Module: wine Branch: master Commit: 24e4acf728dd0d856914d89205fd28e002272e72 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=24e4acf728dd0d856914d892...
Author: Andrew Talbot Andrew.Talbot@talbotville.com Date: Tue Jul 11 22:43:45 2006 +0100
urlmon: Write-strings warnings fix.
---
dlls/urlmon/regsvr.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/dlls/urlmon/regsvr.c b/dlls/urlmon/regsvr.c index d15b72a..2b8cfd3 100644 --- a/dlls/urlmon/regsvr.c +++ b/dlls/urlmon/regsvr.c @@ -572,9 +572,14 @@ static struct regsvr_interface const int * register_inf */
-#define INF_SET_CLSID(clsid) \ - pse[i].pszName = "CLSID_" #clsid; \ - clsids[i++] = &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_inf(BOOL doregister) { @@ -587,7 +592,7 @@ static HRESULT register_inf(BOOL doregis int i = 0;
static const WCHAR wszAdvpack[] = {'a','d','v','p','a','c','k','.','d','l','l',0}; - + INF_SET_CLSID(CdlProtocol); INF_SET_CLSID(FileProtocol); INF_SET_CLSID(FtpProtocol);