[PATCH 0/1] MR2968: include: Annotate SHAlloc with __WINE_(DEALLOC|MALLOC).

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

[Alex Henrie]

From: Alex Henrie

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

diff --git a/include/shlobj.h b/include/shlobj.h
index c00687e84d8..0774dae7eca 100644
--- a/include/shlobj.h
+++ b/include/shlobj.h
@@ -74,8 +74,9 @@ enum

typedef int GPFIDL_FLAGS;

+WINSHELLAPI void         WINAPI SHFree(void*);
 WINSHELLAPI UINT         WINAPI SHAddFromPropSheetExtArray(HPSXA,LPFNADDPROPSHEETPAGE,LPARAM);
-WINSHELLAPI LPVOID       WINAPI SHAlloc(ULONG) __WINE_ALLOC_SIZE(1);
+WINSHELLAPI void*        WINAPI SHAlloc(ULONG) __WINE_ALLOC_SIZE(1) __WINE_DEALLOC(SHFree) __WINE_MALLOC;
 WINSHELLAPI HRESULT      WINAPI SHCoCreateInstance(LPCWSTR,const CLSID*,IUnknown*,REFIID,LPVOID*);
 WINSHELLAPI HPSXA        WINAPI SHCreatePropSheetExtArray(HKEY,LPCWSTR,UINT);
 WINSHELLAPI HPSXA        WINAPI SHCreatePropSheetExtArrayEx(HKEY,LPCWSTR,UINT,IDataObject*);
@@ -88,7 +89,6 @@ WINSHELLAPI HRESULT      WINAPI SHCreateStdEnumFmtEtc(DWORD,const FORMATETC *,IE
 WINSHELLAPI void         WINAPI SHDestroyPropSheetExtArray(HPSXA);
 WINSHELLAPI BOOL         WINAPI SHFindFiles(LPCITEMIDLIST,LPCITEMIDLIST);
 WINSHELLAPI DWORD        WINAPI SHFormatDrive(HWND,UINT,UINT,UINT);
-WINSHELLAPI void         WINAPI SHFree(LPVOID);
 WINSHELLAPI BOOL         WINAPI GetFileNameFromBrowse(HWND,LPWSTR,DWORD,LPCWSTR,LPCWSTR,LPCWSTR,LPCWSTR);
 WINSHELLAPI HRESULT      WINAPI SHGetInstanceExplorer(IUnknown**);
 WINSHELLAPI HRESULT      WINAPI SHGetFolderPathAndSubDirA(HWND,int,HANDLE,DWORD,LPCSTR,LPSTR);

[PATCH 1/1] include: Annotate SHAlloc 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=133383

Your paranoid android.

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

user32:
msg.c:6897: Test failed: SetFocus(hwnd) on a button: 4: the msg 0x0007 was expected, but got msg 0x0005 instead
msg.c:6897: Test failed: SetFocus(hwnd) on a button: 5: the msg 0x0138 was expected, but got msg 0x030f instead
msg.c:6897: Test failed: SetFocus(hwnd) on a button: 6: the msg 0x0111 was expected, but got msg 0x001c instead
msg.c:6897: Test failed: SetFocus(hwnd) on a button: 8: the msg 0x8000 was expected, but got msg 0x0086 instead
msg.c:6897: Test failed: SetFocus(hwnd) on a button: 9: the msg sequence is not complete: expected 0000 - actual 0006