- Modify ICO_ExtractIconExW to:

return more compliant values for usage in PrivateExtractIcons and PrivateExtractIconEx accept and fill in the icon identifier array correctly if provided allow to retrieve both small and large icons together. - Simplify PrivateExtraxtIcons - Modify PrivateExtractIconExW to: use compatible signature to ExtractIconEx in shell32 which it really is directly as tested on W2K by calling both functions with the same parameters directly call internal extraction function fix error when requesting 1 icon for both sizes

- Modify ICO_ExtractIconExW to:
2dcb751a · Rolf Kalbermatter · Alexandre Julliard · 9c507303 · 2dcb751a · 2dcb751a
Commit 2dcb751a authored Dec 10, 2002 by Rolf Kalbermatter Committed by Alexandre Julliard Dec 10, 2002
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

exticon.c dlls/user/exticon.c +0 -0

user32.spec dlls/user/user32.spec +2 -2

winuser.h include/winuser.h +2 -0

No files found.
--- a/dlls/user/exticon.c
+++ b/dlls/user/exticon.c
--- a/dlls/user/user32.spec
+++ b/dlls/user/user32.spec
@@ -619,8 +619,8 @@
 @ stdcall MonitorFromRect(ptr long) MonitorFromRect
 @ stdcall MonitorFromPoint(long long long) MonitorFromPoint
 @ stdcall EnumDisplayMonitors(long ptr ptr long) EnumDisplayMonitors
-@ stdcall PrivateExtractIconExA (long long long long long) PrivateExtractIconExA
-@ stdcall PrivateExtractIconExW (long long long long long) PrivateExtractIconExW
+@ stdcall PrivateExtractIconExA(str long ptr ptr long) PrivateExtractIconExA
+@ stdcall PrivateExtractIconExW(wstr long ptr ptr long) PrivateExtractIconExW
 @ stdcall PrivateExtractIconsA (str long long long ptr ptr long long) PrivateExtractIconsA
 @ stdcall PrivateExtractIconsW (wstr long long long ptr ptr long long) PrivateExtractIconsW
 @ stdcall RegisterShellHookWindow (long) RegisterShellHookWindow

--- a/include/winuser.h
+++ b/include/winuser.h
@@ -4314,6 +4314,8 @@ BOOL      WINAPI PostMessageA(HWND,UINT,WPARAM,LPARAM);
 BOOL      WINAPI PostMessageW(HWND,UINT,WPARAM,LPARAM);
 #define     PostMessage WINELIB_NAME_AW(PostMessage)
 void        WINAPI PostQuitMessage(INT);
+UINT        WINAPI PrivateExtractIconExA(LPCSTR,int,HICON*,HICON*,UINT);
+UINT        WINAPI PrivateExtractIconExW(LPCWSTR,int,HICON*,HICON*,UINT);
 UINT        WINAPI PrivateExtractIconsA(LPCSTR,int,int,int,HICON*,UINT*,UINT,UINT);
 UINT        WINAPI PrivateExtractIconsW(LPCWSTR,int,int,int,HICON*,UINT*,UINT,UINT);
 BOOL        WINAPI PtInRect(const RECT*,POINT);