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

Alexandre Julliard : cryptdlg: Use nameless unions/structs.
by Alexandre Julliard 12 Jul '23

12 Jul '23

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

12 Jul '23

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

12 Jul '23

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

12 Jul '23

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

12 Jul '23

Module: wine Branch: master Commit: 2bf29480c51a7fff73433978e79a785bedd06aea URL: https://gitlab.winehq.org/wine/wine/-/commit/2bf29480c51a7fff73433978e79a78… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 12 15:47:23 2023 +0200 dmsynth: Use nameless unions/structs. --- dlls/dmsynth/synth.c | 21 +++++++++------------ dlls/dmsynth/synthsink.c | 12 +++++------- 2 files changed, 14 insertions(+), 19 deletions(-) diff --git a/dlls/dmsynth/synth.c b/dlls/dmsynth/synth.c index 3631bcfe784..b579c15c66e 100644 --- a/dlls/dmsynth/synth.c +++ b/dlls/dmsynth/synth.c @@ -20,9 +20,6 @@ */ #define COBJMACROS - -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "objbase.h" #include "initguid.h" #include "dmksctrl.h" @@ -656,45 +653,45 @@ static HRESULT WINAPI DMSynthImpl_IKsControl_KsProperty(IKsControl* iface, PKSPR { TRACE("(%p, %p, %lu, %p, %lu, %p)\n", iface, Property, PropertyLength, PropertyData, DataLength, BytesReturned); - TRACE("Property = %s - %lu - %lu\n", debugstr_guid(&Property->u.s.Set), Property->u.s.Id, Property->u.s.Flags); + TRACE("Property = %s - %lu - %lu\n", debugstr_guid(&Property->Set), Property->Id, Property->Flags); - if (Property->u.s.Flags != KSPROPERTY_TYPE_GET) + if (Property->Flags != KSPROPERTY_TYPE_GET) { - FIXME("Property flags %lu not yet supported\n", Property->u.s.Flags); + FIXME("Property flags %lu not yet supported\n", Property->Flags); return S_FALSE; } if (DataLength < sizeof(DWORD)) return E_NOT_SUFFICIENT_BUFFER; - if (IsEqualGUID(&Property->u.s.Set, &GUID_DMUS_PROP_INSTRUMENT2)) + if (IsEqualGUID(&Property->Set, &GUID_DMUS_PROP_INSTRUMENT2)) { *(DWORD*)PropertyData = TRUE; *BytesReturned = sizeof(DWORD); } - else if (IsEqualGUID(&Property->u.s.Set, &GUID_DMUS_PROP_DLS2)) + else if (IsEqualGUID(&Property->Set, &GUID_DMUS_PROP_DLS2)) { *(DWORD*)PropertyData = TRUE; *BytesReturned = sizeof(DWORD); } - else if (IsEqualGUID(&Property->u.s.Set, &GUID_DMUS_PROP_GM_Hardware)) + else if (IsEqualGUID(&Property->Set, &GUID_DMUS_PROP_GM_Hardware)) { *(DWORD*)PropertyData = FALSE; *BytesReturned = sizeof(DWORD); } - else if (IsEqualGUID(&Property->u.s.Set, &GUID_DMUS_PROP_GS_Hardware)) + else if (IsEqualGUID(&Property->Set, &GUID_DMUS_PROP_GS_Hardware)) { *(DWORD*)PropertyData = FALSE; *BytesReturned = sizeof(DWORD); } - else if (IsEqualGUID(&Property->u.s.Set, &GUID_DMUS_PROP_XG_Hardware)) + else if (IsEqualGUID(&Property->Set, &GUID_DMUS_PROP_XG_Hardware)) { *(DWORD*)PropertyData = FALSE; *BytesReturned = sizeof(DWORD); } else { - FIXME("Unknown property %s\n", debugstr_guid(&Property->u.s.Set)); + FIXME("Unknown property %s\n", debugstr_guid(&Property->Set)); *(DWORD*)PropertyData = FALSE; *BytesReturned = sizeof(DWORD); } diff --git a/dlls/dmsynth/synthsink.c b/dlls/dmsynth/synthsink.c index a277a05bafb..825ad86013c 100644 --- a/dlls/dmsynth/synthsink.c +++ b/dlls/dmsynth/synthsink.c @@ -19,8 +19,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "dmsynth_private.h" #include "initguid.h" #include "uuids.h" @@ -245,25 +243,25 @@ static HRESULT WINAPI DMSynthSinkImpl_IKsControl_KsProperty(IKsControl* iface, P { TRACE("(%p, %p, %lu, %p, %lu, %p)\n", iface, Property, PropertyLength, PropertyData, DataLength, BytesReturned); - TRACE("Property = %s - %lu - %lu\n", debugstr_guid(&Property->u.s.Set), Property->u.s.Id, Property->u.s.Flags); + TRACE("Property = %s - %lu - %lu\n", debugstr_guid(&Property->Set), Property->Id, Property->Flags); - if (Property->u.s.Flags != KSPROPERTY_TYPE_GET) + if (Property->Flags != KSPROPERTY_TYPE_GET) { - FIXME("Property flags %lu not yet supported\n", Property->u.s.Flags); + FIXME("Property flags %lu not yet supported\n", Property->Flags); return S_FALSE; } if (DataLength < sizeof(DWORD)) return E_NOT_SUFFICIENT_BUFFER; - if (IsEqualGUID(&Property->u.s.Set, &GUID_DMUS_PROP_SinkUsesDSound)) + if (IsEqualGUID(&Property->Set, &GUID_DMUS_PROP_SinkUsesDSound)) { *(DWORD*)PropertyData = TRUE; *BytesReturned = sizeof(DWORD); } else { - FIXME("Unknown property %s\n", debugstr_guid(&Property->u.s.Set)); + FIXME("Unknown property %s\n", debugstr_guid(&Property->Set)); *(DWORD*)PropertyData = FALSE; *BytesReturned = sizeof(DWORD); }

1 0

Alexandre Julliard : dmusic: Use nameless unions/structs.
by Alexandre Julliard 12 Jul '23

12 Jul '23

Module: wine Branch: master Commit: 43ed6c6d670910f001ae4aa20c312a85c7316141 URL: https://gitlab.winehq.org/wine/wine/-/commit/43ed6c6d670910f001ae4aa20c312a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 12 15:47:38 2023 +0200 dmusic: Use nameless unions/structs. --- dlls/dmusic/dmusic_private.h | 3 --- dlls/dmusic/port.c | 8 ++++---- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/dmusic/dmusic_private.h b/dlls/dmusic/dmusic_private.h index 1b91f4bac94..d6abf1d1f81 100644 --- a/dlls/dmusic/dmusic_private.h +++ b/dlls/dmusic/dmusic_private.h @@ -25,9 +25,6 @@ #include <stdarg.h> #define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT - #include "windef.h" #include "winbase.h" #include "winnt.h" diff --git a/dlls/dmusic/port.c b/dlls/dmusic/port.c index 8549c62c4b1..225191d5905 100644 --- a/dlls/dmusic/port.c +++ b/dlls/dmusic/port.c @@ -725,18 +725,18 @@ static HRESULT WINAPI IKsControlImpl_KsProperty(IKsControl *iface, KSPROPERTY *p ULONG prop_len, void *data, ULONG data_len, ULONG *ret_len) { TRACE("(%p, %p, %lu, %p, %lu, %p)\n", iface, prop, prop_len, data, data_len, ret_len); - TRACE("prop = %s - %lu - %lu\n", debugstr_guid(&prop->u.s.Set), prop->u.s.Id, prop->u.s.Flags); + TRACE("prop = %s - %lu - %lu\n", debugstr_guid(&prop->Set), prop->Id, prop->Flags); - if (prop->u.s.Flags != KSPROPERTY_TYPE_GET) + if (prop->Flags != KSPROPERTY_TYPE_GET) { - FIXME("prop flags %lu not yet supported\n", prop->u.s.Flags); + FIXME("prop flags %lu not yet supported\n", prop->Flags); return S_FALSE; } if (data_len < sizeof(DWORD)) return E_NOT_SUFFICIENT_BUFFER; - FIXME("Unknown property %s\n", debugstr_guid(&prop->u.s.Set)); + FIXME("Unknown property %s\n", debugstr_guid(&prop->Set)); *(DWORD*)data = FALSE; *ret_len = sizeof(DWORD);

1 0

Alexandre Julliard : dxdiagn: Use nameless unions/structs.
by Alexandre Julliard 12 Jul '23

12 Jul '23

Module: wine Branch: master Commit: 990000928fcb967fa98a59596a9b853e947fe0a1 URL: https://gitlab.winehq.org/wine/wine/-/commit/990000928fcb967fa98a59596a9b85… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 12 15:47:55 2023 +0200 dxdiagn: Use nameless unions/structs. --- dlls/dxdiagn/provider.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/dxdiagn/provider.c b/dlls/dxdiagn/provider.c index 0df10ea56ef..696acf7dc51 100644 --- a/dlls/dxdiagn/provider.c +++ b/dlls/dxdiagn/provider.c @@ -22,8 +22,6 @@ #define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "dxdiag_private.h" #include "winver.h" #include "objidl.h" @@ -792,7 +790,7 @@ static BOOL get_texture_memory(GUID *adapter, DWORD *available_mem) if (SUCCEEDED(hr)) { dd_caps.dwCaps = DDSCAPS_LOCALVIDMEM | DDSCAPS_VIDEOMEMORY; - dd_caps.dwCaps2 = dd_caps.dwCaps3 = dd_caps.u1.dwCaps4 = 0; + dd_caps.dwCaps2 = dd_caps.dwCaps3 = dd_caps.dwCaps4 = 0; hr = IDirectDraw7_GetAvailableVidMem(pDirectDraw, &dd_caps, available_mem, NULL); IDirectDraw7_Release(pDirectDraw); if (SUCCEEDED(hr)) @@ -887,8 +885,8 @@ static HRESULT fill_display_information_d3d(IDxDiagContainerImpl_Container *node goto cleanup; swprintf(buffer, ARRAY_SIZE(buffer), L"%u.%u.%04u.%04u", - HIWORD(adapter_info.DriverVersion.u.HighPart), LOWORD(adapter_info.DriverVersion.u.HighPart), - HIWORD(adapter_info.DriverVersion.u.LowPart), LOWORD(adapter_info.DriverVersion.u.LowPart)); + HIWORD(adapter_info.DriverVersion.HighPart), LOWORD(adapter_info.DriverVersion.HighPart), + HIWORD(adapter_info.DriverVersion.LowPart), LOWORD(adapter_info.DriverVersion.LowPart)); hr = add_bstr_property(display_adapter, L"szDriverVersion", buffer); if (FAILED(hr)) @@ -1154,7 +1152,7 @@ static HRESULT fill_display_information_fallback(IDxDiagContainerImpl_Container return S_OK; dd_caps.dwCaps = DDSCAPS_LOCALVIDMEM | DDSCAPS_VIDEOMEMORY; - dd_caps.dwCaps2 = dd_caps.dwCaps3 = dd_caps.u1.dwCaps4 = 0; + dd_caps.dwCaps2 = dd_caps.dwCaps3 = dd_caps.dwCaps4 = 0; hr = IDirectDraw7_GetAvailableVidMem(pDirectDraw, &dd_caps, &tmp, NULL); if (SUCCEEDED(hr)) { @@ -1190,7 +1188,7 @@ static HRESULT fill_display_information_fallback(IDxDiagContainerImpl_Container if (surface_descr.dwFlags & DDSD_PIXELFORMAT) { hr = add_ui4_property(display_adapter, L"dwBpp", - surface_descr.u4.ddpfPixelFormat.u1.dwRGBBitCount); + surface_descr.ddpfPixelFormat.dwRGBBitCount); if (FAILED(hr)) goto cleanup; }

1 0

Alexandre Julliard : gitlab: Install the gstreamer packages from deb-multimedia.org.
by Alexandre Julliard 12 Jul '23

12 Jul '23

Module: wine Branch: master Commit: ac6a2f2c19caa2aa07e524ffd529c5c66c0754d1 URL: https://gitlab.winehq.org/wine/wine/-/commit/ac6a2f2c19caa2aa07e524ffd529c5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 12 19:00:22 2023 +0200 gitlab: Install the gstreamer packages from deb-multimedia.org. The standard bookworm packages don't support multilib. --- tools/gitlab/image.docker | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/tools/gitlab/image.docker b/tools/gitlab/image.docker index c7f9bcd1c08..50607d13872 100644 --- a/tools/gitlab/image.docker +++ b/tools/gitlab/image.docker @@ -23,7 +23,6 @@ RUN export DEBIAN_FRONTEND=noninteractive; \ libgl1-mesa-dev:amd64 libgl1-mesa-dev:i386 \ libgnutls28-dev:amd64 libgnutls28-dev:i386 \ libgphoto2-dev:amd64 libgphoto2-dev:i386 \ - libgstreamer-plugins-base1.0-dev:i386 \ libice-dev:amd64 libice-dev:i386 \ libkrb5-dev:amd64 libkrb5-dev:i386 \ libosmesa6-dev:amd64 libosmesa6-dev:i386 \ @@ -52,8 +51,15 @@ RUN export DEBIAN_FRONTEND=noninteractive; \ unixodbc-dev:amd64 unixodbc-dev:i386 \ x11proto-dev && \ apt-get install -y ccache netbase curl ca-certificates xserver-xorg-video-dummy xserver-xorg xfonts-base xinit fvwm \ - winbind fonts-liberation2 fonts-noto-core fonts-noto-cjk pulseaudio libasound2-plugins:amd64 libasound2-plugins:i386 \ - libmjpegutils-2.1-0:amd64 libmjpegutils-2.1-0:i386 gstreamer1.0-libav:amd64 gstreamer1.0-libav:i386 \ + winbind fonts-liberation2 fonts-noto-core fonts-noto-cjk pulseaudio && \ + curl -O https://www.deb-multimedia.org/pool/main/d/deb-multimedia-keyring/deb-multi… && \ + dpkg -i deb-multimedia-keyring_2016.8.1_all.deb && \ + echo 'deb https://www.deb-multimedia.org bookworm main' >> /etc/apt/sources.list && \ + apt-get update && \ + apt-get install -y libgstreamer-plugins-base1.0-dev:amd64 libgstreamer-plugins-base1.0-dev:i386 \ + libasound2-plugins:amd64 libasound2-plugins:i386 \ + libmjpegutils-2.1-0:amd64 libmjpegutils-2.1-0:i386 \ + gstreamer1.0-libav:amd64 gstreamer1.0-libav:i386 \ gstreamer1.0-plugins-base:amd64 gstreamer1.0-plugins-good:amd64 gstreamer1.0-plugins-bad:amd64 gstreamer1.0-plugins-ugly:amd64 \ gstreamer1.0-plugins-base:i386 gstreamer1.0-plugins-good:i386 gstreamer1.0-plugins-bad:i386 gstreamer1.0-plugins-ugly:i386 && \ apt-get clean && \

1 0

Alistair Leslie-Hughes : mf: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard 12 Jul '23

12 Jul '23

Module: wine Branch: master Commit: 31f9a8511268217897d0f923aace35150f12684c URL: https://gitlab.winehq.org/wine/wine/-/commit/31f9a8511268217897d0f923aace35… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jul 12 17:41:04 2023 +1000 mf: Remove DECLSPEC_HIDDEN usage. --- dlls/mf/mf_private.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/mf/mf_private.h b/dlls/mf/mf_private.h index 69923154b79..d191dadafb1 100644 --- a/dlls/mf/mf_private.h +++ b/dlls/mf/mf_private.h @@ -56,7 +56,7 @@ struct activate_funcs void (*free_private)(void *context); }; -HRESULT create_activation_object(void *context, const struct activate_funcs *funcs, IMFActivate **ret) DECLSPEC_HIDDEN; +HRESULT create_activation_object(void *context, const struct activate_funcs *funcs, IMFActivate **ret); static inline const char *debugstr_time(LONGLONG time) { @@ -113,8 +113,8 @@ static inline const char *debugstr_propvar(const PROPVARIANT *v) } } -extern BOOL mf_is_sample_copier_transform(IMFTransform *transform) DECLSPEC_HIDDEN; -extern BOOL mf_is_sar_sink(IMFMediaSink *sink) DECLSPEC_HIDDEN; -extern HRESULT topology_node_get_object(IMFTopologyNode *node, REFIID riid, void **obj) DECLSPEC_HIDDEN; -extern HRESULT topology_node_get_type_handler(IMFTopologyNode *node, DWORD stream, BOOL output, IMFMediaTypeHandler **handler) DECLSPEC_HIDDEN; -extern HRESULT topology_node_init_media_type(IMFTopologyNode *node, DWORD stream, BOOL output, IMFMediaType **type) DECLSPEC_HIDDEN; +extern BOOL mf_is_sample_copier_transform(IMFTransform *transform); +extern BOOL mf_is_sar_sink(IMFMediaSink *sink); +extern HRESULT topology_node_get_object(IMFTopologyNode *node, REFIID riid, void **obj); +extern HRESULT topology_node_get_type_handler(IMFTopologyNode *node, DWORD stream, BOOL output, IMFMediaTypeHandler **handler); +extern HRESULT topology_node_init_media_type(IMFTopologyNode *node, DWORD stream, BOOL output, IMFMediaType **type);

1 0

Alistair Leslie-Hughes : mfreadwrite: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard 12 Jul '23

12 Jul '23

Module: wine Branch: master Commit: 073f0af5744831806bb5fad18be1bdd1369db14e URL: https://gitlab.winehq.org/wine/wine/-/commit/073f0af5744831806bb5fad18be1bd… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jul 12 17:41:04 2023 +1000 mfreadwrite: Remove DECLSPEC_HIDDEN usage. --- dlls/mfreadwrite/mf_private.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mfreadwrite/mf_private.h b/dlls/mfreadwrite/mf_private.h index e2372e7e856..d8b44712b4a 100644 --- a/dlls/mfreadwrite/mf_private.h +++ b/dlls/mfreadwrite/mf_private.h @@ -19,9 +19,9 @@ #include "mferror.h" extern HRESULT create_sink_writer_from_url(const WCHAR *url, IMFByteStream *stream, - IMFAttributes *attributes, REFIID riid, void **out) DECLSPEC_HIDDEN; + IMFAttributes *attributes, REFIID riid, void **out); extern HRESULT create_sink_writer_from_sink(IMFMediaSink *sink, IMFAttributes *attributes, - REFIID riid, void **out) DECLSPEC_HIDDEN; + REFIID riid, void **out); static inline BOOL mf_array_reserve(void **elements, size_t *capacity, size_t count, size_t size) {

1 0