Hans Leidekker : mscms/tests: Compile with -D__WINESRC__.
Alexandre Julliard
julliard at winehq.org
Mon Oct 14 12:39:28 CDT 2013
Module: wine
Branch: master
Commit: fcd4527ea998b4b8b6823c6e0a29e5707d555b35
URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcd4527ea998b4b8b6823c6e0a29e5707d555b35
Author: Hans Leidekker <hans at codeweavers.com>
Date: Mon Oct 14 10:24:38 2013 +0200
mscms/tests: Compile with -D__WINESRC__.
---
dlls/mscms/tests/Makefile.in | 1 -
dlls/mscms/tests/profile.c | 13 ++++++-------
2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/dlls/mscms/tests/Makefile.in b/dlls/mscms/tests/Makefile.in
index 9387a1a..b73061f 100644
--- a/dlls/mscms/tests/Makefile.in
+++ b/dlls/mscms/tests/Makefile.in
@@ -1,6 +1,5 @@
TESTDLL = mscms.dll
IMPORTS = advapi32
-EXTRADEFS = -U__WINESRC__ -DWINE_STRICT_PROTOTYPES -DWINE_NO_NAMELESS_EXTENSION -DWIDL_C_INLINE_WRAPPERS
C_SRCS = \
profile.c
diff --git a/dlls/mscms/tests/profile.c b/dlls/mscms/tests/profile.c
index 337b67a..cfaf2ba 100644
--- a/dlls/mscms/tests/profile.c
+++ b/dlls/mscms/tests/profile.c
@@ -59,7 +59,7 @@ static BOOL (WINAPI *pSetStandardColorSpaceProfileW)(PCWSTR,DWORD,PWSTR);
static BOOL (WINAPI *pUninstallColorProfileA)(PCSTR,PCSTR,BOOL);
static BOOL (WINAPI *pUninstallColorProfileW)(PCWSTR,PCWSTR,BOOL);
-static BOOL (WINAPI *pEnumDisplayDevicesA)(LPCSTR,DWORD,PDISPLAY_DEVICE,DWORD);
+static BOOL (WINAPI *pEnumDisplayDevicesA)(LPCSTR,DWORD,PDISPLAY_DEVICEA,DWORD);
#define GETFUNCPTR(func) p##func = (void *)GetProcAddress( hmscms, #func ); \
if (!p##func) return FALSE;
@@ -1244,17 +1244,16 @@ static void test_AssociateColorProfileWithDeviceA( char *testprofile )
BOOL ret;
char profile[MAX_PATH], basename[MAX_PATH];
DWORD error, size = sizeof(profile);
- DISPLAY_DEVICE display;
+ DISPLAY_DEVICEA display, monitor;
BOOL res;
- DISPLAY_DEVICE monitor;
if (testprofile && pEnumDisplayDevicesA)
{
- display.cb = sizeof( DISPLAY_DEVICE );
+ display.cb = sizeof( DISPLAY_DEVICEA );
res = pEnumDisplayDevicesA( NULL, 0, &display, 0 );
ok( res, "Can't get display info\n" );
- monitor.cb = sizeof( DISPLAY_DEVICE );
+ monitor.cb = sizeof( DISPLAY_DEVICEA );
res = pEnumDisplayDevicesA( display.DeviceName, 0, &monitor, 0 );
if (res)
{
@@ -1379,9 +1378,9 @@ START_TEST(profile)
}
/* If found, create a temporary copy for testing purposes */
- if (standardprofile && GetTempPath( sizeof(path), path ))
+ if (standardprofile && GetTempPathA( sizeof(path), path ))
{
- if (GetTempFileName( path, "rgb", 0, file ))
+ if (GetTempFileNameA( path, "rgb", 0, file ))
{
if (CopyFileA( standardprofile, file, FALSE ))
{
More information about the wine-cvs
mailing list