- Wine-Commits - list.winehq.org

Alistair Leslie-Hughes : d3d11: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard July 20, 2023

July 20, 2023

Module: wine Branch: master Commit: 8f360d743497dc46eadd11505a75a57e57dd114e URL: https://gitlab.winehq.org/wine/wine/-/commit/8f360d743497dc46eadd11505a75a5… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jul 12 17:41:25 2023 +1000 d3d11: Remove DECLSPEC_HIDDEN usage. --- dlls/d3d11/d3d11_private.h | 174 ++++++++++++++++++++++----------------------- 1 file changed, 87 insertions(+), 87 deletions(-)

1 0

Alistair Leslie-Hughes : ddrawex: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard July 20, 2023

July 20, 2023

Module: wine Branch: master Commit: b9849d2f00a79d1552976bfdfc5f04a785e1ea5d URL: https://gitlab.winehq.org/wine/wine/-/commit/b9849d2f00a79d1552976bfdfc5f04… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jul 12 17:41:25 2023 +1000 ddrawex: Remove DECLSPEC_HIDDEN usage. --- dlls/ddrawex/ddrawex_private.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/ddrawex/ddrawex_private.h b/dlls/ddrawex/ddrawex_private.h index f5adf790c82..f60d3cb4e1b 100644 --- a/dlls/ddrawex/ddrawex_private.h +++ b/dlls/ddrawex/ddrawex_private.h @@ -48,10 +48,10 @@ DECLARE_INTERFACE_(IDirectDrawFactory, IUnknown) HRESULT WINAPI ddrawex_factory_CreateDirectDraw(IDirectDrawFactory *iface, GUID *guid, HWND window, DWORD coop_level, DWORD reserved, IUnknown *outer_unknown, - IDirectDraw **ddraw) DECLSPEC_HIDDEN; + IDirectDraw **ddraw); -void DDSD_to_DDSD2(const DDSURFACEDESC *in, DDSURFACEDESC2 *out) DECLSPEC_HIDDEN; -void DDSD2_to_DDSD(const DDSURFACEDESC2 *in, DDSURFACEDESC *out) DECLSPEC_HIDDEN; +void DDSD_to_DDSD2(const DDSURFACEDESC *in, DDSURFACEDESC2 *out); +void DDSD2_to_DDSD(const DDSURFACEDESC2 *in, DDSURFACEDESC *out); struct ddrawex { @@ -65,8 +65,8 @@ struct ddrawex IDirectDraw4 *parent; }; -IDirectDraw4 *dd_get_outer(IDirectDraw4 *inner) DECLSPEC_HIDDEN; -IDirectDraw4 *dd_get_inner(IDirectDraw4 *outer) DECLSPEC_HIDDEN; +IDirectDraw4 *dd_get_outer(IDirectDraw4 *inner); +IDirectDraw4 *dd_get_inner(IDirectDraw4 *outer); struct ddrawex_surface { @@ -84,8 +84,8 @@ struct ddrawex_surface #define IID_DDrawexPriv IID_IDirectDrawSurface4 }; -struct ddrawex_surface *unsafe_impl_from_IDirectDrawSurface4(IDirectDrawSurface4 *iface) DECLSPEC_HIDDEN; -IDirectDrawSurface4 *dds_get_outer(IDirectDrawSurface4 *inner) DECLSPEC_HIDDEN; -HRESULT prepare_permanent_dc(IDirectDrawSurface4 *iface) DECLSPEC_HIDDEN; +struct ddrawex_surface *unsafe_impl_from_IDirectDrawSurface4(IDirectDrawSurface4 *iface); +IDirectDrawSurface4 *dds_get_outer(IDirectDrawSurface4 *inner); +HRESULT prepare_permanent_dc(IDirectDrawSurface4 *iface); #endif /* __WINE_DLLS_DDRAWEX_DDRAWEX_PRIVATE_H */

1 0

Alexandre Julliard : mfplat/tests: Use nameless unions/structs.
by Alexandre Julliard July 20, 2023

July 20, 2023

Module: wine Branch: master Commit: 75455010e02575f6242bdcd6b9fa1a359ba59f5e URL: https://gitlab.winehq.org/wine/wine/-/commit/75455010e02575f6242bdcd6b9fa1a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 20 11:36:36 2023 +0200 mfplat/tests: Use nameless unions/structs. --- dlls/mfplat/tests/mfplat.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 380850da08a..39fdb665bbf 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -1682,12 +1682,12 @@ static void test_attributes(void) PropVariantInit(&propvar); propvar.vt = MF_ATTRIBUTE_UINT32; - U(propvar).ulVal = 123; + propvar.ulVal = 123; hr = IMFAttributes_SetItem(attributes, &DUMMY_GUID1, &propvar); ok(hr == S_OK, "Failed to set item, hr %#lx.\n", hr); PropVariantInit(&ret_propvar); ret_propvar.vt = MF_ATTRIBUTE_UINT32; - U(ret_propvar).ulVal = 0xdeadbeef; + ret_propvar.ulVal = 0xdeadbeef; hr = IMFAttributes_GetItem(attributes, &DUMMY_GUID1, &ret_propvar); ok(hr == S_OK, "Failed to get item, hr %#lx.\n", hr); ok(!PropVariantCompareEx(&propvar, &ret_propvar, 0, 0), "Unexpected item value.\n"); @@ -1702,7 +1702,7 @@ static void test_attributes(void) PropVariantInit(&ret_propvar); ret_propvar.vt = MF_ATTRIBUTE_STRING; - U(ret_propvar).pwszVal = NULL; + ret_propvar.pwszVal = NULL; hr = IMFAttributes_GetItem(attributes, &DUMMY_GUID1, &ret_propvar); ok(hr == S_OK, "Failed to get item, hr %#lx.\n", hr); ok(!PropVariantCompareEx(&propvar, &ret_propvar, 0, 0), "Unexpected item value.\n"); @@ -1712,12 +1712,12 @@ static void test_attributes(void) PropVariantInit(&propvar); propvar.vt = MF_ATTRIBUTE_UINT64; - U(propvar).uhVal.QuadPart = 65536; + propvar.uhVal.QuadPart = 65536; hr = IMFAttributes_SetItem(attributes, &DUMMY_GUID1, &propvar); ok(hr == S_OK, "Failed to set item, hr %#lx.\n", hr); PropVariantInit(&ret_propvar); ret_propvar.vt = MF_ATTRIBUTE_UINT32; - U(ret_propvar).ulVal = 0xdeadbeef; + ret_propvar.ulVal = 0xdeadbeef; hr = IMFAttributes_GetItem(attributes, &DUMMY_GUID1, &ret_propvar); ok(hr == S_OK, "Failed to get item, hr %#lx.\n", hr); ok(!PropVariantCompareEx(&propvar, &ret_propvar, 0, 0), "Unexpected item value.\n"); @@ -1727,12 +1727,12 @@ static void test_attributes(void) PropVariantInit(&propvar); propvar.vt = VT_I4; - U(propvar).lVal = 123; + propvar.lVal = 123; hr = IMFAttributes_SetItem(attributes, &DUMMY_GUID2, &propvar); ok(hr == MF_E_INVALIDTYPE, "Failed to set item, hr %#lx.\n", hr); PropVariantInit(&ret_propvar); ret_propvar.vt = MF_ATTRIBUTE_UINT32; - U(ret_propvar).lVal = 0xdeadbeef; + ret_propvar.lVal = 0xdeadbeef; hr = IMFAttributes_GetItem(attributes, &DUMMY_GUID2, &ret_propvar); ok(hr == S_OK, "Failed to get item, hr %#lx.\n", hr); PropVariantClear(&propvar); @@ -1741,7 +1741,7 @@ static void test_attributes(void) PropVariantInit(&propvar); propvar.vt = MF_ATTRIBUTE_UINT32; - U(propvar).ulVal = 123; + propvar.ulVal = 123; hr = IMFAttributes_SetItem(attributes, &DUMMY_GUID3, &propvar); ok(hr == S_OK, "Failed to set item, hr %#lx.\n", hr); @@ -1760,7 +1760,7 @@ static void test_attributes(void) PropVariantClear(&propvar); propvar.vt = MF_ATTRIBUTE_UINT64; - U(propvar).uhVal.QuadPart = 65536; + propvar.uhVal.QuadPart = 65536; hr = IMFAttributes_GetItem(attributes, &DUMMY_GUID1, &ret_propvar); ok(hr == S_OK, "Failed to get item, hr %#lx.\n", hr); @@ -1788,13 +1788,13 @@ static void test_attributes(void) ok(double_value == 22.0, "Unexpected value: %f, expected: 22.0.\n", double_value); propvar.vt = MF_ATTRIBUTE_UINT64; - U(propvar).uhVal.QuadPart = 22; + propvar.uhVal.QuadPart = 22; hr = IMFAttributes_CompareItem(attributes, &GUID_NULL, &propvar, &result); ok(hr == S_OK, "Failed to compare items, hr %#lx.\n", hr); ok(!result, "Unexpected result.\n"); propvar.vt = MF_ATTRIBUTE_DOUBLE; - U(propvar).dblVal = 22.0; + propvar.dblVal = 22.0; hr = IMFAttributes_CompareItem(attributes, &GUID_NULL, &propvar, &result); ok(hr == S_OK, "Failed to compare items, hr %#lx.\n", hr); ok(result, "Unexpected result.\n"); @@ -1881,7 +1881,7 @@ static void test_attributes(void) CHECK_ATTR_COUNT(attributes1, 0); propvar.vt = MF_ATTRIBUTE_UINT64; - U(propvar).uhVal.QuadPart = 22; + propvar.uhVal.QuadPart = 22; hr = IMFAttributes_CompareItem(attributes, &GUID_NULL, &propvar, &result); ok(hr == S_OK, "Failed to compare items, hr %#lx.\n", hr); ok(!result, "Unexpected result.\n");

1 0

Alexandre Julliard : mshtml/tests: Use nameless unions/structs.
by Alexandre Julliard July 20, 2023

July 20, 2023

Module: wine Branch: master Commit: 175d873c72dffc803e727d8e6c5bb201e8a9730f URL: https://gitlab.winehq.org/wine/wine/-/commit/175d873c72dffc803e727d8e6c5bb2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 20 11:36:53 2023 +0200 mshtml/tests: Use nameless unions/structs. --- dlls/mshtml/tests/htmldoc.c | 4 ++-- dlls/mshtml/tests/script.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index e4780e9c379..28aa06b0001 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -802,7 +802,7 @@ static HRESULT WINAPI Protocol_Start(IInternetProtocol *iface, LPCWSTR szUrl, ok(bindinfo.dwBindVerb == BINDVERB_POST, "bindinfo.dwBindVerb=%ld\n", bindinfo.dwBindVerb); ok(bindinfo.cbstgmedData == 8, "bindinfo.cbstgmedData=%ld\n", bindinfo.cbstgmedData); ok(bindinfo.stgmedData.tymed == TYMED_HGLOBAL, "bindinfo.stgmedData.tymed=%ld\n", bindinfo.stgmedData.tymed); - ok(!memcmp(U(bindinfo.stgmedData).hGlobal, "cmd=TEST", 8), "unexpected hGlobal\n"); + ok(!memcmp(bindinfo.stgmedData.hGlobal, "cmd=TEST", 8), "unexpected hGlobal\n"); } ok(bindinfo.szCustomVerb == 0, "bindinfo.szCustomVerb=%p\n", bindinfo.szCustomVerb); if(is_mhtml) @@ -1632,7 +1632,7 @@ static void continue_binding(IBindStatusCallback *callback) SET_EXPECT(Read); stgmedium.tymed = TYMED_ISTREAM; - U(stgmedium).pstm = &Stream; + stgmedium.pstm = &Stream; stgmedium.pUnkForRelease = (IUnknown*)&Moniker; hres = IBindStatusCallback_OnDataAvailable(callback, BSCF_FIRSTDATANOTIFICATION|BSCF_LASTDATANOTIFICATION, diff --git a/dlls/mshtml/tests/script.c b/dlls/mshtml/tests/script.c index 2dc68f1456e..bb6e0695c5b 100644 --- a/dlls/mshtml/tests/script.c +++ b/dlls/mshtml/tests/script.c @@ -3864,7 +3864,7 @@ static void stream_write(const WCHAR *name, const WCHAR *data) hres = IStream_Write(protocol_handler->stream, data, lstrlenW(data)*sizeof(WCHAR), NULL); ok(hres == S_OK, "Write failed: %08lx\n", hres); - U(large_zero).QuadPart = 0; + large_zero.QuadPart = 0; hres = IStream_Seek(protocol_handler->stream, large_zero, STREAM_SEEK_SET, NULL); ok(hres == S_OK, "Seek failed: %08lx\n", hres); @@ -4042,10 +4042,10 @@ static HRESULT WINAPI ProtocolEx_StartEx(IInternetProtocolEx *iface, IUri *uri, switch(This->bind_info.stgmedData.tymed) { case TYMED_HGLOBAL: This->size = This->bind_info.cbstgmedData; - This->data = U(This->bind_info.stgmedData).hGlobal; + This->data = This->bind_info.stgmedData.hGlobal; break; case TYMED_ISTREAM: - This->stream = U(This->bind_info.stgmedData).pstm; + This->stream = This->bind_info.stgmedData.pstm; IStream_AddRef(This->stream); break; default:

1 0

Alexandre Julliard : msi/tests: Use nameless unions/structs.
by Alexandre Julliard July 20, 2023

July 20, 2023

Module: wine Branch: master Commit: 490aee03e45222aa9d7e3e7fd6ff80064dc3778d URL: https://gitlab.winehq.org/wine/wine/-/commit/490aee03e45222aa9d7e3e7fd6ff80… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 20 11:37:08 2023 +0200 msi/tests: Use nameless unions/structs. --- dlls/msi/tests/package.c | 6 +++--- dlls/msi/tests/suminfo.c | 32 ++++++++++++++++---------------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 43ee28fdc21..3d7569499e5 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -4717,7 +4717,7 @@ static void test_appsearch_reglocator(void) memset(&si, 0, sizeof(si)); GetNativeSystemInfo(&si); - if (S(U(si)).wProcessorArchitecture == PROCESSOR_ARCHITECTURE_INTEL) + if (si.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_INTEL) { size = ExpandEnvironmentStringsA("%PATH%", NULL, 0); pathvar = malloc(size); @@ -5748,7 +5748,7 @@ static void test_installprops(void) sprintf(buf, "%d", LOBYTE(LOWORD(GetVersion())) * 100 + HIBYTE(LOWORD(GetVersion()))); check_prop(hpkg, "VersionNT", buf, 1, 1); - if (S(U(si)).wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64) + if (si.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64) { sprintf(buf, "%d", si.wProcessorLevel); check_prop(hpkg, "Intel", buf, 1, 0); @@ -5785,7 +5785,7 @@ static void test_installprops(void) strcat(path, "\\"); check_prop(hpkg, "CommonFiles64Folder", path, 0, 0); } - else if (S(U(si)).wProcessorArchitecture == PROCESSOR_ARCHITECTURE_INTEL) + else if (si.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_INTEL) { sprintf(buf, "%d", si.wProcessorLevel); check_prop(hpkg, "Intel", buf, 1, 0); diff --git a/dlls/msi/tests/suminfo.c b/dlls/msi/tests/suminfo.c index 6053248a7c4..59b56a2cbba 100644 --- a/dlls/msi/tests/suminfo.c +++ b/dlls/msi/tests/suminfo.c @@ -343,45 +343,45 @@ static void test_create_database_binary(void) ok( r == S_OK, "failed to set class\n"); propspec[0].ulKind = PRSPEC_PROPID; - U(propspec[0]).propid = PID_TITLE; + propspec[0].propid = PID_TITLE; propvar[0].vt = VT_LPSTR; - U(propvar[0]).pszVal = LOSE_CONST("test title"); + propvar[0].pszVal = LOSE_CONST("test title"); propspec[1].ulKind = PRSPEC_PROPID; - U(propspec[1]).propid = PID_SUBJECT; + propspec[1].propid = PID_SUBJECT; propvar[1].vt = VT_LPSTR; - U(propvar[1]).pszVal = LOSE_CONST("msi suminfo / property storage test"); + propvar[1].pszVal = LOSE_CONST("msi suminfo / property storage test"); propspec[2].ulKind = PRSPEC_PROPID; - U(propspec[2]).propid = PID_AUTHOR; + propspec[2].propid = PID_AUTHOR; propvar[2].vt = VT_LPSTR; - U(propvar[2]).pszVal = LOSE_CONST("mike_m"); + propvar[2].pszVal = LOSE_CONST("mike_m"); propspec[3].ulKind = PRSPEC_PROPID; - U(propspec[3]).propid = PID_TEMPLATE; + propspec[3].propid = PID_TEMPLATE; propvar[3].vt = VT_LPSTR; - U(propvar[3]).pszVal = LOSE_CONST(";1033"); /* actually the string table's codepage */ + propvar[3].pszVal = LOSE_CONST(";1033"); /* actually the string table's codepage */ propspec[4].ulKind = PRSPEC_PROPID; - U(propspec[4]).propid = PID_REVNUMBER; + propspec[4].propid = PID_REVNUMBER; propvar[4].vt = VT_LPSTR; - U(propvar[4]).pszVal = LOSE_CONST("{913B8D18-FBB6-4CAC-A239-C74C11E3FA74}"); + propvar[4].pszVal = LOSE_CONST("{913B8D18-FBB6-4CAC-A239-C74C11E3FA74}"); propspec[5].ulKind = PRSPEC_PROPID; - U(propspec[5]).propid = PID_PAGECOUNT; + propspec[5].propid = PID_PAGECOUNT; propvar[5].vt = VT_I4; - U(propvar[5]).lVal = 100; + propvar[5].lVal = 100; propspec[6].ulKind = PRSPEC_PROPID; - U(propspec[6]).propid = PID_WORDCOUNT; + propspec[6].propid = PID_WORDCOUNT; propvar[6].vt = VT_I4; - U(propvar[6]).lVal = 0; + propvar[6].lVal = 0; /* MSDN says that PID_LASTPRINTED should be a VT_FILETIME... */ propspec[7].ulKind = PRSPEC_PROPID; - U(propspec[7]).propid = PID_LASTPRINTED; + propspec[7].propid = PID_LASTPRINTED; propvar[7].vt = VT_LPSTR; - U(propvar[7]).pszVal = LOSE_CONST("7/1/1999 5:17"); + propvar[7].pszVal = LOSE_CONST("7/1/1999 5:17"); r = IPropertyStorage_WriteMultiple( ps, 8, propspec, propvar, PID_FIRST_USABLE ); ok( r == S_OK, "failed to write properties\n");

1 0

Alexandre Julliard : kernel32/tests: Use nameless unions/structs.
by Alexandre Julliard July 20, 2023

July 20, 2023

Module: wine Branch: master Commit: 708d13b0358ca85f278e82aee7b1f790e126fafe URL: https://gitlab.winehq.org/wine/wine/-/commit/708d13b0358ca85f278e82aee7b1f7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 20 11:36:19 2023 +0200 kernel32/tests: Use nameless unions/structs. --- dlls/kernel32/tests/change.c | 8 +++---- dlls/kernel32/tests/comm.c | 56 +++++++++++++++++++++---------------------- dlls/kernel32/tests/file.c | 38 ++++++++++++++--------------- dlls/kernel32/tests/loader.c | 54 ++++++++++++++++++++--------------------- dlls/kernel32/tests/pipe.c | 4 ++-- dlls/kernel32/tests/process.c | 10 ++++---- 6 files changed, 85 insertions(+), 85 deletions(-)

1 0

Alexandre Julliard : iphlpapi/tests: Use nameless unions/structs.
by Alexandre Julliard July 20, 2023

July 20, 2023

Module: wine Branch: master Commit: 3069b98b10ea6349801983483e6afeb783133664 URL: https://gitlab.winehq.org/wine/wine/-/commit/3069b98b10ea6349801983483e6afe… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 20 11:35:42 2023 +0200 iphlpapi/tests: Use nameless unions/structs. --- dlls/iphlpapi/tests/iphlpapi.c | 48 +++++++++++++++++++++--------------------- 1 file changed, 24 insertions(+), 24 deletions(-)

1 0

Alexandre Julliard : imagehlp/tests: Use nameless unions/structs.
by Alexandre Julliard July 20, 2023

July 20, 2023

Module: wine Branch: master Commit: 17bccc860a96ae1c8c34beef885a3ef142888935 URL: https://gitlab.winehq.org/wine/wine/-/commit/17bccc860a96ae1c8c34beef885a3e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 20 11:35:08 2023 +0200 imagehlp/tests: Use nameless unions/structs. --- dlls/imagehlp/tests/image.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/imagehlp/tests/image.c b/dlls/imagehlp/tests/image.c index 0d9019fe938..a2fc306428f 100644 --- a/dlls/imagehlp/tests/image.c +++ b/dlls/imagehlp/tests/image.c @@ -19,7 +19,6 @@ #include <stdio.h> #include <stdarg.h> -#define NONAMELESSUNION #include <windef.h> #include <winbase.h> #include <winver.h> @@ -234,8 +233,8 @@ static const struct expected_blob b1[] = { {sizeof(bin.nt_headers), &bin.nt_headers}, {sizeof(bin.sections), &bin.sections}, {FILE_IDATA-FILE_TEXT, &bin.text_section}, - {sizeof(bin.idata_section.descriptors[0].u.OriginalFirstThunk), - &bin.idata_section.descriptors[0].u.OriginalFirstThunk}, + {sizeof(bin.idata_section.descriptors[0].OriginalFirstThunk), + &bin.idata_section.descriptors[0].OriginalFirstThunk}, {FIELD_OFFSET(struct Imports, thunks)- (FIELD_OFFSET(struct Imports, descriptors)+FIELD_OFFSET(IMAGE_IMPORT_DESCRIPTOR, Name)), &bin.idata_section.descriptors[0].Name},

1 0

Alexandre Julliard : ieframe/tests: Use nameless unions/structs.
by Alexandre Julliard July 20, 2023

July 20, 2023

Module: wine Branch: master Commit: 8fe23255a57b2ee14c0e75735aa8e7de58728d00 URL: https://gitlab.winehq.org/wine/wine/-/commit/8fe23255a57b2ee14c0e75735aa8e7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 20 11:34:53 2023 +0200 ieframe/tests: Use nameless unions/structs. --- dlls/ieframe/tests/intshcut.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/ieframe/tests/intshcut.c b/dlls/ieframe/tests/intshcut.c index b5487491414..cac0e301dd2 100644 --- a/dlls/ieframe/tests/intshcut.c +++ b/dlls/ieframe/tests/intshcut.c @@ -176,14 +176,14 @@ static void test_ReadAndWriteProperties(void) PROPVARIANT pv[2], pvread[2]; ps[0].ulKind = PRSPEC_PROPID; - U(ps[0]).propid = PID_IS_ICONFILE; + ps[0].propid = PID_IS_ICONFILE; ps[1].ulKind = PRSPEC_PROPID; - U(ps[1]).propid = PID_IS_ICONINDEX; + ps[1].propid = PID_IS_ICONINDEX; pv[0].vt = VT_LPWSTR; - U(pv[0]).pwszVal = iconPath; + pv[0].pwszVal = iconPath; pv[1].vt = VT_I4; - U(pv[1]).lVal = iconIndex; + pv[1].lVal = iconIndex; /* Make sure we have a valid temporary directory */ GetTempPathW(MAX_PATH, fileNameW); @@ -223,9 +223,9 @@ static void test_ReadAndWriteProperties(void) hr = IPropertyStorage_ReadMultiple(pPropStgWrite, 2, ps, pvread); ok(hr == S_OK, "Unable to read properties, hr=0x%lx\n", hr); ok(pvread[1].vt == VT_I4, "got %d\n", pvread[1].vt); - ok(U(pvread[1]).lVal == iconIndex, "Read wrong icon index: %d\n", U(pvread[1]).iVal); + ok(pvread[1].lVal == iconIndex, "Read wrong icon index: %d\n", pvread[1].iVal); ok(pvread[0].vt == VT_LPWSTR, "got %d\n", pvread[0].vt); - ok(lstrcmpW(U(pvread[0]).pwszVal, iconPath) == 0, "Wrong icon path read: %s\n", wine_dbgstr_w(U(pvread[0]).pwszVal)); + ok(lstrcmpW(pvread[0].pwszVal, iconPath) == 0, "Wrong icon path read: %s\n", wine_dbgstr_w(pvread[0].pwszVal)); PropVariantClear(&pvread[0]); PropVariantClear(&pvread[1]); @@ -244,9 +244,9 @@ static void test_ReadAndWriteProperties(void) hr = IPropertyStorage_ReadMultiple(pPropStgWrite, 2, ps, pvread); ok(hr == S_OK, "Unable to read properties, hr=0x%lx\n", hr); ok(pvread[1].vt == VT_I4, "got %d\n", pvread[1].vt); - ok(U(pvread[1]).lVal == iconIndex, "Read wrong icon index: %d\n", U(pvread[1]).iVal); + ok(pvread[1].lVal == iconIndex, "Read wrong icon index: %d\n", pvread[1].iVal); ok(pvread[0].vt == VT_LPWSTR, "got %d\n", pvread[0].vt); - ok(lstrcmpW(U(pvread[0]).pwszVal, iconPath) == 0, "Wrong icon path read: %s\n", wine_dbgstr_w(U(pvread[0]).pwszVal)); + ok(lstrcmpW(pvread[0].pwszVal, iconPath) == 0, "Wrong icon path read: %s\n", wine_dbgstr_w(pvread[0].pwszVal)); PropVariantClear(&pvread[0]); PropVariantClear(&pvread[1]); @@ -292,9 +292,9 @@ static void test_ReadAndWriteProperties(void) { ok(hr == S_OK, "Unable to read properties, hr=0x%lx\n", hr); ok(pvread[1].vt == VT_I4, "got %d\n", pvread[1].vt); - ok(U(pvread[1]).lVal == iconIndex, "Read wrong icon index: %d\n", U(pvread[1]).iVal); + ok(pvread[1].lVal == iconIndex, "Read wrong icon index: %d\n", pvread[1].iVal); ok(pvread[0].vt == VT_LPWSTR, "got %d\n", pvread[0].vt); - ok(lstrcmpW(U(pvread[0]).pwszVal, iconPath) == 0, "Wrong icon path read: %s\n", wine_dbgstr_w(U(pvread[0]).pwszVal)); + ok(lstrcmpW(pvread[0].pwszVal, iconPath) == 0, "Wrong icon path read: %s\n", wine_dbgstr_w(pvread[0].pwszVal)); } PropVariantClear(&pvread[0]); PropVariantClear(&pvread[1]); @@ -390,14 +390,14 @@ static void test_Load(void) ok(hres == S_OK, "Unable to get an IPropertyStorage for reading, hr=0x%lx\n", hres); ps.ulKind = PRSPEC_PROPID; - U(ps).propid = PID_IS_ICONFILE; + ps.propid = PID_IS_ICONFILE; v.vt = VT_NULL; hres = IPropertyStorage_ReadMultiple(propstorage, 1, &ps, &v); ok(hres == S_FALSE, "got 0x%08lx\n", hres); ok(v.vt == VT_EMPTY, "got %d\n", v.vt); ps.ulKind = PRSPEC_PROPID; - U(ps).propid = PID_IS_ICONINDEX; + ps.propid = PID_IS_ICONINDEX; v.vt = VT_EMPTY; hres = IPropertyStorage_ReadMultiple(propstorage, 1, &ps, &v); ok(hres == S_FALSE, "got 0x%08lx\n", hres);

1 0

Alexandre Julliard : inetcomm/tests: Use nameless unions/structs.
by Alexandre Julliard July 20, 2023

July 20, 2023

Module: wine Branch: master Commit: d578e7981a6ca998b68f4c133e34fc91849d1248 URL: https://gitlab.winehq.org/wine/wine/-/commit/d578e7981a6ca998b68f4c133e34fc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 20 11:35:24 2023 +0200 inetcomm/tests: Use nameless unions/structs. --- dlls/inetcomm/tests/mimeintl.c | 2 -- dlls/inetcomm/tests/mimeole.c | 8 +++----- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/dlls/inetcomm/tests/mimeintl.c b/dlls/inetcomm/tests/mimeintl.c index 3eaa86fe7e3..85799670264 100644 --- a/dlls/inetcomm/tests/mimeintl.c +++ b/dlls/inetcomm/tests/mimeintl.c @@ -19,8 +19,6 @@ */ #define COBJMACROS -#define NONAMELESSUNION - #include "windows.h" #include "ole2.h" #include "ocidl.h" diff --git a/dlls/inetcomm/tests/mimeole.c b/dlls/inetcomm/tests/mimeole.c index 1168341610f..eef81fed44c 100644 --- a/dlls/inetcomm/tests/mimeole.c +++ b/dlls/inetcomm/tests/mimeole.c @@ -19,8 +19,6 @@ */ #define COBJMACROS -#define NONAMELESSUNION - #include "initguid.h" #include "windows.h" #include "ole2.h" @@ -204,7 +202,7 @@ static void test_CreateBody(void) ok(hr == S_OK, "ret %08lx\n", hr); off.QuadPart = 0; IStream_Seek(in, off, STREAM_SEEK_CUR, &pos); - ok(pos.u.LowPart == 359, "pos %lu\n", pos.u.LowPart); + ok(pos.LowPart == 359, "pos %lu\n", pos.LowPart); hr = IMimeBody_IsContentType(body, "multipart", "mixed"); ok(hr == S_OK, "ret %08lx\n", hr); @@ -347,7 +345,7 @@ static HRESULT WINAPI Stream_Seek(IStream *iface, LARGE_INTEGER dlibMove, DWORD if(dwOrigin == STREAM_SEEK_END) { CHECK_EXPECT(Stream_Seek_END); - ok(dlibMove.QuadPart == expect_seek_pos, "unexpected seek pos %lu\n", dlibMove.u.LowPart); + ok(dlibMove.QuadPart == expect_seek_pos, "unexpected seek pos %lu\n", dlibMove.LowPart); if(plibNewPosition) plibNewPosition->QuadPart = 10; return S_OK; @@ -355,7 +353,7 @@ static HRESULT WINAPI Stream_Seek(IStream *iface, LARGE_INTEGER dlibMove, DWORD CHECK_EXPECT(Stream_Seek); - ok(dlibMove.QuadPart == expect_seek_pos, "unexpected seek pos %lu\n", dlibMove.u.LowPart); + ok(dlibMove.QuadPart == expect_seek_pos, "unexpected seek pos %lu\n", dlibMove.LowPart); ok(dwOrigin == STREAM_SEEK_SET, "dwOrigin = %ld\n", dwOrigin); This->pos = dlibMove.QuadPart; if(plibNewPosition)

1 0