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

[Alexander Morozov]

В результате этого мерджа было удалено кое-что нужное:

commit f496cd94bea342a598b74b9f29712ad3104b653b
Merge: 4885f87... c5d5a64...
Author: Vitaly Lipatov <lav на etersoft.ru>
Date:   Fri Feb 13 19:08:13 2009 +0300

    Merge commit 'eterwine/master' into eterhack

    Conflicts:
        VERSION
        configure
        dlls/comctl32/listview.c
        dlls/comctl32/toolbar.c
        dlls/ntoskrnl.exe/ntoskrnl.c
        dlls/user32/edit.c
----------- следующая часть -----------
From f8350487dad78c83d08afb27ce17d6105fc8e4a0 Mon Sep 17 00:00:00 2001
From: Alexander Morozov <amorozov на etersoft.ru>
Date: Fri, 27 Feb 2009 14:02:25 +0300
Subject: [PATCH] ntoskrnl.exe: Fixed merge error.

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

diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c
index 575a909..927a6cf 100644
--- a/dlls/ntoskrnl.exe/ntoskrnl.c
+++ b/dlls/ntoskrnl.exe/ntoskrnl.c
@@ -2352,6 +2352,8 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved )
 {
     static void *handler;
     LARGE_INTEGER count;
+    struct DriverObjExtension *ext, *ext2;
+    struct InterfaceInstance *intf, *intf2;
 
     switch(reason)
     {
@@ -2362,7 +2364,23 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved )
         InitializeCriticalSection( &cs );
         break;
     case DLL_PROCESS_DETACH:
+        DeleteCriticalSection( &cs );
         RtlRemoveVectoredExceptionHandler( handler );
+        LIST_FOR_EACH_ENTRY_SAFE( ext, ext2, &DriverObjExtensions,
+                struct DriverObjExtension, entry )
+        {
+            list_remove( &ext->entry );
+            ExFreePool( ext->ptr );
+            ExFreePool( ext );
+        }
+        LIST_FOR_EACH_ENTRY_SAFE( intf, intf2, &Interfaces,
+                struct InterfaceInstance, entry )
+        {
+            list_remove( &intf->entry );
+            RtlFreeUnicodeString( &intf->target );
+            RtlFreeHeap( GetProcessHeap(), 0, intf->link );
+            RtlFreeHeap( GetProcessHeap(), 0, intf );
+        }
         break;
     }
     return TRUE;
-- 
1.6.1.3.GIT