Author: hpoussin Date: Sun Jun 25 00:40:55 2006 New Revision: 22585
URL: http://svn.reactos.org/svn/reactos?rev=22585&view=rev Log: Fix MLLoadLibraryA/W prototypes
Modified: trunk/reactos/dll/win32/shlwapi/ordinal.c trunk/reactos/dll/win32/shlwapi/url.c trunk/reactos/include/shlwapi.h
Modified: trunk/reactos/dll/win32/shlwapi/ordinal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/ordinal.c... ============================================================================== --- trunk/reactos/dll/win32/shlwapi/ordinal.c (original) +++ trunk/reactos/dll/win32/shlwapi/ordinal.c Sun Jun 25 00:40:55 2006 @@ -3419,7 +3419,7 @@ * Success: A handle to the loaded module * Failure: A NULL handle. */ -HMODULE WINAPI MLLoadLibraryA(LPCSTR new_mod, HMODULE inst_hwnd, DWORD dwFlags) +HMODULE WINAPI MLLoadLibraryA(LPCSTR new_mod, HMODULE inst_hwnd, BOOL bCrossCodePage) { /* FIXME: Native appears to do DPA_Create and a DPA_InsertPtr for * each call here. @@ -3443,7 +3443,7 @@ LPSTR ptr; DWORD len;
- FIXME("(%s,%p,0x%08lx) semi-stub!\n", debugstr_a(new_mod), inst_hwnd, dwFlags); + FIXME("(%s,%p,0x%08lx) semi-stub!\n", debugstr_a(new_mod), inst_hwnd, bCrossCodePage); len = GetModuleFileNameA(inst_hwnd, mod_path, sizeof(mod_path)); if (!len || len >= sizeof(mod_path)) return NULL;
@@ -3461,13 +3461,13 @@ * * Unicode version of MLLoadLibraryA. */ -HMODULE WINAPI MLLoadLibraryW(LPCWSTR new_mod, HMODULE inst_hwnd, DWORD dwFlags) +HMODULE WINAPI MLLoadLibraryW(LPCWSTR new_mod, HMODULE inst_hwnd, BOOL bCrossCodePage) { WCHAR mod_path[2*MAX_PATH]; LPWSTR ptr; DWORD len;
- FIXME("(%s,%p,0x%08lx) semi-stub!\n", debugstr_w(new_mod), inst_hwnd, dwFlags); + FIXME("(%s,%p,0x%08lx) semi-stub!\n", debugstr_w(new_mod), inst_hwnd, bCrossCodePage); len = GetModuleFileNameW(inst_hwnd, mod_path, sizeof(mod_path) / sizeof(WCHAR)); if (!len || len >= sizeof(mod_path) / sizeof(WCHAR)) return NULL;
Modified: trunk/reactos/dll/win32/shlwapi/url.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/url.c?rev... ============================================================================== --- trunk/reactos/dll/win32/shlwapi/url.c (original) +++ trunk/reactos/dll/win32/shlwapi/url.c Sun Jun 25 00:40:55 2006 @@ -36,7 +36,6 @@ #include "shlwapi.h" #include "wine/debug.h"
-HMODULE WINAPI MLLoadLibraryW(LPCWSTR,HMODULE,DWORD); BOOL WINAPI MLFreeLibrary(HMODULE); HRESULT WINAPI MLBuildResURLW(LPCWSTR,HMODULE,DWORD,LPCWSTR,LPWSTR,DWORD);
Modified: trunk/reactos/include/shlwapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/shlwapi.h?rev=22585... ============================================================================== --- trunk/reactos/include/shlwapi.h (original) +++ trunk/reactos/include/shlwapi.h Sun Jun 25 00:40:55 2006 @@ -551,8 +551,8 @@ WINSHLWAPI int WINAPI wvnsprintfA(LPSTR,int,LPCSTR,va_list); WINSHLWAPI int WINAPI wvnsprintfW(LPWSTR,int,LPCWSTR,va_list);
-HINSTANCE WINAPI MLLoadLibraryA(LPCSTR,HMODULE,DWORD); -HINSTANCE WINAPI MLLoadLibraryW(LPCWSTR,HMODULE,DWORD); +HINSTANCE WINAPI MLLoadLibraryA(LPCSTR,HMODULE,BOOL); +HINSTANCE WINAPI MLLoadLibraryW(LPCWSTR,HMODULE,BOOL);
HRESULT WINAPI DllInstall(BOOL,LPCWSTR);