mshtml: Write-strings warnings fix

Andrew Talbot Andrew.Talbot at talbotville.com
Wed Jul 12 14:00:57 CDT 2006


Changelog:
    mshtml: Write-strings warnings fix.

diff -urN a/dlls/mshtml/main.c b/dlls/mshtml/main.c
--- a/dlls/mshtml/main.c	2006-06-23 12:46:27.000000000 +0100
+++ b/dlls/mshtml/main.c	2006-07-12 19:41:16.000000000 +0100
@@ -252,11 +252,14 @@
 DEFINE_GUID(CLSID_Scriptlet, 0xAE24FDAE, 0x03C6, 0x11D1, 0x8B,0x76, 0x00,0x80,0xC7,0x44,0xF3,0x89);
 DEFINE_GUID(CLSID_TridentAPI, 0x429AF92C, 0xA51F, 0x11D2, 0x86,0x1E, 0x00,0xC0,0x4F,0xA3,0x5C,0x89);
 
-#define INF_SET_ID(id) \
-    pse[i].pszName = #id; \
-    clsids[i++] = &id;
-
-#define INF_SET_CLSID(clsid) INF_SET_ID(CLSID_ ## clsid)
+#define INF_SET_CLSID(clsid)                  \
+    do                                        \
+    {                                         \
+        static CHAR name[] = "CLSID_" #clsid; \
+                                              \
+        pse[i].pszName = name;                \
+        clsids[i++] = &CLSID_ ## clsid;       \
+    } while (0)
 
 static HRESULT register_server(BOOL do_register)
 {
@@ -267,11 +270,11 @@
     STRENTRYA pse[35];
     static CLSID const *clsids[35];
     int i = 0;
-    
+
     static const WCHAR wszAdvpack[] = {'a','d','v','p','a','c','k','.','d','l','l',0};
 
     TRACE("(%x)\n", do_register);
-    
+
     INF_SET_CLSID(AboutProtocol);
     INF_SET_CLSID(CAnchorBrowsePropertyPage);
     INF_SET_CLSID(CBackgroundPropertyPage);



More information about the wine-patches mailing list