[KERNEL32_VISTA] Export InitializeCriticalSectionEx.

diff --git a/dll/apisets/api-ms-win-core-synch-l1-1-0.spec b/dll/apisets/api-ms-win-core-synch-l1-1-0.spec
index ab22da2..de4c2f4 100644 (file)
--- a/dll/apisets/api-ms-win-core-synch-l1-1-0.spec
+++ b/dll/apisets/api-ms-win-core-synch-l1-1-0.spec
@@ -18,7 +18,7 @@
 @ stdcall EnterCriticalSection() kernel32.EnterCriticalSection
 @ stdcall InitializeCriticalSection() kernel32.InitializeCriticalSection
 @ stdcall InitializeCriticalSectionAndSpinCount() kernel32.InitializeCriticalSectionAndSpinCount
-@ stub InitializeCriticalSectionEx
+@ stdcall InitializeCriticalSectionEx() kernel32_vista.InitializeCriticalSectionEx
 @ stdcall InitializeSRWLock() kernel32_vista.InitializeSRWLock
 @ stdcall LeaveCriticalSection() kernel32.LeaveCriticalSection
 @ stdcall OpenEventA() kernel32.OpenEventA

diff --git a/dll/apisets/api-ms-win-core-synch-l1-2-0.spec b/dll/apisets/api-ms-win-core-synch-l1-2-0.spec
index 78f9a61..778abd9 100644 (file)
--- a/dll/apisets/api-ms-win-core-synch-l1-2-0.spec
+++ b/dll/apisets/api-ms-win-core-synch-l1-2-0.spec
@@ -25,7 +25,7 @@
 @ stdcall InitializeConditionVariable() kernel32_vista.InitializeConditionVariable
 @ stdcall InitializeCriticalSection() kernel32.InitializeCriticalSection
 @ stdcall InitializeCriticalSectionAndSpinCount() kernel32.InitializeCriticalSectionAndSpinCount
-@ stub InitializeCriticalSectionEx
+@ stdcall InitializeCriticalSectionEx() kernel32_vista.InitializeCriticalSectionEx
 @ stdcall InitializeSRWLock() kernel32_vista.InitializeSRWLock
 @ stub InitializeSynchronizationBarrier
 @ stdcall LeaveCriticalSection() kernel32.LeaveCriticalSection

diff --git a/dll/apisets/api-ms-win-core-synch-l1-2-1.spec b/dll/apisets/api-ms-win-core-synch-l1-2-1.spec
index 37270fd..d147b86 100644 (file)
--- a/dll/apisets/api-ms-win-core-synch-l1-2-1.spec
+++ b/dll/apisets/api-ms-win-core-synch-l1-2-1.spec
@@ -23,7 +23,7 @@
 @ stdcall InitializeConditionVariable() kernel32_vista.InitializeConditionVariable
 @ stdcall InitializeCriticalSection() kernel32.InitializeCriticalSection
 @ stdcall InitializeCriticalSectionAndSpinCount() kernel32.InitializeCriticalSectionAndSpinCount
-@ stub InitializeCriticalSectionEx
+@ stdcall InitializeCriticalSectionEx() kernel32_vista.InitializeCriticalSectionEx
 @ stdcall InitializeSRWLock() kernel32_vista.InitializeSRWLock
 @ stub InitializeSynchronizationBarrier
 @ stub InitOnceBeginInitialize

diff --git a/dll/win32/kernel32_vista/k32_vista.h b/dll/win32/kernel32_vista/k32_vista.h
index 45c8bfe..fff9ba8 100644 (file)
--- a/dll/win32/kernel32_vista/k32_vista.h
+++ b/dll/win32/kernel32_vista/k32_vista.h
@@ -8,4 +8,5 @@
 
 #include <ndk/kefuncs.h>
 #include <ndk/psfuncs.h>
+#include <ndk/rtlfuncs.h>
 

diff --git a/dll/win32/kernel32_vista/kernel32_vista.spec b/dll/win32/kernel32_vista/kernel32_vista.spec
index caa7adc..f61e6e6 100644 (file)
--- a/dll/win32/kernel32_vista/kernel32_vista.spec
+++ b/dll/win32/kernel32_vista/kernel32_vista.spec
@@ -14,3 +14,5 @@
 @ stdcall SleepConditionVariableSRW(ptr ptr long long)
 @ stdcall WakeAllConditionVariable(ptr)
 @ stdcall WakeConditionVariable(ptr)
+
+@ stdcall InitializeCriticalSectionEx(ptr long long)

diff --git a/dll/win32/kernel32_vista/sync.c b/dll/win32/kernel32_vista/sync.c
index a13f984..17d3949 100644 (file)
--- a/dll/win32/kernel32_vista/sync.c
+++ b/dll/win32/kernel32_vista/sync.c
@@ -148,3 +148,31 @@ WakeConditionVariable(PCONDITION_VARIABLE ConditionVariable)
 {
     RtlWakeConditionVariable((PRTL_CONDITION_VARIABLE)ConditionVariable);
 }
+
+
+/*
+* @implemented
+*/
+BOOL WINAPI InitializeCriticalSectionEx(OUT LPCRITICAL_SECTION lpCriticalSection,
+                                        IN DWORD dwSpinCount,
+                                        IN DWORD flags)
+{
+    NTSTATUS Status;
+
+    /* FIXME: Flags ignored */
+
+    /* Initialize the critical section */
+    Status = RtlInitializeCriticalSectionAndSpinCount(
+        (PRTL_CRITICAL_SECTION)lpCriticalSection,
+        dwSpinCount);
+    if (!NT_SUCCESS(Status))
+    {
+        /* Set failure code */
+        SetLastError(RtlNtStatusToDosError(Status));
+        return FALSE;
+    }
+
+    /* Success */
+    return TRUE;
+}
+