[PATCH 0/3] MR1575: include: Add __WINE_(DEALLOC|MALLOC) attributes to wine_get_(dos|unix)_file_name.
From: Brendan Shanks <bshanks(a)codeweavers.com> --- include/winbase.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/winbase.h b/include/winbase.h index 7d7be1ae2a8..408a26a3347 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2963,8 +2963,8 @@ WINBASEAPI UINT WINAPI _lwrite(HFILE,LPCSTR,UINT); /* Wine internal functions */ -extern char * CDECL wine_get_unix_file_name( LPCWSTR dos ); -extern WCHAR * CDECL wine_get_dos_file_name( LPCSTR str ); +extern char * CDECL wine_get_unix_file_name( LPCWSTR dos ) __WINE_DEALLOC(HeapFree,3) __WINE_MALLOC; +extern WCHAR * CDECL wine_get_dos_file_name( LPCSTR str ) __WINE_DEALLOC(HeapFree,3) __WINE_MALLOC; #ifdef WINE_UNIX_LIB -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/1575
From: Brendan Shanks <bshanks(a)codeweavers.com> --- dlls/mountmgr.sys/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mountmgr.sys/device.c b/dlls/mountmgr.sys/device.c index 328b0b2f344..bc934e2f494 100644 --- a/dlls/mountmgr.sys/device.c +++ b/dlls/mountmgr.sys/device.c @@ -895,7 +895,7 @@ static BOOL get_volume_device_info( struct volume *volume ) } handle = CreateFileW( name, GENERIC_READ | SYNCHRONIZE, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, 0 ); - RtlFreeHeap( GetProcessHeap(), 0, name ); + HeapFree( GetProcessHeap(), 0, name ); if (handle == INVALID_HANDLE_VALUE) { WARN("Failed to open %s, err %lu\n", debugstr_a(unix_device), GetLastError()); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/1575
From: Brendan Shanks <bshanks(a)codeweavers.com> --- dlls/wpcap/wpcap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wpcap/wpcap.c b/dlls/wpcap/wpcap.c index df35954bfa7..8b917c53663 100644 --- a/dlls/wpcap/wpcap.c +++ b/dlls/wpcap/wpcap.c @@ -137,7 +137,7 @@ void * CDECL pcap_dump_open( struct pcap *pcap, const char *filename ) params.name = unix_path; params.ret = &dumper; PCAP_CALL( dump_open, ¶ms ); - RtlFreeHeap( GetProcessHeap(), 0, unix_path ); + HeapFree( GetProcessHeap(), 0, unix_path ); return dumper; } -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/1575
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=126879 Your paranoid android. === debian11 (32 bit report) === shell32: shelllink.c:847: Test failed: SHCreateStreamOnFileW failed 80070020 shelllink.c:849: Test failed: IPersistFile_Save failed (0x00000000) shelllink.c:851: Test failed: IPersistFile_Load failed (0x00000000) Report validation errors: advapi32:security has no test summary line (early exit of the main process?) advapi32:security has unaccounted for todo messages
Alex Henrie (@alexhenrie) commented about include/winbase.h:
/* Wine internal functions */
-extern char * CDECL wine_get_unix_file_name( LPCWSTR dos ); -extern WCHAR * CDECL wine_get_dos_file_name( LPCSTR str ); +extern char * CDECL wine_get_unix_file_name( LPCWSTR dos ) __WINE_DEALLOC(HeapFree,3) __WINE_MALLOC; +extern WCHAR * CDECL wine_get_dos_file_name( LPCSTR str ) __WINE_DEALLOC(HeapFree,3) __WINE_MALLOC;
If you're touching these lines, now would be a good time to change `LPCSTR` to `const char *` and `LPCWSTR` to `const WCHAR *`. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/1575#note_17695
participants (4)
-
Alex Henrie (＠alexhenrie) -
Brendan Shanks
-
Brendan Shanks (＠bshanks)
-
Marvin