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

shell32/tests: Use nameless unions. 

Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Jacek Caban 2021-03-24 18:38:07 +01:00 committed by Alexandre Julliard
parent b9a8437d52
commit 4e05e6d67e
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/shell32/tests/Makefile.in
View File

@ -1,6 +1,5 @@
TESTDLL = shell32.dll TESTDLL = shell32.dll
IMPORTS = shell32 ole32 oleaut32 user32 gdi32 advapi32 shlwapi IMPORTS = shell32 ole32 oleaut32 user32 gdi32 advapi32 shlwapi
EXTRADEFS = -DWINE_NO_NAMELESS_EXTENSION
C_SRCS = \ C_SRCS = \
appbar.c \ appbar.c \

12
dlls/shell32/tests/shellole.c
View File

@ -120,7 +120,7 @@ static HRESULT WINAPI PropertyStorage_ReadMultiple(IPropertyStorage *This, ULONG
ok(rgpspec[0].u.propid == PID_CODEPAGE, "rgpspec[0].propid = %d\n", rgpspec[0].u.propid); ok(rgpspec[0].u.propid == PID_CODEPAGE, "rgpspec[0].propid = %d\n", rgpspec[0].u.propid);
rgpropvar[0].vt = VT_I2; rgpropvar[0].vt = VT_I2;
rgpropvar[0].u.iVal = 1234; rgpropvar[0].iVal = 1234;
} else { } else {
CHECK_EXPECT(ReadMultiple); CHECK_EXPECT(ReadMultiple);
@ -131,13 +131,13 @@ static HRESULT WINAPI PropertyStorage_ReadMultiple(IPropertyStorage *This, ULONG
ok(rgpropvar[0].vt==0 || broken(rgpropvar[0].vt==VT_BSTR), "rgpropvar[0].vt = %d\n", rgpropvar[0].vt); ok(rgpropvar[0].vt==0 || broken(rgpropvar[0].vt==VT_BSTR), "rgpropvar[0].vt = %d\n", rgpropvar[0].vt);
rgpropvar[0].vt = VT_BSTR; rgpropvar[0].vt = VT_BSTR;
rgpropvar[0].u.bstrVal = (void*)0xdeadbeef; rgpropvar[0].bstrVal = (void*)0xdeadbeef;
rgpropvar[1].vt = VT_LPSTR; rgpropvar[1].vt = VT_LPSTR;
rgpropvar[1].u.pszVal = (void*)0xdeadbeef; rgpropvar[1].pszVal = (void*)0xdeadbeef;
rgpropvar[2].vt = VT_BYREF|VT_I1; rgpropvar[2].vt = VT_BYREF|VT_I1;
rgpropvar[2].u.pcVal = (void*)0xdeadbeef; rgpropvar[2].pcVal = (void*)0xdeadbeef;
rgpropvar[3].vt = VT_BYREF|VT_VARIANT; rgpropvar[3].vt = VT_BYREF|VT_VARIANT;
rgpropvar[3].u.pvarVal = (void*)0xdeadbeef; rgpropvar[3].pvarVal = (void*)0xdeadbeef;
} }
return S_OK; return S_OK;
@ -420,7 +420,7 @@ static void test_SHPropStg_functions(void)
CHECK_CALLED(WriteMultiple); CHECK_CALLED(WriteMultiple);
read[0].vt = VT_BSTR; read[0].vt = VT_BSTR;
read[0].u.bstrVal = (void*)0xdeadbeef; read[0].bstrVal = (void*)0xdeadbeef;
SET_EXPECT(ReadMultiple); SET_EXPECT(ReadMultiple);
SET_EXPECT(ReadMultipleCodePage); SET_EXPECT(ReadMultipleCodePage);
SET_EXPECT(Stat); SET_EXPECT(Stat);