marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
oldstable
Francois Gouget 2011-12-15 10:09:39 +01:00 committed by Alexandre Julliard
parent 3fe2d6e5fd
commit 3c3a4740ca
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dlls/ole32/tests/ole2.c
View File

@ -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);
}

1
dlls/urlmon/tests/uri.c
View File

@ -24,6 +24,7 @@
#define COBJMACROS
#define CONST_VTABLE
#define WIN32_LEAN_AND_MEAN
#include "windef.h"
#include "winbase.h"

4
include/windows.h
View File

@ -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