Index: dlls/shlwapi/ordinal.c

23 Jan 2004

...
Changelog:
  Sync with ReactOS 0.2
  Fix various function prototypes to conform to PSDK
Index: dlls/shlwapi/ordinal.c
RCS file: /home/wine/wine/dlls/shlwapi/ordinal.c,v
retrieving revision 1.75
diff -u -r1.75 ordinal.c

--- dlls/shlwapi/ordinal.c	1 Oct 2003 03:10:42 -0000	1.75
+++ dlls/shlwapi/ordinal.c	22 Jan 2004 23:41:41 -0000
@@ -3414,7 +3414,8 @@

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, HANDLE inst_hwnd,
DWORD dwFlags,

                         LPCSTR component, BOOL cross_code_page)



This is wrong. Please resubmit without this change until we can discover why
the prototype has 5 parameters, yet on my system the implementation only
takes 3.
...
{
   /* FIXME: Native appears to do DPA_Create and a DPA_InsertPtr for
    *        each call here.
@@ -3453,7 +3454,8 @@


Unicode version of MLLoadLibraryA.

*/
-HMODULE WINAPI MLLoadLibraryW(LPCWSTR new_mod, HMODULE
inst_hwnd, DWORD dwFlags)
+HMODULE WINAPI MLLoadLibraryW(LPCWSTR new_mod, HANDLE inst_hwnd,
DWORD dwFlags,

                         LPCWSTR component, BOOL cross_code_page)



Same again
...
{
     WCHAR mod_path[2*MAX_PATH];
     LPWSTR ptr;

    

RE: comctl32 resources / shlwapi prototype fixes

Index: dlls/shlwapi/ordinal.c