[PATCH 0/1] MR1717: include: Annotate ILC* functions with __WINE_(DEALLOC|MALLOC).

[Alex Henrie (＠alexhenrie)]

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

[PATCH 1/1] include: Annotate ILC* functions with __WINE_(DEALLOC|MALLOC).

[Alex Henrie]

From: Alex Henrie <alexhenrie24(a)gmail.com>

---
 include/shlobj.h | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/include/shlobj.h b/include/shlobj.h
index feee6cd9b98..e80619abc7f 100644
--- a/include/shlobj.h
+++ b/include/shlobj.h
@@ -1908,17 +1908,17 @@ HRESULT      WINAPI SHDoDragDrop(HWND,IDataObject*,IDropSource*,DWORD,LPDWORD);
 #define PID_IS_DESCRIPTION 12
 #define PID_IS_COMMENT     13
 
+void         WINAPI ILFree(ITEMIDLIST*);
+ITEMIDLIST*  WINAPI ILClone(const ITEMIDLIST*) __WINE_DEALLOC(ILFree) __WINE_MALLOC;
+ITEMIDLIST*  WINAPI ILCloneFirst(const ITEMIDLIST*) __WINE_DEALLOC(ILFree) __WINE_MALLOC;
+ITEMIDLIST*  WINAPI ILCreateFromPathA(const char*) __WINE_DEALLOC(ILFree) __WINE_MALLOC;
+ITEMIDLIST*  WINAPI ILCreateFromPathW(const WCHAR*) __WINE_DEALLOC(ILFree) __WINE_MALLOC;
+#define             ILCreateFromPath WINELIB_NAME_AW(ILCreateFromPath)
+ITEMIDLIST*  WINAPI ILCombine(const ITEMIDLIST*,const ITEMIDLIST*) __WINE_DEALLOC(ILFree) __WINE_MALLOC;
 
 LPITEMIDLIST WINAPI ILAppendID(LPITEMIDLIST,LPCSHITEMID,BOOL);
-LPITEMIDLIST WINAPI ILClone(LPCITEMIDLIST);
-LPITEMIDLIST WINAPI ILCloneFirst(LPCITEMIDLIST);
-LPITEMIDLIST WINAPI ILCreateFromPathA(LPCSTR);
-LPITEMIDLIST WINAPI ILCreateFromPathW(LPCWSTR);
-#define             ILCreateFromPath WINELIB_NAME_AW(ILCreateFromPath)
-LPITEMIDLIST WINAPI ILCombine(LPCITEMIDLIST,LPCITEMIDLIST);
 LPITEMIDLIST WINAPI ILFindChild(LPCITEMIDLIST,LPCITEMIDLIST);
 LPITEMIDLIST WINAPI ILFindLastID(LPCITEMIDLIST);
-void         WINAPI ILFree(LPITEMIDLIST);
 LPITEMIDLIST WINAPI ILGetNext(LPCITEMIDLIST);
 UINT         WINAPI ILGetSize(LPCITEMIDLIST);
 BOOL         WINAPI ILIsEqual(LPCITEMIDLIST,LPCITEMIDLIST);
-- 
GitLab

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

[PATCH 1/1] include: Annotate ILC* functions with __WINE_(DEALLOC|MALLOC).

[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=127292

Your paranoid android.


=== debian11 (32 bit report) ===

winhttp:
notification.c:122: Test failed: 943: expected callback to be called from the same thread
notification.c:122: Test failed: 948: expected callback to be called from the same thread
notification.c:122: Test failed: 953: expected callback to be called from the same thread
notification.c:997: Test failed: got 4
notification.c:1006: Test failed: got 0
notification.c:1010: Test failed: unexpected data 0 at 0
notification.c:1017: Test failed: got 0
notification.c:1018: Test failed: got 1002
notification.c:1019: Test failed: got 18
notification.c:1030: Test failed: got 1002
notification.c:122: Test failed: 937: expected callback to be called from the same thread
notification.c:122: Test failed: 943: expected callback to be called from the same thread
notification.c:122: Test failed: 948: expected callback to be called from the same thread
notification.c:122: Test failed: 953: expected callback to be called from the same thread