include: Add a couple of missing include directives in windows.h.

Rename a variable to avoid a conflict with the Unknown enumeration value. Define WIN32_LEAN_AND_MEAN to avoid conflicts caused by the SetPort macro.

include: Add a couple of missing include directives in windows.h.
3c3a4740 · Francois Gouget · Alexandre Julliard · 3fe2d6e5 · 3c3a4740 · 3c3a4740
Commit 3c3a4740 authored Dec 15, 2011 by Francois Gouget Committed by Alexandre Julliard Dec 15, 2011
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 4 deletions

ole2.c dlls/ole32/tests/ole2.c +3 -2

uri.c dlls/urlmon/tests/uri.c +1 -0

windows.h include/windows.h +2 -2

No files found.
--- a/dlls/ole32/tests/ole2.c
+++ b/dlls/ole32/tests/ole2.c
@@ -20,6 +20,7 @@
 #define COBJMACROS
 #define CONST_VTABLE
+#define WIN32_LEAN_AND_MEAN
 #include <stdarg.h>
@@ -1841,13 +1842,13 @@ static const IUnknownVtbl UnknownVtbl =
    Unknown_Release
 };
-static IUnknown Unknown = { &UnknownVtbl };
+static IUnknown unknown = { &UnknownVtbl };
 static void test_OleLockRunning(void)
 {
    HRESULT hr;
-    hr = OleLockRunning((LPUNKNOWN)&Unknown, TRUE, FALSE);
+    hr = OleLockRunning((LPUNKNOWN)&unknown, TRUE, FALSE);
    ok(hr == S_OK, "OleLockRunning failed 0x%08x\n", hr);
 }

--- a/dlls/urlmon/tests/uri.c
+++ b/dlls/urlmon/tests/uri.c
@@ -24,6 +24,7 @@
 #define COBJMACROS
 #define CONST_VTABLE
+#define WIN32_LEAN_AND_MEAN
 #include "windef.h"
 #include "winbase.h"

--- a/include/windows.h
+++ b/include/windows.h
@@ -60,7 +60,7 @@
 #include <nb30.h>
 #include <rpc.h>
 #include <shellapi.h>
-/* #include <winperf.h> */
+#include <winperf.h>
 #ifndef WINE_NOWINSOCK
 #include <winsock.h>
@@ -69,7 +69,7 @@
 #ifndef NOCRYPT
 #include <wincrypt.h>
 /* #include <winefs.h> */
-/* #include <winscard.h> */
+#include <winscard.h>
 #endif /* !NOCRYPT */
 #ifndef NOGDI