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

Alexandre Julliard : dmloader: Use nameless unions/structs.
by Alexandre Julliard July 12, 2023

July 12, 2023

Module: wine Branch: master Commit: e0dd29fffe8df167de6cec219722ee3e8d776471 URL: https://gitlab.winehq.org/wine/wine/-/commit/e0dd29fffe8df167de6cec219722ee… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 12 15:47:09 2023 +0200 dmloader: Use nameless unions/structs. --- dlls/dmloader/loaderstream.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/dmloader/loaderstream.c b/dlls/dmloader/loaderstream.c index 38862c0fec7..889070be8f6 100644 --- a/dlls/dmloader/loaderstream.c +++ b/dlls/dmloader/loaderstream.c @@ -44,8 +44,6 @@ * - Rok Mandeljc; 24. April, 2004 */ -#define NONAMELESSUNION - #include "dmloader_private.h" WINE_DEFAULT_DEBUG_CHANNEL(dmloader); @@ -149,10 +147,10 @@ static HRESULT WINAPI IDirectMusicLoaderFileStream_IStream_Seek (LPSTREAM iface, if (This->hFile == INVALID_HANDLE_VALUE) return E_FAIL; - liNewPos.u.HighPart = dlibMove.u.HighPart; - liNewPos.u.LowPart = SetFilePointer (This->hFile, dlibMove.u.LowPart, &liNewPos.u.HighPart, dwOrigin); + liNewPos.HighPart = dlibMove.HighPart; + liNewPos.LowPart = SetFilePointer (This->hFile, dlibMove.LowPart, &liNewPos.HighPart, dwOrigin); - if (liNewPos.u.LowPart == INVALID_SET_FILE_POINTER && GetLastError() != NO_ERROR) return E_FAIL; + if (liNewPos.LowPart == INVALID_SET_FILE_POINTER && GetLastError() != NO_ERROR) return E_FAIL; if (plibNewPosition) plibNewPosition->QuadPart = liNewPos.QuadPart; return S_OK;

1 0

Alexandre Julliard : cryptnet: Use nameless unions/structs.
by Alexandre Julliard July 12, 2023

July 12, 2023

Module: wine Branch: master Commit: 2e0aa941929e4511d8340c911e133e5edae3be53 URL: https://gitlab.winehq.org/wine/wine/-/commit/2e0aa941929e4511d8340c911e133e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 12 15:46:26 2023 +0200 cryptnet: Use nameless unions/structs. --- dlls/cryptnet/cryptnet_main.c | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/dlls/cryptnet/cryptnet_main.c b/dlls/cryptnet/cryptnet_main.c index 75fa4028d12..7768e9e5bd3 100644 --- a/dlls/cryptnet/cryptnet_main.c +++ b/dlls/cryptnet/cryptnet_main.c @@ -18,7 +18,6 @@ * */ -#define NONAMELESSUNION #define CERT_REVOCATION_PARA_HAS_EXTRA_FIELDS #include <share.h> @@ -136,11 +135,11 @@ static BOOL WINAPI CRYPT_GetUrlFromCertificateIssuer(LPCSTR pszUrlOid, if (aia->rgAccDescr[i].AccessLocation.dwAltNameChoice == CERT_ALT_NAME_URL) { - if (aia->rgAccDescr[i].AccessLocation.u.pwszURL) + if (aia->rgAccDescr[i].AccessLocation.pwszURL) { cUrl++; bytesNeeded += sizeof(LPWSTR) + - (lstrlenW(aia->rgAccDescr[i].AccessLocation.u. + (lstrlenW(aia->rgAccDescr[i].AccessLocation. pwszURL) + 1) * sizeof(WCHAR); } } @@ -178,10 +177,10 @@ static BOOL WINAPI CRYPT_GetUrlFromCertificateIssuer(LPCSTR pszUrlOid, if (aia->rgAccDescr[i].AccessLocation.dwAltNameChoice == CERT_ALT_NAME_URL) { - if (aia->rgAccDescr[i].AccessLocation.u.pwszURL) + if (aia->rgAccDescr[i].AccessLocation.pwszURL) { lstrcpyW(nextUrl, - aia->rgAccDescr[i].AccessLocation.u.pwszURL); + aia->rgAccDescr[i].AccessLocation.pwszURL); pUrlArray->rgwszUrl[pUrlArray->cUrl++] = nextUrl; nextUrl += (lstrlenW(nextUrl) + 1); @@ -237,17 +236,17 @@ static BOOL CRYPT_GetUrlFromCRLDistPointsExt(const CRYPT_DATA_BLOB *value, { DWORD j; CERT_ALT_NAME_INFO *name = - &info->rgDistPoint[i].DistPointName.u.FullName; + &info->rgDistPoint[i].DistPointName.FullName; for (j = 0; j < name->cAltEntry; j++) if (name->rgAltEntry[j].dwAltNameChoice == CERT_ALT_NAME_URL) { - if (name->rgAltEntry[j].u.pwszURL) + if (name->rgAltEntry[j].pwszURL) { cUrl++; bytesNeeded += sizeof(LPWSTR) + - (lstrlenW(name->rgAltEntry[j].u.pwszURL) + 1) + (lstrlenW(name->rgAltEntry[j].pwszURL) + 1) * sizeof(WCHAR); } } @@ -281,20 +280,20 @@ static BOOL CRYPT_GetUrlFromCRLDistPointsExt(const CRYPT_DATA_BLOB *value, { DWORD j; CERT_ALT_NAME_INFO *name = - &info->rgDistPoint[i].DistPointName.u.FullName; + &info->rgDistPoint[i].DistPointName.FullName; for (j = 0; j < name->cAltEntry; j++) if (name->rgAltEntry[j].dwAltNameChoice == CERT_ALT_NAME_URL) { - if (name->rgAltEntry[j].u.pwszURL) + if (name->rgAltEntry[j].pwszURL) { lstrcpyW(nextUrl, - name->rgAltEntry[j].u.pwszURL); + name->rgAltEntry[j].pwszURL); pUrlArray->rgwszUrl[pUrlArray->cUrl++] = nextUrl; nextUrl += - (lstrlenW(name->rgAltEntry[j].u.pwszURL) + 1); + (lstrlenW(name->rgAltEntry[j].pwszURL) + 1); } } } @@ -449,7 +448,7 @@ static BOOL CRYPT_GetObjectFromFile(HANDLE hFile, PCRYPT_BLOB_ARRAY pObject) if ((ret = GetFileSizeEx(hFile, &size))) { - if (size.u.HighPart) + if (size.HighPart) { WARN("file too big\n"); SetLastError(ERROR_INVALID_DATA); @@ -459,10 +458,10 @@ static BOOL CRYPT_GetObjectFromFile(HANDLE hFile, PCRYPT_BLOB_ARRAY pObject) { CRYPT_DATA_BLOB blob; - blob.pbData = CryptMemAlloc(size.u.LowPart); + blob.pbData = CryptMemAlloc(size.LowPart); if (blob.pbData) { - ret = ReadFile(hFile, blob.pbData, size.u.LowPart, &blob.cbData, + ret = ReadFile(hFile, blob.pbData, size.LowPart, &blob.cbData, NULL); if (ret) { @@ -2125,7 +2124,7 @@ static DWORD verify_cert_revocation_from_aia_ext(const CRYPT_DATA_BLOB *value, c { if (aia->rgAccDescr[i].AccessLocation.dwAltNameChoice == CERT_ALT_NAME_URL) { - const WCHAR *url = aia->rgAccDescr[i].AccessLocation.u.pwszURL; + const WCHAR *url = aia->rgAccDescr[i].AccessLocation.pwszURL; TRACE("OCSP URL = %s\n", debugstr_w(url)); error = verify_cert_revocation_with_ocsp(cert, url, pRevPara, next_update); }

1 0

Alexandre Julliard : cryptdlg: Use nameless unions/structs.
by Alexandre Julliard July 12, 2023

July 12, 2023

Module: wine Branch: master Commit: a5ab9465fd4bbb2a3b1ed817558cbd230124381f URL: https://gitlab.winehq.org/wine/wine/-/commit/a5ab9465fd4bbb2a3b1ed817558cbd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 12 15:46:10 2023 +0200 cryptdlg: Use nameless unions/structs. --- dlls/cryptdlg/main.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/cryptdlg/main.c b/dlls/cryptdlg/main.c index 1597dc2704c..e34942d07cb 100644 --- a/dlls/cryptdlg/main.c +++ b/dlls/cryptdlg/main.c @@ -16,8 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define NONAMELESSUNION - #include <stdarg.h> #include "windef.h" @@ -231,11 +229,11 @@ static CERT_VERIFY_CERTIFICATE_TRUST *CRYPTDLG_GetVerifyData( * called directly: */ if (data->pWintrustData->dwUnionChoice == WTD_CHOICE_BLOB && - data->pWintrustData->u.pBlob && data->pWintrustData->u.pBlob->cbMemObject == + data->pWintrustData->pBlob && data->pWintrustData->pBlob->cbMemObject == sizeof(CERT_VERIFY_CERTIFICATE_TRUST) && - data->pWintrustData->u.pBlob->pbMemObject) + data->pWintrustData->pBlob->pbMemObject) pCert = (CERT_VERIFY_CERTIFICATE_TRUST *) - data->pWintrustData->u.pBlob->pbMemObject; + data->pWintrustData->pBlob->pbMemObject; return pCert; } @@ -423,7 +421,7 @@ BOOL WINAPI CertViewPropertiesW(CERT_VIEWPROPERTIES_STRUCT_W *info) wtd.cbStruct = sizeof(wtd); wtd.dwUIChoice = WTD_UI_NONE; wtd.dwUnionChoice = WTD_CHOICE_BLOB; - wtd.u.pBlob = &blob; + wtd.pBlob = &blob; wtd.dwStateAction = WTD_STATEACTION_VERIFY; err = WinVerifyTrust(NULL, &cert_action_verify, &wtd); if (err == ERROR_SUCCESS) @@ -440,7 +438,7 @@ BOOL WINAPI CertViewPropertiesW(CERT_VIEWPROPERTIES_STRUCT_W *info) uiInfo.pCertContext = info->pCertContext; uiInfo.cPurposes = info->cArrayPurposes; uiInfo.rgszPurposes = (LPCSTR *)info->arrayPurposes; - uiInfo.u.hWVTStateData = wtd.hWVTStateData; + uiInfo.hWVTStateData = wtd.hWVTStateData; uiInfo.fpCryptProviderDataTrustedUsage = TRUE; uiInfo.cPropSheetPages = info->cArrayPropSheetPages; uiInfo.rgPropSheetPages = info->arrayPropSheetPages;

1 0

Alexandre Julliard : cryptui: Use nameless unions/structs.
by Alexandre Julliard July 12, 2023

July 12, 2023

Module: wine Branch: master Commit: 68239c3bdf4433ebb57181245b8ba8dbcbff5686 URL: https://gitlab.winehq.org/wine/wine/-/commit/68239c3bdf4433ebb57181245b8ba8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 12 15:46:40 2023 +0200 cryptui: Use nameless unions/structs. --- dlls/cryptui/main.c | 214 ++++++++++++++++++++++++++-------------------------- 1 file changed, 106 insertions(+), 108 deletions(-)

1 0

Alexandre Julliard : appwiz.cpl: Use nameless unions/structs.
by Alexandre Julliard July 12, 2023

July 12, 2023

Module: wine Branch: master Commit: 25c70738fb42fa5ea629c4ea83294d0bc0696340 URL: https://gitlab.winehq.org/wine/wine/-/commit/25c70738fb42fa5ea629c4ea83294d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 12 15:45:55 2023 +0200 appwiz.cpl: Use nameless unions/structs. --- dlls/appwiz.cpl/addons.c | 4 +--- dlls/appwiz.cpl/appwiz.c | 12 +++++------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index e69b47745f1..bcf92efdb80 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -22,8 +22,6 @@ #include <errno.h> #define COBJMACROS -#define NONAMELESSUNION - #include "windef.h" #include "winbase.h" #include "winuser.h" @@ -518,7 +516,7 @@ static HRESULT WINAPI InstallCallback_OnDataAvailable(IBindStatusCallback *iface DWORD dwSize, FORMATETC* pformatetc, STGMEDIUM* pstgmed) { if(!msi_file) { - msi_file = wcsdup(pstgmed->u.lpszFileName); + msi_file = wcsdup(pstgmed->lpszFileName); TRACE("got file name %s\n", debugstr_w(msi_file)); } diff --git a/dlls/appwiz.cpl/appwiz.c b/dlls/appwiz.cpl/appwiz.c index 3359d5c4a2b..6f95c23bf28 100644 --- a/dlls/appwiz.cpl/appwiz.c +++ b/dlls/appwiz.cpl/appwiz.c @@ -23,8 +23,6 @@ * */ -#define NONAMELESSUNION - #include <string.h> #include <stdlib.h> #include <stdarg.h> @@ -926,8 +924,8 @@ static void StartApplet(HWND hWnd) psp.dwSize = sizeof (PROPSHEETPAGEW); psp.dwFlags = PSP_USETITLE; psp.hInstance = hInst; - psp.u.pszTemplate = MAKEINTRESOURCEW (IDD_MAIN); - psp.u2.pszIcon = NULL; + psp.pszTemplate = MAKEINTRESOURCEW (IDD_MAIN); + psp.pszIcon = NULL; psp.pfnDlgProc = MainDlgProc; psp.pszTitle = tab_title; psp.lParam = 0; @@ -937,12 +935,12 @@ static void StartApplet(HWND hWnd) psh.dwFlags = PSH_PROPSHEETPAGE | PSH_USEICONID | PSH_USECALLBACK; psh.hwndParent = hWnd; psh.hInstance = hInst; - psh.u.pszIcon = MAKEINTRESOURCEW(ICO_MAIN); + psh.pszIcon = MAKEINTRESOURCEW(ICO_MAIN); psh.pszCaption = app_title; psh.nPages = 1; - psh.u3.ppsp = &psp; + psh.ppsp = &psp; psh.pfnCallback = propsheet_callback; - psh.u2.nStartPage = 0; + psh.nStartPage = 0; /* Display the property sheet */ PropertySheetW (&psh);

1 0

Alexandre Julliard : adsldp: Use nameless unions/structs.
by Alexandre Julliard July 12, 2023

July 12, 2023

Module: wine Branch: master Commit: d37cf9b04a4bbb8b7cce8e480ae20faa331e12f8 URL: https://gitlab.winehq.org/wine/wine/-/commit/d37cf9b04a4bbb8b7cce8e480ae20f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 12 15:45:09 2023 +0200 adsldp: Use nameless unions/structs. --- dlls/adsldp/adsldp.c | 104 +++++++++++++++++++++++++-------------------------- 1 file changed, 51 insertions(+), 53 deletions(-)

1 0

Alexandre Julliard : amstream: Use nameless unions/structs.
by Alexandre Julliard July 12, 2023

July 12, 2023

Module: wine Branch: master Commit: 26d954678af1a8935e0ab3b0e8cbeffc1d882cd0 URL: https://gitlab.winehq.org/wine/wine/-/commit/26d954678af1a8935e0ab3b0e8cbef… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 12 15:45:41 2023 +0200 amstream: Use nameless unions/structs. --- dlls/amstream/ddrawstream.c | 77 ++++++++++++++++++++++----------------------- 1 file changed, 38 insertions(+), 39 deletions(-) diff --git a/dlls/amstream/ddrawstream.c b/dlls/amstream/ddrawstream.c index e31e0d106d3..77795be47fa 100644 --- a/dlls/amstream/ddrawstream.c +++ b/dlls/amstream/ddrawstream.c @@ -18,7 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define NONAMELESSUNION #define COBJMACROS #include "amstream_private.h" #include "wine/debug.h" @@ -123,14 +122,14 @@ static HRESULT process_update(struct ddraw_sample *sample, int stride, BYTE *poi if (FAILED(hr)) return hr; - row_size = (sample->rect.right - sample->rect.left) * desc.ddpfPixelFormat.u1.dwRGBBitCount / 8; + row_size = (sample->rect.right - sample->rect.left) * desc.ddpfPixelFormat.dwRGBBitCount / 8; src_row = pointer; dst_row = desc.lpSurface; for (row = sample->rect.top; row < sample->rect.bottom; ++row) { memcpy(dst_row, src_row, row_size); src_row += stride; - dst_row += desc.u1.lPitch; + dst_row += desc.lPitch; } hr = IDirectDrawSurface_Unlock(sample->surface, desc.lpSurface); @@ -155,9 +154,9 @@ static BOOL is_format_compatible(struct ddraw_stream *stream, { if (stream->format.pf.dwFlags & DDPF_FOURCC) return FALSE; - if (stream->format.pf.u1.dwRGBBitCount != connection_pf->u1.dwRGBBitCount) + if (stream->format.pf.dwRGBBitCount != connection_pf->dwRGBBitCount) return FALSE; - if (stream->format.pf.u1.dwRGBBitCount == 16 && stream->format.pf.u3.dwGBitMask != connection_pf->u3.dwGBitMask) + if (stream->format.pf.dwRGBBitCount == 16 && stream->format.pf.dwGBitMask != connection_pf->dwGBitMask) return FALSE; } return TRUE; @@ -551,7 +550,7 @@ static HRESULT WINAPI ddraw_IDirectDrawMediaStream_SetFormat(IDirectDrawMediaStr TRACE("flags %#lx, pixel format flags %#lx, bit count %lu, size %lux%lu.\n", format->dwFlags, format->ddpfPixelFormat.dwFlags, - format->ddpfPixelFormat.u1.dwRGBBitCount, format->dwWidth, format->dwHeight); + format->ddpfPixelFormat.dwRGBBitCount, format->dwWidth, format->dwHeight); if (format->dwFlags & DDSD_PIXELFORMAT) { @@ -560,7 +559,7 @@ static HRESULT WINAPI ddraw_IDirectDrawMediaStream_SetFormat(IDirectDrawMediaStr if (format->ddpfPixelFormat.dwFlags & DDPF_FOURCC) { - if (!format->ddpfPixelFormat.u1.dwRGBBitCount) + if (!format->ddpfPixelFormat.dwRGBBitCount) return E_INVALIDARG; } else @@ -572,7 +571,7 @@ static HRESULT WINAPI ddraw_IDirectDrawMediaStream_SetFormat(IDirectDrawMediaStr if (!(format->ddpfPixelFormat.dwFlags & DDPF_RGB)) return DDERR_INVALIDSURFACETYPE; - switch (format->ddpfPixelFormat.u1.dwRGBBitCount) + switch (format->ddpfPixelFormat.dwRGBBitCount) { case 8: if (!(format->ddpfPixelFormat.dwFlags & DDPF_PALETTEINDEXED8)) @@ -581,21 +580,21 @@ static HRESULT WINAPI ddraw_IDirectDrawMediaStream_SetFormat(IDirectDrawMediaStr case 16: if (format->ddpfPixelFormat.dwFlags & DDPF_PALETTEINDEXED8) return DDERR_INVALIDSURFACETYPE; - if ((format->ddpfPixelFormat.u2.dwRBitMask != 0x7c00 || - format->ddpfPixelFormat.u3.dwGBitMask != 0x03e0 || - format->ddpfPixelFormat.u4.dwBBitMask != 0x001f) && - (format->ddpfPixelFormat.u2.dwRBitMask != 0xf800 || - format->ddpfPixelFormat.u3.dwGBitMask != 0x07e0 || - format->ddpfPixelFormat.u4.dwBBitMask != 0x001f)) + if ((format->ddpfPixelFormat.dwRBitMask != 0x7c00 || + format->ddpfPixelFormat.dwGBitMask != 0x03e0 || + format->ddpfPixelFormat.dwBBitMask != 0x001f) && + (format->ddpfPixelFormat.dwRBitMask != 0xf800 || + format->ddpfPixelFormat.dwGBitMask != 0x07e0 || + format->ddpfPixelFormat.dwBBitMask != 0x001f)) return DDERR_INVALIDSURFACETYPE; break; case 24: case 32: if (format->ddpfPixelFormat.dwFlags & DDPF_PALETTEINDEXED8) return DDERR_INVALIDSURFACETYPE; - if (format->ddpfPixelFormat.u2.dwRBitMask != 0xff0000 || - format->ddpfPixelFormat.u3.dwGBitMask != 0x00ff00 || - format->ddpfPixelFormat.u4.dwBBitMask != 0x0000ff) + if (format->ddpfPixelFormat.dwRBitMask != 0xff0000 || + format->ddpfPixelFormat.dwGBitMask != 0x00ff00 || + format->ddpfPixelFormat.dwBBitMask != 0x0000ff) return DDERR_INVALIDSURFACETYPE; break; default: @@ -958,35 +957,35 @@ static HRESULT WINAPI ddraw_sink_ReceiveConnection(IPin *iface, IPin *peer, cons if (IsEqualGUID(&mt->subtype, &MEDIASUBTYPE_RGB8)) { pf.dwFlags |= DDPF_PALETTEINDEXED8; - pf.u1.dwRGBBitCount = 8; + pf.dwRGBBitCount = 8; } else if (IsEqualGUID(&mt->subtype, &MEDIASUBTYPE_RGB555)) { - pf.u1.dwRGBBitCount = 16; - pf.u2.dwRBitMask = 0x7c00; - pf.u3.dwGBitMask = 0x03e0; - pf.u4.dwBBitMask = 0x001f; + pf.dwRGBBitCount = 16; + pf.dwRBitMask = 0x7c00; + pf.dwGBitMask = 0x03e0; + pf.dwBBitMask = 0x001f; } else if (IsEqualGUID(&mt->subtype, &MEDIASUBTYPE_RGB565)) { - pf.u1.dwRGBBitCount = 16; - pf.u2.dwRBitMask = 0xf800; - pf.u3.dwGBitMask = 0x07e0; - pf.u4.dwBBitMask = 0x001f; + pf.dwRGBBitCount = 16; + pf.dwRBitMask = 0xf800; + pf.dwGBitMask = 0x07e0; + pf.dwBBitMask = 0x001f; } else if (IsEqualGUID(&mt->subtype, &MEDIASUBTYPE_RGB24)) { - pf.u1.dwRGBBitCount = 24; - pf.u2.dwRBitMask = 0xff0000; - pf.u3.dwGBitMask = 0x00ff00; - pf.u4.dwBBitMask = 0x0000ff; + pf.dwRGBBitCount = 24; + pf.dwRBitMask = 0xff0000; + pf.dwGBitMask = 0x00ff00; + pf.dwBBitMask = 0x0000ff; } else if (IsEqualGUID(&mt->subtype, &MEDIASUBTYPE_RGB32)) { - pf.u1.dwRGBBitCount = 32; - pf.u2.dwRBitMask = 0xff0000; - pf.u3.dwGBitMask = 0x00ff00; - pf.u4.dwBBitMask = 0x0000ff; + pf.dwRGBBitCount = 32; + pf.dwRBitMask = 0xff0000; + pf.dwGBitMask = 0x00ff00; + pf.dwBBitMask = 0x0000ff; } else { @@ -1776,11 +1775,11 @@ static HRESULT ddrawstreamsample_create(struct ddraw_stream *parent, IDirectDraw { desc.ddpfPixelFormat.dwSize = sizeof(desc.ddpfPixelFormat); desc.ddpfPixelFormat.dwFlags = DDPF_RGB; - desc.ddpfPixelFormat.u1.dwRGBBitCount = 32; - desc.ddpfPixelFormat.u2.dwRBitMask = 0xff0000; - desc.ddpfPixelFormat.u3.dwGBitMask = 0x00ff00; - desc.ddpfPixelFormat.u4.dwBBitMask = 0x0000ff; - desc.ddpfPixelFormat.u5.dwRGBAlphaBitMask = 0; + desc.ddpfPixelFormat.dwRGBBitCount = 32; + desc.ddpfPixelFormat.dwRBitMask = 0xff0000; + desc.ddpfPixelFormat.dwGBitMask = 0x00ff00; + desc.ddpfPixelFormat.dwBBitMask = 0x0000ff; + desc.ddpfPixelFormat.dwRGBAlphaBitMask = 0; } desc.ddsCaps.dwCaps = DDSCAPS_SYSTEMMEMORY|DDSCAPS_OFFSCREENPLAIN; desc.lpSurface = NULL;

1 0

Billy Laws : ntdll: Fix NtContinue from within exception context on ARM64.
by Alexandre Julliard July 12, 2023

July 12, 2023

Module: wine Branch: master Commit: 88e336214db94318b6657d641919fcce6be4a328 URL: https://gitlab.winehq.org/wine/wine/-/commit/88e336214db94318b6657d641919fc… Author: Billy Laws <blaws05(a)gmail.com> Date: Tue Jul 11 22:45:04 2023 +0100 ntdll: Fix NtContinue from within exception context on ARM64. When handling an exception, NtContinue can be called from within the signal handler, in which case the raise(SIGUSR2) call ends up getting eaten and integer register context never ends up getting restored. Switch to the method used on X86 to avoid these issues. --- dlls/ntdll/unix/signal_arm64.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/signal_arm64.c b/dlls/ntdll/unix/signal_arm64.c index f553aac1993..7f998f894d4 100644 --- a/dlls/ntdll/unix/signal_arm64.c +++ b/dlls/ntdll/unix/signal_arm64.c @@ -569,7 +569,8 @@ NTSTATUS signal_set_full_context( CONTEXT *context ) { NTSTATUS status = NtSetContextThread( GetCurrentThread(), context ); - if (!status && (context->ContextFlags & CONTEXT_INTEGER) == CONTEXT_INTEGER) raise( SIGUSR2 ); + if (!status && (context->ContextFlags & CONTEXT_INTEGER) == CONTEXT_INTEGER) + arm64_thread_data()->syscall_frame->restore_flags |= CONTEXT_INTEGER; return status; }

1 0

Nikolay Sivov : windows.globalization: Use separate AddRef/Release methods for the language factory.
by Alexandre Julliard July 12, 2023

July 12, 2023

Module: wine Branch: master Commit: ab296a305e19e27f221f4487123930bc91226df1 URL: https://gitlab.winehq.org/wine/wine/-/commit/ab296a305e19e27f221f4487123930… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jul 12 17:55:37 2023 +0200 windows.globalization: Use separate AddRef/Release methods for the language factory. This currently works only because refcount field is at the same offset between structures. --- dlls/windows.globalization/main.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/windows.globalization/main.c b/dlls/windows.globalization/main.c index 344a60e146b..5254d1d2b3e 100644 --- a/dlls/windows.globalization/main.c +++ b/dlls/windows.globalization/main.c @@ -621,11 +621,23 @@ static HRESULT STDMETHODCALLTYPE windows_globalization_language_factory_QueryInt return E_NOINTERFACE; } +static ULONG STDMETHODCALLTYPE windows_globalization_language_factory_AddRef(IActivationFactory *iface) +{ + struct language_factory *factory = impl_language_factory_from_IActivationFactory(iface); + return InterlockedIncrement(&factory->ref); +} + +static ULONG STDMETHODCALLTYPE windows_globalization_language_factory_Release(IActivationFactory *iface) +{ + struct language_factory *factory = impl_language_factory_from_IActivationFactory(iface); + return InterlockedDecrement(&factory->ref); +} + static const struct IActivationFactoryVtbl activation_factory_language_vtbl = { windows_globalization_language_factory_QueryInterface, - windows_globalization_AddRef, - windows_globalization_Release, + windows_globalization_language_factory_AddRef, + windows_globalization_language_factory_Release, /* IInspectable methods */ windows_globalization_GetIids, windows_globalization_GetRuntimeClassName,

1 0

Sven Baars : kernel32/tests: Update a todo that succeeds with the new wow64 architecture.
by Alexandre Julliard July 12, 2023

July 12, 2023

Module: wine Branch: master Commit: 9559959f95cc2087511ac58dfda5fc482e306ab9 URL: https://gitlab.winehq.org/wine/wine/-/commit/9559959f95cc2087511ac58dfda5fc… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Wed Jul 12 09:20:23 2023 +0200 kernel32/tests: Update a todo that succeeds with the new wow64 architecture. --- dlls/kernel32/tests/thread.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index cabc747fdbd..4addff1e199 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -853,11 +853,21 @@ static VOID test_thread_processor(void) HANDLE curthread,curproc; DWORD_PTR processMask,systemMask,retMask; SYSTEM_INFO sysInfo; - BOOL is_wow64; + BOOL is_wow64, old_wow64 = FALSE; DWORD ret; if (!pIsWow64Process || !pIsWow64Process( GetCurrentProcess(), &is_wow64 )) is_wow64 = FALSE; + if (is_wow64) + { + TEB64 *teb64 = ULongToPtr(NtCurrentTeb()->GdiBatchCount); + if (teb64) + { + PEB64 *peb64 = ULongToPtr(teb64->Peb); + old_wow64 = !peb64->LdrData; + } + } + sysInfo.dwNumberOfProcessors=0; GetSystemInfo(&sysInfo); ok(sysInfo.dwNumberOfProcessors>0, @@ -904,7 +914,7 @@ static VOID test_thread_processor(void) { SetLastError(0xdeadbeef); ret = SetThreadIdealProcessor(GetCurrentThread(), MAXIMUM_PROCESSORS + 1); - todo_wine + todo_wine_if(old_wow64) ok(ret != ~0u, "Unexpected return value %lu.\n", ret); SetLastError(0xdeadbeef);

1 0