Mikołaj Zalewski : shlwapi/tests: Make the string. c tests compile in Visual C++.
Alexandre Julliard
julliard at wine.codeweavers.com
Mon Oct 23 10:01:42 CDT 2006
Module: wine
Branch: master
Commit: bd35b0a12245ddf1745324e4a75bd61d0ce560b6
URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd35b0a12245ddf1745324e4a75bd61d0ce560b6
Author: Mikołaj Zalewski <mikolaj at zalewski.pl>
Date: Sun Oct 22 19:37:42 2006 +0200
shlwapi/tests: Make the string.c tests compile in Visual C++.
---
dlls/shlwapi/tests/string.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/dlls/shlwapi/tests/string.c b/dlls/shlwapi/tests/string.c
index 733d8dc..b6dc9d3 100644
--- a/dlls/shlwapi/tests/string.c
+++ b/dlls/shlwapi/tests/string.c
@@ -43,7 +43,7 @@ static BOOL (WINAPI *pIntlStrEqWorker
static BOOL (WINAPI *pStrIsIntlEqualW)(BOOL,LPCWSTR,LPCWSTR,int);
static BOOL (WINAPI *pIntlStrEqWorkerW)(BOOL,LPCWSTR,LPCWSTR,int);
-static inline int strcmpW(const WCHAR *str1, const WCHAR *str2)
+static int strcmpW(const WCHAR *str1, const WCHAR *str2)
{
while (*str1 && (*str1 == *str2)) { str1++; str2++; }
return *str1 - *str2;
@@ -619,7 +619,7 @@ static void test_StrRetToBSTR(void)
if (!pStrRetToBSTR) return;
strret.uType = STRRET_WSTR;
- strret.u.pOleStr = CoDupStrW("Test");
+ U(strret).pOleStr = CoDupStrW("Test");
bstr = 0;
ret = pStrRetToBSTR(&strret, NULL, &bstr);
ok(ret == S_OK && bstr && !strcmpW(bstr, szTestW),
@@ -628,7 +628,7 @@ static void test_StrRetToBSTR(void)
SysFreeString(bstr);
strret.uType = STRRET_CSTR;
- lstrcpyA(strret.u.cStr, "Test");
+ lstrcpyA(U(strret).cStr, "Test");
ret = pStrRetToBSTR(&strret, NULL, &bstr);
ok(ret == S_OK && bstr && !strcmpW(bstr, szTestW),
"STRRET_CSTR: dup failed, ret=0x%08x, bstr %p\n", ret, bstr);
@@ -636,7 +636,7 @@ static void test_StrRetToBSTR(void)
SysFreeString(bstr);
strret.uType = STRRET_OFFSET;
- strret.u.uOffset = 1;
+ U(strret).uOffset = 1;
strcpy((char*)&iidl, " Test");
ret = pStrRetToBSTR(&strret, iidl, &bstr);
ok(ret == S_OK && bstr && !strcmpW(bstr, szTestW),
More information about the wine-cvs
mailing list