Andrew Talbot : mshtml: Write-strings warnings fix.

[Alexandre Julliard]

Module: wine
Branch: refs/heads/master
Commit: f7e38ac6ea597dc2045239f6f4bcb3bfcbd53a55
URL:    http://source.winehq.org/git/?p=wine.git;a=commit;h=f7e38ac6ea597dc2045239f6...

Author: Andrew Talbot 
Date:   Wed Jul 12 21:26:49 2006 +0100

mshtml: Write-strings warnings fix.

---

dlls/mshtml/main.c |   16 +++++++++++-----
 1 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/dlls/mshtml/main.c b/dlls/mshtml/main.c
index 58098d0..d4c4bf7 100644
--- a/dlls/mshtml/main.c
+++ b/dlls/mshtml/main.c
@@ -252,9 +252,14 @@ DEFINE_GUID(CLSID_MHTMLDocument, 0x3050F
 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_ID(id)            \
+    do                            \
+    {                             \
+        static CHAR name[] = #id; \
+                                  \
+        pse[i].pszName = name;    \
+        clsids[i++] = &id;        \
+    } while (0)

#define INF_SET_CLSID(clsid) INF_SET_ID(CLSID_ ## clsid)

@@ -267,11 +272,11 @@ static HRESULT register_server(BOOL do_r
     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);
@@ -331,6 +336,7 @@ static HRESULT register_server(BOOL do_r
 }

#undef INF_SET_CLSID
+#undef INF_SET_ID

/***********************************************************************
  *          DllRegisterServer (MSHTML.@)