[PATCH v2 0/3] MR1575: include: Add __WINE_(DEALLOC|MALLOC) attributes to wine_get_(dos|unix)_file_name.

[Brendan Shanks (＠bshanks)]

--
  v2: wpcap: Free wine_get_unix_file_name memory with HeapFree.
      mountmgr.sys: Free wine_get_dos_file_name memory with HeapFree.
      include: Add __WINE_(DEALLOC|MALLOC) attributes to wine_get_(dos|unix)_file_name.

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

[PATCH v2 1/3] include: Add __WINE_(DEALLOC|MALLOC) attributes to wine_get_(dos|unix)_file_name.

[Brendan Shanks]

From: Brendan Shanks

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

diff --git a/include/winbase.h b/include/winbase.h
index 7d7be1ae2a8..1d135a87fd7 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( const WCHAR * ) __WINE_DEALLOC(HeapFree,3) __WINE_MALLOC;
+extern WCHAR * CDECL wine_get_dos_file_name( const char * ) __WINE_DEALLOC(HeapFree,3) __WINE_MALLOC;

#ifdef WINE_UNIX_LIB

[PATCH v2 2/3] mountmgr.sys: Free wine_get_dos_file_name memory with HeapFree.

[Brendan Shanks]

From: Brendan Shanks

---
 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());

[PATCH v2 3/3] wpcap: Free wine_get_unix_file_name memory with HeapFree.

[Brendan Shanks]

From: Brendan Shanks

---
 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, &params );
-    RtlFreeHeap( GetProcessHeap(), 0, unix_path );
+    HeapFree( GetProcessHeap(), 0, unix_path );
     return dumper;
 }

[PATCH v2 0/3] MR1575: include: Add __WINE_(DEALLOC|MALLOC) attributes to wine_get_(dos|unix)_file_name. - approved

[Alex Henrie (＠alexhenrie)]

This merge request was approved by Alex Henrie.