=?UTF-8?Q?Andr=C3=A9=20Hentschel=20?=: oleaut32/tests: Fix typelib tests compilation with __WINESRC__ defined.
Alexandre Julliard
julliard at winehq.org
Mon Oct 28 15:13:03 CDT 2013
Module: wine
Branch: master
Commit: 611ad497e728e71c6051e98c1a46780a79001740
URL: http://source.winehq.org/git/wine.git/?a=commit;h=611ad497e728e71c6051e98c1a46780a79001740
Author: André Hentschel <nerv at dawncrow.de>
Date: Thu Oct 24 23:28:42 2013 +0200
oleaut32/tests: Fix typelib tests compilation with __WINESRC__ defined.
---
dlls/oleaut32/tests/typelib.c | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c
index 613a27d..9397fe3 100644
--- a/dlls/oleaut32/tests/typelib.c
+++ b/dlls/oleaut32/tests/typelib.c
@@ -44,7 +44,7 @@
{ \
CHAR buf[260]; \
expect_eq(!WideCharToMultiByte(CP_ACP, 0, (expr), -1, buf, 260, NULL, NULL), 0, int, "%d"); \
- ok(lstrcmp(value, buf) == 0, #expr " expected \"%s\" got \"%s\"\n", value, buf); \
+ ok(strcmp(value, buf) == 0, #expr " expected \"%s\" got \"%s\"\n", value, buf); \
}
#define ole_expect(expr, expect) { \
@@ -628,14 +628,14 @@ static void write_typelib(int res_no, const char *filename)
HRSRC res;
void *ptr;
- file = CreateFile( filename, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0 );
+ file = CreateFileA( filename, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0 );
ok( file != INVALID_HANDLE_VALUE, "file creation failed\n" );
if (file == INVALID_HANDLE_VALUE) return;
- res = FindResource( GetModuleHandle(0), MAKEINTRESOURCE(res_no), "TYPELIB" );
+ res = FindResourceA( GetModuleHandleA(NULL), (LPCSTR)MAKEINTRESOURCE(res_no), "TYPELIB" );
ok( res != 0, "couldn't find resource\n" );
- ptr = LockResource( LoadResource( GetModuleHandle(0), res ));
- WriteFile( file, ptr, SizeofResource( GetModuleHandle(0), res ), &written, NULL );
- ok( written == SizeofResource( GetModuleHandle(0), res ), "couldn't write resource\n" );
+ ptr = LockResource( LoadResource( GetModuleHandleA(NULL), res ));
+ WriteFile( file, ptr, SizeofResource( GetModuleHandleA(NULL), res ), &written, NULL );
+ ok( written == SizeofResource( GetModuleHandleA(NULL), res ), "couldn't write resource\n" );
CloseHandle( file );
}
@@ -5221,7 +5221,7 @@ START_TEST(typelib)
if ((filename = create_test_typelib(2)))
{
test_dump_typelib( filename );
- DeleteFile( filename );
+ DeleteFileA( filename );
}
test_register_typelib(TRUE);
More information about the wine-cvs
mailing list