dlls/ntdll/server.c: Change malloc/free to RtlAllocateHeap/RtlFreeHeap

Zac Brown zac at zacbrown.org
Sat Nov 24 17:00:29 CST 2007


Hi,

Changed malloc/free to RtlAllocateHeap/RtlFreeHeap to keep with win api.


-Zac



---
 dlls/ntdll/server.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c
index 1eebef1..51e0f1a 100644
--- a/dlls/ntdll/server.c
+++ b/dlls/ntdll/server.c
@@ -849,7 +849,7 @@ static void rm_rf( const char *path )
     struct stat st;
     struct dirent *de;

-    if (!(buffer = malloc( strlen(path) + 256 + 1 ))) goto done;
+    if (!(buffer = RtlAllocateHeap( GetProcessHeap(), 0, strlen(path) +
256 + 1))) goto done;
     strcpy( buffer, path );
     p = buffer + strlen(buffer);
     *p++ = '/';
@@ -870,7 +870,7 @@ static void rm_rf( const char *path )
         }
         closedir( dir );
     }
-    free( buffer );
+    RtlFreeHeap(GetProcessHeap(), 0, buffer);
     rmdir( path );
 done:
     errno = err;
@@ -889,7 +889,7 @@ static void create_config_dir(void)
     int fd;
     pid_t pid, wret;

-    if (!(tmp_dir = malloc( strlen(config_dir) + sizeof("-XXXXXX") )))
+    if (!(tmp_dir = RtlAllocateHeap(GetProcessHeap(), 0,
strlen(config_dir) + sizeof("-XXXXXX") )))
         fatal_error( "out of memory\n" );
     strcpy( tmp_dir, config_dir );
     strcat( tmp_dir, "-XXXXXX" );
@@ -946,7 +946,7 @@ static void create_config_dir(void)
             fatal_perror( "rename '%s' to '%s'", tmp_dir, config_dir );
         /* else it was probably created by a concurrent wine process */
     }
-    free( tmp_dir );
+    RtlFreeHeap(GetProcessHeap(), 0, tmp_dir);
     MESSAGE( "wine: '%s' created successfully.\n", config_dir );
 }

-- 
1.5.2.5




More information about the wine-patches mailing list