shlwapi, Fixup of some parameter types

["Rolf Kalbermatter" <rolf.kalbermatter@citeng.com>]

ChangeLog:
 * dlls/shlwapi/ordinal.c
   - Fix some parameter types

 * dlls/shlwapi/shlwapi.spec
   - update some signatures

Rolf Kalbermatter

Index: dlls/shlwapi/ordinal.c
===================================================================
RCS file: /home/wine/wine/dlls/shlwapi/ordinal.c,v
retrieving revision 1.60
diff -u -r1.60 ordinal.c
--- dlls/shlwapi/ordinal.c	5 Dec 2002 20:33:07 -0000	1.60
+++ dlls/shlwapi/ordinal.c	6 Dec 2002 13:19:14 -0000
@@ -86,13 +86,13 @@
 static BOOL    (WINAPI *pSHGetPathFromIDListW)(LPCITEMIDLIST, LPWSTR);
 static BOOL    (WINAPI *pShellExecuteExW)(LPSHELLEXECUTEINFOW);
 static HICON   (WINAPI *pSHFileOperationW)(LPSHFILEOPSTRUCTW);
-static HICON   (WINAPI *pExtractIconExW)(LPCWSTR, INT,HICON *,HICON *, UINT);
+static UINT    (WINAPI *pExtractIconExW)(LPCWSTR, INT,HICON *,HICON *, UINT);
 static BOOL    (WINAPI *pSHGetNewLinkInfoW)(LPCWSTR, LPCWSTR, LPCWSTR, BOOL*, UINT);
-static DWORD   (WINAPI *pSHDefExtractIconW)(LPVOID, LPVOID, LPVOID, LPVOID, LPVOID, LPVOID); /* FIXME: Correct args */
+static HRESULT (WINAPI *pSHDefExtractIconW)(LPCWSTR, int, UINT, HICON*, HICON*, UINT);
 static HICON   (WINAPI *pExtractIconW)(HINSTANCE, LPCWSTR, UINT);
 static BOOL    (WINAPI *pGetSaveFileNameW)(LPOPENFILENAMEW);
-static DWORD   (WINAPI *pWNetRestoreConnectionW)(LPVOID, LPVOID); /* FIXME: Correct args */
-static DWORD   (WINAPI *pWNetGetLastErrorW)(LPVOID, LPVOID, LPVOID, LPVOID, LPVOID); /* FIXME: Correct args */
+static DWORD   (WINAPI *pWNetRestoreConnectionW)(HWND, LPWSTR);
+static DWORD   (WINAPI *pWNetGetLastErrorW)(LPDWORD, LPWSTR, DWORD, LPWSTR, DWORD);
 static BOOL    (WINAPI *pPageSetupDlgW)(LPPAGESETUPDLGW);
 static BOOL    (WINAPI *pPrintDlgW)(LPPRINTDLGW);
 static BOOL    (WINAPI *pGetOpenFileNameW)(LPOPENFILENAMEW);
@@ -2215,10 +2215,10 @@
  *
  * Late bound call to shell32.ExtractIconExW.
  */
-HICON WINAPI SHLWAPI_337(LPCWSTR lpszFile, INT nIconIndex, HICON *phiconLarge,
+UINT WINAPI SHLWAPI_337(LPCWSTR lpszFile, INT nIconIndex, HICON *phiconLarge,
                          HICON *phiconSmall, UINT nIcons)
 {
-  GET_FUNC(pExtractIconExW, shell32, "ExtractIconExW", NULL);
+  GET_FUNC(pExtractIconExW, shell32, "ExtractIconExW", 0);
   return pExtractIconExW(lpszFile, nIconIndex, phiconLarge, phiconSmall, nIcons);
 }
 
@@ -2308,11 +2308,11 @@
  *
  * Late bound call to shell32.SHDefExtractIconW
  */
-DWORD WINAPI SHLWAPI_358(LPVOID arg1, LPVOID arg2, LPVOID arg3, LPVOID arg4,
-                         LPVOID arg5, LPVOID arg6)
+UINT WINAPI SHLWAPI_358(LPCWSTR pszIconFile, int iIndex, UINT uFlags, HICON* phiconLarge,
+                         HICON* phiconSmall, UINT nIconSize)
 {
   GET_FUNC(pSHDefExtractIconW, shell32, "SHDefExtractIconW", 0);
-  return pSHDefExtractIconW(arg1, arg2, arg3, arg4, arg5, arg6);
+  return pSHDefExtractIconW(pszIconFile, iIndex, uFlags, phiconLarge, phiconSmall, nIconSize);
 }
 
 /*************************************************************************
@@ -2425,10 +2425,10 @@
  *
  * Late bound call to mpr.WNetRestoreConnectionW
  */
-DWORD WINAPI SHLWAPI_390(LPVOID arg1, LPVOID arg2)
+DWORD WINAPI SHLWAPI_390(HWND hwndOwner, LPWSTR lpszDevice)
 {
   GET_FUNC(pWNetRestoreConnectionW, mpr, "WNetRestoreConnectionW", 0);
-  return pWNetRestoreConnectionW(arg1, arg2);
+  return pWNetRestoreConnectionW(hwndOwner, lpszDevice);
 }
 
 /*************************************************************************
@@ -2436,11 +2436,11 @@
  *
  * Late bound call to mpr.WNetGetLastErrorW
  */
-DWORD WINAPI SHLWAPI_391(LPVOID arg1, LPVOID arg2, LPVOID arg3, LPVOID arg4,
-                         LPVOID arg5)
+DWORD WINAPI SHLWAPI_391(LPDWORD lpError, LPWSTR lpErrorBuf, DWORD nErrorBufSize,
+                         LPWSTR lpNameBuf, DWORD nNameBufSize)
 {
   GET_FUNC(pWNetGetLastErrorW, mpr, "WNetGetLastErrorW", 0);
-  return pWNetGetLastErrorW(arg1, arg2, arg3, arg4, arg5);
+  return pWNetGetLastErrorW(lpError, lpErrorBuf, nErrorBufSize, lpNameBuf, nNameBufSize);
 }
 
 /*************************************************************************

Index: dlls/shlwapi/shlwapi.spec
===================================================================
RCS file: /home/wine/wine/dlls/shlwapi/shlwapi.spec,v
retrieving revision 1.61
diff -u -r1.61 shlwapi.spec
--- dlls/shlwapi/shlwapi.spec	4 Nov 2002 23:53:43 -0000	1.61
+++ dlls/shlwapi/shlwapi.spec	6 Dec 2002 13:22:13 -0000
@@ -355,7 +355,7 @@
 355 stub @
 356 stdcall @(ptr ptr) SHLWAPI_356
 357 stdcall @(wstr wstr wstr long long) SHLWAPI_357
-358 stdcall @(ptr ptr ptr ptr ptr ptr) SHLWAPI_358
+358 stdcall @(wstr long long ptr ptr long) SHLWAPI_358
 359 forward @ kernel32.OpenEventW
 360 forward @ kernel32.RemoveDirectoryW
 361 forward @ kernel32.GetShortPathNameW
@@ -387,8 +387,8 @@
 387 stub ColorAdjustLuma
 388 stub @
 389 stdcall @(ptr) SHLWAPI_389
-390 stdcall @(ptr ptr) SHLWAPI_390
-391 stdcall @(ptr ptr ptr ptr ptr ) SHLWAPI_391
+390 stdcall @(long wstr) SHLWAPI_390
+391 stdcall @(ptr ptr long ptr long) SHLWAPI_391
 392 stub @
 393 forward @ user32.CreateDialogIndirectParamW
 394 forward @ user32.CreateDialogIndirectParamA