July 2023 - Wine-commits - list.winehq.org

Biswapriyo Nath : include: Add ID2D1SvgGlyphStyle in d2d1_3.idl.
by Alexandre Julliard 14 Jul '23

14 Jul '23

Module: wine Branch: master Commit: de1d097d290518e008c2ef01f104dcf9d12b0498 URL: https://gitlab.winehq.org/wine/wine/-/commit/de1d097d290518e008c2ef01f104dc… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Fri Jul 14 21:12:20 2023 +0530 include: Add ID2D1SvgGlyphStyle in d2d1_3.idl. --- include/d2d1_3.idl | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/include/d2d1_3.idl b/include/d2d1_3.idl index c88226b4136..830c196a484 100644 --- a/include/d2d1_3.idl +++ b/include/d2d1_3.idl @@ -309,6 +309,36 @@ interface ID2D1SpriteBatch : ID2D1Resource void Clear(void); } +[ + object, + uuid(af671749-d241-4db8-8e41-dcc2e5c1a438), + local, +] +interface ID2D1SvgGlyphStyle : ID2D1Resource +{ + HRESULT SetFill( + [in, optional] ID2D1Brush *brush + ); + void GetFill( + [out] ID2D1Brush **brush + ); + HRESULT SetStroke( + [in, optional] ID2D1Brush *brush, + [in] FLOAT stroke_width, + [in, optional] const FLOAT *dashes, + [in, optional] UINT32 dashes_count, + [in] FLOAT dash_offset + ); + UINT32 GetStrokeDashesCount(void); + void GetStroke( + [out, optional] ID2D1Brush **brush, + [out, optional] FLOAT *stroke_width, + [out, optional] FLOAT *dashes, + [in, optional] UINT32 dashes_count, + [out, optional] FLOAT *dash_offset + ); +} + [ object, uuid(394ea6a3-0c34-4321-950b-6ca20f0be6c7),

1 0

Jinoh Kang : msi: Make insertion order of line controls consistent with other controls.
by Alexandre Julliard 14 Jul '23

14 Jul '23

Module: wine Branch: master Commit: 3eceda2f2a77754f0bf93ea33018e8ef49e82669 URL: https://gitlab.winehq.org/wine/wine/-/commit/3eceda2f2a77754f0bf93ea33018e8… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Thu Jul 13 22:32:16 2023 +0900 msi: Make insertion order of line controls consistent with other controls. Fixes: 2c5bd49297f79d9941a256d8ec61e0eb2bf9bf9c --- dlls/msi/dialog.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 061bca9a6c9..11d6af75846 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -1190,7 +1190,7 @@ static UINT dialog_line_control( msi_dialog *dialog, MSIRECORD *rec ) return ERROR_OUTOFMEMORY; lstrcpyW( control->name, name ); - list_add_head( &dialog->controls, &control->entry ); + list_add_tail( &dialog->controls, &control->entry ); control->handler = NULL; control->update = NULL; control->property = NULL;

1 0

Jinoh Kang : msi: Don't open code dialog_add_control() in dialog_line_control().
by Alexandre Julliard 14 Jul '23

14 Jul '23

Module: wine Branch: master Commit: 1fca47b724b3835ac0267f58c5b3486fc222fc71 URL: https://gitlab.winehq.org/wine/wine/-/commit/1fca47b724b3835ac0267f58c5b348… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Thu Jul 13 22:47:18 2023 +0900 msi: Don't open code dialog_add_control() in dialog_line_control(). Commit b1cc87cb656 ("msi: The line control has a height of exactly 2 device units.", 2007-12-16) open-coded the body of (msi_)dialog_add_control() inside dialog_line_control() modulo the height override. Except the fixed height, line controls have nothing special compared to other controls. Thus, there is little merit in open-coding it. Also, dialog_line_control() has bit-rotted over time; it already missed a few changes that were done to any other controls. Fix this by just using dialog_add_control(). Also, add a special case logic just for line controls. --- dlls/msi/dialog.c | 61 +++++-------------------------------------------------- 1 file changed, 5 insertions(+), 56 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 11d6af75846..6c1b9ebf2a8 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -419,6 +419,9 @@ static struct control *dialog_create_window( msi_dialog *dialog, MSIRECORD *rec, font = dialog_get_style( title_font, &title ); } + if (!wcsicmp( MSI_RecordGetString( rec, 3 ), L"Line" )) + height = 2; /* line is exactly 2 units in height */ + control->hwnd = CreateWindowExW( exstyle, szCls, title, style, x, y, width, height, parent, NULL, NULL, NULL ); @@ -1163,62 +1166,8 @@ static UINT dialog_checkbox_control( msi_dialog *dialog, MSIRECORD *rec ) static UINT dialog_line_control( msi_dialog *dialog, MSIRECORD *rec ) { - DWORD attributes; - LPCWSTR name; - DWORD style, exstyle = 0; - DWORD x, y, width, height; - struct control *control; - - TRACE("%p %p\n", dialog, rec); - - style = WS_CHILD | SS_ETCHEDHORZ | SS_SUNKEN; - - name = MSI_RecordGetString( rec, 2 ); - attributes = MSI_RecordGetInteger( rec, 8 ); - - if( attributes & msidbControlAttributesVisible ) - style |= WS_VISIBLE; - if( ~attributes & msidbControlAttributesEnabled ) - style |= WS_DISABLED; - if( attributes & msidbControlAttributesSunken ) - exstyle |= WS_EX_CLIENTEDGE; - - dialog_map_events( dialog, name ); - - control = malloc( offsetof( struct control, name[wcslen( name ) + 1] ) ); - if (!control) - return ERROR_OUTOFMEMORY; - - lstrcpyW( control->name, name ); - list_add_tail( &dialog->controls, &control->entry ); - control->handler = NULL; - control->update = NULL; - control->property = NULL; - control->value = NULL; - control->hBitmap = NULL; - control->hIcon = NULL; - control->hImageList = NULL; - control->hDll = NULL; - control->tabnext = wcsdup( MSI_RecordGetString( rec, 11 ) ); - control->type = wcsdup( MSI_RecordGetString( rec, 3 ) ); - control->progress_current = 0; - control->progress_max = 100; - control->progress_backwards = FALSE; - - x = MSI_RecordGetInteger( rec, 4 ); - y = MSI_RecordGetInteger( rec, 5 ); - width = MSI_RecordGetInteger( rec, 6 ); - - x = dialog_scale_unit( dialog, x ); - y = dialog_scale_unit( dialog, y ); - width = dialog_scale_unit( dialog, width ); - height = 2; /* line is exactly 2 units in height */ - - control->hwnd = CreateWindowExW( exstyle, L"Static", NULL, style, - x, y, width, height, dialog->hwnd, NULL, NULL, NULL ); - - TRACE("Dialog %s control %s hwnd %p\n", - debugstr_w(dialog->name), debugstr_w(name), control->hwnd ); + if (!dialog_add_control( dialog, rec, L"Static", SS_ETCHEDHORZ | SS_SUNKEN)) + return ERROR_FUNCTION_FAILED; return ERROR_SUCCESS; }

1 0

Zebediah Figura : opengl32: Copy to the wow64 buffer even for write maps.
by Alexandre Julliard 14 Jul '23

14 Jul '23

Module: wine Branch: master Commit: 77981d45488d2d4458b90eee5e8acb7a17e84100 URL: https://gitlab.winehq.org/wine/wine/-/commit/77981d45488d2d4458b90eee5e8acb… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Jul 13 18:01:28 2023 -0500 opengl32: Copy to the wow64 buffer even for write maps. GL_MAP_WRITE_BIT does not mean that the buffer will be filled, unless an INVALIDATE bit is explicitly set. The application is free to partially update the buffer, even if it does not read from it. Thanks to Aida Jonikienė for doing most of the debugging here. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55045 --- dlls/opengl32/unix_wgl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/opengl32/unix_wgl.c b/dlls/opengl32/unix_wgl.c index e58e5b5d9b5..92a77b78f18 100644 --- a/dlls/opengl32/unix_wgl.c +++ b/dlls/opengl32/unix_wgl.c @@ -1827,7 +1827,7 @@ static NTSTATUS wow64_map_buffer( TEB *teb, GLint buffer, GLenum target, void *p { if (*ret) /* wow64 pointer provided, map buffer to it */ { - if (access & GL_MAP_READ_BIT) + if (!(access & (GL_MAP_INVALIDATE_RANGE_BIT | GL_MAP_INVALIDATE_BUFFER_BIT))) { TRACE( "Copying %#zx from buffer at %p to wow64 buffer %p\n", size, ptr, UlongToPtr(*ret) ); memcpy( UlongToPtr(*ret), ptr, size );

1 0

Zebediah Figura : opengl32: Correctly interpret glMapBuffer() access in wow64 mapping.
by Alexandre Julliard 14 Jul '23

14 Jul '23

Module: wine Branch: master Commit: 59ecdbd43e9a839979f54a7ac2db8a213362f048 URL: https://gitlab.winehq.org/wine/wine/-/commit/59ecdbd43e9a839979f54a7ac2db8a… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Jul 13 18:12:40 2023 -0500 opengl32: Correctly interpret glMapBuffer() access in wow64 mapping. --- dlls/opengl32/unix_wgl.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/opengl32/unix_wgl.c b/dlls/opengl32/unix_wgl.c index 92a77b78f18..a03f8337fbf 100644 --- a/dlls/opengl32/unix_wgl.c +++ b/dlls/opengl32/unix_wgl.c @@ -1857,6 +1857,19 @@ static NTSTATUS wow64_map_buffer( TEB *teb, GLint buffer, GLenum target, void *p return STATUS_INVALID_ADDRESS; } +static GLbitfield map_range_flags_from_map_flags( GLenum flags ) +{ + switch (flags) + { + case GL_READ_ONLY: return GL_MAP_READ_BIT; + case GL_WRITE_ONLY: return GL_MAP_WRITE_BIT; + case GL_READ_WRITE: return GL_MAP_READ_BIT | GL_MAP_WRITE_BIT; + default: + ERR( "invalid map flags %#x\n", flags ); + return GL_MAP_READ_BIT | GL_MAP_WRITE_BIT; + } +} + static NTSTATUS wow64_unmap_buffer( void *ptr, SIZE_T size, GLbitfield access ) { void *wow_ptr; @@ -1968,7 +1981,8 @@ static NTSTATUS wow64_gl_map_buffer( void *args, NTSTATUS (*gl_map_buffer64)(voi if (params32->ret) params.ret = get_buffer_pointer( params.teb, params.target ); else if ((status = gl_map_buffer64( &params ))) return status; - status = wow64_map_buffer( params.teb, 0, params.target, params.ret, 0, params.access, &params32->ret ); + status = wow64_map_buffer( params.teb, 0, params.target, params.ret, 0, + map_range_flags_from_map_flags( params.access ), &params32->ret ); if (!status || status == STATUS_INVALID_ADDRESS) return status; unmap_buffer( params.teb, params.target ); @@ -2038,7 +2052,8 @@ static NTSTATUS wow64_gl_map_named_buffer( void *args, NTSTATUS (*gl_map_named_b if (params32->ret) params.ret = get_named_buffer_pointer( params.teb, params.buffer ); else if ((status = gl_map_named_buffer64( &params ))) return status; - status = wow64_map_buffer( params.teb, params.buffer, 0, params.ret, 0, params.access, &params32->ret ); + status = wow64_map_buffer( params.teb, params.buffer, 0, params.ret, 0, + map_range_flags_from_map_flags( params.access ), &params32->ret ); if (!status || status == STATUS_INVALID_ADDRESS) return status; unmap_named_buffer( params.teb, params.buffer );

1 0

Alexandre Julliard : mscoree: Use nameless unions/structs.
by Alexandre Julliard 14 Jul '23

14 Jul '23

Module: wine Branch: master Commit: 2ba8129ce08c160990551e92495479e8f09ab48c URL: https://gitlab.winehq.org/wine/wine/-/commit/2ba8129ce08c160990551e92495479… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 14 09:22:42 2023 +0200 mscoree: Use nameless unions/structs. --- dlls/mscoree/assembly.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/mscoree/assembly.c b/dlls/mscoree/assembly.c index 8a209dad425..e361270a89b 100644 --- a/dlls/mscoree/assembly.c +++ b/dlls/mscoree/assembly.c @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define NONAMELESSUNION - #include <stdarg.h> #include <stdio.h> @@ -306,7 +304,7 @@ HRESULT assembly_get_native_entrypoint(ASSEMBLY *assembly, NativeEntryPointFunc { if (assembly->corhdr->Flags & COMIMAGE_FLAGS_NATIVE_ENTRYPOINT) { - *func = assembly_rva_to_va(assembly, assembly->corhdr->u.EntryPointRVA); + *func = assembly_rva_to_va(assembly, assembly->corhdr->EntryPointRVA); return S_OK; } else

1 0

Alexandre Julliard : mshtml: Use nameless unions/structs.
by Alexandre Julliard 14 Jul '23

14 Jul '23

Module: wine Branch: master Commit: 102a9bd94b35fe3f27fef80a8833c166809b4443 URL: https://gitlab.winehq.org/wine/wine/-/commit/102a9bd94b35fe3f27fef80a8833c1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 14 09:23:21 2023 +0200 mshtml: Use nameless unions/structs. --- dlls/mshtml/dispex.c | 10 ++++------ dlls/mshtml/navigate.c | 6 ++---- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index e332dfdbd9d..fecc7f6690c 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -19,8 +19,6 @@ #include <stdarg.h> #define COBJMACROS -#define NONAMELESSUNION - #include "windef.h" #include "winbase.h" #include "winuser.h" @@ -362,11 +360,11 @@ static void add_func_info(dispex_data_t *data, tid_t tid, const FUNCDESC *desc, for(i=0; i < info->argc; i++) { TYPEDESC *tdesc = &desc->lprgelemdescParam[i].tdesc; - if(tdesc->vt == VT_PTR && tdesc->u.lptdesc->vt == VT_USERDEFINED) { + if(tdesc->vt == VT_PTR && tdesc->lptdesc->vt == VT_USERDEFINED) { ITypeInfo *ref_type_info; TYPEATTR *attr; - hres = ITypeInfo_GetRefTypeInfo(dti, tdesc->u.lptdesc->u.hreftype, &ref_type_info); + hres = ITypeInfo_GetRefTypeInfo(dti, tdesc->lptdesc->hreftype, &ref_type_info); if(FAILED(hres)) { ERR("Could not get referenced type info: %08lx\n", hres); return; @@ -389,9 +387,9 @@ static void add_func_info(dispex_data_t *data, tid_t tid, const FUNCDESC *desc, return; /* Fallback to ITypeInfo for unsupported arg types */ } - if(desc->lprgelemdescParam[i].u.paramdesc.wParamFlags & PARAMFLAG_FHASDEFAULT) { + if(desc->lprgelemdescParam[i].paramdesc.wParamFlags & PARAMFLAG_FHASDEFAULT) { hres = VariantCopy(&info->arg_info[i].default_value, - &desc->lprgelemdescParam[i].u.paramdesc.pparamdescex->varDefaultValue); + &desc->lprgelemdescParam[i].paramdesc.pparamdescex->varDefaultValue); if(FAILED(hres)) { ERR("Could not copy default value: %08lx\n", hres); return; diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index eb365c99af9..4706167875e 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -19,8 +19,6 @@ #include <stdarg.h> #define COBJMACROS -#define NONAMELESSUNION - #include "windef.h" #include "winbase.h" #include "winuser.h" @@ -386,7 +384,7 @@ static HRESULT WINAPI BindStatusCallback_GetBindInfo(IBindStatusCallback *iface, pbindinfo->dwBindVerb = BINDVERB_POST; pbindinfo->stgmedData.tymed = TYMED_HGLOBAL; - pbindinfo->stgmedData.u.hGlobal = This->request_data.post_data; + pbindinfo->stgmedData.hGlobal = This->request_data.post_data; pbindinfo->stgmedData.pUnkForRelease = (IUnknown*)&This->IBindStatusCallback_iface; IBindStatusCallback_AddRef(&This->IBindStatusCallback_iface); } @@ -401,7 +399,7 @@ static HRESULT WINAPI BindStatusCallback_OnDataAvailable(IBindStatusCallback *if TRACE("(%p)->(%08lx %ld %p %p)\n", This, grfBSCF, dwSize, pformatetc, pstgmed); - return This->vtbl->read_data(This, pstgmed->u.pstm); + return This->vtbl->read_data(This, pstgmed->pstm); } static HRESULT WINAPI BindStatusCallback_OnObjectAvailable(IBindStatusCallback *iface,

1 0

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

14 Jul '23

Module: wine Branch: master Commit: 8de0a9dc740d3ed1e3cf9460852db7e609122f3b URL: https://gitlab.winehq.org/wine/wine/-/commit/8de0a9dc740d3ed1e3cf9460852db7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 14 09:23:45 2023 +0200 msi: Use nameless unions/structs. --- dlls/msi/dialog.c | 7 +++---- dlls/msi/msi.c | 4 +--- dlls/msi/package.c | 6 ++---- dlls/msi/suminfo.c | 2 -- 4 files changed, 6 insertions(+), 13 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 6c1b9ebf2a8..ba8ca526266 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -20,7 +20,6 @@ */ #define COBJMACROS -#define NONAMELESSUNION #include <stdarg.h> @@ -2439,9 +2438,9 @@ static void seltree_add_child_features( MSIPACKAGE *package, HWND hwnd, const WC memset( &tvis, 0, sizeof tvis ); tvis.hParent = hParent; tvis.hInsertAfter = TVI_LAST; - tvis.u.item.mask = TVIF_TEXT | TVIF_PARAM; - tvis.u.item.pszText = feature->Title; - tvis.u.item.lParam = (LPARAM) feature; + tvis.item.mask = TVIF_TEXT | TVIF_PARAM; + tvis.item.pszText = feature->Title; + tvis.item.lParam = (LPARAM) feature; hitem = (HTREEITEM) SendMessageW( hwnd, TVM_INSERTITEMW, 0, (LPARAM) &tvis ); if (!hitem) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 42f2122bed8..2b821d08cf5 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -21,8 +21,6 @@ #include <stdarg.h> #define COBJMACROS -#define NONAMELESSUNION - #include "windef.h" #include "winbase.h" #include "winreg.h" @@ -2548,7 +2546,7 @@ HRESULT WINAPI MsiGetFileSignatureInformationW( const WCHAR *path, DWORD flags, data.dwUIChoice = WTD_UI_NONE; data.fdwRevocationChecks = WTD_REVOKE_WHOLECHAIN; data.dwUnionChoice = WTD_CHOICE_FILE; - data.u.pFile = &info; + data.pFile = &info; data.dwStateAction = WTD_STATEACTION_VERIFY; data.dwUIContext = WTD_UICONTEXT_INSTALL; diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 081ab2caa3b..8c2168d9226 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #define COBJMACROS #include <stdarg.h> @@ -776,7 +774,7 @@ static VOID set_installer_properties(MSIPACKAGE *package) GetNativeSystemInfo( &sys_info ); len = swprintf( bufstr, ARRAY_SIZE(bufstr), L"%d", sys_info.wProcessorLevel ); msi_set_property( package->db, L"Intel", bufstr, len ); - if (sys_info.u.s.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_INTEL) + if (sys_info.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_INTEL) { GetSystemDirectoryW( pth, MAX_PATH ); PathAddBackslashW( pth ); @@ -792,7 +790,7 @@ static VOID set_installer_properties(MSIPACKAGE *package) PathAddBackslashW( pth ); msi_set_property( package->db, L"CommonFilesFolder", pth, -1 ); } - else if (sys_info.u.s.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64) + else if (sys_info.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64) { msi_set_property( package->db, L"MsiAMD64", bufstr, -1 ); msi_set_property( package->db, L"Msix64", bufstr, -1 ); diff --git a/dlls/msi/suminfo.c b/dlls/msi/suminfo.c index 26da79ce8e1..93ecc9f5e04 100644 --- a/dlls/msi/suminfo.c +++ b/dlls/msi/suminfo.c @@ -21,8 +21,6 @@ #include <stdarg.h> #define COBJMACROS -#define NONAMELESSUNION - #include "stdio.h" #include "windef.h" #include "winbase.h"

1 0

Alexandre Julliard : msxml3: Use nameless unions/structs.
by Alexandre Julliard 14 Jul '23

14 Jul '23

Module: wine Branch: master Commit: 194b4025b05e8c220492b589cbb55a3fda0f3651 URL: https://gitlab.winehq.org/wine/wine/-/commit/194b4025b05e8c220492b589cbb55a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 14 09:24:57 2023 +0200 msxml3: Use nameless unions/structs. --- dlls/msxml3/bsc.c | 3 +-- dlls/msxml3/httprequest.c | 5 ++--- dlls/msxml3/xmlview.c | 6 ++---- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/dlls/msxml3/bsc.c b/dlls/msxml3/bsc.c index 5e3b60d92b5..e6b7799e843 100644 --- a/dlls/msxml3/bsc.c +++ b/dlls/msxml3/bsc.c @@ -17,7 +17,6 @@ */ #define COBJMACROS -#define NONAMELESSUNION #include <stdarg.h> @@ -206,7 +205,7 @@ static HRESULT WINAPI bsc_OnDataAvailable( do { - hr = IStream_Read(pstgmed->u.pstm, buf, sizeof(buf), &read); + hr = IStream_Read(pstgmed->pstm, buf, sizeof(buf), &read); if(FAILED(hr)) break; diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c index cc384a380e5..459466a1234 100644 --- a/dlls/msxml3/httprequest.c +++ b/dlls/msxml3/httprequest.c @@ -20,7 +20,6 @@ */ #define COBJMACROS -#define NONAMELESSUNION #include <stdarg.h> @@ -375,7 +374,7 @@ static HRESULT WINAPI BindStatusCallback_GetBindInfo(IBindStatusCallback *iface, if (This->request->verb != BINDVERB_GET && This->body) { pbindinfo->stgmedData.tymed = TYMED_HGLOBAL; - pbindinfo->stgmedData.u.hGlobal = This->body; + pbindinfo->stgmedData.hGlobal = This->body; pbindinfo->cbstgmedData = GlobalSize(This->body); /* callback owns passed body pointer */ IBindStatusCallback_QueryInterface(iface, &IID_IUnknown, (void**)&pbindinfo->stgmedData.pUnkForRelease); @@ -403,7 +402,7 @@ static HRESULT WINAPI BindStatusCallback_OnDataAvailable(IBindStatusCallback *if do { - hr = IStream_Read(stgmed->u.pstm, buf, sizeof(buf), &read); + hr = IStream_Read(stgmed->pstm, buf, sizeof(buf), &read); if (hr != S_OK) break; hr = IStream_Write(This->stream, buf, read, &written); diff --git a/dlls/msxml3/xmlview.c b/dlls/msxml3/xmlview.c index 91f3ecf4805..7139c5c3c24 100644 --- a/dlls/msxml3/xmlview.c +++ b/dlls/msxml3/xmlview.c @@ -19,8 +19,6 @@ #include <stdarg.h> #define COBJMACROS -#define NONAMELESSUNION - #include "windef.h" #include "winbase.h" #include "ole2.h" @@ -348,7 +346,7 @@ static inline HRESULT report_data(BindStatusCallback *This) return hres; stgmedium.tymed = TYMED_ISTREAM; - stgmedium.u.pstm = This->stream; + stgmedium.pstm = This->stream; stgmedium.pUnkForRelease = NULL; hres = IBindStatusCallback_OnDataAvailable(This->bsc, @@ -518,7 +516,7 @@ static HRESULT WINAPI XMLView_BindStatusCallback_OnDataAvailable( return E_FAIL; do { - hres = IStream_Read(pstgmed->u.pstm, buf, sizeof(buf), &size); + hres = IStream_Read(pstgmed->pstm, buf, sizeof(buf), &size); IStream_Write(This->stream, buf, size, &size); } while(hres==S_OK && size);

1 0

Alexandre Julliard : ndis.sys: Use nameless unions/structs.
by Alexandre Julliard 14 Jul '23

14 Jul '23

Module: wine Branch: master Commit: 240df39c1cbc3ec8992e8efda94f15c4dd0ac6aa URL: https://gitlab.winehq.org/wine/wine/-/commit/240df39c1cbc3ec8992e8efda94f15… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 14 09:25:19 2023 +0200 ndis.sys: Use nameless unions/structs. --- dlls/ndis.sys/main.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/ndis.sys/main.c b/dlls/ndis.sys/main.c index b5ce2fd8f5b..bdfe7aa4742 100644 --- a/dlls/ndis.sys/main.c +++ b/dlls/ndis.sys/main.c @@ -21,7 +21,6 @@ #include <stdarg.h> -#define NONAMELESSUNION #include "ntstatus.h" #define WIN32_NO_STATUS #include "windef.h" @@ -48,7 +47,7 @@ static void query_global_stats(IRP *irp, const MIB_IF_ROW2 *netdev) if (irpsp->Parameters.DeviceIoControl.InputBufferLength != sizeof(oid)) { - irp->IoStatus.u.Status = STATUS_INVALID_PARAMETER; + irp->IoStatus.Status = STATUS_INVALID_PARAMETER; return; } oid = *(DWORD *)irp->AssociatedIrp.SystemBuffer; @@ -60,19 +59,19 @@ static void query_global_stats(IRP *irp, const MIB_IF_ROW2 *netdev) { if (len < sizeof(NDIS_MEDIUM)) { - irp->IoStatus.u.Status = STATUS_INVALID_PARAMETER; + irp->IoStatus.Status = STATUS_INVALID_PARAMETER; break; } *(NDIS_MEDIUM *)response = netdev->MediaType; irp->IoStatus.Information = sizeof(netdev->MediaType); - irp->IoStatus.u.Status = STATUS_SUCCESS; + irp->IoStatus.Status = STATUS_SUCCESS; break; } case OID_802_3_PERMANENT_ADDRESS: { irp->IoStatus.Information = netdev->PhysicalAddressLength; if (len < netdev->PhysicalAddressLength) - irp->IoStatus.u.Status = STATUS_INVALID_PARAMETER; + irp->IoStatus.Status = STATUS_INVALID_PARAMETER; else memcpy( response, netdev->PermanentPhysicalAddress, sizeof(netdev->PermanentPhysicalAddress) ); break; @@ -81,7 +80,7 @@ static void query_global_stats(IRP *irp, const MIB_IF_ROW2 *netdev) { irp->IoStatus.Information = netdev->PhysicalAddressLength; if (len < netdev->PhysicalAddressLength) - irp->IoStatus.u.Status = STATUS_INVALID_PARAMETER; + irp->IoStatus.Status = STATUS_INVALID_PARAMETER; else memcpy( response, netdev->PhysicalAddress, sizeof(netdev->PhysicalAddress) ); break; @@ -89,7 +88,7 @@ static void query_global_stats(IRP *irp, const MIB_IF_ROW2 *netdev) } default: FIXME( "Unsupported OID %lx\n", oid ); - irp->IoStatus.u.Status = STATUS_INVALID_PARAMETER; + irp->IoStatus.Status = STATUS_INVALID_PARAMETER; break; } } @@ -112,11 +111,11 @@ static NTSTATUS WINAPI ndis_ioctl(DEVICE_OBJECT *device, IRP *irp) break; default: FIXME( "ioctl %lx not supported\n", irpsp->Parameters.DeviceIoControl.IoControlCode ); - irp->IoStatus.u.Status = STATUS_NOT_SUPPORTED; + irp->IoStatus.Status = STATUS_NOT_SUPPORTED; break; } - status = irp->IoStatus.u.Status; + status = irp->IoStatus.Status; IoCompleteRequest( irp, IO_NO_INCREMENT ); return status; }

1 0