[Wine-patches] ntoskrnl.exe: Fixed merge error.

[Alexander Morozov]

----------- следующая часть -----------
From 85267c317d178c5802904f7512a76effb40784fa Mon Sep 17 00:00:00 2001
From: Alexander Morozov <amorozov на etersoft.ru>
Date: Thu, 15 Jan 2009 17:58:59 +0300
Subject: [PATCH] ntoskrnl.exe: Fixed merge error.

---
 dlls/ntoskrnl.exe/ntoskrnl.c |   18 +++++-------------
 1 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c
index 02ea02a..ce502b7 100644
--- a/dlls/ntoskrnl.exe/ntoskrnl.c
+++ b/dlls/ntoskrnl.exe/ntoskrnl.c
@@ -337,7 +337,11 @@ NTSTATUS CDECL wine_ntoskrnl_main_loop( HANDLE stop_event )
             break;
         case STATUS_PENDING:
             if (WaitForMultipleObjects( 2, handles, FALSE, INFINITE ) == WAIT_OBJECT_0)
+            {
+                HeapFree( GetProcessHeap(), 0, in_buff );
+                HeapFree( GetProcessHeap(), 0, out_buff );
                 return STATUS_SUCCESS;
+            }
             break;
         }
     }
@@ -1320,7 +1324,6 @@ void WINAPI ExFreePoolWithTag( void *ptr, ULONG tag )
 
 
 /***********************************************************************
-<<<<<<< HEAD:dlls/ntoskrnl.exe/ntoskrnl.c
  *           KeGetCurrentThread   (NTOSKRNL.EXE.@)
  */
 PKTHREAD WINAPI KeGetCurrentThread(void)
@@ -1420,13 +1423,6 @@ LONG WINAPI KeReleaseMutex( PRKMUTEX Mutex, BOOLEAN Wait )
 {
     TRACE("%p %d\n", Mutex, Wait);
     return STATUS_SUCCESS;
-=======
- *           KeInitializeEvent   (NTOSKRNL.EXE.@)
- */
-void WINAPI KeInitializeEvent( PRKEVENT Event, EVENT_TYPE Type, BOOLEAN State )
-{
-    FIXME( "stub: %p %d %d\n", Event, Type, State );
->>>>>>> 254f60b985de89a2bd4f5a5aa94aa569684d6732:dlls/ntoskrnl.exe/ntoskrnl.c
 }
 
 
@@ -1435,8 +1431,7 @@ void WINAPI KeInitializeEvent( PRKEVENT Event, EVENT_TYPE Type, BOOLEAN State )
  */
 void WINAPI KeInitializeSpinLock( PKSPIN_LOCK SpinLock )
 {
-<<<<<<< HEAD:dlls/ntoskrnl.exe/ntoskrnl.c
-    TRACE("%p\n", SpinLock);
+    TRACE( "stub: %p\n", SpinLock );
 }
 
 
@@ -1448,9 +1443,6 @@ UINT WINAPI PoSetPowerState( PDEVICE_OBJECT DeviceObject,
 {
     TRACE("%p %u %u\n", DeviceObject, Type, State.DeviceState);
     return State.DeviceState;
-=======
-    FIXME( "stub: %p\n", SpinLock );
->>>>>>> 254f60b985de89a2bd4f5a5aa94aa569684d6732:dlls/ntoskrnl.exe/ntoskrnl.c
 }
 
 
-- 
1.6.0.2.GIT