March 2021 - Wine-Commits - list.winehq.org

Jacek Caban : winecfg: Use nameless unions.
by Alexandre Julliard March 23, 2021

March 23, 2021

Module: wine Branch: master Commit: 8b934f03d4a227cc1485081bac5e97bb779190d3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8b934f03d4a227cc1485081b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 23 00:31:30 2021 +0100 winecfg: Use nameless unions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winecfg/Makefile.in | 1 - programs/winecfg/audio.c | 20 ++++++++++---------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/programs/winecfg/Makefile.in b/programs/winecfg/Makefile.in index 20b67680956..a2746f7d4ac 100644 --- a/programs/winecfg/Makefile.in +++ b/programs/winecfg/Makefile.in @@ -1,7 +1,6 @@ MODULE = winecfg.exe APPMODE = -mwindows IMPORTS = uuid comdlg32 comctl32 shell32 ole32 winmm shlwapi uxtheme user32 gdi32 advapi32 -EXTRADEFS = -DWINE_NO_NAMELESS_EXTENSION C_SRCS = \ about.c \ diff --git a/programs/winecfg/audio.c b/programs/winecfg/audio.c index 1e5f69de24b..a293c4710fd 100644 --- a/programs/winecfg/audio.c +++ b/programs/winecfg/audio.c @@ -125,7 +125,7 @@ static BOOL load_device(IMMDevice *dev, struct DeviceInfo *info) if(SUCCEEDED(hr) && pv.vt == VT_UI4){ i = 0; while (speaker_configs[i].text_id != 0) { - if ((speaker_configs[i].speaker_mask & pv.u.ulVal) == speaker_configs[i].speaker_mask) { + if ((speaker_configs[i].speaker_mask & pv.ulVal) == speaker_configs[i].speaker_mask) { info->speaker_config = i; break; } @@ -247,10 +247,10 @@ static void initAudioDlg (HWND hDlg) load_devices(devenum, eCapture, &num_capture_devs, &capture_devs); PropVariantInit(&pv); - if(get_driver_name(devenum, &pv) && pv.u.pwszVal[0] != '\0'){ + if(get_driver_name(devenum, &pv) && pv.pwszVal[0] != '\0'){ have_driver = TRUE; - wnsprintfW(display_str, ARRAY_SIZE(display_str), format_str, pv.u.pwszVal); - lstrcatW(g_drv_keyW, pv.u.pwszVal); + wnsprintfW(display_str, ARRAY_SIZE(display_str), format_str, pv.pwszVal); + lstrcatW(g_drv_keyW, pv.pwszVal); } PropVariantClear(&pv); @@ -315,7 +315,7 @@ static void initAudioDlg (HWND hDlg) continue; SendDlgItemMessageW(hDlg, IDC_AUDIOOUT_DEVICE, CB_ADDSTRING, - 0, (LPARAM)render_devs[i].name.u.pwszVal); + 0, (LPARAM)render_devs[i].name.pwszVal); SendDlgItemMessageW(hDlg, IDC_AUDIOOUT_DEVICE, CB_SETITEMDATA, i + 1, (LPARAM)&render_devs[i]); @@ -325,7 +325,7 @@ static void initAudioDlg (HWND hDlg) } SendDlgItemMessageW(hDlg, IDC_VOICEOUT_DEVICE, CB_ADDSTRING, - 0, (LPARAM)render_devs[i].name.u.pwszVal); + 0, (LPARAM)render_devs[i].name.pwszVal); SendDlgItemMessageW(hDlg, IDC_VOICEOUT_DEVICE, CB_SETITEMDATA, i + 1, (LPARAM)&render_devs[i]); if(reg_vout_dev && !lstrcmpW(render_devs[i].id, reg_vout_dev)) @@ -334,7 +334,7 @@ static void initAudioDlg (HWND hDlg) lvitem.mask = LVIF_TEXT | LVIF_PARAM; lvitem.iItem = i; lvitem.iSubItem = 0; - lvitem.pszText = render_devs[i].name.u.pwszVal; + lvitem.pszText = render_devs[i].name.pwszVal; lvitem.cchTextMax = lstrlenW(lvitem.pszText); lvitem.lParam = (LPARAM)&render_devs[i]; @@ -357,14 +357,14 @@ static void initAudioDlg (HWND hDlg) continue; SendDlgItemMessageW(hDlg, IDC_AUDIOIN_DEVICE, CB_ADDSTRING, - 0, (LPARAM)capture_devs[i].name.u.pwszVal); + 0, (LPARAM)capture_devs[i].name.pwszVal); SendDlgItemMessageW(hDlg, IDC_AUDIOIN_DEVICE, CB_SETITEMDATA, i + 1, (LPARAM)&capture_devs[i]); if(reg_in_dev && !lstrcmpW(capture_devs[i].id, reg_in_dev)) SendDlgItemMessageW(hDlg, IDC_AUDIOIN_DEVICE, CB_SETCURSEL, i + 1, 0); SendDlgItemMessageW(hDlg, IDC_VOICEIN_DEVICE, CB_ADDSTRING, - 0, (LPARAM)capture_devs[i].name.u.pwszVal); + 0, (LPARAM)capture_devs[i].name.pwszVal); SendDlgItemMessageW(hDlg, IDC_VOICEIN_DEVICE, CB_SETITEMDATA, i + 1, (LPARAM)&capture_devs[i]); if(reg_vin_dev && !lstrcmpW(capture_devs[i].id, reg_vin_dev)) @@ -447,7 +447,7 @@ static void apply_speaker_configs(void) continue; } - pv.u.ulVal = speaker_configs[render_devs[i].speaker_config].speaker_mask; + pv.ulVal = speaker_configs[render_devs[i].speaker_config].speaker_mask; hr = IPropertyStore_SetValue(ps, &PKEY_AudioEndpoint_PhysicalSpeakers, &pv);

1 0

Jacek Caban : winemenubuilder: Use nameless unions.
by Alexandre Julliard March 23, 2021

March 23, 2021

Module: wine Branch: master Commit: 536de62cc6e9a994e35dae5fa2e8a0b7eba0825e URL: https://source.winehq.org/git/wine.git/?a=commit;h=536de62cc6e9a994e35dae5f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 23 00:31:22 2021 +0100 winemenubuilder: Use nameless unions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winemenubuilder/Makefile.in | 1 - programs/winemenubuilder/winemenubuilder.c | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/programs/winemenubuilder/Makefile.in b/programs/winemenubuilder/Makefile.in index 3cca593462b..07e2702843b 100644 --- a/programs/winemenubuilder/Makefile.in +++ b/programs/winemenubuilder/Makefile.in @@ -1,7 +1,6 @@ MODULE = winemenubuilder.exe APPMODE = -mwindows -municode IMPORTS = uuid windowscodecs shell32 shlwapi ole32 user32 advapi32 -EXTRADEFS = -DWINE_NO_NAMELESS_EXTENSION C_SRCS = \ winemenubuilder.c diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index fe4998fb373..87ff3f37637 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -3093,12 +3093,12 @@ static BOOL InvokeShellLinkerForURL( IUniformResourceLocatorW *url, LPCWSTR link hr = IPropertyStorage_ReadMultiple(pPropStg, 2, ps, pv); if (SUCCEEDED(hr)) { - if (pv[0].vt == VT_LPWSTR && pv[0].u.pwszVal && pv[0].u.pwszVal[0]) + if (pv[0].vt == VT_LPWSTR && pv[0].pwszVal && pv[0].pwszVal[0]) { has_icon = TRUE; - icon_name = extract_icon( pv[0].u.pwszVal, pv[1].u.iVal, NULL, bWait ); + icon_name = extract_icon( pv[0].pwszVal, pv[1].iVal, NULL, bWait ); - WINE_TRACE("URL icon path: %s icon index: %d icon name: %s\n", wine_dbgstr_w(pv[0].u.pwszVal), pv[1].u.iVal, icon_name); + WINE_TRACE("URL icon path: %s icon index: %d icon name: %s\n", wine_dbgstr_w(pv[0].pwszVal), pv[1].iVal, icon_name); } PropVariantClear(&pv[0]); PropVariantClear(&pv[1]); @@ -3118,7 +3118,7 @@ static BOOL InvokeShellLinkerForURL( IUniformResourceLocatorW *url, LPCWSTR link goto cleanup; } WINE_ERR("failed to extract icon from %s\n", - wine_dbgstr_w( pv[0].u.pwszVal )); + wine_dbgstr_w( pv[0].pwszVal )); } hSem = CreateSemaphoreA( NULL, 1, 1, "winemenubuilder_semaphore");

1 0

Jacek Caban : combase: Use nameless unions.
by Alexandre Julliard March 23, 2021

March 23, 2021

Module: wine Branch: master Commit: 49b97bad9471550264fe95f30408a2f78586fd3b URL: https://source.winehq.org/git/wine.git/?a=commit;h=49b97bad9471550264fe95f3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 23 00:30:31 2021 +0100 combase: Use nameless unions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/combase/Makefile.in | 1 - dlls/combase/combase.c | 156 +++++++++++++++++++++++------------------------ 2 files changed, 78 insertions(+), 79 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=49b97bad9471550264fe…

1 0

Jacek Caban : devenum: Use nameless structs and unions.
by Alexandre Julliard March 23, 2021

March 23, 2021

Module: wine Branch: master Commit: f59b482c2cd04cb4c64ff76f1af016f62cb03066 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f59b482c2cd04cb4c64ff76f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 23 00:30:39 2021 +0100 devenum: Use nameless structs and unions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/devenum/Makefile.in | 1 - dlls/devenum/createdevenum.c | 48 ++++++++++++++++++++++---------------------- 2 files changed, 24 insertions(+), 25 deletions(-) diff --git a/dlls/devenum/Makefile.in b/dlls/devenum/Makefile.in index b50339dcfd6..6ce1967a6dd 100644 --- a/dlls/devenum/Makefile.in +++ b/dlls/devenum/Makefile.in @@ -1,7 +1,6 @@ MODULE = devenum.dll IMPORTS = dmoguids strmiids uuid ole32 oleaut32 avicap32 winmm user32 advapi32 dsound msdmo DELAYIMPORTS = msvfw32 -EXTRADEFS = -DWINE_NO_NAMELESS_EXTENSION EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/devenum/createdevenum.c b/dlls/devenum/createdevenum.c index f7b53ad271f..8e9cf56eb09 100644 --- a/dlls/devenum/createdevenum.c +++ b/dlls/devenum/createdevenum.c @@ -237,8 +237,8 @@ static void DEVENUM_ReadPins(HKEY hkeyFilterClass, REGFILTER2 *rgf2) REGFILTERPINS2 *rgPins = NULL; rgf2->dwVersion = 2; - rgf2->u.s2.cPins2 = 0; - rgf2->u.s2.rgPins2 = NULL; + rgf2->cPins2 = 0; + rgf2->rgPins2 = NULL; if (RegOpenKeyExW(hkeyFilterClass, L"Pins", 0, KEY_READ, &hkeyPins) != ERROR_SUCCESS) return ; @@ -265,7 +265,7 @@ static void DEVENUM_ReadPins(HKEY hkeyFilterClass, REGFILTER2 *rgf2) HKEY hkeyPinKey = NULL; WCHAR wszPinName[MAX_PATH]; DWORD cName = ARRAY_SIZE(wszPinName); - REGFILTERPINS2 *rgPin = &rgPins[rgf2->u.s2.cPins2]; + REGFILTERPINS2 *rgPin = &rgPins[rgf2->cPins2]; DWORD value, size, Type; LONG lRet; @@ -306,7 +306,7 @@ static void DEVENUM_ReadPins(HKEY hkeyFilterClass, REGFILTER2 *rgf2) DEVENUM_ReadPinTypes(hkeyPinKey, rgPin); - ++rgf2->u.s2.cPins2; + ++rgf2->cPins2; continue; error_cleanup: @@ -316,38 +316,38 @@ static void DEVENUM_ReadPins(HKEY hkeyFilterClass, REGFILTER2 *rgf2) RegCloseKey(hkeyPins); - if (rgPins && !rgf2->u.s2.cPins2) + if (rgPins && !rgf2->cPins2) { CoTaskMemFree(rgPins); rgPins = NULL; } - rgf2->u.s2.rgPins2 = rgPins; + rgf2->rgPins2 = rgPins; } static void free_regfilter2(REGFILTER2 *rgf) { - if (rgf->u.s2.rgPins2) + if (rgf->rgPins2) { UINT iPin; - for (iPin = 0; iPin < rgf->u.s2.cPins2; iPin++) + for (iPin = 0; iPin < rgf->cPins2; iPin++) { - if (rgf->u.s2.rgPins2[iPin].lpMediaType) + if (rgf->rgPins2[iPin].lpMediaType) { UINT iType; - for (iType = 0; iType < rgf->u.s2.rgPins2[iPin].nMediaTypes; iType++) + for (iType = 0; iType < rgf->rgPins2[iPin].nMediaTypes; iType++) { - CoTaskMemFree((void *)rgf->u.s2.rgPins2[iPin].lpMediaType[iType].clsMajorType); - CoTaskMemFree((void *)rgf->u.s2.rgPins2[iPin].lpMediaType[iType].clsMinorType); + CoTaskMemFree((void *)rgf->rgPins2[iPin].lpMediaType[iType].clsMajorType); + CoTaskMemFree((void *)rgf->rgPins2[iPin].lpMediaType[iType].clsMinorType); } - CoTaskMemFree((void *)rgf->u.s2.rgPins2[iPin].lpMediaType); + CoTaskMemFree((void *)rgf->rgPins2[iPin].lpMediaType); } } - CoTaskMemFree((void *)rgf->u.s2.rgPins2); + CoTaskMemFree((void *)rgf->rgPins2); } } @@ -508,8 +508,8 @@ static BOOL CALLBACK register_dsound_devices(GUID *guid, const WCHAR *desc, cons /* write filter data */ rgf.dwVersion = 2; rgf.dwMerit = guid ? MERIT_DO_NOT_USE : MERIT_PREFERRED; - rgf.u.s2.cPins2 = 1; - rgf.u.s2.rgPins2 = &rgpins; + rgf.cPins2 = 1; + rgf.rgPins2 = &rgpins; rgpins.dwFlags = REG_PINFLAG_B_RENDERER; /* FIXME: native registers many more formats */ rgpins.nMediaTypes = 1; @@ -558,8 +558,8 @@ static void register_waveout_devices(void) /* write filter data */ rgf.dwVersion = 2; rgf.dwMerit = MERIT_DO_NOT_USE; - rgf.u.s2.cPins2 = 1; - rgf.u.s2.rgPins2 = &rgpins; + rgf.cPins2 = 1; + rgf.rgPins2 = &rgpins; rgpins.dwFlags = REG_PINFLAG_B_RENDERER; rgpins.nMediaTypes = 1; rgpins.lpMediaType = &rgtypes; @@ -642,8 +642,8 @@ static void register_midiout_devices(void) /* write filter data */ rgf.dwVersion = 2; rgf.dwMerit = (i == -1) ? MERIT_PREFERRED : MERIT_DO_NOT_USE; - rgf.u.s2.cPins2 = 1; - rgf.u.s2.rgPins2 = &rgpins; + rgf.cPins2 = 1; + rgf.rgPins2 = &rgpins; rgpins.dwFlags = REG_PINFLAG_B_RENDERER; rgpins.nMediaTypes = 1; rgpins.lpMediaType = &rgtypes; @@ -692,8 +692,8 @@ static void register_vfw_codecs(void) /* write filter data */ rgf.dwVersion = 2; rgf.dwMerit = MERIT_DO_NOT_USE; - rgf.u.s2.cPins2 = 2; - rgf.u.s2.rgPins2 = rgpins; + rgf.cPins2 = 2; + rgf.rgPins2 = rgpins; rgpins[0].dwFlags = 0; rgpins[0].nMediaTypes = 1; rgpins[0].lpMediaType = &rgtypes[0]; @@ -746,8 +746,8 @@ static void register_avicap_devices(void) rgf.dwVersion = 2; rgf.dwMerit = MERIT_DO_NOT_USE; - rgf.u.s2.cPins2 = 1; - rgf.u.s2.rgPins2 = &rgpins; + rgf.cPins2 = 1; + rgf.rgPins2 = &rgpins; rgpins.dwFlags = 0; rgpins.nMediaTypes = 1; rgpins.lpMediaType = &rgtypes;

1 0

Jacek Caban : services: Use nameless unions.
by Alexandre Julliard March 23, 2021

March 23, 2021

Module: wine Branch: master Commit: a4b07324516e48dd4dab69219dd8a61ed88c51ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=a4b07324516e48dd4dab6921… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 23 00:31:13 2021 +0100 services: Use nameless unions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/services/Makefile.in | 1 - programs/services/rpc.c | 22 +++++++++++----------- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/programs/services/Makefile.in b/programs/services/Makefile.in index 46d4c820a9e..560e277a9bf 100644 --- a/programs/services/Makefile.in +++ b/programs/services/Makefile.in @@ -1,6 +1,5 @@ MODULE = services.exe IMPORTS = rpcrt4 advapi32 userenv setupapi -EXTRADEFS = -DWINE_NO_NAMELESS_EXTENSION EXTRADLLFLAGS = -mconsole -mno-cygwin diff --git a/programs/services/rpc.c b/programs/services/rpc.c index d0f85024191..df69a741b51 100644 --- a/programs/services/rpc.c +++ b/programs/services/rpc.c @@ -859,7 +859,7 @@ static void fill_notify(struct sc_notify_handle *notify, struct service_entry *s list->cElements = 1; list->NotifyParamsArray[0].dwInfoLevel = 2; - list->NotifyParamsArray[0].u.params = cparams; + list->NotifyParamsArray[0].params = cparams; InterlockedExchangePointer((void**)&notify->params_list, list); @@ -934,12 +934,12 @@ DWORD __cdecl svcctl_ChangeServiceConfig2W( SC_RPC_HANDLE hService, SC_RPC_CONFI { WCHAR *descr = NULL; - if (!config.u.descr->lpDescription) + if (!config.descr->lpDescription) break; - if (config.u.descr->lpDescription[0]) + if (config.descr->lpDescription[0]) { - if (!(descr = strdupW( config.u.descr->lpDescription ))) + if (!(descr = strdupW( config.descr->lpDescription ))) return ERROR_NOT_ENOUGH_MEMORY; } @@ -953,15 +953,15 @@ DWORD __cdecl svcctl_ChangeServiceConfig2W( SC_RPC_HANDLE hService, SC_RPC_CONFI break; case SERVICE_CONFIG_FAILURE_ACTIONS: WINE_FIXME( "SERVICE_CONFIG_FAILURE_ACTIONS not implemented: period %u msg %s cmd %s\n", - config.u.actions->dwResetPeriod, - wine_dbgstr_w(config.u.actions->lpRebootMsg), - wine_dbgstr_w(config.u.actions->lpCommand) ); + config.actions->dwResetPeriod, + wine_dbgstr_w(config.actions->lpRebootMsg), + wine_dbgstr_w(config.actions->lpCommand) ); break; case SERVICE_CONFIG_PRESHUTDOWN_INFO: WINE_TRACE( "changing service %p preshutdown timeout to %d\n", - service, config.u.preshutdown->dwPreshutdownTimeout ); + service, config.preshutdown->dwPreshutdownTimeout ); service_lock( service->service_entry ); - service->service_entry->preshutdown_timeout = config.u.preshutdown->dwPreshutdownTimeout; + service->service_entry->preshutdown_timeout = config.preshutdown->dwPreshutdownTimeout; save_service_config( service->service_entry ); service_unlock( service->service_entry ); break; @@ -1682,7 +1682,7 @@ DWORD __cdecl svcctl_NotifyServiceStatusChange( struct sc_handle *hdr = handle; WINE_TRACE("(%p, NotifyMask: 0x%x, %p, %p, %p, %p)\n", handle, - params.u.params->dwNotifyMask, clientprocessguid, scmprocessguid, + params.params->dwNotifyMask, clientprocessguid, scmprocessguid, createremotequeue, hNotify); switch (hdr->type) @@ -1716,7 +1716,7 @@ DWORD __cdecl svcctl_NotifyServiceStatusChange( notify->event = CreateEventW(NULL, TRUE, FALSE, NULL); - notify->notify_mask = params.u.params->dwNotifyMask; + notify->notify_mask = params.params->dwNotifyMask; service_lock(service->service_entry);

1 0

Jacek Caban : wininet: Use nameless structs and unions.
by Alexandre Julliard March 23, 2021

March 23, 2021

Module: wine Branch: master Commit: 5d8dde1ab731af9e5151962d3da45e829195c465 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d8dde1ab731af9e5151962d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 23 00:30:47 2021 +0100 wininet: Use nameless structs and unions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/Makefile.in | 1 - dlls/wininet/urlcache.c | 10 +++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/wininet/Makefile.in b/dlls/wininet/Makefile.in index 615433ea0fb..79823806803 100644 --- a/dlls/wininet/Makefile.in +++ b/dlls/wininet/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -D_WINX32_ -DWINE_NO_NAMELESS_EXTENSION MODULE = wininet.dll IMPORTLIB = wininet IMPORTS = mpr shlwapi shell32 user32 ws2_32 advapi32 diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index c4ca54ac87c..d8b0d5fb037 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -3809,12 +3809,12 @@ BOOL WINAPI GetUrlCacheConfigInfoW(LPINTERNET_CACHE_CONFIG_INFOW info, LPDWORD s info->dwNumCachePaths = 1; info->dwNormalUsage = 0; info->dwExemptUsage = 0; - info->u.s.dwCacheSize = container->file_size / 1024; - lstrcpynW(info->u.s.CachePath, container->path, MAX_PATH); + info->dwCacheSize = container->file_size / 1024; + lstrcpynW(info->CachePath, container->path, MAX_PATH); cache_container_close_index(container); - TRACE("CachePath %s\n", debugstr_w(info->u.s.CachePath)); + TRACE("CachePath %s\n", debugstr_w(info->CachePath)); return TRUE; } @@ -3846,8 +3846,8 @@ BOOL WINAPI GetUrlCacheConfigInfoA(LPINTERNET_CACHE_CONFIG_INFOA info, LPDWORD s info->dwNumCachePaths = infoW.dwNumCachePaths; info->dwNormalUsage = infoW.dwNormalUsage; info->dwExemptUsage = infoW.dwExemptUsage; - info->u.s.dwCacheSize = infoW.u.s.dwCacheSize; - WideCharToMultiByte(CP_ACP, 0, infoW.u.s.CachePath, -1, info->u.s.CachePath, MAX_PATH, NULL, NULL); + info->dwCacheSize = infoW.dwCacheSize; + WideCharToMultiByte(CP_ACP, 0, infoW.CachePath, -1, info->CachePath, MAX_PATH, NULL, NULL); return TRUE; }

1 0

Jacek Caban : wininet/tests: Use nameless structs and unions.
by Alexandre Julliard March 23, 2021

March 23, 2021

Module: wine Branch: master Commit: ce39ae9f4db6bd627cb0bf3ffbd6e8bee05f99a7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ce39ae9f4db6bd627cb0bf3f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 23 00:31:04 2021 +0100 wininet/tests: Use nameless structs and unions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/tests/Makefile.in | 1 - dlls/wininet/tests/urlcache.c | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/wininet/tests/Makefile.in b/dlls/wininet/tests/Makefile.in index 6c1f5fd5c61..ae18bb72faf 100644 --- a/dlls/wininet/tests/Makefile.in +++ b/dlls/wininet/tests/Makefile.in @@ -1,6 +1,5 @@ TESTDLL = wininet.dll IMPORTS = wininet crypt32 ws2_32 user32 advapi32 shell32 -EXTRADEFS = -DWINE_NO_NAMELESS_EXTENSION C_SRCS = \ ftp.c \ diff --git a/dlls/wininet/tests/urlcache.c b/dlls/wininet/tests/urlcache.c index a38ed9bc5ba..f8ba90f7ab0 100644 --- a/dlls/wininet/tests/urlcache.c +++ b/dlls/wininet/tests/urlcache.c @@ -1176,8 +1176,8 @@ static void test_GetUrlCacheConfigInfo(void) get_cache_path(td[i].flags, path, path_win8); ok(info.dwStructSize == td[i].dwStructSize, "got %u\n", info.dwStructSize); - ok(!lstrcmpA(info.u.s.CachePath, path) || !lstrcmpA(info.u.s.CachePath, path_win8), - "%d: expected %s or %s, got %s\n", i, path, path_win8, info.u.s.CachePath); + ok(!lstrcmpA(info.CachePath, path) || !lstrcmpA(info.CachePath, path_win8), + "%d: expected %s or %s, got %s\n", i, path, path_win8, info.CachePath); } } }

1 0

Jacek Caban : ole32: Use nameless unions.
by Alexandre Julliard March 23, 2021

March 23, 2021

Module: wine Branch: master Commit: 903cf0ffe1ff99a04c69d7ab3034cd77200225ed URL: https://source.winehq.org/git/wine.git/?a=commit;h=903cf0ffe1ff99a04c69d7ab… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 23 00:30:54 2021 +0100 ole32: Use nameless unions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/Makefile.in | 2 +- dlls/ole32/stg_prop.c | 206 ++++++++++++++++++++++++------------------------- 2 files changed, 104 insertions(+), 104 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=903cf0ffe1ff99a04c69…

1 0

Alexandre Julliard : Wine release 5.0.4
by Alexandre Julliard March 23, 2021

March 23, 2021

Module: website Branch: master Commit: 8304ffced4af4ed47ef7834f1e89f6e45ea0211c URL: https://source.winehq.org/git/website.git/?a=commit;h=8304ffced4af4ed47ef78… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 23 21:07:53 2021 +0100 Wine release 5.0.4 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2021032301.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/news/en/2021032301.xml b/news/en/2021032301.xml new file mode 100644 index 00000000..038cae3e --- /dev/null +++ b/news/en/2021032301.xml @@ -0,0 +1,13 @@ +<news> +<date>March 23, 2021</date> +<title>Wine 5.0.4 Released</title> +<body> + The Wine maintenance release 5.0.4 is now available. + <a href="{$root}/announce/5.0.4">What's new</a> in this release: +<ul> + <li>Various bug fixes</li> +</ul> + +The source is <a href="//dl.winehq.org/wine/source/5.0/wine-5.0.4.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Sven Baars : shell32: Fix a leak on error path (Coverity).
by Alexandre Julliard March 23, 2021

March 23, 2021

Module: wine Branch: oldstable Commit: 01f7e4bafc8091f783e23421235e432064d78352 URL: https://source.winehq.org/git/wine.git/?a=commit;h=01f7e4bafc8091f783e23421… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Sun Oct 4 18:10:23 2020 +0200 shell32: Fix a leak on error path (Coverity). Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 2dac80524440bbae0ee0ef67c470bc0073b8bfaf) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/shfldr_unixfs.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/shfldr_unixfs.c b/dlls/shell32/shfldr_unixfs.c index a37b1bf5881..48d5fe4ecb6 100644 --- a/dlls/shell32/shfldr_unixfs.c +++ b/dlls/shell32/shfldr_unixfs.c @@ -1251,7 +1251,10 @@ static HRESULT WINAPI ShellFolder2_GetDisplayNameOf(IShellFolder2* iface, LPWSTR pwszDosFileName = wine_get_dos_file_name(This->m_pszPath); if (!pwszDosFileName) return HRESULT_FROM_WIN32(GetLastError()); lpName->u.pOleStr = SHAlloc((lstrlenW(pwszDosFileName) + 1) * sizeof(WCHAR)); - if (!lpName->u.pOleStr) return HRESULT_FROM_WIN32(GetLastError()); + if (!lpName->u.pOleStr) { + heap_free(pwszDosFileName); + return HRESULT_FROM_WIN32(GetLastError()); + } lstrcpyW(lpName->u.pOleStr, pwszDosFileName); PathRemoveBackslashW(lpName->u.pOleStr); heap_free(pwszDosFileName);

1 0