Module: wine Branch: master Commit: 536de62cc6e9a994e35dae5fa2e8a0b7eba0825e URL: https://source.winehq.org/git/wine.git/?a=commit;h=536de62cc6e9a994e35dae5fa...
Author: Jacek Caban jacek@codeweavers.com Date: Tue Mar 23 00:31:22 2021 +0100
winemenubuilder: Use nameless unions.
Signed-off-by: Jacek Caban jacek@codeweavers.com Signed-off-by: Alexandre Julliard julliard@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");