Francois Gouget : shell32/tests: Don'
t use the NONAMELESS* macros in the tests.
Alexandre Julliard
julliard at wine.codeweavers.com
Fri Nov 24 06:19:09 CST 2006
Module: wine
Branch: master
Commit: 144995b5a545731219d64900338df0e694bb0d43
URL: http://source.winehq.org/git/wine.git/?a=commit;h=144995b5a545731219d64900338df0e694bb0d43
Author: Francois Gouget <fgouget at free.fr>
Date: Thu Nov 23 21:35:32 2006 +0100
shell32/tests: Don't use the NONAMELESS* macros in the tests.
---
dlls/shell32/tests/string.c | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/dlls/shell32/tests/string.c b/dlls/shell32/tests/string.c
index 1481ace..acd3101 100644
--- a/dlls/shell32/tests/string.c
+++ b/dlls/shell32/tests/string.c
@@ -21,8 +21,6 @@
#include <stdarg.h>
#include <stdio.h>
-#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
#define WINE_NOWINSOCK
#include "windef.h"
#include "winbase.h"
@@ -67,21 +65,21 @@ static void test_StrRetToStringNW(void)
trace("StrRetToStringNAW is Unicode\n");
strret.uType = STRRET_WSTR;
- strret.u.pOleStr = CoDupStrW("Test");
+ U(strret).pOleStr = CoDupStrW("Test");
memset(buff, 0xff, sizeof(buff));
ret = pStrRetToStrNAW(buff, sizeof(buff)/sizeof(WCHAR), &strret, NULL);
ok(ret == TRUE && !strcmpW(buff, szTestW),
"STRRET_WSTR: dup failed, ret=%d\n", ret);
strret.uType = STRRET_CSTR;
- lstrcpyA(strret.u.cStr, "Test");
+ lstrcpyA(U(strret).cStr, "Test");
memset(buff, 0xff, sizeof(buff));
ret = pStrRetToStrNAW(buff, sizeof(buff)/sizeof(WCHAR), &strret, NULL);
ok(ret == TRUE && !strcmpW(buff, szTestW),
"STRRET_CSTR: dup failed, ret=%d\n", ret);
strret.uType = STRRET_OFFSET;
- strret.u.uOffset = 1;
+ U(strret).uOffset = 1;
strcpy((char*)&iidl, " Test");
memset(buff, 0xff, sizeof(buff));
ret = pStrRetToStrNAW(buff, sizeof(buff)/sizeof(WCHAR), &strret, iidl);
@@ -92,7 +90,7 @@ static void test_StrRetToStringNW(void)
#if 0
/* Invalid dest - should return FALSE, except NT4 does not, so we don't check. */
strret.uType = STRRET_WSTR;
- strret.u.pOleStr = CoDupStrW("Test");
+ U(strret).pOleStr = CoDupStrW("Test");
pStrRetToStrNAW(NULL, sizeof(buff)/sizeof(WCHAR), &strret, NULL);
trace("NULL dest: ret=%d\n", ret);
#endif
More information about the wine-cvs
mailing list