From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Thu, 24 Apr 2014 15:49:21 +0000 (+0000)
Subject: [WMI]
X-Git-Tag: backups/0.3.17@66124~1546
X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=d61a213f6681ab8b127fe0b1410effa15b78d5c1

[WMI]
* Sync with Wine 1.7.17.
CORE-8080

svn path=/trunk/; revision=62950
---

diff --git a/reactos/dll/win32/wmi/wmi.spec b/reactos/dll/win32/wmi/wmi.spec
index b795d26cbc3..4291d4d910e 100644
--- a/reactos/dll/win32/wmi/wmi.spec
+++ b/reactos/dll/win32/wmi/wmi.spec
@@ -1,13 +1,13 @@
-@ stdcall CloseTrace(long) advapi32.CloseTrace
-@ stdcall ControlTraceA(long long ptr long) advapi32.ControlTraceA
-@ stdcall ControlTraceW(long long ptr long) advapi32.ControlTraceW
+@ stdcall CloseTrace(int64) advapi32.CloseTrace
+@ stdcall ControlTraceA(int64 str ptr long) advapi32.ControlTraceA
+@ stdcall ControlTraceW(int64 wstr ptr long) advapi32.ControlTraceW
 @ stdcall CreateTraceInstanceId(long ptr) advapi32.CreateTraceInstanceId
-@ stdcall EnableTrace(long long long ptr long) advapi32.EnableTrace
-@ stdcall GetTraceEnableFlags(long) advapi32.GetTraceEnableFlags
-@ stdcall GetTraceEnableLevel(long) advapi32.GetTraceEnableLevel
-@ stdcall GetTraceLoggerHandle(ptr) advapi32.GetTraceLoggerHandle
-@ stdcall OpenTraceA(ptr) advapi32.OpenTraceA
-@ stdcall OpenTraceW(ptr) advapi32.OpenTraceW
+@ stdcall EnableTrace(long long long ptr int64) advapi32.EnableTrace
+@ stdcall GetTraceEnableFlags(int64) advapi32.GetTraceEnableFlags
+@ stdcall GetTraceEnableLevel(int64) advapi32.GetTraceEnableLevel
+@ stdcall -ret64 GetTraceLoggerHandle(ptr) advapi32.GetTraceLoggerHandle
+@ stdcall -ret64 OpenTraceA(ptr) advapi32.OpenTraceA
+@ stdcall -ret64 OpenTraceW(ptr) advapi32.OpenTraceW
 @ stdcall ProcessTrace(ptr long ptr ptr) advapi32.ProcessTrace
 @ stdcall QueryAllTracesA(ptr long ptr) advapi32.QueryAllTracesA
 @ stdcall QueryAllTracesW(ptr long ptr) advapi32.QueryAllTracesW
@@ -17,9 +17,9 @@
 @ stdcall SetTraceCallback(ptr ptr) advapi32.SetTraceCallback
 @ stdcall StartTraceA(ptr str ptr) advapi32.StartTraceA
 @ stdcall StartTraceW(ptr wstr ptr) advapi32.StartTraceW
-@ stdcall TraceEvent(long ptr) advapi32.TraceEvent
-@ stdcall TraceEventInstance(long ptr ptr ptr) advapi32.TraceEventInstance
-@ stdcall UnregisterTraceGuids(long) advapi32.UnregisterTraceGuids
+@ stdcall TraceEvent(int64 ptr) advapi32.TraceEvent
+@ stdcall TraceEventInstance(int64 ptr ptr ptr) advapi32.TraceEventInstance
+@ stdcall UnregisterTraceGuids(int64) advapi32.UnregisterTraceGuids
 @ stdcall WmiCloseBlock() advapi32.WmiCloseBlock
 @ stdcall WmiDevInstToInstanceNameA() advapi32.WmiDevInstToInstanceNameA
 @ stdcall WmiDevInstToInstanceNameW() advapi32.WmiDevInstToInstanceNameW
diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE
index 74df6699cd7..f3e07dd7c0d 100644
--- a/reactos/media/doc/README.WINE
+++ b/reactos/media/doc/README.WINE
@@ -214,7 +214,7 @@ reactos/dll/win32/winmm/midimap       # Forked at Wine-20050628
 reactos/dll/win32/winmm/wavemap       # Forked at Wine-20050628
 reactos/dll/win32/wintrust            # Synced to Wine-1.7.17
 reactos/dll/win32/wldap32             # Synced to Wine-1.7.1
-reactos/dll/win32/wmi                 # Synced to Wine-1.7.1
+reactos/dll/win32/wmi                 # Synced to Wine-1.7.17
 reactos/dll/win32/wtsapi32            # Synced to Wine-1.7.1
 reactos/dll/win32/wuapi               # Synced to Wine-1.7.1
 reactos/dll/win32/xinput1_1           # Synced to Wine-1.7.1