wine-commits July 2023

wine-commits@winehq.org

1 participants
865 discussions

Alistair Leslie-Hughes : ddraw: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard 20 Jul '23

20 Jul '23

Module: wine Branch: master Commit: 964025e279db2dd9853df8a1eaa8dd18d9bcda57 URL: https://gitlab.winehq.org/wine/wine/-/commit/964025e279db2dd9853df8a1eaa8dd… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jul 12 17:41:26 2023 +1000 ddraw: Remove DECLSPEC_HIDDEN usage. --- dlls/ddraw/ddraw_private.h | 138 ++++++++++++++++++++++----------------------- 1 file changed, 69 insertions(+), 69 deletions(-)

1 0

Alistair Leslie-Hughes : d2d1: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard 20 Jul '23

20 Jul '23

Module: wine Branch: master Commit: 85a88076f84b86a7c7136c4e3131f97bee8df46a URL: https://gitlab.winehq.org/wine/wine/-/commit/85a88076f84b86a7c7136c4e3131f9… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jul 12 17:41:25 2023 +1000 d2d1: Remove DECLSPEC_HIDDEN usage. --- dlls/d2d1/d2d1_private.h | 134 +++++++++++++++++++++++------------------------ 1 file changed, 67 insertions(+), 67 deletions(-)

1 0

Alistair Leslie-Hughes : d3dx10_43: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard 20 Jul '23

20 Jul '23

Module: wine Branch: master Commit: f65705df9d19efdfdd3e4ae3edca961470dcc1b6 URL: https://gitlab.winehq.org/wine/wine/-/commit/f65705df9d19efdfdd3e4ae3edca96… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jul 12 17:41:25 2023 +1000 d3dx10_43: Remove DECLSPEC_HIDDEN usage. --- dlls/d3dx10_43/dxhelpers.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/d3dx10_43/dxhelpers.h b/dlls/d3dx10_43/dxhelpers.h index 5d0cdb54c59..50d509973cd 100644 --- a/dlls/d3dx10_43/dxhelpers.h +++ b/dlls/d3dx10_43/dxhelpers.h @@ -16,18 +16,18 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -extern HRESULT load_file(const WCHAR *path, void **data, DWORD *size) DECLSPEC_HIDDEN; +extern HRESULT load_file(const WCHAR *path, void **data, DWORD *size); extern HRESULT load_resourceA(HMODULE module, const char *resource, - void **data, DWORD *size) DECLSPEC_HIDDEN; + void **data, DWORD *size); extern HRESULT load_resourceW(HMODULE module, const WCHAR *resource, - void **data, DWORD *size) DECLSPEC_HIDDEN; + void **data, DWORD *size); -extern HRESULT get_image_info(const void *data, SIZE_T size, D3DX10_IMAGE_INFO *img_info) DECLSPEC_HIDDEN; +extern HRESULT get_image_info(const void *data, SIZE_T size, D3DX10_IMAGE_INFO *img_info); extern void init_load_info(const D3DX10_IMAGE_LOAD_INFO *load_info, - D3DX10_IMAGE_LOAD_INFO *out) DECLSPEC_HIDDEN; + D3DX10_IMAGE_LOAD_INFO *out); /* Returns array of D3D10_SUBRESOURCE_DATA structures followed by textures data. */ extern HRESULT load_texture_data(const void *data, SIZE_T size, D3DX10_IMAGE_LOAD_INFO *load_info, - D3D10_SUBRESOURCE_DATA **resource_data) DECLSPEC_HIDDEN; + D3D10_SUBRESOURCE_DATA **resource_data); extern HRESULT create_d3d_texture(ID3D10Device *device, D3DX10_IMAGE_LOAD_INFO *load_info, - D3D10_SUBRESOURCE_DATA *resource_data, ID3D10Resource **texture) DECLSPEC_HIDDEN; + D3D10_SUBRESOURCE_DATA *resource_data, ID3D10Resource **texture);

1 0

Alistair Leslie-Hughes : d3d11: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard 20 Jul '23

20 Jul '23

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 : dxgi: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard 20 Jul '23

20 Jul '23

Module: wine Branch: master Commit: 83ea03bcc804e76e493ebb9c15e8a3358ef04ca1 URL: https://gitlab.winehq.org/wine/wine/-/commit/83ea03bcc804e76e493ebb9c15e8a3… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jul 12 17:41:25 2023 +1000 dxgi: Remove DECLSPEC_HIDDEN usage. --- dlls/dxgi/dxgi_private.h | 60 ++++++++++++++++++++++++------------------------ 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index fa704d28b0f..bae728abadb 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -78,36 +78,36 @@ struct dxgi_device_layer }; /* TRACE helper functions */ -const char *debug_dxgi_format(DXGI_FORMAT format) DECLSPEC_HIDDEN; -const char *debug_dxgi_mode(const DXGI_MODE_DESC *desc) DECLSPEC_HIDDEN; -const char *debug_dxgi_mode1(const DXGI_MODE_DESC1 *desc) DECLSPEC_HIDDEN; -void dump_feature_levels(const D3D_FEATURE_LEVEL *feature_levels, unsigned int level_count) DECLSPEC_HIDDEN; +const char *debug_dxgi_format(DXGI_FORMAT format); +const char *debug_dxgi_mode(const DXGI_MODE_DESC *desc); +const char *debug_dxgi_mode1(const DXGI_MODE_DESC1 *desc); +void dump_feature_levels(const D3D_FEATURE_LEVEL *feature_levels, unsigned int level_count); -DXGI_FORMAT dxgi_format_from_wined3dformat(enum wined3d_format_id format) DECLSPEC_HIDDEN; -enum wined3d_format_id wined3dformat_from_dxgi_format(DXGI_FORMAT format) DECLSPEC_HIDDEN; +DXGI_FORMAT dxgi_format_from_wined3dformat(enum wined3d_format_id format); +enum wined3d_format_id wined3dformat_from_dxgi_format(DXGI_FORMAT format); void dxgi_sample_desc_from_wined3d(DXGI_SAMPLE_DESC *desc, - enum wined3d_multisample_type wined3d_type, unsigned int wined3d_quality) DECLSPEC_HIDDEN; + enum wined3d_multisample_type wined3d_type, unsigned int wined3d_quality); void wined3d_sample_desc_from_dxgi(enum wined3d_multisample_type *wined3d_type, - unsigned int *wined3d_quality, const DXGI_SAMPLE_DESC *dxgi_desc) DECLSPEC_HIDDEN; + unsigned int *wined3d_quality, const DXGI_SAMPLE_DESC *dxgi_desc); void wined3d_display_mode_from_dxgi(struct wined3d_display_mode *wined3d_mode, - const DXGI_MODE_DESC *mode) DECLSPEC_HIDDEN; + const DXGI_MODE_DESC *mode); void wined3d_display_mode_from_dxgi1(struct wined3d_display_mode *wined3d_mode, - const DXGI_MODE_DESC1 *mode) DECLSPEC_HIDDEN; -DXGI_USAGE dxgi_usage_from_wined3d_bind_flags(unsigned int wined3d_bind_flags) DECLSPEC_HIDDEN; -unsigned int wined3d_bind_flags_from_dxgi_usage(DXGI_USAGE usage) DECLSPEC_HIDDEN; -unsigned int dxgi_swapchain_flags_from_wined3d(unsigned int wined3d_flags) DECLSPEC_HIDDEN; + const DXGI_MODE_DESC1 *mode); +DXGI_USAGE dxgi_usage_from_wined3d_bind_flags(unsigned int wined3d_bind_flags); +unsigned int wined3d_bind_flags_from_dxgi_usage(DXGI_USAGE usage); +unsigned int dxgi_swapchain_flags_from_wined3d(unsigned int wined3d_flags); HRESULT dxgi_get_output_from_window(IWineDXGIFactory *factory, HWND window, IDXGIOutput **dxgi_output) - DECLSPEC_HIDDEN; + ; HRESULT wined3d_swapchain_desc_from_dxgi(struct wined3d_swapchain_desc *wined3d_desc, IDXGIOutput *dxgi_containing_output, HWND window, const DXGI_SWAP_CHAIN_DESC1 *dxgi_desc, - const DXGI_SWAP_CHAIN_FULLSCREEN_DESC *dxgi_fullscreen_desc) DECLSPEC_HIDDEN; + const DXGI_SWAP_CHAIN_FULLSCREEN_DESC *dxgi_fullscreen_desc); HRESULT dxgi_get_private_data(struct wined3d_private_store *store, - REFGUID guid, UINT *data_size, void *data) DECLSPEC_HIDDEN; + REFGUID guid, UINT *data_size, void *data); HRESULT dxgi_set_private_data(struct wined3d_private_store *store, - REFGUID guid, UINT data_size, const void *data) DECLSPEC_HIDDEN; + REFGUID guid, UINT data_size, const void *data); HRESULT dxgi_set_private_data_interface(struct wined3d_private_store *store, - REFGUID guid, const IUnknown *object) DECLSPEC_HIDDEN; + REFGUID guid, const IUnknown *object); /* IDXGIFactory */ struct dxgi_factory @@ -120,9 +120,9 @@ struct dxgi_factory HWND device_window; }; -HRESULT dxgi_factory_create(REFIID riid, void **factory, BOOL extended) DECLSPEC_HIDDEN; -HWND dxgi_factory_get_device_window(struct dxgi_factory *factory) DECLSPEC_HIDDEN; -struct dxgi_factory *unsafe_impl_from_IDXGIFactory(IDXGIFactory *iface) DECLSPEC_HIDDEN; +HRESULT dxgi_factory_create(REFIID riid, void **factory, BOOL extended); +HWND dxgi_factory_get_device_window(struct dxgi_factory *factory); +struct dxgi_factory *unsafe_impl_from_IDXGIFactory(IDXGIFactory *iface); /* IDXGIDevice */ struct dxgi_device @@ -139,7 +139,7 @@ struct dxgi_device HRESULT dxgi_device_init(struct dxgi_device *device, struct dxgi_device_layer *layer, IDXGIFactory *factory, IDXGIAdapter *adapter, - const D3D_FEATURE_LEVEL *feature_levels, unsigned int level_count) DECLSPEC_HIDDEN; + const D3D_FEATURE_LEVEL *feature_levels, unsigned int level_count); /* IDXGIOutput */ struct dxgi_output @@ -152,8 +152,8 @@ struct dxgi_output }; HRESULT dxgi_output_create(struct dxgi_adapter *adapter, unsigned int output_idx, - struct dxgi_output **output) DECLSPEC_HIDDEN; -struct dxgi_output *unsafe_impl_from_IDXGIOutput(IDXGIOutput *iface) DECLSPEC_HIDDEN; + struct dxgi_output **output); +struct dxgi_output *unsafe_impl_from_IDXGIOutput(IDXGIOutput *iface); /* IDXGIAdapter */ struct dxgi_adapter @@ -167,8 +167,8 @@ struct dxgi_adapter }; HRESULT dxgi_adapter_create(struct dxgi_factory *factory, UINT ordinal, - struct dxgi_adapter **adapter) DECLSPEC_HIDDEN; -struct dxgi_adapter *unsafe_impl_from_IDXGIAdapter(IDXGIAdapter *iface) DECLSPEC_HIDDEN; + struct dxgi_adapter **adapter); +struct dxgi_adapter *unsafe_impl_from_IDXGIAdapter(IDXGIAdapter *iface); /* IDXGISwapChain */ struct d3d11_swapchain @@ -187,13 +187,13 @@ struct d3d11_swapchain }; HRESULT d3d11_swapchain_init(struct d3d11_swapchain *swapchain, struct dxgi_device *device, - struct wined3d_swapchain_desc *desc) DECLSPEC_HIDDEN; + struct wined3d_swapchain_desc *desc); HRESULT d3d12_swapchain_create(IWineDXGIFactory *factory, ID3D12CommandQueue *queue, HWND window, const DXGI_SWAP_CHAIN_DESC1 *swapchain_desc, const DXGI_SWAP_CHAIN_FULLSCREEN_DESC *fullscreen_desc, - IDXGISwapChain1 **swapchain) DECLSPEC_HIDDEN; + IDXGISwapChain1 **swapchain); -BOOL dxgi_validate_swapchain_desc(const DXGI_SWAP_CHAIN_DESC1 *desc) DECLSPEC_HIDDEN; +BOOL dxgi_validate_swapchain_desc(const DXGI_SWAP_CHAIN_DESC1 *desc); /* IDXGISurface/IDXGIResource */ struct dxgi_resource @@ -210,6 +210,6 @@ struct dxgi_resource }; HRESULT dxgi_resource_init(struct dxgi_resource *resource, IDXGIDevice *device, - IUnknown *outer, BOOL needs_surface, struct wined3d_resource *wined3d_resource) DECLSPEC_HIDDEN; + IUnknown *outer, BOOL needs_surface, struct wined3d_resource *wined3d_resource); #endif /* __WINE_DXGI_PRIVATE_H */

1 0

Alistair Leslie-Hughes : ddrawex: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard 20 Jul '23

20 Jul '23

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 : ntdll/tests: Use nameless unions/structs.
by Alexandre Julliard 20 Jul '23

20 Jul '23

Module: wine Branch: master Commit: 59ee798d51eb4d76999de5881cce328a08506131 URL: https://gitlab.winehq.org/wine/wine/-/commit/59ee798d51eb4d76999de5881cce32… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 20 11:38:22 2023 +0200 ntdll/tests: Use nameless unions/structs. --- dlls/ntdll/tests/change.c | 48 ++-- dlls/ntdll/tests/directory.c | 132 +++++------ dlls/ntdll/tests/file.c | 532 +++++++++++++++++++++---------------------- dlls/ntdll/tests/pipe.c | 134 +++++------ dlls/ntdll/tests/wow64.c | 16 +- 5 files changed, 431 insertions(+), 431 deletions(-)

1 0

Alexandre Julliard : msi/tests: Use nameless unions/structs.
by Alexandre Julliard 20 Jul '23

20 Jul '23

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 : mshtml/tests: Use nameless unions/structs.
by Alexandre Julliard 20 Jul '23

20 Jul '23

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 : mfplat/tests: Use nameless unions/structs.
by Alexandre Julliard 20 Jul '23

20 Jul '23

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

← Newer
1
...
19
20
21
22
23
24
25
...
87
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2023