slwapi: Make function definitions and declarations agree (1 of 2)

Andrew Talbot Andrew.Talbot at talbotville.com
Sat Apr 14 07:48:21 CDT 2007


Note: The definitions of these functions (in ordinal.c) have a return
type of INT, not DWORD. My assumption that the definitions are correct
- and these declarations incorrect - is based on the return value
of another shlwapi function, one which is documented: SHUnicodeToAnsi().

-- Andy.
---
Changelog:
    slwapi: Make function definitions and declarations agree.

diff -urN a/dlls/shlwapi/reg.c b/dlls/shlwapi/reg.c
--- a/dlls/shlwapi/reg.c	2007-01-05 19:37:12.000000000 +0000
+++ b/dlls/shlwapi/reg.c	2007-04-14 12:22:34.000000000 +0100
@@ -54,7 +54,7 @@
     WCHAR    lpszPath[MAX_PATH];
 } SHUSKEY, *LPSHUSKEY;
 
-DWORD   WINAPI SHStringFromGUIDW(REFGUID,LPWSTR,INT);
+INT     WINAPI SHStringFromGUIDW(REFGUID,LPWSTR,INT);
 HRESULT WINAPI SHRegGetCLSIDKeyW(REFGUID,LPCWSTR,BOOL,BOOL,PHKEY);
 
 
diff -urN a/dlls/shlwapi/thread.c b/dlls/shlwapi/thread.c
--- a/dlls/shlwapi/thread.c	2007-03-29 20:44:32.000000000 +0100
+++ b/dlls/shlwapi/thread.c	2007-04-14 12:24:58.000000000 +0100
@@ -40,7 +40,7 @@
 
 extern DWORD SHLWAPI_ThreadRef_index;  /* Initialised in shlwapi_main.c */
 
-DWORD WINAPI SHStringFromGUIDA(REFGUID,LPSTR,INT);
+INT WINAPI SHStringFromGUIDA(REFGUID,LPSTR,INT);
 
 /**************************************************************************
  *      _CreateAllAccessSecurityAttributes       [SHLWAPI.356]



More information about the wine-patches mailing list