ReceiveTempSMS/Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

winemenubuilder: Fix compilation on systems that don't support nameless unions.

Browse Source
This commit is contained in:
Francois Gouget 2011-01-04 15:58:22 +01:00 committed by Alexandre Julliard
parent ce3fcda1d3
commit 7b28ae53e1
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
programs/winemenubuilder/winemenubuilder.c
View File

@ -78,6 +78,7 @@
#endif #endif
#define COBJMACROS #define COBJMACROS
#define NONAMELESSUNION
#include <windows.h> #include <windows.h>
#include <shlobj.h> #include <shlobj.h>
@ -2676,9 +2677,9 @@ static BOOL InvokeShellLinkerForURL( IUniformResourceLocatorW *url, LPCWSTR link
} }
ps[0].ulKind = PRSPEC_PROPID; ps[0].ulKind = PRSPEC_PROPID;
ps[0].propid = PID_IS_ICONFILE; ps[0].u.propid = PID_IS_ICONFILE;
ps[1].ulKind = PRSPEC_PROPID; ps[1].ulKind = PRSPEC_PROPID;
ps[1].propid = PID_IS_ICONINDEX; ps[1].u.propid = PID_IS_ICONINDEX;
hr = url->lpVtbl->QueryInterface(url, &IID_IPropertySetStorage, (void **) &pPropSetStg); hr = url->lpVtbl->QueryInterface(url, &IID_IPropertySetStorage, (void **) &pPropSetStg);
if (SUCCEEDED(hr)) if (SUCCEEDED(hr))
@ -2689,9 +2690,9 @@ static BOOL InvokeShellLinkerForURL( IUniformResourceLocatorW *url, LPCWSTR link
hr = IPropertyStorage_ReadMultiple(pPropStg, 2, ps, pv); hr = IPropertyStorage_ReadMultiple(pPropStg, 2, ps, pv);
if (SUCCEEDED(hr)) if (SUCCEEDED(hr))
{ {
icon_name = extract_icon( pv[0].pwszVal, pv[1].iVal, NULL, bWait ); icon_name = extract_icon( pv[0].u.pwszVal, pv[1].u.iVal, NULL, bWait );
WINE_TRACE("URL icon path: %s icon index: %d icon name: %s\n", wine_dbgstr_w(pv[0].pwszVal), pv[1].iVal, icon_name); 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);
PropVariantClear(&pv[0]); PropVariantClear(&pv[0]);
PropVariantClear(&pv[1]); PropVariantClear(&pv[1]);
} }
@ -2710,7 +2711,7 @@ static BOOL InvokeShellLinkerForURL( IUniformResourceLocatorW *url, LPCWSTR link
goto cleanup; goto cleanup;
} }
WINE_ERR("failed to extract icon from %s\n", WINE_ERR("failed to extract icon from %s\n",
wine_dbgstr_w( pv[0].pwszVal )); wine_dbgstr_w( pv[0].u.pwszVal ));
} }
hSem = CreateSemaphoreA( NULL, 1, 1, "winemenubuilder_semaphore"); hSem = CreateSemaphoreA( NULL, 1, 1, "winemenubuilder_semaphore");