- Fix WmiFireEvent Guid type.

- Define WINSOCK_API_LINKAGE in ws2_32
- Remove winsock.h inclusion from ws2_32/misc/async.c

svn path=/branches/header-work/; revision=46793

diff --git a/dll/win32/ws2_32/misc/async.c b/dll/win32/ws2_32/misc/async.c
index a130e7a..d8d3701 100644 (file)
--- a/dll/win32/ws2_32/misc/async.c
+++ b/dll/win32/ws2_32/misc/async.c
@@ -34,7 +34,6 @@
  */
 
 #include <windows.h>
  */
 
 #include <windows.h>

-#include <winsock.h>

 
 #define WS_FD_SETSIZE FD_SETSIZE
 #define HAVE_GETPROTOBYNAME
 
 #define WS_FD_SETSIZE FD_SETSIZE
 #define HAVE_GETPROTOBYNAME

diff --git a/dll/win32/ws2_32/ws2_32.rbuild b/dll/win32/ws2_32/ws2_32.rbuild
index f23493b..912b339 100644 (file)
--- a/dll/win32/ws2_32/ws2_32.rbuild
+++ b/dll/win32/ws2_32/ws2_32.rbuild
@@ -3,6 +3,7 @@
        <include base="ws2_32">include</include>
        <include base="ReactOS">include/reactos/wine</include>
        <define name="LE" />
        <include base="ws2_32">include</include>
        <include base="ReactOS">include/reactos/wine</include>
        <define name="LE" />

+       <define name="WINSOCK_API_LINKAGE">DECLSPEC_EXPORT</define>

        <library>wine</library>
        <library>ntdll</library>
        <library>user32</library>
        <library>wine</library>
        <library>ntdll</library>
        <library>user32</library>

diff --git a/drivers/wmi/wmilib.c b/drivers/wmi/wmilib.c
index 69938ac..c6cec4a 100644 (file)
--- a/drivers/wmi/wmilib.c
+++ b/drivers/wmi/wmilib.c
@@ -34,7 +34,7 @@ WmiCompleteRequest(IN PDEVICE_OBJECT DeviceObject,
 NTSTATUS
 NTAPI
 WmiFireEvent(IN PDEVICE_OBJECT DeviceObject,
 NTSTATUS
 NTAPI
 WmiFireEvent(IN PDEVICE_OBJECT DeviceObject,

-             IN LPGUID Guid,
+             IN LPCGUID Guid,

              IN ULONG InstanceIndex,
              IN ULONG EventDataSize,
              IN PVOID EventData)
              IN ULONG InstanceIndex,
              IN ULONG EventDataSize,
              IN PVOID EventData)