From 1f7943c5795ed2718d5ff0a4e3be9c5cd59e42c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= Date: Sat, 24 Jun 2006 20:40:55 +0000 Subject: [PATCH] Fix MLLoadLibraryA/W prototypes svn path=/trunk/; revision=22585 --- reactos/dll/win32/shlwapi/ordinal.c | 8 ++++---- reactos/dll/win32/shlwapi/url.c | 1 - reactos/include/shlwapi.h | 4 ++-- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/reactos/dll/win32/shlwapi/ordinal.c b/reactos/dll/win32/shlwapi/ordinal.c index 384c2ee98f9..001be01cc06 100644 --- a/reactos/dll/win32/shlwapi/ordinal.c +++ b/reactos/dll/win32/shlwapi/ordinal.c @@ -3419,7 +3419,7 @@ LANGID WINAPI MLGetUILanguage() * 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 @@ HMODULE WINAPI MLLoadLibraryA(LPCSTR new_mod, HMODULE inst_hwnd, DWORD dwFlags) 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 @@ HMODULE WINAPI MLLoadLibraryA(LPCSTR new_mod, HMODULE inst_hwnd, DWORD dwFlags) * * 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; diff --git a/reactos/dll/win32/shlwapi/url.c b/reactos/dll/win32/shlwapi/url.c index ac811d0fbc4..19a6e856b43 100644 --- a/reactos/dll/win32/shlwapi/url.c +++ b/reactos/dll/win32/shlwapi/url.c @@ -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); diff --git a/reactos/include/shlwapi.h b/reactos/include/shlwapi.h index 01e3c9d3b3a..bf6dfd97644 100644 --- a/reactos/include/shlwapi.h +++ b/reactos/include/shlwapi.h @@ -551,8 +551,8 @@ WINSHLWAPI int __cdecl wnsprintfW(LPWSTR,int,LPCWSTR,...); 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);