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

[Alex Henrie (＠alexhenrie)]

--
  v2: include: Annotate ILC* functions with __WINE_(DEALLOC|MALLOC).
 
https://gitlab.winehq.org/wine/wine/-/merge_requests/1717

[PATCH v2 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 20144fbc503..c7452cf5f0a 100644
--- a/include/shlobj.h
+++ b/include/shlobj.h
@@ -1914,17 +1914,17 @@ WINSHELLAPI HRESULT      WINAPI SHDoDragDrop(HWND,IDataObject*,IDropSource*,DWOR
 #define PID_IS_DESCRIPTION 12
 #define PID_IS_COMMENT     13
 
+WINSHELLAPI void         WINAPI ILFree(ITEMIDLIST*);
+WINSHELLAPI ITEMIDLIST*  WINAPI ILClone(const ITEMIDLIST*) __WINE_DEALLOC(ILFree) __WINE_MALLOC;
+WINSHELLAPI ITEMIDLIST*  WINAPI ILCloneFirst(const ITEMIDLIST*) __WINE_DEALLOC(ILFree) __WINE_MALLOC;
+WINSHELLAPI ITEMIDLIST*  WINAPI ILCreateFromPathA(const char*) __WINE_DEALLOC(ILFree) __WINE_MALLOC;
+WINSHELLAPI ITEMIDLIST*  WINAPI ILCreateFromPathW(const WCHAR*) __WINE_DEALLOC(ILFree) __WINE_MALLOC;
+#define                         ILCreateFromPath WINELIB_NAME_AW(ILCreateFromPath)
+WINSHELLAPI ITEMIDLIST*  WINAPI ILCombine(const ITEMIDLIST*,const ITEMIDLIST*) __WINE_DEALLOC(ILFree) __WINE_MALLOC;
 
 WINSHELLAPI LPITEMIDLIST WINAPI ILAppendID(LPITEMIDLIST,LPCSHITEMID,BOOL);
-WINSHELLAPI LPITEMIDLIST WINAPI ILClone(LPCITEMIDLIST);
-WINSHELLAPI LPITEMIDLIST WINAPI ILCloneFirst(LPCITEMIDLIST);
-WINSHELLAPI LPITEMIDLIST WINAPI ILCreateFromPathA(LPCSTR);
-WINSHELLAPI LPITEMIDLIST WINAPI ILCreateFromPathW(LPCWSTR);
-#define                         ILCreateFromPath WINELIB_NAME_AW(ILCreateFromPath)
-WINSHELLAPI LPITEMIDLIST WINAPI ILCombine(LPCITEMIDLIST,LPCITEMIDLIST);
 WINSHELLAPI LPITEMIDLIST WINAPI ILFindChild(LPCITEMIDLIST,LPCITEMIDLIST);
 WINSHELLAPI LPITEMIDLIST WINAPI ILFindLastID(LPCITEMIDLIST);
-WINSHELLAPI void         WINAPI ILFree(LPITEMIDLIST);
 WINSHELLAPI LPITEMIDLIST WINAPI ILGetNext(LPCITEMIDLIST);
 WINSHELLAPI UINT         WINAPI ILGetSize(LPCITEMIDLIST);
 WINSHELLAPI BOOL         WINAPI ILIsEqual(LPCITEMIDLIST,LPCITEMIDLIST);
-- 
GitLab

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

[PATCH v2 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 full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=127373

Your paranoid android.


=== debian11 (build log) ===

error: patch failed: include/shlobj.h:1914
Task: Patch failed to apply

=== debian11b (build log) ===

error: patch failed: include/shlobj.h:1914
Task: Patch failed to apply