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

Alexandre Julliard : winemac.drv: Use nameless unions/structs.
by Alexandre Julliard July 17, 2023

July 17, 2023

Module: wine Branch: master Commit: bb9030cb7808551dd4b6860d279d4c11e5e3b03d URL: https://gitlab.winehq.org/wine/wine/-/commit/bb9030cb7808551dd4b6860d279d4c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 17 11:35:47 2023 +0200 winemac.drv: Use nameless unions/structs. --- dlls/winemac.drv/dragdrop.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/winemac.drv/dragdrop.c b/dlls/winemac.drv/dragdrop.c index 45615c68b71..bbf74ac80c2 100644 --- a/dlls/winemac.drv/dragdrop.c +++ b/dlls/winemac.drv/dragdrop.c @@ -20,8 +20,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define NONAMELESSUNION - #include "ntstatus.h" #define WIN32_NO_STATUS #include "macdrv_dll.h" @@ -167,9 +165,9 @@ static HRESULT WINAPI dddo_GetData(IDataObject* iface, FORMATETC* formatEtc, STG if (SUCCEEDED(hr)) { medium->tymed = TYMED_HGLOBAL; - medium->u.hGlobal = get_pasteboard_data(This->pasteboard, formatEtc->cfFormat); + medium->hGlobal = get_pasteboard_data(This->pasteboard, formatEtc->cfFormat); medium->pUnkForRelease = NULL; - hr = medium->u.hGlobal ? S_OK : E_OUTOFMEMORY; + hr = medium->hGlobal ? S_OK : E_OUTOFMEMORY; } return hr;

1 0

Alexandre Julliard : wineandroid.drv: Use nameless unions/structs.
by Alexandre Julliard July 17, 2023

July 17, 2023

Module: wine Branch: master Commit: 744237ecf694dc59c4fae5e8b6ce37f43a7e04a0 URL: https://gitlab.winehq.org/wine/wine/-/commit/744237ecf694dc59c4fae5e8b6ce37… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 17 11:35:34 2023 +0200 wineandroid.drv: Use nameless unions/structs. --- dlls/wineandroid.drv/device.c | 13 +++---- dlls/wineandroid.drv/init.c | 12 +++---- dlls/wineandroid.drv/keyboard.c | 33 ++++++++---------- dlls/wineandroid.drv/window.c | 77 ++++++++++++++++++++--------------------- 4 files changed, 62 insertions(+), 73 deletions(-)

1 0

Alexandre Julliard : winex11.drv: Use nameless unions/structs.
by Alexandre Julliard July 17, 2023

July 17, 2023

Module: wine Branch: master Commit: 12869e46bda642194a0a5665b2e0ea0a2475ba08 URL: https://gitlab.winehq.org/wine/wine/-/commit/12869e46bda642194a0a5665b2e0ea… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 17 11:36:40 2023 +0200 winex11.drv: Use nameless unions/structs. --- dlls/winex11.drv/desktop.c | 3 -- dlls/winex11.drv/keyboard.c | 14 +++---- dlls/winex11.drv/mouse.c | 95 ++++++++++++++++++++++----------------------- dlls/winex11.drv/systray.c | 5 +-- dlls/winex11.drv/xdnd.c | 10 ++--- dlls/winex11.drv/xrandr.c | 42 ++++++++++---------- dlls/winex11.drv/xvidmode.c | 15 +++---- 7 files changed, 85 insertions(+), 99 deletions(-)

1 0

Alexandre Julliard : usbd.sys: Use nameless unions/structs.
by Alexandre Julliard July 17, 2023

July 17, 2023

Module: wine Branch: master Commit: 57bfaa7514373643b46d3794031c7195ab148b74 URL: https://gitlab.winehq.org/wine/wine/-/commit/57bfaa7514373643b46d3794031c71… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 17 11:33:54 2023 +0200 usbd.sys: Use nameless unions/structs. --- dlls/usbd.sys/usbd.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/usbd.sys/usbd.c b/dlls/usbd.sys/usbd.c index d562cf1f81e..bceebe15cc9 100644 --- a/dlls/usbd.sys/usbd.c +++ b/dlls/usbd.sys/usbd.c @@ -18,8 +18,6 @@ #include <stdarg.h> -#define NONAMELESSUNION - #include "ntstatus.h" #define WIN32_NO_STATUS #include "windef.h" @@ -66,7 +64,7 @@ PURB WINAPI USBD_CreateConfigurationRequest( } urb = USBD_CreateConfigurationRequestEx( ConfigurationDescriptor, interfaceList ); if (urb) - *Siz = urb->u.UrbHeader.Length; + *Siz = urb->UrbHeader.Length; ExFreePool( interfaceList ); } return urb; @@ -98,10 +96,10 @@ PURB WINAPI USBD_CreateConfigurationRequestEx( USBD_INTERFACE_INFORMATION *interfaceInfo; RtlZeroMemory( urb, size ); - urb->u.UrbSelectConfiguration.Hdr.Length = size; - urb->u.UrbSelectConfiguration.Hdr.Function = URB_FUNCTION_SELECT_CONFIGURATION; - urb->u.UrbSelectConfiguration.ConfigurationDescriptor = ConfigurationDescriptor; - interfaceInfo = &urb->u.UrbSelectConfiguration.Interface; + urb->UrbSelectConfiguration.Hdr.Length = size; + urb->UrbSelectConfiguration.Hdr.Function = URB_FUNCTION_SELECT_CONFIGURATION; + urb->UrbSelectConfiguration.ConfigurationDescriptor = ConfigurationDescriptor; + interfaceInfo = &urb->UrbSelectConfiguration.Interface; for (interfaceEntry = InterfaceList; interfaceEntry->InterfaceDescriptor; interfaceEntry++) { ULONG i;

1 0

Alexandre Julliard : wined3d: Use nameless unions/structs.
by Alexandre Julliard July 17, 2023

July 17, 2023

Module: wine Branch: master Commit: e8f82d4d15013ca012e7dd618cfcc4a6e3edbdb9 URL: https://gitlab.winehq.org/wine/wine/-/commit/e8f82d4d15013ca012e7dd618cfcc4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 17 11:35:05 2023 +0200 wined3d: Use nameless unions/structs. --- dlls/wined3d/directx.c | 20 ++++++++++---------- dlls/wined3d/wined3d_private.h | 2 -- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index b77c1f4e133..e4dc14838f1 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -139,7 +139,7 @@ static HRESULT wined3d_output_init(struct wined3d_output *output, unsigned int o close_adapter_desc.hAdapter = open_adapter_desc.hAdapter; D3DKMTCloseAdapter(&close_adapter_desc); - create_device_desc.u.hAdapter = adapter->kmt_adapter; + create_device_desc.hAdapter = adapter->kmt_adapter; if (D3DKMTCreateDevice(&create_device_desc)) return E_FAIL; @@ -1261,7 +1261,7 @@ static void wined3d_output_update_modes(struct wined3d_output *output, bool cach if (mode.dmFields & DM_DISPLAYFLAGS) { - if (mode.u2.dmDisplayFlags & DM_INTERLACED) + if (mode.dmDisplayFlags & DM_INTERLACED) wined3d_mode->scanline_ordering = WINED3D_SCANLINE_ORDERING_INTERLACED; else wined3d_mode->scanline_ordering = WINED3D_SCANLINE_ORDERING_PROGRESSIVE; @@ -1511,14 +1511,14 @@ HRESULT CDECL wined3d_output_get_display_mode(const struct wined3d_output *outpu if (!(m.dmFields & DM_DISPLAYFLAGS)) mode->scanline_ordering = WINED3D_SCANLINE_ORDERING_UNKNOWN; - else if (m.u2.dmDisplayFlags & DM_INTERLACED) + else if (m.dmDisplayFlags & DM_INTERLACED) mode->scanline_ordering = WINED3D_SCANLINE_ORDERING_INTERLACED; else mode->scanline_ordering = WINED3D_SCANLINE_ORDERING_PROGRESSIVE; if (rotation) { - switch (m.u1.s2.dmDisplayOrientation) + switch (m.dmDisplayOrientation) { case DMDO_DEFAULT: *rotation = WINED3D_DISPLAY_ROTATION_0; @@ -1533,7 +1533,7 @@ HRESULT CDECL wined3d_output_get_display_mode(const struct wined3d_output *outpu *rotation = WINED3D_DISPLAY_ROTATION_270; break; default: - FIXME("Unhandled display rotation %#lx.\n", m.u1.s2.dmDisplayOrientation); + FIXME("Unhandled display rotation %#lx.\n", m.dmDisplayOrientation); *rotation = WINED3D_DISPLAY_ROTATION_UNSPECIFIED; break; } @@ -1560,7 +1560,7 @@ static BOOL equal_display_mode(const DEVMODEW *mode1, const DEVMODEW *mode2) return FALSE; if (mode1->dmFields & mode2->dmFields & DM_DISPLAYFLAGS - && mode1->u2.dmDisplayFlags != mode2->u2.dmDisplayFlags) + && mode1->dmDisplayFlags != mode2->dmDisplayFlags) return FALSE; if (mode1->dmFields & mode2->dmFields & DM_DISPLAYFREQUENCY @@ -1568,12 +1568,12 @@ static BOOL equal_display_mode(const DEVMODEW *mode1, const DEVMODEW *mode2) return FALSE; if (mode1->dmFields & mode2->dmFields & DM_DISPLAYORIENTATION - && mode1->u1.s2.dmDisplayOrientation != mode2->u1.s2.dmDisplayOrientation) + && mode1->dmDisplayOrientation != mode2->dmDisplayOrientation) return FALSE; if (mode1->dmFields & mode2->dmFields & DM_POSITION - && (mode1->u1.s2.dmPosition.x != mode2->u1.s2.dmPosition.x - || mode1->u1.s2.dmPosition.y != mode2->u1.s2.dmPosition.y)) + && (mode1->dmPosition.x != mode2->dmPosition.x + || mode1->dmPosition.y != mode2->dmPosition.y)) return FALSE; return TRUE; @@ -1684,7 +1684,7 @@ HRESULT CDECL wined3d_output_set_display_mode(struct wined3d_output *output, { new_mode.dmFields |= DM_DISPLAYFLAGS; if (mode->scanline_ordering == WINED3D_SCANLINE_ORDERING_INTERLACED) - new_mode.u2.dmDisplayFlags |= DM_INTERLACED; + new_mode.dmDisplayFlags |= DM_INTERLACED; } new_format_id = mode->format_id; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 6e2bdc8aaf1..dd12453c66e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -38,8 +38,6 @@ #include <vkd3d_shader.h> #include "ntstatus.h" #define WIN32_NO_STATUS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #define COBJMACROS #include "windef.h" #include "winbase.h"

1 0

Alexandre Julliard : wbemprox: Use nameless unions/structs.
by Alexandre Julliard July 17, 2023

July 17, 2023

Module: wine Branch: master Commit: 8a2dca2563bc4d68f7e7fb5204cacb179d2605ae URL: https://gitlab.winehq.org/wine/wine/-/commit/8a2dca2563bc4d68f7e7fb5204cacb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 17 11:34:13 2023 +0200 wbemprox: Use nameless unions/structs. --- dlls/wbemprox/builtin.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 3d5b1df2466..346c2a98eed 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -17,8 +17,6 @@ */ #define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include <stdarg.h> #include <intrin.h> @@ -1578,7 +1576,7 @@ static UINT get_logical_processor_count( UINT *num_physical, UINT *num_packages if (entry->Relationship == RelationProcessorCore) { core_relation_count++; - if (entry->u.Processor.Flags & LTP_PC_SMT) smt_enabled = TRUE; + if (entry->Processor.Flags & LTP_PC_SMT) smt_enabled = TRUE; } else if (entry->Relationship == RelationProcessorPackage) { @@ -1634,7 +1632,7 @@ static const WCHAR *get_systemtype(void) { SYSTEM_INFO info; GetNativeSystemInfo( &info ); - if (info.u.s.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64) return L"x64 based PC"; + if (info.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64) return L"x64 based PC"; return L"x86 based PC"; } @@ -2878,14 +2876,14 @@ static enum fill_status fill_networkadapter( struct table *table, const struct e if (aa->IfType == IF_TYPE_SOFTWARE_LOOPBACK) continue; rec = (struct record_networkadapter *)(table->data + offset); - swprintf( device_id, ARRAY_SIZE( device_id ), L"%u", aa->u.s.IfIndex ); + swprintf( device_id, ARRAY_SIZE( device_id ), L"%u", aa->IfIndex ); rec->adaptertype = get_adaptertype( aa->IfType, &adaptertypeid, &physical ); rec->adaptertypeid = adaptertypeid; rec->description = wcsdup( aa->Description ); rec->device_id = wcsdup( device_id ); rec->guid = get_networkadapter_guid( &aa->Luid ); - rec->index = aa->u.s.IfIndex; - rec->interface_index = aa->u.s.IfIndex; + rec->index = aa->IfIndex; + rec->interface_index = aa->IfIndex; rec->mac_address = get_mac_address( aa->PhysicalAddress, aa->PhysicalAddressLength ); rec->manufacturer = L"The Wine Project"; rec->name = wcsdup( aa->FriendlyName ); @@ -3115,7 +3113,7 @@ static enum fill_status fill_networkadapterconfig( struct table *table, const st rec->dnsdomain = L""; rec->dnshostname = get_dnshostname( aa->FirstUnicastAddress ); rec->dnsserversearchorder = get_dnsserversearchorder( aa->FirstDnsServerAddress ); - rec->index = aa->u.s.IfIndex; + rec->index = aa->IfIndex; rec->ipaddress = get_ipaddress( aa->FirstUnicastAddress ); rec->ipconnectionmetric = 20; rec->ipenabled = -1; @@ -3243,7 +3241,7 @@ static enum fill_status fill_printer( struct table *table, const struct expr *co swprintf( id, ARRAY_SIZE( id ), L"Printer%u", i ); rec->device_id = wcsdup( id ); rec->drivername = wcsdup( info[i].pDriverName ); - rec->horizontalresolution = info[i].pDevMode->u1.s1.dmPrintQuality; + rec->horizontalresolution = info[i].pDevMode->dmPrintQuality; rec->local = -1; rec->location = wcsdup( info[i].pLocation ); rec->name = wcsdup( info[i].pPrinterName ); @@ -3371,7 +3369,7 @@ static const WCHAR *get_osarchitecture(void) { SYSTEM_INFO info; GetNativeSystemInfo( &info ); - if (info.u.s.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64) return L"64-bit"; + if (info.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64) return L"64-bit"; return L"32-bit"; } static void get_processor_caption( WCHAR *caption, UINT len )

1 0

Alexandre Julliard : wevtapi: Use nameless unions/structs.
by Alexandre Julliard July 17, 2023

July 17, 2023

Module: wine Branch: master Commit: d75127d41acea6b3f1ff4fd59aab50e4507ffb3c URL: https://gitlab.winehq.org/wine/wine/-/commit/d75127d41acea6b3f1ff4fd59aab50… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 17 11:34:29 2023 +0200 wevtapi: Use nameless unions/structs. --- dlls/wevtapi/main.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/wevtapi/main.c b/dlls/wevtapi/main.c index f0db41ebf88..cd8e7239178 100644 --- a/dlls/wevtapi/main.c +++ b/dlls/wevtapi/main.c @@ -19,8 +19,6 @@ #include <stdarg.h> -#define NONAMELESSUNION - #include "windef.h" #include "winbase.h" #include "winevt.h" @@ -63,8 +61,8 @@ BOOL WINAPI EvtGetChannelConfigProperty(EVT_HANDLE ChannelConfig, return FALSE; } - PropertyValueBuffer->u.StringVal = (LPWSTR)(PropertyValueBuffer + 1); - wcscpy((LPWSTR)PropertyValueBuffer->u.StringVal, log_pathW); + PropertyValueBuffer->StringVal = (LPWSTR)(PropertyValueBuffer + 1); + wcscpy((LPWSTR)PropertyValueBuffer->StringVal, log_pathW); PropertyValueBuffer->Type = EvtVarTypeString; return TRUE;

1 0

Alexandre Julliard : sane.ds: Use nameless unions/structs.
by Alexandre Julliard July 17, 2023

July 17, 2023

Module: wine Branch: master Commit: 72ee10b5d57ac16af47658ccbcfc6d68fe2937e4 URL: https://gitlab.winehq.org/wine/wine/-/commit/72ee10b5d57ac16af47658ccbcfc6d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 17 11:33:39 2023 +0200 sane.ds: Use nameless unions/structs. --- dlls/sane.ds/ui.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/sane.ds/ui.c b/dlls/sane.ds/ui.c index f5ce43c086f..557cf81e0b1 100644 --- a/dlls/sane.ds/ui.c +++ b/dlls/sane.ds/ui.c @@ -22,8 +22,6 @@ #include <stdarg.h> #include <stdio.h> -#define NONAMELESSUNION - #include "sane_i.h" #include "winuser.h" #include "winnls.h" @@ -491,7 +489,7 @@ BOOL DoScannerUI(void) { struct option_descriptor opt; - psp[page_count].u.pResource = create_options_page(hdc, &index, + psp[page_count].pResource = create_options_page(hdc, &index, optcount, TRUE); opt.optno = index; SANE_CALL( option_get_descriptor, &opt ); @@ -501,7 +499,7 @@ BOOL DoScannerUI(void) psp[page_count].pszTitle = wcsdup( opt.title ); } - if (psp[page_count].u.pResource) + if (psp[page_count].pResource) { psp[page_count].dwSize = sizeof(PROPSHEETPAGEW); psp[page_count].dwFlags = PSP_DLGINDIRECT | PSP_USETITLE; @@ -526,18 +524,18 @@ BOOL DoScannerUI(void) psh.dwFlags = PSH_PROPSHEETPAGE|PSH_PROPTITLE|PSH_USECALLBACK; psh.hwndParent = activeDS.hwndOwner; psh.hInstance = SANE_instance; - psh.u.pszIcon = 0; + psh.pszIcon = 0; psh.pszCaption = szCaption; psh.nPages = page_count; - psh.u2.nStartPage = 0; - psh.u3.ppsp = (LPCPROPSHEETPAGEW)psp; + psh.nStartPage = 0; + psh.ppsp = (LPCPROPSHEETPAGEW)psp; psh.pfnCallback = PropSheetProc; psrc = PropertySheetW(&psh); for(index = 0; index < page_count; index ++) { - free((LPBYTE)psp[index].u.pResource); + free((LPBYTE)psp[index].pResource); free((LPBYTE)psp[index].pszTitle); } free(szCaption);

1 0

Alexandre Julliard : quartz: Use nameless unions/structs.
by Alexandre Julliard July 17, 2023

July 17, 2023

Module: wine Branch: master Commit: fe8d66bf49dc4023fa17080edbada662ffc23fe5 URL: https://gitlab.winehq.org/wine/wine/-/commit/fe8d66bf49dc4023fa17080edbada6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 17 11:33:22 2023 +0200 quartz: Use nameless unions/structs. --- dlls/quartz/filesource.c | 13 +++++-------- dlls/quartz/filtermapper.c | 2 -- dlls/quartz/regsvr.c | 2 -- 3 files changed, 5 insertions(+), 12 deletions(-) diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index 0579f564af7..48950026ddf 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -18,9 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define NONAMELESSUNION -#define NONAMELESSSTRUCT - #include "quartz_private.h" #include "wine/debug.h" @@ -740,8 +737,8 @@ static HRESULT WINAPI FileAsyncReader_Request(IAsyncReader *iface, IMediaSample assert(i < filter->max_requests); req = &filter->requests[i]; - req->ovl.u.s.Offset = BYTES_FROM_MEDIATIME(start); - req->ovl.u.s.OffsetHigh = BYTES_FROM_MEDIATIME(start) >> 32; + req->ovl.Offset = BYTES_FROM_MEDIATIME(start); + req->ovl.OffsetHigh = BYTES_FROM_MEDIATIME(start) >> 32; /* No reference is taken. */ if (ReadFile(filter->file, data, BYTES_FROM_MEDIATIME(end - start), NULL, &req->ovl) @@ -789,7 +786,7 @@ static HRESULT WINAPI FileAsyncReader_WaitForNext(IAsyncReader *iface, REFERENCE_TIME start, end; IMediaSample_SetActualDataLength(req->sample, size); - start = MEDIATIME_FROM_BYTES(((ULONGLONG)req->ovl.u.s.OffsetHigh << 32) + req->ovl.u.s.Offset); + start = MEDIATIME_FROM_BYTES(((ULONGLONG)req->ovl.OffsetHigh << 32) + req->ovl.Offset); end = start + MEDIATIME_FROM_BYTES(size); IMediaSample_SetTime(req->sample, &start, &end); @@ -814,8 +811,8 @@ static BOOL sync_read(HANDLE file, LONGLONG offset, LONG length, BYTE *buffer, D BOOL ret; ovl.hEvent = (HANDLE)((ULONG_PTR)CreateEventW(NULL, TRUE, FALSE, NULL) | 1); - ovl.u.s.Offset = (DWORD)offset; - ovl.u.s.OffsetHigh = offset >> 32; + ovl.Offset = (DWORD)offset; + ovl.OffsetHigh = offset >> 32; *read_len = 0; diff --git a/dlls/quartz/filtermapper.c b/dlls/quartz/filtermapper.c index dd7c6c41872..69755c3648e 100644 --- a/dlls/quartz/filtermapper.c +++ b/dlls/quartz/filtermapper.c @@ -19,8 +19,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include <stdarg.h> #include "windef.h" diff --git a/dlls/quartz/regsvr.c b/dlls/quartz/regsvr.c index b7b3ddc7ba3..f203f0b7fa7 100644 --- a/dlls/quartz/regsvr.c +++ b/dlls/quartz/regsvr.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> #include <string.h>

1 0

Alexandre Julliard : prntvpt: Use nameless unions/structs.
by Alexandre Julliard July 17, 2023

July 17, 2023

Module: wine Branch: master Commit: 7dc37b2a09f00729c2da29d70919ba8c6d535228 URL: https://gitlab.winehq.org/wine/wine/-/commit/7dc37b2a09f00729c2da29d70919ba… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 17 11:32:46 2023 +0200 prntvpt: Use nameless unions/structs. --- dlls/prntvpt/ticket.c | 49 +++++++++++++++++++++++-------------------------- 1 file changed, 23 insertions(+), 26 deletions(-) diff --git a/dlls/prntvpt/ticket.c b/dlls/prntvpt/ticket.c index a8c5134e1ec..bd18544404b 100644 --- a/dlls/prntvpt/ticket.c +++ b/dlls/prntvpt/ticket.c @@ -19,9 +19,6 @@ #include <stdarg.h> #define COBJMACROS -#define NONAMELESSSTRUCT -#define NONAMELESSUNION - #include "windef.h" #include "winbase.h" #include "wingdi.h" @@ -654,14 +651,14 @@ static void ticket_to_devmode(const struct ticket *ticket, DEVMODEW *dm) dm->dmSize = sizeof(*dm); dm->dmFields = DM_ORIENTATION | DM_PAPERSIZE | DM_PAPERLENGTH | DM_PAPERWIDTH | DM_SCALE | DM_COPIES | DM_COLOR | DM_PRINTQUALITY | DM_YRESOLUTION | DM_COLLATE; - dm->u1.s1.dmOrientation = ticket->page.orientation; - dm->u1.s1.dmPaperSize = ticket->page.media.paper; - dm->u1.s1.dmPaperWidth = ticket->page.media.size.width / 100; - dm->u1.s1.dmPaperLength = ticket->page.media.size.height / 100; - dm->u1.s1.dmScale = ticket->page.scaling; - dm->u1.s1.dmCopies = ticket->job.copies; + dm->dmOrientation = ticket->page.orientation; + dm->dmPaperSize = ticket->page.media.paper; + dm->dmPaperWidth = ticket->page.media.size.width / 100; + dm->dmPaperLength = ticket->page.media.size.height / 100; + dm->dmScale = ticket->page.scaling; + dm->dmCopies = ticket->job.copies; dm->dmColor = ticket->page.color; - dm->u1.s1.dmPrintQuality = ticket->page.resolution.x; + dm->dmPrintQuality = ticket->page.resolution.x; dm->dmYResolution = ticket->page.resolution.y; dm->dmCollate = ticket->document.collate; } @@ -669,23 +666,23 @@ static void ticket_to_devmode(const struct ticket *ticket, DEVMODEW *dm) static void devmode_to_ticket(const DEVMODEW *dm, struct ticket *ticket) { if (dm->dmFields & DM_ORIENTATION) - ticket->page.orientation = dm->u1.s1.dmOrientation; + ticket->page.orientation = dm->dmOrientation; if (dm->dmFields & DM_PAPERSIZE) - ticket->page.media.paper = dm->u1.s1.dmPaperSize; + ticket->page.media.paper = dm->dmPaperSize; if (dm->dmFields & DM_PAPERLENGTH) - ticket->page.media.size.width = dm->u1.s1.dmPaperWidth * 100; + ticket->page.media.size.width = dm->dmPaperWidth * 100; if (dm->dmFields & DM_PAPERWIDTH) - ticket->page.media.size.height = dm->u1.s1.dmPaperLength * 100; + ticket->page.media.size.height = dm->dmPaperLength * 100; if (dm->dmFields & DM_SCALE) - ticket->page.scaling = dm->u1.s1.dmScale; + ticket->page.scaling = dm->dmScale; if (dm->dmFields & DM_COPIES) - ticket->job.copies = dm->u1.s1.dmCopies; + ticket->job.copies = dm->dmCopies; if (dm->dmFields & DM_COLOR) ticket->page.color = dm->dmColor; if (dm->dmFields & DM_PRINTQUALITY) { - ticket->page.resolution.x = dm->u1.s1.dmPrintQuality; - ticket->page.resolution.y = dm->u1.s1.dmPrintQuality; + ticket->page.resolution.x = dm->dmPrintQuality; + ticket->page.resolution.y = dm->dmPrintQuality; } if (dm->dmFields & DM_YRESOLUTION) ticket->page.resolution.y = dm->dmYResolution; @@ -1193,14 +1190,14 @@ static void dump_devmode(const DEVMODEW *dm) TRACE("dmDriverExtra: 0x%04x\n", dm->dmDriverExtra); TRACE("dmFields: 0x%04lx\n", dm->dmFields); dump_fields(dm->dmFields); - TRACE("dmOrientation: %d\n", dm->u1.s1.dmOrientation); - TRACE("dmPaperSize: %d\n", dm->u1.s1.dmPaperSize); - TRACE("dmPaperLength: %d\n", dm->u1.s1.dmPaperLength); - TRACE("dmPaperWidth: %d\n", dm->u1.s1.dmPaperWidth); - TRACE("dmScale: %d\n", dm->u1.s1.dmScale); - TRACE("dmCopies: %d\n", dm->u1.s1.dmCopies); - TRACE("dmDefaultSource: %d\n", dm->u1.s1.dmDefaultSource); - TRACE("dmPrintQuality: %d\n", dm->u1.s1.dmPrintQuality); + TRACE("dmOrientation: %d\n", dm->dmOrientation); + TRACE("dmPaperSize: %d\n", dm->dmPaperSize); + TRACE("dmPaperLength: %d\n", dm->dmPaperLength); + TRACE("dmPaperWidth: %d\n", dm->dmPaperWidth); + TRACE("dmScale: %d\n", dm->dmScale); + TRACE("dmCopies: %d\n", dm->dmCopies); + TRACE("dmDefaultSource: %d\n", dm->dmDefaultSource); + TRACE("dmPrintQuality: %d\n", dm->dmPrintQuality); TRACE("dmColor: %d\n", dm->dmColor); TRACE("dmDuplex: %d\n", dm->dmDuplex); TRACE("dmYResolution: %d\n", dm->dmYResolution);

1 0