wine-commits July 2023

wine-commits@winehq.org

1 participants
865 discussions

Hans Leidekker : secur32/tests: Fix a test failure and extend tests.
by Alexandre Julliard 14 Jul '23

14 Jul '23

Module: wine Branch: master Commit: f74e119217b59a24dd56ca8106f8069275676d3f URL: https://gitlab.winehq.org/wine/wine/-/commit/f74e119217b59a24dd56ca8106f806… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jul 12 13:04:57 2023 +0200 secur32/tests: Fix a test failure and extend tests. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55114 --- dlls/secur32/tests/schannel.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c index fc5d501ff39..c3e9314c5e8 100644 --- a/dlls/secur32/tests/schannel.c +++ b/dlls/secur32/tests/schannel.c @@ -1900,6 +1900,7 @@ static void test_dtls(void) static void test_connection_shutdown(void) { static const BYTE message[] = {0x15, 0x03, 0x01, 0x00, 0x02, 0x01, 0x00}; + static const BYTE message2[] = {0x15, 0x03, 0x01, 0x00, 0x02, 0x02, 0x2a}; CtxtHandle context, context2; SecBufferDesc buffers[2]; SECURITY_STATUS status; @@ -1918,7 +1919,7 @@ static void test_connection_shutdown(void) &cred, NULL, NULL, &cred_handle, NULL ); ok( status == SEC_E_OK, "got %08lx\n", status ); - init_buffers( &buffers[0], 2, 0 ); + init_buffers( &buffers[0], 2, 24 ); init_buffers( &buffers[1], 1, 1000 ); buffers[0].cBuffers = 1; buffers[0].pBuffers[0].BufferType = SECBUFFER_EMPTY; @@ -2012,13 +2013,12 @@ static void test_connection_shutdown(void) status = ApplyControlToken( &context, buffers ); ok( status == SEC_E_OK, "got %08lx.\n", status ); - buf->cbBuffer = 1000; + buffers[1].pBuffers[0].cbBuffer = 1000; status = InitializeSecurityContextA( &cred_handle, &context, NULL, 0, 0, 0, - NULL, 0, NULL, &buffers[0], &attrs, NULL ); + NULL, 0, NULL, &buffers[1], &attrs, NULL ); ok( status == SEC_E_OK, "got %08lx.\n", status ); - ok( buf->cbBuffer == sizeof(message), "got cbBuffer %#lx.\n", buf->cbBuffer ); - ok( !memcmp( buf->pvBuffer, message, sizeof(message) ), "message data mismatch.\n" ); - free_buffers( &buffers[0] ); + ok( buffers[1].pBuffers[0].cbBuffer == sizeof(message), "got cbBuffer %#lx.\n", buffers[1].pBuffers[0].cbBuffer ); + ok( !memcmp( buffers[1].pBuffers[0].pvBuffer, message, sizeof(message) ), "message data mismatch.\n" ); alert.dwTokenType = SCHANNEL_ALERT; alert.dwAlertType = TLS1_ALERT_FATAL; @@ -2028,10 +2028,14 @@ static void test_connection_shutdown(void) status = ApplyControlToken( &context, buffers ); ok( status == SEC_E_OK, "got %08lx.\n", status ); + buffers[1].pBuffers[0].cbBuffer = 1000; status = InitializeSecurityContextA( &cred_handle, &context, NULL, 0, 0, 0, NULL, 0, NULL, &buffers[1], &attrs, NULL ); ok( status == SEC_E_OK, "got %08lx.\n", status ); + ok( buffers[1].pBuffers[0].cbBuffer == sizeof(message2), "got cbBuffer %#lx.\n", buffers[1].pBuffers[0].cbBuffer ); + ok( !memcmp( buffers[1].pBuffers[0].pvBuffer, message2, sizeof(message2) ), "message data mismatch.\n" ); + free_buffers( &buffers[0] ); free_buffers( &buffers[1] ); DeleteSecurityContext( &context ); FreeCredentialsHandle( &cred_handle );

1 0

Alexandre Julliard : gitlab: Make sure that the tags are fetched before building.
by Alexandre Julliard 14 Jul '23

14 Jul '23

Module: wine Branch: master Commit: ed4104d358c2b5f53befd9d4bd49d1656c8da5ea URL: https://gitlab.winehq.org/wine/wine/-/commit/ed4104d358c2b5f53befd9d4bd49d1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 14 12:54:42 2023 +0200 gitlab: Make sure that the tags are fetched before building. --- tools/gitlab/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/gitlab/build.yml b/tools/gitlab/build.yml index 441582a99f3..8a5d5b40ac1 100644 --- a/tools/gitlab/build.yml +++ b/tools/gitlab/build.yml @@ -22,6 +22,7 @@ - export CCACHE_COMPILERCHECK=content - export PATH="/usr/lib/ccache:$PATH" - git config --global --add safe.directory $CI_PROJECT_DIR + - git fetch --tags - mkdir -p build32 build64 - rm -fr .git/rebase-merge # in case a previous CI run failed in git rebase

1 0

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

14 Jul '23

Module: wine Branch: master Commit: f082e4f216b497888f76f5fdc9ed26d2d0779072 URL: https://gitlab.winehq.org/wine/wine/-/commit/f082e4f216b497888f76f5fdc9ed26… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 14 09:26:44 2023 +0200 oledlg: Use nameless unions/structs. --- dlls/oledlg/pastespl.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/oledlg/pastespl.c b/dlls/oledlg/pastespl.c index a502ae6c4a9..7813ecd0c5f 100644 --- a/dlls/oledlg/pastespl.c +++ b/dlls/oledlg/pastespl.c @@ -19,7 +19,6 @@ */ #define COBJMACROS -#define NONAMELESSUNION #include <stdarg.h> @@ -139,7 +138,7 @@ static void get_descriptors(HWND hdlg, ps_struct_t *ps_struct) fmtetc.cfFormat = cf_object_descriptor; if(IDataObject_GetData(ps_struct->ps->lpSrcDataObj, &fmtetc, &stg) == S_OK) { - OBJECTDESCRIPTOR *obj_desc = GlobalLock(stg.u.hGlobal); + OBJECTDESCRIPTOR *obj_desc = GlobalLock(stg.hGlobal); if(obj_desc->dwSrcOfCopy) ps_struct->source_name = wcsdup((WCHAR*)((char*)obj_desc + obj_desc->dwSrcOfCopy)); if(obj_desc->dwFullUserTypeName) @@ -147,8 +146,8 @@ static void get_descriptors(HWND hdlg, ps_struct_t *ps_struct) OleRegGetUserType(&obj_desc->clsid, USERCLASSTYPE_APPNAME, &ps_struct->app_name); /* Get the icon here. If dwDrawAspect & DVASCPECT_ICON call GetData(CF_METAFILEPICT), otherwise native calls OleGetIconFromClass(obj_desc->clsid) */ - GlobalUnlock(stg.u.hGlobal); - GlobalFree(stg.u.hGlobal); + GlobalUnlock(stg.hGlobal); + GlobalFree(stg.hGlobal); } else { @@ -158,13 +157,13 @@ static void get_descriptors(HWND hdlg, ps_struct_t *ps_struct) fmtetc.cfFormat = cf_link_src_descriptor; if(IDataObject_GetData(ps_struct->ps->lpSrcDataObj, &fmtetc, &stg) == S_OK) { - OBJECTDESCRIPTOR *obj_desc = GlobalLock(stg.u.hGlobal); + OBJECTDESCRIPTOR *obj_desc = GlobalLock(stg.hGlobal); if(obj_desc->dwSrcOfCopy) ps_struct->link_source_name = wcsdup((WCHAR*)((char*)obj_desc + obj_desc->dwSrcOfCopy)); if(obj_desc->dwFullUserTypeName) ps_struct->link_type_name = wcsdup((WCHAR*)((char*)obj_desc + obj_desc->dwFullUserTypeName)); - GlobalUnlock(stg.u.hGlobal); - GlobalFree(stg.u.hGlobal); + GlobalUnlock(stg.hGlobal); + GlobalFree(stg.hGlobal); } if(ps_struct->source_name == NULL && ps_struct->link_source_name == NULL)

1 0

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

14 Jul '23

Module: wine Branch: master Commit: 1ce80d35bce08b849f2b42cdc072b8c11bf48fae URL: https://gitlab.winehq.org/wine/wine/-/commit/1ce80d35bce08b849f2b42cdc072b8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 14 09:26:24 2023 +0200 oledb32: Use nameless unions/structs. --- dlls/oledb32/dslocator.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/oledb32/dslocator.c b/dlls/oledb32/dslocator.c index 722032bc18b..5746b51d55c 100644 --- a/dlls/oledb32/dslocator.c +++ b/dlls/oledb32/dslocator.c @@ -20,8 +20,6 @@ #include <string.h> #define COBJMACROS -#define NONAMELESSUNION - #include "windef.h" #include "winbase.h" #include "objbase.h" @@ -636,22 +634,22 @@ static HRESULT WINAPI dslocator_PromptNew(IDataSourceLocator *iface, IDispatch * pages[0].dwSize = sizeof(PROPSHEETPAGEW); pages[0].hInstance = instance; - pages[0].u.pszTemplate = MAKEINTRESOURCEW(IDD_PROVIDER); + pages[0].pszTemplate = MAKEINTRESOURCEW(IDD_PROVIDER); pages[0].pfnDlgProc = data_link_properties_dlg_proc; pages[1].dwSize = sizeof(PROPSHEETPAGEW); pages[1].hInstance = instance; - pages[1].u.pszTemplate = MAKEINTRESOURCEW(IDD_CONNECTION); + pages[1].pszTemplate = MAKEINTRESOURCEW(IDD_CONNECTION); pages[1].pfnDlgProc = data_link_connection_dlg_proc; pages[2].dwSize = sizeof(PROPSHEETPAGEW); pages[2].hInstance = instance; - pages[2].u.pszTemplate = MAKEINTRESOURCEW(IDD_ADVANCED); + pages[2].pszTemplate = MAKEINTRESOURCEW(IDD_ADVANCED); pages[2].pfnDlgProc = data_link_advanced_dlg_proc; pages[3].dwSize = sizeof(pages[0]); pages[3].hInstance = instance; - pages[3].u.pszTemplate = MAKEINTRESOURCEW(IDD_ALL); + pages[3].pszTemplate = MAKEINTRESOURCEW(IDD_ALL); pages[3].pfnDlgProc = data_link_all_dlg_proc; memset(&hdr, 0, sizeof(hdr)); @@ -660,7 +658,7 @@ static HRESULT WINAPI dslocator_PromptNew(IDataSourceLocator *iface, IDispatch * hdr.dwFlags = PSH_NOAPPLYNOW | PSH_PROPSHEETPAGE; hdr.hInstance = instance; hdr.pszCaption = MAKEINTRESOURCEW(IDS_PROPSHEET_TITLE); - hdr.u3.ppsp = pages; + hdr.ppsp = pages; hdr.nPages = ARRAY_SIZE(pages); ret = PropertySheetW(&hdr);

1 0

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

14 Jul '23

Module: wine Branch: master Commit: c94e218ff44cea0eaf353b420c3ef39d37cd75b3 URL: https://gitlab.winehq.org/wine/wine/-/commit/c94e218ff44cea0eaf353b420c3ef3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 14 09:25:57 2023 +0200 netprofm: Use nameless unions/structs. --- dlls/netprofm/list.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/netprofm/list.c b/dlls/netprofm/list.c index 40e03cb94f7..e6819185f22 100644 --- a/dlls/netprofm/list.c +++ b/dlls/netprofm/list.c @@ -18,8 +18,6 @@ */ #define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include <stdarg.h> #include "windef.h" @@ -1769,7 +1767,7 @@ static void init_networks( struct list_manager *mgr ) struct connection *connection; NET_LUID luid; - ConvertInterfaceIndexToLuid(aa->u.s.IfIndex, &luid); + ConvertInterfaceIndexToLuid(aa->IfIndex, &luid); ConvertInterfaceLuidToGuid(&luid, &id); /* assume a one-to-one mapping between networks and connections */

1 0

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

14 Jul '23

Module: wine Branch: master Commit: 6522c60fded7801a897cf31e0acdb7f016c711dd URL: https://gitlab.winehq.org/wine/wine/-/commit/6522c60fded7801a897cf31e0acdb7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 14 09:25:38 2023 +0200 netio.sys: Use nameless unions/structs. --- dlls/netio.sys/netio.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/netio.sys/netio.c b/dlls/netio.sys/netio.c index cad6dc32f1f..05b5d6d2a69 100644 --- a/dlls/netio.sys/netio.c +++ b/dlls/netio.sys/netio.c @@ -20,9 +20,6 @@ #include <stdarg.h> -#define NONAMELESSUNION -#define NONAMELESSSTRUCT - #include "ntstatus.h" #define WIN32_NO_STATUS #include "windef.h" @@ -155,9 +152,9 @@ static void socket_init(struct wsk_socket_internal *socket) static void dispatch_irp(IRP *irp, NTSTATUS status) { - irp->IoStatus.u.Status = status; + irp->IoStatus.Status = status; --irp->CurrentLocation; - --irp->Tail.Overlay.s.u2.CurrentStackLocation; + --irp->Tail.Overlay.CurrentStackLocation; IoCompleteRequest(irp, IO_NO_INCREMENT); }

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

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 : 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 : 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

← Newer
1
...
43
44
45
46
47
48
49
...
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