- Wine-Commits - list.winehq.org

Alexandre Julliard : krnl386: Use nameless unions/structs.
by Alexandre Julliard July 19, 2023

July 19, 2023

Module: wine Branch: master Commit: 7a82d78b171873c45e7aca211ae07a92df5aac4f URL: https://gitlab.winehq.org/wine/wine/-/commit/7a82d78b171873c45e7aca211ae07a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 18 19:56:11 2023 +0200 krnl386: Use nameless unions/structs. --- dlls/krnl386.exe16/int2f.c | 1 - dlls/krnl386.exe16/local.c | 7 +++---- dlls/krnl386.exe16/vxd.c | 1 - 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/krnl386.exe16/int2f.c b/dlls/krnl386.exe16/int2f.c index 7114a46e455..fcb9ebd7d79 100644 --- a/dlls/krnl386.exe16/int2f.c +++ b/dlls/krnl386.exe16/int2f.c @@ -25,7 +25,6 @@ #include "ntstatus.h" #define WIN32_NO_STATUS -#define NONAMELESSUNION #include "wine/winbase16.h" #include "wine/debug.h" #include "winternl.h" diff --git a/dlls/krnl386.exe16/local.c b/dlls/krnl386.exe16/local.c index 672f1c22a19..1f75d8ef00f 100644 --- a/dlls/krnl386.exe16/local.c +++ b/dlls/krnl386.exe16/local.c @@ -27,7 +27,6 @@ * parameter than usual. */ -#define NONAMELESSUNION #include <stdlib.h> #include <string.h> #include "wine/winbase16.h" @@ -2160,9 +2159,9 @@ BOOL16 WINAPI Local32Info16( LOCAL32INFO *pLocal32Info, HGLOBAL16 handle ) { if (entry.wFlags & PROCESS_HEAP_REGION) { - pLocal32Info->dwMemReserved += entry.u.Region.dwCommittedSize - + entry.u.Region.dwUnCommittedSize; - pLocal32Info->dwMemCommitted = entry.u.Region.dwCommittedSize; + pLocal32Info->dwMemReserved += entry.Region.dwCommittedSize + + entry.Region.dwUnCommittedSize; + pLocal32Info->dwMemCommitted = entry.Region.dwCommittedSize; } else if (!(entry.wFlags & PROCESS_HEAP_ENTRY_BUSY)) { diff --git a/dlls/krnl386.exe16/vxd.c b/dlls/krnl386.exe16/vxd.c index a707fc36043..9ac1ea0bbb5 100644 --- a/dlls/krnl386.exe16/vxd.c +++ b/dlls/krnl386.exe16/vxd.c @@ -27,7 +27,6 @@ #include "ntstatus.h" #define WIN32_NO_STATUS -#define NONAMELESSUNION #include "windef.h" #include "winbase.h" #include "winerror.h"

1 0

Alexandre Julliard : winmm: Use nameless unions/structs.
by Alexandre Julliard July 19, 2023

July 19, 2023

Module: wine Branch: master Commit: 0682b43b550910a835b7cd1859dbff09691a8f78 URL: https://gitlab.winehq.org/wine/wine/-/commit/0682b43b550910a835b7cd1859dbff… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 18 19:55:27 2023 +0200 winmm: Use nameless unions/structs. --- dlls/winmm/lolvldrv.c | 1 - dlls/winmm/waveform.c | 38 ++++++++++++++++++-------------------- dlls/winmm/winmm.c | 2 -- 3 files changed, 18 insertions(+), 23 deletions(-) diff --git a/dlls/winmm/lolvldrv.c b/dlls/winmm/lolvldrv.c index ff7e83398f1..906405ac74f 100644 --- a/dlls/winmm/lolvldrv.c +++ b/dlls/winmm/lolvldrv.c @@ -20,7 +20,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define NONAMELESSUNION #define COBJMACROS #include <string.h> diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index ecd2acb8b28..42cc0b24510 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -22,8 +22,6 @@ #include <stdarg.h> #include <string.h> -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #define COBJMACROS #include "windef.h" #include "winbase.h" @@ -3921,8 +3919,8 @@ UINT WINAPI mixerGetControlDetailsA(HMIXEROBJ hmix, LPMIXERCONTROLDETAILS lpmcdA int size = max(1, lpmcdA->cChannels) * sizeof(MIXERCONTROLDETAILS_LISTTEXTW); unsigned int i; - if (lpmcdA->u.cMultipleItems != 0) { - size *= lpmcdA->u.cMultipleItems; + if (lpmcdA->cMultipleItems != 0) { + size *= lpmcdA->cMultipleItems; } pDetailsW = HeapAlloc(GetProcessHeap(), 0, size); lpmcdA->paDetails = pDetailsW; @@ -3931,7 +3929,7 @@ UINT WINAPI mixerGetControlDetailsA(HMIXEROBJ hmix, LPMIXERCONTROLDETAILS lpmcdA ret = mixerGetControlDetailsW(hmix, lpmcdA, fdwDetails); /* copy from lpmcd->paDetails back to paDetailsW; */ if (ret == MMSYSERR_NOERROR) { - for (i = 0; i < lpmcdA->u.cMultipleItems * lpmcdA->cChannels; i++) { + for (i = 0; i < lpmcdA->cMultipleItems * lpmcdA->cChannels; i++) { pDetailsA->dwParam1 = pDetailsW->dwParam1; pDetailsA->dwParam2 = pDetailsW->dwParam2; WideCharToMultiByte( CP_ACP, 0, pDetailsW->szName, -1, @@ -3940,8 +3938,8 @@ UINT WINAPI mixerGetControlDetailsA(HMIXEROBJ hmix, LPMIXERCONTROLDETAILS lpmcdA pDetailsA++; pDetailsW++; } - pDetailsA -= lpmcdA->u.cMultipleItems * lpmcdA->cChannels; - pDetailsW -= lpmcdA->u.cMultipleItems * lpmcdA->cChannels; + pDetailsA -= lpmcdA->cMultipleItems * lpmcdA->cChannels; + pDetailsW -= lpmcdA->cMultipleItems * lpmcdA->cChannels; } HeapFree(GetProcessHeap(), 0, pDetailsW); lpmcdA->paDetails = pDetailsA; @@ -3973,8 +3971,8 @@ UINT WINAPI mixerGetLineControlsA(HMIXEROBJ hmix, LPMIXERLINECONTROLSA lpmlcA, mlcW.cbStruct = sizeof(mlcW); mlcW.dwLineID = lpmlcA->dwLineID; - mlcW.u.dwControlID = lpmlcA->u.dwControlID; - mlcW.u.dwControlType = lpmlcA->u.dwControlType; + mlcW.dwControlID = lpmlcA->dwControlID; + mlcW.dwControlType = lpmlcA->dwControlType; /* Debugging on Windows shows for MIXER_GETLINECONTROLSF_ONEBYTYPE only, the control count is assumed to be 1 - This is relied upon by a game, @@ -3992,8 +3990,8 @@ UINT WINAPI mixerGetLineControlsA(HMIXEROBJ hmix, LPMIXERLINECONTROLSA lpmlcA, if (ret == MMSYSERR_NOERROR) { lpmlcA->dwLineID = mlcW.dwLineID; - lpmlcA->u.dwControlID = mlcW.u.dwControlID; - lpmlcA->u.dwControlType = mlcW.u.dwControlType; + lpmlcA->dwControlID = mlcW.dwControlID; + lpmlcA->dwControlType = mlcW.dwControlType; for (i = 0; i < mlcW.cControls; i++) { lpmlcA->pamxctrl[i].cbStruct = sizeof(MIXERCONTROLA); @@ -4032,8 +4030,8 @@ static UINT WINMM_GetVolumeLineControl(WINMM_MMDevice *mmdevice, DWORD line, ctl->cMultipleItems = 0; LoadStringW(hWinMM32Instance, IDS_VOLUME, ctl->szShortName, MIXER_SHORT_NAME_CHARS); LoadStringW(hWinMM32Instance, IDS_VOLUME, ctl->szName, MIXER_LONG_NAME_CHARS); - ctl->Bounds.s1.dwMinimum = 0; - ctl->Bounds.s1.dwMaximum = 0xFFFF; + ctl->Bounds.dwMinimum = 0; + ctl->Bounds.dwMaximum = 0xFFFF; ctl->Metrics.cSteps = 192; return MMSYSERR_NOERROR; @@ -4048,8 +4046,8 @@ static UINT WINMM_GetMuteLineControl(WINMM_MMDevice *mmdevice, DWORD line, ctl->cMultipleItems = 0; LoadStringW(hWinMM32Instance, IDS_MUTE, ctl->szShortName, MIXER_SHORT_NAME_CHARS); LoadStringW(hWinMM32Instance, IDS_MUTE, ctl->szName, MIXER_LONG_NAME_CHARS); - ctl->Bounds.s1.dwMinimum = 0; - ctl->Bounds.s1.dwMaximum = 1; + ctl->Bounds.dwMinimum = 0; + ctl->Bounds.dwMaximum = 1; ctl->Metrics.cSteps = 0; return MMSYSERR_NOERROR; @@ -4083,7 +4081,7 @@ UINT WINAPI mixerGetLineControlsW(HMIXEROBJ hmix, LPMIXERLINECONTROLSW lpmlcW, return MMSYSERR_INVALPARAM; TRACE("dwLineID: %lu\n", lpmlcW->dwLineID); - TRACE("dwControl: %lx\n", lpmlcW->u.dwControlID); + TRACE("dwControl: %lx\n", lpmlcW->dwControlID); TRACE("cControls: %lu\n", lpmlcW->cControls); mmdevice = WINMM_GetMixerMMDevice(hmix, fdwControls, NULL); @@ -4110,10 +4108,10 @@ UINT WINAPI mixerGetLineControlsW(HMIXEROBJ hmix, LPMIXERLINECONTROLSW lpmlcW, return MMSYSERR_INVALPARAM; if(lpmlcW->dwLineID != 0 && lpmlcW->dwLineID != 0xFFFF0000) return MIXERR_INVALLINE; - if(lpmlcW->u.dwControlID == 0) + if(lpmlcW->dwControlID == 0) return WINMM_GetVolumeLineControl(mmdevice, lpmlcW->dwLineID, lpmlcW->pamxctrl, fdwControls); - if(lpmlcW->u.dwControlID == 1) + if(lpmlcW->dwControlID == 1) return WINMM_GetMuteLineControl(mmdevice, lpmlcW->dwLineID, lpmlcW->pamxctrl, fdwControls); return MMSYSERR_NOTSUPPORTED; @@ -4124,10 +4122,10 @@ UINT WINAPI mixerGetLineControlsW(HMIXEROBJ hmix, LPMIXERLINECONTROLSW lpmlcW, return MMSYSERR_INVALPARAM; if(lpmlcW->dwLineID != 0 && lpmlcW->dwLineID != 0xFFFF0000) return MIXERR_INVALLINE; - if(lpmlcW->u.dwControlType == MIXERCONTROL_CONTROLTYPE_VOLUME) + if(lpmlcW->dwControlType == MIXERCONTROL_CONTROLTYPE_VOLUME) return WINMM_GetVolumeLineControl(mmdevice, lpmlcW->dwLineID, lpmlcW->pamxctrl, fdwControls); - if(lpmlcW->u.dwControlType == MIXERCONTROL_CONTROLTYPE_MUTE) + if(lpmlcW->dwControlType == MIXERCONTROL_CONTROLTYPE_MUTE) return WINMM_GetMuteLineControl(mmdevice, lpmlcW->dwLineID, lpmlcW->pamxctrl, fdwControls); return MMSYSERR_NOTSUPPORTED; diff --git a/dlls/winmm/winmm.c b/dlls/winmm/winmm.c index 31567d33c4f..f69c2282073 100644 --- a/dlls/winmm/winmm.c +++ b/dlls/winmm/winmm.c @@ -43,8 +43,6 @@ #include <stdarg.h> #include <string.h> -#define NONAMELESSUNION - #include "windef.h" #include "winbase.h" #include "mmsystem.h"

1 0

Alex Henrie : shell32: Free item lists with ILFree.
by Alexandre Julliard July 19, 2023

July 19, 2023

Module: wine Branch: master Commit: 36cf7b3d9d5f0b253905f99a1e23747628f1c975 URL: https://gitlab.winehq.org/wine/wine/-/commit/36cf7b3d9d5f0b253905f99a1e2374… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Jul 17 21:51:02 2023 -0600 shell32: Free item lists with ILFree. --- dlls/shell32/clipboard.c | 4 ++-- dlls/shell32/cpanelfolder.c | 6 +++--- dlls/shell32/pidl.c | 2 +- dlls/shell32/shfldr_desktop.c | 6 +++--- dlls/shell32/shfldr_fs.c | 8 ++++---- dlls/shell32/shfldr_mycomp.c | 6 +++--- dlls/shell32/shfldr_netplaces.c | 4 ++-- dlls/shell32/shlview_cmenu.c | 4 ++-- 8 files changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/shell32/clipboard.c b/dlls/shell32/clipboard.c index 2f5c63bed9d..487fd0dcf8c 100644 --- a/dlls/shell32/clipboard.c +++ b/dlls/shell32/clipboard.c @@ -165,7 +165,7 @@ HGLOBAL RenderFILENAMEA (LPITEMIDLIST pidlRoot, LPITEMIDLIST * apidl, UINT cidl) return 0; bSuccess = SHGetPathFromIDListA(pidl, szTemp); - SHFree(pidl); + ILFree(pidl); if (!bSuccess) return 0; @@ -197,7 +197,7 @@ HGLOBAL RenderFILENAMEW (LPITEMIDLIST pidlRoot, LPITEMIDLIST * apidl, UINT cidl) return 0; bSuccess = SHGetPathFromIDListW(pidl, szTemp); - SHFree(pidl); + ILFree(pidl); if (!bSuccess) return 0; diff --git a/dlls/shell32/cpanelfolder.c b/dlls/shell32/cpanelfolder.c index a03f1c3d38c..69af6734f57 100644 --- a/dlls/shell32/cpanelfolder.c +++ b/dlls/shell32/cpanelfolder.c @@ -636,18 +636,18 @@ static HRESULT WINAPI ISF_ControlPanel_fnGetUIObjectOf(IShellFolder2 *iface, HWN } else if (IsEqualIID(riid, &IID_IExtractIconA) &&(cidl == 1)) { pidl = ILCombine(This->pidlRoot, apidl[0]); pObj = (LPUNKNOWN) IExtractIconA_Constructor(pidl); - SHFree(pidl); + ILFree(pidl); hr = S_OK; } else if (IsEqualIID(riid, &IID_IExtractIconW) &&(cidl == 1)) { pidl = ILCombine(This->pidlRoot, apidl[0]); pObj = (LPUNKNOWN) IExtractIconW_Constructor(pidl); - SHFree(pidl); + ILFree(pidl); hr = S_OK; } else if ((IsEqualIID(riid,&IID_IShellLinkW) || IsEqualIID(riid,&IID_IShellLinkA)) && (cidl == 1)) { pidl = ILCombine(This->pidlRoot, apidl[0]); hr = IShellLink_ConstructFromFile(NULL, riid, pidl, &pObj); - SHFree(pidl); + ILFree(pidl); } else { hr = E_NOINTERFACE; } diff --git a/dlls/shell32/pidl.c b/dlls/shell32/pidl.c index a7b5b60b270..9878ef9811e 100644 --- a/dlls/shell32/pidl.c +++ b/dlls/shell32/pidl.c @@ -1328,7 +1328,7 @@ HRESULT WINAPI SHBindToFolderIDListParent(IShellFolder *psf, LPCITEMIDLIST pidl, LPITEMIDLIST pidlParent = ILClone(pidl); ILRemoveLastID(pidlParent); hr = IShellFolder_BindToObject(psf, pidlParent, NULL, riid, ppv); - SHFree (pidlParent); + ILFree(pidlParent); } if (psfDesktop) diff --git a/dlls/shell32/shfldr_desktop.c b/dlls/shell32/shfldr_desktop.c index 3ebd8806808..49de36aa741 100644 --- a/dlls/shell32/shfldr_desktop.c +++ b/dlls/shell32/shfldr_desktop.c @@ -530,14 +530,14 @@ static HRESULT WINAPI ISF_Desktop_fnGetUIObjectOf (IShellFolder2 * iface, { pidl = ILCombine (This->pidlRoot, apidl[0]); pObj = (LPUNKNOWN) IExtractIconA_Constructor (pidl); - SHFree (pidl); + ILFree(pidl); hr = S_OK; } else if (IsEqualIID (riid, &IID_IExtractIconW) && (cidl == 1)) { pidl = ILCombine (This->pidlRoot, apidl[0]); pObj = (LPUNKNOWN) IExtractIconW_Constructor (pidl); - SHFree (pidl); + ILFree(pidl); hr = S_OK; } else if (IsEqualIID (riid, &IID_IDropTarget) && (cidl >= 1)) @@ -550,7 +550,7 @@ static HRESULT WINAPI ISF_Desktop_fnGetUIObjectOf (IShellFolder2 * iface, { pidl = ILCombine (This->pidlRoot, apidl[0]); hr = IShellLink_ConstructFromFile(NULL, riid, pidl, &pObj); - SHFree (pidl); + ILFree(pidl); } else hr = E_NOINTERFACE; diff --git a/dlls/shell32/shfldr_fs.c b/dlls/shell32/shfldr_fs.c index b1acfe2ded5..32de9ab6ef1 100644 --- a/dlls/shell32/shfldr_fs.c +++ b/dlls/shell32/shfldr_fs.c @@ -710,12 +710,12 @@ IShellFolder_fnGetUIObjectOf (IShellFolder2 * iface, } else if (IsEqualIID (riid, &IID_IExtractIconA) && (cidl == 1)) { pidl = ILCombine (This->pidlRoot, apidl[0]); pObj = (LPUNKNOWN) IExtractIconA_Constructor (pidl); - SHFree (pidl); + ILFree(pidl); hr = S_OK; } else if (IsEqualIID (riid, &IID_IExtractIconW) && (cidl == 1)) { pidl = ILCombine (This->pidlRoot, apidl[0]); pObj = (LPUNKNOWN) IExtractIconW_Constructor (pidl); - SHFree (pidl); + ILFree(pidl); hr = S_OK; } else if (IsEqualIID (riid, &IID_IDropTarget) && (cidl >= 1)) { hr = IShellFolder2_QueryInterface (iface, &IID_IDropTarget, @@ -724,7 +724,7 @@ IShellFolder_fnGetUIObjectOf (IShellFolder2 * iface, IsEqualIID(riid,&IID_IShellLinkA)) && (cidl == 1)) { pidl = ILCombine (This->pidlRoot, apidl[0]); hr = IShellLink_ConstructFromFile(NULL, riid, pidl, &pObj); - SHFree (pidl); + ILFree(pidl); } else { hr = E_NOINTERFACE; } @@ -1305,7 +1305,7 @@ ISFHelper_fnDeleteItems (ISFHelper * iface, UINT cidl, LPCITEMIDLIST * apidl) { LPITEMIDLIST pidl = ILCombine(This->pidlRoot, apidl[i]); SHChangeNotify(wEventId, SHCNF_IDLIST, pidl, NULL); - SHFree(pidl); + ILFree(pidl); } wszCurrentPath += lstrlenW(wszCurrentPath)+1; diff --git a/dlls/shell32/shfldr_mycomp.c b/dlls/shell32/shfldr_mycomp.c index 0f7408e1fae..6d24a8e5c9e 100644 --- a/dlls/shell32/shfldr_mycomp.c +++ b/dlls/shell32/shfldr_mycomp.c @@ -527,14 +527,14 @@ static HRESULT WINAPI ISF_MyComputer_fnGetUIObjectOf (IShellFolder2 * iface, { pidl = ILCombine (This->pidlRoot, apidl[0]); pObj = (LPUNKNOWN) IExtractIconA_Constructor (pidl); - SHFree (pidl); + ILFree(pidl); hr = S_OK; } else if (IsEqualIID (riid, &IID_IExtractIconW) && (cidl == 1)) { pidl = ILCombine (This->pidlRoot, apidl[0]); pObj = (LPUNKNOWN) IExtractIconW_Constructor (pidl); - SHFree (pidl); + ILFree(pidl); hr = S_OK; } else if (IsEqualIID (riid, &IID_IDropTarget) && (cidl >= 1)) @@ -547,7 +547,7 @@ static HRESULT WINAPI ISF_MyComputer_fnGetUIObjectOf (IShellFolder2 * iface, { pidl = ILCombine (This->pidlRoot, apidl[0]); hr = IShellLink_ConstructFromFile(NULL, riid, pidl, &pObj); - SHFree (pidl); + ILFree(pidl); } else hr = E_NOINTERFACE; diff --git a/dlls/shell32/shfldr_netplaces.c b/dlls/shell32/shfldr_netplaces.c index 5f5ec43491c..0a48a000bcd 100644 --- a/dlls/shell32/shfldr_netplaces.c +++ b/dlls/shell32/shfldr_netplaces.c @@ -424,14 +424,14 @@ static HRESULT WINAPI ISF_NetworkPlaces_fnGetUIObjectOf (IShellFolder2 * iface, { pidl = ILCombine (This->pidlRoot, apidl[0]); pObj = (LPUNKNOWN) IExtractIconA_Constructor (pidl); - SHFree (pidl); + ILFree(pidl); hr = S_OK; } else if (IsEqualIID (riid, &IID_IExtractIconW) && (cidl == 1)) { pidl = ILCombine (This->pidlRoot, apidl[0]); pObj = (LPUNKNOWN) IExtractIconW_Constructor (pidl); - SHFree (pidl); + ILFree(pidl); hr = S_OK; } else if (IsEqualIID (riid, &IID_IDropTarget) && (cidl >= 1)) diff --git a/dlls/shell32/shlview_cmenu.c b/dlls/shell32/shlview_cmenu.c index b4cc56321ef..87d25794898 100644 --- a/dlls/shell32/shlview_cmenu.c +++ b/dlls/shell32/shlview_cmenu.c @@ -282,7 +282,7 @@ static void DoOpenExplore(ContextMenu *This, HWND hwnd, LPCSTR verb) sei.nShow = SW_SHOWNORMAL; sei.lpVerb = verb; ShellExecuteExA(&sei); - SHFree(pidlFQ); + ILFree(pidlFQ); } /************************************************************************** @@ -1150,7 +1150,7 @@ static HRESULT paste_pidls(ContextMenu *This, ITEMIDLIST **pidls, UINT count) if(psfhlpsrc) ISFHelper_Release(psfhlpsrc); IShellFolder_Release(psfFrom); } - SHFree(pidl_dir); + ILFree(pidl_dir); } IShellFolder_Release(psfDesktop);

1 0

Alex Henrie : include: Annotate SHAlloc with __WINE_(DEALLOC|MALLOC).
by Alexandre Julliard July 19, 2023

July 19, 2023

Module: wine Branch: master Commit: 16a2243ee992931faac1346aa338fc2151b29589 URL: https://gitlab.winehq.org/wine/wine/-/commit/16a2243ee992931faac1346aa338fc… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Jul 17 21:51:02 2023 -0600 include: Annotate SHAlloc with __WINE_(DEALLOC|MALLOC). --- include/shlobj.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/shlobj.h b/include/shlobj.h index c00687e84d8..0774dae7eca 100644 --- a/include/shlobj.h +++ b/include/shlobj.h @@ -74,8 +74,9 @@ enum typedef int GPFIDL_FLAGS; +WINSHELLAPI void WINAPI SHFree(void*); WINSHELLAPI UINT WINAPI SHAddFromPropSheetExtArray(HPSXA,LPFNADDPROPSHEETPAGE,LPARAM); -WINSHELLAPI LPVOID WINAPI SHAlloc(ULONG) __WINE_ALLOC_SIZE(1); +WINSHELLAPI void* WINAPI SHAlloc(ULONG) __WINE_ALLOC_SIZE(1) __WINE_DEALLOC(SHFree) __WINE_MALLOC; WINSHELLAPI HRESULT WINAPI SHCoCreateInstance(LPCWSTR,const CLSID*,IUnknown*,REFIID,LPVOID*); WINSHELLAPI HPSXA WINAPI SHCreatePropSheetExtArray(HKEY,LPCWSTR,UINT); WINSHELLAPI HPSXA WINAPI SHCreatePropSheetExtArrayEx(HKEY,LPCWSTR,UINT,IDataObject*); @@ -88,7 +89,6 @@ WINSHELLAPI HRESULT WINAPI SHCreateStdEnumFmtEtc(DWORD,const FORMATETC *,IE WINSHELLAPI void WINAPI SHDestroyPropSheetExtArray(HPSXA); WINSHELLAPI BOOL WINAPI SHFindFiles(LPCITEMIDLIST,LPCITEMIDLIST); WINSHELLAPI DWORD WINAPI SHFormatDrive(HWND,UINT,UINT,UINT); -WINSHELLAPI void WINAPI SHFree(LPVOID); WINSHELLAPI BOOL WINAPI GetFileNameFromBrowse(HWND,LPWSTR,DWORD,LPCWSTR,LPCWSTR,LPCWSTR,LPCWSTR); WINSHELLAPI HRESULT WINAPI SHGetInstanceExplorer(IUnknown**); WINSHELLAPI HRESULT WINAPI SHGetFolderPathAndSubDirA(HWND,int,HANDLE,DWORD,LPCSTR,LPSTR);

1 0

Alexandre Julliard : wininet: Use nameless unions/structs.
by Alexandre Julliard July 19, 2023

July 19, 2023

Module: wine Branch: master Commit: 94efe81ad581a43a121a60324e325b30e6c197f8 URL: https://gitlab.winehq.org/wine/wine/-/commit/94efe81ad581a43a121a60324e325b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 18 19:55:12 2023 +0200 wininet: Use nameless unions/structs. --- dlls/wininet/netconnection.c | 4 +--- dlls/wininet/urlcache.c | 7 ++----- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index 40da064588b..06aa5c82f6c 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -21,8 +21,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define NONAMELESSUNION - #include "ws2tcpip.h" #include <time.h> @@ -162,7 +160,7 @@ static DWORD netconn_verify_cert(netconn_t *conn, PCCERT_CONTEXT cert, HCERTSTOR */ memcpy(&chainCopy, chain, sizeof(chainCopy)); chainCopy.TrustStatus.dwErrorStatus = 0; - sslExtraPolicyPara.u.cbSize = sizeof(sslExtraPolicyPara); + sslExtraPolicyPara.cbSize = sizeof(sslExtraPolicyPara); sslExtraPolicyPara.dwAuthType = AUTHTYPE_SERVER; sslExtraPolicyPara.pwszServerName = conn->server->name; sslExtraPolicyPara.fdwChecks = conn->security_flags; diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index cad4c39046b..bad6f34b510 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -22,9 +22,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define NONAMELESSUNION -#define NONAMELESSSTRUCT - #include "ws2tcpip.h" #include <limits.h> @@ -1270,7 +1267,7 @@ static DWORD urlcache_copy_entry(cache_container *container, const urlcache_head entry_info->lpszLocalFileName = NULL; entry_info->lpszSourceUrlName = NULL; entry_info->CacheEntryType = url_entry->cache_entry_type; - entry_info->u.dwExemptDelta = url_entry->exempt_delta; + entry_info->dwExemptDelta = url_entry->exempt_delta; entry_info->dwHeaderInfoSize = url_entry->header_info_size; entry_info->dwHitRate = url_entry->hit_rate; entry_info->dwSizeHigh = url_entry->size.u.HighPart; @@ -1394,7 +1391,7 @@ static DWORD urlcache_set_entry_info(entry_url *url_entry, const INTERNET_CACHE_ if (field_control & CACHE_ENTRY_ATTRIBUTE_FC) url_entry->cache_entry_type = entry_info->CacheEntryType; if (field_control & CACHE_ENTRY_EXEMPT_DELTA_FC) - url_entry->exempt_delta = entry_info->u.dwExemptDelta; + url_entry->exempt_delta = entry_info->dwExemptDelta; if (field_control & CACHE_ENTRY_EXPTIME_FC) file_time_to_dos_date_time(&entry_info->ExpireTime, &url_entry->expire_date, &url_entry->expire_time); if (field_control & CACHE_ENTRY_HEADERINFO_FC)

1 0

Alexandre Julliard : winhttp: Use nameless unions/structs.
by Alexandre Julliard July 19, 2023

July 19, 2023

Module: wine Branch: master Commit: f58ce1cef6967f4326b3ec88ca5f7d3278dd4c2d URL: https://gitlab.winehq.org/wine/wine/-/commit/f58ce1cef6967f4326b3ec88ca5f7d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 18 19:54:48 2023 +0200 winhttp: Use nameless unions/structs. --- dlls/winhttp/net.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index 1be78d126d4..6eeb1cb5ac9 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -20,7 +20,6 @@ #include <assert.h> #include <stdarg.h> -#define NONAMELESSUNION #include "windef.h" #include "winbase.h" #include "ws2tcpip.h" @@ -147,7 +146,7 @@ static DWORD netconn_verify_cert( PCCERT_CONTEXT cert, WCHAR *server, DWORD secu */ memcpy(&chainCopy, chain, sizeof(chainCopy)); chainCopy.TrustStatus.dwErrorStatus = 0; - sslExtraPolicyPara.u.cbSize = sizeof(sslExtraPolicyPara); + sslExtraPolicyPara.cbSize = sizeof(sslExtraPolicyPara); sslExtraPolicyPara.dwAuthType = AUTHTYPE_SERVER; sslExtraPolicyPara.pwszServerName = server; sslExtraPolicyPara.fdwChecks = security_flags;

1 0

Alex Henrie : include: Annotate IoAllocate functions with __WINE_(ALLOC_SIZE|DEALLOC|MALLOC).
by Alexandre Julliard July 19, 2023

July 19, 2023

Module: wine Branch: master Commit: c79ffafcae894cc3d800a96bbf7da3d8fd95b138 URL: https://gitlab.winehq.org/wine/wine/-/commit/c79ffafcae894cc3d800a96bbf7da3… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Jun 4 14:57:14 2023 -0600 include: Annotate IoAllocate functions with __WINE_(ALLOC_SIZE|DEALLOC|MALLOC). --- include/ddk/wdm.h | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 0e54d59a7f6..79c88315c2e 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1705,13 +1705,17 @@ void WINAPI ExUnregisterCallback(void*); #define PLUGPLAY_PROPERTY_PERSISTENT 0x0001 +void WINAPI IoFreeErrorLogEntry(void*); +void WINAPI IoFreeIrp(IRP*); +void WINAPI IoFreeMdl(MDL*); +void WINAPI IoFreeWorkItem(PIO_WORKITEM); void WINAPI IoAcquireCancelSpinLock(KIRQL*); NTSTATUS WINAPI IoAcquireRemoveLockEx(IO_REMOVE_LOCK*,void*,const char*,ULONG, ULONG); NTSTATUS WINAPI IoAllocateDriverObjectExtension(PDRIVER_OBJECT,PVOID,ULONG,PVOID*); -PVOID WINAPI IoAllocateErrorLogEntry(PVOID,UCHAR); -PIRP WINAPI IoAllocateIrp(CCHAR,BOOLEAN); -PMDL WINAPI IoAllocateMdl(PVOID,ULONG,BOOLEAN,BOOLEAN,IRP*); -PIO_WORKITEM WINAPI IoAllocateWorkItem(PDEVICE_OBJECT); +void* WINAPI IoAllocateErrorLogEntry(void*,unsigned char) __WINE_ALLOC_SIZE(2) __WINE_DEALLOC(IoFreeErrorLogEntry) __WINE_MALLOC; +IRP* WINAPI IoAllocateIrp(char,BOOLEAN) __WINE_DEALLOC(IoFreeIrp); +MDL* WINAPI IoAllocateMdl(void*,ULONG,BOOLEAN,BOOLEAN,IRP*) __WINE_DEALLOC(IoFreeMdl); +PIO_WORKITEM WINAPI IoAllocateWorkItem(DEVICE_OBJECT*) __WINE_DEALLOC(IoFreeWorkItem); void WINAPI IoDetachDevice(PDEVICE_OBJECT); PDEVICE_OBJECT WINAPI IoAttachDeviceToDeviceStack(PDEVICE_OBJECT,PDEVICE_OBJECT); PIRP WINAPI IoBuildAsynchronousFsdRequest(ULONG,DEVICE_OBJECT*,void*,ULONG,LARGE_INTEGER*,IO_STATUS_BLOCK*); @@ -1728,9 +1732,6 @@ PKEVENT WINAPI IoCreateSynchronizationEvent(UNICODE_STRING*,HANDLE*); void WINAPI IoDeleteDevice(DEVICE_OBJECT*); void WINAPI IoDeleteDriver(DRIVER_OBJECT*); NTSTATUS WINAPI IoDeleteSymbolicLink(UNICODE_STRING*); -void WINAPI IoFreeIrp(IRP*); -void WINAPI IoFreeMdl(MDL*); -void WINAPI IoFreeWorkItem(PIO_WORKITEM); DEVICE_OBJECT * WINAPI IoGetAttachedDeviceReference(DEVICE_OBJECT*); PEPROCESS WINAPI IoGetCurrentProcess(void); NTSTATUS WINAPI IoGetDeviceInterfaces(const GUID*,PDEVICE_OBJECT,ULONG,PWSTR*);

1 0

Jeff Smith : gdiplus: Fix GdipGetAllPropertyItems return value when no properties exist.
by Alexandre Julliard July 19, 2023

July 19, 2023

Module: wine Branch: master Commit: b48a37f450ed17d45130ec56eddafd18b36a3187 URL: https://gitlab.winehq.org/wine/wine/-/commit/b48a37f450ed17d45130ec56eddafd… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Tue Jul 11 10:03:53 2023 -0500 gdiplus: Fix GdipGetAllPropertyItems return value when no properties exist. Discovered in researching https://bugs.winehq.org/show_bug.cgi?id=54748 --- dlls/gdiplus/image.c | 2 +- dlls/gdiplus/tests/image.c | 52 +++++++++++++++++++++++----------------------- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 7ad3ca0347e..4ba6b1efd95 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -2846,7 +2846,7 @@ GpStatus WINGDIPAPI GdipGetAllPropertyItems(GpImage *image, UINT size, } reader = ((GpBitmap *)image)->metadata_reader; - if (!reader) return PropertyNotFound; + if (!reader) return GenericError; hr = IWICMetadataReader_GetEnumerator(reader, &enumerator); if (FAILED(hr)) return hresult_to_status(hr); diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index b718a6fca16..b5f86c7e1b9 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -3681,6 +3681,7 @@ static void test_image_properties(void) }; GpStatus status, expected; GpImage *image; + PropertyItem *prop_item; UINT prop_count, prop_size, i; PROPID prop_id[16] = { 0 }; ImageType image_type; @@ -3816,6 +3817,31 @@ static void test_image_properties(void) status = GdipGetPropertySize(image, &prop_size, &prop_count); expect(expected, status); + status = GdipGetAllPropertyItems(image, 0, 0, NULL); + expect(InvalidParameter, status); + status = GdipGetAllPropertyItems(image, prop_size, prop_count, NULL); + expect(InvalidParameter, status); + prop_item = HeapAlloc(GetProcessHeap(), 0, prop_size); + expected = (image_type == ImageTypeMetafile) ? NotImplemented : InvalidParameter; + if (prop_count != 1) + { + status = GdipGetAllPropertyItems(image, prop_size, 1, prop_item); + expect(expected, status); + } + if (prop_size != 0) + { + status = GdipGetAllPropertyItems(image, 0, prop_count, prop_item); + expect(expected, status); + } + status = GdipGetAllPropertyItems(image, prop_size + 1, prop_count, prop_item); + expect(expected, status); + if (image_type != ImageTypeMetafile) + expected = (prop_count == 0) ? GenericError : Ok; + status = GdipGetAllPropertyItems(image, prop_size, prop_count, prop_item); + ok(status == expected || broken(status == Ok && prop_count == 0), /* XP */ + "Expected %d, got %d\n", expected, status); + HeapFree(GetProcessHeap(), 0, prop_item); + GdipDisposeImage(image); winetest_pop_context(); @@ -4176,19 +4202,6 @@ static void test_GdipGetAllPropertyItems(void) "expected total property size %u, got %u\n", prop_size, total_size); prop_item = HeapAlloc(GetProcessHeap(), 0, prop_size); - - status = GdipGetAllPropertyItems(image, 0, prop_count, prop_item); - expect(InvalidParameter, status); - status = GdipGetAllPropertyItems(image, prop_size, 1, prop_item); - expect(InvalidParameter, status); - status = GdipGetAllPropertyItems(image, prop_size, prop_count, NULL); - expect(InvalidParameter, status); - status = GdipGetAllPropertyItems(image, prop_size, prop_count, NULL); - expect(InvalidParameter, status); - status = GdipGetAllPropertyItems(image, 0, 0, NULL); - expect(InvalidParameter, status); - status = GdipGetAllPropertyItems(image, prop_size + 1, prop_count, prop_item); - expect(InvalidParameter, status); status = GdipGetAllPropertyItems(image, prop_size, prop_count, prop_item); expect(Ok, status); @@ -4932,19 +4945,6 @@ static void test_gif_properties(void) "expected total property size %u, got %u\n", prop_size, total_size); prop_item = HeapAlloc(GetProcessHeap(), 0, prop_size); - - status = GdipGetAllPropertyItems(image, 0, prop_count, prop_item); - expect(InvalidParameter, status); - status = GdipGetAllPropertyItems(image, prop_size, 1, prop_item); - expect(InvalidParameter, status); - status = GdipGetAllPropertyItems(image, prop_size, prop_count, NULL); - expect(InvalidParameter, status); - status = GdipGetAllPropertyItems(image, prop_size, prop_count, NULL); - expect(InvalidParameter, status); - status = GdipGetAllPropertyItems(image, 0, 0, NULL); - expect(InvalidParameter, status); - status = GdipGetAllPropertyItems(image, prop_size + 1, prop_count, prop_item); - expect(InvalidParameter, status); status = GdipGetAllPropertyItems(image, prop_size, prop_count, prop_item); expect(Ok, status);

1 0

Jeff Smith : gdiplus: Fix GdipGetPropertySize return value when no properties exist.
by Alexandre Julliard July 19, 2023

July 19, 2023

Module: wine Branch: master Commit: 1517342faccc841c4af4ed6230eb67ab81560a60 URL: https://gitlab.winehq.org/wine/wine/-/commit/1517342faccc841c4af4ed6230eb67… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Tue Jul 11 10:02:29 2023 -0500 gdiplus: Fix GdipGetPropertySize return value when no properties exist. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54748 --- dlls/gdiplus/image.c | 7 ++++++- dlls/gdiplus/tests/image.c | 28 ++++++++++++---------------- 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 50a666c5bc9..7ad3ca0347e 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -2760,7 +2760,12 @@ GpStatus WINGDIPAPI GdipGetPropertySize(GpImage *image, UINT *size, UINT *count) } reader = ((GpBitmap *)image)->metadata_reader; - if (!reader) return PropertyNotFound; + if (!reader) + { + *count = 0; + *size = 0; + return Ok; + } hr = IWICMetadataReader_GetCount(reader, &prop_count); if (FAILED(hr)) return hresult_to_status(hr); diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index a2dcd448143..b718a6fca16 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -3804,6 +3804,18 @@ static void test_image_properties(void) "expected property id %#lx, got %#lx\n", prop_id[0], item.data.id); } + status = GdipGetPropertySize(NULL, &prop_size, &prop_count); + expect(InvalidParameter, status); + status = GdipGetPropertySize(image, &prop_size, NULL); + expect(InvalidParameter, status); + status = GdipGetPropertySize(image, NULL, &prop_count); + expect(InvalidParameter, status); + status = GdipGetPropertySize(image, NULL, NULL); + expect(InvalidParameter, status); + expected = (image_type == ImageTypeMetafile) ? NotImplemented : Ok; + status = GdipGetPropertySize(image, &prop_size, &prop_count); + expect(expected, status); + GdipDisposeImage(image); winetest_pop_context(); @@ -4154,14 +4166,6 @@ static void test_GdipGetAllPropertyItems(void) HeapFree(GetProcessHeap(), 0, prop_id); - status = GdipGetPropertySize(NULL, &total_size, &total_count); - expect(InvalidParameter, status); - status = GdipGetPropertySize(image, &total_size, NULL); - expect(InvalidParameter, status); - status = GdipGetPropertySize(image, NULL, &total_count); - expect(InvalidParameter, status); - status = GdipGetPropertySize(image, NULL, NULL); - expect(InvalidParameter, status); total_size = 0xdeadbeef; total_count = 0xdeadbeef; status = GdipGetPropertySize(image, &total_size, &total_count); @@ -4918,14 +4922,6 @@ static void test_gif_properties(void) HeapFree(GetProcessHeap(), 0, prop_id); - status = GdipGetPropertySize(NULL, &total_size, &total_count); - expect(InvalidParameter, status); - status = GdipGetPropertySize(image, &total_size, NULL); - expect(InvalidParameter, status); - status = GdipGetPropertySize(image, NULL, &total_count); - expect(InvalidParameter, status); - status = GdipGetPropertySize(image, NULL, NULL); - expect(InvalidParameter, status); total_size = 0xdeadbeef; total_count = 0xdeadbeef; status = GdipGetPropertySize(image, &total_size, &total_count);

1 0

Jeff Smith : gdiplus/tests: Use test context for test ran in a loop.
by Alexandre Julliard July 19, 2023

July 19, 2023

Module: wine Branch: master Commit: 7c8a4c1ce864506038035bc372eeeb1e45c0503b URL: https://gitlab.winehq.org/wine/wine/-/commit/7c8a4c1ce864506038035bc372eeeb… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Mon Jul 10 14:22:04 2023 -0500 gdiplus/tests: Use test context for test ran in a loop. --- dlls/gdiplus/tests/image.c | 52 ++++++++++++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 23 deletions(-) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 256d834e50d..27b60d740cd 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -3693,39 +3693,42 @@ static void test_image_properties(void) for (i = 0; i < ARRAY_SIZE(td); i++) { + winetest_push_context("%u", i); + image = load_image(td[i].image_data, td[i].image_size, TRUE, FALSE); if (!image) { - trace("%u: failed to load image data\n", i); + trace("failed to load image data\n"); + winetest_pop_context(); continue; } status = GdipGetImageType(image, &image_type); - ok(status == Ok, "%u: GdipGetImageType error %d\n", i, status); - ok(td[i].image_type == image_type, "%u: expected image_type %d, got %d\n", - i, td[i].image_type, image_type); + ok(status == Ok, "GdipGetImageType error %d\n", status); + ok(td[i].image_type == image_type, "expected image_type %d, got %d\n", + td[i].image_type, image_type); palette_size = -1; status = GdipGetImagePaletteSize(image, &palette_size); if (td[i].palette_size >= 0) { - ok(status == Ok, "%u: GdipGetImagePaletteSize error %d\n", i, status); - ok(td[i].palette_size == palette_size, "%u: expected palette_size %d, got %d\n", - i, td[i].palette_size, palette_size); + ok(status == Ok, "GdipGetImagePaletteSize error %d\n", status); + ok(td[i].palette_size == palette_size, "expected palette_size %d, got %d\n", + td[i].palette_size, palette_size); } else { - ok(status == -td[i].palette_size, "%u: GdipGetImagePaletteSize returned %d\n", i, status); - ok(palette_size == 0, "%u: expected palette_size 0, got %d\n", - i, palette_size); + ok(status == -td[i].palette_size, "GdipGetImagePaletteSize returned %d\n", status); + ok(palette_size == 0, "expected palette_size 0, got %d\n", + palette_size); } status = GdipGetPropertyCount(image, &prop_count); - ok(status == Ok, "%u: GdipGetPropertyCount error %d\n", i, status); + ok(status == Ok, "GdipGetPropertyCount error %d\n", status); todo_wine_if(td[i].image_data == pngimage || td[i].image_data == jpgimage || td[i].image_data == gifimage) ok(td[i].prop_count == prop_count || (td[i].prop_count2 != ~0 && td[i].prop_count2 == prop_count), - " %u: expected property count %u or %u, got %u\n", - i, td[i].prop_count, td[i].prop_count2, prop_count); + "expected property count %u or %u, got %u\n", + td[i].prop_count, td[i].prop_count2, prop_count); status = GdipGetPropertyItemSize(NULL, 0, &prop_size); expect(InvalidParameter, status); @@ -3751,6 +3754,7 @@ static void test_image_properties(void) if (!(td[i].prop_count == prop_count || (td[i].prop_count2 != ~0 && td[i].prop_count2 == prop_count))) { GdipDisposeImage(image); + winetest_pop_context(); continue; } @@ -3783,8 +3787,8 @@ static void test_image_properties(void) expect(Ok, status); if (prop_count != 0) ok(td[i].prop_id == prop_id[0] || (td[i].prop_id2 != ~0 && td[i].prop_id2 == prop_id[0]), - " %u: expected property id %#x or %#x, got %#lx\n", - i, td[i].prop_id, td[i].prop_id2, prop_id[0]); + "expected property id %#x or %#x, got %#lx\n", + td[i].prop_id, td[i].prop_id2, prop_id[0]); } if (status == Ok) @@ -3797,30 +3801,32 @@ static void test_image_properties(void) expect(Ok, status); assert(sizeof(item) >= prop_size); - ok(prop_size > sizeof(PropertyItem), "%u: got too small prop_size %u\n", - i, prop_size); + ok(prop_size > sizeof(PropertyItem), "got too small prop_size %u\n", + prop_size); ok(td[i].prop_size + sizeof(PropertyItem) == prop_size || (td[i].prop_size2 != ~0 && td[i].prop_size2 + sizeof(PropertyItem) == prop_size), - " %u: expected property size (%u or %u)+%u, got %u\n", - i, td[i].prop_size, td[i].prop_size2, (UINT) sizeof(PropertyItem), prop_size); + "expected property size (%u or %u)+%u, got %u\n", + td[i].prop_size, td[i].prop_size2, (UINT) sizeof(PropertyItem), prop_size); status = GdipGetPropertyItem(image, prop_id[0], 0, &item.data); ok(status == InvalidParameter || status == GenericError /* Win7 */, - "%u: expected InvalidParameter, got %d\n", i, status); + "expected InvalidParameter, got %d\n", status); status = GdipGetPropertyItem(image, prop_id[0], prop_size - 1, &item.data); ok(status == InvalidParameter || status == GenericError /* Win7 */, - "%u: expected InvalidParameter, got %d\n", i, status); + "expected InvalidParameter, got %d\n", status); status = GdipGetPropertyItem(image, prop_id[0], prop_size + 1, &item.data); ok(status == InvalidParameter || status == GenericError /* Win7 */, - "%u: expected InvalidParameter, got %d\n", i, status); + "expected InvalidParameter, got %d\n", status); status = GdipGetPropertyItem(image, prop_id[0], prop_size, &item.data); expect(Ok, status); ok(prop_id[0] == item.data.id, - "%u: expected property id %#lx, got %#lx\n", i, prop_id[0], item.data.id); + "expected property id %#lx, got %#lx\n", prop_id[0], item.data.id); } } GdipDisposeImage(image); + + winetest_pop_context(); } }

1 0