Put FOR_EACH_COCLASS macro into its own file and export it
[WebKit-https.git] / WebKit / win / WebKitDLL.cpp
index 0c06bc72bb38d5864d5091f853ab12158a958e25..712dec8a391eb89af79b85865ef6263583d02aaa 100644 (file)
@@ -26,6 +26,7 @@
 #include "config.h"
 #include "WebKitDLL.h"
 
+#include "ForEachCoClass.h"
 #include "IWebURLResponse.h"
 #include "ProgIDMacros.h"
 #include "WebKit.h"
@@ -46,32 +47,11 @@ ULONG gLockCount;
 ULONG gClassCount;
 HINSTANCE gInstance;
 
-#define FOR_EACH_CLASS(macro) \
-    macro(CFDictionaryPropertyBag) \
-    macro(WebCache) \
-    macro(WebDebugProgram) \
-    macro(WebDownload) \
-    macro(WebError) \
-    macro(WebHistory) \
-    macro(WebHistoryItem) \
-    macro(WebIconDatabase) \
-    macro(WebJavaScriptCollector) \
-    macro(WebKitStatistics) \
-    macro(WebMutableURLRequest) \
-    macro(WebNotificationCenter) \
-    macro(WebPreferences) \
-    macro(WebScrollBar) \
-    macro(WebURLCredential) \
-    macro(WebURLProtectionSpace) \
-    macro(WebURLRequest) \
-    macro(WebURLResponse) \
-    macro(WebView)
-
 #define CLSID_FOR_CLASS(cls) CLSID_##cls,
-
 static CLSID gRegCLSIDs[] = {
-    FOR_EACH_CLASS(CLSID_FOR_CLASS)
+    FOR_EACH_COCLASS(CLSID_FOR_CLASS)
 };
+#undef CLSID_FOR_CLASS
 
 void shutDownWebKit()
 {
@@ -158,8 +138,9 @@ STDAPI DllCanUnloadNow(void)
 
 static const int gSlotsPerEntry = 12;
 static LPCTSTR gRegTable[][3] = {
-    FOR_EACH_CLASS(KEYS_FOR_CLASS)
+    FOR_EACH_COCLASS(KEYS_FOR_CLASS)
 };
+#undef KEYS_FOR_CLASS
 
 static void substituteGUID(LPTSTR str, const UUID* guid)
 {