Sync with trunk (r48545)

[reactos.git] / dll / win32 / kernel32 / file / file.c

diff --git a/dll/win32/kernel32/file/file.c b/dll/win32/kernel32/file/file.c
index 6604662..7210147 100644 (file)
--- a/dll/win32/kernel32/file/file.c
+++ b/dll/win32/kernel32/file/file.c
@@ -13,9 +13,9 @@
 /* INCLUDES *****************************************************************/
 
 #include <k32.h>
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(kernel32file);
+#define NDEBUG
+#include <debug.h>
+static ULONG gDebugChannel = kernel32file;
 
 /* GLOBALS ******************************************************************/
 
@@ -1906,7 +1906,8 @@ ReplaceFileW(
     )
 {
     HANDLE hReplaced = NULL, hReplacement = NULL;
-    UNICODE_STRING NtReplacedName, NtReplacementName;
+    UNICODE_STRING NtReplacedName = { 0, 0, NULL };
+    UNICODE_STRING NtReplacementName = { 0, 0, NULL };
     DWORD Error = ERROR_SUCCESS;
     NTSTATUS Status;
     BOOL Ret = FALSE;
@@ -2029,8 +2030,10 @@ Cleanup:
     if (hReplacement) NtClose(hReplacement);
     if (Buffer) RtlFreeHeap(RtlGetProcessHeap(), 0, Buffer);
 
-    RtlFreeUnicodeString(&NtReplacementName);
-    RtlFreeUnicodeString(&NtReplacedName);
+    if (NtReplacementName.Buffer)
+        RtlFreeHeap(GetProcessHeap(), 0, NtReplacementName.Buffer);
+    if (NtReplacedName.Buffer)
+        RtlFreeHeap(GetProcessHeap(), 0, NtReplacedName.Buffer);
 
     /* If there was an error, set the error code */
     if(!Ret)