SHGetMalloc() returns a HRESULT, not a DWORD.

dfa6b127 · Dimitrie O. Paun · Alexandre Julliard · 36d0e5b7 · dfa6b127 · dfa6b127
Commit dfa6b127 authored Jan 03, 2003 by Dimitrie O. Paun Committed by Alexandre Julliard Jan 03, 2003
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

shellole.c dlls/shell32/shellole.c +1 -1

shlobj.h include/shlobj.h +1 -1

No files found.
--- a/dlls/shell32/shellole.c
+++ b/dlls/shell32/shellole.c
@@ -423,7 +423,7 @@ static ICOM_VTABLE(IMalloc) VT_Shell_IMalloc32 =
 *  uses OLE32.CoGetMalloc if OLE32.DLL is already loaded.
 *  if not it uses a internal implementations as fallback.
 */
-DWORD WINAPI SHGetMalloc(LPMALLOC *lpmal)
+HRESULT WINAPI SHGetMalloc(LPMALLOC *lpmal)
 {
 	HRESULT (WINAPI *pCoGetMalloc)(DWORD,LPMALLOC *);
 	HMODULE hOle32;

--- a/include/shlobj.h
+++ b/include/shlobj.h
@@ -375,7 +375,7 @@ typedef struct _SHELLVIEWDATA   /* idl */
  DWORD           viewmode;  /* NF_* enum */
 } SHELLVIEWDATA, * LPSHELLVIEWDATA;

-DWORD WINAPI SHGetMalloc(LPMALLOC *lpmal) ;
+HRESULT WINAPI SHGetMalloc(LPMALLOC *lpmal) ;

 /**********************************************************************
 * SHGetSetSettings ()