system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-07-20 19:54:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

oleaut32/tests: Fix vartest tests compilation with __WINESRC__ defined.

Browse source
This commit is contained in:
André Hentschel 2013-10-24 23:34:22 +02:00 committed by Alexandre Julliard
parent 03f627096e
commit ca469de656
2 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
dlls/oleaut32/tests/Makefile.in
View file

@ -1,6 +1,5 @@
TESTDLL = oleaut32.dll
IMPORTS = oleaut32 ole32 rpcrt4 user32 gdi32 advapi32
EXTRADEFS = -U__WINESRC__ -DWINE_STRICT_PROTOTYPES -DWINE_NO_NAMELESS_EXTENSION -DWIDL_C_INLINE_WRAPPERS
C_SRCS = \
dispatch.c \

12
dlls/oleaut32/tests/vartest.c
View file

@ -28,7 +28,7 @@
#include "windef.h"
#include "winbase.h"
#include "winsock.h"
#include "winsock2.h"
#include "wine/test.h"
#include "winuser.h"
#include "wingdi.h"
@ -116,7 +116,7 @@ static void init(void)
if (bstr) memcpy(&sz12_false[2], bstr, SysStringByteLen(bstr) + sizeof(WCHAR));
SysFreeString(bstr);
hOleaut32 = GetModuleHandle("oleaut32.dll");
hOleaut32 = GetModuleHandleA("oleaut32.dll");
has_i8 = GetProcAddress(hOleaut32, "VarI8FromI1") != NULL;
if (!has_i8)
skip("No support for I8 and UI8 data types\n");
@ -5366,7 +5366,7 @@ static void test_VarCat(void)
static const WCHAR sz12_date[] = {'1','2','9','/','3','0','/','1','9','8','0','\0'};
static const WCHAR sz12_date_broken[] = {'1','2','9','/','3','0','/','8','0','\0'};
static const WCHAR sz_empty[] = {'\0'};
TCHAR orig_date_format[128];
CHAR orig_date_format[128];
VARTYPE leftvt, rightvt, resultvt;
HRESULT hres;
HRESULT expected_error_num;
@ -5375,8 +5375,8 @@ static void test_VarCat(void)
/* Set date format for testing */
lcid = LOCALE_USER_DEFAULT;
GetLocaleInfo(lcid,LOCALE_SSHORTDATE,orig_date_format,128);
SetLocaleInfo(lcid,LOCALE_SSHORTDATE,"M/d/yyyy");
GetLocaleInfoA(lcid,LOCALE_SSHORTDATE,orig_date_format,128);
SetLocaleInfoA(lcid,LOCALE_SSHORTDATE,"M/d/yyyy");
VariantInit(&left);
VariantInit(&right);
@ -5697,7 +5697,7 @@ static void test_VarCat(void)
"VarCat: EMPTY concat with EMPTY did not return empty VT_BSTR\n");
/* Restore original date format settings */
SetLocaleInfo(lcid,LOCALE_SSHORTDATE,orig_date_format);
SetLocaleInfoA(lcid,LOCALE_SSHORTDATE,orig_date_format);
VariantClear(&left);
VariantClear(&right);