[PATCH 0/1] MR6397: include: Always declare the imagelist read and write functions.

[Huw Davies (＠huw)]

This matches the PSDK.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/6397

[PATCH 1/1] include: Always declare the imagelist read and write functions.

[Huw Davies]

From: Huw Davies <huw(a)codeweavers.com>

This matches the PSDK.
---
 include/commctrl.h | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/include/commctrl.h b/include/commctrl.h
index ece751a0d35..c84dce3702c 100644
--- a/include/commctrl.h
+++ b/include/commctrl.h
@@ -601,14 +601,13 @@ WINCOMMCTRLAPI BOOL       WINAPI ImageList_SetIconSize(HIMAGELIST,INT,INT);
 WINCOMMCTRLAPI BOOL       WINAPI ImageList_SetImageCount(HIMAGELIST,UINT);
 WINCOMMCTRLAPI BOOL       WINAPI ImageList_SetOverlayImage(HIMAGELIST,INT,INT);
 
-#ifdef __IStream_INTERFACE_DEFINED__
-WINCOMMCTRLAPI HIMAGELIST WINAPI ImageList_Read(LPSTREAM);
-WINCOMMCTRLAPI BOOL       WINAPI ImageList_Write(HIMAGELIST,IStream*);
-WINCOMMCTRLAPI HRESULT    WINAPI ImageList_WriteEx(HIMAGELIST,DWORD,IStream*);
+struct IStream;
+WINCOMMCTRLAPI HIMAGELIST WINAPI ImageList_Read(struct IStream*);
+WINCOMMCTRLAPI BOOL       WINAPI ImageList_Write(HIMAGELIST,struct IStream*);
+WINCOMMCTRLAPI HRESULT    WINAPI ImageList_WriteEx(HIMAGELIST,DWORD,struct IStream*);
 
 #define ILP_NORMAL    0
 #define ILP_DOWNLEVEL 1
-#endif
 
 #define ImageList_AddIcon(himl,hicon) ImageList_ReplaceIcon(himl,-1,hicon)
 #define ImageList_ExtractIcon(hi,himl,i) ImageList_GetIcon(himl,i,0)
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/6397

[PATCH 1/1] include: Always declare the imagelist read and write functions.

[Marvin]

Hi,

It looks like your patch introduced the new failures shown below.
Please investigate and fix them before resubmitting your patch.
If they are not new, fixing them anyway would help a lot. Otherwise
please ask for the known failures list to be updated.

The tests also ran into some preexisting test failures. If you know how
to fix them that would be helpful. See the TestBot job for the details:

The full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=148073

Your paranoid android.


=== debian11b (64 bit WoW report) ===

ddraw:
ddraw7.c:3822: Test failed: Expected (0,0)-(640,480), got (0,0)-(1024,768).
ddraw7.c:3847: Test failed: Expected (0,0)-(640,480), got (0,0)-(1024,768).

winmm:
mci: Timeout