ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

shell32/tests: Don't use the NONAMELESS* macros in the tests.

This commit is contained in:
Francois Gouget 2006-11-23 21:35:32 +01:00 committed by Alexandre Julliard
parent 73c6275e94
commit 144995b5a5
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dlls/shell32/tests/string.c
View File

@ -21,8 +21,6 @@
#include <stdarg.h> #include <stdarg.h>
#include <stdio.h> #include <stdio.h>
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
#define WINE_NOWINSOCK #define WINE_NOWINSOCK
#include "windef.h" #include "windef.h"
#include "winbase.h" #include "winbase.h"
@ -67,21 +65,21 @@ static void test_StrRetToStringNW(void)
trace("StrRetToStringNAW is Unicode\n"); trace("StrRetToStringNAW is Unicode\n");
strret.uType = STRRET_WSTR; strret.uType = STRRET_WSTR;
strret.u.pOleStr = CoDupStrW("Test"); U(strret).pOleStr = CoDupStrW("Test");
memset(buff, 0xff, sizeof(buff)); memset(buff, 0xff, sizeof(buff));
ret = pStrRetToStrNAW(buff, sizeof(buff)/sizeof(WCHAR), &strret, NULL); ret = pStrRetToStrNAW(buff, sizeof(buff)/sizeof(WCHAR), &strret, NULL);
ok(ret == TRUE && !strcmpW(buff, szTestW), ok(ret == TRUE && !strcmpW(buff, szTestW),
"STRRET_WSTR: dup failed, ret=%d\n", ret); "STRRET_WSTR: dup failed, ret=%d\n", ret);
strret.uType = STRRET_CSTR; strret.uType = STRRET_CSTR;
lstrcpyA(strret.u.cStr, "Test"); lstrcpyA(U(strret).cStr, "Test");
memset(buff, 0xff, sizeof(buff)); memset(buff, 0xff, sizeof(buff));
ret = pStrRetToStrNAW(buff, sizeof(buff)/sizeof(WCHAR), &strret, NULL); ret = pStrRetToStrNAW(buff, sizeof(buff)/sizeof(WCHAR), &strret, NULL);
ok(ret == TRUE && !strcmpW(buff, szTestW), ok(ret == TRUE && !strcmpW(buff, szTestW),
"STRRET_CSTR: dup failed, ret=%d\n", ret); "STRRET_CSTR: dup failed, ret=%d\n", ret);
strret.uType = STRRET_OFFSET; strret.uType = STRRET_OFFSET;
strret.u.uOffset = 1; U(strret).uOffset = 1;
strcpy((char*)&iidl, " Test"); strcpy((char*)&iidl, " Test");
memset(buff, 0xff, sizeof(buff)); memset(buff, 0xff, sizeof(buff));
ret = pStrRetToStrNAW(buff, sizeof(buff)/sizeof(WCHAR), &strret, iidl); ret = pStrRetToStrNAW(buff, sizeof(buff)/sizeof(WCHAR), &strret, iidl);
@ -92,7 +90,7 @@ static void test_StrRetToStringNW(void)
#if 0 #if 0
/* Invalid dest - should return FALSE, except NT4 does not, so we don't check. */ /* Invalid dest - should return FALSE, except NT4 does not, so we don't check. */
strret.uType = STRRET_WSTR; strret.uType = STRRET_WSTR;
strret.u.pOleStr = CoDupStrW("Test"); U(strret).pOleStr = CoDupStrW("Test");
pStrRetToStrNAW(NULL, sizeof(buff)/sizeof(WCHAR), &strret, NULL); pStrRetToStrNAW(NULL, sizeof(buff)/sizeof(WCHAR), &strret, NULL);
trace("NULL dest: ret=%d\n", ret); trace("NULL dest: ret=%d\n", ret);
#endif #endif