- wine-devel - winehq.org

[PATCH resend] setupapi: Implement CM_Get_DevNode_Property[_Ex]W().
by Chip Davis 27 Jan '20

27 Jan '20

Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> --- dlls/cfgmgr32/cfgmgr32.spec | 2 + dlls/setupapi/devinst.c | 105 ++++++++++++++++++++++++++---------- dlls/setupapi/setupapi.spec | 2 + 3 files changed, 81 insertions(+), 28 deletions(-) diff --git a/dlls/cfgmgr32/cfgmgr32.spec b/dlls/cfgmgr32/cfgmgr32.spec index 20ede7b13d1f..8360048421a0 100644 --- a/dlls/cfgmgr32/cfgmgr32.spec +++ b/dlls/cfgmgr32/cfgmgr32.spec @@ -57,6 +57,8 @@ @ stdcall CM_Get_Class_Registry_PropertyW(ptr long ptr ptr long long ptr) setupapi.CM_Get_Class_Registry_PropertyW @ stub CM_Get_Depth @ stub CM_Get_Depth_Ex +@ stdcall CM_Get_DevNode_PropertyW(long ptr ptr ptr ptr long) setupapi.CM_Get_DevNode_PropertyW +@ stdcall CM_Get_DevNode_Property_ExW(long ptr ptr ptr ptr long ptr) setupapi.CM_Get_DevNode_Property_ExW @ stdcall CM_Get_DevNode_Registry_PropertyA(long long ptr ptr ptr long) setupapi.CM_Get_DevNode_Registry_PropertyA @ stdcall CM_Get_DevNode_Registry_PropertyW(long long ptr ptr ptr long) setupapi.CM_Get_DevNode_Registry_PropertyW @ stdcall CM_Get_DevNode_Registry_Property_ExA(long long ptr ptr ptr long ptr) setupapi.CM_Get_DevNode_Registry_Property_ExA diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 25d4040da058..6871f47023c9 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -4177,47 +4177,26 @@ BOOL WINAPI SetupDiGetINFClassW(PCWSTR inf, LPGUID class_guid, PWSTR class_name, return (have_guid || have_name); } -/*********************************************************************** - * SetupDiGetDevicePropertyW (SETUPAPI.@) - */ -BOOL WINAPI SetupDiGetDevicePropertyW(HDEVINFO devinfo, PSP_DEVINFO_DATA device_data, - const DEVPROPKEY *prop_key, DEVPROPTYPE *prop_type, BYTE *prop_buff, - DWORD prop_buff_size, DWORD *required_size, DWORD flags) +static LSTATUS get_device_property(struct device *device, const DEVPROPKEY *prop_key, DEVPROPTYPE *prop_type, + BYTE *prop_buff, DWORD prop_buff_size, DWORD *required_size, DWORD flags) { - static const WCHAR formatW[] = {'\\', '%', '0', '4', 'X', 0}; - WCHAR key_path[55] = {'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', '\\'}; + WCHAR key_path[55] = L"Properties\\"; HKEY hkey; DWORD value_type; DWORD value_size = 0; LSTATUS ls; - struct device *device; - - TRACE("%p, %p, %p, %p, %p, %d, %p, %#x\n", devinfo, device_data, prop_key, prop_type, prop_buff, prop_buff_size, - required_size, flags); - - if (!(device = get_device(devinfo, device_data))) - return FALSE; if (!prop_key) - { - SetLastError(ERROR_INVALID_DATA); - return FALSE; - } + return ERROR_INVALID_DATA; if (!prop_type || (!prop_buff && prop_buff_size)) - { - SetLastError(ERROR_INVALID_USER_BUFFER); - return FALSE; - } + return ERROR_INVALID_USER_BUFFER; if (flags) - { - SetLastError(ERROR_INVALID_FLAGS); - return FALSE; - } + return ERROR_INVALID_FLAGS; SETUPDI_GuidToString(&prop_key->fmtid, key_path + 11); - swprintf(key_path + 49, ARRAY_SIZE(key_path) - 49, formatW, prop_key->pid); + swprintf(key_path + 49, ARRAY_SIZE(key_path) - 49, L"\\%04X", prop_key->pid); ls = RegOpenKeyExW(device->key, key_path, 0, KEY_QUERY_VALUE, &hkey); if (!ls) @@ -4248,10 +4227,80 @@ BOOL WINAPI SetupDiGetDevicePropertyW(HDEVINFO devinfo, PSP_DEVINFO_DATA device_ if (required_size) *required_size = value_size; + return ls; +} + +/*********************************************************************** + * SetupDiGetDevicePropertyW (SETUPAPI.@) + */ +BOOL WINAPI SetupDiGetDevicePropertyW(HDEVINFO devinfo, PSP_DEVINFO_DATA device_data, + const DEVPROPKEY *prop_key, DEVPROPTYPE *prop_type, BYTE *prop_buff, + DWORD prop_buff_size, DWORD *required_size, DWORD flags) +{ + struct device *device; + LSTATUS ls; + + TRACE("%p, %p, %p, %p, %p, %d, %p, %#x\n", devinfo, device_data, prop_key, prop_type, prop_buff, prop_buff_size, + required_size, flags); + + if (!(device = get_device(devinfo, device_data))) + return FALSE; + + ls = get_device_property(device, prop_key, prop_type, prop_buff, prop_buff_size, required_size, flags); + SetLastError(ls); return !ls; } +/*********************************************************************** + * CM_Get_DevNode_Property_ExW (SETUPAPI.@) + */ +CONFIGRET WINAPI CM_Get_DevNode_Property_ExW(DEVINST devnode, const DEVPROPKEY *prop_key, DEVPROPTYPE *prop_type, + BYTE *prop_buff, ULONG *prop_buff_size, ULONG flags, HMACHINE machine) +{ + struct device *device = get_devnode_device(devnode); + LSTATUS ls; + + TRACE("%u, %p, %p, %p, %p, %#x, %p\n", devnode, prop_key, prop_type, prop_buff, prop_buff_size, + flags, machine); + + if (machine) + return CR_MACHINE_UNAVAILABLE; + + if (!device) + return CR_NO_SUCH_DEVINST; + + if (!prop_buff_size) + return CR_INVALID_POINTER; + + ls = get_device_property(device, prop_key, prop_type, prop_buff, *prop_buff_size, prop_buff_size, flags); + switch (ls) + { + case NO_ERROR: + return CR_SUCCESS; + case ERROR_INVALID_DATA: + return CR_INVALID_DATA; + case ERROR_INVALID_USER_BUFFER: + return CR_INVALID_POINTER; + case ERROR_INVALID_FLAGS: + return CR_INVALID_FLAG; + case ERROR_INSUFFICIENT_BUFFER: + return CR_BUFFER_SMALL; + case ERROR_NOT_FOUND: + return CR_NO_SUCH_VALUE; + } + return CR_FAILURE; +} + +/*********************************************************************** + * CM_Get_DevNode_PropertyW (SETUPAPI.@) + */ +CONFIGRET WINAPI CM_Get_DevNode_PropertyW(DEVINST dev, const DEVPROPKEY *key, DEVPROPTYPE type, + PVOID buf, PULONG len, ULONG flags) +{ + return CM_Get_DevNode_Property_ExW(dev, key, type, buf, len, flags, NULL); +} + /*********************************************************************** * SetupDiInstallDeviceInterfaces (SETUPAPI.@) */ diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index 8c4ebcc1011e..74c252c6fd5f 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -67,6 +67,8 @@ @ stdcall CM_Get_Class_Registry_PropertyW(ptr long ptr ptr long long ptr) @ stub CM_Get_Depth @ stub CM_Get_Depth_Ex +@ stdcall CM_Get_DevNode_PropertyW(long ptr ptr ptr ptr long) +@ stdcall CM_Get_DevNode_Property_ExW(long ptr ptr ptr ptr long ptr) @ stdcall CM_Get_DevNode_Registry_PropertyA(long long ptr ptr ptr long) @ stdcall CM_Get_DevNode_Registry_PropertyW(long long ptr ptr ptr long) @ stdcall CM_Get_DevNode_Registry_Property_ExA(long long ptr ptr ptr long ptr) -- 2.24.0

1 0

[PATCH v2] atl: Fix the ATL_WNDCLASSINFOW::m_szAutoName member definition and construction.
by Hermès BÉLUSCA-MAÏTO 26 Jan '20

26 Jan '20

Signed-off-by: Hermes Belusca-Maito <hermes.belusca(a)sfr.fr>

1 0

[PATCH] dmime: Get rid of the DMUSIC_PRIVATE_PCHANNEL typedef
by Michael Stefaniuc 26 Jan '20

26 Jan '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmime/dmime_private.h | 10 ---------- dlls/dmime/performance.c | 6 +++++- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/dlls/dmime/dmime_private.h b/dlls/dmime/dmime_private.h index 983db7f62b..576ebc1ae8 100644 --- a/dlls/dmime/dmime_private.h +++ b/dlls/dmime/dmime_private.h @@ -102,16 +102,6 @@ typedef struct _DMUS_PRIVATE_TEMPO_PLAY_STATE { DWORD dummy; } DMUS_PRIVATE_TEMPO_PLAY_STATE, *LPDMUS_PRIVATE_TEMPO_PLAY_STATE; -/* some sort of aux. performance channel: as far as i can understand, these are - used to represent a particular midi channel in particular group at particular - group; so all we need to do is to fill it with parent port, group and midi - channel ? */ -typedef struct DMUSIC_PRIVATE_PCHANNEL_ { - DWORD channel; /* map to this channel... */ - DWORD group; /* ... in this group ... */ - IDirectMusicPort *port; /* ... at this port */ -} DMUSIC_PRIVATE_PCHANNEL, *LPDMUSIC_PRIVATE_PCHANNEL; - /********************************************************************** * Dll lifetime tracking declaration for dmime.dll */ diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index 3dd54a6cb6..c492ebdcb1 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -27,7 +27,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmime); struct pchannel_block { DWORD block_num; /* Block 0 is PChannels 0-15, Block 1 is PChannels 16-31, etc */ - DMUSIC_PRIVATE_PCHANNEL pchannel[16]; + struct { + DWORD channel; /* MIDI channel */ + DWORD group; /* MIDI group */ + IDirectMusicPort *port; + } pchannel[16]; struct wine_rb_entry entry; }; -- 2.24.1

1 0

[PATCH] dmscript: Implement the Script track GetParam/SetParam methods
by Michael Stefaniuc 26 Jan '20

26 Jan '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmscript/scripttrack.c | 24 ++++++++++++++---------- dlls/dmscript/tests/dmscript.c | 11 ++++++++++- 2 files changed, 24 insertions(+), 11 deletions(-) diff --git a/dlls/dmscript/scripttrack.c b/dlls/dmscript/scripttrack.c index ad5617f414..1bdf3e13c5 100644 --- a/dlls/dmscript/scripttrack.c +++ b/dlls/dmscript/scripttrack.c @@ -124,20 +124,24 @@ static HRESULT WINAPI script_track_Play(IDirectMusicTrack8 *iface, void *pStateD return S_OK; } -static HRESULT WINAPI script_track_GetParam(IDirectMusicTrack8 *iface, REFGUID rguidType, - MUSIC_TIME mtTime, MUSIC_TIME *pmtNext, void *pParam) +static HRESULT WINAPI script_track_GetParam(IDirectMusicTrack8 *iface, REFGUID type, + MUSIC_TIME time, MUSIC_TIME *next, void *param) { - DirectMusicScriptTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %s, %d, %p, %p): stub\n", This, debugstr_dmguid(rguidType), mtTime, pmtNext, pParam); - return S_OK; + DirectMusicScriptTrack *This = impl_from_IDirectMusicTrack8(iface); + + TRACE("(%p, %s, %d, %p, %p): not supported\n", This, debugstr_dmguid(type), time, next, param); + + return DMUS_E_GET_UNSUPPORTED; } -static HRESULT WINAPI script_track_SetParam(IDirectMusicTrack8 *iface, REFGUID rguidType, - MUSIC_TIME mtTime, void *pParam) +static HRESULT WINAPI script_track_SetParam(IDirectMusicTrack8 *iface, REFGUID type, + MUSIC_TIME time, void *param) { - DirectMusicScriptTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %s, %d, %p): stub\n", This, debugstr_dmguid(rguidType), mtTime, pParam); - return S_OK; + DirectMusicScriptTrack *This = impl_from_IDirectMusicTrack8(iface); + + TRACE("(%p, %s, %d, %p): not supported\n", This, debugstr_dmguid(type), time, param); + + return DMUS_E_SET_UNSUPPORTED; } static HRESULT WINAPI script_track_IsParamSupported(IDirectMusicTrack8 *iface, REFGUID type) diff --git a/dlls/dmscript/tests/dmscript.c b/dlls/dmscript/tests/dmscript.c index 365b006025..30b64d5788 100644 --- a/dlls/dmscript/tests/dmscript.c +++ b/dlls/dmscript/tests/dmscript.c @@ -207,6 +207,7 @@ static void test_scripttrack(void) IPersistStream *ps; CLSID class; ULARGE_INTEGER size; + char buf[64] = { 0 }; HRESULT hr; #define X(guid) &guid, #guid const struct { @@ -260,14 +261,22 @@ static void test_scripttrack(void) ok(hr == E_POINTER, "IDirectMusicTrack8_EndPlay failed: %08x\n", hr); hr = IDirectMusicTrack8_Play(dmt, NULL, 0, 0, 0, 0, NULL, NULL, 0); ok(hr == E_POINTER, "IDirectMusicTrack8_Play failed: %08x\n", hr); + } hr = IDirectMusicTrack8_GetParam(dmt, NULL, 0, NULL, NULL); ok(hr == DMUS_E_GET_UNSUPPORTED, "IDirectMusicTrack8_GetParam failed: %08x\n", hr); - } for (i = 0; i < ARRAY_SIZE(unsupported); i++) { hr = IDirectMusicTrack8_IsParamSupported(dmt, unsupported[i].type); ok(hr == DMUS_E_TYPE_UNSUPPORTED, "IsParamSupported(%s) failed: %08x, expected DMUS_E_TYPE_UNSUPPORTED\n", unsupported[i].name, hr); + hr = IDirectMusicTrack8_GetParam(dmt, unsupported[i].type, 0, NULL, buf); + ok(hr == DMUS_E_GET_UNSUPPORTED, + "GetParam(%s) failed: %08x, expected DMUS_E_GET_UNSUPPORTED\n", + unsupported[i].name, hr); + hr = IDirectMusicTrack8_SetParam(dmt, unsupported[i].type, 0, buf); + ok(hr == DMUS_E_SET_UNSUPPORTED, + "SetParam(%s) failed: %08x, expected DMUS_E_SET_UNSUPPORTED\n", + unsupported[i].name, hr); } hr = IDirectMusicTrack8_AddNotificationType(dmt, NULL); ok(hr == E_NOTIMPL, "IDirectMusicTrack8_AddNotificationType failed: %08x\n", hr); -- 2.24.1

1 0

[PATCH] dmcompos: Partially implement Chord Map track GetParam/SetParam methods
by Michael Stefaniuc 26 Jan '20

26 Jan '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmcompos/chordmaptrack.c | 38 +++++++++++++++++++++++++--------- dlls/dmcompos/tests/dmcompos.c | 6 ++---- 2 files changed, 30 insertions(+), 14 deletions(-) diff --git a/dlls/dmcompos/chordmaptrack.c b/dlls/dmcompos/chordmaptrack.c index b60b06768b..cf4f825986 100644 --- a/dlls/dmcompos/chordmaptrack.c +++ b/dlls/dmcompos/chordmaptrack.c @@ -117,20 +117,38 @@ static HRESULT WINAPI chordmap_track_Play(IDirectMusicTrack8 *iface, void *pStat return S_OK; } -static HRESULT WINAPI chordmap_track_GetParam(IDirectMusicTrack8 *iface, REFGUID rguidType, - MUSIC_TIME mtTime, MUSIC_TIME *pmtNext, void *pParam) +static HRESULT WINAPI chordmap_track_GetParam(IDirectMusicTrack8 *iface, REFGUID type, + MUSIC_TIME time, MUSIC_TIME *next, void *param) { - IDirectMusicChordMapTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %s, %d, %p, %p): stub\n", This, debugstr_dmguid(rguidType), mtTime, pmtNext, pParam); - return S_OK; + IDirectMusicChordMapTrack *This = impl_from_IDirectMusicTrack8(iface); + + TRACE("(%p, %s, %d, %p, %p)\n", This, debugstr_dmguid(type), time, next, param); + + if (!type) + return E_POINTER; + if (!IsEqualGUID(type, &GUID_IDirectMusicChordMap)) + return DMUS_E_GET_UNSUPPORTED; + + FIXME("GUID_IDirectMusicChordMap not handled yet\n"); + + return S_OK; } -static HRESULT WINAPI chordmap_track_SetParam(IDirectMusicTrack8 *iface, REFGUID rguidType, - MUSIC_TIME mtTime, void *pParam) +static HRESULT WINAPI chordmap_track_SetParam(IDirectMusicTrack8 *iface, REFGUID type, + MUSIC_TIME time, void *param) { - IDirectMusicChordMapTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %s, %d, %p): stub\n", This, debugstr_dmguid(rguidType), mtTime, pParam); - return S_OK; + IDirectMusicChordMapTrack *This = impl_from_IDirectMusicTrack8(iface); + + TRACE("(%p, %s, %d, %p)\n", This, debugstr_dmguid(type), time, param); + + if (!type) + return E_POINTER; + if (!IsEqualGUID(type, &GUID_IDirectMusicChordMap)) + return DMUS_E_SET_UNSUPPORTED; + + FIXME("GUID_IDirectMusicChordMap not handled yet\n"); + + return S_OK; } static HRESULT WINAPI chordmap_track_IsParamSupported(IDirectMusicTrack8 *iface, REFGUID rguidType) diff --git a/dlls/dmcompos/tests/dmcompos.c b/dlls/dmcompos/tests/dmcompos.c index f041d0ac34..d4dbd2206c 100644 --- a/dlls/dmcompos/tests/dmcompos.c +++ b/dlls/dmcompos/tests/dmcompos.c @@ -321,12 +321,10 @@ static void test_chordmaptrack(void) ok(hr == S_OK, "IDirectMusicTrack8_EndPlay failed: %08x\n", hr); hr = IDirectMusicTrack8_Play(dmt8, NULL, 0, 0, 0, 0, NULL, NULL, 0); ok(hr == S_OK, "IDirectMusicTrack8_Play failed: %08x\n", hr); - todo_wine { hr = IDirectMusicTrack8_GetParam(dmt8, NULL, 0, NULL, NULL); ok(hr == E_POINTER, "IDirectMusicTrack8_GetParam failed: %08x\n", hr); hr = IDirectMusicTrack8_SetParam(dmt8, NULL, 0, NULL); ok(hr == E_POINTER, "IDirectMusicTrack8_SetParam failed: %08x\n", hr); - } hr = IDirectMusicTrack8_IsParamSupported(dmt8, NULL); ok(hr == E_POINTER, "IDirectMusicTrack8_IsParamSupported failed: %08x\n", hr); @@ -348,11 +346,11 @@ static void test_chordmaptrack(void) "IsParamSupported(%s) failed: %08x, expected DMUS_E_TYPE_UNSUPPORTED\n", unsupported[i].name, hr); hr = IDirectMusicTrack8_GetParam(dmt8, unsupported[i].type, 0, NULL, &chordmap); - todo_wine ok(hr == DMUS_E_GET_UNSUPPORTED, + ok(hr == DMUS_E_GET_UNSUPPORTED, "GetParam(%s) failed: %08x, expected DMUS_E_GET_UNSUPPORTED\n", unsupported[i].name, hr); hr = IDirectMusicTrack8_SetParam(dmt8, unsupported[i].type, 0, chordmap); - todo_wine ok(hr == DMUS_E_SET_UNSUPPORTED, + ok(hr == DMUS_E_SET_UNSUPPORTED, "SetParam(%s) failed: %08x, expected DMUS_E_SET_UNSUPPORTED\n", unsupported[i].name, hr); } -- 2.24.1

1 0

[PATCH] dmsynth: Avoid the LPDIRECTMUSICSYNTH8 type
by Michael Stefaniuc 26 Jan '20

26 Jan '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmsynth/synth.c | 73 ++++++++++++++++++++++++++++---------------- 1 file changed, 47 insertions(+), 26 deletions(-) diff --git a/dlls/dmsynth/synth.c b/dlls/dmsynth/synth.c index 6d2c778a74..19789b5a25 100644 --- a/dlls/dmsynth/synth.c +++ b/dlls/dmsynth/synth.c @@ -37,7 +37,8 @@ static inline IDirectMusicSynth8Impl *impl_from_IDirectMusicSynth8(IDirectMusicS } /* IDirectMusicSynth8Impl IUnknown part: */ -static HRESULT WINAPI IDirectMusicSynth8Impl_QueryInterface(LPDIRECTMUSICSYNTH8 iface, REFIID riid, LPVOID *ret_iface) +static HRESULT WINAPI IDirectMusicSynth8Impl_QueryInterface(IDirectMusicSynth8 *iface, REFIID riid, + void **ret_iface) { IDirectMusicSynth8Impl *This = impl_from_IDirectMusicSynth8(iface); @@ -65,7 +66,7 @@ static HRESULT WINAPI IDirectMusicSynth8Impl_QueryInterface(LPDIRECTMUSICSYNTH8 return E_NOINTERFACE; } -static ULONG WINAPI IDirectMusicSynth8Impl_AddRef(LPDIRECTMUSICSYNTH8 iface) +static ULONG WINAPI IDirectMusicSynth8Impl_AddRef(IDirectMusicSynth8 *iface) { IDirectMusicSynth8Impl *This = impl_from_IDirectMusicSynth8(iface); ULONG ref = InterlockedIncrement(&This->ref); @@ -75,7 +76,7 @@ static ULONG WINAPI IDirectMusicSynth8Impl_AddRef(LPDIRECTMUSICSYNTH8 iface) return ref; } -static ULONG WINAPI IDirectMusicSynth8Impl_Release(LPDIRECTMUSICSYNTH8 iface) +static ULONG WINAPI IDirectMusicSynth8Impl_Release(IDirectMusicSynth8 *iface) { IDirectMusicSynth8Impl *This = impl_from_IDirectMusicSynth8(iface); ULONG ref = InterlockedDecrement(&This->ref); @@ -93,7 +94,8 @@ static ULONG WINAPI IDirectMusicSynth8Impl_Release(LPDIRECTMUSICSYNTH8 iface) } /* IDirectMusicSynth8Impl IDirectMusicSynth part: */ -static HRESULT WINAPI IDirectMusicSynth8Impl_Open(LPDIRECTMUSICSYNTH8 iface, LPDMUS_PORTPARAMS pPortParams) +static HRESULT WINAPI IDirectMusicSynth8Impl_Open(IDirectMusicSynth8 *iface, + DMUS_PORTPARAMS *pPortParams) { IDirectMusicSynth8Impl *This = impl_from_IDirectMusicSynth8(iface); @@ -102,7 +104,7 @@ static HRESULT WINAPI IDirectMusicSynth8Impl_Open(LPDIRECTMUSICSYNTH8 iface, LPD return S_OK; } -static HRESULT WINAPI IDirectMusicSynth8Impl_Close(LPDIRECTMUSICSYNTH8 iface) +static HRESULT WINAPI IDirectMusicSynth8Impl_Close(IDirectMusicSynth8 *iface) { IDirectMusicSynth8Impl *This = impl_from_IDirectMusicSynth8(iface); @@ -111,7 +113,8 @@ static HRESULT WINAPI IDirectMusicSynth8Impl_Close(LPDIRECTMUSICSYNTH8 iface) return S_OK; } -static HRESULT WINAPI IDirectMusicSynth8Impl_SetNumChannelGroups(LPDIRECTMUSICSYNTH8 iface, DWORD groups) +static HRESULT WINAPI IDirectMusicSynth8Impl_SetNumChannelGroups(IDirectMusicSynth8 *iface, + DWORD groups) { IDirectMusicSynth8Impl *This = impl_from_IDirectMusicSynth8(iface); @@ -120,7 +123,8 @@ static HRESULT WINAPI IDirectMusicSynth8Impl_SetNumChannelGroups(LPDIRECTMUSICSY return S_OK; } -static HRESULT WINAPI IDirectMusicSynth8Impl_Download(LPDIRECTMUSICSYNTH8 iface, LPHANDLE hDownload, LPVOID data, LPBOOL free) +static HRESULT WINAPI IDirectMusicSynth8Impl_Download(IDirectMusicSynth8 *iface, HANDLE *hDownload, + void *data, BOOL *free) { IDirectMusicSynth8Impl *This = impl_from_IDirectMusicSynth8(iface); LPBYTE buffer = data; @@ -254,7 +258,8 @@ static HRESULT WINAPI IDirectMusicSynth8Impl_Download(LPDIRECTMUSICSYNTH8 iface, return S_OK; } -static HRESULT WINAPI IDirectMusicSynth8Impl_Unload(LPDIRECTMUSICSYNTH8 iface, HANDLE hDownload, HRESULT (CALLBACK* lpFreeHandle)(HANDLE,HANDLE), HANDLE hUserData) +static HRESULT WINAPI IDirectMusicSynth8Impl_Unload(IDirectMusicSynth8 *iface, HANDLE hDownload, + HRESULT (CALLBACK *lpFreeHandle)(HANDLE,HANDLE), HANDLE hUserData) { IDirectMusicSynth8Impl *This = impl_from_IDirectMusicSynth8(iface); @@ -263,7 +268,8 @@ static HRESULT WINAPI IDirectMusicSynth8Impl_Unload(LPDIRECTMUSICSYNTH8 iface, H return S_OK; } -static HRESULT WINAPI IDirectMusicSynth8Impl_PlayBuffer(LPDIRECTMUSICSYNTH8 iface, REFERENCE_TIME rt, LPBYTE buffer, DWORD size) +static HRESULT WINAPI IDirectMusicSynth8Impl_PlayBuffer(IDirectMusicSynth8 *iface, + REFERENCE_TIME rt, BYTE *buffer, DWORD size) { IDirectMusicSynth8Impl *This = impl_from_IDirectMusicSynth8(iface); @@ -272,7 +278,8 @@ static HRESULT WINAPI IDirectMusicSynth8Impl_PlayBuffer(LPDIRECTMUSICSYNTH8 ifac return S_OK; } -static HRESULT WINAPI IDirectMusicSynth8Impl_GetRunningStats(LPDIRECTMUSICSYNTH8 iface, LPDMUS_SYNTHSTATS stats) +static HRESULT WINAPI IDirectMusicSynth8Impl_GetRunningStats(IDirectMusicSynth8 *iface, + DMUS_SYNTHSTATS *stats) { IDirectMusicSynth8Impl *This = impl_from_IDirectMusicSynth8(iface); @@ -281,7 +288,8 @@ static HRESULT WINAPI IDirectMusicSynth8Impl_GetRunningStats(LPDIRECTMUSICSYNTH8 return S_OK; } -static HRESULT WINAPI IDirectMusicSynth8Impl_GetPortCaps(LPDIRECTMUSICSYNTH8 iface, LPDMUS_PORTCAPS caps) +static HRESULT WINAPI IDirectMusicSynth8Impl_GetPortCaps(IDirectMusicSynth8 *iface, + DMUS_PORTCAPS *caps) { IDirectMusicSynth8Impl *This = impl_from_IDirectMusicSynth8(iface); @@ -292,7 +300,8 @@ static HRESULT WINAPI IDirectMusicSynth8Impl_GetPortCaps(LPDIRECTMUSICSYNTH8 ifa return S_OK; } -static HRESULT WINAPI IDirectMusicSynth8Impl_SetMasterClock(LPDIRECTMUSICSYNTH8 iface, IReferenceClock* clock) +static HRESULT WINAPI IDirectMusicSynth8Impl_SetMasterClock(IDirectMusicSynth8 *iface, + IReferenceClock *clock) { IDirectMusicSynth8Impl *This = impl_from_IDirectMusicSynth8(iface); @@ -301,7 +310,8 @@ static HRESULT WINAPI IDirectMusicSynth8Impl_SetMasterClock(LPDIRECTMUSICSYNTH8 return S_OK; } -static HRESULT WINAPI IDirectMusicSynth8Impl_GetLatencyClock(LPDIRECTMUSICSYNTH8 iface, IReferenceClock** clock) +static HRESULT WINAPI IDirectMusicSynth8Impl_GetLatencyClock(IDirectMusicSynth8 *iface, + IReferenceClock **clock) { IDirectMusicSynth8Impl *This = impl_from_IDirectMusicSynth8(iface); @@ -319,7 +329,7 @@ static HRESULT WINAPI IDirectMusicSynth8Impl_GetLatencyClock(LPDIRECTMUSICSYNTH8 return S_OK; } -static HRESULT WINAPI IDirectMusicSynth8Impl_Activate(LPDIRECTMUSICSYNTH8 iface, BOOL enable) +static HRESULT WINAPI IDirectMusicSynth8Impl_Activate(IDirectMusicSynth8 *iface, BOOL enable) { IDirectMusicSynth8Impl *This = impl_from_IDirectMusicSynth8(iface); @@ -330,7 +340,8 @@ static HRESULT WINAPI IDirectMusicSynth8Impl_Activate(LPDIRECTMUSICSYNTH8 iface, return S_OK; } -static HRESULT WINAPI IDirectMusicSynth8Impl_SetSynthSink(LPDIRECTMUSICSYNTH8 iface, IDirectMusicSynthSink* synth_sink) +static HRESULT WINAPI IDirectMusicSynth8Impl_SetSynthSink(IDirectMusicSynth8 *iface, + IDirectMusicSynthSink *synth_sink) { IDirectMusicSynth8Impl *This = impl_from_IDirectMusicSynth8(iface); @@ -344,7 +355,8 @@ static HRESULT WINAPI IDirectMusicSynth8Impl_SetSynthSink(LPDIRECTMUSICSYNTH8 if return S_OK; } -static HRESULT WINAPI IDirectMusicSynth8Impl_Render(LPDIRECTMUSICSYNTH8 iface, short* buffer, DWORD length, LONGLONG position) +static HRESULT WINAPI IDirectMusicSynth8Impl_Render(IDirectMusicSynth8 *iface, short *buffer, + DWORD length, LONGLONG position) { IDirectMusicSynth8Impl *This = impl_from_IDirectMusicSynth8(iface); @@ -353,7 +365,8 @@ static HRESULT WINAPI IDirectMusicSynth8Impl_Render(LPDIRECTMUSICSYNTH8 iface, s return S_OK; } -static HRESULT WINAPI IDirectMusicSynth8Impl_SetChannelPriority(LPDIRECTMUSICSYNTH8 iface, DWORD channel_group, DWORD channel, DWORD priority) +static HRESULT WINAPI IDirectMusicSynth8Impl_SetChannelPriority(IDirectMusicSynth8 *iface, + DWORD channel_group, DWORD channel, DWORD priority) { /* IDirectMusicSynth8Impl *This = impl_from_IDirectMusicSynth8(iface); */ @@ -363,7 +376,8 @@ static HRESULT WINAPI IDirectMusicSynth8Impl_SetChannelPriority(LPDIRECTMUSICSYN return S_OK; } -static HRESULT WINAPI IDirectMusicSynth8Impl_GetChannelPriority(LPDIRECTMUSICSYNTH8 iface, DWORD channel_group, DWORD channel, LPDWORD priority) +static HRESULT WINAPI IDirectMusicSynth8Impl_GetChannelPriority(IDirectMusicSynth8 *iface, + DWORD channel_group, DWORD channel, DWORD *priority) { IDirectMusicSynth8Impl *This = impl_from_IDirectMusicSynth8(iface); @@ -372,7 +386,8 @@ static HRESULT WINAPI IDirectMusicSynth8Impl_GetChannelPriority(LPDIRECTMUSICSYN return S_OK; } -static HRESULT WINAPI IDirectMusicSynth8Impl_GetFormat(LPDIRECTMUSICSYNTH8 iface, LPWAVEFORMATEX wave_format, LPDWORD wave_format_size) +static HRESULT WINAPI IDirectMusicSynth8Impl_GetFormat(IDirectMusicSynth8 *iface, + WAVEFORMATEX *wave_format, DWORD *wave_format_size) { IDirectMusicSynth8Impl *This = impl_from_IDirectMusicSynth8(iface); @@ -381,7 +396,7 @@ static HRESULT WINAPI IDirectMusicSynth8Impl_GetFormat(LPDIRECTMUSICSYNTH8 iface return S_OK; } -static HRESULT WINAPI IDirectMusicSynth8Impl_GetAppend(LPDIRECTMUSICSYNTH8 iface, DWORD* append) +static HRESULT WINAPI IDirectMusicSynth8Impl_GetAppend(IDirectMusicSynth8 *iface, DWORD *append) { TRACE("(%p)->(%p)\n", iface, append); @@ -392,8 +407,10 @@ static HRESULT WINAPI IDirectMusicSynth8Impl_GetAppend(LPDIRECTMUSICSYNTH8 iface } /* IDirectMusicSynth8Impl IDirectMusicSynth8 part: */ -static HRESULT WINAPI IDirectMusicSynth8Impl_PlayVoice(LPDIRECTMUSICSYNTH8 iface, REFERENCE_TIME ref_time, DWORD voice_id, DWORD channel_group, DWORD channel, - DWORD dwDLId, LONG prPitch, LONG vrVolume, SAMPLE_TIME stVoiceStart, SAMPLE_TIME stLoopStart, SAMPLE_TIME stLoopEnd) +static HRESULT WINAPI IDirectMusicSynth8Impl_PlayVoice(IDirectMusicSynth8 *iface, + REFERENCE_TIME ref_time, DWORD voice_id, DWORD channel_group, DWORD channel, DWORD dwDLId, + LONG prPitch, LONG vrVolume, SAMPLE_TIME stVoiceStart, SAMPLE_TIME stLoopStart, + SAMPLE_TIME stLoopEnd) { IDirectMusicSynth8Impl *This = impl_from_IDirectMusicSynth8(iface); @@ -404,7 +421,8 @@ static HRESULT WINAPI IDirectMusicSynth8Impl_PlayVoice(LPDIRECTMUSICSYNTH8 iface return S_OK; } -static HRESULT WINAPI IDirectMusicSynth8Impl_StopVoice(LPDIRECTMUSICSYNTH8 iface, REFERENCE_TIME ref_time, DWORD voice_id) +static HRESULT WINAPI IDirectMusicSynth8Impl_StopVoice(IDirectMusicSynth8 *iface, + REFERENCE_TIME ref_time, DWORD voice_id) { IDirectMusicSynth8Impl *This = impl_from_IDirectMusicSynth8(iface); @@ -413,7 +431,8 @@ static HRESULT WINAPI IDirectMusicSynth8Impl_StopVoice(LPDIRECTMUSICSYNTH8 iface return S_OK; } -static HRESULT WINAPI IDirectMusicSynth8Impl_GetVoiceState(LPDIRECTMUSICSYNTH8 iface, DWORD dwVoice[], DWORD cbVoice, DMUS_VOICE_STATE dwVoiceState[]) +static HRESULT WINAPI IDirectMusicSynth8Impl_GetVoiceState(IDirectMusicSynth8 *iface, + DWORD dwVoice[], DWORD cbVoice, DMUS_VOICE_STATE dwVoiceState[]) { IDirectMusicSynth8Impl *This = impl_from_IDirectMusicSynth8(iface); @@ -422,7 +441,8 @@ static HRESULT WINAPI IDirectMusicSynth8Impl_GetVoiceState(LPDIRECTMUSICSYNTH8 i return S_OK; } -static HRESULT WINAPI IDirectMusicSynth8Impl_Refresh(LPDIRECTMUSICSYNTH8 iface, DWORD download_id, DWORD flags) +static HRESULT WINAPI IDirectMusicSynth8Impl_Refresh(IDirectMusicSynth8 *iface, DWORD download_id, + DWORD flags) { IDirectMusicSynth8Impl *This = impl_from_IDirectMusicSynth8(iface); @@ -431,7 +451,8 @@ static HRESULT WINAPI IDirectMusicSynth8Impl_Refresh(LPDIRECTMUSICSYNTH8 iface, return S_OK; } -static HRESULT WINAPI IDirectMusicSynth8Impl_AssignChannelToBuses(LPDIRECTMUSICSYNTH8 iface, DWORD channel_group, DWORD channel, LPDWORD pdwBuses, DWORD cBuses) +static HRESULT WINAPI IDirectMusicSynth8Impl_AssignChannelToBuses(IDirectMusicSynth8 *iface, + DWORD channel_group, DWORD channel, DWORD *pdwBuses, DWORD cBuses) { IDirectMusicSynth8Impl *This = impl_from_IDirectMusicSynth8(iface); -- 2.24.1

1 0

[PATCH] dmsynth: Avoid the LPDIRECTMUSICSYNTHSINK type
by Michael Stefaniuc 26 Jan '20

26 Jan '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmsynth/synthsink.c | 31 ++++++++++++++++++++----------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/dlls/dmsynth/synthsink.c b/dlls/dmsynth/synthsink.c index 7d148b0e9f..46011eae27 100644 --- a/dlls/dmsynth/synthsink.c +++ b/dlls/dmsynth/synthsink.c @@ -33,7 +33,8 @@ static inline IDirectMusicSynthSinkImpl *impl_from_IDirectMusicSynthSink(IDirect } /* IDirectMusicSynthSinkImpl IUnknown part: */ -static HRESULT WINAPI IDirectMusicSynthSinkImpl_QueryInterface(LPDIRECTMUSICSYNTHSINK iface, REFIID riid, LPVOID *ret_iface) +static HRESULT WINAPI IDirectMusicSynthSinkImpl_QueryInterface(IDirectMusicSynthSink *iface, + REFIID riid, void **ret_iface) { IDirectMusicSynthSinkImpl *This = impl_from_IDirectMusicSynthSink(iface); @@ -60,7 +61,7 @@ static HRESULT WINAPI IDirectMusicSynthSinkImpl_QueryInterface(LPDIRECTMUSICSYNT return E_NOINTERFACE; } -static ULONG WINAPI IDirectMusicSynthSinkImpl_AddRef(LPDIRECTMUSICSYNTHSINK iface) +static ULONG WINAPI IDirectMusicSynthSinkImpl_AddRef(IDirectMusicSynthSink *iface) { IDirectMusicSynthSinkImpl *This = impl_from_IDirectMusicSynthSink(iface); ULONG ref = InterlockedIncrement(&This->ref); @@ -70,7 +71,7 @@ static ULONG WINAPI IDirectMusicSynthSinkImpl_AddRef(LPDIRECTMUSICSYNTHSINK ifac return ref; } -static ULONG WINAPI IDirectMusicSynthSinkImpl_Release(LPDIRECTMUSICSYNTHSINK iface) +static ULONG WINAPI IDirectMusicSynthSinkImpl_Release(IDirectMusicSynthSink *iface) { IDirectMusicSynthSinkImpl *This = impl_from_IDirectMusicSynthSink(iface); ULONG ref = InterlockedDecrement(&This->ref); @@ -88,7 +89,8 @@ static ULONG WINAPI IDirectMusicSynthSinkImpl_Release(LPDIRECTMUSICSYNTHSINK ifa } /* IDirectMusicSynthSinkImpl IDirectMusicSynthSink part: */ -static HRESULT WINAPI IDirectMusicSynthSinkImpl_Init(LPDIRECTMUSICSYNTHSINK iface, IDirectMusicSynth* synth) +static HRESULT WINAPI IDirectMusicSynthSinkImpl_Init(IDirectMusicSynthSink *iface, + IDirectMusicSynth *synth) { IDirectMusicSynthSinkImpl *This = impl_from_IDirectMusicSynthSink(iface); @@ -97,7 +99,8 @@ static HRESULT WINAPI IDirectMusicSynthSinkImpl_Init(LPDIRECTMUSICSYNTHSINK ifac return S_OK; } -static HRESULT WINAPI IDirectMusicSynthSinkImpl_SetMasterClock(LPDIRECTMUSICSYNTHSINK iface, IReferenceClock* clock) +static HRESULT WINAPI IDirectMusicSynthSinkImpl_SetMasterClock(IDirectMusicSynthSink *iface, + IReferenceClock *clock) { IDirectMusicSynthSinkImpl *This = impl_from_IDirectMusicSynthSink(iface); @@ -106,7 +109,8 @@ static HRESULT WINAPI IDirectMusicSynthSinkImpl_SetMasterClock(LPDIRECTMUSICSYNT return S_OK; } -static HRESULT WINAPI IDirectMusicSynthSinkImpl_GetLatencyClock(LPDIRECTMUSICSYNTHSINK iface, IReferenceClock** clock) +static HRESULT WINAPI IDirectMusicSynthSinkImpl_GetLatencyClock(IDirectMusicSynthSink *iface, + IReferenceClock **clock) { IDirectMusicSynthSinkImpl *This = impl_from_IDirectMusicSynthSink(iface); @@ -121,7 +125,8 @@ static HRESULT WINAPI IDirectMusicSynthSinkImpl_GetLatencyClock(LPDIRECTMUSICSYN return S_OK; } -static HRESULT WINAPI IDirectMusicSynthSinkImpl_Activate(LPDIRECTMUSICSYNTHSINK iface, BOOL enable) +static HRESULT WINAPI IDirectMusicSynthSinkImpl_Activate(IDirectMusicSynthSink *iface, + BOOL enable) { IDirectMusicSynthSinkImpl *This = impl_from_IDirectMusicSynthSink(iface); @@ -130,7 +135,8 @@ static HRESULT WINAPI IDirectMusicSynthSinkImpl_Activate(LPDIRECTMUSICSYNTHSINK return S_OK; } -static HRESULT WINAPI IDirectMusicSynthSinkImpl_SampleToRefTime(LPDIRECTMUSICSYNTHSINK iface, LONGLONG sample_time, REFERENCE_TIME* ref_time) +static HRESULT WINAPI IDirectMusicSynthSinkImpl_SampleToRefTime(IDirectMusicSynthSink *iface, + LONGLONG sample_time, REFERENCE_TIME *ref_time) { IDirectMusicSynthSinkImpl *This = impl_from_IDirectMusicSynthSink(iface); @@ -139,7 +145,8 @@ static HRESULT WINAPI IDirectMusicSynthSinkImpl_SampleToRefTime(LPDIRECTMUSICSYN return S_OK; } -static HRESULT WINAPI IDirectMusicSynthSinkImpl_RefTimeToSample(LPDIRECTMUSICSYNTHSINK iface, REFERENCE_TIME ref_time, LONGLONG* sample_time) +static HRESULT WINAPI IDirectMusicSynthSinkImpl_RefTimeToSample(IDirectMusicSynthSink *iface, + REFERENCE_TIME ref_time, LONGLONG *sample_time) { IDirectMusicSynthSinkImpl *This = impl_from_IDirectMusicSynthSink(iface); @@ -148,7 +155,8 @@ static HRESULT WINAPI IDirectMusicSynthSinkImpl_RefTimeToSample(LPDIRECTMUSICSYN return S_OK; } -static HRESULT WINAPI IDirectMusicSynthSinkImpl_SetDirectSound(LPDIRECTMUSICSYNTHSINK iface, LPDIRECTSOUND dsound, LPDIRECTSOUNDBUFFER dsound_buffer) +static HRESULT WINAPI IDirectMusicSynthSinkImpl_SetDirectSound(IDirectMusicSynthSink *iface, + IDirectSound *dsound, IDirectSoundBuffer *dsound_buffer) { IDirectMusicSynthSinkImpl *This = impl_from_IDirectMusicSynthSink(iface); @@ -157,7 +165,8 @@ static HRESULT WINAPI IDirectMusicSynthSinkImpl_SetDirectSound(LPDIRECTMUSICSYNT return S_OK; } -static HRESULT WINAPI IDirectMusicSynthSinkImpl_GetDesiredBufferSize(LPDIRECTMUSICSYNTHSINK iface, LPDWORD buffer_size_in_samples) +static HRESULT WINAPI IDirectMusicSynthSinkImpl_GetDesiredBufferSize(IDirectMusicSynthSink *iface, + DWORD *buffer_size_in_samples) { IDirectMusicSynthSinkImpl *This = impl_from_IDirectMusicSynthSink(iface); -- 2.24.1

1 0

[PATCH v4 1/4] kernelbase: Don't return ERROR_INSUFFICIENT_BUFFER from GetEnvironmentVariableW.
by Vladimir Panteleev 25 Jan '20

25 Jan '20

Windows doesn't do this (except XP, and then only for empty variables, where it returns ERROR_MORE_DATA). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48471 Signed-off-by: Vladimir Panteleev <git(a)vladimir.panteleev.md> --- Since v3: Tweak commit message, rebase, and reorder to front of patchset (so that the last two patches can take advantage of this and the next one). --- dlls/kernel32/tests/environ.c | 6 ++++++ dlls/kernelbase/process.c | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/environ.c b/dlls/kernel32/tests/environ.c index 128a5fdbe5..e65d7af0f2 100644 --- a/dlls/kernel32/tests/environ.c +++ b/dlls/kernel32/tests/environ.c @@ -104,9 +104,12 @@ static void test_GetSetEnvironmentVariableA(void) GetLastError()); /* Try to retrieve the environment variable we just set */ + SetLastError(0xdeadbeef); ret_size = GetEnvironmentVariableA(name, NULL, 0); ok(ret_size == strlen(value) + 1, "should return length with terminating 0 ret_size=%d\n", ret_size); + ok(GetLastError() == 0xdeadbeef, + "should not fail with zero size but GetLastError=%d\n", GetLastError()); lstrcpyA(buf, "foo"); ret_size = GetEnvironmentVariableA(name, buf, lstrlenA(value)); @@ -206,10 +209,13 @@ static void test_GetSetEnvironmentVariableW(void) GetLastError()); /* Try to retrieve the environment variable we just set */ + SetLastError(0xdeadbeef); ret_size = GetEnvironmentVariableW(name, NULL, 0); ok(ret_size == lstrlenW(value) + 1, "should return length with terminating 0 ret_size=%d\n", ret_size); + ok(GetLastError() == 0xdeadbeef, + "should not fail with zero size but GetLastError=%d\n", GetLastError()); lstrcpyW(buf, fooW); ret_size = GetEnvironmentVariableW(name, buf, lstrlenW(value)); diff --git a/dlls/kernelbase/process.c b/dlls/kernelbase/process.c index a07dddb1fc..788f03f220 100644 --- a/dlls/kernelbase/process.c +++ b/dlls/kernelbase/process.c @@ -1274,7 +1274,8 @@ DWORD WINAPI DECLSPEC_HOTPATCH GetEnvironmentVariableW( LPCWSTR name, LPWSTR val status = RtlQueryEnvironmentVariable_U( NULL, &us_name, &us_value ); len = us_value.Length / sizeof(WCHAR); - if (!set_ntstatus( status )) return (status == STATUS_BUFFER_TOO_SMALL) ? len + 1 : 0; + if (status == STATUS_BUFFER_TOO_SMALL) return len + 1; + if (!set_ntstatus( status )) return 0; if (size) val[len] = 0; return len; } -- 2.25.0

2 6

[PATCH 1/5] winegstreamer: Implement IPin::QueryAccept() for the AVI splitter source.
by Zebediah Figura 25 Jan '20

25 Jan '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/tests/avisplit.c | 16 ++++++++-------- dlls/winegstreamer/gstdemux.c | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/quartz/tests/avisplit.c b/dlls/quartz/tests/avisplit.c index befcac404c9..31cb767b607 100644 --- a/dlls/quartz/tests/avisplit.c +++ b/dlls/quartz/tests/avisplit.c @@ -621,42 +621,42 @@ static void test_media_types(void) pmt->majortype = GUID_NULL; hr = IPin_QueryAccept(pin, pmt); - todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); pmt->majortype = MEDIATYPE_Video; pmt->subtype = GUID_NULL; hr = IPin_QueryAccept(pin, pmt); - todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); pmt->subtype = MEDIASUBTYPE_I420; pmt->formattype = GUID_NULL; hr = IPin_QueryAccept(pin, pmt); - todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); pmt->formattype = FORMAT_None; hr = IPin_QueryAccept(pin, pmt); - todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); pmt->formattype = FORMAT_VideoInfo; vih = (VIDEOINFOHEADER *)pmt->pbFormat; vih->AvgTimePerFrame = 10000; hr = IPin_QueryAccept(pin, pmt); - todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); vih->AvgTimePerFrame = 1000 * 10000; vih->dwBitRate = 1000000; hr = IPin_QueryAccept(pin, pmt); - todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); vih->dwBitRate = 0; SetRect(&vih->rcSource, 0, 0, 32, 24); hr = IPin_QueryAccept(pin, pmt); - todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); SetRect(&vih->rcSource, 0, 0, 0, 0); vih->bmiHeader.biCompression = BI_RGB; hr = IPin_QueryAccept(pin, pmt); - todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); vih->bmiHeader.biCompression = mmioFOURCC('I','4','2','0'); CoTaskMemFree(pmt->pbFormat); diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index dadad69beb7..81a0617e56d 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -2377,7 +2377,7 @@ static BOOL avi_splitter_init_gst(struct gstdemux *filter) static HRESULT avi_splitter_source_query_accept(struct gstdemux_source *pin, const AM_MEDIA_TYPE *mt) { - return S_OK; + return compare_media_types(mt, &pin->mt) ? S_OK : S_FALSE; } IUnknown * CALLBACK avi_splitter_create(IUnknown *outer, HRESULT *phr) -- 2.25.0

1 4

[PATCH v2 1/4] ntdll: Split logic for MemoryBasicInformation into a separate function.
by Andrew Wesie 24 Jan '20

24 Jan '20

From: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Andrew Wesie <awesie(a)gmail.com> --- dlls/ntdll/virtual.c | 65 +++++++++++++++++++++++++------------------- 1 file changed, 37 insertions(+), 28 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 5890344f7a..ad91cffd8f 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -3011,40 +3011,16 @@ static int get_free_mem_state_callback( void *start, size_t size, void *arg ) return 1; } -#define UNIMPLEMENTED_INFO_CLASS(c) \ - case c: \ - FIXME("(process=%p,addr=%p) Unimplemented information class: " #c "\n", process, addr); \ - return STATUS_INVALID_INFO_CLASS - -/*********************************************************************** - * NtQueryVirtualMemory (NTDLL.@) - * ZwQueryVirtualMemory (NTDLL.@) - */ -NTSTATUS WINAPI NtQueryVirtualMemory( HANDLE process, LPCVOID addr, - MEMORY_INFORMATION_CLASS info_class, PVOID buffer, - SIZE_T len, SIZE_T *res_len ) +/* get basic information about a memory block */ +static NTSTATUS get_basic_memory_info( HANDLE process, LPCVOID addr, + MEMORY_BASIC_INFORMATION *info, + SIZE_T len, SIZE_T *res_len ) { struct file_view *view; char *base, *alloc_base = 0, *alloc_end = working_set_limit; struct wine_rb_entry *ptr; - MEMORY_BASIC_INFORMATION *info = buffer; sigset_t sigset; - if (info_class != MemoryBasicInformation) - { - switch(info_class) - { - UNIMPLEMENTED_INFO_CLASS(MemoryWorkingSetList); - UNIMPLEMENTED_INFO_CLASS(MemorySectionName); - UNIMPLEMENTED_INFO_CLASS(MemoryBasicVlmInformation); - - default: - FIXME("(%p,%p,info_class=%d,%p,%ld,%p) Unknown information class\n", - process, addr, info_class, buffer, len, res_len); - return STATUS_INVALID_INFO_CLASS; - } - } - if (len < sizeof(MEMORY_BASIC_INFORMATION)) return STATUS_INFO_LENGTH_MISMATCH; @@ -3159,6 +3135,39 @@ NTSTATUS WINAPI NtQueryVirtualMemory( HANDLE process, LPCVOID addr, } +#define UNIMPLEMENTED_INFO_CLASS(c) \ + case c: \ + FIXME("(process=%p,addr=%p) Unimplemented information class: " #c "\n", process, addr); \ + return STATUS_INVALID_INFO_CLASS + +/*********************************************************************** + * NtQueryVirtualMemory (NTDLL.@) + * ZwQueryVirtualMemory (NTDLL.@) + */ +NTSTATUS WINAPI NtQueryVirtualMemory( HANDLE process, LPCVOID addr, + MEMORY_INFORMATION_CLASS info_class, + PVOID buffer, SIZE_T len, SIZE_T *res_len ) +{ + TRACE("(%p, %p, info_class=%d, %p, %ld, %p)\n", + process, addr, info_class, buffer, len, res_len); + + switch(info_class) + { + case MemoryBasicInformation: + return get_basic_memory_info( process, addr, buffer, len, res_len ); + + UNIMPLEMENTED_INFO_CLASS(MemoryWorkingSetList); + UNIMPLEMENTED_INFO_CLASS(MemorySectionName); + UNIMPLEMENTED_INFO_CLASS(MemoryBasicVlmInformation); + + default: + FIXME("(%p,%p,info_class=%d,%p,%ld,%p) Unknown information class\n", + process, addr, info_class, buffer, len, res_len); + return STATUS_INVALID_INFO_CLASS; + } +} + + /*********************************************************************** * NtLockVirtualMemory (NTDLL.@) * ZwLockVirtualMemory (NTDLL.@) -- 2.17.1

2 5

[website] German translation for release 5.0
by Julian Rüger 24 Jan '20

24 Jan '20

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

2 1

[PATCH resend] http.sys: Translate WSAEADDRINUSE to STATUS_SHARING_VIOLATION.
by Zebediah Figura 24 Jan '20

24 Jan '20

Fixes intermittent failures on the Debian 10 testbot. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/http.sys/http.c | 7 ++++++- dlls/httpapi/tests/httpapi.c | 6 ++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/http.sys/http.c b/dlls/http.sys/http.c index 91d81400e65..4259ca618f3 100644 --- a/dlls/http.sys/http.c +++ b/dlls/http.sys/http.c @@ -1104,10 +1104,15 @@ static NTSTATUS http_add_url(struct request_queue *queue, IRP *irp) addr.sin_addr.S_un.S_addr = INADDR_ANY; if (bind(s, (struct sockaddr *)&addr, sizeof(addr)) == -1) { - ERR("Failed to bind socket, error %u.\n", WSAGetLastError()); LeaveCriticalSection(&http_cs); closesocket(s); heap_free(url); + if (WSAGetLastError() == WSAEADDRINUSE) + { + WARN("Address %s is already in use.\n", debugstr_a(params->url)); + return STATUS_SHARING_VIOLATION; + } + ERR("Failed to bind socket, error %u.\n", WSAGetLastError()); return STATUS_UNSUCCESSFUL; } diff --git a/dlls/httpapi/tests/httpapi.c b/dlls/httpapi/tests/httpapi.c index ee585948abd..a52a3f6c344 100644 --- a/dlls/httpapi/tests/httpapi.c +++ b/dlls/httpapi/tests/httpapi.c @@ -113,8 +113,9 @@ static unsigned short add_url_v1(HANDLE queue) for (port = 50000; port < 51000; ++port) { swprintf(url, ARRAY_SIZE(url), L"http://localhost:%u/", port); - if ((ret = HttpAddUrl(queue, url, NULL)) != ERROR_SHARING_VIOLATION) + if (!(ret = HttpAddUrl(queue, url, NULL))) return port; + ok(ret == ERROR_SHARING_VIOLATION, "Failed to add %s, error %u.\n", debugstr_w(url), ret); } ok(0, "Failed to add url %s, error %u.\n", debugstr_w(url), ret); return 0; @@ -129,8 +130,9 @@ static ULONG add_url_v2(HTTP_URL_GROUP_ID group) for (port = 50010; port < 51000; ++port) { swprintf(url, ARRAY_SIZE(url), L"http://localhost:%u/", port); - if ((ret = pHttpAddUrlToUrlGroup(group, url, 0xdeadbeef, 0)) != ERROR_SHARING_VIOLATION) + if (!(ret = pHttpAddUrlToUrlGroup(group, url, 0xdeadbeef, 0))) return port; + ok(ret == ERROR_SHARING_VIOLATION, "Failed to add %s, error %u.\n", debugstr_w(url), ret); } ok(0, "Failed to add url %s, error %u.\n", debugstr_w(url), ret); return 0; -- 2.25.0

1 0

[PATCH 3/4 v2] jscript/tests: Add more error reporting tests.
by Jacek Caban 24 Jan '20

24 Jan '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- v2: Fixed tests in non-English locales dlls/jscript/tests/run.c | 603 +++++++++++++++++++++++++++------------ 1 file changed, 428 insertions(+), 175 deletions(-)

1 0

[PATCH 3/4] jscript/tests: Add more error reporting tests.
by Jacek Caban 24 Jan '20

24 Jan '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/tests/run.c | 602 +++++++++++++++++++++++++++------------ 1 file changed, 427 insertions(+), 175 deletions(-)

2 1

[PATCH 1/5] ntdll: Split logic for MemoryBasicInformation into a separate function.
by Andrew Wesie 24 Jan '20

24 Jan '20

From: Dmitry Timoshkov <dmitry(a)baikal.ru> From: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Andrew Wesie <awesie(a)gmail.com> --- dlls/ntdll/virtual.c | 65 +++++++++++++++++++++++++------------------- 1 file changed, 37 insertions(+), 28 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 5890344f7a..ad91cffd8f 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -3011,40 +3011,16 @@ static int get_free_mem_state_callback( void *start, size_t size, void *arg ) return 1; } -#define UNIMPLEMENTED_INFO_CLASS(c) \ - case c: \ - FIXME("(process=%p,addr=%p) Unimplemented information class: " #c "\n", process, addr); \ - return STATUS_INVALID_INFO_CLASS - -/*********************************************************************** - * NtQueryVirtualMemory (NTDLL.@) - * ZwQueryVirtualMemory (NTDLL.@) - */ -NTSTATUS WINAPI NtQueryVirtualMemory( HANDLE process, LPCVOID addr, - MEMORY_INFORMATION_CLASS info_class, PVOID buffer, - SIZE_T len, SIZE_T *res_len ) +/* get basic information about a memory block */ +static NTSTATUS get_basic_memory_info( HANDLE process, LPCVOID addr, + MEMORY_BASIC_INFORMATION *info, + SIZE_T len, SIZE_T *res_len ) { struct file_view *view; char *base, *alloc_base = 0, *alloc_end = working_set_limit; struct wine_rb_entry *ptr; - MEMORY_BASIC_INFORMATION *info = buffer; sigset_t sigset; - if (info_class != MemoryBasicInformation) - { - switch(info_class) - { - UNIMPLEMENTED_INFO_CLASS(MemoryWorkingSetList); - UNIMPLEMENTED_INFO_CLASS(MemorySectionName); - UNIMPLEMENTED_INFO_CLASS(MemoryBasicVlmInformation); - - default: - FIXME("(%p,%p,info_class=%d,%p,%ld,%p) Unknown information class\n", - process, addr, info_class, buffer, len, res_len); - return STATUS_INVALID_INFO_CLASS; - } - } - if (len < sizeof(MEMORY_BASIC_INFORMATION)) return STATUS_INFO_LENGTH_MISMATCH; @@ -3159,6 +3135,39 @@ NTSTATUS WINAPI NtQueryVirtualMemory( HANDLE process, LPCVOID addr, } +#define UNIMPLEMENTED_INFO_CLASS(c) \ + case c: \ + FIXME("(process=%p,addr=%p) Unimplemented information class: " #c "\n", process, addr); \ + return STATUS_INVALID_INFO_CLASS + +/*********************************************************************** + * NtQueryVirtualMemory (NTDLL.@) + * ZwQueryVirtualMemory (NTDLL.@) + */ +NTSTATUS WINAPI NtQueryVirtualMemory( HANDLE process, LPCVOID addr, + MEMORY_INFORMATION_CLASS info_class, + PVOID buffer, SIZE_T len, SIZE_T *res_len ) +{ + TRACE("(%p, %p, info_class=%d, %p, %ld, %p)\n", + process, addr, info_class, buffer, len, res_len); + + switch(info_class) + { + case MemoryBasicInformation: + return get_basic_memory_info( process, addr, buffer, len, res_len ); + + UNIMPLEMENTED_INFO_CLASS(MemoryWorkingSetList); + UNIMPLEMENTED_INFO_CLASS(MemorySectionName); + UNIMPLEMENTED_INFO_CLASS(MemoryBasicVlmInformation); + + default: + FIXME("(%p,%p,info_class=%d,%p,%ld,%p) Unknown information class\n", + process, addr, info_class, buffer, len, res_len); + return STATUS_INVALID_INFO_CLASS; + } +} + + /*********************************************************************** * NtLockVirtualMemory (NTDLL.@) * ZwLockVirtualMemory (NTDLL.@) -- 2.17.1

2 7

[PATCH] d3drm: Explicitly set initial viewport projection type.
by Jeff Smith 24 Jan '20

24 Jan '20

Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> --- dlls/d3drm/tests/d3drm.c | 21 +++++++++++++++++++++ dlls/d3drm/viewport.c | 8 ++++++++ 2 files changed, 29 insertions(+) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 0f9f9cd6ed..dbaa80e662 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -1733,6 +1733,7 @@ static void test_Viewport(void) RECT rc; DWORD data, ref1, ref2, ref3, ref4; DWORD initial_ref1, initial_ref2, initial_ref3, device_ref, frame_ref, frame_ref2, viewport_ref; + D3DRMPROJECTIONTYPE project; window = create_window(); GetClientRect(window, &rc); @@ -2150,6 +2151,8 @@ static void test_Viewport(void) ok(front == -1.0f, "Got unexpected front %.8e\n", front); back = IDirect3DRMViewport_GetBack(viewport); ok(back == -1.0f, "Got unexpected back %.8e\n", back); + project = IDirect3DRMViewport_GetProjection(viewport); + ok(project == -1, "Got unexpected projection type %u.\n", project); hr = IDirect3DRMViewport_SetCamera(viewport, frame); ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr); @@ -2161,6 +2164,8 @@ static void test_Viewport(void) ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr); hr = IDirect3DRMViewport_SetBack(viewport, 100.0f); ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DRMViewport_SetProjection(viewport, D3DRMPROJECT_PERSPECTIVE); + ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr); /* Test all failures together */ hr = IDirect3DRMViewport_Init(viewport, NULL, frame, rc.left, rc.top, rc.right, rc.bottom); @@ -2236,6 +2241,8 @@ static void test_Viewport(void) ok(front == 1.0f, "Got unexpected front %.8e.\n", front); back = IDirect3DRMViewport_GetBack(viewport); ok(back == 100.0f, "Got unexpected back %.8e.\n", back); + project = IDirect3DRMViewport_GetProjection(viewport); + ok(project == D3DRMPROJECT_PERSPECTIVE, "Got unexpected projection type %u.\n", project); hr = IDirect3DRMViewport_SetField(viewport, 1.0f); ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr); @@ -2266,6 +2273,10 @@ static void test_Viewport(void) ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr); back = IDirect3DRMViewport_GetBack(viewport); ok(back == 200.0f, "Got unexpected back %.8e.\n", back); + hr = IDirect3DRMViewport_SetProjection(viewport, D3DRMPROJECT_ORTHOGRAPHIC); + ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr); + project = IDirect3DRMViewport_GetProjection(viewport); + ok(project == D3DRMPROJECT_ORTHOGRAPHIC, "Got unexpected projection type %u.\n", project); hr = IDirect3DRMViewport_Init(viewport, device1, frame, rc.left, rc.top, rc.right, rc.bottom); ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr); @@ -2333,6 +2344,8 @@ static void test_Viewport(void) ok(front == -1.0f, "Got unexpected front %.8e\n", front); back = IDirect3DRMViewport2_GetBack(viewport2); ok(back == -1.0f, "Got unexpected back %.8e\n", back); + project = IDirect3DRMViewport2_GetProjection(viewport2); + ok(project == -1, "Got unexpected projection type %u.\n", project); hr = IDirect3DRMViewport2_SetCamera(viewport2, frame3); ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr); @@ -2344,6 +2357,8 @@ static void test_Viewport(void) ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr); hr = IDirect3DRMViewport2_SetBack(viewport2, 100.0f); ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DRMViewport2_SetProjection(viewport2, D3DRMPROJECT_PERSPECTIVE); + ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr); hr = IDirect3DRMViewport2_Init(viewport2, NULL, frame3, rc.left, rc.top, rc.right, rc.bottom); ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr); @@ -2412,6 +2427,8 @@ static void test_Viewport(void) ok(front == 1.0f, "Got unexpected front %.8e.\n", front); back = IDirect3DRMViewport2_GetBack(viewport2); ok(back == 100.0f, "Got unexpected back %.8e.\n", back); + project = IDirect3DRMViewport2_GetProjection(viewport2); + ok(project == D3DRMPROJECT_PERSPECTIVE, "Got unexpected projection type %u.\n", project); hr = IDirect3DRMViewport2_SetField(viewport2, 1.0f); ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr); @@ -2442,6 +2459,10 @@ static void test_Viewport(void) ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr); back = IDirect3DRMViewport2_GetBack(viewport2); ok(back == 200.0f, "Got unexpected back %.8e.\n", back); + hr = IDirect3DRMViewport2_SetProjection(viewport2, D3DRMPROJECT_ORTHOGRAPHIC); + ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr); + project = IDirect3DRMViewport2_GetProjection(viewport2); + ok(project == D3DRMPROJECT_ORTHOGRAPHIC, "Got unexpected projection type %u.\n", project); hr = IDirect3DRMViewport2_Init(viewport2, device3, frame3, rc.left, rc.top, rc.right, rc.bottom); ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr); diff --git a/dlls/d3drm/viewport.c b/dlls/d3drm/viewport.c index 8e959d5f37..da6b38b110 100644 --- a/dlls/d3drm/viewport.c +++ b/dlls/d3drm/viewport.c @@ -376,6 +376,8 @@ static HRESULT WINAPI d3drm_viewport2_Init(IDirect3DRMViewport2 *iface, IDirect3 viewport->clip.front = 1.0f; viewport->clip.back = 100.0f; + viewport->projection = D3DRMPROJECT_PERSPECTIVE; + cleanup: if (FAILED(hr)) @@ -613,6 +615,9 @@ static HRESULT WINAPI d3drm_viewport2_SetProjection(IDirect3DRMViewport2 *iface, TRACE("iface %p, type %#x.\n", iface, type); + if (!viewport->d3d_viewport) + return D3DRMERR_BADOBJECT; + viewport->projection = type; return D3DRM_OK; @@ -975,6 +980,9 @@ static D3DRMPROJECTIONTYPE WINAPI d3drm_viewport2_GetProjection(IDirect3DRMViewp TRACE("iface %p.\n", iface); + if (!viewport->d3d_viewport) + return (D3DRMPROJECTIONTYPE)(-1); + return viewport->projection; } -- 2.23.0

1 0

[PATCH 4/4] jscript/tests: Add more script enter notification tests.
by Jacek Caban 24 Jan '20

24 Jan '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/tests/caller.c | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-)

1 0

[PATCH 2/4] jscript: Store source position in instr_t.
by Jacek Caban 24 Jan '20

24 Jan '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/compile.c | 15 +++++++++++++++ dlls/jscript/engine.h | 1 + dlls/jscript/parser.h | 4 ++++ dlls/jscript/parser.y | 34 +++++++++++++++++++--------------- 4 files changed, 39 insertions(+), 15 deletions(-)

1 0

[PATCH 1/4] jscript: Introduce jsstr_to_bstr helper.
by Jacek Caban 24 Jan '20

24 Jan '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/jsstr.c | 13 +++++++++++-- dlls/jscript/jsstr.h | 2 +- dlls/jscript/jsutils.c | 27 +++------------------------ 3 files changed, 15 insertions(+), 27 deletions(-)

1 0

[PATCH] ucrtbase: Use given context in wcstok.
by Daniel Lehman 24 Jan '20

24 Jan '20

Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> --- breaking change in 2015 for wcstok: https://docs.microsoft.com/en-us/cpp/porting/visual-cpp-change-history-2003… compilation will fail if only 2 arguments are provided: 1>: error C4996: 'wcstok': wcstok has been changed to conform with the ISO C standard, adding an extra context parameter. To use the legacy Microsoft wcstok, define _CRT_NON_CONFORMING_WCSTOK. 1>C:\Program Files (x86)\Windows Kits\10\Include\10.0.18362.0\ucrt\corecrt_wstring.h(261): message : see declaration of 'wcstok' --- .../api-ms-win-crt-string-l1-1-0.spec | 2 +- dlls/msvcrt/wcs.c | 9 ++++++ dlls/ucrtbase/tests/string.c | 30 +++++++++++++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- 4 files changed, 41 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-crt-string-l1-1-0/api-ms-win-crt-string-l1-1-0.spec b/dlls/api-ms-win-crt-string-l1-1-0/api-ms-win-crt-string-l1-1-0.spec index ead56fbcb5..0dae2a8233 100644 --- a/dlls/api-ms-win-crt-string-l1-1-0/api-ms-win-crt-string-l1-1-0.spec +++ b/dlls/api-ms-win-crt-string-l1-1-0/api-ms-win-crt-string-l1-1-0.spec @@ -170,7 +170,7 @@ @ cdecl wcsnlen(wstr long) ucrtbase.wcsnlen @ cdecl wcspbrk(wstr wstr) ucrtbase.wcspbrk @ cdecl wcsspn(wstr wstr) ucrtbase.wcsspn -@ cdecl wcstok(wstr wstr) ucrtbase.wcstok +@ cdecl wcstok(wstr wstr ptr) ucrtbase.wcstok @ cdecl wcstok_s(ptr wstr ptr) ucrtbase.wcstok_s @ cdecl wcsxfrm(ptr wstr long) ucrtbase.wcsxfrm @ cdecl wctype(str) ucrtbase.wctype diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 1abe28b7d9..8411048204 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1630,10 +1630,19 @@ MSVCRT_wchar_t * CDECL MSVCRT_wcstok_s( MSVCRT_wchar_t *str, const MSVCRT_wchar_ /********************************************************************* * wcstok (MSVCRT.@) */ +#if _MSVCR_VER>=140 +MSVCRT_wchar_t * CDECL MSVCRT_wcstok( MSVCRT_wchar_t *str, const MSVCRT_wchar_t *delim, MSVCRT_wchar_t **ctx ) +{ + if (!ctx) + ctx = &msvcrt_get_thread_data()->wcstok_next; + return MSVCRT_wcstok_s(str, delim, ctx); +} +#else MSVCRT_wchar_t * CDECL MSVCRT_wcstok( MSVCRT_wchar_t *str, const MSVCRT_wchar_t *delim ) { return MSVCRT_wcstok_s(str, delim, &msvcrt_get_thread_data()->wcstok_next); } +#endif /********************************************************************* * _wctomb_s_l (MSVCRT.@) diff --git a/dlls/ucrtbase/tests/string.c b/dlls/ucrtbase/tests/string.c index 7a2cf06a90..c0b2336322 100644 --- a/dlls/ucrtbase/tests/string.c +++ b/dlls/ucrtbase/tests/string.c @@ -89,6 +89,7 @@ static void (__cdecl *p__free_locale)(_locale_t); static int (__cdecl *p__getmbcp)(void); static int (__cdecl *p__setmbcp)(int); static size_t (__cdecl *p__mbsspn)(const unsigned char*, const unsigned char*); +static wchar_t* (__cdecl *p_wcstok)(wchar_t*, const wchar_t*, wchar_t**); static BOOL init(void) { @@ -122,6 +123,7 @@ static BOOL init(void) p__getmbcp = (void*)GetProcAddress(module, "_getmbcp"); p__setmbcp = (void*)GetProcAddress(module, "_setmbcp"); p__mbsspn = (void*)GetProcAddress(module, "_mbsspn"); + p_wcstok = (void*)GetProcAddress(module, "wcstok"); return TRUE; } @@ -456,6 +458,33 @@ static void test_mbsspn( void) p__setmbcp(cp); } +static void test_wcstok(void) +{ + static const wchar_t *input = L"two words"; + wchar_t buffer[16]; + wchar_t *token; + wchar_t *next; + + next = NULL; + wcscpy(buffer, input); + token = p_wcstok(buffer, L" ", &next); + ok(!wcscmp(L"two", token), "expected \"two\", got \"%ls\"\n", token); + ok(next == token + 4, "expected %p, got %p\n", token + 4, next); + token = p_wcstok(NULL, L" ", &next); + ok(!wcscmp(L"words", token), "expected \"words\", got \"%ls\"\n", token); + ok(next == token + 5, "expected %p, got %p\n", token + 5, next); + token = p_wcstok(NULL, L" ", &next); + ok(!token, "expected NULL, got %p\n", token); + + wcscpy(buffer, input); + token = p_wcstok(buffer, L" ", NULL); + ok(!wcscmp(L"two", token), "expected \"two\", got \"%ls\"\n", token); + token = p_wcstok(NULL, L" ", NULL); + ok(!wcscmp(L"words", token), "expected \"words\", got \"%ls\"\n", token); + token = p_wcstok(NULL, L" ", NULL); + ok(!token, "expected NULL, got %p\n", token); +} + START_TEST(string) { if (!init()) return; @@ -465,4 +494,5 @@ START_TEST(string) test___strncnt(); test_C_locale(); test_mbsspn(); + test_wcstok(); } diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index dc95824a1f..93a75248bf 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2579,7 +2579,7 @@ @ cdecl wcstod(wstr ptr) MSVCRT_wcstod @ cdecl wcstof(ptr ptr) MSVCRT_wcstof @ stub wcstoimax -@ cdecl wcstok(wstr wstr) MSVCRT_wcstok +@ cdecl wcstok(wstr wstr ptr) MSVCRT_wcstok @ cdecl wcstok_s(ptr wstr ptr) MSVCRT_wcstok_s @ cdecl wcstol(wstr ptr long) MSVCRT_wcstol @ stub wcstold -- 2.17.1

2 1

[PATCH 1/5] wined3d: Introduce wined3d_device_apply_stateblock().
by Zebediah Figura 24 Jan '20

24 Jan '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- v4: Use wined3d_device_apply_stateblock() in wined3d_stateblock_apply(). dlls/wined3d/device.c | 193 ++++++++++++++++++++++++++++++++++++++ dlls/wined3d/stateblock.c | 64 +------------ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 1 + 4 files changed, 200 insertions(+), 59 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 8913420724..8e20e31d3f 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3829,6 +3829,199 @@ struct wined3d_texture * CDECL wined3d_device_get_texture(const struct wined3d_d return device->state.textures[stage]; } +void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, + struct wined3d_stateblock *stateblock) +{ + const struct wined3d_d3d_info *d3d_info = &stateblock->device->adapter->d3d_info; + const struct wined3d_stateblock_state *state = &stateblock->stateblock_state; + unsigned int i, j, count; + + TRACE("device %p, stateblock %p.\n", device, stateblock); + + if (stateblock->changed.vertexShader) + wined3d_device_set_vertex_shader(device, state->vs); + if (stateblock->changed.pixelShader) + wined3d_device_set_pixel_shader(device, state->ps); + + count = 0; + for (i = 0; i < d3d_info->limits.vs_uniform_count; ++i) + { + if (stateblock->changed.vs_consts_f[i]) + ++count; + else if (count) + { + wined3d_device_set_vs_consts_f(device, i - count, count, state->vs_consts_f + i - count); + count = 0; + } + } + if (count) + wined3d_device_set_vs_consts_f(device, i - count, count, state->vs_consts_f + i - count); + + count = 0; + for (i = 0; i < WINED3D_MAX_CONSTS_B; ++i) + { + if (stateblock->changed.vertexShaderConstantsB & (1u << i)) + ++count; + else if (count) + { + wined3d_device_set_vs_consts_b(device, i - count, count, state->vs_consts_b + i - count); + count = 0; + } + } + if (count) + wined3d_device_set_vs_consts_b(device, i - count, count, state->vs_consts_b + i - count); + + count = 0; + for (i = 0; i < WINED3D_MAX_CONSTS_I; ++i) + { + if (stateblock->changed.vertexShaderConstantsI & (1u << i)) + ++count; + else if (count) + { + wined3d_device_set_vs_consts_i(device, i - count, count, state->vs_consts_i + i - count); + count = 0; + } + } + if (count) + wined3d_device_set_vs_consts_i(device, i - count, count, state->vs_consts_i + i - count); + + count = 0; + for (i = 0; i < d3d_info->limits.ps_uniform_count; ++i) + { + if (stateblock->changed.ps_consts_f[i]) + ++count; + else if (count) + { + wined3d_device_set_ps_consts_f(device, i - count, count, state->ps_consts_f + i - count); + count = 0; + } + } + if (count) + wined3d_device_set_ps_consts_f(device, i - count, count, state->ps_consts_f + i - count); + + count = 0; + for (i = 0; i < WINED3D_MAX_CONSTS_B; ++i) + { + if (stateblock->changed.pixelShaderConstantsB & (1u << i)) + ++count; + else if (count) + { + wined3d_device_set_ps_consts_b(device, i - count, count, state->ps_consts_b + i - count); + count = 0; + } + } + if (count) + wined3d_device_set_ps_consts_b(device, i - count, count, state->ps_consts_b + i - count); + + count = 0; + for (i = 0; i < WINED3D_MAX_CONSTS_I; ++i) + { + if (stateblock->changed.pixelShaderConstantsI & (1u << i)) + ++count; + else if (count) + { + wined3d_device_set_ps_consts_i(device, i - count, count, state->ps_consts_i + i - count); + count = 0; + } + } + if (count) + wined3d_device_set_ps_consts_i(device, i - count, count, state->ps_consts_i + i - count); + + for (i = 0; i < ARRAY_SIZE(state->light_state->light_map); ++i) + { + const struct wined3d_light_info *light; + + LIST_FOR_EACH_ENTRY(light, &state->light_state->light_map[i], struct wined3d_light_info, entry) + { + wined3d_device_set_light(device, light->OriginalIndex, &light->OriginalParms); + wined3d_device_set_light_enable(device, light->OriginalIndex, light->glIndex != -1); + } + } + + for (i = 0; i < ARRAY_SIZE(state->rs); ++i) + { + if (stateblock->changed.renderState[i >> 5] & (1u << (i & 0x1f))) + { + if (i == WINED3D_RS_BLENDFACTOR) + { + struct wined3d_color color; + wined3d_color_from_d3dcolor(&color, state->rs[i]); + wined3d_device_set_blend_state(device, NULL, &color); + } + else + wined3d_device_set_render_state(device, i, state->rs[i]); + } + } + + for (i = 0; i < ARRAY_SIZE(state->texture_states); ++i) + { + for (j = 0; j < ARRAY_SIZE(state->texture_states[i]); ++j) + { + if (stateblock->changed.textureState[i] & (1u << j)) + wined3d_device_set_texture_stage_state(device, i, j, state->texture_states[i][j]); + } + } + + for (i = 0; i < ARRAY_SIZE(state->sampler_states); ++i) + { + DWORD stage = i; + if (stage >= WINED3D_MAX_FRAGMENT_SAMPLERS) + stage += WINED3DVERTEXTEXTURESAMPLER0 - WINED3D_MAX_FRAGMENT_SAMPLERS; + for (j = 0; j < ARRAY_SIZE(state->sampler_states[j]); ++j) + { + if (stateblock->changed.samplerState[i] & (1 << j)) + wined3d_device_set_sampler_state(device, stage, j, state->sampler_states[i][j]); + } + } + + for (i = 0; i < ARRAY_SIZE(state->transforms); ++i) + { + if (stateblock->changed.transform[i >> 5] & (1u << (i & 0x1f))) + wined3d_device_set_transform(device, i, &state->transforms[i]); + } + + if (stateblock->changed.indices) + wined3d_device_set_index_buffer(device, state->index_buffer, state->index_format, 0); + wined3d_device_set_base_vertex_index(device, state->base_vertex_index); + if (stateblock->changed.vertexDecl) + wined3d_device_set_vertex_declaration(device, state->vertex_declaration); + if (stateblock->changed.material) + wined3d_device_set_material(device, &state->material); + if (stateblock->changed.viewport) + wined3d_device_set_viewports(device, 1, &state->viewport); + if (stateblock->changed.scissorRect) + wined3d_device_set_scissor_rects(device, 1, &state->scissor_rect); + + for (i = 0; i < ARRAY_SIZE(state->streams); ++i) + { + if (stateblock->changed.streamSource & (1u << i)) + wined3d_device_set_stream_source(device, i, state->streams[i].buffer, + state->streams[i].offset, state->streams[i].stride); + if (stateblock->changed.streamFreq & (1u << i)) + wined3d_device_set_stream_source_freq(device, i, + state->streams[i].frequency | state->streams[i].flags); + } + + for (i = 0; i < ARRAY_SIZE(state->textures); ++i) + { + DWORD stage = i; + if (stage >= WINED3D_MAX_FRAGMENT_SAMPLERS) + stage += WINED3DVERTEXTEXTURESAMPLER0 - WINED3D_MAX_FRAGMENT_SAMPLERS; + if (stateblock->changed.textures & (1u << i)) + wined3d_device_set_texture(device, stage, state->textures[i]); + } + + for (i = 0; i < ARRAY_SIZE(state->clip_planes); ++i) + { + if (stateblock->changed.clipplane & (1u << i)) + wined3d_device_set_clip_plane(device, i, &state->clip_planes[i]); + } + + memset(&stateblock->changed, 0, sizeof(stateblock->changed)); + + TRACE("Applied stateblock %p.\n", stateblock); +} + HRESULT CDECL wined3d_device_get_device_caps(const struct wined3d_device *device, struct wined3d_caps *caps) { TRACE("device %p, caps %p.\n", device, caps); diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index f6d36f8c25..f21cd0f187 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1037,7 +1037,6 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock, if (state->vs) wined3d_shader_decref(state->vs); state->vs = stateblock->stateblock_state.vs; - wined3d_device_set_vertex_shader(device, stateblock->stateblock_state.vs); } /* Vertex Shader Constants. */ @@ -1046,21 +1045,18 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock, unsigned int idx = stateblock->contained_vs_consts_f[i]; state->vs_consts_f[idx] = stateblock->stateblock_state.vs_consts_f[idx]; - wined3d_device_set_vs_consts_f(device, idx, 1, &stateblock->stateblock_state.vs_consts_f[idx]); } for (i = 0; i < stateblock->num_contained_vs_consts_i; ++i) { unsigned int idx = stateblock->contained_vs_consts_i[i]; state->vs_consts_i[idx] = stateblock->stateblock_state.vs_consts_i[idx]; - wined3d_device_set_vs_consts_i(device, idx, 1, &stateblock->stateblock_state.vs_consts_i[idx]); } for (i = 0; i < stateblock->num_contained_vs_consts_b; ++i) { unsigned int idx = stateblock->contained_vs_consts_b[i]; state->vs_consts_b[idx] = stateblock->stateblock_state.vs_consts_b[idx]; - wined3d_device_set_vs_consts_b(device, idx, 1, &stateblock->stateblock_state.vs_consts_b[idx]); } for (i = 0; i < ARRAY_SIZE(stateblock->stateblock_state.light_state->light_map); ++i) @@ -1075,8 +1071,6 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock, { wined3d_light_state_enable_light(state->light_state, &device->adapter->d3d_info, new_light, light->glIndex != -1); } - wined3d_device_set_light(device, light->OriginalIndex, &light->OriginalParms); - wined3d_device_set_light_enable(device, light->OriginalIndex, light->glIndex != -1); } } @@ -1087,7 +1081,6 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock, if (state->ps) wined3d_shader_decref(state->ps); state->ps = stateblock->stateblock_state.ps; - wined3d_device_set_pixel_shader(device, stateblock->stateblock_state.ps); } /* Pixel Shader Constants. */ @@ -1096,21 +1089,18 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock, unsigned int idx = stateblock->contained_ps_consts_f[i]; state->ps_consts_f[idx] = stateblock->stateblock_state.ps_consts_f[idx]; - wined3d_device_set_ps_consts_f(device, idx, 1, &stateblock->stateblock_state.ps_consts_f[idx]); } for (i = 0; i < stateblock->num_contained_ps_consts_i; ++i) { unsigned int idx = stateblock->contained_ps_consts_i[i]; state->ps_consts_i[idx] = stateblock->stateblock_state.ps_consts_i[idx]; - wined3d_device_set_ps_consts_i(device, idx, 1, &stateblock->stateblock_state.ps_consts_i[idx]); } for (i = 0; i < stateblock->num_contained_ps_consts_b; ++i) { unsigned int idx = stateblock->contained_ps_consts_b[i]; state->ps_consts_b[idx] = stateblock->stateblock_state.ps_consts_b[idx]; - wined3d_device_set_ps_consts_b(device, idx, 1, &stateblock->stateblock_state.ps_consts_b[idx]); } /* Render states. */ @@ -1119,14 +1109,6 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock, enum wined3d_render_state rs = stateblock->contained_render_states[i]; state->rs[rs] = stateblock->stateblock_state.rs[rs]; - if (rs == WINED3D_RS_BLENDFACTOR) - { - struct wined3d_color color; - wined3d_color_from_d3dcolor(&color, stateblock->stateblock_state.rs[rs]); - wined3d_device_set_blend_state(device, NULL, &color); - } - else - wined3d_device_set_render_state(device, rs, stateblock->stateblock_state.rs[rs]); } /* Texture states. */ @@ -1136,8 +1118,6 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock, DWORD texture_state = stateblock->contained_tss_states[i].state; state->texture_states[stage][texture_state] = stateblock->stateblock_state.texture_states[stage][texture_state]; - wined3d_device_set_texture_stage_state(device, stage, texture_state, - stateblock->stateblock_state.texture_states[stage][texture_state]); } /* Sampler states. */ @@ -1145,11 +1125,8 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock, { DWORD stage = stateblock->contained_sampler_states[i].stage; DWORD sampler_state = stateblock->contained_sampler_states[i].state; - DWORD value = stateblock->stateblock_state.sampler_states[stage][sampler_state]; - state->sampler_states[stage][sampler_state] = value; - if (stage >= WINED3D_MAX_FRAGMENT_SAMPLERS) stage += WINED3DVERTEXTEXTURESAMPLER0 - WINED3D_MAX_FRAGMENT_SAMPLERS; - wined3d_device_set_sampler_state(device, stage, sampler_state, value); + state->sampler_states[stage][sampler_state] = stateblock->stateblock_state.sampler_states[stage][sampler_state]; } /* Transform states. */ @@ -1158,7 +1135,6 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock, enum wined3d_transform_state transform = stateblock->contained_transform_states[i]; state->transforms[transform] = stateblock->stateblock_state.transforms[transform]; - wined3d_device_set_transform(device, transform, &stateblock->stateblock_state.transforms[transform]); } if (stateblock->changed.indices) @@ -1170,10 +1146,6 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock, state->index_buffer = stateblock->stateblock_state.index_buffer; state->index_format = stateblock->stateblock_state.index_format; state->base_vertex_index = stateblock->stateblock_state.base_vertex_index; - - wined3d_device_set_index_buffer(device, stateblock->stateblock_state.index_buffer, - stateblock->stateblock_state.index_format, 0); - wined3d_device_set_base_vertex_index(device, stateblock->stateblock_state.base_vertex_index); } if (stateblock->changed.vertexDecl && stateblock->stateblock_state.vertex_declaration) @@ -1183,34 +1155,20 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock, if (state->vertex_declaration) wined3d_vertex_declaration_decref(state->vertex_declaration); state->vertex_declaration = stateblock->stateblock_state.vertex_declaration; - wined3d_device_set_vertex_declaration(device, stateblock->stateblock_state.vertex_declaration); } if (stateblock->changed.material) - { state->material = stateblock->stateblock_state.material; - wined3d_device_set_material(device, &stateblock->stateblock_state.material); - } if (stateblock->changed.viewport) - { state->viewport = stateblock->stateblock_state.viewport; - wined3d_device_set_viewports(device, 1, &stateblock->stateblock_state.viewport); - } - if (stateblock->changed.scissorRect) - { state->scissor_rect = stateblock->stateblock_state.scissor_rect; - wined3d_device_set_scissor_rects(device, 1, &stateblock->stateblock_state.scissor_rect); - } - map = stateblock->changed.streamSource; for (i = 0; map; map >>= 1, ++i) { - unsigned int offset, stride; - if (!(map & 1)) continue; if (stateblock->stateblock_state.streams[i].buffer) @@ -1218,14 +1176,8 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock, if (state->streams[i].buffer) wined3d_buffer_decref(state->streams[i].buffer); state->streams[i].buffer = stateblock->stateblock_state.streams[i].buffer; - - offset = stateblock->stateblock_state.streams[i].offset; - stride = stateblock->stateblock_state.streams[i].stride; - - state->streams[i].stride = stride; - state->streams[i].offset = offset; - wined3d_device_set_stream_source(device, i, - stateblock->stateblock_state.streams[i].buffer, offset, stride); + state->streams[i].offset = stateblock->stateblock_state.streams[i].offset; + state->streams[i].stride = stateblock->stateblock_state.streams[i].stride; } map = stateblock->changed.streamFreq; @@ -1235,25 +1187,18 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock, state->streams[i].frequency = stateblock->stateblock_state.streams[i].frequency; state->streams[i].flags = stateblock->stateblock_state.streams[i].flags; - - wined3d_device_set_stream_source_freq(device, i, - stateblock->stateblock_state.streams[i].frequency | stateblock->stateblock_state.streams[i].flags); } map = stateblock->changed.textures; for (i = 0; map; map >>= 1, ++i) { - DWORD stage; - if (!(map & 1)) continue; - stage = i < WINED3D_MAX_FRAGMENT_SAMPLERS ? i : WINED3DVERTEXTEXTURESAMPLER0 + i - WINED3D_MAX_FRAGMENT_SAMPLERS; if (stateblock->stateblock_state.textures[i]) wined3d_texture_incref(stateblock->stateblock_state.textures[i]); if (state->textures[i]) wined3d_texture_decref(state->textures[i]); state->textures[i] = stateblock->stateblock_state.textures[i]; - wined3d_device_set_texture(device, stage, stateblock->stateblock_state.textures[i]); } map = stateblock->changed.clipplane; @@ -1262,9 +1207,10 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock, if (!(map & 1)) continue; state->clip_planes[i] = stateblock->stateblock_state.clip_planes[i]; - wined3d_device_set_clip_plane(device, i, &stateblock->stateblock_state.clip_planes[i]); } + wined3d_device_apply_stateblock(device, device_state); + TRACE("Applied stateblock %p.\n", stateblock); } diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index e03c57055b..c8ef442c72 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -37,6 +37,7 @@ @ cdecl wined3d_buffer_incref(ptr) @ cdecl wined3d_device_acquire_focus_window(ptr ptr) +@ cdecl wined3d_device_apply_stateblock(ptr ptr) @ cdecl wined3d_device_begin_scene(ptr) @ cdecl wined3d_device_clear(ptr long ptr long ptr float long) @ cdecl wined3d_device_clear_rendertarget_view(ptr ptr ptr long ptr float long) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 9cdf18633c..4306f5ae21 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2289,6 +2289,7 @@ struct wined3d_resource * __cdecl wined3d_buffer_get_resource(struct wined3d_buf ULONG __cdecl wined3d_buffer_incref(struct wined3d_buffer *buffer); HRESULT __cdecl wined3d_device_acquire_focus_window(struct wined3d_device *device, HWND window); +void __cdecl wined3d_device_apply_stateblock(struct wined3d_device *device, struct wined3d_stateblock *stateblock); HRESULT __cdecl wined3d_device_begin_scene(struct wined3d_device *device); HRESULT __cdecl wined3d_device_clear(struct wined3d_device *device, DWORD rect_count, const RECT *rects, DWORD flags, const struct wined3d_color *color, float z, DWORD stencil); -- 2.25.0

2 6

[PATCH 6/6] dxgi/tests: Test the fullscreen state after the swapchain window is destroyed.
by Henri Verbeet 24 Jan '20

24 Jan '20

From: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/dxgi/tests/dxgi.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index b2b53f7a4ca..aaef8113640 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -2363,6 +2363,7 @@ static void test_set_fullscreen(IUnknown *device, BOOL is_d3d12) IDXGISwapChain *swapchain; IDXGIFactory *factory; IDXGIOutput *output; + BOOL fullscreen; ULONG refcount; HRESULT hr; @@ -2432,11 +2433,20 @@ static void test_set_fullscreen(IUnknown *device, BOOL is_d3d12) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(!fullscreen, "Got unexpected fullscreen %#x.\n", fullscreen); DestroyWindow(swapchain_desc.OutputWindow); hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(!fullscreen, "Got unexpected fullscreen %#x.\n", fullscreen); hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, NULL); ok(hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE, "Got unexpected hr %#x.\n", hr); + hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(!fullscreen, "Got unexpected fullscreen %#x.\n", fullscreen); hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); refcount = IDXGISwapChain_Release(swapchain); @@ -2448,13 +2458,25 @@ static void test_set_fullscreen(IUnknown *device, BOOL is_d3d12) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, NULL); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(!!fullscreen, "Got unexpected fullscreen %#x.\n", fullscreen); DestroyWindow(swapchain_desc.OutputWindow); hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, NULL); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(!!fullscreen, "Got unexpected fullscreen %#x.\n", fullscreen); hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(!fullscreen, "Got unexpected fullscreen %#x.\n", fullscreen); hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, NULL); ok(hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE, "Got unexpected hr %#x.\n", hr); + hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(!fullscreen, "Got unexpected fullscreen %#x.\n", fullscreen); hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); refcount = IDXGISwapChain_Release(swapchain); -- 2.11.0

2 1

[PATCH 5/6] wined3d: Implement mapping Vulkan buffers.
by Henri Verbeet 24 Jan '20

24 Jan '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/adapter_vk.c | 56 ++++++++++-- dlls/wined3d/context.c | 195 ++++++++++++++++++++++++++++++++++++++++- dlls/wined3d/resource.c | 26 ++++++ dlls/wined3d/wined3d_private.h | 23 +++++ 4 files changed, 293 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 7d501b4b08f..87e21b0b41f 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -233,6 +233,7 @@ static HRESULT adapter_vk_create_device(struct wined3d *wined3d, const struct wi device_vk->vk_device = vk_device; VK_CALL(vkGetDeviceQueue(vk_device, queue_family_index, 0, &device_vk->vk_queue)); + device_vk->vk_queue_family_index = queue_family_index; device_vk->vk_info = *vk_info; #define LOAD_DEVICE_PFN(name) \ @@ -490,20 +491,65 @@ static void adapter_vk_uninit_3d(struct wined3d_device *device) static void *adapter_vk_map_bo_address(struct wined3d_context *context, const struct wined3d_bo_address *data, size_t size, uint32_t bind_flags, uint32_t map_flags) { - if (data->buffer_object) + struct wined3d_context_vk *context_vk = wined3d_context_vk(context); + const struct wined3d_vk_info *vk_info; + struct wined3d_device_vk *device_vk; + VkCommandBuffer vk_command_buffer; + VkBufferMemoryBarrier vk_barrier; + struct wined3d_bo_vk *bo; + void *map_ptr; + VkResult vr; + + if (!(bo = (struct wined3d_bo_vk *)data->buffer_object)) + return data->addr; + + vk_info = context_vk->vk_info; + device_vk = wined3d_device_vk(context->device); + + if (!(vk_command_buffer = wined3d_context_vk_get_command_buffer(context_vk))) + { + ERR("Failed to get command buffer.\n"); + return NULL; + } + + vk_barrier.sType = VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER; + vk_barrier.pNext = NULL; + vk_barrier.srcAccessMask = vk_access_mask_from_bind_flags(bind_flags); + vk_barrier.dstAccessMask = VK_ACCESS_HOST_READ_BIT; + vk_barrier.srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; + vk_barrier.dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; + vk_barrier.buffer = bo->vk_buffer; + vk_barrier.offset = (uintptr_t)data->addr; + vk_barrier.size = size; + VK_CALL(vkCmdPipelineBarrier(vk_command_buffer, VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, + VK_PIPELINE_STAGE_HOST_BIT, 0, 0, NULL, 1, &vk_barrier, 0, NULL)); + + wined3d_context_vk_submit_command_buffer(context_vk); + wined3d_context_vk_wait_command_buffer(context_vk, context_vk->current_command_buffer.id - 1); + + if ((vr = VK_CALL(vkMapMemory(device_vk->vk_device, bo->vk_memory, + (uintptr_t)data->addr, size, 0, &map_ptr))) < 0) { - ERR("Unsupported buffer object %#lx.\n", data->buffer_object); + ERR("Failed to map buffer, vr %s.\n", wined3d_debug_vkresult(vr)); return NULL; } - return data->addr; + return map_ptr; } static void adapter_vk_unmap_bo_address(struct wined3d_context *context, const struct wined3d_bo_address *data, uint32_t bind_flags, unsigned int range_count, const struct wined3d_map_range *ranges) { - if (data->buffer_object) - ERR("Unsupported buffer object %#lx.\n", data->buffer_object); + const struct wined3d_vk_info *vk_info; + struct wined3d_device_vk *device_vk; + struct wined3d_bo_vk *bo; + + if (!(bo = (struct wined3d_bo_vk *)data->buffer_object)) + return; + + vk_info = wined3d_context_vk(context)->vk_info; + device_vk = wined3d_device_vk(context->device); + VK_CALL(vkUnmapMemory(device_vk->vk_device, bo->vk_memory)); } static void adapter_vk_copy_bo_address(struct wined3d_context *context, diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 7d66fab0a26..27c9d37f5df 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1561,8 +1561,52 @@ void wined3d_context_vk_destroy_bo(struct wined3d_context_vk *context_vk, const VK_CALL(vkFreeMemory(device_vk->vk_device, bo->vk_memory, NULL)); } +static void wined3d_context_vk_cleanup_resources(struct wined3d_context_vk *context_vk) +{ + struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device); + const struct wined3d_vk_info *vk_info = context_vk->vk_info; + struct wined3d_command_buffer_vk *buffer; + SIZE_T i = 0; + + while (i < context_vk->submitted.buffer_count) + { + buffer = &context_vk->submitted.buffers[i]; + if (VK_CALL(vkGetFenceStatus(device_vk->vk_device, buffer->vk_fence)) == VK_NOT_READY) + { + ++i; + continue; + } + + TRACE("Command buffer %p with id 0x%s has finished.\n", + buffer->vk_command_buffer, wine_dbgstr_longlong(buffer->id)); + VK_CALL(vkDestroyFence(device_vk->vk_device, buffer->vk_fence, NULL)); + VK_CALL(vkFreeCommandBuffers(device_vk->vk_device, + context_vk->vk_command_pool, 1, &buffer->vk_command_buffer)); + + if (buffer->id > context_vk->completed_command_buffer_id) + context_vk->completed_command_buffer_id = buffer->id; + *buffer = context_vk->submitted.buffers[--context_vk->submitted.buffer_count]; + } +} + void wined3d_context_vk_cleanup(struct wined3d_context_vk *context_vk) { + struct wined3d_command_buffer_vk *buffer = &context_vk->current_command_buffer; + struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device); + const struct wined3d_vk_info *vk_info = context_vk->vk_info; + + if (buffer->vk_command_buffer) + { + VK_CALL(vkFreeCommandBuffers(device_vk->vk_device, + context_vk->vk_command_pool, 1, &buffer->vk_command_buffer)); + buffer->vk_command_buffer = VK_NULL_HANDLE; + } + VK_CALL(vkDestroyCommandPool(device_vk->vk_device, context_vk->vk_command_pool, NULL)); + + wined3d_context_vk_wait_command_buffer(context_vk, buffer->id - 1); + context_vk->completed_command_buffer_id = buffer->id; + wined3d_context_vk_cleanup_resources(context_vk); + heap_free(context_vk->submitted.buffers); wined3d_context_cleanup(&context_vk->c); } @@ -1965,6 +2009,135 @@ HGLRC context_create_wgl_attribs(const struct wined3d_gl_info *gl_info, HDC hdc, return ctx; } +VkCommandBuffer wined3d_context_vk_get_command_buffer(struct wined3d_context_vk *context_vk) +{ + struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device); + const struct wined3d_vk_info *vk_info = context_vk->vk_info; + VkCommandBufferAllocateInfo command_buffer_info; + struct wined3d_command_buffer_vk *buffer; + VkCommandBufferBeginInfo begin_info; + VkResult vr; + + TRACE("context_vk %p.\n", context_vk); + + buffer = &context_vk->current_command_buffer; + if (buffer->vk_command_buffer) + { + TRACE("Returning existing command buffer %p with id 0x%s.\n", + buffer->vk_command_buffer, wine_dbgstr_longlong(buffer->id)); + return buffer->vk_command_buffer; + } + + command_buffer_info.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO; + command_buffer_info.pNext = NULL; + command_buffer_info.commandPool = context_vk->vk_command_pool; + command_buffer_info.level = VK_COMMAND_BUFFER_LEVEL_PRIMARY; + command_buffer_info.commandBufferCount = 1; + if ((vr = VK_CALL(vkAllocateCommandBuffers(device_vk->vk_device, + &command_buffer_info, &buffer->vk_command_buffer))) < 0) + { + WARN("Failed to allocate Vulkan command buffer, vr %s.\n", wined3d_debug_vkresult(vr)); + return VK_NULL_HANDLE; + } + + begin_info.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO; + begin_info.pNext = NULL; + begin_info.flags = 0; + begin_info.pInheritanceInfo = NULL; + if ((vr = VK_CALL(vkBeginCommandBuffer(buffer->vk_command_buffer, &begin_info))) < 0) + { + WARN("Failed to begin command buffer, vr %s.\n", wined3d_debug_vkresult(vr)); + VK_CALL(vkFreeCommandBuffers(device_vk->vk_device, context_vk->vk_command_pool, + 1, &buffer->vk_command_buffer)); + return buffer->vk_command_buffer = VK_NULL_HANDLE; + } + + TRACE("Created new command buffer %p with id 0x%s.\n", + buffer->vk_command_buffer, wine_dbgstr_longlong(buffer->id)); + + return buffer->vk_command_buffer; +} + +void wined3d_context_vk_submit_command_buffer(struct wined3d_context_vk *context_vk) +{ + struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device); + const struct wined3d_vk_info *vk_info = context_vk->vk_info; + struct wined3d_command_buffer_vk *buffer; + VkFenceCreateInfo fence_desc; + VkSubmitInfo submit_info; + VkResult vr; + + TRACE("context_vk %p.\n", context_vk); + + buffer = &context_vk->current_command_buffer; + if (!buffer->vk_command_buffer) + return; + + TRACE("Submitting command buffer %p with id 0x%s.\n", + buffer->vk_command_buffer, wine_dbgstr_longlong(buffer->id)); + + VK_CALL(vkEndCommandBuffer(buffer->vk_command_buffer)); + + fence_desc.sType = VK_STRUCTURE_TYPE_FENCE_CREATE_INFO; + fence_desc.pNext = NULL; + fence_desc.flags = 0; + if ((vr = VK_CALL(vkCreateFence(device_vk->vk_device, &fence_desc, NULL, &buffer->vk_fence))) < 0) + ERR("Failed to create fence, vr %s.\n", wined3d_debug_vkresult(vr)); + + submit_info.sType = VK_STRUCTURE_TYPE_SUBMIT_INFO; + submit_info.pNext = NULL; + submit_info.waitSemaphoreCount = 0; + submit_info.pWaitSemaphores = NULL; + submit_info.pWaitDstStageMask = NULL; + submit_info.commandBufferCount = 1; + submit_info.pCommandBuffers = &buffer->vk_command_buffer; + submit_info.signalSemaphoreCount = 0; + submit_info.pSignalSemaphores = NULL; + + if ((vr = VK_CALL(vkQueueSubmit(device_vk->vk_queue, 1, &submit_info, buffer->vk_fence))) < 0) + ERR("Failed to submit command buffer %p, vr %s.\n", + buffer->vk_command_buffer, wined3d_debug_vkresult(vr)); + + if (!wined3d_array_reserve((void **)&context_vk->submitted.buffers, &context_vk->submitted.buffers_size, + context_vk->submitted.buffer_count + 1, sizeof(*context_vk->submitted.buffers))) + ERR("Failed to grow submitted command buffer array.\n"); + + context_vk->submitted.buffers[context_vk->submitted.buffer_count++] = *buffer; + + buffer->vk_command_buffer = VK_NULL_HANDLE; + /* We don't expect this to ever happen, but handle it anyway. */ + if (!++buffer->id) + { + wined3d_context_vk_wait_command_buffer(context_vk, buffer->id - 1); + context_vk->completed_command_buffer_id = 0; + buffer->id = 1; + } + wined3d_context_vk_cleanup_resources(context_vk); +} + +void wined3d_context_vk_wait_command_buffer(struct wined3d_context_vk *context_vk, uint64_t id) +{ + struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device); + const struct wined3d_vk_info *vk_info = context_vk->vk_info; + SIZE_T i; + + if (id <= context_vk->completed_command_buffer_id) + return; + + for (i = 0; i < context_vk->submitted.buffer_count; ++i) + { + if (context_vk->submitted.buffers[i].id != id) + continue; + + VK_CALL(vkWaitForFences(device_vk->vk_device, 1, + &context_vk->submitted.buffers[i].vk_fence, VK_TRUE, UINT64_MAX)); + wined3d_context_vk_cleanup_resources(context_vk); + return; + } + + ERR("Failed to find fence for command buffer with id 0x%s.\n", wine_dbgstr_longlong(id)); +} + static void wined3d_context_init(struct wined3d_context *context, struct wined3d_swapchain *swapchain) { struct wined3d_device *device = swapchain->device; @@ -2412,13 +2585,31 @@ fail: HRESULT wined3d_context_vk_init(struct wined3d_context_vk *context_vk, struct wined3d_swapchain *swapchain) { + VkCommandPoolCreateInfo command_pool_info; + const struct wined3d_vk_info *vk_info; struct wined3d_adapter_vk *adapter_vk; + struct wined3d_device_vk *device_vk; + VkResult vr; TRACE("context_vk %p, swapchain %p.\n", context_vk, swapchain); wined3d_context_init(&context_vk->c, swapchain); - adapter_vk = wined3d_adapter_vk(swapchain->device->adapter); - context_vk->vk_info = &adapter_vk->vk_info; + device_vk = wined3d_device_vk(swapchain->device); + adapter_vk = wined3d_adapter_vk(device_vk->d.adapter); + context_vk->vk_info = vk_info = &adapter_vk->vk_info; + + command_pool_info.sType = VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO; + command_pool_info.pNext = NULL; + command_pool_info.flags = VK_COMMAND_POOL_CREATE_TRANSIENT_BIT; + command_pool_info.queueFamilyIndex = device_vk->vk_queue_family_index; + if ((vr = VK_CALL(vkCreateCommandPool(device_vk->vk_device, + &command_pool_info, NULL, &context_vk->vk_command_pool))) < 0) + { + ERR("Failed to create Vulkan command pool, vr %s.\n", wined3d_debug_vkresult(vr)); + wined3d_context_cleanup(&context_vk->c); + return E_FAIL; + } + context_vk->current_command_buffer.id = 1; return WINED3D_OK; } diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index bba940f42cb..bbb892b328d 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -549,3 +549,29 @@ unsigned int wined3d_resource_get_sample_count(const struct wined3d_resource *re return resource->multisample_type; } + +VkAccessFlags vk_access_mask_from_bind_flags(uint32_t bind_flags) +{ + VkAccessFlags flags = 0; + + if (bind_flags & WINED3D_BIND_VERTEX_BUFFER) + flags |= VK_ACCESS_VERTEX_ATTRIBUTE_READ_BIT; + if (bind_flags & WINED3D_BIND_INDEX_BUFFER) + flags |= VK_ACCESS_INDEX_READ_BIT; + if (bind_flags & WINED3D_BIND_CONSTANT_BUFFER) + flags |= VK_ACCESS_UNIFORM_READ_BIT; + if (bind_flags & WINED3D_BIND_SHADER_RESOURCE) + flags |= VK_ACCESS_SHADER_READ_BIT; + if (bind_flags & WINED3D_BIND_UNORDERED_ACCESS) + flags |= VK_ACCESS_SHADER_READ_BIT | VK_ACCESS_SHADER_WRITE_BIT; + if (bind_flags & WINED3D_BIND_INDIRECT_BUFFER) + flags |= VK_ACCESS_INDIRECT_COMMAND_READ_BIT; + if (bind_flags & WINED3D_BIND_RENDER_TARGET) + flags |= VK_ACCESS_COLOR_ATTACHMENT_READ_BIT | VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT; + if (bind_flags & WINED3D_BIND_DEPTH_STENCIL) + flags |= VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_READ_BIT | VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT; + if (bind_flags & WINED3D_BIND_STREAM_OUTPUT) + FIXME("Ignoring some bind flags %#x.\n", bind_flags); + + return flags; +} diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 934a422ede1..5beaa927d77 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -294,6 +294,7 @@ extern const struct min_lookup minMipLookup[WINED3D_TEXF_LINEAR + 1] DECLSPEC_HI extern const GLenum magLookup[WINED3D_TEXF_LINEAR + 1] DECLSPEC_HIDDEN; GLenum wined3d_gl_compare_func(enum wined3d_cmp_func f) DECLSPEC_HIDDEN; +VkAccessFlags vk_access_mask_from_bind_flags(uint32_t bind_flags) DECLSPEC_HIDDEN; static inline enum wined3d_cmp_func wined3d_sanitize_cmp_func(enum wined3d_cmp_func func) { @@ -2158,11 +2159,29 @@ void wined3d_context_gl_unmap_bo_address(struct wined3d_context_gl *context_gl, void wined3d_context_gl_update_stream_sources(struct wined3d_context_gl *context_gl, const struct wined3d_state *state) DECLSPEC_HIDDEN; +struct wined3d_command_buffer_vk +{ + uint64_t id; + VkCommandBuffer vk_command_buffer; + VkFence vk_fence; +}; + struct wined3d_context_vk { struct wined3d_context c; const struct wined3d_vk_info *vk_info; + + VkCommandPool vk_command_pool; + struct wined3d_command_buffer_vk current_command_buffer; + uint64_t completed_command_buffer_id; + + struct + { + struct wined3d_command_buffer_vk *buffers; + SIZE_T buffers_size; + SIZE_T buffer_count; + } submitted; }; static inline struct wined3d_context_vk *wined3d_context_vk(struct wined3d_context *context) @@ -2175,8 +2194,11 @@ BOOL wined3d_context_vk_create_bo(struct wined3d_context_vk *context_vk, VkDevic VkBufferUsageFlags usage, VkMemoryPropertyFlags memory_type, struct wined3d_bo_vk *bo) DECLSPEC_HIDDEN; void wined3d_context_vk_destroy_bo(struct wined3d_context_vk *context_vk, const struct wined3d_bo_vk *bo) DECLSPEC_HIDDEN; +VkCommandBuffer wined3d_context_vk_get_command_buffer(struct wined3d_context_vk *context_vk) DECLSPEC_HIDDEN; HRESULT wined3d_context_vk_init(struct wined3d_context_vk *context_vk, struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; +void wined3d_context_vk_submit_command_buffer(struct wined3d_context_vk *context_vk) DECLSPEC_HIDDEN; +void wined3d_context_vk_wait_command_buffer(struct wined3d_context_vk *context_vk, uint64_t id) DECLSPEC_HIDDEN; typedef void (*APPLYSTATEFUNC)(struct wined3d_context *ctx, const struct wined3d_state *state, DWORD state_id); @@ -3350,6 +3372,7 @@ struct wined3d_device_vk VkDevice vk_device; VkQueue vk_queue; + uint32_t vk_queue_family_index; struct wined3d_vk_info vk_info; }; -- 2.11.0

1 0

[PATCH 4/6] wined3d: Get gl_info from the context in wined3d_device_create_primary_opengl_context_cs().
by Henri Verbeet 24 Jan '20

24 Jan '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/device.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 89134207243..cdc65a6fa71 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1002,13 +1002,15 @@ void wined3d_device_create_primary_opengl_context_cs(void *object) context_release(context); return; } - wined3d_ffp_blitter_create(&device->blitter, &device->adapter->gl_info); + + context_gl = wined3d_context_gl(context); + + wined3d_ffp_blitter_create(&device->blitter, context_gl->gl_info); if (!wined3d_glsl_blitter_create(&device->blitter, device)) wined3d_arbfp_blitter_create(&device->blitter, device); - wined3d_fbo_blitter_create(&device->blitter, &device->adapter->gl_info); - wined3d_raw_blitter_create(&device->blitter, &device->adapter->gl_info); + wined3d_fbo_blitter_create(&device->blitter, context_gl->gl_info); + wined3d_raw_blitter_create(&device->blitter, context_gl->gl_info); - context_gl = wined3d_context_gl(context); wined3d_device_gl_create_dummy_textures(wined3d_device_gl(device), context_gl); wined3d_device_create_default_samplers(device, context); context_release(context); -- 2.11.0

1 0

[PATCH 3/6] wined3d: Store a gl_info pointer in struct shader_arb_ctx_priv.
by Henri Verbeet 24 Jan '20

24 Jan '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/arb_program_shader.c | 7 +++++-- dlls/wined3d/shader.c | 1 - dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 9d98c79ce51..14ca883e761 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -237,6 +237,7 @@ struct shader_arb_ctx_priv NV3 } target_version; + const struct wined3d_gl_info *gl_info; const struct arb_vs_compile_args *cur_vs_args; const struct arb_ps_compile_args *cur_ps_args; const struct arb_ps_compiled_shader *compiled_fprog; @@ -1438,7 +1439,7 @@ static void shader_hw_sample(const struct wined3d_shader_instruction *ins, DWORD case WINED3D_SHADER_RESOURCE_TEXTURE_2D: if (pshader && priv->cur_ps_args->super.np2_fixup & (1u << sampler_idx) - && ins->ctx->gl_info->supported[ARB_TEXTURE_RECTANGLE]) + && priv->gl_info->supported[ARB_TEXTURE_RECTANGLE]) tex_type = "RECT"; else tex_type = "2D"; @@ -3301,7 +3302,7 @@ static void shader_hw_ret(const struct wined3d_shader_instruction *ins) if(vshader) { if (priv->in_main_func) vshader_add_footer(priv, shader->backend_data, - priv->cur_vs_args, ins->ctx->reg_maps, ins->ctx->gl_info, buffer); + priv->cur_vs_args, ins->ctx->reg_maps, priv->gl_info, buffer); } shader_addline(buffer, "RET;\n"); @@ -3555,6 +3556,7 @@ static GLuint shader_arb_generate_pshader(const struct wined3d_shader *shader, /* Create the hw ARB shader */ memset(&priv_ctx, 0, sizeof(priv_ctx)); + priv_ctx.gl_info = gl_info; priv_ctx.cur_ps_args = args; priv_ctx.compiled_fprog = compiled; priv_ctx.cur_np2fixup_info = &compiled->np2fixup_info; @@ -4113,6 +4115,7 @@ static GLuint shader_arb_generate_vshader(const struct wined3d_shader *shader, unsigned int i; memset(&priv_ctx, 0, sizeof(priv_ctx)); + priv_ctx.gl_info = gl_info; priv_ctx.cur_vs_args = args; list_init(&priv_ctx.control_frames); init_output_registers(shader, ps_input_sig, &priv_ctx, compiled); diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 3b9a96abc69..757631a73ef 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -2624,7 +2624,6 @@ HRESULT shader_generate_code(const struct wined3d_shader *shader, struct wined3d state.in_subroutine = FALSE; ctx.shader = shader; - ctx.gl_info = &device->adapter->gl_info; ctx.reg_maps = reg_maps; ctx.buffer = buffer; ctx.tex_mx = &tex_mx; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 583d970eca8..934a422ede1 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -79,6 +79,7 @@ struct wined3d_fragment_pipe_ops; struct wined3d_adapter; struct wined3d_context; +struct wined3d_gl_info; struct wined3d_state; struct wined3d_swapchain_gl; struct wined3d_texture_gl; @@ -1084,7 +1085,6 @@ struct wined3d_shader_parser_state struct wined3d_shader_context { const struct wined3d_shader *shader; - const struct wined3d_gl_info *gl_info; const struct wined3d_shader_reg_maps *reg_maps; struct wined3d_string_buffer *buffer; struct wined3d_shader_tex_mx *tex_mx; -- 2.11.0

1 0

[PATCH 2/6] wined3d: Store a gl_info pointer in struct shader_glsl_ctx_priv.
by Henri Verbeet 24 Jan '20

24 Jan '20

Since the one in struct wined3d_shader_context is going away. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/glsl_shader.c | 43 +++++++++++++++++++++++++++++-------------- 1 file changed, 29 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index f05631ec595..25e97723255 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -271,7 +271,9 @@ struct glsl_program_key GLuint cs_id; }; -struct shader_glsl_ctx_priv { +struct shader_glsl_ctx_priv +{ + const struct wined3d_gl_info *gl_info; const struct vs_compile_args *cur_vs_args; const struct ds_compile_args *cur_ds_args; const struct ps_compile_args *cur_ps_args; @@ -2651,8 +2653,9 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * const struct wined3d_shader *shader = ctx->shader; const struct wined3d_shader_reg_maps *reg_maps = ctx->reg_maps; const struct wined3d_shader_version *version = &reg_maps->shader_version; - const struct wined3d_gl_info *gl_info = ctx->gl_info; + const struct shader_glsl_ctx_priv *priv = ctx->backend_data; const char *prefix = shader_glsl_get_prefix(version->type); + const struct wined3d_gl_info *gl_info = priv->gl_info; struct glsl_src_param rel_param0, rel_param1; if (reg->idx[0].offset != ~0u && reg->idx[0].rel_addr) @@ -2674,8 +2677,6 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * case WINED3DSPR_INCONTROLPOINT: if (version->type == WINED3D_SHADER_TYPE_VERTEX) { - struct shader_glsl_ctx_priv *priv = ctx->backend_data; - if (reg->idx[0].rel_addr) FIXME("VS3 input registers relative addressing.\n"); if (is_swizzled && priv->cur_vs_args->swizzle_map & (1u << reg->idx[0].offset)) @@ -3353,7 +3354,7 @@ static void shader_glsl_get_sample_function(const struct wined3d_shader_context { enum wined3d_shader_resource_type resource_type; struct shader_glsl_ctx_priv *priv = ctx->backend_data; - const struct wined3d_gl_info *gl_info = ctx->gl_info; + const struct wined3d_gl_info *gl_info = priv->gl_info; BOOL shadow = glsl_is_shadow_sampler(ctx->shader, priv->cur_ps_args, resource_idx, sampler_idx); BOOL projected = flags & WINED3D_GLSL_SAMPLE_PROJECTED; BOOL texrect = ctx->reg_maps->shader_version.type == WINED3D_SHADER_TYPE_PIXEL @@ -3854,8 +3855,9 @@ static void shader_glsl_udiv(const struct wined3d_shader_instruction *ins) /* Process the WINED3DSIO_MOV opcode using GLSL (dst = src) */ static void shader_glsl_mov(const struct wined3d_shader_instruction *ins) { - const struct wined3d_gl_info *gl_info = ins->ctx->gl_info; + const struct shader_glsl_ctx_priv *priv = ins->ctx->backend_data; struct wined3d_string_buffer *buffer = ins->ctx->buffer; + const struct wined3d_gl_info *gl_info = priv->gl_info; struct glsl_src_param src0_param; DWORD write_mask; @@ -4979,9 +4981,10 @@ static void shader_glsl_emit(const struct wined3d_shader_instruction *ins) { unsigned int stream = ins->handler_idx == WINED3DSIH_EMIT ? 0 : ins->src[0].reg.idx[0].offset; const struct wined3d_shader_reg_maps *reg_maps = ins->ctx->reg_maps; + const struct shader_glsl_ctx_priv *priv = ins->ctx->backend_data; shader_addline(ins->ctx->buffer, "setup_gs_output(gs_out);\n"); - if (!ins->ctx->gl_info->supported[ARB_CLIP_CONTROL]) + if (!priv->gl_info->supported[ARB_CLIP_CONTROL]) shader_glsl_fixup_position(ins->ctx->buffer, reg_maps->viewport_array); if (!stream) @@ -5186,7 +5189,8 @@ static void shader_glsl_tex(const struct wined3d_shader_instruction *ins) static void shader_glsl_texldd(const struct wined3d_shader_instruction *ins) { - const struct wined3d_gl_info *gl_info = ins->ctx->gl_info; + const struct shader_glsl_ctx_priv *priv = ins->ctx->backend_data; + const struct wined3d_gl_info *gl_info = priv->gl_info; struct glsl_src_param coord_param, dx_param, dy_param; struct glsl_sample_function sample_function; DWORD sampler_idx; @@ -5214,7 +5218,8 @@ static void shader_glsl_texldd(const struct wined3d_shader_instruction *ins) static void shader_glsl_texldl(const struct wined3d_shader_instruction *ins) { const struct wined3d_shader_version *shader_version = &ins->ctx->reg_maps->shader_version; - const struct wined3d_gl_info *gl_info = ins->ctx->gl_info; + const struct shader_glsl_ctx_priv *priv = ins->ctx->backend_data; + const struct wined3d_gl_info *gl_info = priv->gl_info; struct glsl_src_param coord_param, lod_param; struct glsl_sample_function sample_function; DWORD swizzle = ins->src[1].swizzle; @@ -5769,8 +5774,9 @@ static BOOL is_mipmapped(enum wined3d_shader_resource_type resource_type) static void shader_glsl_resinfo(const struct wined3d_shader_instruction *ins) { const struct wined3d_shader_version *version = &ins->ctx->reg_maps->shader_version; - const struct wined3d_gl_info *gl_info = ins->ctx->gl_info; + const struct shader_glsl_ctx_priv *priv = ins->ctx->backend_data; struct wined3d_string_buffer *buffer = ins->ctx->buffer; + const struct wined3d_gl_info *gl_info = priv->gl_info; enum wined3d_shader_resource_type resource_type; enum wined3d_shader_register_type reg_type; unsigned int resource_idx, bind_idx, i; @@ -5858,7 +5864,8 @@ static void shader_glsl_resinfo(const struct wined3d_shader_instruction *ins) static void shader_glsl_sample_info(const struct wined3d_shader_instruction *ins) { const struct wined3d_shader_reg_maps *reg_maps = ins->ctx->reg_maps; - const struct wined3d_gl_info *gl_info = ins->ctx->gl_info; + const struct shader_glsl_ctx_priv *priv = ins->ctx->backend_data; + const struct wined3d_gl_info *gl_info = priv->gl_info; struct wined3d_string_buffer *buffer = ins->ctx->buffer; const struct wined3d_shader_dst_param *dst = ins->dst; const struct wined3d_shader_src_param *src = ins->src; @@ -6060,9 +6067,10 @@ static void shader_glsl_gen_sample_c_lz_emulation(const struct wined3d_shader_in static void shader_glsl_sample_c(const struct wined3d_shader_instruction *ins) { - const struct wined3d_gl_info *gl_info = ins->ctx->gl_info; + const struct shader_glsl_ctx_priv *priv = ins->ctx->backend_data; unsigned int resource_idx, sampler_idx, sampler_bind_idx; const struct wined3d_shader_resource_info *resource_info; + const struct wined3d_gl_info *gl_info = priv->gl_info; struct glsl_src_param coord_param, compare_param; struct glsl_sample_function sample_function; const char *lod_param = NULL; @@ -6110,8 +6118,9 @@ static void shader_glsl_gather4(const struct wined3d_shader_instruction *ins) unsigned int resource_param_idx, resource_idx, sampler_idx, sampler_bind_idx, component_idx; const struct wined3d_shader_reg_maps *reg_maps = ins->ctx->reg_maps; const char *prefix = shader_glsl_get_prefix(reg_maps->shader_version.type); + const struct shader_glsl_ctx_priv *priv = ins->ctx->backend_data; struct glsl_src_param coord_param, compare_param, offset_param; - const struct wined3d_gl_info *gl_info = ins->ctx->gl_info; + const struct wined3d_gl_info *gl_info = priv->gl_info; const struct wined3d_shader_resource_info *resource_info; struct wined3d_string_buffer *buffer = ins->ctx->buffer; unsigned int coord_size, offset_size; @@ -7574,6 +7583,7 @@ static GLuint shader_glsl_generate_fragment_shader(const struct wined3d_context_ DWORD map; memset(&priv_ctx, 0, sizeof(priv_ctx)); + priv_ctx.gl_info = gl_info; priv_ctx.cur_ps_args = args; priv_ctx.cur_np2fixup_info = np2fixup_info; priv_ctx.string_buffers = string_buffers; @@ -7927,6 +7937,7 @@ static GLuint shader_glsl_generate_vertex_shader(const struct wined3d_context_gl unsigned int i; memset(&priv_ctx, 0, sizeof(priv_ctx)); + priv_ctx.gl_info = gl_info; priv_ctx.cur_vs_args = args; priv_ctx.string_buffers = string_buffers; @@ -8071,6 +8082,7 @@ static GLuint shader_glsl_generate_hull_shader(const struct wined3d_context_gl * unsigned int i; memset(&priv_ctx, 0, sizeof(priv_ctx)); + priv_ctx.gl_info = gl_info; priv_ctx.string_buffers = string_buffers; shader_glsl_add_version_declaration(buffer, gl_info); @@ -8164,6 +8176,7 @@ static GLuint shader_glsl_generate_domain_shader(const struct wined3d_context_gl GLuint shader_id; memset(&priv_ctx, 0, sizeof(priv_ctx)); + priv_ctx.gl_info = gl_info; priv_ctx.cur_ds_args = args; priv_ctx.string_buffers = string_buffers; @@ -8262,6 +8275,7 @@ static GLuint shader_glsl_generate_geometry_shader(const struct wined3d_context_ GLuint shader_id; memset(&priv_ctx, 0, sizeof(priv_ctx)); + priv_ctx.gl_info = gl_info; priv_ctx.string_buffers = string_buffers; shader_glsl_add_version_declaration(buffer, gl_info); @@ -8351,7 +8365,7 @@ static GLuint shader_glsl_generate_geometry_shader(const struct wined3d_context_ static void shader_glsl_generate_shader_epilogue(const struct wined3d_shader_context *ctx) { const struct shader_glsl_ctx_priv *priv = ctx->backend_data; - const struct wined3d_gl_info *gl_info = ctx->gl_info; + const struct wined3d_gl_info *gl_info = priv->gl_info; struct wined3d_string_buffer *buffer = ctx->buffer; const struct wined3d_shader *shader = ctx->shader; @@ -8388,6 +8402,7 @@ static GLuint shader_glsl_generate_compute_shader(const struct wined3d_context_g unsigned int i; memset(&priv_ctx, 0, sizeof(priv_ctx)); + priv_ctx.gl_info = gl_info; priv_ctx.string_buffers = string_buffers; shader_glsl_add_version_declaration(buffer, gl_info); -- 2.11.0

1 0

[PATCH 1/6] wined3d: Create Vulkan buffers.
by Henri Verbeet 24 Jan '20

24 Jan '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/adapter_vk.c | 17 ++++++++++ dlls/wined3d/buffer.c | 66 ++++++++++++++++++++++++++++++++++++-- dlls/wined3d/context.c | 72 ++++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 21 ++++++++++++ 4 files changed, 173 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 4ec68013017..7d501b4b08f 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -555,6 +555,23 @@ static void adapter_vk_destroy_swapchain(struct wined3d_swapchain *swapchain) heap_free(swapchain); } +unsigned int wined3d_adapter_vk_get_memory_type_index(const struct wined3d_adapter_vk *adapter_vk, + uint32_t memory_type_mask, VkMemoryPropertyFlags flags) +{ + const VkPhysicalDeviceMemoryProperties *memory_info = &adapter_vk->memory_properties; + unsigned int i; + + for (i = 0; i < memory_info->memoryTypeCount; ++i) + { + if (!(memory_type_mask & (1u << i))) + continue; + if ((memory_info->memoryTypes[i].propertyFlags & flags) == flags) + return i; + } + + return ~0u; +} + static HRESULT adapter_vk_create_buffer(struct wined3d_device *device, const struct wined3d_buffer_desc *desc, const struct wined3d_sub_resource_data *data, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_buffer **buffer) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 5da6aec4fb8..4f3c28fe0b1 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1554,6 +1554,44 @@ HRESULT wined3d_buffer_gl_init(struct wined3d_buffer_gl *buffer_gl, struct wined return wined3d_buffer_init(&buffer_gl->b, device, desc, data, parent, parent_ops, &wined3d_buffer_gl_ops); } +static BOOL wined3d_buffer_vk_create_buffer_object(struct wined3d_buffer_vk *buffer_vk, + struct wined3d_context_vk *context_vk) +{ + struct wined3d_resource *resource = &buffer_vk->b.resource; + uint32_t bind_flags = resource->bind_flags; + VkMemoryPropertyFlags memory_type; + VkBufferUsageFlags usage; + + usage = VK_BUFFER_USAGE_TRANSFER_SRC_BIT | VK_BUFFER_USAGE_TRANSFER_DST_BIT; + if (bind_flags & WINED3D_BIND_VERTEX_BUFFER) + usage |= VK_BUFFER_USAGE_VERTEX_BUFFER_BIT; + if (bind_flags & WINED3D_BIND_INDEX_BUFFER) + usage |= VK_BUFFER_USAGE_INDEX_BUFFER_BIT; + if (bind_flags & WINED3D_BIND_CONSTANT_BUFFER) + usage |= VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT; + if (bind_flags & WINED3D_BIND_SHADER_RESOURCE) + usage |= VK_BUFFER_USAGE_UNIFORM_TEXEL_BUFFER_BIT; + if (bind_flags & WINED3D_BIND_UNORDERED_ACCESS) + usage |= VK_BUFFER_USAGE_STORAGE_TEXEL_BUFFER_BIT; + if (bind_flags & WINED3D_BIND_INDIRECT_BUFFER) + usage |= VK_BUFFER_USAGE_INDIRECT_BUFFER_BIT; + if (bind_flags & (WINED3D_BIND_STREAM_OUTPUT | WINED3D_BIND_RENDER_TARGET | WINED3D_BIND_DEPTH_STENCIL)) + FIXME("Ignoring some bind flags %#x.\n", bind_flags); + memory_type = VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT + | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT + | VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT; + if (!(wined3d_context_vk_create_bo(context_vk, resource->size, usage, memory_type, &buffer_vk->bo))) + { + WARN("Failed to create Vulkan buffer.\n"); + return FALSE; + } + + buffer_vk->b.buffer_object = (uintptr_t)&buffer_vk->bo; + buffer_invalidate_bo_range(&buffer_vk->b, 0, 0); + + return TRUE; +} + static BOOL wined3d_buffer_vk_prepare_location(struct wined3d_buffer *buffer, struct wined3d_context *context, unsigned int location) { @@ -1563,8 +1601,10 @@ static BOOL wined3d_buffer_vk_prepare_location(struct wined3d_buffer *buffer, return wined3d_resource_prepare_sysmem(&buffer->resource); case WINED3D_LOCATION_BUFFER: - /* The Vulkan buffer is created during resource creation. */ - return TRUE; + if (buffer->buffer_object) + return TRUE; + + return wined3d_buffer_vk_create_buffer_object(wined3d_buffer_vk(buffer), wined3d_context_vk(context)); default: FIXME("Unhandled location %s.\n", wined3d_debug_location(location)); @@ -1575,7 +1615,24 @@ static BOOL wined3d_buffer_vk_prepare_location(struct wined3d_buffer *buffer, static void wined3d_buffer_vk_unload_location(struct wined3d_buffer *buffer, struct wined3d_context *context, unsigned int location) { - FIXME("buffer %p, context %p, location %s.\n", buffer, context, wined3d_debug_location(location)); + struct wined3d_context_vk *context_vk = wined3d_context_vk(context); + struct wined3d_buffer_vk *buffer_vk = wined3d_buffer_vk(buffer); + + TRACE("buffer %p, context %p, location %s.\n", buffer, context, wined3d_debug_location(location)); + + switch (location) + { + case WINED3D_LOCATION_BUFFER: + wined3d_context_vk_destroy_bo(context_vk, &buffer_vk->bo); + buffer_vk->bo.vk_buffer = VK_NULL_HANDLE; + buffer_vk->bo.vk_memory = VK_NULL_HANDLE; + buffer_vk->b.buffer_object = 0u; + break; + + default: + ERR("Unhandled location %s.\n", wined3d_debug_location(location)); + break; + } } static void wined3d_buffer_vk_upload_ranges(struct wined3d_buffer *buffer, struct wined3d_context *context, @@ -1605,6 +1662,9 @@ HRESULT wined3d_buffer_vk_init(struct wined3d_buffer_vk *buffer_vk, struct wined TRACE("buffer_vk %p, device %p, desc %p, data %p, parent %p, parent_ops %p.\n", buffer_vk, device, desc, data, parent, parent_ops); + if (desc->access & WINED3D_RESOURCE_ACCESS_GPU) + buffer_vk->b.flags |= WINED3D_BUFFER_USE_BO; + return wined3d_buffer_init(&buffer_vk->b, device, desc, data, parent, parent_ops, &wined3d_buffer_vk_ops); } diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 458343ce4a4..7d66fab0a26 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1493,6 +1493,74 @@ static void wined3d_context_gl_cleanup(struct wined3d_context_gl *context_gl) wined3d_context_cleanup(&context_gl->c); } +BOOL wined3d_context_vk_create_bo(struct wined3d_context_vk *context_vk, VkDeviceSize size, + VkBufferUsageFlags usage, VkMemoryPropertyFlags memory_type, struct wined3d_bo_vk *bo) +{ + struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device); + const struct wined3d_vk_info *vk_info = context_vk->vk_info; + VkMemoryRequirements memory_requirements; + struct wined3d_adapter_vk *adapter_vk; + VkMemoryAllocateInfo allocate_info; + VkBufferCreateInfo create_info; + VkResult vr; + + adapter_vk = wined3d_adapter_vk(device_vk->d.adapter); + + create_info.sType = VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO; + create_info.pNext = NULL; + create_info.flags = 0; + create_info.size = size; + create_info.usage = usage; + create_info.sharingMode = VK_SHARING_MODE_EXCLUSIVE; + create_info.queueFamilyIndexCount = 0; + create_info.pQueueFamilyIndices = NULL; + + if ((vr = VK_CALL(vkCreateBuffer(device_vk->vk_device, &create_info, NULL, &bo->vk_buffer))) < 0) + { + ERR("Failed to create Vulkan buffer, vr %s.\n", wined3d_debug_vkresult(vr)); + return FALSE; + } + + VK_CALL(vkGetBufferMemoryRequirements(device_vk->vk_device, bo->vk_buffer, &memory_requirements)); + + allocate_info.sType = VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO; + allocate_info.pNext = NULL; + allocate_info.allocationSize = memory_requirements.size; + allocate_info.memoryTypeIndex = wined3d_adapter_vk_get_memory_type_index(adapter_vk, + memory_requirements.memoryTypeBits, memory_type); + if (allocate_info.memoryTypeIndex == ~0u) + { + ERR("Failed to find suitable memory type.\n"); + VK_CALL(vkDestroyBuffer(device_vk->vk_device, bo->vk_buffer, NULL)); + return FALSE; + } + if ((vr = VK_CALL(vkAllocateMemory(device_vk->vk_device, &allocate_info, NULL, &bo->vk_memory))) < 0) + { + ERR("Failed to allocate buffer memory, vr %s.\n", wined3d_debug_vkresult(vr)); + VK_CALL(vkDestroyBuffer(device_vk->vk_device, bo->vk_buffer, NULL)); + return FALSE; + } + + if ((vr = VK_CALL(vkBindBufferMemory(device_vk->vk_device, bo->vk_buffer, bo->vk_memory, 0))) < 0) + { + ERR("Failed to bind buffer memory, vr %s.\n", wined3d_debug_vkresult(vr)); + VK_CALL(vkFreeMemory(device_vk->vk_device, bo->vk_memory, NULL)); + VK_CALL(vkDestroyBuffer(device_vk->vk_device, bo->vk_buffer, NULL)); + return FALSE; + } + + return TRUE; +} + +void wined3d_context_vk_destroy_bo(struct wined3d_context_vk *context_vk, const struct wined3d_bo_vk *bo) +{ + struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device); + const struct wined3d_vk_info *vk_info = context_vk->vk_info; + + VK_CALL(vkDestroyBuffer(device_vk->vk_device, bo->vk_buffer, NULL)); + VK_CALL(vkFreeMemory(device_vk->vk_device, bo->vk_memory, NULL)); +} + void wined3d_context_vk_cleanup(struct wined3d_context_vk *context_vk) { wined3d_context_cleanup(&context_vk->c); @@ -2344,9 +2412,13 @@ fail: HRESULT wined3d_context_vk_init(struct wined3d_context_vk *context_vk, struct wined3d_swapchain *swapchain) { + struct wined3d_adapter_vk *adapter_vk; + TRACE("context_vk %p, swapchain %p.\n", context_vk, swapchain); wined3d_context_init(&context_vk->c, swapchain); + adapter_vk = wined3d_adapter_vk(swapchain->device->adapter); + context_vk->vk_info = &adapter_vk->vk_info; return WINED3D_OK; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 21f17736ec7..583d970eca8 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1512,6 +1512,12 @@ do { \ #define checkGLcall(A) do {} while(0) #endif +struct wined3d_bo_vk +{ + VkBuffer vk_buffer; + VkDeviceMemory vk_memory; +}; + struct wined3d_bo_address { UINT_PTR buffer_object; @@ -2155,9 +2161,20 @@ void wined3d_context_gl_update_stream_sources(struct wined3d_context_gl *context struct wined3d_context_vk { struct wined3d_context c; + + const struct wined3d_vk_info *vk_info; }; +static inline struct wined3d_context_vk *wined3d_context_vk(struct wined3d_context *context) +{ + return CONTAINING_RECORD(context, struct wined3d_context_vk, c); +} + void wined3d_context_vk_cleanup(struct wined3d_context_vk *context_vk) DECLSPEC_HIDDEN; +BOOL wined3d_context_vk_create_bo(struct wined3d_context_vk *context_vk, VkDeviceSize size, + VkBufferUsageFlags usage, VkMemoryPropertyFlags memory_type, struct wined3d_bo_vk *bo) DECLSPEC_HIDDEN; +void wined3d_context_vk_destroy_bo(struct wined3d_context_vk *context_vk, + const struct wined3d_bo_vk *bo) DECLSPEC_HIDDEN; HRESULT wined3d_context_vk_init(struct wined3d_context_vk *context_vk, struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; @@ -2929,6 +2946,8 @@ static inline struct wined3d_adapter_vk *wined3d_adapter_vk(struct wined3d_adapt struct wined3d_adapter *wined3d_adapter_vk_create(unsigned int ordinal, unsigned int wined3d_creation_flags) DECLSPEC_HIDDEN; +unsigned int wined3d_adapter_vk_get_memory_type_index(const struct wined3d_adapter_vk *adapter_vk, + uint32_t memory_type_mask, VkMemoryPropertyFlags flags) DECLSPEC_HIDDEN; struct wined3d_caps_gl_ctx { @@ -4208,6 +4227,8 @@ HRESULT wined3d_buffer_gl_init(struct wined3d_buffer_gl *buffer_gl, struct wined struct wined3d_buffer_vk { struct wined3d_buffer b; + + struct wined3d_bo_vk bo; }; static inline struct wined3d_buffer_vk *wined3d_buffer_vk(struct wined3d_buffer *buffer) -- 2.11.0

1 0

[PATCH v3 1/5] wined3d: Introduce wined3d_device_apply_stateblock().
by Zebediah Figura 24 Jan '20

24 Jan '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- v3: Only push modified constants. This series may not necessarily be safe for code freeze, but I'm submitting it at least to finish the review process. dlls/wined3d/device.c | 193 ++++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 1 + 3 files changed, 195 insertions(+) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 8913420724..8e20e31d3f 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3829,6 +3829,199 @@ struct wined3d_texture * CDECL wined3d_device_get_texture(const struct wined3d_d return device->state.textures[stage]; } +void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, + struct wined3d_stateblock *stateblock) +{ + const struct wined3d_d3d_info *d3d_info = &stateblock->device->adapter->d3d_info; + const struct wined3d_stateblock_state *state = &stateblock->stateblock_state; + unsigned int i, j, count; + + TRACE("device %p, stateblock %p.\n", device, stateblock); + + if (stateblock->changed.vertexShader) + wined3d_device_set_vertex_shader(device, state->vs); + if (stateblock->changed.pixelShader) + wined3d_device_set_pixel_shader(device, state->ps); + + count = 0; + for (i = 0; i < d3d_info->limits.vs_uniform_count; ++i) + { + if (stateblock->changed.vs_consts_f[i]) + ++count; + else if (count) + { + wined3d_device_set_vs_consts_f(device, i - count, count, state->vs_consts_f + i - count); + count = 0; + } + } + if (count) + wined3d_device_set_vs_consts_f(device, i - count, count, state->vs_consts_f + i - count); + + count = 0; + for (i = 0; i < WINED3D_MAX_CONSTS_B; ++i) + { + if (stateblock->changed.vertexShaderConstantsB & (1u << i)) + ++count; + else if (count) + { + wined3d_device_set_vs_consts_b(device, i - count, count, state->vs_consts_b + i - count); + count = 0; + } + } + if (count) + wined3d_device_set_vs_consts_b(device, i - count, count, state->vs_consts_b + i - count); + + count = 0; + for (i = 0; i < WINED3D_MAX_CONSTS_I; ++i) + { + if (stateblock->changed.vertexShaderConstantsI & (1u << i)) + ++count; + else if (count) + { + wined3d_device_set_vs_consts_i(device, i - count, count, state->vs_consts_i + i - count); + count = 0; + } + } + if (count) + wined3d_device_set_vs_consts_i(device, i - count, count, state->vs_consts_i + i - count); + + count = 0; + for (i = 0; i < d3d_info->limits.ps_uniform_count; ++i) + { + if (stateblock->changed.ps_consts_f[i]) + ++count; + else if (count) + { + wined3d_device_set_ps_consts_f(device, i - count, count, state->ps_consts_f + i - count); + count = 0; + } + } + if (count) + wined3d_device_set_ps_consts_f(device, i - count, count, state->ps_consts_f + i - count); + + count = 0; + for (i = 0; i < WINED3D_MAX_CONSTS_B; ++i) + { + if (stateblock->changed.pixelShaderConstantsB & (1u << i)) + ++count; + else if (count) + { + wined3d_device_set_ps_consts_b(device, i - count, count, state->ps_consts_b + i - count); + count = 0; + } + } + if (count) + wined3d_device_set_ps_consts_b(device, i - count, count, state->ps_consts_b + i - count); + + count = 0; + for (i = 0; i < WINED3D_MAX_CONSTS_I; ++i) + { + if (stateblock->changed.pixelShaderConstantsI & (1u << i)) + ++count; + else if (count) + { + wined3d_device_set_ps_consts_i(device, i - count, count, state->ps_consts_i + i - count); + count = 0; + } + } + if (count) + wined3d_device_set_ps_consts_i(device, i - count, count, state->ps_consts_i + i - count); + + for (i = 0; i < ARRAY_SIZE(state->light_state->light_map); ++i) + { + const struct wined3d_light_info *light; + + LIST_FOR_EACH_ENTRY(light, &state->light_state->light_map[i], struct wined3d_light_info, entry) + { + wined3d_device_set_light(device, light->OriginalIndex, &light->OriginalParms); + wined3d_device_set_light_enable(device, light->OriginalIndex, light->glIndex != -1); + } + } + + for (i = 0; i < ARRAY_SIZE(state->rs); ++i) + { + if (stateblock->changed.renderState[i >> 5] & (1u << (i & 0x1f))) + { + if (i == WINED3D_RS_BLENDFACTOR) + { + struct wined3d_color color; + wined3d_color_from_d3dcolor(&color, state->rs[i]); + wined3d_device_set_blend_state(device, NULL, &color); + } + else + wined3d_device_set_render_state(device, i, state->rs[i]); + } + } + + for (i = 0; i < ARRAY_SIZE(state->texture_states); ++i) + { + for (j = 0; j < ARRAY_SIZE(state->texture_states[i]); ++j) + { + if (stateblock->changed.textureState[i] & (1u << j)) + wined3d_device_set_texture_stage_state(device, i, j, state->texture_states[i][j]); + } + } + + for (i = 0; i < ARRAY_SIZE(state->sampler_states); ++i) + { + DWORD stage = i; + if (stage >= WINED3D_MAX_FRAGMENT_SAMPLERS) + stage += WINED3DVERTEXTEXTURESAMPLER0 - WINED3D_MAX_FRAGMENT_SAMPLERS; + for (j = 0; j < ARRAY_SIZE(state->sampler_states[j]); ++j) + { + if (stateblock->changed.samplerState[i] & (1 << j)) + wined3d_device_set_sampler_state(device, stage, j, state->sampler_states[i][j]); + } + } + + for (i = 0; i < ARRAY_SIZE(state->transforms); ++i) + { + if (stateblock->changed.transform[i >> 5] & (1u << (i & 0x1f))) + wined3d_device_set_transform(device, i, &state->transforms[i]); + } + + if (stateblock->changed.indices) + wined3d_device_set_index_buffer(device, state->index_buffer, state->index_format, 0); + wined3d_device_set_base_vertex_index(device, state->base_vertex_index); + if (stateblock->changed.vertexDecl) + wined3d_device_set_vertex_declaration(device, state->vertex_declaration); + if (stateblock->changed.material) + wined3d_device_set_material(device, &state->material); + if (stateblock->changed.viewport) + wined3d_device_set_viewports(device, 1, &state->viewport); + if (stateblock->changed.scissorRect) + wined3d_device_set_scissor_rects(device, 1, &state->scissor_rect); + + for (i = 0; i < ARRAY_SIZE(state->streams); ++i) + { + if (stateblock->changed.streamSource & (1u << i)) + wined3d_device_set_stream_source(device, i, state->streams[i].buffer, + state->streams[i].offset, state->streams[i].stride); + if (stateblock->changed.streamFreq & (1u << i)) + wined3d_device_set_stream_source_freq(device, i, + state->streams[i].frequency | state->streams[i].flags); + } + + for (i = 0; i < ARRAY_SIZE(state->textures); ++i) + { + DWORD stage = i; + if (stage >= WINED3D_MAX_FRAGMENT_SAMPLERS) + stage += WINED3DVERTEXTEXTURESAMPLER0 - WINED3D_MAX_FRAGMENT_SAMPLERS; + if (stateblock->changed.textures & (1u << i)) + wined3d_device_set_texture(device, stage, state->textures[i]); + } + + for (i = 0; i < ARRAY_SIZE(state->clip_planes); ++i) + { + if (stateblock->changed.clipplane & (1u << i)) + wined3d_device_set_clip_plane(device, i, &state->clip_planes[i]); + } + + memset(&stateblock->changed, 0, sizeof(stateblock->changed)); + + TRACE("Applied stateblock %p.\n", stateblock); +} + HRESULT CDECL wined3d_device_get_device_caps(const struct wined3d_device *device, struct wined3d_caps *caps) { TRACE("device %p, caps %p.\n", device, caps); diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index e03c57055b..c8ef442c72 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -37,6 +37,7 @@ @ cdecl wined3d_buffer_incref(ptr) @ cdecl wined3d_device_acquire_focus_window(ptr ptr) +@ cdecl wined3d_device_apply_stateblock(ptr ptr) @ cdecl wined3d_device_begin_scene(ptr) @ cdecl wined3d_device_clear(ptr long ptr long ptr float long) @ cdecl wined3d_device_clear_rendertarget_view(ptr ptr ptr long ptr float long) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 9cdf18633c..4306f5ae21 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2289,6 +2289,7 @@ struct wined3d_resource * __cdecl wined3d_buffer_get_resource(struct wined3d_buf ULONG __cdecl wined3d_buffer_incref(struct wined3d_buffer *buffer); HRESULT __cdecl wined3d_device_acquire_focus_window(struct wined3d_device *device, HWND window); +void __cdecl wined3d_device_apply_stateblock(struct wined3d_device *device, struct wined3d_stateblock *stateblock); HRESULT __cdecl wined3d_device_begin_scene(struct wined3d_device *device); HRESULT __cdecl wined3d_device_clear(struct wined3d_device *device, DWORD rect_count, const RECT *rects, DWORD flags, const struct wined3d_color *color, float z, DWORD stencil); -- 2.24.0

3 9

[PATCH v2 1/5] winegstreamer: Rename the "ppPins" element of struct gstdemux to "sources".
by Zebediah Figura 24 Jan '20

24 Jan '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/winegstreamer/gstdemux.c | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 7ae70d0a736..88310668540 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -57,7 +57,8 @@ struct gstdemux struct strmbase_sink sink; IAsyncReader *reader; IMemAllocator *alloc; - struct gstdemux_source **ppPins; + + struct gstdemux_source **sources; LONG cStreams; LONGLONG filesize; @@ -842,7 +843,7 @@ static void removed_decoded_pad(GstElement *bin, GstPad *pad, gpointer user) TRACE("%p %p %p\n", This, bin, pad); for (x = 0; x < This->cStreams; ++x) { - if (This->ppPins[x]->their_src == pad) + if (This->sources[x]->their_src == pad) break; } if (x == This->cStreams) @@ -853,7 +854,7 @@ static void removed_decoded_pad(GstElement *bin, GstPad *pad, gpointer user) return; } - pin = This->ppPins[x]; + pin = This->sources[x]; if(pin->flipfilter) gst_pad_unlink(pin->their_src, pin->flip_sink); @@ -994,7 +995,7 @@ static void existing_new_pad(GstElement *bin, GstPad *pad, gpointer user) } for (x = 0; x < This->cStreams; ++x) { - struct gstdemux_source *pin = This->ppPins[x]; + struct gstdemux_source *pin = This->sources[x]; if (!pin->their_src) { gst_segment_init(pin->segment, GST_FORMAT_TIME); @@ -1215,7 +1216,7 @@ static struct strmbase_pin *gstdemux_get_pin(struct strmbase_filter *base, unsig if (!index) return &filter->sink.pin; else if (index <= filter->cStreams) - return &filter->ppPins[index - 1]->pin.pin; + return &filter->sources[index - 1]->pin.pin; return NULL; } @@ -1280,7 +1281,7 @@ static HRESULT gstdemux_init_stream(struct strmbase_filter *iface) for (i = 0; i < filter->cStreams; ++i) { - if (SUCCEEDED(pin_hr = BaseOutputPinImpl_Active(&filter->ppPins[i]->pin))) + if (SUCCEEDED(pin_hr = BaseOutputPinImpl_Active(&filter->sources[i]->pin))) hr = pin_hr; } return hr; @@ -1496,10 +1497,10 @@ static BOOL gstdecoder_init_gst(struct gstdemux *filter) WaitForSingleObject(filter->no_more_pads_event, INFINITE); - gst_pad_query_duration(filter->ppPins[0]->their_src, GST_FORMAT_TIME, &duration); + gst_pad_query_duration(filter->sources[0]->their_src, GST_FORMAT_TIME, &duration); for (i = 0; i < filter->cStreams; ++i) { - struct gstdemux_source *pin = filter->ppPins[i]; + struct gstdemux_source *pin = filter->sources[i]; const HANDLE events[2] = {pin->caps_event, filter->error_event}; pin->seek.llDuration = pin->seek.llStop = duration / 100; @@ -1947,9 +1948,9 @@ static struct gstdemux_source *create_pin(struct gstdemux *filter, const WCHAR * struct gstdemux_source *pin, **new_array; char pad_name[19]; - if (!(new_array = heap_realloc(filter->ppPins, (filter->cStreams + 1) * sizeof(*new_array)))) + if (!(new_array = heap_realloc(filter->sources, (filter->cStreams + 1) * sizeof(*new_array)))) return NULL; - filter->ppPins = new_array; + filter->sources = new_array; if (!(pin = heap_alloc_zero(sizeof(*pin)))) return NULL; @@ -1970,7 +1971,7 @@ static struct gstdemux_source *create_pin(struct gstdemux *filter, const WCHAR * gst_pad_set_event_function(pin->my_sink, event_sink_wrapper); gst_pad_set_query_function(pin->my_sink, query_sink_wrapper); - filter->ppPins[filter->cStreams++] = pin; + filter->sources[filter->cStreams++] = pin; return pin; } @@ -1990,11 +1991,11 @@ static HRESULT GST_RemoveOutputPins(struct gstdemux *This) This->my_src = This->their_sink = NULL; for (i = 0; i < This->cStreams; ++i) - free_source_pin(This->ppPins[i]); + free_source_pin(This->sources[i]); This->cStreams = 0; - heap_free(This->ppPins); - This->ppPins = NULL; + heap_free(This->sources); + This->sources = NULL; gst_element_set_bus(This->container, NULL); gst_object_unref(This->container); This->container = NULL; @@ -2317,10 +2318,10 @@ static BOOL avi_splitter_init_gst(struct gstdemux *filter) WaitForSingleObject(filter->no_more_pads_event, INFINITE); - gst_pad_query_duration(filter->ppPins[0]->their_src, GST_FORMAT_TIME, &duration); + gst_pad_query_duration(filter->sources[0]->their_src, GST_FORMAT_TIME, &duration); for (i = 0; i < filter->cStreams; ++i) { - struct gstdemux_source *pin = filter->ppPins[i]; + struct gstdemux_source *pin = filter->sources[i]; const HANDLE events[2] = {pin->caps_event, filter->error_event}; pin->seek.llDuration = pin->seek.llStop = duration / 100; -- 2.25.0

1 4

[PATCH 2/3] ddraw/tests: Don't use log2f to avoid mingwex dependency.
by Jacek Caban 24 Jan '20

24 Jan '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ddraw/tests/ddraw1.c | 2 +- dlls/ddraw/tests/ddraw2.c | 2 +- dlls/ddraw/tests/ddraw4.c | 2 +- dlls/ddraw/tests/ddraw7.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-)

3 2

[PATCH 1/5] ddraw/tests: Don't leak overlay if DWM cannot be disabled.
by Stefan Dösinger 24 Jan '20

24 Jan '20

This fixes test_caps on my GeForce 650M Windows 10 machine. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> --- There's a deeper problem with test_caps() though - that this leak causes it to fail is just a symptom. ddraw reports different caps after creating a surface, presumably because some internal plugins get loaded. So the results of test_caps() are potentially misleading. --- dlls/ddraw/tests/ddraw1.c | 3 ++- dlls/ddraw/tests/ddraw2.c | 3 ++- dlls/ddraw/tests/ddraw4.c | 3 ++- dlls/ddraw/tests/ddraw7.c | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index c10be66236a..26dd8140e4c 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -9478,10 +9478,11 @@ static void test_overlay_rect(void) ok(!pos_x, "Got unexpected pos_x %d.\n", pos_x); ok(!pos_y, "Got unexpected pos_y %d.\n", pos_y); - IDirectDrawSurface_Release(overlay); done: if (primary) IDirectDrawSurface_Release(primary); + if (overlay) + IDirectDrawSurface_Release(overlay); IDirectDraw_Release(ddraw); DestroyWindow(window); } diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 8d4d44863a1..8e37243e6c1 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -10180,10 +10180,11 @@ static void test_overlay_rect(void) ok(!pos_x, "Got unexpected pos_x %d.\n", pos_x); ok(!pos_y, "Got unexpected pos_y %d.\n", pos_y); - IDirectDrawSurface_Release(overlay); done: if (primary) IDirectDrawSurface_Release(primary); + if (overlay) + IDirectDrawSurface_Release(overlay); IDirectDraw2_Release(ddraw); DestroyWindow(window); } diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 1a16e2d571e..b6dbd63c885 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -12058,10 +12058,11 @@ static void test_overlay_rect(void) ok(!pos_x, "Got unexpected pos_x %d.\n", pos_x); ok(!pos_y, "Got unexpected pos_y %d.\n", pos_y); - IDirectDrawSurface4_Release(overlay); done: if (primary) IDirectDrawSurface4_Release(primary); + if (overlay) + IDirectDrawSurface4_Release(overlay); IDirectDraw4_Release(ddraw); DestroyWindow(window); } diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 20a1bc5f3af..be6aca2cec9 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -12049,10 +12049,11 @@ static void test_overlay_rect(void) ok(!pos_x, "Got unexpected pos_x %d.\n", pos_x); ok(!pos_y, "Got unexpected pos_y %d.\n", pos_y); - IDirectDrawSurface7_Release(overlay); done: if (primary) IDirectDrawSurface7_Release(primary); + if (overlay) + IDirectDrawSurface7_Release(overlay); IDirectDraw7_Release(ddraw); DestroyWindow(window); } -- 2.24.1

3 14

[PATCH v2 1/4] d3d9/tests: Test more formats in srgbtexture_test().
by Paul Gofman 24 Jan '20

24 Jan '20

Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- v2: - increase tolerance for some checks (those checks were falling out of tolerance when using fallback srgb read mode in Wine). dlls/d3d9/tests/visual.c | 395 ++++++++++++++++++++++----------------- 1 file changed, 227 insertions(+), 168 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 3d3597bdd1..196c3fa85f 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -3767,26 +3767,49 @@ done: static void fill_surface(IDirect3DSurface9 *surface, DWORD color, DWORD flags) { + unsigned int byte_count; D3DSURFACE_DESC desc; + unsigned int x, y; D3DLOCKED_RECT l; HRESULT hr; - unsigned int x, y; - DWORD *mem; + void *mem; memset(&desc, 0, sizeof(desc)); memset(&l, 0, sizeof(l)); hr = IDirect3DSurface9_GetDesc(surface, &desc); ok(hr == D3D_OK, "IDirect3DSurface9_GetDesc failed with %08x\n", hr); + + switch(desc.Format) + { + case D3DFMT_A8R8G8B8: + case D3DFMT_X8R8G8B8: + byte_count = 4; + break; + + case D3DFMT_A1R5G5B5: + case D3DFMT_X1R5G5B5: + case D3DFMT_R5G6B5: + byte_count = 2; + break; + + default: + ok(0, "Unsupported format %#x.\n", desc.Format); + return; + } + hr = IDirect3DSurface9_LockRect(surface, &l, NULL, flags); ok(hr == D3D_OK, "IDirect3DSurface9_LockRect failed with %08x\n", hr); if(FAILED(hr)) return; for(y = 0; y < desc.Height; y++) { - mem = (DWORD *) ((BYTE *) l.pBits + y * l.Pitch); - for(x = 0; x < l.Pitch / sizeof(DWORD); x++) + mem = (BYTE *)l.pBits + y * l.Pitch; + for(x = 0; x < l.Pitch / byte_count; ++x) { - mem[x] = color; + if (byte_count == 4) + ((DWORD *)mem)[x] = color; + else + ((WORD *)mem)[x] = color; } } hr = IDirect3DSurface9_UnlockRect(surface); @@ -8964,7 +8987,8 @@ static void srgbtexture_test(void) struct IDirect3DSurface9 *surface; IDirect3DDevice9 *device; IDirect3D9 *d3d; - D3DCOLOR color; + D3DCOLOR colour; + unsigned int i; ULONG refcount; HWND window; DWORD value; @@ -8977,6 +9001,25 @@ static void srgbtexture_test(void) 1.0f, -1.0f, 0.0f, 1.0f, 1.0f, 1.0f, 1.0f, 0.0f, 1.0f, 0.0f, }; + static const struct + { + D3DFORMAT format; + const char *format_name; + DWORD fill_colour1, fill_colour2; + DWORD fill_colour_rb1, fill_colour_rb2; + DWORD conv_colour1, conv_colour2; + } + tests[] = + { + {D3DFMT_A8R8G8B8, "A8R8G8B8", + 0xff7f7f7f, 0xff3f3f3f, 0x007f7f7f, 0x003f3f3f, 0x00363636, 0x000d0d0d}, + {D3DFMT_R5G6B5, "R5G6R5", + 0x7bef, 0x39e7, 0x007b7d7b, 0x003a3d3a, 0x00333433, 0x000a0c0a}, + {D3DFMT_A1R5G5B5, "A1R5G5R5", + 0xbdef, 0x9ce7, 0x007b7b7b, 0x003a3a3a, 0x00333433, 0x000a0a0a}, + {D3DFMT_X1R5G5B5, "X1R5G5R5", + 0x3def, 0x1ce7, 0x007b7b7b, 0x003a3a3a, 0x00333433, 0x000a0a0a}, + }; window = create_window(); d3d = Direct3DCreate9(D3D_SDK_VERSION); @@ -8987,179 +9030,195 @@ static void srgbtexture_test(void) goto done; } - if (IDirect3D9_CheckDeviceFormat(d3d, 0, D3DDEVTYPE_HAL, - D3DFMT_X8R8G8B8, D3DUSAGE_QUERY_SRGBREAD, D3DRTYPE_TEXTURE, D3DFMT_A8R8G8B8) != D3D_OK) + for (i = 0; i < ARRAY_SIZE(tests); ++i) { - skip("D3DFMT_A8R8G8B8 textures with SRGBREAD not supported.\n"); - IDirect3DDevice9_Release(device); - goto done; - } + if (IDirect3D9_CheckDeviceFormat(d3d, 0, D3DDEVTYPE_HAL, + D3DFMT_X8R8G8B8, D3DUSAGE_QUERY_SRGBREAD, D3DRTYPE_TEXTURE, tests[i].format) != D3D_OK) + { + skip("%s textures with SRGBREAD are not supported.\n", tests[i].format_name); + continue; + } - hr = IDirect3DDevice9_CreateTexture(device, 16, 16, 2, 0, D3DFMT_A8R8G8B8, D3DPOOL_MANAGED, &texture, NULL); - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - hr = IDirect3DTexture9_GetSurfaceLevel(texture, 0, &surface); - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - fill_surface(surface, 0xff7f7f7f, 0); - IDirect3DSurface9_Release(surface); - hr = IDirect3DTexture9_GetSurfaceLevel(texture, 1, &surface); - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - fill_surface(surface, 0xff3f3f3f, 0); - IDirect3DSurface9_Release(surface); + hr = IDirect3DDevice9_CreateTexture(device, 16, 16, 2, 0, tests[i].format, D3DPOOL_MANAGED, &texture, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DTexture9_GetSurfaceLevel(texture, 0, &surface); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + fill_surface(surface, tests[i].fill_colour1, 0); + IDirect3DSurface9_Release(surface); + hr = IDirect3DTexture9_GetSurfaceLevel(texture, 1, &surface); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + fill_surface(surface, tests[i].fill_colour2, 0); + IDirect3DSurface9_Release(surface); - hr = IDirect3DDevice9_SetRenderState(device, D3DRS_LIGHTING, FALSE); - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - hr = IDirect3DDevice9_SetTexture(device, 0, (IDirect3DBaseTexture9 *)texture); - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_LIGHTING, FALSE); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetTexture(device, 0, (IDirect3DBaseTexture9 *)texture); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - /* AMD uses the LSB of the D3DSAMP_SRGBTEXTURE value. - * NVIDIA ignores any values other than 0 and 1, leaving the previous - * D3DSAMP_SRGBTEXTURE state. - * Intel, WARP treat the value as boolean. */ - hr = IDirect3DDevice9_BeginScene(device); - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_SRGBTEXTURE, 0x7e41882a); - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - hr = IDirect3DDevice9_GetSamplerState(device, 0, D3DSAMP_SRGBTEXTURE, &value); - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - ok(value == 0x7e41882a, "Got unexpected value %#x.\n", value); - hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_TEX1); - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, 5 * sizeof(float)); - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - hr = IDirect3DDevice9_EndScene(device); - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - color = getPixelColor(device, 320, 240); - ok(color_match(color, 0x007f7f7f, 1) || broken(color_match(color, 0x00363636, 1)), - "Got unexpected color 0x%08x.\n", color); - hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + /* AMD uses the LSB of the D3DSAMP_SRGBTEXTURE value. + * NVIDIA ignores any values other than 0 and 1, leaving the previous + * D3DSAMP_SRGBTEXTURE state. + * Intel, WARP treat the value as boolean. */ + hr = IDirect3DDevice9_BeginScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_SRGBTEXTURE, 0x7e41882a); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_GetSamplerState(device, 0, D3DSAMP_SRGBTEXTURE, &value); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(value == 0x7e41882a, "Got unexpected value %#x.\n", value); + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_TEX1); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, 5 * sizeof(float)); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + colour = getPixelColor(device, 320, 240); + ok(color_match(colour, tests[i].fill_colour_rb1, 2) + || broken(color_match(colour, tests[i].conv_colour1, 1)), + "Format %s, got unexpected colour 0x%08x.\n", tests[i].format_name, colour); + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - hr = IDirect3DDevice9_BeginScene(device); - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_SRGBTEXTURE, 100); - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - hr = IDirect3DDevice9_GetSamplerState(device, 0, D3DSAMP_SRGBTEXTURE, &value); - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - ok(value == 100, "Got unexpected value %#x.\n", value); - hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, 5 * sizeof(float)); - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - hr = IDirect3DDevice9_EndScene(device); - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - color = getPixelColor(device, 320, 240); - ok(color_match(color, 0x007f7f7f, 1) || broken(color_match(color, 0x00363636, 1)), - "Got unexpected color 0x%08x.\n", color); - hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_BeginScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_SRGBTEXTURE, 100); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_GetSamplerState(device, 0, D3DSAMP_SRGBTEXTURE, &value); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(value == 100, "Got unexpected value %#x.\n", value); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, 5 * sizeof(float)); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + colour = getPixelColor(device, 320, 240); + ok(color_match(colour, tests[i].fill_colour_rb1, 2) + || broken(color_match(colour, tests[i].conv_colour1, 1)), + "Format %s, got unexpected colour 0x%08x.\n", tests[i].format_name, colour); + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - hr = IDirect3DDevice9_BeginScene(device); - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_SRGBTEXTURE, 2); - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - hr = IDirect3DDevice9_GetSamplerState(device, 0, D3DSAMP_SRGBTEXTURE, &value); - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - ok(value == 2, "Got unexpected value %#x.\n", value); - hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, 5 * sizeof(float)); - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - hr = IDirect3DDevice9_EndScene(device); - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - color = getPixelColor(device, 320, 240); - ok(color_match(color, 0x007f7f7f, 1) || broken(color_match(color, 0x00363636, 1)), - "Got unexpected color 0x%08x.\n", color); - hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_BeginScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_SRGBTEXTURE, 2); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_GetSamplerState(device, 0, D3DSAMP_SRGBTEXTURE, &value); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(value == 2, "Got unexpected value %#x.\n", value); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, 5 * sizeof(float)); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + colour = getPixelColor(device, 320, 240); + ok(color_match(colour, tests[i].fill_colour_rb1, 2) + || broken(color_match(colour, tests[i].conv_colour1, 1)), + "Format %s, got unexpected colour 0x%08x.\n", tests[i].format_name, colour); + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - hr = IDirect3DDevice9_BeginScene(device); - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_SRGBTEXTURE, 3); - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - hr = IDirect3DDevice9_GetSamplerState(device, 0, D3DSAMP_SRGBTEXTURE, &value); - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - ok(value == 3, "Got unexpected value %#x.\n", value); - hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, 5 * sizeof(float)); - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - hr = IDirect3DDevice9_EndScene(device); - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - color = getPixelColor(device, 320, 240); - ok(color_match(color, 0x007f7f7f, 1) || color_match(color, 0x00363636, 1), - "Got unexpected color 0x%08x.\n", color); - hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_BeginScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_SRGBTEXTURE, 3); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_GetSamplerState(device, 0, D3DSAMP_SRGBTEXTURE, &value); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(value == 3, "Got unexpected value %#x.\n", value); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, 5 * sizeof(float)); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + colour = getPixelColor(device, 320, 240); + ok(color_match(colour, tests[i].fill_colour_rb1, 2) + || color_match(colour, tests[i].conv_colour1, 3), + "Format %s, got unexpected colour 0x%08x.\n", tests[i].format_name, colour); + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - hr = IDirect3DDevice9_BeginScene(device); - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_SRGBTEXTURE, TRUE); - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - hr = IDirect3DDevice9_GetSamplerState(device, 0, D3DSAMP_SRGBTEXTURE, &value); - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - ok(value == TRUE, "Got unexpected value %#x.\n", value); - hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, 5 * sizeof(float)); - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - hr = IDirect3DDevice9_EndScene(device); - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - color = getPixelColor(device, 320, 240); - ok(color_match(color, 0x00363636, 1), "Got unexpected color 0x%08x.\n", color); - hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_BeginScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_SRGBTEXTURE, TRUE); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_GetSamplerState(device, 0, D3DSAMP_SRGBTEXTURE, &value); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(value == TRUE, "Got unexpected value %#x.\n", value); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, 5 * sizeof(float)); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + colour = getPixelColor(device, 320, 240); + ok(color_match(colour, tests[i].conv_colour1, 3), "Format %s, got unexpected colour 0x%08x.\n", + tests[i].format_name, colour); + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - hr = IDirect3DDevice9_BeginScene(device); - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - /* Set the other state to verify that the sampler just inherits old - * D3DSAMP_SRGBTEXTURE but * the old sampler is not preserved entirely on - * NVIDIA. */ - hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_SRGBTEXTURE, 0x7e41882a); - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - hr = IDirect3DDevice9_GetSamplerState(device, 0, D3DSAMP_SRGBTEXTURE, &value); - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - ok(value == 0x7e41882a, "Got unexpected value %#x.\n", value); - hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_MIPFILTER, D3DTEXF_POINT); - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_MAXMIPLEVEL, 1); - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, 5 * sizeof(float)); - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - hr = IDirect3DDevice9_EndScene(device); - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - color = getPixelColor(device, 320, 240); - ok(color_match(color, 0x000d0d0d, 1) || color_match(color, 0x003f3f3f, 1), - "Got unexpected color 0x%08x.\n", color); - hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_BeginScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + /* Set the other state to verify that the sampler just inherits old + * D3DSAMP_SRGBTEXTURE but the old sampler is not preserved entirely on + * NVIDIA. */ + hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_SRGBTEXTURE, 0x7e41882a); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_GetSamplerState(device, 0, D3DSAMP_SRGBTEXTURE, &value); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(value == 0x7e41882a, "Got unexpected value %#x.\n", value); + hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_MIPFILTER, D3DTEXF_POINT); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_MAXMIPLEVEL, 1); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, 5 * sizeof(float)); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + colour = getPixelColor(device, 320, 240); + ok(color_match(colour, tests[i].conv_colour2, 1) + || color_match(colour, tests[i].fill_colour_rb2, 2), + "Format %s, got unexpected colour 0x%08x.\n", tests[i].format_name, colour); + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - hr = IDirect3DDevice9_BeginScene(device); - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_SRGBTEXTURE, 0); - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - hr = IDirect3DDevice9_GetSamplerState(device, 0, D3DSAMP_SRGBTEXTURE, &value); - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - ok(value == 0, "Got unexpected value %#x.\n", value); - hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, 5 * sizeof(float)); - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - hr = IDirect3DDevice9_EndScene(device); - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - color = getPixelColor(device, 320, 240); - ok(color_match(color, 0x003f3f3f, 1), "Got unexpected color 0x%08x.\n", color); - hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_BeginScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_SRGBTEXTURE, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_GetSamplerState(device, 0, D3DSAMP_SRGBTEXTURE, &value); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(value == 0, "Got unexpected value %#x.\n", value); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, 5 * sizeof(float)); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + colour = getPixelColor(device, 320, 240); + ok(color_match(colour, tests[i].fill_colour_rb2, 2), + "Format %s, got unexpected colour 0x%08x.\n", tests[i].format_name, colour); + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice9_BeginScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_SRGBTEXTURE, 0x7e41882a); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_GetSamplerState(device, 0, D3DSAMP_SRGBTEXTURE, &value); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(value == 0x7e41882a, "Got unexpected value %#x.\n", value); + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_TEX1); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, 5 * sizeof(float)); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + colour = getPixelColor(device, 320, 240); + ok(color_match(colour, tests[i].fill_colour_rb2, 2) + || broken(color_match(colour, tests[i].conv_colour2, 1)), + "Format %s, got unexpected colour 0x%08x.\n", tests[i].format_name, colour); + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + IDirect3DTexture9_Release(texture); + + hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_SRGBTEXTURE, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_MAXMIPLEVEL, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + } - hr = IDirect3DDevice9_BeginScene(device); - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_SRGBTEXTURE, 0x7e41882a); - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - hr = IDirect3DDevice9_GetSamplerState(device, 0, D3DSAMP_SRGBTEXTURE, &value); - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - ok(value == 0x7e41882a, "Got unexpected value %#x.\n", value); - hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_TEX1); - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, 5 * sizeof(float)); - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - hr = IDirect3DDevice9_EndScene(device); - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - color = getPixelColor(device, 320, 240); - ok(color_match(color, 0x003f3f3f, 1) || broken(color_match(color, 0x000d0d0d, 1)), - "Got unexpected color 0x%08x.\n", color); - hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - IDirect3DTexture9_Release(texture); refcount = IDirect3DDevice9_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); done: -- 2.24.1

3 5

[PATCH 1/4] d3d9/tests: Test more formats in srgbtexture_test().
by Paul Gofman 24 Jan '20

24 Jan '20

Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- dlls/d3d9/tests/visual.c | 395 ++++++++++++++++++++++----------------- 1 file changed, 227 insertions(+), 168 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 6b3466ece5..31b05f7501 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -3767,26 +3767,49 @@ done: static void fill_surface(IDirect3DSurface9 *surface, DWORD color, DWORD flags) { + unsigned int byte_count; D3DSURFACE_DESC desc; + unsigned int x, y; D3DLOCKED_RECT l; HRESULT hr; - unsigned int x, y; - DWORD *mem; + void *mem; memset(&desc, 0, sizeof(desc)); memset(&l, 0, sizeof(l)); hr = IDirect3DSurface9_GetDesc(surface, &desc); ok(hr == D3D_OK, "IDirect3DSurface9_GetDesc failed with %08x\n", hr); + + switch(desc.Format) + { + case D3DFMT_A8R8G8B8: + case D3DFMT_X8R8G8B8: + byte_count = 4; + break; + + case D3DFMT_A1R5G5B5: + case D3DFMT_X1R5G5B5: + case D3DFMT_R5G6B5: + byte_count = 2; + break; + + default: + ok(0, "Unsupported format %#x.\n", desc.Format); + return; + } + hr = IDirect3DSurface9_LockRect(surface, &l, NULL, flags); ok(hr == D3D_OK, "IDirect3DSurface9_LockRect failed with %08x\n", hr); if(FAILED(hr)) return; for(y = 0; y < desc.Height; y++) { - mem = (DWORD *) ((BYTE *) l.pBits + y * l.Pitch); - for(x = 0; x < l.Pitch / sizeof(DWORD); x++) + mem = (BYTE *)l.pBits + y * l.Pitch; + for(x = 0; x < l.Pitch / byte_count; ++x) { - mem[x] = color; + if (byte_count == 4) + ((DWORD *)mem)[x] = color; + else + ((WORD *)mem)[x] = color; } } hr = IDirect3DSurface9_UnlockRect(surface); @@ -8964,7 +8987,8 @@ static void srgbtexture_test(void) struct IDirect3DSurface9 *surface; IDirect3DDevice9 *device; IDirect3D9 *d3d; - D3DCOLOR color; + D3DCOLOR colour; + unsigned int i; ULONG refcount; HWND window; DWORD value; @@ -8977,6 +9001,25 @@ static void srgbtexture_test(void) 1.0f, -1.0f, 0.0f, 1.0f, 1.0f, 1.0f, 1.0f, 0.0f, 1.0f, 0.0f, }; + static const struct + { + D3DFORMAT format; + const char *format_name; + DWORD fill_colour1, fill_colour2; + DWORD fill_colour_rb1, fill_colour_rb2; + DWORD conv_colour1, conv_colour2; + } + tests[] = + { + {D3DFMT_A8R8G8B8, "A8R8G8B8", + 0xff7f7f7f, 0xff3f3f3f, 0x007f7f7f, 0x003f3f3f, 0x00363636, 0x000d0d0d}, + {D3DFMT_R5G6B5, "R5G6R5", + 0x7bef, 0x39e7, 0x007b7d7b, 0x003a3d3a, 0x00333433, 0x000a0c0a}, + {D3DFMT_A1R5G5B5, "A1R5G5R5", + 0xbdef, 0x9ce7, 0x007b7b7b, 0x003a3a3a, 0x00333433, 0x000a0a0a}, + {D3DFMT_X1R5G5B5, "X1R5G5R5", + 0x3def, 0x1ce7, 0x007b7b7b, 0x003a3a3a, 0x00333433, 0x000a0a0a}, + }; window = create_window(); d3d = Direct3DCreate9(D3D_SDK_VERSION); @@ -8987,179 +9030,195 @@ static void srgbtexture_test(void) goto done; } - if (IDirect3D9_CheckDeviceFormat(d3d, 0, D3DDEVTYPE_HAL, - D3DFMT_X8R8G8B8, D3DUSAGE_QUERY_SRGBREAD, D3DRTYPE_TEXTURE, D3DFMT_A8R8G8B8) != D3D_OK) + for (i = 0; i < ARRAY_SIZE(tests); ++i) { - skip("D3DFMT_A8R8G8B8 textures with SRGBREAD not supported.\n"); - IDirect3DDevice9_Release(device); - goto done; - } + if (IDirect3D9_CheckDeviceFormat(d3d, 0, D3DDEVTYPE_HAL, + D3DFMT_X8R8G8B8, D3DUSAGE_QUERY_SRGBREAD, D3DRTYPE_TEXTURE, tests[i].format) != D3D_OK) + { + skip("%s textures with SRGBREAD are not supported.\n", tests[i].format_name); + continue; + } - hr = IDirect3DDevice9_CreateTexture(device, 16, 16, 2, 0, D3DFMT_A8R8G8B8, D3DPOOL_MANAGED, &texture, NULL); - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - hr = IDirect3DTexture9_GetSurfaceLevel(texture, 0, &surface); - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - fill_surface(surface, 0xff7f7f7f, 0); - IDirect3DSurface9_Release(surface); - hr = IDirect3DTexture9_GetSurfaceLevel(texture, 1, &surface); - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - fill_surface(surface, 0xff3f3f3f, 0); - IDirect3DSurface9_Release(surface); + hr = IDirect3DDevice9_CreateTexture(device, 16, 16, 2, 0, tests[i].format, D3DPOOL_MANAGED, &texture, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DTexture9_GetSurfaceLevel(texture, 0, &surface); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + fill_surface(surface, tests[i].fill_colour1, 0); + IDirect3DSurface9_Release(surface); + hr = IDirect3DTexture9_GetSurfaceLevel(texture, 1, &surface); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + fill_surface(surface, tests[i].fill_colour2, 0); + IDirect3DSurface9_Release(surface); - hr = IDirect3DDevice9_SetRenderState(device, D3DRS_LIGHTING, FALSE); - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - hr = IDirect3DDevice9_SetTexture(device, 0, (IDirect3DBaseTexture9 *)texture); - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_LIGHTING, FALSE); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetTexture(device, 0, (IDirect3DBaseTexture9 *)texture); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - /* AMD uses the LSB of the D3DSAMP_SRGBTEXTURE value. - * NVIDIA ignores any values other than 0 and 1, leaving the previous - * D3DSAMP_SRGBTEXTURE state. - * Intel, WARP treat the value as boolean. */ - hr = IDirect3DDevice9_BeginScene(device); - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_SRGBTEXTURE, 0x7e41882a); - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - hr = IDirect3DDevice9_GetSamplerState(device, 0, D3DSAMP_SRGBTEXTURE, &value); - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - ok(value == 0x7e41882a, "Got unexpected value %#x.\n", value); - hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_TEX1); - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, 5 * sizeof(float)); - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - hr = IDirect3DDevice9_EndScene(device); - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - color = getPixelColor(device, 320, 240); - ok(color_match(color, 0x007f7f7f, 1) || broken(color_match(color, 0x00363636, 1)), - "Got unexpected color 0x%08x.\n", color); - hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + /* AMD uses the LSB of the D3DSAMP_SRGBTEXTURE value. + * NVIDIA ignores any values other than 0 and 1, leaving the previous + * D3DSAMP_SRGBTEXTURE state. + * Intel, WARP treat the value as boolean. */ + hr = IDirect3DDevice9_BeginScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_SRGBTEXTURE, 0x7e41882a); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_GetSamplerState(device, 0, D3DSAMP_SRGBTEXTURE, &value); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(value == 0x7e41882a, "Got unexpected value %#x.\n", value); + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_TEX1); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, 5 * sizeof(float)); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + colour = getPixelColor(device, 320, 240); + ok(color_match(colour, tests[i].fill_colour_rb1, 1) + || broken(color_match(colour, tests[i].conv_colour1, 1)), + "Format %s, got unexpected colour 0x%08x.\n", tests[i].format_name, colour); + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - hr = IDirect3DDevice9_BeginScene(device); - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_SRGBTEXTURE, 100); - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - hr = IDirect3DDevice9_GetSamplerState(device, 0, D3DSAMP_SRGBTEXTURE, &value); - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - ok(value == 100, "Got unexpected value %#x.\n", value); - hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, 5 * sizeof(float)); - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - hr = IDirect3DDevice9_EndScene(device); - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - color = getPixelColor(device, 320, 240); - ok(color_match(color, 0x007f7f7f, 1) || broken(color_match(color, 0x00363636, 1)), - "Got unexpected color 0x%08x.\n", color); - hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_BeginScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_SRGBTEXTURE, 100); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_GetSamplerState(device, 0, D3DSAMP_SRGBTEXTURE, &value); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(value == 100, "Got unexpected value %#x.\n", value); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, 5 * sizeof(float)); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + colour = getPixelColor(device, 320, 240); + ok(color_match(colour, tests[i].fill_colour_rb1, 1) + || broken(color_match(colour, tests[i].conv_colour1, 1)), + "Format %s, got unexpected colour 0x%08x.\n", tests[i].format_name, colour); + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - hr = IDirect3DDevice9_BeginScene(device); - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_SRGBTEXTURE, 2); - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - hr = IDirect3DDevice9_GetSamplerState(device, 0, D3DSAMP_SRGBTEXTURE, &value); - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - ok(value == 2, "Got unexpected value %#x.\n", value); - hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, 5 * sizeof(float)); - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - hr = IDirect3DDevice9_EndScene(device); - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - color = getPixelColor(device, 320, 240); - ok(color_match(color, 0x007f7f7f, 1) || broken(color_match(color, 0x00363636, 1)), - "Got unexpected color 0x%08x.\n", color); - hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_BeginScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_SRGBTEXTURE, 2); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_GetSamplerState(device, 0, D3DSAMP_SRGBTEXTURE, &value); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(value == 2, "Got unexpected value %#x.\n", value); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, 5 * sizeof(float)); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + colour = getPixelColor(device, 320, 240); + ok(color_match(colour, tests[i].fill_colour_rb1, 1) + || broken(color_match(colour, tests[i].conv_colour1, 1)), + "Format %s, got unexpected colour 0x%08x.\n", tests[i].format_name, colour); + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - hr = IDirect3DDevice9_BeginScene(device); - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_SRGBTEXTURE, 3); - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - hr = IDirect3DDevice9_GetSamplerState(device, 0, D3DSAMP_SRGBTEXTURE, &value); - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - ok(value == 3, "Got unexpected value %#x.\n", value); - hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, 5 * sizeof(float)); - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - hr = IDirect3DDevice9_EndScene(device); - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - color = getPixelColor(device, 320, 240); - ok(color_match(color, 0x007f7f7f, 1) || color_match(color, 0x00363636, 1), - "Got unexpected color 0x%08x.\n", color); - hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_BeginScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_SRGBTEXTURE, 3); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_GetSamplerState(device, 0, D3DSAMP_SRGBTEXTURE, &value); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(value == 3, "Got unexpected value %#x.\n", value); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, 5 * sizeof(float)); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + colour = getPixelColor(device, 320, 240); + ok(color_match(colour, tests[i].fill_colour_rb1, 1) + || color_match(colour, tests[i].conv_colour1, 1), + "Format %s, got unexpected colour 0x%08x.\n", tests[i].format_name, colour); + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - hr = IDirect3DDevice9_BeginScene(device); - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_SRGBTEXTURE, TRUE); - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - hr = IDirect3DDevice9_GetSamplerState(device, 0, D3DSAMP_SRGBTEXTURE, &value); - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - ok(value == TRUE, "Got unexpected value %#x.\n", value); - hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, 5 * sizeof(float)); - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - hr = IDirect3DDevice9_EndScene(device); - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - color = getPixelColor(device, 320, 240); - ok(color_match(color, 0x00363636, 1), "Got unexpected color 0x%08x.\n", color); - hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_BeginScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_SRGBTEXTURE, TRUE); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_GetSamplerState(device, 0, D3DSAMP_SRGBTEXTURE, &value); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(value == TRUE, "Got unexpected value %#x.\n", value); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, 5 * sizeof(float)); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + colour = getPixelColor(device, 320, 240); + ok(color_match(colour, tests[i].conv_colour1, 1), "Format %s, got unexpected colour 0x%08x.\n", + tests[i].format_name, colour); + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - hr = IDirect3DDevice9_BeginScene(device); - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - /* Set the other state to verify that the sampler just inherits old - * D3DSAMP_SRGBTEXTURE but * the old sampler is not preserved entirely on - * NVIDIA. */ - hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_SRGBTEXTURE, 0x7e41882a); - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - hr = IDirect3DDevice9_GetSamplerState(device, 0, D3DSAMP_SRGBTEXTURE, &value); - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - ok(value == 0x7e41882a, "Got unexpected value %#x.\n", value); - hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_MIPFILTER, D3DTEXF_POINT); - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_MAXMIPLEVEL, 1); - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, 5 * sizeof(float)); - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - hr = IDirect3DDevice9_EndScene(device); - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - color = getPixelColor(device, 320, 240); - ok(color_match(color, 0x000d0d0d, 1) || color_match(color, 0x003f3f3f, 1), - "Got unexpected color 0x%08x.\n", color); - hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_BeginScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + /* Set the other state to verify that the sampler just inherits old + * D3DSAMP_SRGBTEXTURE but the old sampler is not preserved entirely on + * NVIDIA. */ + hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_SRGBTEXTURE, 0x7e41882a); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_GetSamplerState(device, 0, D3DSAMP_SRGBTEXTURE, &value); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(value == 0x7e41882a, "Got unexpected value %#x.\n", value); + hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_MIPFILTER, D3DTEXF_POINT); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_MAXMIPLEVEL, 1); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, 5 * sizeof(float)); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + colour = getPixelColor(device, 320, 240); + ok(color_match(colour, tests[i].conv_colour2, 1) + || color_match(colour, tests[i].fill_colour_rb2, 1), + "Format %s, got unexpected colour 0x%08x.\n", tests[i].format_name, colour); + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - hr = IDirect3DDevice9_BeginScene(device); - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_SRGBTEXTURE, 0); - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - hr = IDirect3DDevice9_GetSamplerState(device, 0, D3DSAMP_SRGBTEXTURE, &value); - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - ok(value == 0, "Got unexpected value %#x.\n", value); - hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, 5 * sizeof(float)); - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - hr = IDirect3DDevice9_EndScene(device); - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - color = getPixelColor(device, 320, 240); - ok(color_match(color, 0x003f3f3f, 1), "Got unexpected color 0x%08x.\n", color); - hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_BeginScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_SRGBTEXTURE, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_GetSamplerState(device, 0, D3DSAMP_SRGBTEXTURE, &value); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(value == 0, "Got unexpected value %#x.\n", value); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, 5 * sizeof(float)); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + colour = getPixelColor(device, 320, 240); + ok(color_match(colour, tests[i].fill_colour_rb2, 1), + "Format %s, got unexpected colour 0x%08x.\n", tests[i].format_name, colour); + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice9_BeginScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_SRGBTEXTURE, 0x7e41882a); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_GetSamplerState(device, 0, D3DSAMP_SRGBTEXTURE, &value); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(value == 0x7e41882a, "Got unexpected value %#x.\n", value); + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_TEX1); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, 5 * sizeof(float)); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + colour = getPixelColor(device, 320, 240); + ok(color_match(colour, tests[i].fill_colour_rb2, 1) + || broken(color_match(colour, tests[i].conv_colour2, 1)), + "Format %s, got unexpected colour 0x%08x.\n", tests[i].format_name, colour); + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + IDirect3DTexture9_Release(texture); + + hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_SRGBTEXTURE, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_MAXMIPLEVEL, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + } - hr = IDirect3DDevice9_BeginScene(device); - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_SRGBTEXTURE, 0x7e41882a); - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - hr = IDirect3DDevice9_GetSamplerState(device, 0, D3DSAMP_SRGBTEXTURE, &value); - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - ok(value == 0x7e41882a, "Got unexpected value %#x.\n", value); - hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_TEX1); - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, 5 * sizeof(float)); - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - hr = IDirect3DDevice9_EndScene(device); - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - color = getPixelColor(device, 320, 240); - ok(color_match(color, 0x003f3f3f, 1) || broken(color_match(color, 0x000d0d0d, 1)), - "Got unexpected color 0x%08x.\n", color); - hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - IDirect3DTexture9_Release(texture); refcount = IDirect3DDevice9_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); done: -- 2.24.1

4 19

[PATCH] msxml3/tests: Fix copy & paste in traces.
by Daniel Lehman 24 Jan '20

24 Jan '20

Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> --- dlls/msxml3/tests/domdoc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 915d802517..b882f644bb 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -2221,7 +2221,7 @@ static void test_domnode( void ) ok(r == E_INVALIDARG, "get_nodeValue ret %08x\n", r ); r = IXMLDOMDocument_get_nodeValue( doc, &var ); - ok( r == S_FALSE, "nextNode returned wrong code\n"); + ok( r == S_FALSE, "get_nodeValue returned wrong code\n"); ok( V_VT(&var) == VT_NULL, "variant wasn't empty\n"); ok( V_BSTR(&var) == NULL, "variant value wasn't null\n"); @@ -2391,7 +2391,7 @@ static void test_domnode( void ) { type = NODE_INVALID; r = IXMLDOMNode_get_nodeType( node, &type); - ok( r == S_OK, "getNamedItem returned wrong code\n"); + ok( r == S_OK, "get_nodeType returned wrong code\n"); ok( type == NODE_ATTRIBUTE, "node not an attribute\n"); str = NULL; @@ -2424,7 +2424,7 @@ static void test_domnode( void ) type = NODE_INVALID; r = IXMLDOMNode_get_nodeType( next, &type); - ok( r == S_OK, "getNamedItem returned wrong code\n"); + ok( r == S_OK, "get_nodeType returned wrong code\n"); ok( type == NODE_TEXT, "node not text\n"); str = (void *)0xdeadbeef; @@ -2513,7 +2513,7 @@ static void test_domnode( void ) { type = NODE_INVALID; r = IXMLDOMNode_get_nodeType( node, &type); - ok( r == S_OK, "getNamedItem returned wrong code\n"); + ok( r == S_OK, "get_nodeType returned wrong code\n"); ok( type == NODE_ELEMENT, "node not text\n"); r = IXMLDOMNode_hasChildNodes( node, NULL ); -- 2.17.1

2 1

[PATCH v2 2/2] msado15: Implement _Connection get/put ConnectionString
by Alistair Leslie-Hughes 24 Jan '20

24 Jan '20

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msado15/connection.c | 14 ++++++++++---- dlls/msado15/tests/msado15.c | 11 +++++++++++ 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/dlls/msado15/connection.c b/dlls/msado15/connection.c index 73b225628c..e74fcd6c02 100644 --- a/dlls/msado15/connection.c +++ b/dlls/msado15/connection.c @@ -37,6 +37,7 @@ struct connection LONG refs; ObjectStateEnum state; LONG timeout; + BSTR datasource; }; static inline struct connection *impl_from_Connection( _Connection *iface ) @@ -62,6 +63,7 @@ static ULONG WINAPI connection_Release( _Connection *iface ) if (!refs) { TRACE( "destroying %p\n", connection ); + SysFreeString(connection->datasource); heap_free( connection ); } return refs; @@ -125,14 +127,18 @@ static HRESULT WINAPI connection_get_Properties( _Connection *iface, Properties static HRESULT WINAPI connection_get_ConnectionString( _Connection *iface, BSTR *str ) { - FIXME( "%p, %p\n", iface, str ); - return E_NOTIMPL; + struct connection *connection = impl_from_Connection( iface ); + TRACE( "%p, %p\n", connection, str ); + *str = SysAllocString(connection->datasource); + return S_OK; } static HRESULT WINAPI connection_put_ConnectionString( _Connection *iface, BSTR str ) { - FIXME( "%p, %s\n", iface, debugstr_w(str) ); - return E_NOTIMPL; + struct connection *connection = impl_from_Connection( iface ); + TRACE( "%p, %s\n", connection, debugstr_w(str) ); + connection->datasource = SysAllocString(str); + return S_OK; } static HRESULT WINAPI connection_get_CommandTimeout( _Connection *iface, LONG *timeout ) diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index afdf0dfb6a..e77eaa3633 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -661,6 +661,7 @@ static void test_Connection(void) IRunnableObject *runtime; ISupportErrorInfo *errorinfo; LONG state, timeout; + BSTR connect1, connect2; hr = CoCreateInstance(&CLSID_Connection, NULL, CLSCTX_INPROC_SERVER, &IID__Connection, (void**)&connection); ok( hr == S_OK, "got %08x\n", hr ); @@ -696,6 +697,16 @@ if (0) /* Crashes on windows */ ok(hr == S_OK, "Failed to get state, hr 0x%08x\n", hr); ok(timeout == 300, "Unexpected timeout value %d\n", timeout); + connect1 = SysAllocString(L"Provider=MSDASQL.1;Persist Security Info=False;Data Source=wine_test"); + hr = _Connection_put_ConnectionString(connection, connect1); + ok(hr == S_OK, "Failed, hr 0x%08x\n", hr); + + hr = _Connection_get_ConnectionString(connection, &connect2); + ok(hr == S_OK, "Failed, hr 0x%08x\n", hr); + ok(wcscmp(connect1, connect2) == 0, "wrong string %s\n", wine_dbgstr_w(connect2)); + SysFreeString(connect1); + SysFreeString(connect2); + _Connection_Release(connection); } -- 2.24.1

1 0

[PATCH v2 1/2] include: Register all ADODB interfaces
by Alistair Leslie-Hughes 24 Jan '20

24 Jan '20

--- include/msado15_backcompat.idl | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/include/msado15_backcompat.idl b/include/msado15_backcompat.idl index e4a847ab85..a813b80bf7 100644 --- a/include/msado15_backcompat.idl +++ b/include/msado15_backcompat.idl @@ -50,6 +50,14 @@ interface Recordset21; dispinterface ConnectionEvents; dispinterface RecordsetEvents; +[ + uuid(2a75196c-d9eb-4129-b803-931327f72d5c), + version(2.8) +] +library ADODB +{ + importlib("stdole2.tlb"); + typedef [uuid(0000052A-0000-0010-8000-00AA006D2EA4)] enum ErrorValueEnum { adErrInvalidArgument = 3001, @@ -2044,14 +2052,6 @@ interface ADORecordsetConstruction : IDispatch [in] IUnknown *row_pos); }; -[ - uuid(2a75196c-d9eb-4129-b803-931327f72d5c), - version(2.8) -] -library ADODB -{ - importlib("stdole2.tlb"); - [ uuid(00000514-0000-0010-8000-00aa006d2ea4), ] -- 2.24.1

1 0

[PATCH v2 1/2] include: Add XACTENGINE_* error codes
by Alistair Leslie-Hughes 24 Jan '20

24 Jan '20

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/xact3.idl | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/include/xact3.idl b/include/xact3.idl index 7743d131f6..a77afff6d4 100644 --- a/include/xact3.idl +++ b/include/xact3.idl @@ -572,3 +572,49 @@ interface IXACT3Wave HRESULT GetProperties([out] XACT_WAVE_INSTANCE_PROPERTIES *pProperties); } + +cpp_quote("#define FACILITY_XACTENGINE 0xAC7") +cpp_quote("#define XACTENGINEERROR(n) MAKE_HRESULT(SEVERITY_ERROR, FACILITY_XACTENGINE, n)") + +cpp_quote("#define XACTENGINE_E_OUTOFMEMORY E_OUTOFMEMORY") +cpp_quote("#define XACTENGINE_E_INVALIDARG E_INVALIDARG") +cpp_quote("#define XACTENGINE_E_NOTIMPL E_NOTIMPL") +cpp_quote("#define XACTENGINE_E_FAIL E_FAIL") + +cpp_quote("#define XACTENGINE_E_ALREADYINITIALIZED XACTENGINEERROR(0x001)") +cpp_quote("#define XACTENGINE_E_NOTINITIALIZED XACTENGINEERROR(0x002)") +cpp_quote("#define XACTENGINE_E_EXPIRED XACTENGINEERROR(0x003)") +cpp_quote("#define XACTENGINE_E_NONOTIFICATIONCALLBACK XACTENGINEERROR(0x004)") +cpp_quote("#define XACTENGINE_E_NOTIFICATIONREGISTERED XACTENGINEERROR(0x005)") +cpp_quote("#define XACTENGINE_E_INVALIDUSAGE XACTENGINEERROR(0x006)") +cpp_quote("#define XACTENGINE_E_INVALIDDATA XACTENGINEERROR(0x007)") +cpp_quote("#define XACTENGINE_E_INSTANCELIMITFAILTOPLAY XACTENGINEERROR(0x008)") +cpp_quote("#define XACTENGINE_E_NOGLOBALSETTINGS XACTENGINEERROR(0x009)") +cpp_quote("#define XACTENGINE_E_INVALIDVARIABLEINDEX XACTENGINEERROR(0x00a)") +cpp_quote("#define XACTENGINE_E_INVALIDCATEGORY XACTENGINEERROR(0x00b)") +cpp_quote("#define XACTENGINE_E_INVALIDCUEINDEX XACTENGINEERROR(0x00c)") +cpp_quote("#define XACTENGINE_E_INVALIDWAVEINDEX XACTENGINEERROR(0x00d)") +cpp_quote("#define XACTENGINE_E_INVALIDTRACKINDEX XACTENGINEERROR(0x00e)") +cpp_quote("#define XACTENGINE_E_INVALIDSOUNDOFFSETORINDEX XACTENGINEERROR(0x00f)") +cpp_quote("#define XACTENGINE_E_READFILE XACTENGINEERROR(0x010)") +cpp_quote("#define XACTENGINE_E_UNKNOWNEVENT XACTENGINEERROR(0x011)") +cpp_quote("#define XACTENGINE_E_INCALLBACK XACTENGINEERROR(0x012)") +cpp_quote("#define XACTENGINE_E_NOWAVEBANK XACTENGINEERROR(0x013)") +cpp_quote("#define XACTENGINE_E_SELECTVARIATION XACTENGINEERROR(0x014)") +cpp_quote("#define XACTENGINE_E_MULTIPLEAUDITIONENGINES XACTENGINEERROR(0x015)") +cpp_quote("#define XACTENGINE_E_WAVEBANKNOTPREPARED XACTENGINEERROR(0x016)") +cpp_quote("#define XACTENGINE_E_NORENDERER XACTENGINEERROR(0x017)") +cpp_quote("#define XACTENGINE_E_INVALIDENTRYCOUNT XACTENGINEERROR(0x018)") +cpp_quote("#define XACTENGINE_E_SEEKTIMEBEYONDCUEEND XACTENGINEERROR(0x019)") +cpp_quote("#define XACTENGINE_E_SEEKTIMEBEYONDWAVEEND XACTENGINEERROR(0x01a)") +cpp_quote("#define XACTENGINE_E_NOFRIENDLYNAMES XACTENGINEERROR(0x01b)") + +cpp_quote("#define XACTENGINE_E_AUDITION_WRITEFILE XACTENGINEERROR(0x101)") +cpp_quote("#define XACTENGINE_E_AUDITION_NOSOUNDBANK XACTENGINEERROR(0x102)") +cpp_quote("#define XACTENGINE_E_AUDITION_INVALIDRPCINDEX XACTENGINEERROR(0x103)") +cpp_quote("#define XACTENGINE_E_AUDITION_MISSINGDATA XACTENGINEERROR(0x104)") +cpp_quote("#define XACTENGINE_E_AUDITION_UNKNOWNCOMMAND XACTENGINEERROR(0x105)") +cpp_quote("#define XACTENGINE_E_AUDITION_INVALIDDSPINDEX XACTENGINEERROR(0x106)") +cpp_quote("#define XACTENGINE_E_AUDITION_MISSINGWAVE XACTENGINEERROR(0x107)") +cpp_quote("#define XACTENGINE_E_AUDITION_CREATEDIRECTORYFAILED XACTENGINEERROR(0x108)") +cpp_quote("#define XACTENGINE_E_AUDITION_INVALIDSESSION XACTENGINEERROR(0x109)") -- 2.24.1

1 1

[PATCH 3/3] msado15: Implement _Connection get/put ConnectionString
by Alistair Leslie-Hughes 24 Jan '20

24 Jan '20

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msado15/connection.c | 14 ++++++++++---- dlls/msado15/tests/msado15.c | 11 +++++++++++ 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/dlls/msado15/connection.c b/dlls/msado15/connection.c index b267fc08c0..6fecb72615 100644 --- a/dlls/msado15/connection.c +++ b/dlls/msado15/connection.c @@ -37,6 +37,7 @@ struct connection LONG refs; ObjectStateEnum state; LONG timeout; + BSTR datasource; }; static inline struct connection *impl_from_Connection( _Connection *iface ) @@ -62,6 +63,7 @@ static ULONG WINAPI connection_Release( _Connection *iface ) if (!refs) { TRACE( "destroying %p\n", connection ); + SysFreeString(connection->datasource); heap_free( connection ); } return refs; @@ -135,14 +137,18 @@ static HRESULT WINAPI connection_get_Properties( _Connection *iface, Properties static HRESULT WINAPI connection_get_ConnectionString( _Connection *iface, BSTR *str ) { - FIXME( "%p, %p\n", iface, str ); - return E_NOTIMPL; + struct connection *connection = impl_from_Connection( iface ); + TRACE( "%p, %p\n", connection, str ); + *str = SysAllocString(connection->datasource); + return S_OK; } static HRESULT WINAPI connection_put_ConnectionString( _Connection *iface, BSTR str ) { - FIXME( "%p, %s\n", iface, debugstr_w(str) ); - return E_NOTIMPL; + struct connection *connection = impl_from_Connection( iface ); + TRACE( "%p, %s\n", connection, debugstr_w(str) ); + connection->datasource = SysAllocString(str); + return S_OK; } static HRESULT WINAPI connection_get_CommandTimeout( _Connection *iface, LONG *timeout ) diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index 17be9e4f14..431566f0bf 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -663,6 +663,7 @@ static void test_Connection(void) IMarshal *marshal; IExternalConnection *external; LONG state, timeout; + BSTR connect1, connect2; hr = CoCreateInstance(&CLSID_Connection, NULL, CLSCTX_INPROC_SERVER, &IID__Connection, (void**)&connection); ok( hr == S_OK, "got %08x\n", hr ); @@ -704,6 +705,16 @@ if (0) /* Crashes on windows */ ok(hr == S_OK, "Failed to get state, hr 0x%08x\n", hr); ok(timeout == 300, "Unexpected timeout value %d\n", timeout); + connect1 = SysAllocString(L"Provider=MSDASQL.1;Persist Security Info=False;Data Source=wine_test"); + hr = _Connection_put_ConnectionString(connection, connect1); + ok(hr == S_OK, "Failed, hr 0x%08x\n", hr); + + hr = _Connection_get_ConnectionString(connection, &connect2); + ok(hr == S_OK, "Failed, hr 0x%08x\n", hr); + ok(wcscmp(connect1, connect2) == 0, "wrong string %s\n", wine_dbgstr_w(connect2)); + SysFreeString(connect1); + SysFreeString(connect2); + _Connection_Release(connection); } -- 2.24.1

2 1

[PATCH v2 2/2] include: Add XACT defines
by Alistair Leslie-Hughes 24 Jan '20

24 Jan '20

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/xact3.idl | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/include/xact3.idl b/include/xact3.idl index a77afff6d4..cfa9e00fdc 100644 --- a/include/xact3.idl +++ b/include/xact3.idl @@ -19,6 +19,9 @@ import "unknwn.idl"; import "xaudio2.idl"; +cpp_quote("#include <limits.h>") +cpp_quote("#include <float.h>") + [ uuid(bcc782bc-6492-4c22-8c35-f5d72fe73c6e) ] @@ -313,6 +316,40 @@ cpp_quote("static const XACTNOTIFICATIONTYPE XACTNOTIFICATIONTYPE_WAVEDESTROYED cpp_quote("static const XACTNOTIFICATIONTYPE XACTNOTIFICATIONTYPE_WAVEBANKPREPARED = 17;") cpp_quote("static const XACTNOTIFICATIONTYPE XACTNOTIFICATIONTYPE_WAVEBANKSTREAMING_INVALIDCONTENT = 18;") +cpp_quote("static const XACTTIME XACTTIME_MIN = INT_MIN;") +cpp_quote("static const XACTTIME XACTTIME_MAX = INT_MAX;") +cpp_quote("static const XACTTIME XACTTIME_INFINITE = INT_MAX;") +cpp_quote("static const XACTINSTANCELIMIT XACTINSTANCELIMIT_INFINITE = 0xff;") +cpp_quote("static const XACTINSTANCELIMIT XACTINSTANCELIMIT_MIN = 0x00;") +cpp_quote("static const XACTINSTANCELIMIT XACTINSTANCELIMIT_MAX = 0xfe;") +cpp_quote("static const XACTINDEX XACTINDEX_MIN = 0x00;") +cpp_quote("static const XACTINDEX XACTINDEX_MAX = 0xfffe;") +cpp_quote("static const XACTINDEX XACTINDEX_INVALID = 0xffff;") +cpp_quote("static const XACTNOTIFICATIONTYPE XACTNOTIFICATIONTYPE_MIN = 0x00;") +cpp_quote("static const XACTNOTIFICATIONTYPE XACTNOTIFICATIONTYPE_MAX = 0xff;") +cpp_quote("static const XACTVARIABLEVALUE XACTVARIABLEVALUE_MIN = -FLT_MAX;") +cpp_quote("static const XACTVARIABLEVALUE XACTVARIABLEVALUE_MAX = FLT_MAX;") +cpp_quote("static const XACTVARIABLEINDEX XACTVARIABLEINDEX_MIN = 0x0000;") +cpp_quote("static const XACTVARIABLEINDEX XACTVARIABLEINDEX_MAX = 0xfffe;") +cpp_quote("static const XACTVARIABLEINDEX XACTVARIABLEINDEX_INVALID = 0xffff;") +cpp_quote("static const XACTCATEGORY XACTCATEGORY_MIN = 0x0;") +cpp_quote("static const XACTCATEGORY XACTCATEGORY_MAX = 0xfffe;") +cpp_quote("static const XACTCATEGORY XACTCATEGORY_INVALID = 0xffff;") +cpp_quote("static const XACTCHANNEL XACTCHANNEL_MIN = 0;") +cpp_quote("static const XACTCHANNEL XACTCHANNEL_MAX = 0xff;") +cpp_quote("static const XACTPITCH XACTPITCH_MIN = -1200;") +cpp_quote("static const XACTPITCH XACTPITCH_MAX = 1200;") +cpp_quote("static const XACTPITCH XACTPITCH_MIN_TOTAL = -2400;") +cpp_quote("static const XACTPITCH XACTPITCH_MAX_TOTAL = 2400;") +cpp_quote("static const XACTVOLUME XACTVOLUME_MIN = 0.0f;") +cpp_quote("static const XACTVOLUME XACTVOLUME_MAX = 16777216.0f;") +cpp_quote("static const XACTVARIABLEVALUE XACTPARAMETERVALUE_MIN = -FLT_MAX;") +cpp_quote("static const XACTVARIABLEVALUE XACTPARAMETERVALUE_MAX = FLT_MAX;") +cpp_quote("static const XACTLOOPCOUNT XACTLOOPCOUNT_MIN = 0x00;") +cpp_quote("static const XACTLOOPCOUNT XACTLOOPCOUNT_MAX = 0xfe;") +cpp_quote("static const XACTLOOPCOUNT XACTLOOPCOUNT_INFINITE = 0xff;") +cpp_quote("static const DWORD XACTWAVEALIGNMENT_MIN = 2048;") + [ object, uuid(b1ee676a-d9cd-4d2a-89a8-fa53eb9e480b), -- 2.24.1

1 0

[PATCH 1/3] msado15: Silence some queried interfaces.
by Alistair Leslie-Hughes 24 Jan '20

24 Jan '20

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msado15/connection.c | 10 ++++++++++ dlls/msado15/tests/msado15.c | 8 ++++++++ 2 files changed, 18 insertions(+) diff --git a/dlls/msado15/connection.c b/dlls/msado15/connection.c index 73b225628c..b267fc08c0 100644 --- a/dlls/msado15/connection.c +++ b/dlls/msado15/connection.c @@ -81,6 +81,16 @@ static HRESULT WINAPI connection_QueryInterface( _Connection *iface, REFIID riid { *obj = &connection->ISupportErrorInfo_iface; } + else if(IsEqualGUID( riid, &IID_IMarshal )) + { + TRACE("IMarshal not supported\n"); + return E_NOINTERFACE; + } + else if(IsEqualGUID( riid, &IID_IExternalConnection )) + { + TRACE("IExternalConnection not supported\n"); + return E_NOINTERFACE; + } else { FIXME( "interface %s not implemented\n", debugstr_guid(riid) ); diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index afdf0dfb6a..17be9e4f14 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -660,6 +660,8 @@ static void test_Connection(void) _Connection *connection; IRunnableObject *runtime; ISupportErrorInfo *errorinfo; + IMarshal *marshal; + IExternalConnection *external; LONG state, timeout; hr = CoCreateInstance(&CLSID_Connection, NULL, CLSCTX_INPROC_SERVER, &IID__Connection, (void**)&connection); @@ -672,6 +674,12 @@ static void test_Connection(void) ok(hr == S_OK, "Failed to get ISupportErrorInfo interface\n"); ISupportErrorInfo_Release(errorinfo); + hr = _Connection_QueryInterface(connection, &IID_IMarshal, (void**)&marshal); + ok(hr == E_NOINTERFACE, "Unexpected IMarshal interface\n"); + + hr = _Connection_QueryInterface(connection, &IID_IExternalConnection, (void**)&external); + ok(hr == E_NOINTERFACE, "Unexpected IExternalConnection interface\n"); + if (0) /* Crashes on windows */ { hr = _Connection_get_State(connection, NULL); -- 2.24.1

2 1

[PATCH 2/3] include: Register all ADODB interfaces
by Alistair Leslie-Hughes 24 Jan '20

24 Jan '20

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/msado15_backcompat.idl | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/include/msado15_backcompat.idl b/include/msado15_backcompat.idl index e4a847ab85..a813b80bf7 100644 --- a/include/msado15_backcompat.idl +++ b/include/msado15_backcompat.idl @@ -50,6 +50,14 @@ interface Recordset21; dispinterface ConnectionEvents; dispinterface RecordsetEvents; +[ + uuid(2a75196c-d9eb-4129-b803-931327f72d5c), + version(2.8) +] +library ADODB +{ + importlib("stdole2.tlb"); + typedef [uuid(0000052A-0000-0010-8000-00AA006D2EA4)] enum ErrorValueEnum { adErrInvalidArgument = 3001, @@ -2044,14 +2052,6 @@ interface ADORecordsetConstruction : IDispatch [in] IUnknown *row_pos); }; -[ - uuid(2a75196c-d9eb-4129-b803-931327f72d5c), - version(2.8) -] -library ADODB -{ - importlib("stdole2.tlb"); - [ uuid(00000514-0000-0010-8000-00aa006d2ea4), ] -- 2.24.1

1 0

[website] German translation for release 5.0-rc6
by Julian Rüger 24 Jan '20

24 Jan '20

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[website] German translation for release 5.0-rc5
by Julian Rüger 24 Jan '20

24 Jan '20

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[website] German translation for release 5.0-rc4
by Julian Rüger 24 Jan '20

24 Jan '20

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[website] German translation for release 5.0-rc3
by Julian Rüger 24 Jan '20

24 Jan '20

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[website] German translation for release 5.0-rc2
by Julian Rüger 24 Jan '20

24 Jan '20

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[website] German translation for release 5.0-rc1
by Julian Rüger 24 Jan '20

24 Jan '20

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[PATCH 3/3] winegcc: Use Wine crt when linking to msvcrt.
by Jacek Caban 24 Jan '20

24 Jan '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- tools/winegcc/winegcc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)

1 0

[PATCH 1/4] ole32: Add support for non-default counter for anti moniker.
by Nikolay Sivov 24 Jan '20

24 Jan '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/ole32/antimoniker.c | 66 +++++++++++++++++++++++--------------- dlls/ole32/tests/moniker.c | 10 ------ 2 files changed, 40 insertions(+), 36 deletions(-) diff --git a/dlls/ole32/antimoniker.c b/dlls/ole32/antimoniker.c index f7912fad78..bff6500fa5 100644 --- a/dlls/ole32/antimoniker.c +++ b/dlls/ole32/antimoniker.c @@ -40,6 +40,7 @@ typedef struct AntiMonikerImpl{ IROTData IROTData_iface; LONG ref; IUnknown *pMarshal; /* custom marshaler */ + DWORD count; } AntiMonikerImpl; static inline AntiMonikerImpl *impl_from_IMoniker(IMoniker *iface) @@ -168,30 +169,35 @@ AntiMonikerImpl_IsDirty(IMoniker* iface) /****************************************************************************** * AntiMoniker_Load ******************************************************************************/ -static HRESULT WINAPI -AntiMonikerImpl_Load(IMoniker* iface,IStream* pStm) +static HRESULT WINAPI AntiMonikerImpl_Load(IMoniker *iface, IStream *stream) { - DWORD constant=1,dwbuffer; - HRESULT res; + AntiMonikerImpl *moniker = impl_from_IMoniker(iface); + DWORD count = 0; + HRESULT hr; + + TRACE("%p, %p.\n", iface, stream); - /* data read by this function is only a DWORD constant (must be 1) ! */ - res=IStream_Read(pStm,&dwbuffer,sizeof(DWORD),NULL); + if (FAILED(hr = IStream_Read(stream, &count, sizeof(count), NULL))) + return hr; + + if (count > 0xfffff) + return E_INVALIDARG; - if (SUCCEEDED(res)&& dwbuffer!=constant) - return E_FAIL; + moniker->count = count; - return res; + return S_OK; } /****************************************************************************** * AntiMoniker_Save ******************************************************************************/ -static HRESULT WINAPI -AntiMonikerImpl_Save(IMoniker* iface,IStream* pStm,BOOL fClearDirty) +static HRESULT WINAPI AntiMonikerImpl_Save(IMoniker *iface, IStream *stream, BOOL clear_dirty) { - static const DWORD constant = 1; - /* data written by this function is only a DWORD constant set to 1 ! */ - return IStream_Write(pStm,&constant,sizeof(constant),NULL); + AntiMonikerImpl *moniker = impl_from_IMoniker(iface); + + TRACE("%p, %p, %d.\n", iface, stream, clear_dirty); + + return IStream_Write(stream, &moniker->count, sizeof(moniker->count), NULL); } /****************************************************************************** @@ -323,12 +329,16 @@ AntiMonikerImpl_IsEqual(IMoniker* iface,IMoniker* pmkOtherMoniker) /****************************************************************************** * AntiMoniker_Hash ******************************************************************************/ -static HRESULT WINAPI AntiMonikerImpl_Hash(IMoniker* iface,DWORD* pdwHash) +static HRESULT WINAPI AntiMonikerImpl_Hash(IMoniker *iface, DWORD *hash) { - if (pdwHash==NULL) + AntiMonikerImpl *moniker = impl_from_IMoniker(iface); + + TRACE("%p, %p.\n", iface, hash); + + if (!hash) return E_POINTER; - *pdwHash = 0x80000001; + *hash = 0x80000000 | moniker->count; return S_OK; } @@ -434,14 +444,16 @@ AntiMonikerImpl_RelativePathTo(IMoniker* iface,IMoniker* pmOther, IMoniker** ppm * AntiMoniker_GetDisplayName ******************************************************************************/ static HRESULT WINAPI -AntiMonikerImpl_GetDisplayName(IMoniker* iface, IBindCtx* pbc, - IMoniker* pmkToLeft, LPOLESTR *ppszDisplayName) +AntiMonikerImpl_GetDisplayName(IMoniker *iface, IBindCtx *pbc, IMoniker *pmkToLeft, LPOLESTR *displayname) { - static const WCHAR back[]={'\\','.','.',0}; + AntiMonikerImpl *moniker = impl_from_IMoniker(iface); + static const WCHAR nameW[] = {'\\','.','.'}; + WCHAR *ptrW; + int i; - TRACE("(%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,ppszDisplayName); + TRACE("%p, %p, %p, %p.\n", iface, pbc, pmkToLeft, displayname); - if (ppszDisplayName==NULL) + if (!displayname) return E_POINTER; if (pmkToLeft!=NULL){ @@ -449,12 +461,13 @@ AntiMonikerImpl_GetDisplayName(IMoniker* iface, IBindCtx* pbc, return E_NOTIMPL; } - *ppszDisplayName=CoTaskMemAlloc(sizeof(back)); - - if (*ppszDisplayName==NULL) + *displayname = ptrW = CoTaskMemAlloc((moniker->count * ARRAY_SIZE(nameW) + 1) * sizeof(WCHAR)); + if (!*displayname) return E_OUTOFMEMORY; - lstrcpyW(*ppszDisplayName,back); + for (i = 0; i < moniker->count; ++i) + memcpy(ptrW + i * ARRAY_SIZE(nameW), nameW, sizeof(nameW)); + ptrW[moniker->count * ARRAY_SIZE(nameW)] = 0; return S_OK; } @@ -598,6 +611,7 @@ static HRESULT AntiMonikerImpl_Construct(AntiMonikerImpl* This) This->IROTData_iface.lpVtbl = &VT_ROTDataImpl; This->ref = 0; This->pMarshal = NULL; + This->count = 1; return S_OK; } diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index e0e3020234..dff6cbbe57 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -2328,7 +2328,6 @@ todo_wine stream_write_dword(stream, 2); hr = IMoniker_Load(moniker, stream); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = IMoniker_IsEqual(moniker, moniker2); @@ -2341,13 +2340,11 @@ todo_wine hr = IMoniker_Hash(moniker, &hash); ok(hr == S_OK, "Failed to get hash value, hr %#x.\n", hr); -todo_wine ok(hash == 0x80000002, "Unexpected hash value %#x.\n", hash); /* Display name reflects anti combination. */ hr = IMoniker_GetDisplayName(moniker, bindctx, NULL, &name); ok(hr == S_OK, "Failed to get display name, hr %#x.\n", hr); -todo_wine ok(!lstrcmpW(name, L"\\..\\.."), "Unexpected display name %s.\n", wine_dbgstr_w(name)); CoTaskMemFree(name); @@ -2355,30 +2352,25 @@ todo_wine stream_write_dword(stream, 0xfffff); hr = IMoniker_Load(moniker, stream); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = IMoniker_Hash(moniker, &hash); ok(hr == S_OK, "Failed to get hash value, hr %#x.\n", hr); -todo_wine ok(hash == 0x800fffff, "Unexpected hash value %#x.\n", hash); stream_write_dword(stream, 0xfffff + 1); hr = IMoniker_Load(moniker, stream); -todo_wine ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); hr = IMoniker_Hash(moniker, &hash); ok(hr == S_OK, "Failed to get hash value, hr %#x.\n", hr); -todo_wine ok(hash == 0x800fffff, "Unexpected hash value %#x.\n", hash); /* Zero combining counter is also valid. */ stream_write_dword(stream, 0); hr = IMoniker_Load(moniker, stream); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = IMoniker_IsEqual(moniker, moniker2); @@ -2391,12 +2383,10 @@ todo_wine hr = IMoniker_Hash(moniker, &hash); ok(hr == S_OK, "Failed to get hash value, hr %#x.\n", hr); -todo_wine ok(hash == 0x80000000, "Unexpected hash value %#x.\n", hash); hr = IMoniker_GetDisplayName(moniker, bindctx, NULL, &name); ok(hr == S_OK, "Failed to get display name, hr %#x.\n", hr); -todo_wine ok(!lstrcmpW(name, L""), "Unexpected display name %s.\n", wine_dbgstr_w(name)); CoTaskMemFree(name); -- 2.24.1

1 3

[PATCH] testbot/LogUtils: Return the ParseWineTestReport() results as a single object.
by Francois Gouget 24 Jan '20

24 Jan '20

Rename the variable holding it to $LogInfo for consistency with the other functions as it plays the same role and may eventually carry the same information. Store the extra errors in the $LogInfo->{Extra} field and rename _AddError() to _AddExtra() to match and avoid confusion with _AddLogError(). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/UpdateTaskLogs | 10 +-- testbot/bin/WineRunTask.pl | 18 ++-- testbot/bin/WineRunWineTest.pl | 18 ++-- testbot/lib/WineTestBot/LogUtils.pm | 125 ++++++++++++++++------------ 4 files changed, 95 insertions(+), 76 deletions(-) diff --git a/testbot/bin/UpdateTaskLogs b/testbot/bin/UpdateTaskLogs index ca9bf44a37..00a6f23223 100755 --- a/testbot/bin/UpdateTaskLogs +++ b/testbot/bin/UpdateTaskLogs @@ -190,19 +190,19 @@ sub BuildErrFile($$$$) my $TaskKey = Path2TaskKey($Dir); - my ($TestUnitCount, $TimeoutCount, $LogFailures, $LogErrors) = ParseWineTestReport("$Dir/$ReportName", $IsWineTest, $TaskTimedOut); - if (!defined $LogFailures and @$LogErrors == 1) + my $LogInfo = ParseWineTestReport("$Dir/$ReportName", $IsWineTest, $TaskTimedOut); + if (!defined $LogInfo->{Failures} and @{$LogInfo->{Extra}} == 1) { - return "$TaskKey: $LogErrors->[0]"; + return "$TaskKey: $LogInfo->{Extra}->[0]"; } - return undef if (!@$LogErrors); + return undef if (!@{$LogInfo->{Extra}}); Debug("$TaskKey: Creating $ReportName.err\n"); if (open(my $Log, ">", "$Dir/$ReportName.err")) { # Save the extra errors detected by ParseWineTestReport() in # $ReportName.err (see WineRunWineTest.pl). - print $Log "$_\n" for (@$LogErrors); + print $Log "$_\n" for (@{$LogInfo->{Extra}}); close($Log); return undef; } diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index 62bd162eed..3044cd76bd 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -556,24 +556,24 @@ if ($TA->GetFile($RptFileName, "$TaskDir/$RptFileName")) { chmod 0664, "$TaskDir/$RptFileName"; - my ($TestUnitCount, $TimeoutCount, $LogFailures, $LogErrors) = ParseWineTestReport("$TaskDir/$RptFileName", $IsWineTest, $TaskTimedOut); - $TaskTimedOut = 1 if ($TestUnitCount == $TimeoutCount); - if (!defined $LogFailures and @$LogErrors == 1) + my $LogInfo = ParseWineTestReport("$TaskDir/$RptFileName", $IsWineTest, $TaskTimedOut); + $TaskTimedOut = 1 if ($LogInfo->{TestUnitCount} == $LogInfo->{TimeoutCount}); + if (!defined $LogInfo->{Failures} and @{$LogInfo->{Extra}} == 1) { # Could not open the file $NewStatus = 'boterror'; - Error "$LogErrors->[0]\n"; - LogTaskError("$LogErrors->[0]\n"); + Error "$LogInfo->{Extra}->[0]\n"; + LogTaskError("$LogInfo->{Extra}->[0]\n"); } else { - # $LogFailures can legitimately be undefined in case of a timeout - $TaskFailures += $LogFailures || 0; - if (@$LogErrors and open(my $Log, ">", "$TaskDir/$RptFileName.err")) + # $LogInfo->{Failures} can legitimately be undefined in case of a timeout + $TaskFailures += $LogInfo->{Failures} || 0; + if (@{$LogInfo->{Extra}} and open(my $Log, ">", "$TaskDir/$RptFileName.err")) { # Save the extra errors detected by ParseWineTestReport() in # $RptFileName.err (see WineRunWineTest.pl). - print $Log "$_\n" for (@$LogErrors); + print $Log "$_\n" for (@{$LogInfo->{Extra}}); close($Log); } } diff --git a/testbot/bin/WineRunWineTest.pl b/testbot/bin/WineRunWineTest.pl index fecbab0098..950661b70c 100755 --- a/testbot/bin/WineRunWineTest.pl +++ b/testbot/bin/WineRunWineTest.pl @@ -578,20 +578,20 @@ foreach my $Mission (@{$TaskMissions->{Missions}}) { chmod 0664, "$TaskDir/$RptFileName"; - my ($TestUnitCount, $TimeoutCount, $LogFailures, $LogErrors) = ParseWineTestReport("$TaskDir/$RptFileName", $Step->FileType eq "patch", $TaskTimedOut); - $TaskTimedOut = 1 if ($TestUnitCount == $TimeoutCount); - if (!defined $LogFailures and @$LogErrors == 1) + my $LogInfo = ParseWineTestReport("$TaskDir/$RptFileName", $Step->FileType eq "patch", $TaskTimedOut); + $TaskTimedOut = 1 if ($LogInfo->{TestUnitCount} == $LogInfo->{TimeoutCount}); + if (!defined $LogInfo->{Failures} and @{$LogInfo->{Extra}} == 1) { # Could not open the file $NewStatus = 'boterror'; - Error "$LogErrors->[0]\n"; - LogTaskError("$LogErrors->[0]\n"); + Error "$LogInfo->{Extra}->[0]\n"; + LogTaskError("$LogInfo->{Extra}->[0]\n"); } else { - # $LogFailures can legitimately be undefined in case of a timeout - $TaskFailures += $LogFailures || 0; - if (@$LogErrors and open(my $Log, ">", "$TaskDir/$RptFileName.err")) + # $LogInfo->{Failures} can legitimately be undefined in case of a timeout + $TaskFailures += $LogInfo->{Failures} || 0; + if (@{$LogInfo->{Extra}} and open(my $Log, ">", "$TaskDir/$RptFileName.err")) { # Save the extra errors detected by ParseWineTestReport() in # $RptFileName.err: @@ -600,7 +600,7 @@ foreach my $Mission (@{$TaskMissions->{Missions}}) # if there are multiple .report files in the directory. # - The .err file can be moved to the latest directory next to the # reference report. - print $Log "$_\n" for (@$LogErrors); + print $Log "$_\n" for (@{$LogInfo->{Extra}}); close($Log); } } diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 8cd3ae1178..d05a811d5c 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -232,56 +232,56 @@ sub _NewCurrentUnit($$) }; } -sub _AddError($$;$) +sub _AddExtra($$;$) { - my ($Parser, $Error, $Cur) = @_; + my ($LogInfo, $Error, $Cur) = @_; $Error = "$Cur->{Dll}:$Cur->{Unit} $Error" if (defined $Cur); - push @{$Parser->{Errors}}, $Error; - $Parser->{Failures}++; + push @{$LogInfo->{Extra}}, $Error; + $LogInfo->{Failures}++; } sub _CheckUnit($$$$) { - my ($Parser, $Cur, $Unit, $Type) = @_; + my ($LogInfo, $Cur, $Unit, $Type) = @_; if ($Cur->{Units}->{$Unit} or $Cur->{Unit} eq "") { - $Parser->{IsWineTest} = 1; + $LogInfo->{IsWineTest} = 1; } # To avoid issuing many duplicate errors, # only report the first misplaced message. - elsif ($Parser->{IsWineTest} and !$Cur->{IsBroken}) + elsif ($LogInfo->{IsWineTest} and !$Cur->{IsBroken}) { - _AddError($Parser, "contains a misplaced $Type message for $Unit", $Cur); + _AddExtra($LogInfo, "contains a misplaced $Type message for $Unit", $Cur); $Cur->{IsBroken} = 1; } } sub _CheckSummaryCounter($$$$) { - my ($Parser, $Cur, $Field, $Type) = @_; + my ($LogInfo, $Cur, $Field, $Type) = @_; if ($Cur->{"Line$Field"} != 0 and $Cur->{"Summary$Field"} == 0) { - _AddError($Parser, "has unaccounted for $Type messages", $Cur); + _AddExtra($LogInfo, "has unaccounted for $Type messages", $Cur); } elsif ($Cur->{"Line$Field"} == 0 and $Cur->{"Summary$Field"} != 0) { - _AddError($Parser, "is missing some $Type messages", $Cur); + _AddExtra($LogInfo, "is missing some $Type messages", $Cur); } } sub _CloseTestUnit($$$) { - my ($Parser, $Cur, $Last) = @_; + my ($LogInfo, $Cur, $Last) = @_; # Verify the summary lines if (!$Cur->{IsBroken}) { - _CheckSummaryCounter($Parser, $Cur, "Failures", "failure"); - _CheckSummaryCounter($Parser, $Cur, "Todos", "todo"); - _CheckSummaryCounter($Parser, $Cur, "Skips", "skip"); + _CheckSummaryCounter($LogInfo, $Cur, "Failures", "failure"); + _CheckSummaryCounter($LogInfo, $Cur, "Todos", "todo"); + _CheckSummaryCounter($LogInfo, $Cur, "Skips", "skip"); } # Note that the summary lines may count some failures twice @@ -290,7 +290,7 @@ sub _CloseTestUnit($$$) if ($Cur->{UnitSize} > $MaxUnitSize) { - _AddError($Parser, "prints too much data ($Cur->{UnitSize} bytes)", $Cur); + _AddExtra($LogInfo, "prints too much data ($Cur->{UnitSize} bytes)", $Cur); } if (!$Cur->{IsBroken} and defined $Cur->{Rc}) { @@ -298,31 +298,31 @@ sub _CloseTestUnit($$$) # after the 'done' line (e.g. by subprocesses). if ($Cur->{LineFailures} != 0 and $Cur->{Rc} == 0) { - _AddError($Parser, "returned success despite having failures", $Cur); + _AddExtra($LogInfo, "returned success despite having failures", $Cur); } - elsif (!$Parser->{IsWineTest} and $Cur->{Rc} != 0) + elsif (!$LogInfo->{IsWineTest} and $Cur->{Rc} != 0) { - _AddError($Parser, "The test returned a non-zero exit code"); + _AddExtra($LogInfo, "The test returned a non-zero exit code"); } - elsif ($Parser->{IsWineTest} and $Cur->{LineFailures} == 0 and $Cur->{Rc} != 0) + elsif ($LogInfo->{IsWineTest} and $Cur->{LineFailures} == 0 and $Cur->{Rc} != 0) { - _AddError($Parser, "returned a non-zero exit code despite reporting no failures", $Cur); + _AddExtra($LogInfo, "returned a non-zero exit code despite reporting no failures", $Cur); } } # For executables TestLauncher's done line may not be recognizable. - elsif ($Parser->{IsWineTest} and !defined $Cur->{Rc}) + elsif ($LogInfo->{IsWineTest} and !defined $Cur->{Rc}) { if (!$Last) { - _AddError($Parser, "has no done line (or it is garbled)", $Cur); + _AddExtra($LogInfo, "has no done line (or it is garbled)", $Cur); } - elsif ($Last and !$Parser->{TaskTimedOut}) + elsif ($Last and !$LogInfo->{TaskTimedOut}) { - _AddError($Parser, "The report seems to have been truncated"); + _AddExtra($LogInfo, "The report seems to have been truncated"); } } - $Parser->{Failures} += $Cur->{LineFailures}; + $LogInfo->{Failures} += $Cur->{LineFailures}; } =pod @@ -330,9 +330,29 @@ sub _CloseTestUnit($$$) =item C<ParseWineTestReport()> -Parses a Wine test report and returns the number of failures and extra errors, -a list of extra errors, and whether the test timed out. +Returns a hashtable containing a summary of the WineTest report: +=over + +=item IsWineTest +True if this is a regular Wine test report, false if this is some other Windows +binary. + +=item TaskTimedOut +True if the overall task timed out waiting for the test to complete. + +=item TestUnitCount +The number of test units. + +=item TimeoutCount +The number of test units that timed out. +=item Failures +The number of failed tests. + +=item Extra +An array containing the extra errors detected during the inconsistency check. + +=back =back =cut @@ -343,18 +363,18 @@ sub ParseWineTestReport($$$) my $LogFile; if (!open($LogFile, "<", $FileName)) { - my $BaseName = basename($FileName); - return (undef, undef, undef, ["Unable to open '$BaseName' for reading: $!"]); + my $LogName = basename($FileName); + return {Extra => ["Unable to open '$LogName' for reading: $!"]}; } - my $Parser = { + my $LogInfo = { IsWineTest => $IsWineTest, TaskTimedOut => $TaskTimedOut, TestUnitCount => 0, TimeoutCount => 0, Failures => undef, - Errors => [], + Extra => [], }; my $Cur = _NewCurrentUnit("", ""); @@ -366,9 +386,9 @@ sub ParseWineTestReport($$$) my ($Dll, $Unit, $Type) = ($1, $2, $3); # Close the previous test unit - _CloseTestUnit($Parser, $Cur, 0) if ($Cur->{Dll} ne ""); + _CloseTestUnit($LogInfo, $Cur, 0) if ($Cur->{Dll} ne ""); $Cur = _NewCurrentUnit($Dll, $Unit); - $Parser->{TestUnitCount}++; + $LogInfo->{TestUnitCount}++; # Recognize skipped messages in case we need to skip tests in the VMs $Cur->{Rc} = 0 if ($Type eq "skipped"); @@ -383,21 +403,21 @@ sub ParseWineTestReport($$$) } else { - _AddError($Parser, "Misplaced $SubUnit subtest\n"); + _AddExtra($LogInfo, "Misplaced $SubUnit subtest\n"); } } elsif (($Cur->{Unit} ne "" and $Line =~ /($Cur->{UnitsRE})\.c:\d+: Test (?:failed|succeeded inside todo block): /) or $Line =~ /^([_a-z0-9]+)\.c:\d+: Test (?:failed|succeeded inside todo block): /) { - _CheckUnit($Parser, $Cur, $1, "failure"); + _CheckUnit($LogInfo, $Cur, $1, "failure"); $Cur->{LineFailures}++; } elsif (($Cur->{Unit} ne "" and $Line =~ /($Cur->{UnitsRE})\.c:\d+: Test marked todo: /) or $Line =~ /^([_a-z0-9]+)\.c:\d+: Test marked todo: /) { - _CheckUnit($Parser, $Cur, $1, "todo"); + _CheckUnit($LogInfo, $Cur, $1, "todo"); $Cur->{LineTodos}++; } elsif (($Cur->{Unit} ne "" and @@ -417,7 +437,7 @@ sub ParseWineTestReport($$$) # This also replaces a test summary line. $Cur->{Pids}->{0} = 1; $Cur->{SummaryFailures}++; - $Parser->{IsWineTest} = 1; + $LogInfo->{IsWineTest} = 1; $Cur->{LineFailures}++; } @@ -433,7 +453,7 @@ sub ParseWineTestReport($$$) $Cur->{Pids}->{$Pid || 0} = 1; $Cur->{SummaryFailures}++; } - _CheckUnit($Parser, $Cur, $Unit, "unhandled exception"); + _CheckUnit($LogInfo, $Cur, $Unit, "unhandled exception"); $Cur->{LineFailures}++; } elsif (($Cur->{Unit} ne "" and @@ -451,11 +471,11 @@ sub ParseWineTestReport($$$) $Cur->{SummaryFailures} += $Failures; $Cur->{SummaryTodos} += $Todos; $Cur->{SummarySkips} += $Skips; - $Parser->{IsWineTest} = 1; + $LogInfo->{IsWineTest} = 1; } else { - _CheckUnit($Parser, $Cur, $Unit, "test summary") if ($Todos or $Failures); + _CheckUnit($LogInfo, $Cur, $Unit, "test summary") if ($Todos or $Failures); } } elsif (($Cur->{Dll} ne "" and @@ -464,17 +484,17 @@ sub ParseWineTestReport($$$) { my ($Dll, $Unit, $Pid, $Rc) = ($1, $2, $3, $4); - if ($Parser->{IsWineTest} and ($Dll ne $Cur->{Dll} or $Unit ne $Cur->{Unit})) + if ($LogInfo->{IsWineTest} and ($Dll ne $Cur->{Dll} or $Unit ne $Cur->{Unit})) { # First close the current test unit taking into account # it may have been polluted by the new one. $Cur->{IsBroken} = 1; - _CloseTestUnit($Parser, $Cur, 0); + _CloseTestUnit($LogInfo, $Cur, 0); # Then switch to the new one, warning it's missing a start line, # and that its results may be inconsistent. ($Cur->{Dll}, $Cur->{Unit}) = ($Dll, $Unit); - _AddError($Parser, "had no start line (or it is garbled)", $Cur); + _AddExtra($LogInfo, "had no start line (or it is garbled)", $Cur); $Cur->{IsBroken} = 1; } @@ -482,9 +502,9 @@ sub ParseWineTestReport($$$) { # The done line will already be shown as a timeout (see JobDetails) # so record the failure but don't add an error message. - $Parser->{Failures}++; + $LogInfo->{Failures}++; $Cur->{IsBroken} = 1; - $Parser->{TimeoutCount}++; + $LogInfo->{TimeoutCount}++; } elsif ((!$Pid and !%{$Cur->{Pids}}) or ($Pid and !$Cur->{Pids}->{$Pid} and !$Cur->{Pids}->{0})) @@ -492,12 +512,12 @@ sub ParseWineTestReport($$$) # The main summary line is missing if ($Rc & 0xc0000000) { - _AddError($Parser, sprintf("%s:%s crashed (%08x)", $Dll, $Unit, $Rc & 0xffffffff)); + _AddExtra($LogInfo, sprintf("%s:%s crashed (%08x)", $Dll, $Unit, $Rc & 0xffffffff)); $Cur->{IsBroken} = 1; } - elsif ($Parser->{IsWineTest} and !$Cur->{IsBroken}) + elsif ($LogInfo->{IsWineTest} and !$Cur->{IsBroken}) { - _AddError($Parser, "$Dll:$Unit has no test summary line (early exit of the main process?)"); + _AddExtra($LogInfo, "$Dll:$Unit has no test summary line (early exit of the main process?)"); } } elsif ($Rc & 0xc0000000) @@ -511,12 +531,11 @@ sub ParseWineTestReport($$$) $Cur->{Rc} = $Rc; } } - $Cur->{IsBroken} = 1 if ($Parser->{TaskTimedOut}); - _CloseTestUnit($Parser, $Cur, 1); + $Cur->{IsBroken} = 1 if ($LogInfo->{TaskTimedOut}); + _CloseTestUnit($LogInfo, $Cur, 1); close($LogFile); - return ($Parser->{TestUnitCount}, $Parser->{TimeoutCount}, - $Parser->{Failures}, $Parser->{Errors}); + return $LogInfo; } -- 2.20.1

1 0

[PATCH 1/5] dwrite: Implement GetFaceNames() for fontfaces.
by Nikolay Sivov 24 Jan '20

24 Jan '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/dwrite_private.h | 4 ++- dlls/dwrite/font.c | 57 ++++++++++++++++++++---------------- dlls/dwrite/main.c | 2 +- dlls/dwrite/tests/font.c | 30 ++++++++++++++++++- 4 files changed, 65 insertions(+), 28 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index cf3f13b1c6..58b5e9a0e0 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -231,6 +231,8 @@ struct dwrite_fontface FONTSIGNATURE fontsig; UINT32 glyph_image_formats; + IDWriteLocalizedStrings *names; + struct scriptshaping_cache *shaping_cache; LOGFONTW lf; @@ -245,7 +247,7 @@ extern HRESULT create_trimmingsign(IDWriteFactory7 *factory, IDWriteTextFormat * extern HRESULT create_typography(IDWriteTypography**) DECLSPEC_HIDDEN; extern HRESULT create_localizedstrings(IDWriteLocalizedStrings**) DECLSPEC_HIDDEN; extern HRESULT add_localizedstring(IDWriteLocalizedStrings*,const WCHAR*,const WCHAR*) DECLSPEC_HIDDEN; -extern HRESULT clone_localizedstring(IDWriteLocalizedStrings *iface, IDWriteLocalizedStrings **strings) DECLSPEC_HIDDEN; +extern HRESULT clone_localizedstrings(IDWriteLocalizedStrings *iface, IDWriteLocalizedStrings **strings) DECLSPEC_HIDDEN; extern void set_en_localizedstring(IDWriteLocalizedStrings*,const WCHAR*) DECLSPEC_HIDDEN; extern void sort_localizedstrings(IDWriteLocalizedStrings*) DECLSPEC_HIDDEN; extern HRESULT get_system_fontcollection(IDWriteFactory7 *factory, IDWriteFontCollection1 **collection) DECLSPEC_HIDDEN; diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 4e08b2f632..df1bc5adcb 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -539,6 +539,8 @@ static ULONG WINAPI dwritefontface_Release(IDWriteFontFace5 *iface) if (fontface->stream) IDWriteFontFileStream_Release(fontface->stream); heap_free(fontface->files); + if (fontface->names) + IDWriteLocalizedStrings_Release(fontface->names); for (i = 0; i < ARRAY_SIZE(fontface->glyphs); i++) heap_free(fontface->glyphs[i]); @@ -1259,9 +1261,11 @@ static HRESULT WINAPI dwritefontface3_GetFamilyNames(IDWriteFontFace5 *iface, ID static HRESULT WINAPI dwritefontface3_GetFaceNames(IDWriteFontFace5 *iface, IDWriteLocalizedStrings **names) { - FIXME("%p, %p: stub\n", iface, names); + struct dwrite_fontface *fontface = impl_from_IDWriteFontFace5(iface); - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, names); + + return clone_localizedstrings(fontface->names, names); } static HRESULT WINAPI dwritefontface3_GetInformationalStrings(IDWriteFontFace5 *iface, @@ -1616,9 +1620,11 @@ static BOOL WINAPI dwritefont_IsSymbolFont(IDWriteFont3 *iface) static HRESULT WINAPI dwritefont_GetFaceNames(IDWriteFont3 *iface, IDWriteLocalizedStrings **names) { - struct dwrite_font *This = impl_from_IDWriteFont3(iface); - TRACE("(%p)->(%p)\n", This, names); - return clone_localizedstring(This->data->names, names); + struct dwrite_font *font = impl_from_IDWriteFont3(iface); + + TRACE("%p, %p.\n", iface, names); + + return clone_localizedstrings(font->data->names, names); } static HRESULT WINAPI dwritefont_GetInformationalStrings(IDWriteFont3 *iface, @@ -1663,7 +1669,7 @@ static HRESULT WINAPI dwritefont_GetInformationalStrings(IDWriteFont3 *iface, IDWriteFontFace5_Release(fontface); } - hr = clone_localizedstring(data->info_strings[stringid], strings); + hr = clone_localizedstrings(data->info_strings[stringid], strings); if (FAILED(hr)) return hr; @@ -2166,7 +2172,10 @@ static HRESULT WINAPI dwritefontfamily_GetFont(IDWriteFontFamily2 *iface, UINT32 static HRESULT WINAPI dwritefontfamily_GetFamilyNames(IDWriteFontFamily2 *iface, IDWriteLocalizedStrings **names) { struct dwrite_fontfamily *family = impl_from_IDWriteFontFamily2(iface); - return clone_localizedstring(family->data->familyname, names); + + TRACE("%p, %p.\n", iface, names); + + return clone_localizedstrings(family->data->familyname, names); } static BOOL is_better_font_match(const struct dwrite_font_propvec *next, const struct dwrite_font_propvec *cur, @@ -4614,6 +4623,7 @@ HRESULT create_font_file(IDWriteFontFileLoader *loader, const void *reference_ke HRESULT create_fontface(const struct fontface_desc *desc, struct list *cached_list, IDWriteFontFace5 **ret) { struct file_stream_desc stream_desc; + struct dwrite_font_data *font_data; struct dwrite_fontface *fontface; HRESULT hr; int i; @@ -4678,38 +4688,35 @@ HRESULT create_fontface(const struct fontface_desc *desc, struct list *cached_li */ if (desc->font_data) { - fontface->weight = desc->font_data->weight; - fontface->style = desc->font_data->style; - fontface->stretch = desc->font_data->stretch; - fontface->panose = desc->font_data->panose; - fontface->fontsig = desc->font_data->fontsig; - fontface->lf = desc->font_data->lf; - fontface->flags |= desc->font_data->flags & (FONT_IS_SYMBOL | FONT_IS_MONOSPACED | FONT_IS_COLORED); + font_data = desc->font_data; + addref_font_data(font_data); } else { IDWriteLocalizedStrings *names; - struct dwrite_font_data *data; - hr = init_font_data(desc, &names, &data); + hr = init_font_data(desc, &names, &font_data); if (FAILED(hr)) { IDWriteFontFace5_Release(&fontface->IDWriteFontFace5_iface); return hr; } - fontface->weight = data->weight; - fontface->style = data->style; - fontface->stretch = data->stretch; - fontface->panose = data->panose; - fontface->fontsig = data->fontsig; - fontface->lf = data->lf; - fontface->flags |= data->flags & (FONT_IS_SYMBOL | FONT_IS_MONOSPACED | FONT_IS_COLORED); - IDWriteLocalizedStrings_Release(names); - release_font_data(data); } + fontface->weight = font_data->weight; + fontface->style = font_data->style; + fontface->stretch = font_data->stretch; + fontface->panose = font_data->panose; + fontface->fontsig = font_data->fontsig; + fontface->lf = font_data->lf; + fontface->flags |= font_data->flags & (FONT_IS_SYMBOL | FONT_IS_MONOSPACED | FONT_IS_COLORED); + fontface->names = font_data->names; + if (fontface->names) + IDWriteLocalizedStrings_AddRef(fontface->names); + release_font_data(font_data); + fontface->cached = factory_cache_fontface(fontface->factory, cached_list, &fontface->IDWriteFontFace5_iface); *ret = &fontface->IDWriteFontFace5_iface; diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index 317a6cedaf..283cccb76c 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -468,7 +468,7 @@ HRESULT add_localizedstring(IDWriteLocalizedStrings *iface, const WCHAR *locale, return S_OK; } -HRESULT clone_localizedstring(IDWriteLocalizedStrings *iface, IDWriteLocalizedStrings **ret) +HRESULT clone_localizedstrings(IDWriteLocalizedStrings *iface, IDWriteLocalizedStrings **ret) { struct localizedstrings *strings, *strings_clone; size_t i; diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index ac70a4c137..6a2acd7cd8 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -4410,8 +4410,10 @@ static void test_GetFaceNames(void) static const WCHAR obliqueW[] = {'O','b','l','i','q','u','e',0}; static const WCHAR enus2W[] = {'e','n','-','U','s',0}; static const WCHAR enusW[] = {'e','n','-','u','s',0}; - IDWriteLocalizedStrings *strings, *strings2; + IDWriteLocalizedStrings *strings, *strings2, *strings3; + IDWriteFontFace3 *fontface3; IDWriteGdiInterop *interop; + IDWriteFontFace *fontface; IDWriteFactory *factory; UINT32 count, index; IDWriteFont *font; @@ -4470,6 +4472,32 @@ static void test_GetFaceNames(void) ok(!lstrcmpW(buffW, obliqueW), "got %s\n", wine_dbgstr_w(buffW)); IDWriteLocalizedStrings_Release(strings); + hr = IDWriteFont_CreateFontFace(font, &fontface); + ok(hr == S_OK, "Failed to create a font face, hr %#x.\n", hr); + + if (SUCCEEDED(IDWriteFontFace_QueryInterface(fontface, &IID_IDWriteFontFace3, (void **)&fontface3))) + { + hr = IDWriteFontFace3_GetFaceNames(fontface3, &strings2); + ok(hr == S_OK, "Failed to get face names, hr %#x.\n", hr); + + hr = IDWriteFontFace3_GetFaceNames(fontface3, &strings3); + ok(hr == S_OK, "Failed to get face names, hr %#x.\n", hr); + ok(strings2 != strings3, "Unexpected instance.\n"); + IDWriteLocalizedStrings_Release(strings3); + + buffW[0] = 0; + hr = IDWriteLocalizedStrings_GetString(strings2, 0, buffW, ARRAY_SIZE(buffW)); + ok(hr == S_OK, "Failed to get a string, hr %#x.\n", hr); + ok(!lstrcmpW(buffW, obliqueW), "Unexpected name %s.\n", wine_dbgstr_w(buffW)); + IDWriteLocalizedStrings_Release(strings2); + + IDWriteFontFace3_Release(fontface3); + } + else + win_skip("GetFaceNames() is not supported.\n"); + + IDWriteFontFace_Release(fontface); + IDWriteFont_Release(font); IDWriteGdiInterop_Release(interop); ref = IDWriteFactory_Release(factory); -- 2.24.1

1 4

[PATCH 1/5] winegstreamer: Rename the "ppPins" element of struct gstdemux to "sources".
by Zebediah Figura 24 Jan '20

24 Jan '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/winegstreamer/gstdemux.c | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 7ae70d0a736..88310668540 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -57,7 +57,8 @@ struct gstdemux struct strmbase_sink sink; IAsyncReader *reader; IMemAllocator *alloc; - struct gstdemux_source **ppPins; + + struct gstdemux_source **sources; LONG cStreams; LONGLONG filesize; @@ -842,7 +843,7 @@ static void removed_decoded_pad(GstElement *bin, GstPad *pad, gpointer user) TRACE("%p %p %p\n", This, bin, pad); for (x = 0; x < This->cStreams; ++x) { - if (This->ppPins[x]->their_src == pad) + if (This->sources[x]->their_src == pad) break; } if (x == This->cStreams) @@ -853,7 +854,7 @@ static void removed_decoded_pad(GstElement *bin, GstPad *pad, gpointer user) return; } - pin = This->ppPins[x]; + pin = This->sources[x]; if(pin->flipfilter) gst_pad_unlink(pin->their_src, pin->flip_sink); @@ -994,7 +995,7 @@ static void existing_new_pad(GstElement *bin, GstPad *pad, gpointer user) } for (x = 0; x < This->cStreams; ++x) { - struct gstdemux_source *pin = This->ppPins[x]; + struct gstdemux_source *pin = This->sources[x]; if (!pin->their_src) { gst_segment_init(pin->segment, GST_FORMAT_TIME); @@ -1215,7 +1216,7 @@ static struct strmbase_pin *gstdemux_get_pin(struct strmbase_filter *base, unsig if (!index) return &filter->sink.pin; else if (index <= filter->cStreams) - return &filter->ppPins[index - 1]->pin.pin; + return &filter->sources[index - 1]->pin.pin; return NULL; } @@ -1280,7 +1281,7 @@ static HRESULT gstdemux_init_stream(struct strmbase_filter *iface) for (i = 0; i < filter->cStreams; ++i) { - if (SUCCEEDED(pin_hr = BaseOutputPinImpl_Active(&filter->ppPins[i]->pin))) + if (SUCCEEDED(pin_hr = BaseOutputPinImpl_Active(&filter->sources[i]->pin))) hr = pin_hr; } return hr; @@ -1496,10 +1497,10 @@ static BOOL gstdecoder_init_gst(struct gstdemux *filter) WaitForSingleObject(filter->no_more_pads_event, INFINITE); - gst_pad_query_duration(filter->ppPins[0]->their_src, GST_FORMAT_TIME, &duration); + gst_pad_query_duration(filter->sources[0]->their_src, GST_FORMAT_TIME, &duration); for (i = 0; i < filter->cStreams; ++i) { - struct gstdemux_source *pin = filter->ppPins[i]; + struct gstdemux_source *pin = filter->sources[i]; const HANDLE events[2] = {pin->caps_event, filter->error_event}; pin->seek.llDuration = pin->seek.llStop = duration / 100; @@ -1947,9 +1948,9 @@ static struct gstdemux_source *create_pin(struct gstdemux *filter, const WCHAR * struct gstdemux_source *pin, **new_array; char pad_name[19]; - if (!(new_array = heap_realloc(filter->ppPins, (filter->cStreams + 1) * sizeof(*new_array)))) + if (!(new_array = heap_realloc(filter->sources, (filter->cStreams + 1) * sizeof(*new_array)))) return NULL; - filter->ppPins = new_array; + filter->sources = new_array; if (!(pin = heap_alloc_zero(sizeof(*pin)))) return NULL; @@ -1970,7 +1971,7 @@ static struct gstdemux_source *create_pin(struct gstdemux *filter, const WCHAR * gst_pad_set_event_function(pin->my_sink, event_sink_wrapper); gst_pad_set_query_function(pin->my_sink, query_sink_wrapper); - filter->ppPins[filter->cStreams++] = pin; + filter->sources[filter->cStreams++] = pin; return pin; } @@ -1990,11 +1991,11 @@ static HRESULT GST_RemoveOutputPins(struct gstdemux *This) This->my_src = This->their_sink = NULL; for (i = 0; i < This->cStreams; ++i) - free_source_pin(This->ppPins[i]); + free_source_pin(This->sources[i]); This->cStreams = 0; - heap_free(This->ppPins); - This->ppPins = NULL; + heap_free(This->sources); + This->sources = NULL; gst_element_set_bus(This->container, NULL); gst_object_unref(This->container); This->container = NULL; @@ -2317,10 +2318,10 @@ static BOOL avi_splitter_init_gst(struct gstdemux *filter) WaitForSingleObject(filter->no_more_pads_event, INFINITE); - gst_pad_query_duration(filter->ppPins[0]->their_src, GST_FORMAT_TIME, &duration); + gst_pad_query_duration(filter->sources[0]->their_src, GST_FORMAT_TIME, &duration); for (i = 0; i < filter->cStreams; ++i) { - struct gstdemux_source *pin = filter->ppPins[i]; + struct gstdemux_source *pin = filter->sources[i]; const HANDLE events[2] = {pin->caps_event, filter->error_event}; pin->seek.llDuration = pin->seek.llStop = duration / 100; -- 2.25.0

2 5

[PATCH 2/2] comctl32: For multiselect monthcal control send MCN_SELCHANGE notification on WM_LBUTTONDOWN event.
by Dmitry Timoshkov 24 Jan '20

24 Jan '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/comctl32/monthcal.c | 3 ++- dlls/comctl32/tests/monthcal.c | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index 244bfcee69..1de13dab36 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -2258,7 +2258,8 @@ MONTHCAL_LButtonDown(MONTHCAL_INFO *infoPtr, LPARAM lParam) MONTHCAL_SetSelRange(infoPtr, st); infoPtr->status = MC_SEL_LBUTDOWN; - MONTHCAL_SetDayFocus(infoPtr, &ht.st); + if (MONTHCAL_SetDayFocus(infoPtr, &ht.st) && (infoPtr->dwStyle & MCS_MULTISELECT)) + MONTHCAL_NotifySelectionChange(infoPtr); return 0; } } diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c index 974787ac36..ae528a0ddb 100644 --- a/dlls/comctl32/tests/monthcal.c +++ b/dlls/comctl32/tests/monthcal.c @@ -2042,7 +2042,6 @@ static void test_sel_notify(void) got_MCN_SELECT = got_MCN_SELCHANGE = FALSE; SendMessageA(hwnd, WM_LBUTTONDOWN, 0, MAKELPARAM(mchit.pt.x, mchit.pt.y)); if (styles[i].val & MCS_MULTISELECT) -todo_wine ok(got_MCN_SELCHANGE, "%d: MCN_SELCHANGE should be sent\n", i); else ok(!got_MCN_SELCHANGE, "%d: MCN_SELCHANGE should not be sent\n", i); -- 2.20.1

1 0

[PATCH v4] include: Add xact3wb.h
by Alistair Leslie-Hughes 24 Jan '20

24 Jan '20

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/Makefile.in | 1 + include/xact3wb.h | 64 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+) create mode 100644 include/xact3wb.h diff --git a/include/Makefile.in b/include/Makefile.in index 8284d6fdf3..b1e7d0084f 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -772,6 +772,7 @@ SOURCES = \ wtypes.idl \ wuapi.idl \ x3daudio.h \ + xact3wb.h \ xapo.idl \ xapofx.h \ xaudio2.idl \ diff --git a/include/xact3wb.h b/include/xact3wb.h new file mode 100644 index 0000000000..d283efc112 --- /dev/null +++ b/include/xact3wb.h @@ -0,0 +1,64 @@ +/* + * Copyright (c) 2020 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#ifndef __XACT3WB_H__ +#define __XACT3WB_H__ + +typedef union WAVEBANKMINIWAVEFORMAT +{ + struct + { + DWORD wFormatTag : 2; + DWORD nChannels : 3; + DWORD nSamplesPerSec : 18; + DWORD wBlockAlign : 8; + DWORD wBitsPerSample : 1; + } DUMMYSTRUCTNAME; + + DWORD dwValue; +} WAVEBANKMINIWAVEFORMAT; + +typedef struct WAVEBANKREGION +{ + DWORD dwOffset; + DWORD dwLength; +} WAVEBANKREGION; + +typedef struct WAVEBANKSAMPLEREGION +{ + DWORD dwStartSample; + DWORD dwTotalSamples; +} WAVEBANKSAMPLEREGION; + +typedef struct WAVEBANKENTRY +{ + union + { + struct + { + DWORD dwFlags : 4; + DWORD Duration : 28; + } DUMMYSTRUCTNAME; + DWORD dwFlagsAndDuration; + } DUMMYUNIONNAME; + + WAVEBANKMINIWAVEFORMAT Format; + WAVEBANKREGION PlayRegion; + WAVEBANKSAMPLEREGION LoopRegion; +} WAVEBANKENTRY; + +#endif /* __XACT3WB_H__ */ -- 2.17.1

1 0

[PATCH v3] include: Add xact3wb.h
by Alistair Leslie-Hughes 24 Jan '20

24 Jan '20

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/Makefile.in | 1 + include/xact3wb.h | 64 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+) create mode 100644 include/xact3wb.h diff --git a/include/Makefile.in b/include/Makefile.in index 8a05f5d01c..5dac4e66d5 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -771,6 +771,7 @@ SOURCES = \ wtypes.idl \ wuapi.idl \ x3daudio.h \ + xact3wb.h \ xapo.idl \ xapofx.h \ xaudio2.idl \ diff --git a/include/xact3wb.h b/include/xact3wb.h new file mode 100644 index 0000000000..b0dce3b2d4 --- /dev/null +++ b/include/xact3wb.h @@ -0,0 +1,64 @@ +/* + * Copyright (c) 2020 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#ifndef __XACT3WB_H__ +#define __XACT3WB_H__ + +typedef union WAVEBANKMINIWAVEFORMAT +{ + struct + { + DWORD wFormatTag : 2; + DWORD nChannels : 3; + DWORD nSamplesPerSec : 18; + DWORD wBlockAlign : 8; + DWORD wBitsPerSample : 1; + } DUMMYSTRUCTNAME; + + DWORD dwValue; +} WAVEBANKMINIWAVEFORMAT; + +typedef struct WAVEBANKREGION +{ + DWORD dwOffset; + DWORD dwLength; +} WAVEBANKREGION; + +typedef struct WAVEBANKSAMPLEREGION +{ + DWORD dwStartSample; + DWORD dwTotalSamples; +} WAVEBANKSAMPLEREGION; + +typedef struct WAVEBANKENTRY +{ + union + { + struct + { + DWORD dwFlags : 4; + DWORD Duration : 28; + } DUMMYSTRUCTNAME; + DWORD dwFlagsAndDuration; + } NONAMELESSUNION; + + WAVEBANKMINIWAVEFORMAT Format; + WAVEBANKREGION PlayRegion; + WAVEBANKSAMPLEREGION LoopRegion; +} WAVEBANKENTRY; + +#endif /* __XACT3WB_H__ */ -- 2.17.1

2 1

[PATCH] widl: Support function pointers in structs
by Alistair Leslie-Hughes 24 Jan '20

24 Jan '20

Visual Studio idl's support functions pointers within struct's. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/xact3.idl | 6 +++--- tools/widl/parser.y | 5 ++--- tools/widl/typegen.c | 1 + tools/widl/typegen.h | 1 + 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/include/xact3.idl b/include/xact3.idl index 85b18d0b9f..252478b83e 100644 --- a/include/xact3.idl +++ b/include/xact3.idl @@ -70,8 +70,8 @@ typedef BOOL (__stdcall *XACT_GETOVERLAPPEDRESULT_CALLBACK)( ); typedef struct XACT_FILEIO_CALLBACKS { - BYTE* readFileCallback; /* FIXME: XACT_READFILE_CALLBACK */ - BYTE* getOverlappedResultCallback; /* FIXME: XACT_GETOVERLAPPEDRESULT_CALLBACK */ + XACT_READFILE_CALLBACK readFileCallback; + XACT_GETOVERLAPPEDRESULT_CALLBACK getOverlappedResultCallback; } XACT_FILEIO_CALLBACKS; typedef struct XACT_NOTIFICATION XACT_NOTIFICATION; @@ -87,7 +87,7 @@ typedef struct XACT_RUNTIME_PARAMETERS DWORD globalSettingsFlags; DWORD globalSettingsAllocAttributes; XACT_FILEIO_CALLBACKS fileIOCallbacks; - BYTE* fnNotificationCallback; /* FIXME: XACT_NOTIFICATION_CALLBACK */ + XACT_NOTIFICATION_CALLBACK fnNotificationCallback; LPCWSTR pRendererID; IXAudio2 *pXAudio2; IXAudio2MasteringVoice *pMasteringVoice; diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 5f6eb50878..090fb00339 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -2521,9 +2521,6 @@ static void check_field_common(const type_t *container_type, case TYPE_VOID: reason = "cannot derive from void *"; break; - case TYPE_FUNCTION: - reason = "cannot be a function pointer"; - break; case TYPE_BITFIELD: reason = "cannot be a bit-field"; break; @@ -2575,6 +2572,7 @@ static void check_field_common(const type_t *container_type, error_loc_info(&arg->loc_info, "undefined type declaration \"enum %s\"\n", type->name); } case TGT_USER_TYPE: + case TGT_FUNCTION_POINTER: case TGT_IFACE_POINTER: case TGT_BASIC: case TGT_RANGE: @@ -2659,6 +2657,7 @@ static void check_remoting_args(const var_t *func) case TGT_INVALID: /* already error'd before we get here */ case TGT_CTXT_HANDLE_POINTER: + case TGT_FUNCTION_POINTER: case TGT_POINTER: case TGT_ARRAY: /* OK */ diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 9b8aa1a322..ce3b1207c6 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -367,6 +367,7 @@ enum typegen_type typegen_detect_type(const type_t *type, const attr_list_t *att case TYPE_ARRAY: return TGT_ARRAY; case TYPE_FUNCTION: + return TGT_FUNCTION_POINTER; case TYPE_COCLASS: case TYPE_INTERFACE: case TYPE_MODULE: diff --git a/tools/widl/typegen.h b/tools/widl/typegen.h index 95ad601768..c388e62434 100644 --- a/tools/widl/typegen.h +++ b/tools/widl/typegen.h @@ -58,6 +58,7 @@ enum typegen_type TGT_STRUCT, TGT_UNION, TGT_RANGE, + TGT_FUNCTION_POINTER, }; typedef int (*type_pred_t)(const type_t *); -- 2.17.1

2 1

[PATCH] kernelbase: Implement GetThreadIdealProcessorEx stub.
by Roman Pišl 24 Jan '20

24 Jan '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48313 Signed-off-by: Roman Pišl <rpisl(a)seznam.cz> --- .../api-ms-win-core-processthreads-l1-1-1.spec | 2 +- .../api-ms-win-core-processthreads-l1-1-2.spec | 2 +- dlls/kernel32/kernel32.spec | 2 +- dlls/kernelbase/kernelbase.spec | 2 +- dlls/kernelbase/thread.c | 11 +++++++++++ 5 files changed, 15 insertions(+), 4 deletions(-) diff --git a/dlls/api-ms-win-core-processthreads-l1-1-1/api-ms-win-core-processthreads-l1-1-1.spec b/dlls/api-ms-win-core-processthreads-l1-1-1/api-ms-win-core-processthreads-l1-1-1.spec index e4cfec2b64..c0187f100f 100644 --- a/dlls/api-ms-win-core-processthreads-l1-1-1/api-ms-win-core-processthreads-l1-1-1.spec +++ b/dlls/api-ms-win-core-processthreads-l1-1-1/api-ms-win-core-processthreads-l1-1-1.spec @@ -28,7 +28,7 @@ @ stdcall GetStartupInfoW(ptr) kernel32.GetStartupInfoW @ stdcall GetThreadContext(long ptr) kernel32.GetThreadContext @ stdcall GetThreadId(ptr) kernel32.GetThreadId -@ stub GetThreadIdealProcessorEx +@ stdcall GetThreadIdealProcessorEx(long ptr) kernel32.GetThreadIdealProcessorEx @ stdcall GetThreadPriority(long) kernel32.GetThreadPriority @ stdcall GetThreadPriorityBoost(long ptr) kernel32.GetThreadPriorityBoost @ stdcall GetThreadTimes(long ptr ptr ptr ptr) kernel32.GetThreadTimes diff --git a/dlls/api-ms-win-core-processthreads-l1-1-2/api-ms-win-core-processthreads-l1-1-2.spec b/dlls/api-ms-win-core-processthreads-l1-1-2/api-ms-win-core-processthreads-l1-1-2.spec index 45d52ff171..793015cf53 100644 --- a/dlls/api-ms-win-core-processthreads-l1-1-2/api-ms-win-core-processthreads-l1-1-2.spec +++ b/dlls/api-ms-win-core-processthreads-l1-1-2/api-ms-win-core-processthreads-l1-1-2.spec @@ -31,7 +31,7 @@ @ stdcall GetThreadContext(long ptr) kernel32.GetThreadContext @ stdcall GetThreadIOPendingFlag(long ptr) kernel32.GetThreadIOPendingFlag @ stdcall GetThreadId(ptr) kernel32.GetThreadId -@ stub GetThreadIdealProcessorEx +@ stdcall GetThreadIdealProcessorEx(long ptr) kernel32.GetThreadIdealProcessorEx @ stub GetThreadInformation @ stdcall GetThreadPriority(long) kernel32.GetThreadPriority @ stdcall GetThreadPriorityBoost(long ptr) kernel32.GetThreadPriorityBoost diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index be48ef1694..f9295dc3ee 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -853,7 +853,7 @@ @ stdcall -import GetThreadGroupAffinity(long ptr) @ stdcall -import GetThreadIOPendingFlag(long ptr) @ stdcall -import GetThreadId(ptr) -# @ stub GetThreadIdealProcessorEx +@ stdcall -import GetThreadIdealProcessorEx(long ptr) @ stdcall -import GetThreadLocale() @ stdcall GetThreadPreferredUILanguages(long ptr ptr ptr) @ stdcall -import GetThreadPriority(long) diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index f36d4d525c..caa6de1d51 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -716,7 +716,7 @@ @ stdcall GetThreadGroupAffinity(long ptr) @ stdcall GetThreadIOPendingFlag(long ptr) @ stdcall GetThreadId(ptr) -# @ stub GetThreadIdealProcessorEx +@ stdcall GetThreadIdealProcessorEx(long ptr) # @ stub GetThreadInformation @ stdcall GetThreadLocale() @ stdcall GetThreadPreferredUILanguages(long ptr ptr ptr) kernel32.GetThreadPreferredUILanguages diff --git a/dlls/kernelbase/thread.c b/dlls/kernelbase/thread.c index f669c9d873..14ec215d8f 100644 --- a/dlls/kernelbase/thread.c +++ b/dlls/kernelbase/thread.c @@ -245,6 +245,17 @@ DWORD WINAPI DECLSPEC_HOTPATCH GetThreadId( HANDLE thread ) } +/*********************************************************************** + * GetThreadIdealProcessorEx (kernelbase.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH GetThreadIdealProcessorEx( HANDLE thread, PROCESSOR_NUMBER *ideal ) +{ + FIXME( "(%p %p): stub\n", thread, ideal ); + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); + return FALSE; +} + + /*********************************************************************** * GetThreadLocale (kernelbase.@) */ -- 2.20.1

2 1

[PATCH v2 1/2] crypt32: also check CERT_CHAIN_POLICY_ALLOW_UNKNOWN_CA_FLAG
by Ilia Mirkin 24 Jan '20

24 Jan '20

It appears that the untrusted root check should be skipped if this flag is set even if the ExtraPolicyPara one is not set. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48495 Signed-off-by: Ilia Mirkin <imirkin(a)alum.mit.edu> --- v2: reorder to be before the test addition. making the test have todo_wine is a lot of work, which would then have to be entirely undone. dlls/crypt32/chain.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index 396a563c04..935fd6e344 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -3455,10 +3455,13 @@ static BOOL WINAPI verify_ssl_policy(LPCSTR szPolicyOID, PCERT_CHAIN_POLICY_STATUS pPolicyStatus) { HTTPSPolicyCallbackData *sslPara = NULL; - DWORD checks = 0; + DWORD checks = 0, baseChecks = 0; if (pPolicyPara) + { + baseChecks = pPolicyPara->dwFlags; sslPara = pPolicyPara->pvExtraPolicyPara; + } if (TRACE_ON(chain)) dump_ssl_extra_chain_policy_para(sslPara); if (sslPara && sslPara->u.cbSize >= sizeof(HTTPSPolicyCallbackData)) @@ -3474,7 +3477,8 @@ static BOOL WINAPI verify_ssl_policy(LPCSTR szPolicyOID, } else if (pChainContext->TrustStatus.dwErrorStatus & CERT_TRUST_IS_UNTRUSTED_ROOT && - !(checks & SECURITY_FLAG_IGNORE_UNKNOWN_CA)) + !(checks & SECURITY_FLAG_IGNORE_UNKNOWN_CA) && + !(baseChecks & CERT_CHAIN_POLICY_ALLOW_UNKNOWN_CA_FLAG)) { pPolicyStatus->dwError = CERT_E_UNTRUSTEDROOT; find_element_with_error(pChainContext, -- 2.24.1

1 1

[PATCH] msado15: Implement _Recordset get_CursorLocation and put_CursorLocation.
by Alistair Leslie-Hughes 23 Jan '20

23 Jan '20

This patch was deferred. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msado15/recordset.c | 20 ++++++++++++++++---- dlls/msado15/tests/msado15.c | 6 ++++++ 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index 1d28d6b957..1f16add4c3 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -43,6 +43,7 @@ struct recordset LONG allocated; LONG index; VARIANT *data; + CursorLocationEnum cursor_location; }; struct fields @@ -1229,14 +1230,24 @@ static HRESULT WINAPI recordset_CancelBatch( _Recordset *iface, AffectEnum affec static HRESULT WINAPI recordset_get_CursorLocation( _Recordset *iface, CursorLocationEnum *cursor_loc ) { - FIXME( "%p, %p\n", iface, cursor_loc ); - return E_NOTIMPL; + struct recordset *recordset = impl_from_Recordset( iface ); + + TRACE( "%p, %p\n", iface, cursor_loc ); + + *cursor_loc = recordset->cursor_location; + + return S_OK; } static HRESULT WINAPI recordset_put_CursorLocation( _Recordset *iface, CursorLocationEnum cursor_loc ) { - FIXME( "%p, %u\n", iface, cursor_loc ); - return E_NOTIMPL; + struct recordset *recordset = impl_from_Recordset( iface ); + + TRACE( "%p, %u\n", iface, cursor_loc ); + + recordset->cursor_location = cursor_loc; + + return S_OK; } static HRESULT WINAPI recordset_NextRecordset( _Recordset *iface, VARIANT *records_affected, _Recordset **record_set ) @@ -1524,6 +1535,7 @@ HRESULT Recordset_create( void **obj ) recordset->ISupportErrorInfo_iface.lpVtbl = &recordset_supporterrorinfo_vtbl; recordset->refs = 1; recordset->index = -1; + recordset->cursor_location = adUseServer; *obj = &recordset->Recordset_iface; TRACE( "returning iface %p\n", *obj ); diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index afdf0dfb6a..917d131063 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -65,6 +65,7 @@ static void test_Recordset(void) Field *field; LONG refs, count, state; VARIANT missing, val, index; + CursorLocationEnum location; BSTR name; HRESULT hr; @@ -132,6 +133,11 @@ static void test_Recordset(void) ok( hr == S_OK, "got %08x\n", hr ); ok( state == adStateClosed, "got %d\n", state ); + location = -1; + hr = _Recordset_get_CursorLocation( recordset, &location ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( location == adUseServer, "got %d\n", location ); + VariantInit( &missing ); hr = _Recordset_AddNew( recordset, missing, missing ); ok( hr == MAKE_ADO_HRESULT( adErrObjectClosed ), "got %08x\n", hr ); -- 2.17.1

1 0

[PATCH] include: Add cdosys.idl
by Alistair Leslie-Hughes 23 Jan '20

23 Jan '20

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/Makefile.in | 1 + include/cdosys.idl | 242 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 243 insertions(+) create mode 100644 include/cdosys.idl diff --git a/include/Makefile.in b/include/Makefile.in index b1e7d0084f..5f967b616d 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -51,6 +51,7 @@ SOURCES = \ bluetoothapis.h \ bthsdpdef.h \ cderr.h \ + cdosys.idl \ cfgmgr32.h \ cguid.h \ chprst.idl \ diff --git a/include/cdosys.idl b/include/cdosys.idl new file mode 100644 index 0000000000..9b8c6af129 --- /dev/null +++ b/include/cdosys.idl @@ -0,0 +1,242 @@ +/* + * Copyright (C) 2019 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +import "unknwn.idl"; +import "objidl.idl"; +import "oaidl.idl"; + +#if !defined(progid) && !defined(__WIDL__) +#define threading(model) +#define progid(str) +#define vi_progid(str) +#endif + +[ + uuid(cd000000-8b95-11d1-82db-00c04fb1625d), + version(1.0) +] +library CDO +{ + importlib("stdole2.tlb"); + + interface _Stream; + interface IBodyPart; + interface IBodyParts; + interface IConfiguration; + interface IDataSource; + interface Fields; + + typedef enum + { + cdoDSNDefault = 0, + cdoDSNNever = 1, + cdoDSNFailure = 2, + cdoDSNSuccess = 4, + cdoDSNDelay = 8, + cdoDSNSuccessFailOrDelay = 14 + } CdoDSNOptions; + + typedef enum + { + cdoRefTypeId = 0, + cdoRefTypeLocation = 1 + } CdoReferenceType; + + typedef enum + { + cdoSuppressNone = 0, + cdoSuppressImages = 1, + cdoSuppressBGSounds = 2, + cdoSuppressFrames = 4, + cdoSuppressObjects = 8, + cdoSuppressStyleSheets = 16, + cdoSuppressAll = 31 + } CdoMHTMLFlags; + + [ + odl, + uuid(cd000020-8b95-11d1-82db-00c04fb1625d), + dual, + nonextensible, + oleautomation + ] + interface IMessage : IDispatch + { + [id(0x00000065), propget] + HRESULT BCC([out, retval] BSTR *bcc); + [id(0x00000065), propput] + HRESULT BCC([in] BSTR bcc); + + [id(0x00000067), propget] + HRESULT CC([out, retval] BSTR *cc); + [id(0x00000067), propput] + HRESULT CC([in] BSTR cc); + + [id(0x00000069), propget] + HRESULT FollowUpTo([out, retval] BSTR *follow); + [id(0x00000069), propput] + HRESULT FollowUpTo([in] BSTR follow); + + [id(0x0000006a), propget] + HRESULT From([out, retval] BSTR *from); + [id(0x0000006a), propput] + HRESULT From([in] BSTR from); + + [id(0x0000006b), propget] + HRESULT Keywords([out, retval] BSTR* keywords); + [id(0x0000006b), propput] + HRESULT Keywords([in] BSTR keywords); + + [id(0x0000006e), propget] + HRESULT MimeFormatted([out, retval] VARIANT_BOOL *formatted); + [id(0x0000006e), propput] + HRESULT MimeFormatted([in] VARIANT_BOOL formatted); + + [id(0x0000006f), propget] + HRESULT Newsgroups([out, retval] BSTR *newsgroups); + [id(0x0000006f), propput] + HRESULT Newsgroups([in] BSTR newsgroups); + [id(0x00000070), propget] + + HRESULT Organization([out, retval] BSTR *organization); + [id(0x00000070), propput] + HRESULT Organization([in] BSTR organization); + + [id(0x00000072), propget] + HRESULT ReceivedTime([out, retval] DATE *received); + + [id(0x00000073), propget] + HRESULT ReplyTo([out, retval] BSTR *reply); + [id(0x00000073), propput] + HRESULT ReplyTo([in] BSTR reply); + + [id(0x00000074), propget] + HRESULT DSNOptions([out, retval] CdoDSNOptions *options); + [id(0x00000074), propput] + HRESULT DSNOptions([in] CdoDSNOptions options); + + [id(0x00000077), propget] + HRESULT SentOn([out, retval] DATE *sent); + + [id(0x00000078), propget] + HRESULT Subject([out, retval] BSTR *subject); + [id(0x00000078), propput] + HRESULT Subject([in] BSTR subject); + + [id(0x00000079), propget] + HRESULT To([out, retval] BSTR *to); + [id(0x00000079), propput] + HRESULT To([in] BSTR to); + + [id(0x0000007b), propget] + HRESULT TextBody([out, retval] BSTR *body); + [id(0x0000007b), propput] + HRESULT TextBody([in] BSTR body); + + [id(0x0000007c)] + HRESULT HTMLBody([out, retval] BSTR* body); + [id(0x0000007c), propput] + HRESULT HTMLBody([in] BSTR body); + + [id(0x0000007d), propget] + HRESULT Attachments([out, retval] IBodyParts **attachments); + + [id(0x0000007e), propget] + HRESULT Sender([out, retval] BSTR *sender); + [id(0x0000007e), propput] + HRESULT Sender([in] BSTR sender); + + [id(0x0000007f), propget] + HRESULT Configuration([out, retval] IConfiguration **config); + [id(0x0000007f), propput] + HRESULT Configuration([in] IConfiguration *config); + [id(0x0000007f), propputref] + HRESULT Configuration([in] IConfiguration *config); + + [id(0x00000080), propget] + HRESULT AutoGenerateTextBody([out, retval] VARIANT_BOOL *body); + [id(0x00000080), propput] + HRESULT AutoGenerateTextBody([in] VARIANT_BOOL body); + + [id(0x00000081), propget] + HRESULT EnvelopeFields([out, retval] Fields **fields); + + [id(0x00000082), propget] + HRESULT TextBodyPart([out, retval] IBodyPart **body); + [id(0x00000083), propget] + HRESULT HTMLBodyPart([out, retval] IBodyPart **body); + + [id(0x00000084), propget] + HRESULT BodyPart([out, retval] IBodyPart ** part); + + [id(0x00000085), propget] + HRESULT DataSource([out, retval] IDataSource **datasource); + + [id(0x00000086), propget] + HRESULT Fields([out, retval] Fields **fields); + + [id(0x00000087), propget] + HRESULT MDNRequested([out, retval] VARIANT_BOOL* requested); + [id(0x00000087), propput] + HRESULT MDNRequested([in] VARIANT_BOOL requested); + + [id(0x00000096)] + HRESULT AddRelatedBodyPart([in] BSTR url, [in] BSTR Reference, [in] CdoReferenceType ReferenceType, + [in, optional] BSTR username, [in, optional] BSTR password, [out, retval] IBodyPart **body); + [id(0x00000097)] + HRESULT AddAttachment([in] BSTR url, [in, optional] BSTR username, + [in, optional] BSTR password, [out, retval] IBodyPart **body); + + [id(0x00000098)] + HRESULT CreateMHTMLBody([in] BSTR url, [in, optional, defaultvalue(0)] CdoMHTMLFlags flags, + [in, optional] BSTR username, [in, optional] BSTR password); + + [id(0x00000099)] + HRESULT Forward([out, retval] IMessage **msg); + + [id(0x0000009a)] + HRESULT Post(); + + [id(0x0000009b)] + HRESULT PostReply([out, retval] IMessage **msg); + + [id(0x0000009c)] + HRESULT Reply([out, retval] IMessage **msg); + + [id(0x0000009d)] + HRESULT ReplyAll([out, retval] IMessage **msg); + + [id(0x0000009e)] + HRESULT Send(); + + [id(0x0000009f)] + HRESULT GetStream([out, retval] _Stream **stream); + + [id(0x000000a0)] + HRESULT GetInterface([in] BSTR name, [out, retval] IDispatch **unknown); + }; + + [ + uuid(cd000001-8b95-11d1-82db-00c04fb1625d) + ] + coclass Message + { + [default] interface IMessage; + interface IDataSource; + interface IBodyPart; + }; +} -- 2.17.1

1 0

[PATCH] gdi32: Link ScriptGetCMap from usp10 dll with spec file
by Esdras Tarsis 23 Jan '20

23 Jan '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48505 Signed-off-by: Esdras Tarsis <esdrastarsis(a)gmail.com> --- dlls/gdi32/gdi32.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index 8faa2978f4..f50230a929 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -426,6 +426,7 @@ @ stdcall SaveDC(long) @ stdcall ScaleViewportExtEx(long long long long long ptr) @ stdcall ScaleWindowExtEx(long long long long long ptr) +@ stdcall ScriptGetCMap(ptr ptr ptr long long ptr) usp10.ScriptGetCMap @ stub SelectBrushLocal @ stdcall SelectClipPath(long long) @ stdcall SelectClipRgn(long long) -- 2.25.0

1 0

[PATCH v2] winedump: Add a default case to numeric_leaf().
by Gerald Pfeifer 23 Jan '20

23 Jan '20

This addresses two warnings issues by GCC 10 (currently in development stage 4, so this is unlikely to change): msc.c:687:9: warning: 'value' may be used uninitialized in this function msc.c:301:13: warning: 'value' may be used uninitialized in this function The only difference to v1 is the Signed-off-by: header. Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> --- tools/winedump/msc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/winedump/msc.c b/tools/winedump/msc.c index fbe7f9e541..6843f899b1 100644 --- a/tools/winedump/msc.c +++ b/tools/winedump/msc.c @@ -206,6 +206,7 @@ static int numeric_leaf(int* value, const unsigned short int* leaf) { case fv_integer: *value = fv.v.i; break; case fv_longlong: *value = (unsigned)fv.v.llu; printf("bad conversion\n"); break; + default: assert( 0 ); *value = 0; } return len; } -- 2.24.0

1 0

Re: [PATCH] dlls: Global variable compatibility update for gcc 10
by Michael Cronenworth 23 Jan '20

23 Jan '20

On 1/23/20 3:49 PM, Marvin wrote: > This is an automated notification to let you know that your patch has > been reviewed and its status set to "Needs splitting". Do you want each DLL to have a separate patch?

1 0

[PATCH v3 1/4] kernel32/tests: Fix GetLastError() checks in environment tests.
by Vladimir Panteleev 23 Jan '20

23 Jan '20

Lack of SetLastError() calls caused tests to compare stale errors, instead of the effects of the tested (immediately previously called) functions. Add SetLastError calls, and fix a broken test (copy check from A to W tests). Signed-off-by: Vladimir Panteleev <git(a)vladimir.panteleev.md> --- Since v2: No changes (only rebase on master). Suggested change from v2 is in next commit as it requires changes in Wine. dlls/kernel32/tests/environ.c | 29 ++++++++++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/environ.c b/dlls/kernel32/tests/environ.c index 44a6a0cff0..128a5fdbe5 100644 --- a/dlls/kernel32/tests/environ.c +++ b/dlls/kernel32/tests/environ.c @@ -131,6 +131,7 @@ static void test_GetSetEnvironmentVariableA(void) ok(ret == TRUE, "should erase existing variable\n"); lstrcpyA(buf, "foo"); + SetLastError(0xdeadbeef); ret_size = GetEnvironmentVariableA(name, buf, lstrlenA(value) + 1); ok(lstrcmpA(buf, "foo") == 0, "should not touch the buffer\n"); ok(ret_size == 0 && GetLastError() == ERROR_ENVVAR_NOT_FOUND, @@ -163,16 +164,19 @@ static void test_GetSetEnvironmentVariableA(void) name, ret_size, GetLastError(), buf); /* Test the limits */ + SetLastError(0xdeadbeef); ret_size = GetEnvironmentVariableA(NULL, NULL, 0); ok(ret_size == 0 && (GetLastError() == ERROR_INVALID_PARAMETER || GetLastError() == ERROR_ENVVAR_NOT_FOUND), "should not find variable but ret_size=%d GetLastError=%d\n", ret_size, GetLastError()); + SetLastError(0xdeadbeef); ret_size = GetEnvironmentVariableA(NULL, buf, lstrlenA(value) + 1); ok(ret_size == 0 && (GetLastError() == ERROR_INVALID_PARAMETER || GetLastError() == ERROR_ENVVAR_NOT_FOUND), "should not find variable but ret_size=%d GetLastError=%d\n", ret_size, GetLastError()); + SetLastError(0xdeadbeef); ret_size = GetEnvironmentVariableA("", buf, lstrlenA(value) + 1); ok(ret_size == 0 && GetLastError() == ERROR_ENVVAR_NOT_FOUND, "should not find variable but ret_size=%d GetLastError=%d\n", @@ -233,6 +237,7 @@ static void test_GetSetEnvironmentVariableW(void) ok(ret == TRUE, "should erase existing variable\n"); lstrcpyW(buf, fooW); + SetLastError(0xdeadbeef); ret_size = GetEnvironmentVariableW(name, buf, lstrlenW(value) + 1); ok(lstrcmpW(buf, fooW) == 0, "should not touch the buffer\n"); ok(ret_size == 0 && GetLastError() == ERROR_ENVVAR_NOT_FOUND, @@ -255,25 +260,31 @@ static void test_GetSetEnvironmentVariableW(void) ok(ret == TRUE, "should not fail with empty value but GetLastError=%d\n", GetLastError()); lstrcpyW(buf, fooW); + SetLastError(0); ret_size = GetEnvironmentVariableW(name, buf, lstrlenW(value) + 1); - ok(ret_size == 0 && GetLastError() == ERROR_ENVVAR_NOT_FOUND, - "should not find variable but ret_size=%d GetLastError=%d\n", + ok(ret_size == 0 && + ((GetLastError() == 0 && lstrcmpW(buf, empty_strW) == 0) || + (GetLastError() == ERROR_ENVVAR_NOT_FOUND)), + "should be set to \"\" (NT) or removed (Win9x) but ret_size=%d GetLastError=%d\n", ret_size, GetLastError()); ok(lstrcmpW(buf, empty_strW) == 0, "should copy an empty string\n"); /* Test the limits */ + SetLastError(0xdeadbeef); ret_size = GetEnvironmentVariableW(NULL, NULL, 0); - ok(ret_size == 0 && GetLastError() == ERROR_ENVVAR_NOT_FOUND, + ok(ret_size == 0 && (GetLastError() == ERROR_INVALID_PARAMETER || GetLastError() == ERROR_ENVVAR_NOT_FOUND), "should not find variable but ret_size=%d GetLastError=%d\n", ret_size, GetLastError()); if (0) /* Both tests crash on Vista */ { + SetLastError(0xdeadbeef); ret_size = GetEnvironmentVariableW(NULL, buf, lstrlenW(value) + 1); ok(ret_size == 0 && GetLastError() == ERROR_ENVVAR_NOT_FOUND, "should not find variable but ret_size=%d GetLastError=%d\n", ret_size, GetLastError()); + SetLastError(0xdeadbeef); ret = SetEnvironmentVariableW(NULL, NULL); ok(ret == FALSE && (GetLastError() == ERROR_INVALID_PARAMETER || GetLastError() == ERROR_ENVVAR_NOT_FOUND), "should fail with NULL, NULL but ret=%d and GetLastError=%d\n", @@ -342,6 +353,7 @@ static void test_ExpandEnvironmentStringsA(void) ret_size = ExpandEnvironmentStringsA(buf, buf2, sizeof(buf2)); ok(!strcmp(buf, buf2), "ExpandEnvironmentStrings failed %s vs %s. ret_size = %d\n", buf, buf2, ret_size); + SetLastError(0xdeadbeef); ret_size1 = GetWindowsDirectoryA(buf1,256); ok ((ret_size1 >0) && (ret_size1<256), "GetWindowsDirectory Failed\n"); ret_size = ExpandEnvironmentStringsA("%SystemRoot%",buf,sizeof(buf)); @@ -374,6 +386,7 @@ static void test_GetComputerName(void) int name_len; size = 0; + SetLastError(0xdeadbeef); ret = GetComputerNameA((LPSTR)0xdeadbeef, &size); error = GetLastError(); ok(!ret && error == ERROR_BUFFER_OVERFLOW, "GetComputerNameA should have failed with ERROR_BUFFER_OVERFLOW instead of %d\n", error); @@ -433,6 +446,7 @@ static void test_GetComputerNameExA(void) } size = 0; + SetLastError(0xdeadbeef); ret = pGetComputerNameExA(ComputerNameDnsDomain, (LPSTR)0xdeadbeef, &size); error = GetLastError(); ok(ret == 0, "Expected 0, got %d\n", ret); @@ -452,6 +466,7 @@ static void test_GetComputerNameExA(void) HeapFree(GetProcessHeap(), 0, name); size = 0; + SetLastError(0xdeadbeef); ret = pGetComputerNameExA(ComputerNameDnsFullyQualified, (LPSTR)0xdeadbeef, &size); error = GetLastError(); ok(ret == 0, "Expected 0, got %d\n", ret); @@ -468,6 +483,7 @@ static void test_GetComputerNameExA(void) HeapFree(GetProcessHeap(), 0, name); size = 0; + SetLastError(0xdeadbeef); ret = pGetComputerNameExA(ComputerNameDnsHostname, (LPSTR)0xdeadbeef, &size); error = GetLastError(); ok(ret == 0, "Expected 0, got %d\n", ret); @@ -484,12 +500,14 @@ static void test_GetComputerNameExA(void) HeapFree(GetProcessHeap(), 0, name); size = 0; + SetLastError(0xdeadbeef); ret = pGetComputerNameExA(ComputerNameNetBIOS, (LPSTR)0xdeadbeef, &size); error = GetLastError(); ok(ret == 0, "Expected 0, got %d\n", ret); ok(error == ERROR_MORE_DATA, "Expected ERROR_MORE_DATA, got %d\n", error); size = 0; + SetLastError(0xdeadbeef); ret = pGetComputerNameExA(ComputerNameNetBIOS, NULL, &size); error = GetLastError(); ok(ret == 0, "Expected 0, got %d\n", ret); @@ -520,6 +538,7 @@ static void test_GetComputerNameExW(void) } size = 0; + SetLastError(0xdeadbeef); ret = pGetComputerNameExW(ComputerNameDnsDomain, (LPWSTR)0xdeadbeef, &size); error = GetLastError(); ok(!ret && error == ERROR_MORE_DATA, "GetComputerNameExW should have failed with ERROR_MORE_DATA instead of %d\n", error); @@ -530,6 +549,7 @@ static void test_GetComputerNameExW(void) HeapFree(GetProcessHeap(), 0, nameW); size = 0; + SetLastError(0xdeadbeef); ret = pGetComputerNameExW(ComputerNameDnsFullyQualified, (LPWSTR)0xdeadbeef, &size); error = GetLastError(); ok(!ret && error == ERROR_MORE_DATA, "GetComputerNameExW should have failed with ERROR_MORE_DATA instead of %d\n", error); @@ -540,6 +560,7 @@ static void test_GetComputerNameExW(void) HeapFree(GetProcessHeap(), 0, nameW); size = 0; + SetLastError(0xdeadbeef); ret = pGetComputerNameExW(ComputerNameDnsHostname, (LPWSTR)0xdeadbeef, &size); error = GetLastError(); ok(!ret && error == ERROR_MORE_DATA, "GetComputerNameExW should have failed with ERROR_MORE_DATA instead of %d\n", error); @@ -550,6 +571,7 @@ static void test_GetComputerNameExW(void) HeapFree(GetProcessHeap(), 0, nameW); size = 0; + SetLastError(0xdeadbeef); ret = pGetComputerNameExW(ComputerNameNetBIOS, (LPWSTR)0xdeadbeef, &size); error = GetLastError(); ok(!ret && error == ERROR_MORE_DATA, "GetComputerNameExW should have failed with ERROR_MORE_DATA instead of %d\n", error); @@ -560,6 +582,7 @@ static void test_GetComputerNameExW(void) HeapFree(GetProcessHeap(), 0, nameW); size = 0; + SetLastError(0xdeadbeef); ret = pGetComputerNameExW(ComputerNameNetBIOS, NULL, &size); error = GetLastError(); ok(!ret && error == ERROR_MORE_DATA, "GetComputerNameExW should have failed with ERROR_MORE_DATA instead of %d\n", error); -- 2.25.0

2 4

[PATCH] xinput: Implement XInputGetKeystroke
by Andrew Eikum 23 Jan '20

23 Jan '20

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/xinput1_3/xinput_main.c | 216 ++++++++++++++++++++++++++++++-- dlls/xinput1_3/xinput_private.h | 1 + 2 files changed, 209 insertions(+), 8 deletions(-) diff --git a/dlls/xinput1_3/xinput_main.c b/dlls/xinput1_3/xinput_main.c index 5485ae8d2d1..63b7dd7f0b5 100644 --- a/dlls/xinput1_3/xinput_main.c +++ b/dlls/xinput1_3/xinput_main.c @@ -202,19 +202,219 @@ DWORD WINAPI DECLSPEC_HOTPATCH XInputGetStateEx(DWORD index, XINPUT_STATE* state return xinput_get_state(index, state); } +static const int JS_STATE_OFF = 0; +static const int JS_STATE_LOW = 1; +static const int JS_STATE_HIGH = 2; + +static int joystick_state(const SHORT value) +{ + if (value > 20000) + return JS_STATE_HIGH; + if (value < -20000) + return JS_STATE_LOW; + return JS_STATE_OFF; +} + +static WORD js_vk_offs(const int x, const int y) +{ + if (y == JS_STATE_OFF) + { + /*if (x == JS_STATE_OFF) shouldn't get here */ + if (x == JS_STATE_LOW) return 3; /* LEFT */ + /*if (x == JS_STATE_HIGH)*/ return 2; /* RIGHT */ + } + if (y == JS_STATE_HIGH) + { + if (x == JS_STATE_OFF) return 0; /* UP */ + if (x == JS_STATE_LOW) return 4; /* UPLEFT */ + /*if (x == JS_STATE_HIGH)*/ return 5; /* UPRIGHT */ + } + /*if (y == JS_STATE_LOW)*/ + { + if (x == JS_STATE_OFF) return 1; /* DOWN */ + if (x == JS_STATE_LOW) return 7; /* DOWNLEFT */ + /*if (x == JS_STATE_HIGH)*/ return 6; /* DOWNRIGHT */ + } +} + +static DWORD check_joystick_keystroke(const DWORD index, XINPUT_KEYSTROKE *keystroke, + const SHORT *cur_x, const SHORT *cur_y, SHORT *last_x, SHORT *last_y, + const WORD base_vk) +{ + int cur_vk = 0, cur_x_st, cur_y_st; + int last_vk = 0, last_x_st, last_y_st; + + cur_x_st = joystick_state(*cur_x); + cur_y_st = joystick_state(*cur_y); + if (cur_x_st || cur_y_st) + cur_vk = base_vk + js_vk_offs(cur_x_st, cur_y_st); + + last_x_st = joystick_state(*last_x); + last_y_st = joystick_state(*last_y); + if (last_x_st || last_y_st) + last_vk = base_vk + js_vk_offs(last_x_st, last_y_st); + + if (cur_vk != last_vk) + { + if (last_vk) + { + /* joystick was set, and now different. send a KEYUP event, and set + * last pos to centered, so the appropriate KEYDOWN event will be + * sent on the next call. */ + keystroke->VirtualKey = last_vk; + keystroke->Unicode = 0; /* unused */ + keystroke->Flags = XINPUT_KEYSTROKE_KEYUP; + keystroke->UserIndex = index; + keystroke->HidCode = 0; + + *last_x = 0; + *last_y = 0; + + return ERROR_SUCCESS; + } + + /* joystick was unset, send KEYDOWN. */ + keystroke->VirtualKey = cur_vk; + keystroke->Unicode = 0; /* unused */ + keystroke->Flags = XINPUT_KEYSTROKE_KEYDOWN; + keystroke->UserIndex = index; + keystroke->HidCode = 0; + + *last_x = *cur_x; + *last_y = *cur_y; + + return ERROR_SUCCESS; + } + + *last_x = *cur_x; + *last_y = *cur_y; + + return ERROR_EMPTY; +} + +static BOOL trigger_is_on(const BYTE value) +{ + return value > 30; +} + +static DWORD check_for_keystroke(const DWORD index, XINPUT_KEYSTROKE *keystroke) +{ + xinput_controller *device = &controllers[index]; + const XINPUT_GAMEPAD *cur; + DWORD ret = ERROR_EMPTY; + int i; + + static const struct { + int mask; + WORD vk; + } buttons[] = { + { XINPUT_GAMEPAD_DPAD_UP, VK_PAD_DPAD_UP }, + { XINPUT_GAMEPAD_DPAD_DOWN, VK_PAD_DPAD_DOWN }, + { XINPUT_GAMEPAD_DPAD_LEFT, VK_PAD_DPAD_LEFT }, + { XINPUT_GAMEPAD_DPAD_RIGHT, VK_PAD_DPAD_RIGHT }, + { XINPUT_GAMEPAD_START, VK_PAD_START }, + { XINPUT_GAMEPAD_BACK, VK_PAD_BACK }, + { XINPUT_GAMEPAD_LEFT_THUMB, VK_PAD_LTHUMB_PRESS }, + { XINPUT_GAMEPAD_RIGHT_THUMB, VK_PAD_RTHUMB_PRESS }, + { XINPUT_GAMEPAD_LEFT_SHOULDER, VK_PAD_LSHOULDER }, + { XINPUT_GAMEPAD_RIGHT_SHOULDER, VK_PAD_RSHOULDER }, + { XINPUT_GAMEPAD_A, VK_PAD_A }, + { XINPUT_GAMEPAD_B, VK_PAD_B }, + { XINPUT_GAMEPAD_X, VK_PAD_X }, + { XINPUT_GAMEPAD_Y, VK_PAD_Y }, + /* note: guide button does not send an event */ + }; + + if (!verify_and_lock_device(device)) + return ERROR_DEVICE_NOT_CONNECTED; + + cur = &device->state.Gamepad; + + /*** buttons ***/ + for (i = 0; i < ARRAY_SIZE(buttons); ++i) + { + if ((cur->wButtons & buttons[i].mask) ^ (device->last_keystroke.wButtons & buttons[i].mask)) + { + keystroke->VirtualKey = buttons[i].vk; + keystroke->Unicode = 0; /* unused */ + if (cur->wButtons & buttons[i].mask) + { + keystroke->Flags = XINPUT_KEYSTROKE_KEYDOWN; + device->last_keystroke.wButtons |= buttons[i].mask; + } + else + { + keystroke->Flags = XINPUT_KEYSTROKE_KEYUP; + device->last_keystroke.wButtons &= ~buttons[i].mask; + } + keystroke->UserIndex = index; + keystroke->HidCode = 0; + ret = ERROR_SUCCESS; + goto done; + } + } + + /*** triggers ***/ + if (trigger_is_on(cur->bLeftTrigger) ^ trigger_is_on(device->last_keystroke.bLeftTrigger)) + { + keystroke->VirtualKey = VK_PAD_LTRIGGER; + keystroke->Unicode = 0; /* unused */ + keystroke->Flags = trigger_is_on(cur->bLeftTrigger) ? XINPUT_KEYSTROKE_KEYDOWN : XINPUT_KEYSTROKE_KEYUP; + keystroke->UserIndex = index; + keystroke->HidCode = 0; + device->last_keystroke.bLeftTrigger = cur->bLeftTrigger; + ret = ERROR_SUCCESS; + goto done; + } + + if (trigger_is_on(cur->bRightTrigger) ^ trigger_is_on(device->last_keystroke.bRightTrigger)) + { + keystroke->VirtualKey = VK_PAD_RTRIGGER; + keystroke->Unicode = 0; /* unused */ + keystroke->Flags = trigger_is_on(cur->bRightTrigger) ? XINPUT_KEYSTROKE_KEYDOWN : XINPUT_KEYSTROKE_KEYUP; + keystroke->UserIndex = index; + keystroke->HidCode = 0; + device->last_keystroke.bRightTrigger = cur->bRightTrigger; + ret = ERROR_SUCCESS; + goto done; + } + + /*** joysticks ***/ + ret = check_joystick_keystroke(index, keystroke, &cur->sThumbLX, &cur->sThumbLY, + &device->last_keystroke.sThumbLX, + &device->last_keystroke.sThumbLY, VK_PAD_LTHUMB_UP); + if (ret == ERROR_SUCCESS) + goto done; + + ret = check_joystick_keystroke(index, keystroke, &cur->sThumbRX, &cur->sThumbRY, + &device->last_keystroke.sThumbRX, + &device->last_keystroke.sThumbRY, VK_PAD_RTHUMB_UP); + if (ret == ERROR_SUCCESS) + goto done; + +done: + unlock_device(device); + + return ret; +} + DWORD WINAPI DECLSPEC_HOTPATCH XInputGetKeystroke(DWORD index, DWORD reserved, PXINPUT_KEYSTROKE keystroke) { - static int warn_once; + TRACE("(index %u, reserved %u, keystroke %p)\n", index, reserved, keystroke); - if (!warn_once++) - FIXME("(index %u, reserved %u, keystroke %p) Stub!\n", index, reserved, keystroke); - - if (index >= XUSER_MAX_COUNT) + if (index >= XUSER_MAX_COUNT && index != XUSER_INDEX_ANY) return ERROR_BAD_ARGUMENTS; - if (!controllers[index].platform_private) - return ERROR_DEVICE_NOT_CONNECTED; - return ERROR_NOT_SUPPORTED; + if (index == XUSER_INDEX_ANY) + { + int i; + for (i = 0; i < XUSER_MAX_COUNT; ++i) + if (check_for_keystroke(i, keystroke) == ERROR_SUCCESS) + return ERROR_SUCCESS; + return ERROR_EMPTY; + } + + return check_for_keystroke(index, keystroke); } DWORD WINAPI DECLSPEC_HOTPATCH XInputGetCapabilities(DWORD index, DWORD flags, XINPUT_CAPABILITIES* capabilities) diff --git a/dlls/xinput1_3/xinput_private.h b/dlls/xinput1_3/xinput_private.h index f3456cd8e7c..7de9a2a2e4d 100644 --- a/dlls/xinput1_3/xinput_private.h +++ b/dlls/xinput1_3/xinput_private.h @@ -23,6 +23,7 @@ typedef struct _xinput_controller XINPUT_CAPABILITIES caps; void *platform_private; /* non-NULL when device is valid; validity may be read without holding crit */ XINPUT_STATE state; + XINPUT_GAMEPAD last_keystroke; XINPUT_VIBRATION vibration; } xinput_controller; -- 2.25.0

1 0

[PATCH] msctf/tests: Fix some test failures on Windows 10.
by Zebediah Figura 23 Jan '20

23 Jan '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/msctf/tests/inputprocessor.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index f8ec492f7f0..81e692d1d2b 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -2406,6 +2406,7 @@ static void test_AssociateFocus(void) ITfThreadMgr_SetFocus(g_tm,dmorig); sink_check_ok(&test_OnSetFocus,"OnSetFocus"); + test_OnInitDocumentMgr = test_OnPushContext = SINK_OPTIONAL; /* Win10 1709+ */ test_CurrentFocus = FOCUS_SAVE; test_PrevFocus = FOCUS_SAVE; test_OnSetFocus = SINK_SAVE; @@ -2422,11 +2423,13 @@ static void test_AssociateFocus(void) ok(olddm == dm1, "incorrect old DocumentMgr returned\n"); ITfDocumentMgr_Release(olddm); + test_OnInitDocumentMgr = test_OnPushContext = SINK_OPTIONAL; /* Win10 1709+ */ test_OnSetFocus = SINK_IGNORE; /* OnSetFocus fires a couple of times on Win7 */ test_CurrentFocus = FOCUS_IGNORE; test_PrevFocus = FOCUS_IGNORE; SetFocus(wnd2); processPendingMessages(); + test_OnInitDocumentMgr = test_OnPushContext = SINK_OPTIONAL; /* Win10 1709+ */ SetFocus(wnd1); processPendingMessages(); @@ -2444,6 +2447,7 @@ static void test_AssociateFocus(void) ITfDocumentMgr_Release(dm1); + test_OnPopContext = SINK_OPTIONAL; /* Win10 1709+ */ test_CurrentFocus = dmorig; test_PrevFocus = FOCUS_IGNORE; test_OnSetFocus = SINK_OPTIONAL; @@ -2454,8 +2458,9 @@ static void test_AssociateFocus(void) test_CurrentFocus = FOCUS_IGNORE; test_PrevFocus = FOCUS_IGNORE; DestroyWindow(wnd1); + test_OnPopContext = SINK_OPTIONAL; /* Win10 1709+ */ DestroyWindow(wnd2); - test_OnPopContext = SINK_OPTIONAL; /* Vista and greater */ + test_OnPopContext = SINK_IGNORE; /* Vista+, twice Win10 1709+ */ test_OnSetFocus = SINK_OPTIONAL; /* Vista and greater */ ITfThreadMgr_GetFocus(g_tm, &test_PrevFocus); test_CurrentFocus = NULL; -- 2.24.1

1 0

[PATCH] find/tests: Add tests for file based search
by Fabian Maurer 23 Jan '20

23 Jan '20

--- programs/find/tests/find.c | 118 ++++++++++++++++++++++++++++++++++--- 1 file changed, 109 insertions(+), 9 deletions(-) diff --git a/programs/find/tests/find.c b/programs/find/tests/find.c index 147b59c8ce..741b3a47ad 100644 --- a/programs/find/tests/find.c +++ b/programs/find/tests/find.c @@ -180,10 +180,44 @@ static void run_find_stdin_(const WCHAR *commandline, const BYTE *input, int inp heap_free(child_output); } +static void run_find_file_(const WCHAR *commandline, const BYTE *input, int input_len, const BYTE *out_expected, int out_expected_len, int exitcode_expected, const char *file, int line) +{ + char path_temp_file[MAX_PATH]; + char path_temp_dir[MAX_PATH]; + HANDLE handle_file; + WCHAR commandline_new[MAX_PATH]; + BYTE *out_expected_new; + char header[MAX_PATH]; + int header_len; + + GetTempPathA(ARRAY_SIZE(path_temp_dir), path_temp_dir); + GetTempFileNameA(path_temp_dir, "", 0, path_temp_file); + handle_file = CreateFileA(path_temp_file, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL); + write_to_handle(handle_file, input, input_len); + CloseHandle(handle_file); + + wsprintfW(commandline_new, L"%s %hs", commandline, path_temp_file); + + CharUpperA(path_temp_file); + wsprintfA(header, "\r\n---------- %s\r\n", path_temp_file); + header_len = lstrlenA(header); + out_expected_new = heap_alloc(header_len + out_expected_len); + memcpy(out_expected_new, header, header_len); + memcpy(out_expected_new + header_len, out_expected, out_expected_len); + + run_find_stdin_(commandline_new, (BYTE*)"", 0, out_expected_new, header_len + out_expected_len, exitcode_expected, file, line); + heap_free(out_expected_new); + + DeleteFileA(path_temp_file); +} + #define run_find_stdin_str(commandline, input, out_expected, exitcode_expected) \ - run_find_stdin_str_(commandline, input, out_expected, exitcode_expected, __FILE__, __LINE__) + run_find_str_(commandline, input, out_expected, exitcode_expected, 0, __FILE__, __LINE__) -static void run_find_stdin_str_(const char *commandline, const char *input, const char *out_expected, int exitcode_expected, const char *file, int line) +#define run_find_file_str(commandline, input, out_expected, exitcode_expected) \ + run_find_str_(commandline, input, out_expected, exitcode_expected, 1, __FILE__, __LINE__) + +static void run_find_str_(const char *commandline, const char *input, const char *out_expected, int exitcode_expected, BOOL is_file, const char *file, int line) { WCHAR *commandlineW; int len_commandlineW; @@ -193,15 +227,20 @@ static void run_find_stdin_str_(const char *commandline, const char *input, cons commandlineW = heap_alloc(len_commandlineW * sizeof(WCHAR)); MultiByteToWideChar(CP_UTF8, 0, commandline, -1, commandlineW, len_commandlineW); - run_find_stdin_(commandlineW, (BYTE *)input, lstrlenA(input), (BYTE *)out_expected, lstrlenA(out_expected), exitcode_expected, file, line); - + if (is_file) + run_find_file_(commandlineW, (BYTE *)input, lstrlenA(input), (BYTE *)out_expected, lstrlenA(out_expected), exitcode_expected, file, line); + else + run_find_stdin_(commandlineW, (BYTE *)input, lstrlenA(input), (BYTE *)out_expected, lstrlenA(out_expected), exitcode_expected, file, line); heap_free(commandlineW); } #define run_find_stdin_unicode(input, out_expected, exitcode_expected) \ - run_find_stdin_unicode_(input, sizeof(input), out_expected, sizeof(out_expected), exitcode_expected, __FILE__, __LINE__) + run_find_unicode_(input, sizeof(input), out_expected, sizeof(out_expected), exitcode_expected, 0, __FILE__, __LINE__) -static void run_find_stdin_unicode_(const BYTE *input, int input_len, const BYTE *out_expected, int out_expected_len, int exitcode_expected, const char *file, int line) +#define run_find_file_unicode(input, out_expected, exitcode_expected) \ + run_find_unicode_(input, sizeof(input), out_expected, sizeof(out_expected), exitcode_expected, 1, __FILE__, __LINE__) + +static void run_find_unicode_(const BYTE *input, int input_len, const BYTE *out_expected, int out_expected_len, int exitcode_expected, BOOL is_file, const char *file, int line) { /* Need "test" as char and quoted wchar */ static const WCHAR wstr_quoted_test[] = { '"','t', 'e', 's', 't','"',0 }; @@ -219,7 +258,10 @@ static void run_find_stdin_unicode_(const BYTE *input, int input_len, const BYTE exitcode_expected = 1; } - run_find_stdin_(wstr_quoted_test, input, input_len, out_expected_mangled, out_expected_mangled_len, exitcode_expected, file, line); + if (is_file) + run_find_file_(wstr_quoted_test, input, input_len, out_expected_mangled, out_expected_mangled_len, exitcode_expected, file, line); + else + run_find_stdin_(wstr_quoted_test, input, input_len, out_expected_mangled, out_expected_mangled_len, exitcode_expected, file, line); } static void test_errors(void) @@ -272,7 +314,7 @@ static const BYTE str_rus_utf8_nobom[] = { 0xD0,0xBF,0xD1,0x static const BYTE str_en_utf8_bom[] = { 0xEF,0xBB,0xBF,'e','n','t','e','s','t','\r','\n' }; static const BYTE str_en_utf8_nobom[] = { 'e','n','t','e','s','t','\r','\n' }; -static void test_unicode_support(void) +static void test_unicode_support_stdin(void) { /* Test unicode support on STDIN * Those depend on the active codepage - e.g. 932 (japanese) behaves different from 1252 (latin) @@ -302,6 +344,62 @@ static void test_unicode_support(void) run_find_stdin_unicode(str_jap_utf16le_bom, str_jap_utf16le_bom, 0); } +static void test_file_search(void) +{ + todo_wine + run_find_file_str("\"\"", "test", "", 1); + todo_wine + run_find_file_str("\"test\"", "", "", 1); + todo_wine + run_find_file_str("\"test\"", "test", "test\r\n", 0); + todo_wine + run_find_file_str("\"test\"", "test2", "test2\r\n", 0); + todo_wine + run_find_file_str("\"test\"", "test\r2", "test\r2\r\n", 0); + todo_wine + run_find_file_str("\"test2\"", "test", "", 1); + todo_wine + run_find_file_str("\"test\"", "test\nother\ntest2\ntest3", "test\r\ntest2\r\ntest3\r\n", 0); +} + +static void test_unicode_support_file(void) +{ + /* Test unicode support on files */ + + /* Test UTF-8 BOM */ + todo_wine + run_find_file_unicode(str_en_utf8_nobom, str_en_utf8_nobom, 0); + todo_wine + run_find_file_unicode(str_en_utf8_bom, str_en_utf8_bom, 0); + + /* Test russian characters */ + todo_wine + run_find_file_unicode(str_rus_utf8_bom, str_rus_utf8_bom, 0); + todo_wine + run_find_file_unicode(str_rus_utf8_nobom, str_rus_utf8_nobom, 0); + + /* Test japanese characters */ + todo_wine + run_find_file_unicode(str_jap_utf8_nobom, str_jap_utf8_nobom, 0); + todo_wine + run_find_file_unicode(str_jap_utf8_bom, str_jap_utf8_bom, 0); + todo_wine + run_find_file_unicode(str_jap_shiftjis, str_jap_shiftjis, 0); + + /* Test unsupported encodings */ + todo_wine + run_find_file_unicode(str_jap_utf16le_nobom, str_empty, 1); + todo_wine + run_find_file_unicode(str_jap_utf16be_bom, str_empty, 1); + todo_wine + run_find_file_unicode(str_jap_utf16be_nobom, str_empty, 1); + + /* Test utf16le */ + todo_wine + run_find_file_unicode(str_jap_utf16le_bom, str_jap_utf16le_bom, 0); +} + + START_TEST(find) { if (PRIMARYLANGID(GetUserDefaultUILanguage()) != LANG_ENGLISH) @@ -314,5 +412,7 @@ START_TEST(find) } test_singleline_without_switches(); test_multiline(); - test_unicode_support(); + test_unicode_support_stdin(); + test_file_search(); + test_unicode_support_file(); } -- 2.25.0

1 0

[PATCH] gdi32: Fix some spec file entries (try 2)
by André Hentschel 23 Jan '20

23 Jan '20

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/gdi32/gdi32.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index 8faa2978f49..7994f080939 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -1,5 +1,5 @@ # ordinal exports -100 stdcall @(long long str str str) GDI_CallDevInstall16 +100 stdcall @(segptr long str str str) GDI_CallDevInstall16 101 stdcall @(long str str ptr) GDI_CallExtDeviceModePropSheet16 102 stdcall @(long ptr str str ptr str long) GDI_CallExtDeviceMode16 103 stdcall @(long str ptr ptr) GDI_CallAdvancedSetupDialog16 -- 2.17.1

2 1

test_compressed_surface_stretch fails on r200 GPUs
by Stefan Dösinger 23 Jan '20

23 Jan '20

Hi Paul, In my quest to squash ddraw test failures on my hardware lab I have run into a recently added problem. Maybe you still have an active enough memory of the test code that you can help me understand the failure. The system is a 2003-era laptop with an ATI Mobility Radeon 9000 running windows XP. The test failures are in the attached ddraw7.txt file. I ran the test with some minimal modifications, see ddraw7.diff. My gut feeling is that this is not simply a color precision issue - the values are pretty far apart, especially for 16 bit surfaces. Yet, something is apparently going right. The blit happens and the result at least resembles the expected results. It makes sense to me that only the sysmem->vidmem blit is affected as that's the most likely case to be accelerated by the driver. Could the driver handle the src rectangle incorrectly? My cheap way to fix it would be to add something like broken(ddraw_is_amd() && color == 0x8019), but if we can find a way to keep the test intact on this hardware that would be better. Cheers, Stefan

2 2

[PATCH] gdiplus: If the font unit is not pixels scaling should not be applied.
by Dmitry Timoshkov 23 Jan '20

23 Jan '20

I don't see a way of adding a test case for this, I'm attaching a test app (source + binary) that visually shows problematic behaviour. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/gdiplus/graphics.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index e485e5c99f..c52fa65445 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2276,6 +2276,12 @@ static void get_font_hfont(GpGraphics *graphics, GDIPCONST GpFont *font, (pt[1].X-pt[0].X)*(pt[1].X-pt[0].X)); rel_height = sqrt((pt[2].Y-pt[0].Y)*(pt[2].Y-pt[0].Y)+ (pt[2].X-pt[0].X)*(pt[2].X-pt[0].X)); + /* If the font unit is not pixels scaling should not be applied */ + if (font->unit != UnitPixel && font->unit != UnitWorld) + { + rel_width /= graphics->scale; + rel_height /= graphics->scale; + } get_log_fontW(font, graphics, &lfw); lfw.lfHeight = -gdip_round(font_height * rel_height); -- 2.20.1

2 1

[PATCH v2 1/2] gdiplus/tests: Add another GdipGetPathGradientCenterPoint test.
by Jeff Smith 23 Jan '20

23 Jan '20

Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> --- dlls/gdiplus/tests/brush.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/dlls/gdiplus/tests/brush.c b/dlls/gdiplus/tests/brush.c index bb645ffef9..c67ab74708 100644 --- a/dlls/gdiplus/tests/brush.c +++ b/dlls/gdiplus/tests/brush.c @@ -1299,6 +1299,7 @@ static void test_pathgradientcenterpoint(void) { static const GpPointF path_points[] = {{0,0}, {3,0}, {0,4}}; GpStatus status; + GpPath* path; GpPathGradient *grad; GpPointF point; @@ -1346,6 +1347,26 @@ static void test_pathgradientcenterpoint(void) status = GdipDeleteBrush((GpBrush*)grad); expect(Ok, status); + + status = GdipCreatePath(FillModeWinding, &path); + expect(Ok, status); + + status = GdipAddPathEllipse(path, 0, 0, 100, 50); + expect(Ok, status); + + status = GdipCreatePathGradientFromPath(path, &grad); + expect(Ok, status); + + status = GdipGetPathGradientCenterPoint(grad, &point); + expect(Ok, status); + todo_wine expectf(700.0/13.0, point.X); + expectf(25.0, point.Y); + + status = GdipDeletePath(path); + expect(Ok, status); + + status = GdipDeleteBrush((GpBrush*)grad); + expect(Ok, status); } static void test_pathgradientpresetblend(void) -- 2.23.0

2 3

[PATCH v2 1/4] user32/tests: Add broken w1064v1809 active window test results.
by Rémi Bernon 23 Jan '20

23 Jan '20

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/user32/tests/win.c | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 0f683f858a1..a31255f505d 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -3164,7 +3164,17 @@ static void test_SetActiveWindow(HWND hwnd) ShowWindow(hwnd, SW_HIDE); SetFocus(0); SetActiveWindow(0); - check_wnd_state(0, 0, 0, 0); + + /* On w1064v1809, ShowWindow(hwnd, SW_HIDE) / SetActiveWindow(0) + * does not change active window to 0, and then focus is not + * restored either when window is activated. */ + if (broken(GetActiveWindow() != 0)) + { + check_wnd_state(hwnd, 0, 0, 0); + SetFocus(hwnd); + } + else + check_wnd_state(0, 0, 0, 0); ShowWindow(hwnd, SW_SHOW); check_wnd_state(hwnd, hwnd, hwnd, 0); @@ -3188,7 +3198,17 @@ static void test_SetActiveWindow(HWND hwnd) check_wnd_state(hwnd, hwnd, hwnd, 0); ShowWindow(hwnd, SW_HIDE); - check_wnd_state(0, 0, 0, 0); + + /* On w1064v1809, ShowWindow(hwnd, SW_HIDE) / SetActiveWindow(0) + * does not change active window to 0, and then focus is not + * restored either when window is activated. */ + if (broken(GetActiveWindow() != 0)) + { + check_wnd_state(hwnd, 0, 0, 0); + SetFocus(hwnd); + } + else + check_wnd_state(0, 0, 0, 0); /* Invisible window. */ SetActiveWindow(hwnd); -- 2.25.0

2 7

[PATCH v3] setupapi: Handle arch-specific SourceDisks{Names, Files} .inf sections in get_source_info.
by Gijs Vermeulen 23 Jan '20

23 Jan '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48455 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/setupapi/query.c | 57 +++++++++++++++----------------- dlls/setupapi/queue.c | 13 ++++---- dlls/setupapi/setupapi_private.h | 3 ++ 3 files changed, 36 insertions(+), 37 deletions(-) diff --git a/dlls/setupapi/query.c b/dlls/setupapi/query.c index 828d8a1145..93e57fbe01 100644 --- a/dlls/setupapi/query.c +++ b/dlls/setupapi/query.c @@ -34,35 +34,23 @@ WINE_DEFAULT_DEBUG_CHANNEL(setupapi); #ifdef __i386__ -static const WCHAR source_disks_names_platform[] = - {'S','o','u','r','c','e','D','i','s','k','s','N','a','m','e','s','.','x','8','6',0}; -static const WCHAR source_disks_files_platform[] = - {'S','o','u','r','c','e','D','i','s','k','s','F','i','l','e','s','.','x','8','6',0}; +static const WCHAR source_disks_names_platform[] = L"SourceDisksNames.x86"; +static const WCHAR source_disks_files_platform[] = L"SourceDisksFiles.x86"; #elif defined(__x86_64__) -static const WCHAR source_disks_names_platform[] = - {'S','o','u','r','c','e','D','i','s','k','s','N','a','m','e','s','.','a','m','d','6','4',0}; -static const WCHAR source_disks_files_platform[] = - {'S','o','u','r','c','e','D','i','s','k','s','F','i','l','e','s','.','a','m','d','6','4',0}; +static const WCHAR source_disks_names_platform[] = L"SourceDisksNames.amd64"; +static const WCHAR source_disks_files_platform[] = L"SourceDisksFiles.amd64"; #elif defined(__arm__) -static const WCHAR source_disks_names_platform[] = - {'S','o','u','r','c','e','D','i','s','k','s','N','a','m','e','s','.','a','r','m',0}; -static const WCHAR source_disks_files_platform[] = - {'S','o','u','r','c','e','D','i','s','k','s','F','i','l','e','s','.','a','r','m',0}; +static const WCHAR source_disks_names_platform[] = L"SourceDisksNames.arm"; +static const WCHAR source_disks_files_platform[] = L"SourceDisksFiles.arm"; #elif defined(__aarch64__) -static const WCHAR source_disks_names_platform[] = - {'S','o','u','r','c','e','D','i','s','k','s','N','a','m','e','s','.','a','r','m','6','4',0}; -static const WCHAR source_disks_files_platform[] = - {'S','o','u','r','c','e','D','i','s','k','s','F','i','l','e','s','.','a','r','m','6','4',0}; +static const WCHAR source_disks_names_platform[] = L"SourceDisksNames.arm64"; +static const WCHAR source_disks_files_platform[] = L"SourceDisksFiles.arm64"; #else /* FIXME: other platforms */ -static const WCHAR source_disks_names_platform[] = - {'S','o','u','r','c','e','D','i','s','k','s','N','a','m','e','s',0}; -static const WCHAR source_disks_files_platform[] = - {'S','o','u','r','c','e','D','i','s','k','s','F','i','l','e','s',0}; +static const WCHAR source_disks_names_platform[] = L"SourceDisksNames"; +static const WCHAR source_disks_files_platform[] = L"SourceDisksFiles"; #endif -static const WCHAR source_disks_names[] = - {'S','o','u','r','c','e','D','i','s','k','s','N','a','m','e','s',0}; -static const WCHAR source_disks_files[] = - {'S','o','u','r','c','e','D','i','s','k','s','F','i','l','e','s',0}; +static const WCHAR source_disks_names[] = L"SourceDisksNames"; +static const WCHAR source_disks_files[] = L"SourceDisksFiles"; /* fills the PSP_INF_INFORMATION struct fill_info is TRUE * always returns the required size of the information @@ -121,6 +109,18 @@ static HINF search_for_inf(LPCVOID InfSpec, DWORD SearchControl) return INVALID_HANDLE_VALUE; } +BOOL search_for_source_disks_files( HINF hinf, const WCHAR *filename, INFCONTEXT *ctx ) +{ + return SetupFindFirstLineW( hinf, source_disks_files_platform, filename, ctx ) || + SetupFindFirstLineW( hinf, source_disks_files, filename, ctx ); +} + +BOOL search_for_source_disks_names( HINF hinf, const WCHAR *filename, INFCONTEXT *ctx ) +{ + return SetupFindFirstLineW( hinf, source_disks_names_platform, filename, ctx ) || + SetupFindFirstLineW( hinf, source_disks_names, filename, ctx ); +} + /*********************************************************************** * SetupGetInfInformationA (SETUPAPI.@) * @@ -374,8 +374,7 @@ static LPWSTR get_source_id( HINF hinf, PINFCONTEXT context, PCWSTR filename ) DWORD size; LPWSTR source_id; - if (!SetupFindFirstLineW( hinf, source_disks_files_platform, filename, context ) && - !SetupFindFirstLineW( hinf, source_disks_files, filename, context )) + if (!search_for_source_disks_files( hinf, filename, context )) return NULL; if (!SetupGetStringFieldW( context, 1, NULL, 0, &size )) @@ -390,8 +389,7 @@ static LPWSTR get_source_id( HINF hinf, PINFCONTEXT context, PCWSTR filename ) return NULL; } - if (!SetupFindFirstLineW( hinf, source_disks_names_platform, source_id, context ) && - !SetupFindFirstLineW( hinf, source_disks_names, source_id, context )) + if (!search_for_source_disks_names( hinf, source_id, context )) { HeapFree( GetProcessHeap(), 0, source_id ); return NULL; @@ -503,8 +501,7 @@ BOOL WINAPI SetupGetSourceInfoW( HINF hinf, UINT source_id, UINT info, swprintf( source_id_str, ARRAY_SIZE(source_id_str), fmt, source_id ); - if (!SetupFindFirstLineW( hinf, source_disks_names_platform, source_id_str, &ctx ) && - !SetupFindFirstLineW( hinf, source_disks_names, source_id_str, &ctx )) + if (!search_for_source_disks_names( hinf, source_id_str, &ctx )) return FALSE; switch (info) diff --git a/dlls/setupapi/queue.c b/dlls/setupapi/queue.c index 2d2c833474..29a76f1b8c 100644 --- a/dlls/setupapi/queue.c +++ b/dlls/setupapi/queue.c @@ -289,21 +289,20 @@ UINT CALLBACK QUEUE_callback_WtoA( void *context, UINT notification, static void get_source_info( HINF hinf, const WCHAR *src_file, SP_FILE_COPY_PARAMS_W *params, WCHAR *src_root, WCHAR *src_path) { - static const WCHAR SourceDisksNames[] = - {'S','o','u','r','c','e','D','i','s','k','s','N','a','m','e','s',0}; - static const WCHAR SourceDisksFiles[] = - {'S','o','u','r','c','e','D','i','s','k','s','F','i','l','e','s',0}; - INFCONTEXT file_ctx, disk_ctx; INT id, diskid; DWORD len; /* find the SourceDisksFiles entry */ - if (!SetupFindFirstLineW( hinf, SourceDisksFiles, src_file, &file_ctx )) return; + if (!search_for_source_disks_files( hinf, src_file, &file_ctx )) + return; + if (!SetupGetIntField( &file_ctx, 1, &diskid )) return; /* now find the diskid in the SourceDisksNames section */ - if (!SetupFindFirstLineW( hinf, SourceDisksNames, NULL, &disk_ctx )) return; + if (!search_for_source_disks_names( hinf, NULL, &disk_ctx )) + return; + for (;;) { if (SetupGetIntField( &disk_ctx, 0, &id ) && (id == diskid)) break; diff --git a/dlls/setupapi/setupapi_private.h b/dlls/setupapi/setupapi_private.h index f4685ab2b4..99ca8aa0c9 100644 --- a/dlls/setupapi/setupapi_private.h +++ b/dlls/setupapi/setupapi_private.h @@ -111,4 +111,7 @@ extern OSVERSIONINFOW OsVersionInfo DECLSPEC_HIDDEN; extern BOOL create_fake_dll( const WCHAR *name, const WCHAR *source ) DECLSPEC_HIDDEN; extern void cleanup_fake_dlls(void) DECLSPEC_HIDDEN; +extern BOOL search_for_source_disks_files( HINF hinf, const WCHAR *filename, INFCONTEXT *ctx ) DECLSPEC_HIDDEN; +extern BOOL search_for_source_disks_names( HINF hinf, const WCHAR *filename, INFCONTEXT *ctx ) DECLSPEC_HIDDEN; + #endif /* __SETUPAPI_PRIVATE_H */ -- 2.25.0

2 1

[PATCH v2] dinput: Support default DIPROP_BUFFERSIZE buffer size
by Alistair Leslie-Hughes 23 Jan '20

23 Jan '20

When a program calls SetProperty with DIPROP_BUFFERSIZE, dinput records this value for GetProperty but only uses it when the device can support that number of buffers otherwise a max value. In the case of game "Far Cry 5", it passes through (DWORD)-1 which cause HeapAlloc to fail ((DWORD)-1 * sizeof(DIDEVICEOBJECTDATA)). Since there is no real way of working out the max value, I've capped it at 20. MSDN reference. https://docs.microsoft.com/en-us/previous-versions/windows/desktop/ee417908… Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45732 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dinput/device.c | 14 ++++++++++---- dlls/dinput/device_private.h | 3 ++- dlls/dinput/tests/device.c | 20 +++++++++++++++++--- 3 files changed, 29 insertions(+), 8 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 28329d03b5..ab6f4e6896 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -1307,7 +1307,7 @@ HRESULT WINAPI IDirectInputDevice2WImpl_GetProperty(LPDIRECTINPUTDEVICE8W iface, if (pdiph->dwSize != sizeof(DIPROPDWORD)) return DIERR_INVALIDPARAM; - pd->dwData = This->queue_len; + pd->dwData = This->buffersize; TRACE("buffersize = %d\n", pd->dwData); break; } @@ -1396,12 +1396,18 @@ HRESULT WINAPI IDirectInputDevice2WImpl_SetProperty( TRACE("buffersize = %d\n", pd->dwData); EnterCriticalSection(&This->crit); + + This->buffersize = pd->dwData; + + This->queue_len = This->buffersize > 20 ? 20 : This->buffersize; + if (This->buffersize > 20) + WARN("Trying to set large buffer size %d\n", pd->dwData); + HeapFree(GetProcessHeap(), 0, This->data_queue); - This->data_queue = !pd->dwData ? NULL : HeapAlloc(GetProcessHeap(), 0, - pd->dwData * sizeof(DIDEVICEOBJECTDATA)); + This->data_queue = !This->queue_len ? NULL : HeapAlloc(GetProcessHeap(), 0, + This->queue_len * sizeof(DIDEVICEOBJECTDATA)); This->queue_head = This->queue_tail = This->overflow = 0; - This->queue_len = pd->dwData; LeaveCriticalSection(&This->crit); break; diff --git a/dlls/dinput/device_private.h b/dlls/dinput/device_private.h index 27e9c26286..23d9e2eebc 100644 --- a/dlls/dinput/device_private.h +++ b/dlls/dinput/device_private.h @@ -71,10 +71,11 @@ struct IDirectInputDeviceImpl DI_EVENT_PROC event_proc; /* function to receive mouse & keyboard events */ LPDIDEVICEOBJECTDATA data_queue; /* buffer for 'GetDeviceData'. */ - int queue_len; /* size of the queue - set in 'SetProperty' */ + int queue_len; /* valid size of the queue */ int queue_head; /* position to write new event into queue */ int queue_tail; /* next event to read from queue */ BOOL overflow; /* return DI_BUFFEROVERFLOW in 'GetDeviceData' */ + DWORD buffersize; /* size of the queue - set in 'SetProperty' */ DataFormat data_format; /* user data format and wine to user format converter */ diff --git a/dlls/dinput/tests/device.c b/dlls/dinput/tests/device.c index a2a5a65686..5232a7b813 100644 --- a/dlls/dinput/tests/device.c +++ b/dlls/dinput/tests/device.c @@ -71,7 +71,7 @@ static BOOL CALLBACK enum_type_callback(const DIDEVICEOBJECTINSTANCEA *oi, void return DIENUM_CONTINUE; } -static void test_object_info(IDirectInputDeviceA *device, HWND hwnd) +static void test_object_info(IDirectInputDeviceA *device, HWND hwnd, int size) { HRESULT hr; DIPROPDWORD dp; @@ -106,8 +106,22 @@ static void test_object_info(IDirectInputDeviceA *device, HWND hwnd) dp.diph.dwHeaderSize = sizeof(DIPROPHEADER); dp.diph.dwHow = DIPH_DEVICE; dp.diph.dwObj = 0; + dp.dwData = -1; + + hr = IDirectInputDevice_GetProperty(device, DIPROP_BUFFERSIZE, &dp.diph); + ok(hr == DI_OK, "Failed: %08x\n", hr); + ok(dp.dwData == size, "got %d\n", dp.dwData); + + dp.dwData = -1; + hr = IDirectInputDevice_SetProperty(device, DIPROP_BUFFERSIZE, (LPCDIPROPHEADER)&dp.diph); + ok(hr == DI_OK, "SetProperty() failed: %08x\n", hr); + dp.dwData = 0; + hr = IDirectInputDevice_GetProperty(device, DIPROP_BUFFERSIZE, &dp.diph); + ok(hr == DI_OK, "Failed: %08x\n", hr); + ok(dp.dwData == -1, "got %d\n", dp.dwData); + dp.dwData = 0; hr = IDirectInputDevice_SetProperty(device, DIPROP_BUFFERSIZE, (LPCDIPROPHEADER)&dp.diph); ok(hr == DI_OK, "SetProperty() failed: %08x\n", hr); cnt = 5; @@ -191,13 +205,13 @@ static BOOL CALLBACK enum_devices(const DIDEVICEINSTANCEA *lpddi, void *pvRef) hr = IUnknown_QueryInterface(device, &IID_IDirectInputDevice2A, (LPVOID*)&obj); ok(SUCCEEDED(hr), "IUnknown_QueryInterface(IID_IDirectInputDevice2A) failed: %08x\n", hr); - test_object_info(obj, data->hwnd); + test_object_info(obj, data->hwnd, 0); IUnknown_Release(obj); obj = NULL; hr = IUnknown_QueryInterface(device, &IID_IDirectInputDevice2W, (LPVOID*)&obj); ok(SUCCEEDED(hr), "IUnknown_QueryInterface(IID_IDirectInputDevice2W) failed: %08x\n", hr); - test_object_info(obj, data->hwnd); + test_object_info(obj, data->hwnd, 20); IUnknown_Release(obj); IUnknown_Release(device); -- 2.24.1

4 3

[PATCH v2 2/2] include: Add xact.idl
by Alistair Leslie-Hughes 23 Jan '20

23 Jan '20

From: Ethan Lee <elee(a)codeweavers.com> v2: Use a xact3wb.h for the structures that use :X syntax, which is the same as windows. #if 0 these structures and removed the union part with a equal size value. Windows only exposes the lastest IXACT3Engine, we'll have to use a private idl to define the other versions. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/Makefile.in | 1 + include/xact3.idl | 547 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 548 insertions(+) create mode 100644 include/xact3.idl diff --git a/include/Makefile.in b/include/Makefile.in index 5dac4e66d5..ee62a2ce70 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -771,6 +771,7 @@ SOURCES = \ wtypes.idl \ wuapi.idl \ x3daudio.h \ + xact3.idl \ xact3wb.h \ xapo.idl \ xapofx.h \ diff --git a/include/xact3.idl b/include/xact3.idl new file mode 100644 index 0000000000..85b18d0b9f --- /dev/null +++ b/include/xact3.idl @@ -0,0 +1,547 @@ +/* + * Copyright (c) 2018 Ethan Lee for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "unknwn.idl"; +import "xaudio2.idl"; + +cpp_quote("#include \"xact3wb.h\"") + +[ + uuid(bcc782bc-6492-4c22-8c35-f5d72fe73c6e) +] +coclass XACTEngine +{ + interface IUnknown; +} + +interface IXACT3Engine; +interface IXACT3SoundBank; +interface IXACT3WaveBank; +interface IXACT3Cue; +interface IXACT3Wave; + +typedef WORD XACTCATEGORY; +typedef BYTE XACTCHANNEL; +typedef WORD XACTINDEX; +typedef BYTE XACTINSTANCELIMIT; +typedef BYTE XACTLOOPCOUNT; +typedef BYTE XACTNOTIFICATIONTYPE; +typedef SHORT XACTPITCH; +typedef LONG XACTTIME; +typedef WORD XACTVARIABLEINDEX; +typedef FLOAT XACTVARIABLEVALUE; +typedef BYTE XACTVARIATIONWEIGHT; +typedef FLOAT XACTVOLUME; + +typedef struct XACT_RENDERER_DETAILS +{ + WCHAR rendererID[0xFF]; + WCHAR displayName[0xFF]; + BOOL defaultDevice; +} XACT_RENDERER_DETAILS; + +typedef BOOL (__stdcall *XACT_READFILE_CALLBACK)( + HANDLE hFile, + LPVOID lpBuffer, + DWORD nNumberOfBytesRead, + LPDWORD lpNumberOfBytesRead, + void* lpOverlapped +); +typedef BOOL (__stdcall *XACT_GETOVERLAPPEDRESULT_CALLBACK)( + HANDLE hFile, + void* lpOverlapped, + LPDWORD lpNumberOfBytesTransferred, + BOOL bWait +); +typedef struct XACT_FILEIO_CALLBACKS +{ + BYTE* readFileCallback; /* FIXME: XACT_READFILE_CALLBACK */ + BYTE* getOverlappedResultCallback; /* FIXME: XACT_GETOVERLAPPEDRESULT_CALLBACK */ +} XACT_FILEIO_CALLBACKS; + +typedef struct XACT_NOTIFICATION XACT_NOTIFICATION; +typedef void (__stdcall *XACT_NOTIFICATION_CALLBACK)( + const XACT_NOTIFICATION *pNotification +); + +typedef struct XACT_RUNTIME_PARAMETERS +{ + DWORD lookAheadTime; + BYTE* pGlobalSettingsBuffer; /* FIXME: void* */ + DWORD globalSettingsBufferSize; + DWORD globalSettingsFlags; + DWORD globalSettingsAllocAttributes; + XACT_FILEIO_CALLBACKS fileIOCallbacks; + BYTE* fnNotificationCallback; /* FIXME: XACT_NOTIFICATION_CALLBACK */ + LPCWSTR pRendererID; + IXAudio2 *pXAudio2; + IXAudio2MasteringVoice *pMasteringVoice; +} XACT_RUNTIME_PARAMETERS; + +typedef struct XACT_STREAMING_PARAMETERS +{ + BYTE* file; /* FIXME: HANDLE */ + DWORD offset; + DWORD flags; + WORD packetSize; +} XACT_STREAMING_PARAMETERS; + +/* defined in xact3wb.h */ +cpp_quote("#if 0") + +typedef struct WAVEBANKREGION +{ + DWORD dwOffset; + DWORD dwLength; +} WAVEBANKREGION; + +typedef struct WAVEBANKSAMPLEREGION +{ + DWORD dwStartSample; + DWORD dwTotalSamples; +} WAVEBANKSAMPLEREGION; + +typedef union WAVEBANKMINIWAVEFORMAT +{ + DWORD dwValue; +} WAVEBANKMINIWAVEFORMAT; + +typedef struct WAVEBANKENTRY +{ + DWORD dwFlagsAndDuration; /* Is a union */ + WAVEBANKMINIWAVEFORMAT Format; + WAVEBANKREGION PlayRegion; + WAVEBANKSAMPLEREGION LoopRegion; +} WAVEBANKENTRY; + +cpp_quote("#endif") + +typedef struct XACT_WAVE_PROPERTIES +{ + char friendlyName[64]; + WAVEBANKMINIWAVEFORMAT format; + DWORD durationInSamples; + WAVEBANKSAMPLEREGION loopRegion; + BOOL streaming; +} XACT_WAVE_PROPERTIES; + +typedef struct XACT_WAVE_INSTANCE_PROPERTIES +{ + XACT_WAVE_PROPERTIES waveProperties; /* FIXME: 'properties' */ + BOOL backgroundMusic; +} XACT_WAVE_INSTANCE_PROPERTIES; + +typedef struct XACT_CUE_PROPERTIES +{ + char friendlyName[0xFF]; + BOOL interactive; + XACTINDEX iaVariableIndex; + XACTINDEX numVariations; + XACTINSTANCELIMIT maxInstances; + XACTINSTANCELIMIT currentInstances; +} XACT_CUE_PROPERTIES; + +typedef struct XACT_TRACK_PROPERTIES +{ + XACTTIME duration; + XACTINDEX numVariations; + XACTCHANNEL numChannels; + XACTINDEX waveVariation; + XACTLOOPCOUNT loopCount; +} XACT_TRACK_PROPERTIES; + +typedef struct XACT_VARIATION_PROPERTIES +{ + XACTINDEX index; + XACTVARIATIONWEIGHT weight; + XACTVARIABLEVALUE iaVariableMin; + XACTVARIABLEVALUE iaVariableMax; + BOOL linger; +} XACT_VARIATION_PROPERTIES; + +typedef struct XACT_SOUND_PROPERTIES +{ + XACTCATEGORY category; + BYTE priority; + XACTPITCH pitch; + XACTVOLUME volume; + XACTINDEX numTracks; + XACT_TRACK_PROPERTIES arrTrackProperties[1]; +} XACT_SOUND_PROPERTIES; + +typedef struct XACT_SOUND_VARIATION_PROPERTIES +{ + XACT_VARIATION_PROPERTIES variationProperties; + XACT_SOUND_PROPERTIES soundProperties; +} XACT_SOUND_VARIATION_PROPERTIES; + +typedef struct XACT_CUE_INSTANCE_PROPERTIES +{ + DWORD allocAttributes; + XACT_CUE_PROPERTIES cueProperties; + XACT_SOUND_VARIATION_PROPERTIES activeVariationProperties; +} XACT_CUE_INSTANCE_PROPERTIES; + +cpp_quote("#include <pshpack1.h>") + +typedef struct XACT_NOTIFICATION_DESCRIPTION +{ + XACTNOTIFICATIONTYPE type; + BYTE flags; + IXACT3SoundBank *pSoundBank; + IXACT3WaveBank *pWaveBank; + IXACT3Cue *pCue; + IXACT3Wave *pWave; + XACTINDEX cueIndex; + XACTINDEX waveIndex; + BYTE* pvContext; /* FIXME: LPVOID */ +} XACT_NOTIFICATION_DESCRIPTION; + +typedef struct XACT_NOTIFICATION_CUE +{ + XACTINDEX cueIndex; + IXACT3SoundBank *pSoundBank; + IXACT3Cue *pCue; +} XACT_NOTIFICATION_CUE; + +typedef struct XACT_NOTIFICATION_MARKER +{ + XACTINDEX cueIndex; + IXACT3SoundBank *pSoundBank; + IXACT3Cue *pCue; + DWORD marker; +} XACT_NOTIFICATION_MARKER; + +typedef struct XACT_NOTIFICATION_SOUNDBANK +{ + IXACT3SoundBank *pSoundBank; +} XACT_NOTIFICATION_SOUNDBANK; + +typedef struct XACT_NOTIFICATION_WAVEBANK +{ + IXACT3WaveBank *pWaveBank; +} XACT_NOTIFICATION_WAVEBANK; + +typedef struct XACT_NOTIFICATION_VARIABLE +{ + XACTINDEX cueIndex; + IXACT3SoundBank *pSoundBank; + IXACT3Cue *pCue; + XACTVARIABLEINDEX variableIndex; + XACTVARIABLEVALUE variableValue; + BOOL local; +} XACT_NOTIFICATION_VARIABLE; + +typedef struct XACT_NOTIFICATION_GUI +{ + DWORD reserved; +} XACT_NOTIFICATION_GUI; + +typedef struct XACT_NOTIFICATION_WAVE +{ + IXACT3WaveBank *pWaveBank; + XACTINDEX waveIndex; + XACTINDEX cueIndex; + IXACT3SoundBank *pSoundBank; + IXACT3Cue *pCue; + IXACT3Wave *pWave; +} XACT_NOTIFICATION_WAVE; + +struct XACT_NOTIFICATION +{ + XACTNOTIFICATIONTYPE type; + LONG timeStamp; + PVOID pvContext; + union + { + XACT_NOTIFICATION_CUE cue; + XACT_NOTIFICATION_MARKER marker; + XACT_NOTIFICATION_SOUNDBANK soundBank; + XACT_NOTIFICATION_WAVEBANK waveBank; + XACT_NOTIFICATION_VARIABLE variable; + XACT_NOTIFICATION_GUI gui; + XACT_NOTIFICATION_WAVE wave; + }; +}; + +cpp_quote("#include <poppack.h>") + +static const XACTNOTIFICATIONTYPE XACTNOTIFICATIONTYPE_CUEDESTROYED = 4; +static const XACTNOTIFICATIONTYPE XACTNOTIFICATIONTYPE_SOUNDBANKDESTROYED = 6; +static const XACTNOTIFICATIONTYPE XACTNOTIFICATIONTYPE_WAVEBANKDESTROYED = 7; +static const XACTNOTIFICATIONTYPE XACTNOTIFICATIONTYPE_WAVEDESTROYED = 16; + +[ + object, + uuid(b1ee676a-d9cd-4d2a-89a8-fa53eb9e480b), +] +interface IXACT3Engine : IUnknown +{ + HRESULT GetRendererCount([out] XACTINDEX *pnRendererCount); + + HRESULT GetRendererDetails( + XACTINDEX nRendererIndex, + [out] XACT_RENDERER_DETAILS *pRendererDetails); + + HRESULT GetFinalMixFormat([out] WAVEFORMATEXTENSIBLE *pFinalMixFormat); + + HRESULT Initialize([in] const XACT_RUNTIME_PARAMETERS *pParams); + + HRESULT ShutDown(); + + HRESULT DoWork(); + + HRESULT CreateSoundBank( + [in] const BYTE* pvBuffer, /* FIXME: void* */ + DWORD dwSize, + DWORD dwFlags, + DWORD dwAllocAttributes, + [out] IXACT3SoundBank **ppSoundBank); + + HRESULT CreateInMemoryWaveBank( + [in] const BYTE* pvBuffer, /* FIXME: void* */ + DWORD dwSize, + DWORD dwFlags, + DWORD dwAllocAttributes, + [out] IXACT3WaveBank **ppWaveBank); + + HRESULT CreateStreamingWaveBank( + [in] const XACT_STREAMING_PARAMETERS *pParms, + [out] IXACT3WaveBank **ppWaveBank); + + HRESULT PrepareWave( + DWORD dwFlags, + [in] LPCSTR szWavePath, + WORD wStreamingPacketSize, + DWORD dwAlignment, + DWORD dwPlayOffset, + XACTLOOPCOUNT nLoopCount, + [out] IXACT3Wave **ppWave); + + HRESULT PrepareInMemoryWave( + DWORD dwFlags, + WAVEBANKENTRY entry, + [in] DWORD *pdwSeekTable, + [in] BYTE *pbWaveData, + DWORD dwPlayOffset, + XACTLOOPCOUNT nLoopCount, + [out] IXACT3Wave **ppWave); + + HRESULT PrepareStreamingWave( + DWORD dwFlags, + WAVEBANKENTRY entry, + XACT_STREAMING_PARAMETERS streamingParams, + DWORD dwAlignment, + [in] DWORD *pdwSeekTable, + DWORD dwPlayOffset, + XACTLOOPCOUNT nLoopCount, + [out] IXACT3Wave **ppWave); + + HRESULT RegisterNotification( + [in] const XACT_NOTIFICATION_DESCRIPTION *pNotificationDesc); + + HRESULT UnRegisterNotification( + [in] const XACT_NOTIFICATION_DESCRIPTION *pNotificationDesc); + + XACTCATEGORY GetCategory( + [in] LPCSTR szFriendlyName); + + HRESULT Stop(XACTCATEGORY nCategory, DWORD dwFlags); + + HRESULT SetVolume(XACTCATEGORY nCategory, XACTVOLUME nVolume); + + HRESULT Pause(XACTCATEGORY nCategory, BOOL fPause); + + XACTVARIABLEINDEX GetGlobalVariableIndex([in] LPCSTR szFriendlyName); + + HRESULT SetGlobalVariable( + XACTVARIABLEINDEX nIndex, + XACTVARIABLEVALUE nValue); + + HRESULT GetGlobalVariable( + XACTVARIABLEINDEX nIndex, + [out] XACTVARIABLEVALUE *nValue); +} + +[ + object, + local +] +interface IXACT3SoundBank +{ + XACTINDEX GetCueIndex([in] LPCSTR szFriendlyName); + + HRESULT GetNumCues([out] XACTINDEX *pnNumCues); + + HRESULT GetCueProperties( + XACTINDEX nCueIndex, + [out] XACT_CUE_PROPERTIES *pProperties); + + HRESULT Prepare( + XACTINDEX nCueIndex, + DWORD dwFlags, + XACTTIME timeOffset, + [out] IXACT3Cue **ppCue); + + HRESULT Play( + XACTINDEX nCueIndex, + DWORD dwFlags, + XACTTIME timeOffset, + [out] IXACT3Cue **ppCue); + + HRESULT Stop(XACTINDEX nCueIndex, DWORD dwFlags); + + HRESULT Destroy(); + + HRESULT GetState([out] DWORD *pdwState); +} + +[ + object, + local +] +interface IXACT3WaveBank +{ + HRESULT Destroy(); + + HRESULT GetNumWaves([out] XACTINDEX *pnNumWaves); + + XACTINDEX GetWaveIndex([in] LPCSTR szFriendlyName); + + HRESULT GetWaveProperties( + XACTINDEX nWaveIndex, + [out] XACT_WAVE_PROPERTIES *pWaveProperties); + + HRESULT Prepare( + XACTINDEX nWaveIndex, + DWORD dwFlags, + DWORD dwPlayOffset, + XACTLOOPCOUNT nLoopCount, + [out] IXACT3Wave **ppWave); + + HRESULT Play( + XACTINDEX nWaveIndex, + DWORD dwFlags, + DWORD dwPlayOffset, + XACTLOOPCOUNT nLoopCount, + [out] IXACT3Wave **ppWave); + + HRESULT Stop(XACTINDEX nWaveIndex, DWORD dwFlags); + + HRESULT GetState([out] DWORD *pdwState); +} + +[ + object, + local +] +interface IXACT34Cue +{ + HRESULT Play(); + + HRESULT Stop(DWORD dwFlags); + + HRESULT GetState([out] DWORD *pdwState); + + HRESULT Destroy(); + + HRESULT SetMatrixCoefficients( + UINT32 uSrcChannelCount, + UINT32 uDstChannelCount, + [in] float *pMatrixCoefficients); + + XACTVARIABLEINDEX GetVariableIndex([in] LPCSTR szFriendlyName); + + HRESULT SetVariable(XACTVARIABLEINDEX nIndex, XACTVARIABLEVALUE nValue); + + HRESULT GetVariable( + XACTVARIABLEINDEX nIndex, + [out] XACTVARIABLEVALUE *nValue); + + HRESULT Pause(BOOL fPause); + + HRESULT GetProperties([out] XACT_CUE_INSTANCE_PROPERTIES **ppProperties); +} + +[ + object, + local +] +interface IXACT3Cue +{ + HRESULT Play(); + + HRESULT Stop(DWORD dwFlags); + + HRESULT GetState([out] DWORD *pdwState); + + HRESULT Destroy(); + + HRESULT SetMatrixCoefficients( + UINT32 uSrcChannelCount, + UINT32 uDstChannelCount, + [in] float *pMatrixCoefficients); + + XACTVARIABLEINDEX GetVariableIndex([in] LPCSTR szFriendlyName); + + HRESULT SetVariable(XACTVARIABLEINDEX nIndex, XACTVARIABLEVALUE nValue); + + HRESULT GetVariable( + XACTVARIABLEINDEX nIndex, + [out] XACTVARIABLEVALUE *nValue); + + HRESULT Pause(BOOL fPause); + + HRESULT GetProperties([out] XACT_CUE_INSTANCE_PROPERTIES **ppProperties); + + HRESULT SetOutputVoices([in] const XAUDIO2_VOICE_SENDS *pSendList); + + HRESULT SetOutputVoiceMatrix( + [in] IXAudio2Voice *pDestinationVoice, + UINT32 SourceChannels, + UINT32 DestinationChannels, + [in, size_is(SourceChannels * DestinationChannels)] const float *pLevelMatrix); +} + +[ + object, + local +] +interface IXACT3Wave +{ + HRESULT Destroy(); + + HRESULT Play(); + + HRESULT Stop(DWORD dwFlags); + + HRESULT Pause(BOOL fPause); + + HRESULT GetState([out] DWORD *pdwState); + + HRESULT SetPitch(XACTPITCH pitch); + + HRESULT SetVolume(XACTVOLUME volume); + + HRESULT SetMatrixCoefficients( + UINT32 uSrcChannelCount, + UINT32 uDstChannelCount, + [in] float *pMatrixCoefficients); + + HRESULT GetProperties([out] XACT_WAVE_INSTANCE_PROPERTIES *pProperties); +} -- 2.17.1

2 1

[PATCH v2 1/2] include: Add xact3wb.h
by Alistair Leslie-Hughes 23 Jan '20

23 Jan '20

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/Makefile.in | 1 + include/xact3wb.h | 64 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+) create mode 100644 include/xact3wb.h diff --git a/include/Makefile.in b/include/Makefile.in index 8a05f5d01c..5dac4e66d5 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -771,6 +771,7 @@ SOURCES = \ wtypes.idl \ wuapi.idl \ x3daudio.h \ + xact3wb.h \ xapo.idl \ xapofx.h \ xaudio2.idl \ diff --git a/include/xact3wb.h b/include/xact3wb.h new file mode 100644 index 0000000000..b7dd818329 --- /dev/null +++ b/include/xact3wb.h @@ -0,0 +1,64 @@ +/* + * Copyright (c) 2020 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#ifndef __XACT3WB_H__ +#define __XACT3WB_H__ + +typedef union WAVEBANKMINIWAVEFORMAT +{ + struct + { + DWORD wFormatTag : 2; + DWORD nChannels : 3; + DWORD nSamplesPerSec : 18; + DWORD wBlockAlign : 8; + DWORD wBitsPerSample : 1; + } NONAMELESSUNION; + + DWORD dwValue; +} WAVEBANKMINIWAVEFORMAT; + +typedef struct WAVEBANKREGION +{ + DWORD dwOffset; + DWORD dwLength; +} WAVEBANKREGION; + +typedef struct WAVEBANKSAMPLEREGION +{ + DWORD dwStartSample; + DWORD dwTotalSamples; +} WAVEBANKSAMPLEREGION; + +typedef struct WAVEBANKENTRY +{ + union + { + union + { + DWORD dwFlags : 4; + DWORD Duration : 28; + } NONAMELESSUNION; + DWORD dwFlagsAndDuration; + }; + + WAVEBANKMINIWAVEFORMAT Format; + WAVEBANKREGION PlayRegion; + WAVEBANKSAMPLEREGION LoopRegion; +} WAVEBANKENTRY; + +#endif /* __XACT3WB_H__ */ -- 2.17.1

2 1

[PATCH 1/2] crypt32/test: additional test for skipping unknown CAs
by Ilia Mirkin 23 Jan '20

23 Jan '20

This is already tested by setting a flag in the ssl policy parameters, but apparently the flag in base policy parameters also needs to be respected. Tested on Win7. Signed-off-by: Ilia Mirkin <imirkin(a)alum.mit.edu> --- dlls/crypt32/tests/chain.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index e2a7633526..1bf78b084d 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -4743,6 +4743,11 @@ static void check_ssl_policy(void) CHECK_CHAIN_POLICY_STATUS(CERT_CHAIN_POLICY_SSL, NULL, ignoredUnknownCAPolicyCheck, &oct2007, &policyPara); sslPolicyPara.fdwChecks = 0; + /* And again, but specifying the ignore in dwFlags */ + policyPara.dwFlags = CERT_CHAIN_POLICY_ALLOW_UNKNOWN_CA_FLAG; + CHECK_CHAIN_POLICY_STATUS(CERT_CHAIN_POLICY_SSL, NULL, + ignoredUnknownCAPolicyCheck, &oct2007, &policyPara); + policyPara.dwFlags = 0; /* And again, but checking the Google chain at a bad date */ sslPolicyPara.pwszServerName = google_dot_com; CHECK_CHAIN_POLICY_STATUS(CERT_CHAIN_POLICY_SSL, NULL, -- 2.24.1

3 3

[PATCH] user32/msgbox: Implement copying contents to clipboard
by Vadim Zeitlin 23 Jan '20

23 Jan '20

Standard message box dialog provides a useful feature: pressing Ctrl-C or Ctrl-Insert in it copies its contents to the clipboard, which is very convenient when reporting problems in the programs using message boxes for error reporting, for example. Implement support for this, by adding WM_COPY handler to the message box dialog proc, which does the actual copying, and modifying the general dialog box proc to generate WM_COPY when keys above are pressed in a message box dialog. This required adding a new DF_MSGBOX flag, which allows to distinguish message boxes from the other dialogs, which is a bit ugly, but seems to be the best/only way to support this feature. Signed-off-by: Vadim Zeitlin <vz-wine(a)zeitlins.org> --- dlls/user32/controls.h | 5 +- dlls/user32/dialog.c | 18 +++- dlls/user32/msgbox.c | 196 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 216 insertions(+), 3 deletions(-) diff --git a/dlls/user32/controls.h b/dlls/user32/controls.h index 0b0f1c2801..09ac4d98dd 100644 --- a/dlls/user32/controls.h +++ b/dlls/user32/controls.h @@ -234,10 +234,11 @@ extern UINT MENU_GetMenuBarHeight( HWND hwnd, UINT menubarWidth, UINT xBaseUnit; /* Dialog units (depends on the font) */ UINT yBaseUnit; INT idResult; /* EndDialog() result / default pushbutton ID */ - UINT flags; /* EndDialog() called for this dialog */ + UINT flags; /* Combination of DF_XXX values below */ } DIALOGINFO; -#define DF_END 0x0001 +#define DF_END 0x0001 /* EndDialog() called for this dialog */ +#define DF_MSGBOX 0x0002 /* Dialog is a message box */ extern DIALOGINFO *DIALOG_get_info( HWND hwnd, BOOL create ) DECLSPEC_HIDDEN; extern INT DIALOG_DoDialogBox( HWND hwnd, HWND owner ) DECLSPEC_HIDDEN; diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c index 88c2930c06..552fae2fbe 100644 --- a/dlls/user32/dialog.c +++ b/dlls/user32/dialog.c @@ -810,7 +810,23 @@ INT DIALOG_DoDialogBox( HWND hwnd, HWND owner ) break; } if (!IsWindow( hwnd )) return 0; - if (!(dlgInfo->flags & DF_END) && !IsDialogMessageW( hwnd, &msg)) + if (dlgInfo->flags & DF_END) break; + + /* Special hack for message boxes: allow them to copy their + * contents to clipboard when Ctrl-C or Ctrl-Ins is pressed. */ + if (dlgInfo->flags & DF_MSGBOX) + { + if ((msg.message == WM_CHAR && + LOBYTE(msg.wParam) == 3) || + (msg.message == WM_KEYDOWN && + LOBYTE(msg.wParam) == VK_INSERT && + GetKeyState(VK_CONTROL) < 0)) + { + SendMessageW(hwnd, WM_COPY, 0, 0); + } + } + + if (!IsDialogMessageW( hwnd, &msg)) { TranslateMessage( &msg ); DispatchMessageW( &msg ); diff --git a/dlls/user32/msgbox.c b/dlls/user32/msgbox.c index 457c3ae7d1..5124a4835b 100644 --- a/dlls/user32/msgbox.c +++ b/dlls/user32/msgbox.c @@ -27,6 +27,7 @@ #include "wingdi.h" #include "winternl.h" #include "dlgs.h" +#include "controls.h" #include "user_private.h" #include "resources.h" #include "wine/debug.h" @@ -317,6 +318,191 @@ static void MSGBOX_OnInit(HWND hwnd, LPMSGBOXPARAMSW lpmb) } +/************************************************************************** + * MSGBOX_CopyToClipboard + * + * Called from MSGBOX_CopyToClipboard() to either build the text string + * representing the message box contents, in the following format: + * + * --------------------------- + * Caption + * --------------------------- + * Text line 1 + * ... + * Text line N + * --------------------------- + * Button_1 ... Button_N + * --------------------------- + * + * or to calculate the size of the buffer needed by this string, if the input + * buffer is null. + * + * Returns the length (not size) of the string that was, or would be, built. + */ +static int MSGBOX_BuildText( HWND hwnd, WCHAR* buffer ) +{ + HWND hItem; + int i; + WCHAR windowText[4096]; + const int windowTextLen = sizeof(windowText) / sizeof(WCHAR); + int len, total_len = 0; + + static const WCHAR separatorLine[] = {'-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','\r','\n',0}; + static int separatorLen = sizeof(separatorLine) / sizeof(WCHAR) - 1; + + static const WCHAR buttonSeparator[] = {' ',' ',' ',0}; + static int buttonSeparatorLen = sizeof(buttonSeparator) / sizeof(WCHAR) - 1; + + static const WCHAR eol[] = {'\r','\n',0}; + static int eolLen = sizeof(eol) / sizeof(WCHAR) - 1; + + /* Top separator line */ + if (buffer) + { + strcpyW(buffer, separatorLine); + buffer += separatorLen; + } + total_len += separatorLen; + + /* Message box caption */ + if (buffer) + { + GetWindowTextW(hwnd, windowText, windowTextLen); + len = strlenW(windowText); + + strcpyW(buffer, windowText); + buffer += len; + + strcpyW(buffer, eol); + buffer += eolLen; + } + else + { + len = GetWindowTextLengthW(hwnd); + } + total_len += len + eolLen; + + /* Second separator line */ + if (buffer) + { + strcpyW(buffer, separatorLine); + buffer += separatorLen; + } + total_len += separatorLen; + + /* Message box text */ + hItem = GetDlgItem(hwnd, MSGBOX_IDTEXT); + if (buffer) + { + GetWindowTextW(hItem, windowText, windowTextLen); + len = strlenW(windowText); + + strcpyW(buffer, windowText); + buffer += len; + + strcpyW(buffer, eol); + buffer += eolLen; + } + else + { + len = GetWindowTextLengthW(hItem); + } + total_len += len + eolLen; + + /* Third separator line */ + if (buffer) + { + strcpyW(buffer, separatorLine); + buffer += separatorLen; + } + total_len += separatorLen; + + /* Buttons line */ + for (i = IDOK; i <= IDCONTINUE; i++) + { + if (i == IDCLOSE) continue; /* No CLOSE button */ + hItem = GetDlgItem(hwnd, i); + if (!(GetWindowLongW(hItem, GWL_STYLE) & WS_VISIBLE)) continue; + + /* Add button text followed by a separator. Notice that we include the + * separator after the last button too, both because it's simpler and + * because this is how the native message box does it. + */ + if (buffer) + { + WCHAR* text = windowText; + + GetWindowTextW(hItem, windowText, windowTextLen); + len = strlenW(windowText); + + /* Don't include mnemonics in the output: all message box buttons + * that use mnemonics at all use them for their first character. + */ + if (windowText[0] == '&') + { + text++; + len--; + } + + strcpyW(buffer, text); + buffer += len; + + strcpyW(buffer, buttonSeparator); + buffer += buttonSeparatorLen; + } + else + { + len = GetWindowTextLengthW(hItem); + } + total_len += len + buttonSeparatorLen; + } + + if (buffer) + { + strcpyW(buffer, eol); + buffer += eolLen; + } + total_len += eolLen; + + /* Bottom separator line */ + if (buffer) + { + strcpyW(buffer, separatorLine); + buffer += separatorLen; + } + total_len += separatorLen; + + return total_len; +} + +/************************************************************************** + * MSGBOX_CopyToClipboard + * + * Called from MSGBOX_DlgProc() and puts message box contents to the clipboard + * in the following format: + * + */ +static void MSGBOX_CopyToClipboard( HWND hwnd ) +{ + HGLOBAL hmem; + WCHAR* buffer; + const int bufferLen = MSGBOX_BuildText(hwnd, NULL); + + hmem = GlobalAlloc(GMEM_MOVEABLE | GMEM_DDESHARE, (bufferLen + 1) * sizeof(WCHAR)); + if (!hmem) return; + buffer = GlobalLock(hmem); + MSGBOX_BuildText(hwnd, buffer); + TRACE_(msgbox)("Copying %s to clipboard\n", debugstr_w(buffer)); + GlobalUnlock(buffer); + + if (OpenClipboard(hwnd)) + { + EmptyClipboard(); + SetClipboardData(CF_UNICODETEXT, hmem); + CloseClipboard(); + } +} + /************************************************************************** * MSGBOX_DlgProc * @@ -328,10 +514,15 @@ static INT_PTR CALLBACK MSGBOX_DlgProc( HWND hwnd, UINT message, switch(message) { case WM_INITDIALOG: { + DIALOGINFO *dlgInfo; LPMSGBOXPARAMSW mbp = (LPMSGBOXPARAMSW)lParam; SetWindowContextHelpId(hwnd, mbp->dwContextHelpId); MSGBOX_OnInit(hwnd, mbp); SetPropA(hwnd, "WINE_MSGBOX_HELPCALLBACK", mbp->lpfnMsgBoxCallback); + + dlgInfo = DIALOG_get_info(hwnd, FALSE); + if (dlgInfo) + dlgInfo->flags |= DF_MSGBOX; break; } @@ -370,6 +561,11 @@ static INT_PTR CALLBACK MSGBOX_DlgProc( HWND hwnd, UINT message, break; } + case WM_COPY: + /* See code sending this message in dialog.c */ + MSGBOX_CopyToClipboard(hwnd); + break; + default: /* Ok. Ignore all the other messages */ TRACE("Message number 0x%04x is being ignored.\n", message); -- 2.24.0.155.gd9f6f3b619

5 6

[PATCH 3/3] jscript: Store source location in statement_t.
by Jacek Caban 23 Jan '20

23 Jan '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/parser.h | 1 + dlls/jscript/parser.y | 142 +++++++++++++++++++++--------------------- 2 files changed, 73 insertions(+), 70 deletions(-)

1 0

[PATCH 2/3] jscript: Always set parser error code on error.
by Jacek Caban 23 Jan '20

23 Jan '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/lex.c | 8 ++++---- dlls/jscript/parser.y | 24 +++++++++--------------- 2 files changed, 13 insertions(+), 19 deletions(-)

1 0

[PATCH 1/3] jscript: Use parser location to calculate function body string.
by Jacek Caban 23 Jan '20

23 Jan '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/compile.c | 10 +++++++++- dlls/jscript/lex.c | 16 ++++++++-------- dlls/jscript/parser.h | 2 +- dlls/jscript/parser.y | 30 +++++++++++++----------------- 4 files changed, 31 insertions(+), 27 deletions(-)

1 0

[PATCH 1/5] dwrite: Add a helper specifically for TryGetFontTable().
by Nikolay Sivov 23 Jan '20

23 Jan '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/dwrite_private.h | 3 +- dlls/dwrite/font.c | 2 +- dlls/dwrite/opentype.c | 95 ++++++++++++++++++++++-------------- 3 files changed, 61 insertions(+), 39 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index cc5c028fd2..875f12916b 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -310,7 +310,8 @@ extern const void* get_fontface_table(IDWriteFontFace5 *fontface, UINT32 tag, struct dwrite_fonttable *table) DECLSPEC_HIDDEN; extern HRESULT opentype_analyze_font(IDWriteFontFileStream*,BOOL*,DWRITE_FONT_FILE_TYPE*,DWRITE_FONT_FACE_TYPE*,UINT32*) DECLSPEC_HIDDEN; -extern HRESULT opentype_get_font_table(struct file_stream_desc*,UINT32,const void**,void**,UINT32*,BOOL*) DECLSPEC_HIDDEN; +extern HRESULT opentype_try_get_font_table(struct file_stream_desc *stream_desc, UINT32 tag, const void **data, + void **context, UINT32 *size, BOOL *exists) DECLSPEC_HIDDEN; extern HRESULT opentype_cmap_get_unicode_ranges(const struct dwrite_fonttable *table, unsigned int max_count, DWRITE_UNICODE_RANGE *ranges, unsigned int *count) DECLSPEC_HIDDEN; extern void opentype_get_font_properties(struct file_stream_desc*,struct dwrite_font_props*) DECLSPEC_HIDDEN; diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 9280b5d32a..25b09feb07 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -707,7 +707,7 @@ static HRESULT WINAPI dwritefontface_TryGetFontTable(IDWriteFontFace5 *iface, UI stream_desc.stream = fontface->stream; stream_desc.face_type = fontface->type; stream_desc.face_index = fontface->index; - return opentype_get_font_table(&stream_desc, table_tag, table_data, context, table_size, exists); + return opentype_try_get_font_table(&stream_desc, table_tag, table_data, context, table_size, exists); } static void WINAPI dwritefontface_ReleaseFontTable(IDWriteFontFace5 *iface, void *table_context) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 09a9a861c3..c5f1d16fac 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -1366,7 +1366,7 @@ HRESULT opentype_analyze_font(IDWriteFontFileStream *stream, BOOL *supported, DW return S_OK; } -HRESULT opentype_get_font_table(struct file_stream_desc *stream_desc, UINT32 tag, const void **table_data, +HRESULT opentype_try_get_font_table(struct file_stream_desc *stream_desc, UINT32 tag, const void **table_data, void **table_context, UINT32 *table_size, BOOL *found) { void *table_directory_context, *sfnt_context; @@ -1434,6 +1434,12 @@ HRESULT opentype_get_font_table(struct file_stream_desc *stream_desc, UINT32 tag return hr; } +static HRESULT opentype_get_font_table(struct file_stream_desc *stream_desc, UINT32 tag, + struct dwrite_fonttable *table) +{ + return opentype_try_get_font_table(stream_desc, tag, (const void **)&table->data, &table->context, &table->size, &table->exists); +} + /********** * CMAP **********/ @@ -1555,15 +1561,15 @@ HRESULT opentype_cmap_get_unicode_ranges(const struct dwrite_fonttable *cmap, un void opentype_get_font_typo_metrics(struct file_stream_desc *stream_desc, unsigned int *ascent, unsigned int *descent) { + struct dwrite_fonttable os2; const TT_OS2_V2 *data; - unsigned int size; - void *context; - opentype_get_font_table(stream_desc, MS_OS2_TAG, (const void **)&data, &context, &size, NULL); + opentype_get_font_table(stream_desc, MS_OS2_TAG, &os2); + data = (const TT_OS2_V2 *)os2.data; *ascent = *descent = 0; - if (size >= FIELD_OFFSET(TT_OS2_V2, sTypoLineGap)) + if (os2.size >= FIELD_OFFSET(TT_OS2_V2, sTypoLineGap)) { SHORT value = GET_BE_WORD(data->sTypoDescender); *ascent = GET_BE_WORD(data->sTypoAscender); @@ -1571,12 +1577,12 @@ void opentype_get_font_typo_metrics(struct file_stream_desc *stream_desc, unsign } if (data) - IDWriteFontFileStream_ReleaseFileFragment(stream_desc->stream, context); + IDWriteFontFileStream_ReleaseFileFragment(stream_desc->stream, os2.context); } void opentype_get_font_metrics(struct file_stream_desc *stream_desc, DWRITE_FONT_METRICS1 *metrics, DWRITE_CARET_METRICS *caret) { - void *os2_context, *head_context, *post_context, *hhea_context; + struct dwrite_fonttable os2, head, post, hhea; const TT_OS2_V2 *tt_os2; const TT_HEAD *tt_head; const TT_POST *tt_post; @@ -1584,10 +1590,15 @@ void opentype_get_font_metrics(struct file_stream_desc *stream_desc, DWRITE_FONT memset(metrics, 0, sizeof(*metrics)); - opentype_get_font_table(stream_desc, MS_OS2_TAG, (const void**)&tt_os2, &os2_context, NULL, NULL); - opentype_get_font_table(stream_desc, MS_HEAD_TAG, (const void**)&tt_head, &head_context, NULL, NULL); - opentype_get_font_table(stream_desc, MS_POST_TAG, (const void**)&tt_post, &post_context, NULL, NULL); - opentype_get_font_table(stream_desc, MS_HHEA_TAG, (const void**)&tt_hhea, &hhea_context, NULL, NULL); + opentype_get_font_table(stream_desc, MS_OS2_TAG, &os2); + opentype_get_font_table(stream_desc, MS_HEAD_TAG, &head); + opentype_get_font_table(stream_desc, MS_POST_TAG, &post); + opentype_get_font_table(stream_desc, MS_HHEA_TAG, &hhea); + + tt_head = (const TT_HEAD *)head.data; + tt_os2 = (const TT_OS2_V2 *)os2.data; + tt_post = (const TT_POST *)post.data; + tt_hhea = (const TT_HHEA *)hhea.data; if (tt_head) { metrics->designUnitsPerEm = GET_BE_WORD(tt_head->unitsPerEm); @@ -1597,7 +1608,8 @@ void opentype_get_font_metrics(struct file_stream_desc *stream_desc, DWRITE_FONT metrics->glyphBoxBottom = GET_BE_WORD(tt_head->yMin); } - if (caret) { + if (caret) + { if (tt_hhea) { caret->slopeRise = GET_BE_WORD(tt_hhea->caretSlopeRise); caret->slopeRun = GET_BE_WORD(tt_hhea->caretSlopeRun); @@ -1679,23 +1691,26 @@ void opentype_get_font_metrics(struct file_stream_desc *stream_desc, DWRITE_FONT metrics->capHeight = metrics->designUnitsPerEm * 7 / 10; if (tt_os2) - IDWriteFontFileStream_ReleaseFileFragment(stream_desc->stream, os2_context); + IDWriteFontFileStream_ReleaseFileFragment(stream_desc->stream, os2.context); if (tt_head) - IDWriteFontFileStream_ReleaseFileFragment(stream_desc->stream, head_context); + IDWriteFontFileStream_ReleaseFileFragment(stream_desc->stream, head.context); if (tt_post) - IDWriteFontFileStream_ReleaseFileFragment(stream_desc->stream, post_context); + IDWriteFontFileStream_ReleaseFileFragment(stream_desc->stream, post.context); if (tt_hhea) - IDWriteFontFileStream_ReleaseFileFragment(stream_desc->stream, hhea_context); + IDWriteFontFileStream_ReleaseFileFragment(stream_desc->stream, hhea.context); } void opentype_get_font_properties(struct file_stream_desc *stream_desc, struct dwrite_font_props *props) { - void *os2_context, *head_context; + struct dwrite_fonttable os2, head; const TT_OS2_V2 *tt_os2; const TT_HEAD *tt_head; - opentype_get_font_table(stream_desc, MS_OS2_TAG, (const void**)&tt_os2, &os2_context, NULL, NULL); - opentype_get_font_table(stream_desc, MS_HEAD_TAG, (const void**)&tt_head, &head_context, NULL, NULL); + opentype_get_font_table(stream_desc, MS_OS2_TAG, &os2); + opentype_get_font_table(stream_desc, MS_HEAD_TAG, &head); + + tt_os2 = (const TT_OS2_V2 *)os2.data; + tt_head = (const TT_HEAD *)head.data; /* default stretch, weight and style to normal */ props->stretch = DWRITE_FONT_STRETCH_NORMAL; @@ -1767,10 +1782,10 @@ void opentype_get_font_properties(struct file_stream_desc *stream_desc, struct d TRACE("stretch=%d, weight=%d, style %d\n", props->stretch, props->weight, props->style); - if (tt_os2) - IDWriteFontFileStream_ReleaseFileFragment(stream_desc->stream, os2_context); - if (tt_head) - IDWriteFontFileStream_ReleaseFileFragment(stream_desc->stream, head_context); + if (os2.data) + IDWriteFontFileStream_ReleaseFileFragment(stream_desc->stream, os2.context); + if (head.data) + IDWriteFontFileStream_ReleaseFileFragment(stream_desc->stream, head.context); } static UINT get_name_record_codepage(enum OPENTYPE_PLATFORM_ID platform, USHORT encoding) @@ -2026,13 +2041,16 @@ HRESULT opentype_get_font_info_strings(const void *table_data, DWRITE_INFORMATIO have 'Preferred Family Name' in WWS format, then WWS name is not used. */ HRESULT opentype_get_font_familyname(struct file_stream_desc *stream_desc, IDWriteLocalizedStrings **names) { + struct dwrite_fonttable os2, name; const TT_OS2_V2 *tt_os2; - void *os2_context, *name_context; const void *name_table; HRESULT hr; - opentype_get_font_table(stream_desc, MS_OS2_TAG, (const void**)&tt_os2, &os2_context, NULL, NULL); - opentype_get_font_table(stream_desc, MS_NAME_TAG, &name_table, &name_context, NULL, NULL); + opentype_get_font_table(stream_desc, MS_OS2_TAG, &os2); + opentype_get_font_table(stream_desc, MS_NAME_TAG, &name); + + tt_os2 = (const TT_OS2_V2 *)os2.data; + name_table = (const void *)name.data; *names = NULL; @@ -2047,10 +2065,10 @@ HRESULT opentype_get_font_familyname(struct file_stream_desc *stream_desc, IDWri if (FAILED(hr)) hr = opentype_get_font_strings_from_id(name_table, OPENTYPE_STRING_FAMILY_NAME, names); - if (tt_os2) - IDWriteFontFileStream_ReleaseFileFragment(stream_desc->stream, os2_context); - if (name_context) - IDWriteFontFileStream_ReleaseFileFragment(stream_desc->stream, name_context); + if (os2.context) + IDWriteFontFileStream_ReleaseFileFragment(stream_desc->stream, os2.context); + if (name.context) + IDWriteFontFileStream_ReleaseFileFragment(stream_desc->stream, name.context); return hr; } @@ -2059,14 +2077,17 @@ HRESULT opentype_get_font_familyname(struct file_stream_desc *stream_desc, IDWri have 'Preferred Face Name' in WWS format, then WWS name is not used. */ HRESULT opentype_get_font_facename(struct file_stream_desc *stream_desc, WCHAR *lfname, IDWriteLocalizedStrings **names) { + struct dwrite_fonttable os2, name; IDWriteLocalizedStrings *lfnames; - void *os2_context, *name_context; const TT_OS2_V2 *tt_os2; const void *name_table; HRESULT hr; - opentype_get_font_table(stream_desc, MS_OS2_TAG, (const void**)&tt_os2, &os2_context, NULL, NULL); - opentype_get_font_table(stream_desc, MS_NAME_TAG, &name_table, &name_context, NULL, NULL); + opentype_get_font_table(stream_desc, MS_OS2_TAG, &os2); + opentype_get_font_table(stream_desc, MS_NAME_TAG, &name); + + tt_os2 = (const TT_OS2_V2 *)os2.data; + name_table = name.data; *names = NULL; @@ -2113,10 +2134,10 @@ HRESULT opentype_get_font_facename(struct file_stream_desc *stream_desc, WCHAR * IDWriteLocalizedStrings_Release(lfnames); } - if (tt_os2) - IDWriteFontFileStream_ReleaseFileFragment(stream_desc->stream, os2_context); - if (name_context) - IDWriteFontFileStream_ReleaseFileFragment(stream_desc->stream, name_context); + if (os2.context) + IDWriteFontFileStream_ReleaseFileFragment(stream_desc->stream, os2.context); + if (name.context) + IDWriteFontFileStream_ReleaseFileFragment(stream_desc->stream, name.context); return hr; } -- 2.24.1

2 6

[PATCH 1/2] testbot/LogUtils: Rename the $Summary variables to $LogInfo.
by Francois Gouget 23 Jan '20

23 Jan '20

ParseTaskLog() will eventually return the same information as GetLogErrors() so name the resulting structures to match. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/WineRunBuild.pl | 10 +++++----- testbot/bin/WineRunReconfig.pl | 16 ++++++++-------- testbot/bin/WineRunWineTest.pl | 12 ++++++------ testbot/lib/WineTestBot/LogUtils.pm | 16 ++++++++-------- 4 files changed, 27 insertions(+), 27 deletions(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index ce8f40f05e..cf6428ae4a 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -419,23 +419,23 @@ if (!defined $TA->Wait($Pid, $Task->Timeout, 60)) Debug(Elapsed($Start), " Retrieving 'Build.log'\n"); if ($TA->GetFile("Build.log", "$TaskDir/log")) { - my $Summary = ParseTaskLog("$TaskDir/log"); - if ($Summary->{Task} eq "ok") + my $LogInfo = ParseTaskLog("$TaskDir/log"); + if ($LogInfo->{Task} eq "ok") { # We must have gotten the full log and the build did succeed. # So forget any prior error. $NewStatus = "completed"; $TAError = $ErrMessage = undef; } - elsif ($Summary->{Task} eq "badpatch") + elsif ($LogInfo->{Task} eq "badpatch") { # This too is conclusive enough to ignore other errors. $NewStatus = "badpatch"; $TAError = $ErrMessage = undef; } - elsif ($Summary->{NoLog}) + elsif ($LogInfo->{NoLog}) { - FatalError("$Summary->{NoLog}\n", "retry"); + FatalError("$LogInfo->{NoLog}\n", "retry"); } else { diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index 9b0b479ee2..c16c40a5af 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -416,21 +416,21 @@ if (!defined $TA->Wait($Pid, $Task->Timeout, 60)) } } -my $Summary; +my $LogInfo; Debug(Elapsed($Start), " Retrieving 'Reconfig.log'\n"); if ($TA->GetFile("Reconfig.log", "$TaskDir/log")) { - $Summary = ParseTaskLog("$TaskDir/log"); - if ($Summary->{Task} eq "ok") + $LogInfo = ParseTaskLog("$TaskDir/log"); + if ($LogInfo->{Task} eq "ok") { # We must have gotten the full log and the build did succeed. # So forget any prior error. $NewStatus = "completed"; $TAError = $ErrMessage = undef; } - elsif ($Summary->{NoLog}) + elsif ($LogInfo->{NoLog}) { - FatalError("$Summary->{NoLog}\n", "retry"); + FatalError("$LogInfo->{NoLog}\n", "retry"); } else { @@ -438,7 +438,7 @@ if ($TA->GetFile("Reconfig.log", "$TaskDir/log")) # probably already have an error message that explains why. NotifyAdministrator("The ". $VM->Name ." build failed", "The ". $VM->Name ." build failed:\n\n". - "$Summary->{Task}\n\n". + "$LogInfo->{Task}\n\n". "See the link below for more details:\n". MakeSecureURL(GetTaskURL($JobId, $StepNo, $TaskNo)) ."\n"); $NewStatus = "badbuild"; @@ -469,7 +469,7 @@ if ($NewStatus eq "completed") "latest/wine-parentsrc.txt") { my $BaseName = basename($FileName); - if ($FileName !~ m~^latest/~ and !$Summary->{$BaseName} and + if ($FileName !~ m~^latest/~ and !$LogInfo->{$BaseName} and -f "$DataDir/latest/$BaseName") { # This file was not updated so there is no point in redownloading it. @@ -486,7 +486,7 @@ if ($NewStatus eq "completed") } } - if ($Summary->{"testagentd"}) + if ($LogInfo->{"testagentd"}) { # Restart the TestAgent server from the new binary # Note that the privileged TestAgent server is usually run with diff --git a/testbot/bin/WineRunWineTest.pl b/testbot/bin/WineRunWineTest.pl index 245128a73a..fecbab0098 100755 --- a/testbot/bin/WineRunWineTest.pl +++ b/testbot/bin/WineRunWineTest.pl @@ -527,8 +527,8 @@ if (!defined $TA->Wait($Pid, $Task->Timeout, 60)) Debug(Elapsed($Start), " Retrieving 'Task.log'\n"); if ($TA->GetFile("Task.log", "$TaskDir/log")) { - my $Summary = ParseTaskLog("$TaskDir/log"); - if ($Summary->{Task} eq "ok") + my $LogInfo = ParseTaskLog("$TaskDir/log"); + if ($LogInfo->{Task} eq "ok") { # We must have gotten the full log and the task completed successfully # (with or without test failures). So clear any previous errors, including @@ -536,17 +536,17 @@ if ($TA->GetFile("Task.log", "$TaskDir/log")) $NewStatus = "completed"; $TaskFailures = $TAError = $ErrMessage = $PossibleCrash = undef; } - elsif ($Summary->{Task} eq "badpatch") + elsif ($LogInfo->{Task} eq "badpatch") { # This too is conclusive enough to ignore other errors. $NewStatus = "badpatch"; $TaskFailures = $TAError = $ErrMessage = $PossibleCrash = undef; } - elsif ($Summary->{NoLog}) + elsif ($LogInfo->{NoLog}) { - FatalError("$Summary->{NoLog}\n", "retry"); + FatalError("$LogInfo->{NoLog}\n", "retry"); } - elsif ($Summary->{Type} eq "build") + elsif ($LogInfo->{Type} eq "build") { # The error happened before the tests started so blame the build. $NewStatus = "badbuild"; diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index c83b63d25d..af17c110d9 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -94,35 +94,35 @@ sub ParseTaskLog($) if (open(my $LogFile, "<", $FileName)) { - my $Summary = {Type => "build"}; + my $LogInfo = {Type => "build"}; foreach my $Line (<$LogFile>) { chomp $Line; if ($Line eq "Task: tests") { - $Summary->{Type} = "tests"; + $LogInfo->{Type} = "tests"; } elsif ($Line eq "Task: ok") { - $Summary->{Task} ||= "ok"; + $LogInfo->{Task} ||= "ok"; } elsif ($Line eq "Task: Patch failed to apply") { - $Summary->{Task} = "badpatch"; + $LogInfo->{Task} = "badpatch"; last; # Should be the last and most specific message } elsif ($Line =~ /^Task: Updated ([a-zA-Z0-9.]+)$/) { - $Summary->{$1} = "updated"; + $LogInfo->{$1} = "updated"; } elsif ($Line =~ /^Task: / or _IsPerlError($Line)) { - $Summary->{Task} = "failed"; + $LogInfo->{Task} = "failed"; } } close($LogFile); - $Summary->{Task} ||= "missing"; - return $Summary; + $LogInfo->{Task} ||= "missing"; + return $LogInfo; } return {NoLog => "Unable to open the task log for reading: $!"}; } -- 2.20.1

1 1

[PATCH] testbot: Rename the staging files for the mailing list patches.
by Francois Gouget 23 Jan '20

23 Jan '20

There is no need to use the mailing list name for those files. Also make it clear that these files contain the email, not just the patch. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/Engine.pl | 4 ++-- testbot/bin/Janitor.pl | 2 +- testbot/bin/WinePatchesMLSubmit.pl | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index ca352335bd..a8fc2f0de9 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -420,13 +420,13 @@ sub HandleWinePatchMLSubmission() foreach my $Entry (@Entries) { # Validate file name - next if ($Entry !~ m/^([0-9a-fA-F]{32}_wine-patches)$/); + next if ($Entry !~ m/^([0-9a-fA-F]{32}_email)$/); my $FullMessageFileName = "$DataDir/staging/$1"; # Create a work directory my $WorkDir = CreateNewDir("$DataDir/staging", "_work"); - # Process the patch + # Process the email my $Parser = new MIME::Parser; $Parser->output_dir($WorkDir); my $Entity = $Parser->parse_open($FullMessageFileName); diff --git a/testbot/bin/Janitor.pl b/testbot/bin/Janitor.pl index 115b7d5eec..bf3989a712 100755 --- a/testbot/bin/Janitor.pl +++ b/testbot/bin/Janitor.pl @@ -276,7 +276,7 @@ if (opendir(my $dh, "$DataDir/staging")) # These files always expire after one day $TTL = 1 - $Age; } - elsif ($Entry !~ /^[0-9a-f]{32}_(?:patch\.diff|patchset\.diff|wine-patches|winetest(?:64)?-latest\.exe)$/) + elsif ($Entry !~ /^[0-9a-f]{32}_(?:patch\.diff|patchset\.diff|email|winetest(?:64)?-latest\.exe)$/) { my $Deletion = defined $TTL ? " (deletion in $TTL days)" : ""; Error "Found a suspicious file$Deletion: staging/$Entry\n"; diff --git a/testbot/bin/WinePatchesMLSubmit.pl b/testbot/bin/WinePatchesMLSubmit.pl index bddd42c1a1..4797e986ad 100755 --- a/testbot/bin/WinePatchesMLSubmit.pl +++ b/testbot/bin/WinePatchesMLSubmit.pl @@ -45,7 +45,7 @@ use WineTestBot::Engine::Notify; use WineTestBot::Log; # Store the message in the staging dir -my ($fh, $FileName) = OpenNewFile("$DataDir/staging", "_wine-patches"); +my ($fh, $FileName) = OpenNewFile("$DataDir/staging", "_email"); if (!$fh) { LogMsg "Could not create a staging file: $!\n"; -- 2.20.1

1 0

[PATCH] dlls: Global variable compatibility update for gcc 10
by Michael Cronenworth 23 Jan '20

23 Jan '20

https://gcc.gnu.org/gcc-10/porting_to.html#common Default to -fno-common A common mistake in C is omitting extern when declaring a global variable in a header file. If the header is included by several files it results in multiple definitions of the same variable. In previous GCC versions this error is ignored. GCC 10 defaults to -fno-common, which means a linker error will now be reported. To fix this, use extern in header files when declaring global variables, and ensure each global is defined in exactly one C file. As a workaround, legacy C code can be compiled with -fcommon. int x; // tentative definition - avoid in header files extern int y; // correct declaration in a header file Signed-off-by: Michael Cronenworth <mike(a)cchtml.com> --- dlls/crypt32/crypt32_private.h | 2 +- dlls/dsound/dsound_private.h | 6 +++--- dlls/gphoto2.ds/gphoto2_i.h | 2 +- dlls/gphoto2.ds/gphoto2_main.c | 2 ++ dlls/mshtml/htmlstyle.h | 2 +- dlls/mshtml/main.c | 7 +++++++ dlls/mshtml/mshtml_private.h | 12 ++++++------ dlls/msi/msi.c | 2 ++ dlls/msi/msipriv.h | 2 +- dlls/sane.ds/sane_i.h | 4 ++-- dlls/sane.ds/sane_main.c | 17 +++++++++++++++++ dlls/secur32/secur32_priv.h | 4 ++-- dlls/twain_32/twain32_main.c | 4 +++- dlls/twain_32/twain_i.h | 6 +++--- dlls/wbemprox/main.c | 2 ++ dlls/wbemprox/wbemprox_private.h | 4 ++-- dlls/webservices/webservices_private.h | 6 +++--- dlls/winebus.sys/bus.h | 4 ++-- dlls/xinput1_3/xinput_private.h | 4 ++-- 19 files changed, 62 insertions(+), 30 deletions(-) diff --git a/dlls/crypt32/crypt32_private.h b/dlls/crypt32/crypt32_private.h index 3d0129e7d4..d92eb1a157 100644 --- a/dlls/crypt32/crypt32_private.h +++ b/dlls/crypt32/crypt32_private.h @@ -152,7 +152,7 @@ BOOL WINAPI CRYPT_AsnEncodePubKeyInfoNoNull(DWORD dwCertEncodingType, */ HCRYPTPROV WINAPI I_CryptGetDefaultCryptProv(ALG_ID); -HINSTANCE hInstance DECLSPEC_HIDDEN; +extern HINSTANCE hInstance DECLSPEC_HIDDEN; void crypt_oid_init(void) DECLSPEC_HIDDEN; void crypt_oid_free(void) DECLSPEC_HIDDEN; diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index 69c4a2f390..930c3e92ec 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -188,9 +188,9 @@ HRESULT IDirectSoundBufferImpl_Duplicate( IDirectSoundBufferImpl **ppdsb, IDirectSoundBufferImpl *pdsb) DECLSPEC_HIDDEN; void secondarybuffer_destroy(IDirectSoundBufferImpl *This) DECLSPEC_HIDDEN; -const IDirectSound3DListenerVtbl ds3dlvt DECLSPEC_HIDDEN; -const IDirectSound3DBufferVtbl ds3dbvt DECLSPEC_HIDDEN; -const IKsPropertySetVtbl iksbvt DECLSPEC_HIDDEN; +extern const IDirectSound3DListenerVtbl ds3dlvt DECLSPEC_HIDDEN; +extern const IDirectSound3DBufferVtbl ds3dbvt DECLSPEC_HIDDEN; +extern const IKsPropertySetVtbl iksbvt DECLSPEC_HIDDEN; HRESULT IKsPrivatePropertySetImpl_Create(REFIID riid, void **ppv) DECLSPEC_HIDDEN; diff --git a/dlls/gphoto2.ds/gphoto2_i.h b/dlls/gphoto2.ds/gphoto2_i.h index 9ab8bbbf33..6b504821e0 100644 --- a/dlls/gphoto2.ds/gphoto2_i.h +++ b/dlls/gphoto2.ds/gphoto2_i.h @@ -100,7 +100,7 @@ struct tagActiveDS struct jpeg_decompress_struct jd; struct jpeg_error_mgr jerr; #endif -} activeDS DECLSPEC_HIDDEN; +} extern activeDS DECLSPEC_HIDDEN; /* Helper functions */ extern TW_UINT16 GPHOTO2_SaneCapability (pTW_CAPABILITY pCapability, TW_UINT16 action) DECLSPEC_HIDDEN; diff --git a/dlls/gphoto2.ds/gphoto2_main.c b/dlls/gphoto2.ds/gphoto2_main.c index 28100414cc..4d71c89e2e 100644 --- a/dlls/gphoto2.ds/gphoto2_main.c +++ b/dlls/gphoto2.ds/gphoto2_main.c @@ -33,6 +33,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(twain); +struct tagActiveDS activeDS; + DSMENTRYPROC GPHOTO2_dsmentry; #ifdef HAVE_GPHOTO2 diff --git a/dlls/mshtml/htmlstyle.h b/dlls/mshtml/htmlstyle.h index 9dcf3d9eed..7a83897043 100644 --- a/dlls/mshtml/htmlstyle.h +++ b/dlls/mshtml/htmlstyle.h @@ -142,7 +142,7 @@ void init_css_style(CSSStyle*,nsIDOMCSSStyleDeclaration*,style_qi_t, dispex_static_data_t*,compat_mode_t) DECLSPEC_HIDDEN; void CSSStyle_init_dispex_info(dispex_data_t *info, compat_mode_t mode) DECLSPEC_HIDDEN; -const dispex_static_data_vtbl_t CSSStyle_dispex_vtbl DECLSPEC_HIDDEN; +extern const dispex_static_data_vtbl_t CSSStyle_dispex_vtbl DECLSPEC_HIDDEN; HRESULT get_style_property(CSSStyle*,styleid_t,BSTR*) DECLSPEC_HIDDEN; HRESULT get_style_property_var(CSSStyle*,styleid_t,VARIANT*) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/main.c b/dlls/mshtml/main.c index 29396a5475..e2c927c5f9 100644 --- a/dlls/mshtml/main.c +++ b/dlls/mshtml/main.c @@ -51,6 +51,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); HINSTANCE hInst; DWORD mshtml_tls = TLS_OUT_OF_INDEXES; +void (__cdecl *ccp_init)(ExternalCycleCollectionParticipant*,const CCObjCallback*); +nsrefcnt (__cdecl *ccref_decr)(nsCycleCollectingAutoRefCnt*,nsISupports*,ExternalCycleCollectionParticipant*); +nsrefcnt (__cdecl *ccref_incr)(nsCycleCollectingAutoRefCnt*,nsISupports*); +void (__cdecl *ccref_init)(nsCycleCollectingAutoRefCnt*,nsrefcnt); +void (__cdecl *describe_cc_node)(nsCycleCollectingAutoRefCnt*,const char*,nsCycleCollectionTraversalCallback*); +void (__cdecl *note_cc_edge)(nsISupports*,const char*,nsCycleCollectionTraversalCallback*); + static HINSTANCE shdoclc = NULL; static WCHAR *status_strings[IDS_STATUS_LAST-IDS_STATUS_FIRST+1]; static IMultiLanguage2 *mlang; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 9612b32608..cc9eefc528 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -355,12 +355,12 @@ typedef struct { DEFINE_GUID(IID_nsXPCOMCycleCollectionParticipant, 0x9674489b,0x1f6f,0x4550,0xa7,0x30, 0xcc,0xae,0xdd,0x10,0x4c,0xf9); -nsrefcnt (__cdecl *ccref_incr)(nsCycleCollectingAutoRefCnt*,nsISupports*) DECLSPEC_HIDDEN; -nsrefcnt (__cdecl *ccref_decr)(nsCycleCollectingAutoRefCnt*,nsISupports*,ExternalCycleCollectionParticipant*) DECLSPEC_HIDDEN; -void (__cdecl *ccref_init)(nsCycleCollectingAutoRefCnt*,nsrefcnt) DECLSPEC_HIDDEN; -void (__cdecl *ccp_init)(ExternalCycleCollectionParticipant*,const CCObjCallback*) DECLSPEC_HIDDEN; -void (__cdecl *describe_cc_node)(nsCycleCollectingAutoRefCnt*,const char*,nsCycleCollectionTraversalCallback*) DECLSPEC_HIDDEN; -void (__cdecl *note_cc_edge)(nsISupports*,const char*,nsCycleCollectionTraversalCallback*) DECLSPEC_HIDDEN; +extern nsrefcnt (__cdecl *ccref_incr)(nsCycleCollectingAutoRefCnt*,nsISupports*) DECLSPEC_HIDDEN; +extern nsrefcnt (__cdecl *ccref_decr)(nsCycleCollectingAutoRefCnt*,nsISupports*,ExternalCycleCollectionParticipant*) DECLSPEC_HIDDEN; +extern void (__cdecl *ccref_init)(nsCycleCollectingAutoRefCnt*,nsrefcnt) DECLSPEC_HIDDEN; +extern void (__cdecl *ccp_init)(ExternalCycleCollectionParticipant*,const CCObjCallback*) DECLSPEC_HIDDEN; +extern void (__cdecl *describe_cc_node)(nsCycleCollectingAutoRefCnt*,const char*,nsCycleCollectionTraversalCallback*) DECLSPEC_HIDDEN; +extern void (__cdecl *note_cc_edge)(nsISupports*,const char*,nsCycleCollectionTraversalCallback*) DECLSPEC_HIDDEN; void init_dispex_with_compat_mode(DispatchEx*,IUnknown*,dispex_static_data_t*,compat_mode_t) DECLSPEC_HIDDEN; void release_dispex(DispatchEx*) DECLSPEC_HIDDEN; diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 7bf5004bed..6387b0a937 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -51,6 +51,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(msi); +BOOL is_wow64; + static const WCHAR installerW[] = {'\\','I','n','s','t','a','l','l','e','r',0}; UINT msi_locate_product(LPCWSTR szProduct, MSIINSTALLCONTEXT *context) diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index fca2f9e7b4..6b87cfb3d8 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -42,7 +42,7 @@ #include "winemsi.h" static const BOOL is_64bit = sizeof(void *) > sizeof(int); -BOOL is_wow64 DECLSPEC_HIDDEN; +extern BOOL is_wow64 DECLSPEC_HIDDEN; #define MSI_DATASIZEMASK 0x00ff #define MSITYPE_VALID 0x0100 diff --git a/dlls/sane.ds/sane_i.h b/dlls/sane.ds/sane_i.h index 941e8b9e1b..d22b1b1723 100644 --- a/dlls/sane.ds/sane_i.h +++ b/dlls/sane.ds/sane_i.h @@ -36,7 +36,7 @@ #include "twain.h" #ifdef SONAME_LIBSANE -#define MAKE_FUNCPTR(f) typeof(f) * p##f DECLSPEC_HIDDEN; +#define MAKE_FUNCPTR(f) extern typeof(f) * p##f DECLSPEC_HIDDEN; MAKE_FUNCPTR(sane_init) MAKE_FUNCPTR(sane_exit) MAKE_FUNCPTR(sane_get_devices) @@ -84,7 +84,7 @@ struct tagActiveDS TW_FIX32 defaultXResolution; BOOL YResolutionSet; TW_FIX32 defaultYResolution; -} activeDS DECLSPEC_HIDDEN; +} extern activeDS DECLSPEC_HIDDEN; /* Helper functions */ extern TW_UINT16 SANE_SaneCapability (pTW_CAPABILITY pCapability, TW_UINT16 action) DECLSPEC_HIDDEN; diff --git a/dlls/sane.ds/sane_main.c b/dlls/sane.ds/sane_main.c index 7af0a2321a..cb9da8e875 100644 --- a/dlls/sane.ds/sane_main.c +++ b/dlls/sane.ds/sane_main.c @@ -33,8 +33,25 @@ WINE_DEFAULT_DEBUG_CHANNEL(twain); DSMENTRYPROC SANE_dsmentry; #ifdef SONAME_LIBSANE +#define MAKE_FUNCPTR(f) typeof(f) * p##f; +MAKE_FUNCPTR(sane_init) +MAKE_FUNCPTR(sane_exit) +MAKE_FUNCPTR(sane_get_devices) +MAKE_FUNCPTR(sane_open) +MAKE_FUNCPTR(sane_close) +MAKE_FUNCPTR(sane_get_option_descriptor) +MAKE_FUNCPTR(sane_control_option) +MAKE_FUNCPTR(sane_get_parameters) +MAKE_FUNCPTR(sane_start) +MAKE_FUNCPTR(sane_read) +MAKE_FUNCPTR(sane_cancel) +MAKE_FUNCPTR(sane_set_io_mode) +MAKE_FUNCPTR(sane_get_select_fd) +MAKE_FUNCPTR(sane_strstatus) +#undef MAKE_FUNCPTR HINSTANCE SANE_instance; +struct tagActiveDS activeDS; static void *libsane_handle; diff --git a/dlls/secur32/secur32_priv.h b/dlls/secur32/secur32_priv.h index 5ed26d67ef..1f77955cfd 100644 --- a/dlls/secur32/secur32_priv.h +++ b/dlls/secur32/secur32_priv.h @@ -190,8 +190,8 @@ void SECUR32_arc4Cleanup(arc4_info *a4i) DECLSPEC_HIDDEN; #define NTLMSSP_NEGOTIATE_56 0x80000000 -SecPkgInfoW *ntlm_package_infoW DECLSPEC_HIDDEN; -SecPkgInfoA *ntlm_package_infoA DECLSPEC_HIDDEN; +extern SecPkgInfoW *ntlm_package_infoW DECLSPEC_HIDDEN; +extern SecPkgInfoA *ntlm_package_infoA DECLSPEC_HIDDEN; /* schannel internal interface */ typedef struct schan_imp_session_opaque *schan_imp_session; diff --git a/dlls/twain_32/twain32_main.c b/dlls/twain_32/twain32_main.c index b1beb96958..0f8ee14430 100644 --- a/dlls/twain_32/twain32_main.c +++ b/dlls/twain_32/twain32_main.c @@ -29,7 +29,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(twain); -extern HINSTANCE DSM_hinstance; +TW_UINT16 DSM_twCC; +activeDS *activeSources; +HINSTANCE DSM_hinstance; BOOL WINAPI DllMain (HINSTANCE hinstance, DWORD reason, LPVOID reserved) { diff --git a/dlls/twain_32/twain_i.h b/dlls/twain_32/twain_i.h index 7939d233bb..ad513458cd 100644 --- a/dlls/twain_32/twain_i.h +++ b/dlls/twain_32/twain_i.h @@ -45,11 +45,11 @@ typedef struct tagActiveDS HWND event_window; } activeDS; -TW_UINT16 DSM_twCC DECLSPEC_HIDDEN; /* current condition code of Source Manager */ +extern TW_UINT16 DSM_twCC DECLSPEC_HIDDEN; /* current condition code of Source Manager */ -activeDS *activeSources DECLSPEC_HIDDEN; /* list of active data sources */ +extern activeDS *activeSources DECLSPEC_HIDDEN; /* list of active data sources */ -HINSTANCE DSM_hinstance DECLSPEC_HIDDEN; +extern HINSTANCE DSM_hinstance DECLSPEC_HIDDEN; /* Implementation of operation triplets (From Application to Source Manager) */ extern TW_UINT16 TWAIN_CloseDS diff --git a/dlls/wbemprox/main.c b/dlls/wbemprox/main.c index d90f4f8cc6..0908441498 100644 --- a/dlls/wbemprox/main.c +++ b/dlls/wbemprox/main.c @@ -35,6 +35,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(wbemprox); static HINSTANCE instance; +struct list *table_list; + typedef HRESULT (*fnCreateInstance)( LPVOID *ppObj ); typedef struct diff --git a/dlls/wbemprox/wbemprox_private.h b/dlls/wbemprox/wbemprox_private.h index 9d39a7c92b..9096b392e3 100644 --- a/dlls/wbemprox/wbemprox_private.h +++ b/dlls/wbemprox/wbemprox_private.h @@ -20,8 +20,8 @@ #include "wine/heap.h" #include "wine/list.h" -IClientSecurity client_security DECLSPEC_HIDDEN; -struct list *table_list DECLSPEC_HIDDEN; +extern IClientSecurity client_security DECLSPEC_HIDDEN; +extern struct list *table_list DECLSPEC_HIDDEN; enum param_direction { diff --git a/dlls/webservices/webservices_private.h b/dlls/webservices/webservices_private.h index 6f2b90dad2..b352aa52d4 100644 --- a/dlls/webservices/webservices_private.h +++ b/dlls/webservices/webservices_private.h @@ -18,7 +18,7 @@ #include "winhttp.h" -_locale_t c_locale DECLSPEC_HIDDEN; +extern _locale_t c_locale DECLSPEC_HIDDEN; #define STREAM_BUFSIZE 4096 @@ -50,8 +50,8 @@ struct dictionary ULONG current_sequence; ULONG *sequence; }; -struct dictionary dict_builtin DECLSPEC_HIDDEN; -const struct dictionary dict_builtin_static DECLSPEC_HIDDEN; +extern struct dictionary dict_builtin DECLSPEC_HIDDEN; +extern const struct dictionary dict_builtin_static DECLSPEC_HIDDEN; int find_string( const struct dictionary *, const unsigned char *, ULONG, ULONG * ) DECLSPEC_HIDDEN; HRESULT insert_string( struct dictionary *, unsigned char *, ULONG, int, ULONG * ) DECLSPEC_HIDDEN; diff --git a/dlls/winebus.sys/bus.h b/dlls/winebus.sys/bus.h index 041a37ad04..22a4b46a51 100644 --- a/dlls/winebus.sys/bus.h +++ b/dlls/winebus.sys/bus.h @@ -54,5 +54,5 @@ DEVICE_OBJECT* bus_enumerate_hid_devices(const platform_vtbl *vtbl, enum_func fu DWORD check_bus_option(const UNICODE_STRING *option, DWORD default_value) DECLSPEC_HIDDEN; BOOL is_xbox_gamepad(WORD vid, WORD pid) DECLSPEC_HIDDEN; -HANDLE driver_key DECLSPEC_HIDDEN; -DEVICE_OBJECT *bus_pdo DECLSPEC_HIDDEN; +extern HANDLE driver_key DECLSPEC_HIDDEN; +extern DEVICE_OBJECT *bus_pdo DECLSPEC_HIDDEN; diff --git a/dlls/xinput1_3/xinput_private.h b/dlls/xinput1_3/xinput_private.h index f3456cd8e7..9a0e03c1de 100644 --- a/dlls/xinput1_3/xinput_private.h +++ b/dlls/xinput1_3/xinput_private.h @@ -26,8 +26,8 @@ typedef struct _xinput_controller XINPUT_VIBRATION vibration; } xinput_controller; -CRITICAL_SECTION xinput_crit; -xinput_controller controllers[XUSER_MAX_COUNT]; +extern CRITICAL_SECTION xinput_crit; +extern xinput_controller controllers[XUSER_MAX_COUNT]; void HID_find_gamepads(xinput_controller *devices) DECLSPEC_HIDDEN; void HID_destroy_gamepads(xinput_controller *devices) DECLSPEC_HIDDEN; -- 2.24.1

3 2

[PATCH] vcruntime140_1: Add stub dll.
by Daniel Lehman 23 Jan '20

23 Jan '20

Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> --- configure.ac | 1 + dlls/vcruntime140_1/Makefile.in | 1 + dlls/vcruntime140_1/vcruntime140_1.spec | 3 +++ tools/make_specfiles | 1 + 4 files changed, 6 insertions(+) create mode 100644 dlls/vcruntime140_1/Makefile.in create mode 100644 dlls/vcruntime140_1/vcruntime140_1.spec diff --git a/configure.ac b/configure.ac index 681d315eed..36f65378a4 100644 --- a/configure.ac +++ b/configure.ac @@ -3717,6 +3717,7 @@ WINE_CONFIG_MAKEFILE(dlls/vcomp120) WINE_CONFIG_MAKEFILE(dlls/vcomp140) WINE_CONFIG_MAKEFILE(dlls/vcomp90) WINE_CONFIG_MAKEFILE(dlls/vcruntime140) +WINE_CONFIG_MAKEFILE(dlls/vcruntime140_1) WINE_CONFIG_MAKEFILE(dlls/vdhcp.vxd,enable_win16) WINE_CONFIG_MAKEFILE(dlls/vdmdbg) WINE_CONFIG_MAKEFILE(dlls/ver.dll16,enable_win16) diff --git a/dlls/vcruntime140_1/Makefile.in b/dlls/vcruntime140_1/Makefile.in new file mode 100644 index 0000000000..b5e20fe92f --- /dev/null +++ b/dlls/vcruntime140_1/Makefile.in @@ -0,0 +1 @@ +MODULE = vcruntime140_1.dll diff --git a/dlls/vcruntime140_1/vcruntime140_1.spec b/dlls/vcruntime140_1/vcruntime140_1.spec new file mode 100644 index 0000000000..55f568ef13 --- /dev/null +++ b/dlls/vcruntime140_1/vcruntime140_1.spec @@ -0,0 +1,3 @@ +@ stub __CxxFrameHandler4 +@ stub __NLG_Dispatch2 +@ stub __NLG_Return2 diff --git a/tools/make_specfiles b/tools/make_specfiles index 7fef3a6821..7237e832bc 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -67,6 +67,7 @@ my @dll_groups = "api-ms-win-crt-time-l1-1-0", "api-ms-win-crt-utility-l1-1-0", "vcruntime140", + "vcruntime140_1", ], [ "msvcp120", -- 2.17.1

1 0

[PATCH 1/5] quartz: Simplify FilterMapper_RegisterPin().
by Zebediah Figura 23 Jan '20

23 Jan '20

Avoid some unnecessary allocations. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/filtermapper.c | 127 ++++++++++++------------------------- 1 file changed, 42 insertions(+), 85 deletions(-) diff --git a/dlls/quartz/filtermapper.c b/dlls/quartz/filtermapper.c index bb718ed1ce..f7259a1650 100644 --- a/dlls/quartz/filtermapper.c +++ b/dlls/quartz/filtermapper.c @@ -87,10 +87,6 @@ static const WCHAR wszFilterDataName[] = {'F','i','l','t','e','r','D','a','t','a static const WCHAR wszFilter[] = {'F','i','l','t','e','r',0}; /* For pins registered with IFilterMapper */ static const WCHAR wszPins[] = {'P','i','n','s',0}; -static const WCHAR wszAllowedMany[] = {'A','l','l','o','w','e','d','M','a','n','y',0}; -static const WCHAR wszAllowedZero[] = {'A','l','l','o','w','e','d','Z','e','r','o',0}; -static const WCHAR wszDirection[] = {'D','i','r','e','c','t','i','o','n',0}; -static const WCHAR wszIsRendered[] = {'I','s','R','e','n','d','e','r','e','d',0}; /* For types registered with IFilterMapper */ static const WCHAR wszTypes[] = {'T','y','p','e','s',0}; @@ -1162,98 +1158,59 @@ static HRESULT WINAPI FilterMapper_RegisterFilterInstance(IFilterMapper * iface, return E_NOTIMPL; } -static HRESULT WINAPI FilterMapper_RegisterPin( - IFilterMapper * iface, - CLSID Filter, - LPCWSTR szName, - BOOL bRendered, - BOOL bOutput, - BOOL bZero, - BOOL bMany, - CLSID ConnectsToFilter, - LPCWSTR ConnectsToPin) +static HRESULT WINAPI FilterMapper_RegisterPin(IFilterMapper *iface, CLSID clsid, + const WCHAR *name, BOOL rendered, BOOL output, BOOL zero, BOOL many, + CLSID external_filter, const WCHAR *external_pin) { - HRESULT hr; - LONG lRet; - LPWSTR wszClsid = NULL; - HKEY hKey = NULL; - HKEY hPinsKey = NULL; - WCHAR * wszPinsKeyName; - WCHAR wszKeyName[ARRAY_SIZE(wszClsidSlash)-1 + (CHARS_IN_GUID-1) + 1]; - - TRACE("(%p)->(%s, %s, %d, %d, %d, %d, %s, %s)\n", iface, debugstr_guid(&Filter), debugstr_w(szName), bRendered, - bOutput, bZero, bMany, debugstr_guid(&ConnectsToFilter), debugstr_w(ConnectsToPin)); - - hr = StringFromCLSID(&Filter, &wszClsid); - - if (SUCCEEDED(hr)) - { - lstrcpyW(wszKeyName, wszClsidSlash); - lstrcatW(wszKeyName, wszClsid); - - lRet = RegOpenKeyExW(HKEY_CLASSES_ROOT, wszKeyName, 0, KEY_WRITE, &hKey); - hr = HRESULT_FROM_WIN32(lRet); - } - - if (SUCCEEDED(hr)) - { - wszPinsKeyName = CoTaskMemAlloc((lstrlenW(wszPins) + 1 + lstrlenW(szName) + 1) * 2); - if (!wszPinsKeyName) - hr = E_OUTOFMEMORY; - } - - if (SUCCEEDED(hr)) - { - lstrcpyW(wszPinsKeyName, wszPins); - lstrcatW(wszPinsKeyName, wszSlash); - lstrcatW(wszPinsKeyName, szName); - - lRet = RegCreateKeyExW(hKey, wszPinsKeyName, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hPinsKey, NULL); - hr = HRESULT_FROM_WIN32(lRet); - CoTaskMemFree(wszPinsKeyName); - } - - if (SUCCEEDED(hr)) - { - lRet = RegSetValueExW(hPinsKey, wszAllowedMany, 0, REG_DWORD, (LPBYTE)&bMany, sizeof(bMany)); - hr = HRESULT_FROM_WIN32(lRet); - } + WCHAR keypath[6 + 38 + 1], *pin_keypath; + HKEY key, pin_key, type_key; + LONG ret; - if (SUCCEEDED(hr)) - { - lRet = RegSetValueExW(hPinsKey, wszAllowedZero, 0, REG_DWORD, (LPBYTE)&bZero, sizeof(bZero)); - hr = HRESULT_FROM_WIN32(lRet); - } + TRACE("iface %p, clsid %s, name %s, rendered %d, output %d, zero %d, " + "many %d, external_filter %s, external_pin %s.\n", + iface, debugstr_guid(&clsid), debugstr_w(name), rendered, output, + zero, many, debugstr_guid(&external_filter), debugstr_w(external_pin)); - if (SUCCEEDED(hr)) - { - lRet = RegSetValueExW(hPinsKey, wszDirection, 0, REG_DWORD, (LPBYTE)&bOutput, sizeof(bOutput)); - hr = HRESULT_FROM_WIN32(lRet); - } + wcscpy(keypath, L"CLSID\\"); + StringFromGUID2(&clsid, keypath + wcslen(keypath), ARRAY_SIZE(keypath) - wcslen(keypath)); + if ((ret = RegOpenKeyExW(HKEY_CLASSES_ROOT, keypath, 0, KEY_WRITE, &key))) + return HRESULT_FROM_WIN32(ret); - if (SUCCEEDED(hr)) + if (!(pin_keypath = malloc((5 + wcslen(name) + 1) * sizeof(WCHAR)))) { - lRet = RegSetValueExW(hPinsKey, wszIsRendered, 0, REG_DWORD, (LPBYTE)&bRendered, sizeof(bRendered)); - hr = HRESULT_FROM_WIN32(lRet); + RegCloseKey(key); + return E_OUTOFMEMORY; } + wcscpy(pin_keypath, L"Pins\\"); + wcscat(pin_keypath, name); - if (SUCCEEDED(hr)) + if ((ret = RegCreateKeyExW(key, pin_keypath, 0, NULL, 0, KEY_WRITE, NULL, &pin_key, NULL))) { - HKEY hkeyDummy = NULL; - - lRet = RegCreateKeyExW(hPinsKey, wszTypes, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hkeyDummy, NULL); - hr = HRESULT_FROM_WIN32(lRet); - - if (hkeyDummy) RegCloseKey(hkeyDummy); + ERR("Failed to open pin key, error %u.\n", ret); + free(pin_keypath); + RegCloseKey(key); + return HRESULT_FROM_WIN32(ret); } + free(pin_keypath); + + if ((ret = RegSetValueExW(pin_key, L"AllowedMany", 0, REG_DWORD, (const BYTE *)&many, sizeof(DWORD)))) + ERR("Failed to set AllowedMany value, error %u.\n", ret); + if ((ret = RegSetValueExW(pin_key, L"AllowedZero", 0, REG_DWORD, (const BYTE *)&zero, sizeof(DWORD)))) + ERR("Failed to set AllowedZero value, error %u.\n", ret); + if ((ret = RegSetValueExW(pin_key, L"Direction", 0, REG_DWORD, (const BYTE *)&output, sizeof(DWORD)))) + ERR("Failed to set Direction value, error %u.\n", ret); + if ((ret = RegSetValueExW(pin_key, L"IsRendered", 0, REG_DWORD, (const BYTE *)&rendered, sizeof(DWORD)))) + ERR("Failed to set IsRendered value, error %u.\n", ret); + + if (!(ret = RegCreateKeyExW(pin_key, L"Types", 0, NULL, 0, 0, NULL, &type_key, NULL))) + RegCloseKey(type_key); + else + ERR("Failed to create Types subkey, error %u.\n", ret); - CoTaskMemFree(wszClsid); - if (hKey) - RegCloseKey(hKey); - if (hPinsKey) - RegCloseKey(hPinsKey); + RegCloseKey(pin_key); + RegCloseKey(key); - return hr; + return S_OK; } -- 2.25.0

2 6

[PATCH 1/5] ole32: Handle GetObject() failure in ParseDisplayName() for item moniker.
by Nikolay Sivov 23 Jan '20

23 Jan '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/ole32/itemmoniker.c | 10 ++++++---- dlls/ole32/tests/moniker.c | 4 ---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/ole32/itemmoniker.c b/dlls/ole32/itemmoniker.c index 79fb293c38..73ed63fe6d 100644 --- a/dlls/ole32/itemmoniker.c +++ b/dlls/ole32/itemmoniker.c @@ -790,13 +790,15 @@ static HRESULT WINAPI ItemMonikerImpl_ParseDisplayName(IMoniker *iface, IBindCtx { hr = IOleItemContainer_GetObject(container, This->itemName, get_bind_speed_from_bindctx(pbc), pbc, &IID_IParseDisplayName, (void **)&parser); + if (SUCCEEDED(hr)) + { + hr = IMoniker_GetDisplayName(iface,pbc,NULL,&displayName); - hr = IMoniker_GetDisplayName(iface,pbc,NULL,&displayName); - - hr = IParseDisplayName_ParseDisplayName(parser, pbc, displayName, eaten, ppmkOut); + hr = IParseDisplayName_ParseDisplayName(parser, pbc, displayName, eaten, ppmkOut); + IParseDisplayName_Release(parser); + } IOleItemContainer_Release(container); - IParseDisplayName_Release(parser); } return hr; diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index bbd964e723..7607468d01 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -2141,28 +2141,24 @@ todo_wine hr = IBindCtx_SetBindOptions(bindctx, &bind_opts); ok(hr == S_OK, "Failed to set bind options, hr %#x.\n", hr); hr = IMoniker_ParseDisplayName(moniker, bindctx, &container_moniker->IMoniker_iface, displayname, &eaten, &moniker2); -todo_wine ok(hr == (0x8bee0000 | BINDSPEED_INDEFINITE), "Unexpected hr %#x.\n", hr); bind_opts.dwTickCountDeadline = 1; hr = IBindCtx_SetBindOptions(bindctx, &bind_opts); ok(hr == S_OK, "Failed to set bind options, hr %#x.\n", hr); hr = IMoniker_ParseDisplayName(moniker, bindctx, &container_moniker->IMoniker_iface, displayname, &eaten, &moniker2); -todo_wine ok(hr == (0x8bee0000 | BINDSPEED_IMMEDIATE), "Unexpected hr %#x.\n", hr); bind_opts.dwTickCountDeadline = 2499; hr = IBindCtx_SetBindOptions(bindctx, &bind_opts); ok(hr == S_OK, "Failed to set bind options, hr %#x.\n", hr); hr = IMoniker_ParseDisplayName(moniker, bindctx, &container_moniker->IMoniker_iface, displayname, &eaten, &moniker2); -todo_wine ok(hr == (0x8bee0000 | BINDSPEED_IMMEDIATE), "Unexpected hr %#x.\n", hr); bind_opts.dwTickCountDeadline = 2500; hr = IBindCtx_SetBindOptions(bindctx, &bind_opts); ok(hr == S_OK, "Failed to set bind options, hr %#x.\n", hr); hr = IMoniker_ParseDisplayName(moniker, bindctx, &container_moniker->IMoniker_iface, displayname, &eaten, &moniker2); -todo_wine ok(hr == (0x8bee0000 | BINDSPEED_MODERATE), "Unexpected hr %#x.\n", hr); IMoniker_Release(&container_moniker->IMoniker_iface); -- 2.24.1

2 5

[PATCH v2] setupapi: Handle arch-specific SourceDisks{Names, Files} .inf sections in get_source_info.
by Gijs Vermeulen 22 Jan '20

22 Jan '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48455 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/setupapi/query.c | 57 +++++++++++++++----------------- dlls/setupapi/queue.c | 13 ++++---- dlls/setupapi/setupapi_private.h | 3 ++ 3 files changed, 36 insertions(+), 37 deletions(-) diff --git a/dlls/setupapi/query.c b/dlls/setupapi/query.c index 828d8a1145..e3637732d9 100644 --- a/dlls/setupapi/query.c +++ b/dlls/setupapi/query.c @@ -34,35 +34,23 @@ WINE_DEFAULT_DEBUG_CHANNEL(setupapi); #ifdef __i386__ -static const WCHAR source_disks_names_platform[] = - {'S','o','u','r','c','e','D','i','s','k','s','N','a','m','e','s','.','x','8','6',0}; -static const WCHAR source_disks_files_platform[] = - {'S','o','u','r','c','e','D','i','s','k','s','F','i','l','e','s','.','x','8','6',0}; +static const WCHAR source_disks_names_platform[] = L"SourceDisksNames.x86"; +static const WCHAR source_disks_files_platform[] = L"SourceDisksFiles.x86"; #elif defined(__x86_64__) -static const WCHAR source_disks_names_platform[] = - {'S','o','u','r','c','e','D','i','s','k','s','N','a','m','e','s','.','a','m','d','6','4',0}; -static const WCHAR source_disks_files_platform[] = - {'S','o','u','r','c','e','D','i','s','k','s','F','i','l','e','s','.','a','m','d','6','4',0}; +static const WCHAR source_disks_names_platform[] = L"SourceDisksNames.amd64"; +static const WCHAR source_disks_files_platform[] = L"SourceDisksFiles.amd64"; #elif defined(__arm__) -static const WCHAR source_disks_names_platform[] = - {'S','o','u','r','c','e','D','i','s','k','s','N','a','m','e','s','.','a','r','m',0}; -static const WCHAR source_disks_files_platform[] = - {'S','o','u','r','c','e','D','i','s','k','s','F','i','l','e','s','.','a','r','m',0}; +static const WCHAR source_disks_names_platform[] = L"SourceDisksNames.arm"; +static const WCHAR source_disks_files_platform[] = L"SourceDisksFiles.arm"; #elif defined(__aarch64__) -static const WCHAR source_disks_names_platform[] = - {'S','o','u','r','c','e','D','i','s','k','s','N','a','m','e','s','.','a','r','m','6','4',0}; -static const WCHAR source_disks_files_platform[] = - {'S','o','u','r','c','e','D','i','s','k','s','F','i','l','e','s','.','a','r','m','6','4',0}; +static const WCHAR source_disks_names_platform[] = L"SourceDisksNames.arm64"; +static const WCHAR source_disks_files_platform[] = L"SourceDisksFiles.arm64"; #else /* FIXME: other platforms */ -static const WCHAR source_disks_names_platform[] = - {'S','o','u','r','c','e','D','i','s','k','s','N','a','m','e','s',0}; -static const WCHAR source_disks_files_platform[] = - {'S','o','u','r','c','e','D','i','s','k','s','F','i','l','e','s',0}; +static const WCHAR source_disks_names_platform[] = L"SourceDisksNames"; +static const WCHAR source_disks_files_platform[] = L"SourceDisksFiles"; #endif -static const WCHAR source_disks_names[] = - {'S','o','u','r','c','e','D','i','s','k','s','N','a','m','e','s',0}; -static const WCHAR source_disks_files[] = - {'S','o','u','r','c','e','D','i','s','k','s','F','i','l','e','s',0}; +static const WCHAR source_disks_names[] = L"SourceDisksNames"; +static const WCHAR source_disks_files[] = L"SourceDisksFiles"; /* fills the PSP_INF_INFORMATION struct fill_info is TRUE * always returns the required size of the information @@ -121,6 +109,18 @@ static HINF search_for_inf(LPCVOID InfSpec, DWORD SearchControl) return INVALID_HANDLE_VALUE; } +BOOL search_for_source_disks_files( HINF hinf, const WCHAR *filename, INFCONTEXT *ctx ) +{ + return !SetupFindFirstLineW( hinf, source_disks_files_platform, filename, ctx ) && + !SetupFindFirstLineW( hinf, source_disks_files, filename, ctx ); +} + +BOOL search_for_source_disks_names( HINF hinf, const WCHAR *filename, INFCONTEXT *ctx ) +{ + return !SetupFindFirstLineW( hinf, source_disks_names_platform, filename, ctx ) && + !SetupFindFirstLineW( hinf, source_disks_names, filename, ctx ); +} + /*********************************************************************** * SetupGetInfInformationA (SETUPAPI.@) * @@ -374,8 +374,7 @@ static LPWSTR get_source_id( HINF hinf, PINFCONTEXT context, PCWSTR filename ) DWORD size; LPWSTR source_id; - if (!SetupFindFirstLineW( hinf, source_disks_files_platform, filename, context ) && - !SetupFindFirstLineW( hinf, source_disks_files, filename, context )) + if (!search_for_source_disks_files( hinf, filename, context )) return NULL; if (!SetupGetStringFieldW( context, 1, NULL, 0, &size )) @@ -390,8 +389,7 @@ static LPWSTR get_source_id( HINF hinf, PINFCONTEXT context, PCWSTR filename ) return NULL; } - if (!SetupFindFirstLineW( hinf, source_disks_names_platform, source_id, context ) && - !SetupFindFirstLineW( hinf, source_disks_names, source_id, context )) + if (!search_for_source_disks_names( hinf, source_id, context )) { HeapFree( GetProcessHeap(), 0, source_id ); return NULL; @@ -503,8 +501,7 @@ BOOL WINAPI SetupGetSourceInfoW( HINF hinf, UINT source_id, UINT info, swprintf( source_id_str, ARRAY_SIZE(source_id_str), fmt, source_id ); - if (!SetupFindFirstLineW( hinf, source_disks_names_platform, source_id_str, &ctx ) && - !SetupFindFirstLineW( hinf, source_disks_names, source_id_str, &ctx )) + if (!search_for_source_disks_names( hinf, source_id_str, &ctx )) return FALSE; switch (info) diff --git a/dlls/setupapi/queue.c b/dlls/setupapi/queue.c index 2d2c833474..29a76f1b8c 100644 --- a/dlls/setupapi/queue.c +++ b/dlls/setupapi/queue.c @@ -289,21 +289,20 @@ UINT CALLBACK QUEUE_callback_WtoA( void *context, UINT notification, static void get_source_info( HINF hinf, const WCHAR *src_file, SP_FILE_COPY_PARAMS_W *params, WCHAR *src_root, WCHAR *src_path) { - static const WCHAR SourceDisksNames[] = - {'S','o','u','r','c','e','D','i','s','k','s','N','a','m','e','s',0}; - static const WCHAR SourceDisksFiles[] = - {'S','o','u','r','c','e','D','i','s','k','s','F','i','l','e','s',0}; - INFCONTEXT file_ctx, disk_ctx; INT id, diskid; DWORD len; /* find the SourceDisksFiles entry */ - if (!SetupFindFirstLineW( hinf, SourceDisksFiles, src_file, &file_ctx )) return; + if (!search_for_source_disks_files( hinf, src_file, &file_ctx )) + return; + if (!SetupGetIntField( &file_ctx, 1, &diskid )) return; /* now find the diskid in the SourceDisksNames section */ - if (!SetupFindFirstLineW( hinf, SourceDisksNames, NULL, &disk_ctx )) return; + if (!search_for_source_disks_names( hinf, NULL, &disk_ctx )) + return; + for (;;) { if (SetupGetIntField( &disk_ctx, 0, &id ) && (id == diskid)) break; diff --git a/dlls/setupapi/setupapi_private.h b/dlls/setupapi/setupapi_private.h index f4685ab2b4..99ca8aa0c9 100644 --- a/dlls/setupapi/setupapi_private.h +++ b/dlls/setupapi/setupapi_private.h @@ -111,4 +111,7 @@ extern OSVERSIONINFOW OsVersionInfo DECLSPEC_HIDDEN; extern BOOL create_fake_dll( const WCHAR *name, const WCHAR *source ) DECLSPEC_HIDDEN; extern void cleanup_fake_dlls(void) DECLSPEC_HIDDEN; +extern BOOL search_for_source_disks_files( HINF hinf, const WCHAR *filename, INFCONTEXT *ctx ) DECLSPEC_HIDDEN; +extern BOOL search_for_source_disks_names( HINF hinf, const WCHAR *filename, INFCONTEXT *ctx ) DECLSPEC_HIDDEN; + #endif /* __SETUPAPI_PRIVATE_H */ -- 2.25.0

2 1

[PATCH 9/9] vbscript: Support reporting error location to script host.
by Jacek Caban 22 Jan '20

22 Jan '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/vbscript/compile.c | 17 ++++++++++------- dlls/vbscript/interp.c | 20 +++++++++++++++++--- dlls/vbscript/tests/run.c | 3 +-- dlls/vbscript/vbscript.c | 24 +++++++++++++++++++----- dlls/vbscript/vbscript.h | 4 +++- 5 files changed, 50 insertions(+), 18 deletions(-)

1 0

[PATCH 8/9] vbscript: Pass parser error location to compiler.
by Jacek Caban 22 Jan '20

22 Jan '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/vbscript/compile.c | 15 +++++++-------- dlls/vbscript/parse.h | 1 + dlls/vbscript/parser.y | 3 +++ 3 files changed, 11 insertions(+), 8 deletions(-)

1 0

[PATCH 7/9] vbscript: Simplify option explicit parsing.
by Jacek Caban 22 Jan '20

22 Jan '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/vbscript/parser.y | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-)

1 0

[PATCH 6/9] vbscript: Use parser_error to set unhandled parser error.
by Jacek Caban 22 Jan '20

22 Jan '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/vbscript/lex.c | 2 +- dlls/vbscript/parse.h | 1 - dlls/vbscript/parser.y | 25 ++++++++++--------------- 3 files changed, 11 insertions(+), 17 deletions(-)

1 0

[PATCH 5/9] vbscript: Store source cookie and starting line in vbscode_t.
by Jacek Caban 22 Jan '20

22 Jan '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/vbscript/compile.c | 15 ++++++++++----- dlls/vbscript/vbscript.c | 5 +++-- dlls/vbscript/vbscript.h | 9 ++++++--- 3 files changed, 19 insertions(+), 10 deletions(-)

1 0

[PATCH 4/9] vbscript: Store source location in instr_t.
by Jacek Caban 22 Jan '20

22 Jan '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/vbscript/compile.c | 8 ++++++++ dlls/vbscript/vbscript.h | 1 + 2 files changed, 9 insertions(+)

1 0

[PATCH 3/9] vbscript: Store source location in statement_t.
by Jacek Caban 22 Jan '20

22 Jan '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/vbscript/lex.c | 7 +- dlls/vbscript/parse.h | 4 +- dlls/vbscript/parser.y | 163 +++++++++++++++++++++-------------------- 3 files changed, 90 insertions(+), 84 deletions(-)

1 0

[PATCH 2/9] vbscript: Alloc vbscode_t before parsing the script.
by Jacek Caban 22 Jan '20

22 Jan '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/vbscript/compile.c | 29 +++++++++++++++++++---------- 1 file changed, 19 insertions(+), 10 deletions(-)

1 0

[PATCH 1/9] vbscript/tests: Add error position tests.
by Jacek Caban 22 Jan '20

22 Jan '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/vbscript/tests/run.c | 194 ++++++++++++++++++++++++++++---------- 1 file changed, 143 insertions(+), 51 deletions(-)

1 0

[PATCH 1/2] user32/tests: Add a test exposing a SetActiveWindow inversion.
by Rémi Bernon 22 Jan '20

22 Jan '20

When calling SetForegroundWindow for a window in another thread, an internal message is posted to the thread's message queue. If this thread then calls SetForegroundWindow before processing its messages it will execute the corresponding set_active_window first, but then overwrite the active window later, when processing its internal messages. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/user32/tests/win.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 0f683f858a1..38fcada570c 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -3246,7 +3246,9 @@ static void test_SetActiveWindow(HWND hwnd) struct create_window_thread_params { HWND window; + HWND other_window; HANDLE window_created; + HANDLE set_foreground; HANDLE test_finished; }; @@ -3255,12 +3257,23 @@ static DWORD WINAPI create_window_thread(void *param) struct create_window_thread_params *p = param; DWORD res; BOOL ret; + MSG msg; + p->other_window = CreateWindowA("static", NULL, WS_POPUP | WS_VISIBLE, 0, 0, 0, 0, 0, 0, 0, 0); p->window = CreateWindowA("static", NULL, WS_POPUP | WS_VISIBLE, 0, 0, 0, 0, 0, 0, 0, 0); ret = SetEvent(p->window_created); ok(ret, "SetEvent failed, last error %#x.\n", GetLastError()); + res = WaitForSingleObject(p->set_foreground, INFINITE); + ok(res == WAIT_OBJECT_0, "Wait failed (%#x), last error %#x.\n", res, GetLastError()); + + SetForegroundWindow(p->other_window); + check_active_state(p->other_window, p->other_window, p->other_window); + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); + todo_wine + check_active_state(p->other_window, p->other_window, p->other_window); + res = WaitForSingleObject(p->test_finished, INFINITE); ok(res == WAIT_OBJECT_0, "Wait failed (%#x), last error %#x.\n", res, GetLastError()); @@ -3355,6 +3368,8 @@ static void test_SetForegroundWindow(HWND hwnd) thread_params.window_created = CreateEventW(NULL, FALSE, FALSE, NULL); ok(!!thread_params.window_created, "CreateEvent failed, last error %#x.\n", GetLastError()); + thread_params.set_foreground = CreateEventW(NULL, FALSE, FALSE, NULL); + ok(!!thread_params.set_foreground, "CreateEvent failed, last error %#x.\n", GetLastError()); thread_params.test_finished = CreateEventW(NULL, FALSE, FALSE, NULL); ok(!!thread_params.test_finished, "CreateEvent failed, last error %#x.\n", GetLastError()); thread = CreateThread(NULL, 0, create_window_thread, &thread_params, 0, &tid); @@ -3388,9 +3403,19 @@ static void test_SetForegroundWindow(HWND hwnd) ok(!SetForegroundWindow(hwnd2), "SetForegroundWindow failed\n"); check_wnd_state(hwnd, hwnd, hwnd, 0); + SetForegroundWindow(hwnd); + check_active_state(hwnd, hwnd, hwnd); + SetForegroundWindow(thread_params.window); + check_active_state(0, thread_params.window, 0); + SetForegroundWindow(hwnd); + check_active_state(hwnd, hwnd, hwnd); + res = SetEvent(thread_params.set_foreground); + ok(res, "SetEvent failed, last error %#x.\n", GetLastError()); + SetEvent(thread_params.test_finished); WaitForSingleObject(thread, INFINITE); CloseHandle(thread_params.test_finished); + CloseHandle(thread_params.set_foreground); CloseHandle(thread_params.window_created); CloseHandle(thread); DestroyWindow(hwnd2); -- 2.25.0

2 5

[PATCH 7/7] dmstyle/tests: Add GetParam/SetParam tests for unsupported types
by Michael Stefaniuc 22 Jan '20

22 Jan '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- Track SetParam(NULL) test re-added. dlls/dmstyle/tests/dmstyle.c | 76 +++++++++++++++++++++++++++++++++++- 1 file changed, 75 insertions(+), 1 deletion(-) diff --git a/dlls/dmstyle/tests/dmstyle.c b/dlls/dmstyle/tests/dmstyle.c index 5759a85aee..69c33ad73c 100644 --- a/dlls/dmstyle/tests/dmstyle.c +++ b/dlls/dmstyle/tests/dmstyle.c @@ -237,6 +237,25 @@ static void test_dmstyle(void) while (IDirectMusicStyle_Release(dms)); } +static void expect_getparam(IDirectMusicTrack8 *track, REFGUID type, const char *name, + HRESULT expect) +{ + HRESULT hr; + char buf[64] = { 0 }; + + hr = IDirectMusicTrack8_GetParam(track, type, 0, NULL, buf); + ok(hr == expect, "GetParam(%s) failed: %08x, expected %08x\n", name, hr, expect); +} + +static void expect_setparam(IDirectMusicTrack8 *track, REFGUID type, const char *name, + HRESULT expect) +{ + HRESULT hr; + + hr = IDirectMusicTrack8_SetParam(track, type, 0, track); + ok(hr == expect, "SetParam(%s) failed: %08x, expected %08x\n", name, hr, expect); +} + static void test_track(void) { IDirectMusicTrack8 *dmt8; @@ -320,6 +339,8 @@ static void test_track(void) hr = IDirectMusicTrack8_GetParam(dmt8, NULL, 0, NULL, NULL); ok(hr == E_POINTER, "IDirectMusicTrack8_GetParam failed: %08x\n", hr); + hr = IDirectMusicTrack8_SetParam(dmt8, NULL, 0, NULL); + ok(hr == E_POINTER, "IDirectMusicTrack8_SetParam failed: %08x\n", hr); hr = IDirectMusicTrack8_IsParamSupported(dmt8, NULL); ok(hr == E_POINTER, "IDirectMusicTrack8_IsParamSupported failed: %08x\n", hr); @@ -328,10 +349,63 @@ static void test_track(void) if (class[i].has_params & (1 << j)) ok(hr == S_OK, "IsParamSupported(%s) failed: %08x, expected S_OK\n", param_types[j].name, hr); - else + else { ok(hr == DMUS_E_TYPE_UNSUPPORTED, "IsParamSupported(%s) failed: %08x, expected DMUS_E_TYPE_UNSUPPORTED\n", param_types[j].name, hr); + if (class[i].clsid == &CLSID_DirectMusicChordTrack) { + expect_setparam(dmt8, param_types[j].type, param_types[j].name, + DMUS_E_SET_UNSUPPORTED); + } else if (class[i].clsid == &CLSID_DirectMusicMuteTrack) { + expect_getparam(dmt8, param_types[j].type, param_types[j].name, + DMUS_E_TYPE_UNSUPPORTED); + expect_setparam(dmt8, param_types[j].type, param_types[j].name, + DMUS_E_TYPE_UNSUPPORTED); + } else { + expect_getparam(dmt8, param_types[j].type, param_types[j].name, + DMUS_E_GET_UNSUPPORTED); + expect_setparam(dmt8, param_types[j].type, param_types[j].name, + DMUS_E_SET_UNSUPPORTED); + } + } + } + + /* GetParam / SetParam for IsParamSupported supported types */ + if (class[i].clsid == &CLSID_DirectMusicAuditionTrack) { + expect_getparam(dmt8, &GUID_DisableTimeSig, "GUID_DisableTimeSig", + DMUS_E_GET_UNSUPPORTED); + expect_getparam(dmt8, &GUID_EnableTimeSig, "GUID_EnableTimeSig", + DMUS_E_GET_UNSUPPORTED); + expect_getparam(dmt8, &GUID_SeedVariations, "GUID_SeedVariations", + DMUS_E_GET_UNSUPPORTED); + expect_setparam(dmt8, &GUID_Valid_Start_Time, "GUID_Valid_Start_Time", + DMUS_E_SET_UNSUPPORTED); + expect_setparam(dmt8, &GUID_Variations, "GUID_Variations", + DMUS_E_SET_UNSUPPORTED); + } else if (class[i].clsid == &CLSID_DirectMusicChordTrack) { + expect_setparam(dmt8, &GUID_RhythmParam, "GUID_RhythmParam", + DMUS_E_SET_UNSUPPORTED); + } else if (class[i].clsid == &CLSID_DirectMusicCommandTrack) { + expect_setparam(dmt8, &GUID_CommandParam2, "GUID_CommandParam2", + DMUS_E_SET_UNSUPPORTED); + } else if (class[i].clsid == &CLSID_DirectMusicMotifTrack) { + expect_getparam(dmt8, &GUID_DisableTimeSig, "GUID_DisableTimeSig", + DMUS_E_GET_UNSUPPORTED); + expect_getparam(dmt8, &GUID_EnableTimeSig, "GUID_EnableTimeSig", + DMUS_E_GET_UNSUPPORTED); + expect_getparam(dmt8, &GUID_SeedVariations, "GUID_SeedVariations", + DMUS_E_GET_UNSUPPORTED); + expect_setparam(dmt8, &GUID_Valid_Start_Time, "GUID_Valid_Start_Time", + DMUS_E_SET_UNSUPPORTED); + } else if (class[i].clsid == &CLSID_DirectMusicStyleTrack) { + expect_getparam(dmt8, &GUID_DisableTimeSig, "GUID_DisableTimeSig", + DMUS_E_GET_UNSUPPORTED); + expect_getparam(dmt8, &GUID_EnableTimeSig, "GUID_EnableTimeSig", + DMUS_E_GET_UNSUPPORTED); + expect_getparam(dmt8, &GUID_SeedVariations, "GUID_SeedVariations", + DMUS_E_GET_UNSUPPORTED); + expect_setparam(dmt8, &GUID_TimeSignature, "GUID_TimeSignature", + DMUS_E_SET_UNSUPPORTED); } if (class[i].clsid == &CLSID_DirectMusicMuteTrack) { -- 2.24.1

1 0

[PATCH 6/7] dmstyle: Partially implement Style track GetParam/SetParam methods
by Michael Stefaniuc 22 Jan '20

22 Jan '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmstyle/styletrack.c | 36 +++++++++++++++++++++++++++++------- 1 file changed, 29 insertions(+), 7 deletions(-) diff --git a/dlls/dmstyle/styletrack.c b/dlls/dmstyle/styletrack.c index 06fe1c7ca8..f80073e42b 100644 --- a/dlls/dmstyle/styletrack.c +++ b/dlls/dmstyle/styletrack.c @@ -138,7 +138,7 @@ static HRESULT WINAPI style_track_GetParam(IDirectMusicTrack8 *iface, REFGUID ty IDirectMusicStyleTrack *This = impl_from_IDirectMusicTrack8(iface); struct list *item = NULL; - FIXME("(%p, %s, %d, %p, %p): stub\n", This, debugstr_dmguid(type), time, next, param); + TRACE("(%p, %s, %d, %p, %p):\n", This, debugstr_dmguid(type), time, next, param); if (!type) return E_POINTER; @@ -155,17 +155,39 @@ static HRESULT WINAPI style_track_GetParam(IDirectMusicTrack8 *iface, REFGUID ty } return DMUS_E_NOT_FOUND; + } else if (IsEqualGUID(&GUID_TimeSignature, type)) { + FIXME("GUID_TimeSignature not handled yet\n"); + return S_OK; } - return S_OK; + return DMUS_E_GET_UNSUPPORTED; } -static HRESULT WINAPI style_track_SetParam(IDirectMusicTrack8 *iface, REFGUID rguidType, - MUSIC_TIME mtTime, void *pParam) +static HRESULT WINAPI style_track_SetParam(IDirectMusicTrack8 *iface, REFGUID type, MUSIC_TIME time, + void *param) { - IDirectMusicStyleTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %s, %d, %p): stub\n", This, debugstr_dmguid(rguidType), mtTime, pParam); - return S_OK; + IDirectMusicStyleTrack *This = impl_from_IDirectMusicTrack8(iface); + + TRACE("(%p, %s, %d, %p)\n", This, debugstr_dmguid(type), time, param); + + if (!type) + return E_POINTER; + + if (IsEqualGUID(type, &GUID_DisableTimeSig)) { + FIXME("GUID_DisableTimeSig not handled yet\n"); + return S_OK; + } else if (IsEqualGUID(type, &GUID_EnableTimeSig)) { + FIXME("GUID_EnableTimeSig not handled yet\n"); + return S_OK; + } else if (IsEqualGUID(type, &GUID_IDirectMusicStyle)) { + FIXME("GUID_IDirectMusicStyle not handled yet\n"); + return S_OK; + } else if (IsEqualGUID(type, &GUID_SeedVariations)) { + FIXME("GUID_SeedVariations not handled yet\n"); + return S_OK; + } + + return DMUS_E_SET_UNSUPPORTED; } static HRESULT WINAPI style_track_IsParamSupported(IDirectMusicTrack8 *iface, REFGUID rguidType) -- 2.24.1

1 0

[PATCH 5/7] dmstyle: Partially implement Mute track GetParam/SetParam methods
by Michael Stefaniuc 22 Jan '20

22 Jan '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmstyle/mutetrack.c | 32 +++++++++++++++++++++++--------- 1 file changed, 23 insertions(+), 9 deletions(-) diff --git a/dlls/dmstyle/mutetrack.c b/dlls/dmstyle/mutetrack.c index 2d60beffcc..deba4966a9 100644 --- a/dlls/dmstyle/mutetrack.c +++ b/dlls/dmstyle/mutetrack.c @@ -117,24 +117,38 @@ static HRESULT WINAPI mute_track_Play(IDirectMusicTrack8 *iface, void *pStateDat return S_OK; } -static HRESULT WINAPI mute_track_GetParam(IDirectMusicTrack8 *iface, REFGUID rguidType, - MUSIC_TIME mtTime, MUSIC_TIME *pmtNext, void *pParam) +static HRESULT WINAPI mute_track_GetParam(IDirectMusicTrack8 *iface, REFGUID type, MUSIC_TIME time, + MUSIC_TIME *next, void *param) { IDirectMusicMuteTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %s, %d, %p, %p): stub\n", This, debugstr_dmguid(rguidType), mtTime, pmtNext, pParam); - if (!rguidType) + TRACE("(%p, %s, %d, %p, %p):\n", This, debugstr_dmguid(type), time, next, param); + + if (!type) return E_POINTER; + if (!IsEqualGUID(type, &GUID_MuteParam)) + return DMUS_E_TYPE_UNSUPPORTED; + + FIXME("GUID_MuteParam not handled yet\n"); return S_OK; } -static HRESULT WINAPI mute_track_SetParam(IDirectMusicTrack8 *iface, REFGUID rguidType, - MUSIC_TIME mtTime, void *pParam) +static HRESULT WINAPI mute_track_SetParam(IDirectMusicTrack8 *iface, REFGUID type, MUSIC_TIME time, + void *param) { - IDirectMusicMuteTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %s, %d, %p): stub\n", This, debugstr_dmguid(rguidType), mtTime, pParam); - return S_OK; + IDirectMusicMuteTrack *This = impl_from_IDirectMusicTrack8(iface); + + TRACE("(%p, %s, %d, %p)\n", This, debugstr_dmguid(type), time, param); + + if (!type) + return E_POINTER; + if (!IsEqualGUID(type, &GUID_MuteParam)) + return DMUS_E_TYPE_UNSUPPORTED; + + FIXME("GUID_MuteParam not handled yet\n"); + + return S_OK; } static HRESULT WINAPI mute_track_IsParamSupported(IDirectMusicTrack8 *iface, REFGUID rguidType) -- 2.24.1

1 0

[PATCH 4/7] dmstyle: Partially implement Motif track GetParam/SetParam methods
by Michael Stefaniuc 22 Jan '20

22 Jan '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmstyle/motiftrack.c | 39 ++++++++++++++++++++++++++++++--------- 1 file changed, 30 insertions(+), 9 deletions(-) diff --git a/dlls/dmstyle/motiftrack.c b/dlls/dmstyle/motiftrack.c index d8cc17b32a..2452d1a94d 100644 --- a/dlls/dmstyle/motiftrack.c +++ b/dlls/dmstyle/motiftrack.c @@ -117,24 +117,45 @@ static HRESULT WINAPI motif_track_Play(IDirectMusicTrack8 *iface, void *pStateDa return S_OK; } -static HRESULT WINAPI motif_track_GetParam(IDirectMusicTrack8 *iface, REFGUID rguidType, - MUSIC_TIME mtTime, MUSIC_TIME *pmtNext, void *pParam) +static HRESULT WINAPI motif_track_GetParam(IDirectMusicTrack8 *iface, REFGUID type, MUSIC_TIME time, + MUSIC_TIME *next, void *param) { IDirectMusicMotifTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %s, %d, %p, %p): stub\n", This, debugstr_dmguid(rguidType), mtTime, pmtNext, pParam); - if (!rguidType) + TRACE("(%p, %s, %d, %p, %p):\n", This, debugstr_dmguid(type), time, next, param); + + if (!type) return E_POINTER; + if (!IsEqualGUID(type, &GUID_Valid_Start_Time)) + return DMUS_E_GET_UNSUPPORTED; + + FIXME("GUID_Valid_Start_Time not handled yet\n"); return S_OK; } -static HRESULT WINAPI motif_track_SetParam(IDirectMusicTrack8 *iface, REFGUID rguidType, - MUSIC_TIME mtTime, void *pParam) +static HRESULT WINAPI motif_track_SetParam(IDirectMusicTrack8 *iface, REFGUID type, MUSIC_TIME time, + void *param) { - IDirectMusicMotifTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %s, %d, %p): stub\n", This, debugstr_dmguid(rguidType), mtTime, pParam); - return S_OK; + IDirectMusicMotifTrack *This = impl_from_IDirectMusicTrack8(iface); + + TRACE("(%p, %s, %d, %p)\n", This, debugstr_dmguid(type), time, param); + + if (!type) + return E_POINTER; + + if (IsEqualGUID(type, &GUID_DisableTimeSig)) { + FIXME("GUID_DisableTimeSig not handled yet\n"); + return S_OK; + } else if (IsEqualGUID(type, &GUID_EnableTimeSig)) { + FIXME("GUID_EnableTimeSig not handled yet\n"); + return S_OK; + } else if (IsEqualGUID(type, &GUID_SeedVariations)) { + FIXME("GUID_SeedVariations not handled yet\n"); + return S_OK; + } + + return DMUS_E_SET_UNSUPPORTED; } static HRESULT WINAPI motif_track_IsParamSupported(IDirectMusicTrack8 *iface, REFGUID rguidType) -- 2.24.1

1 0

[PATCH 3/7] dmstyle: Partially implement Command track GetParam/SetParam methods
by Michael Stefaniuc 22 Jan '20

22 Jan '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmstyle/commandtrack.c | 45 ++++++++++++++++++++++++++++--------- 1 file changed, 35 insertions(+), 10 deletions(-) diff --git a/dlls/dmstyle/commandtrack.c b/dlls/dmstyle/commandtrack.c index 8efb8f54b1..d8b57b8c1f 100644 --- a/dlls/dmstyle/commandtrack.c +++ b/dlls/dmstyle/commandtrack.c @@ -119,24 +119,49 @@ static HRESULT WINAPI command_track_Play(IDirectMusicTrack8 *iface, void *pState return S_OK; } -static HRESULT WINAPI command_track_GetParam(IDirectMusicTrack8 *iface, REFGUID rguidType, - MUSIC_TIME mtTime, MUSIC_TIME *pmtNext, void *pParam) +static HRESULT WINAPI command_track_GetParam(IDirectMusicTrack8 *iface, REFGUID type, + MUSIC_TIME time, MUSIC_TIME *next, void *param) { IDirectMusicCommandTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %s, %d, %p, %p): stub\n", This, debugstr_dmguid(rguidType), mtTime, pmtNext, pParam); - if (!rguidType) + TRACE("(%p, %s, %d, %p, %p):\n", This, debugstr_dmguid(type), time, next, param); + + if (!type) return E_POINTER; - return S_OK; + if (IsEqualGUID(type, &GUID_CommandParam)) { + FIXME("GUID_CommandParam not handled yet\n"); + return S_OK; + } else if (IsEqualGUID(type, &GUID_CommandParam2)) { + FIXME("GUID_CommandParam2 not handled yet\n"); + return S_OK; + } else if (IsEqualGUID(type, &GUID_CommandParamNext)) { + FIXME("GUID_CommandParamNext not handled yet\n"); + return S_OK; + } + + return DMUS_E_GET_UNSUPPORTED; } -static HRESULT WINAPI command_track_SetParam(IDirectMusicTrack8 *iface, REFGUID rguidType, - MUSIC_TIME mtTime, void *pParam) +static HRESULT WINAPI command_track_SetParam(IDirectMusicTrack8 *iface, REFGUID type, + MUSIC_TIME time, void *param) { - IDirectMusicCommandTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %s, %d, %p): stub\n", This, debugstr_dmguid(rguidType), mtTime, pParam); - return S_OK; + IDirectMusicCommandTrack *This = impl_from_IDirectMusicTrack8(iface); + + TRACE("(%p, %s, %d, %p)\n", This, debugstr_dmguid(type), time, param); + + if (!type) + return E_POINTER; + + if (IsEqualGUID(type, &GUID_CommandParam)) { + FIXME("GUID_CommandParam not handled yet\n"); + return S_OK; + } else if (IsEqualGUID(type, &GUID_CommandParamNext)) { + FIXME("GUID_CommandParamNext not handled yet\n"); + return S_OK; + } + + return DMUS_E_SET_UNSUPPORTED; } static HRESULT WINAPI command_track_IsParamSupported(IDirectMusicTrack8 *iface, REFGUID rguidType) -- 2.24.1

1 0

[PATCH 2/7] dmstyle: Partially implement Chord track GetParam/SetParam methods
by Michael Stefaniuc 22 Jan '20

22 Jan '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmstyle/chordtrack.c | 38 ++++++++++++++++++++++++++++---------- 1 file changed, 28 insertions(+), 10 deletions(-) diff --git a/dlls/dmstyle/chordtrack.c b/dlls/dmstyle/chordtrack.c index 09d0bf3c9f..90db0a202a 100644 --- a/dlls/dmstyle/chordtrack.c +++ b/dlls/dmstyle/chordtrack.c @@ -120,24 +120,42 @@ static HRESULT WINAPI chord_track_Play(IDirectMusicTrack8 *iface, void *pStateDa return S_OK; } -static HRESULT WINAPI chord_track_GetParam(IDirectMusicTrack8 *iface, REFGUID rguidType, - MUSIC_TIME mtTime, MUSIC_TIME *pmtNext, void *pParam) +static HRESULT WINAPI chord_track_GetParam(IDirectMusicTrack8 *iface, REFGUID type, MUSIC_TIME time, + MUSIC_TIME *next, void *param) { IDirectMusicChordTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %s, %d, %p, %p): stub\n", This, debugstr_dmguid(rguidType), mtTime, pmtNext, pParam); - if (!rguidType) + TRACE("(%p, %s, %d, %p, %p):\n", This, debugstr_dmguid(type), time, next, param); + + if (!type) return E_POINTER; - return S_OK; + if (IsEqualGUID(type, &GUID_ChordParam)) { + FIXME("GUID_ChordParam not handled yet\n"); + return S_OK; + } else if (IsEqualGUID(type, &GUID_RhythmParam)) { + FIXME("GUID_RhythmParam not handled yet\n"); + return S_OK; + } + + return DMUS_E_GET_UNSUPPORTED; } -static HRESULT WINAPI chord_track_SetParam(IDirectMusicTrack8 *iface, REFGUID rguidType, - MUSIC_TIME mtTime, void *pParam) +static HRESULT WINAPI chord_track_SetParam(IDirectMusicTrack8 *iface, REFGUID type, MUSIC_TIME time, + void *param) { - IDirectMusicChordTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %s, %d, %p): stub\n", This, debugstr_dmguid(rguidType), mtTime, pParam); - return S_OK; + IDirectMusicChordTrack *This = impl_from_IDirectMusicTrack8(iface); + + TRACE("(%p, %s, %d, %p)\n", This, debugstr_dmguid(type), time, param); + + if (!type) + return E_POINTER; + if (!IsEqualGUID(type, &GUID_ChordParam)) + return DMUS_E_SET_UNSUPPORTED; + + FIXME("GUID_ChordParam not handled yet\n"); + + return S_OK; } static HRESULT WINAPI chord_track_IsParamSupported(IDirectMusicTrack8 *iface, REFGUID type) -- 2.24.1

1 0

[PATCH 1/7] dmstyle: Partially implement Audition track GetParam/SetParam methods
by Michael Stefaniuc 22 Jan '20

22 Jan '20

Temporary drop a todo_wine test until all dmstyle tracks have their SetParam() method implemented. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmstyle/auditiontrack.c | 45 ++++++++++++++++++++++++++++-------- dlls/dmstyle/tests/dmstyle.c | 2 -- 2 files changed, 35 insertions(+), 12 deletions(-) diff --git a/dlls/dmstyle/auditiontrack.c b/dlls/dmstyle/auditiontrack.c index 9d45f1bcd0..ececce9728 100644 --- a/dlls/dmstyle/auditiontrack.c +++ b/dlls/dmstyle/auditiontrack.c @@ -117,24 +117,49 @@ static HRESULT WINAPI audition_track_Play(IDirectMusicTrack8 *iface, void *pStat return S_OK; } -static HRESULT WINAPI audition_track_GetParam(IDirectMusicTrack8 *iface, REFGUID rguidType, - MUSIC_TIME mtTime, MUSIC_TIME *pmtNext, void *pParam) +static HRESULT WINAPI audition_track_GetParam(IDirectMusicTrack8 *iface, REFGUID type, + MUSIC_TIME time, MUSIC_TIME *next, void *param) { IDirectMusicAuditionTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %s, %d, %p, %p): stub\n", This, debugstr_dmguid(rguidType), mtTime, pmtNext, pParam); - if (!rguidType) + TRACE("(%p, %s, %d, %p, %p):\n", This, debugstr_dmguid(type), time, next, param); + + if (!type) return E_POINTER; - return S_OK; + if (IsEqualGUID(type, &GUID_Valid_Start_Time)) { + FIXME("GUID_Valid_Start_Time not handled yet\n"); + return S_OK; + } else if (IsEqualGUID(type, &GUID_Variations)) { + FIXME("GUID_Variations not handled yet\n"); + return S_OK; + } + + return DMUS_E_GET_UNSUPPORTED; } -static HRESULT WINAPI audition_track_SetParam(IDirectMusicTrack8 *iface, REFGUID rguidType, - MUSIC_TIME mtTime, void *pParam) +static HRESULT WINAPI audition_track_SetParam(IDirectMusicTrack8 *iface, REFGUID type, + MUSIC_TIME time, void *param) { - IDirectMusicAuditionTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %s, %d, %p): stub\n", This, debugstr_dmguid(rguidType), mtTime, pParam); - return S_OK; + IDirectMusicAuditionTrack *This = impl_from_IDirectMusicTrack8(iface); + + TRACE("(%p, %s, %d, %p)\n", This, debugstr_dmguid(type), time, param); + + if (!type) + return E_POINTER; + + if (IsEqualGUID(type, &GUID_DisableTimeSig)) { + FIXME("GUID_DisableTimeSig not handled yet\n"); + return S_OK; + } else if (IsEqualGUID(type, &GUID_EnableTimeSig)) { + FIXME("GUID_EnableTimeSig not handled yet\n"); + return S_OK; + } else if (IsEqualGUID(type, &GUID_SeedVariations)) { + FIXME("GUID_SeedVariations not handled yet\n"); + return S_OK; + } + + return DMUS_E_SET_UNSUPPORTED; } static HRESULT WINAPI audition_track_IsParamSupported(IDirectMusicTrack8 *iface, REFGUID type) diff --git a/dlls/dmstyle/tests/dmstyle.c b/dlls/dmstyle/tests/dmstyle.c index 5130af773c..5759a85aee 100644 --- a/dlls/dmstyle/tests/dmstyle.c +++ b/dlls/dmstyle/tests/dmstyle.c @@ -320,8 +320,6 @@ static void test_track(void) hr = IDirectMusicTrack8_GetParam(dmt8, NULL, 0, NULL, NULL); ok(hr == E_POINTER, "IDirectMusicTrack8_GetParam failed: %08x\n", hr); - hr = IDirectMusicTrack8_SetParam(dmt8, NULL, 0, NULL); - todo_wine ok(hr == E_POINTER, "IDirectMusicTrack8_SetParam failed: %08x\n", hr); hr = IDirectMusicTrack8_IsParamSupported(dmt8, NULL); ok(hr == E_POINTER, "IDirectMusicTrack8_IsParamSupported failed: %08x\n", hr); -- 2.24.1

1 0

[PATCH] testbot: Use the configured mailing list name instead of hardcoding it.
by Francois Gouget 22 Jan '20

22 Jan '20

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- $PatchesMailingList is already set to "wine-devel" in the configuration file. testbot/lib/WineTestBot/Patches.pm | 2 +- testbot/web/JobDetails.pl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/lib/WineTestBot/Patches.pm b/testbot/lib/WineTestBot/Patches.pm index 8a22d3a5ad..d021f9cb43 100644 --- a/testbot/lib/WineTestBot/Patches.pm +++ b/testbot/lib/WineTestBot/Patches.pm @@ -158,7 +158,7 @@ sub Submit($$$) $Subject =~ s/\[PATCH[^\]]*]//i; $Subject =~ s/[[$]?\d+\/\d+[$\]]?//; $Subject =~ s/^\s*//; - $NewJob->Remarks(substr("[wine-patches] " . $Subject, 0, + $NewJob->Remarks(substr("[$PatchesMailingList] " . $Subject, 0, $PropertyDescriptor->GetMaxLength())); $NewJob->Patch($self); diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index 76de1bb23c..2909eb7dbc 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -64,7 +64,7 @@ sub GetPageTitle($) my ($self) = @_; my $PageTitle = $self->{Job}->Remarks; - $PageTitle =~ s/^[[]wine-patches[]] //; + $PageTitle =~ s/^[[]\Q$PatchesMailingList\E[]] //; $PageTitle = "Job " . $self->{JobId} if ($PageTitle eq ""); $PageTitle .= " - ${ProjectName} Test Bot"; return $PageTitle; -- 2.20.1

1 0

[PATCH] setupapi: Handle arch-specific SourceDisks{Names, Files} .inf sections in get_source_info.
by Gijs Vermeulen 22 Jan '20

22 Jan '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48455 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/setupapi/query.c | 31 ------------------------------- dlls/setupapi/queue.c | 15 ++++++++------- dlls/setupapi/setupapi_private.h | 19 +++++++++++++++++++ 3 files changed, 27 insertions(+), 38 deletions(-) diff --git a/dlls/setupapi/query.c b/dlls/setupapi/query.c index 828d8a1145..e1a0f5aaf5 100644 --- a/dlls/setupapi/query.c +++ b/dlls/setupapi/query.c @@ -33,37 +33,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(setupapi); -#ifdef __i386__ -static const WCHAR source_disks_names_platform[] = - {'S','o','u','r','c','e','D','i','s','k','s','N','a','m','e','s','.','x','8','6',0}; -static const WCHAR source_disks_files_platform[] = - {'S','o','u','r','c','e','D','i','s','k','s','F','i','l','e','s','.','x','8','6',0}; -#elif defined(__x86_64__) -static const WCHAR source_disks_names_platform[] = - {'S','o','u','r','c','e','D','i','s','k','s','N','a','m','e','s','.','a','m','d','6','4',0}; -static const WCHAR source_disks_files_platform[] = - {'S','o','u','r','c','e','D','i','s','k','s','F','i','l','e','s','.','a','m','d','6','4',0}; -#elif defined(__arm__) -static const WCHAR source_disks_names_platform[] = - {'S','o','u','r','c','e','D','i','s','k','s','N','a','m','e','s','.','a','r','m',0}; -static const WCHAR source_disks_files_platform[] = - {'S','o','u','r','c','e','D','i','s','k','s','F','i','l','e','s','.','a','r','m',0}; -#elif defined(__aarch64__) -static const WCHAR source_disks_names_platform[] = - {'S','o','u','r','c','e','D','i','s','k','s','N','a','m','e','s','.','a','r','m','6','4',0}; -static const WCHAR source_disks_files_platform[] = - {'S','o','u','r','c','e','D','i','s','k','s','F','i','l','e','s','.','a','r','m','6','4',0}; -#else /* FIXME: other platforms */ -static const WCHAR source_disks_names_platform[] = - {'S','o','u','r','c','e','D','i','s','k','s','N','a','m','e','s',0}; -static const WCHAR source_disks_files_platform[] = - {'S','o','u','r','c','e','D','i','s','k','s','F','i','l','e','s',0}; -#endif -static const WCHAR source_disks_names[] = - {'S','o','u','r','c','e','D','i','s','k','s','N','a','m','e','s',0}; -static const WCHAR source_disks_files[] = - {'S','o','u','r','c','e','D','i','s','k','s','F','i','l','e','s',0}; - /* fills the PSP_INF_INFORMATION struct fill_info is TRUE * always returns the required size of the information */ diff --git a/dlls/setupapi/queue.c b/dlls/setupapi/queue.c index 2d2c833474..8284a4f738 100644 --- a/dlls/setupapi/queue.c +++ b/dlls/setupapi/queue.c @@ -289,21 +289,22 @@ UINT CALLBACK QUEUE_callback_WtoA( void *context, UINT notification, static void get_source_info( HINF hinf, const WCHAR *src_file, SP_FILE_COPY_PARAMS_W *params, WCHAR *src_root, WCHAR *src_path) { - static const WCHAR SourceDisksNames[] = - {'S','o','u','r','c','e','D','i','s','k','s','N','a','m','e','s',0}; - static const WCHAR SourceDisksFiles[] = - {'S','o','u','r','c','e','D','i','s','k','s','F','i','l','e','s',0}; - INFCONTEXT file_ctx, disk_ctx; INT id, diskid; DWORD len; /* find the SourceDisksFiles entry */ - if (!SetupFindFirstLineW( hinf, SourceDisksFiles, src_file, &file_ctx )) return; + if (!SetupFindFirstLineW( hinf, source_disks_files_platform, src_file, &file_ctx ) && + !SetupFindFirstLineW( hinf, source_disks_files, src_file, &file_ctx )) + return; + if (!SetupGetIntField( &file_ctx, 1, &diskid )) return; /* now find the diskid in the SourceDisksNames section */ - if (!SetupFindFirstLineW( hinf, SourceDisksNames, NULL, &disk_ctx )) return; + if (!SetupFindFirstLineW( hinf, source_disks_names_platform, NULL, &disk_ctx ) && + !SetupFindFirstLineW( hinf, source_disks_names, NULL, &disk_ctx )) + return; + for (;;) { if (SetupGetIntField( &disk_ctx, 0, &id ) && (id == diskid)) break; diff --git a/dlls/setupapi/setupapi_private.h b/dlls/setupapi/setupapi_private.h index f4685ab2b4..b3ae3a6035 100644 --- a/dlls/setupapi/setupapi_private.h +++ b/dlls/setupapi/setupapi_private.h @@ -111,4 +111,23 @@ extern OSVERSIONINFOW OsVersionInfo DECLSPEC_HIDDEN; extern BOOL create_fake_dll( const WCHAR *name, const WCHAR *source ) DECLSPEC_HIDDEN; extern void cleanup_fake_dlls(void) DECLSPEC_HIDDEN; +#ifdef __i386__ +static const WCHAR source_disks_names_platform[] = L"SourceDisksNames.x86"; +static const WCHAR source_disks_files_platform[] = L"SourceDisksFiles.x86"; +#elif defined(__x86_64__) +static const WCHAR source_disks_names_platform[] = L"SourceDisksNames.amd64"; +static const WCHAR source_disks_files_platform[] = L"SourceDisksFiles.amd64"; +#elif defined(__arm__) +static const WCHAR source_disks_names_platform[] = L"SourceDisksNames.arm"; +static const WCHAR source_disks_files_platform[] = L"SourceDisksFiles.arm"; +#elif defined(__aarch64__) +static const WCHAR source_disks_names_platform[] = L"SourceDisksNames.arm64"; +static const WCHAR source_disks_files_platform[] = L"SourceDisksFiles.arm64"; +#else /* FIXME: other platforms */ +static const WCHAR source_disks_names_platform[] = L"SourceDisksNames"; +static const WCHAR source_disks_files_platform[] = L"SourceDisksFiles"; +#endif +static const WCHAR source_disks_names[] = L"SourceDisksNames"; +static const WCHAR source_disks_files[] = L"SourceDisksFiles"; + #endif /* __SETUPAPI_PRIVATE_H */ -- 2.25.0

2 1

[PATCH 1/2] mshtml: Implement IHTMLScriptElement::get_htmlFor().
by Nikolay Sivov 22 Jan '20

22 Jan '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mshtml/htmlscript.c | 10 ++++++++-- dlls/mshtml/tests/dom.c | 5 +++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlscript.c b/dlls/mshtml/htmlscript.c index 18a652e0df..60fd94e3d4 100644 --- a/dlls/mshtml/htmlscript.c +++ b/dlls/mshtml/htmlscript.c @@ -157,8 +157,14 @@ static HRESULT WINAPI HTMLScriptElement_put_htmlFor(IHTMLScriptElement *iface, B static HRESULT WINAPI HTMLScriptElement_get_htmlFor(IHTMLScriptElement *iface, BSTR *p) { HTMLScriptElement *This = impl_from_IHTMLScriptElement(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString html_str; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsAString_Init(&html_str, NULL); + nsres = nsIDOMHTMLScriptElement_GetHtmlFor(This->nsscript, &html_str); + return return_nsstr(nsres, &html_str, p); } static HRESULT WINAPI HTMLScriptElement_put_event(IHTMLScriptElement *iface, BSTR v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 13de60ff4d..23b3a57282 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -8834,6 +8834,11 @@ static void test_elems(IHTMLDocument2 *doc) hres = IHTMLScriptElement_get_src(script, &str); ok(hres == S_OK, "get_src failed: %08x\n", hres); ok(!str, "src = %s\n", wine_dbgstr_w(str)); + + str = (BSTR)0xdeadbeef; + hres = IHTMLScriptElement_get_htmlFor(script, &str); + ok(hres == S_OK, "get_htmlFor failed: %08x\n", hres); + ok(!str, "htmlFor = %s\n", wine_dbgstr_w(str)); } IHTMLScriptElement_Release(script); -- 2.24.1

3 5

[PATCH] testbot: Remove unneeded references to the mailing list name in comments.
by Francois Gouget 22 Jan '20

22 Jan '20

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/Engine.pl | 2 +- testbot/bin/WinePatchesMLSubmit.pl | 2 +- testbot/lib/WineTestBot/VMs.pm | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index a3608d0546..a8fc2f0de9 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -611,7 +611,7 @@ sub ClientRead($) This is called on startup and regularly after that to catch things that fall through the cracks, possibly because of an Engine restart. -Specifically it checks the staging directory for wine-patches emails dropped +Specifically it checks the staging directory for mailing list patches dropped by WinePatchesMLSubmit.pl, for notifications of changes on Wine's Patches web site dropped by WinePatchesWebSubmit.pl, and checks whether any pending patchsets are now complete and thus can be scheduled. diff --git a/testbot/bin/WinePatchesMLSubmit.pl b/testbot/bin/WinePatchesMLSubmit.pl index 0b2f6a1648..4797e986ad 100755 --- a/testbot/bin/WinePatchesMLSubmit.pl +++ b/testbot/bin/WinePatchesMLSubmit.pl @@ -1,7 +1,7 @@ #!/usr/bin/perl -Tw # -*- Mode: Perl; perl-indent-level: 2; indent-tabs-mode: nil -*- # -# This script expects to receive a wine-devel email on stdin and submits it +# This script expects to receive a mailing list email on stdin and submits it # to WineTestBot for testing. It is meant to be called from a tool such as # procmail. # diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index 2f4b703624..6c3c8b759f 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -73,8 +73,8 @@ them. A base VM is used for every suitable task. This is the only role that build VMs can play besides retired. For Windows VMs, this means that it will run the -WineTest jobs, the wine-patches jobs, and also the manually submitted jobs -unless the submitter decided otherwise. +WineTest jobs, jobs for the mailing list patches, and also the manually +submitted jobs unless the submitter decided otherwise. =item winetest -- 2.20.1

1 0

[PATCH 00/10] Implement d3d10 effect framework functionality
by Connor McAdams 22 Jan '20

22 Jan '20

Patch series to implement the functions that are used by steam big picture mode. Submitting for feedback/ideas on how to improve/change things. Connor McAdams (10): d3d10: Allocate buffers for effect interface local_buffers. d3d10: Implement scalar effect variable set methods. d3d10: Implement scalar effect variable get methods. d3d10: Implement vector effect variable set methods. d3d10: Implement vector effect variable get methods. d3d10: Implement matrix effect variable set methods. d3d10: Implement matrix effect variable get methods. d3d10: Implement ShaderResource effect variable set method. d3d10: Get resources used by effect shaders. d3d10: Apply shader resources for shaders used in pass. dlls/d3d10/d3d10_private.h | 28 ++ dlls/d3d10/effect.c | 758 +++++++++++++++++++++++++++++++++---- 2 files changed, 718 insertions(+), 68 deletions(-) -- 2.20.1

2 21

[PATCH 1/7] ddraw/tests: Pass in device to look for when enumerating.
by Jeff Smith 22 Jan '20

22 Jan '20

This makes it possible to scan for devices other than HAL. Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> --- dlls/ddraw/tests/ddraw7.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 470464951c..d921746152 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -339,10 +339,10 @@ static IDirectDraw7 *create_ddraw(void) static HRESULT WINAPI enum_devtype_cb(char *desc_str, char *name, D3DDEVICEDESC7 *desc, void *ctx) { - BOOL *hal_ok = ctx; - if (IsEqualGUID(&desc->deviceGUID, &IID_IDirect3DTnLHalDevice)) + struct { REFCLSID riid; BOOL present; } *device_data = ctx; + if (IsEqualGUID(&desc->deviceGUID, device_data->riid)) { - *hal_ok = TRUE; + device_data->present = TRUE; return DDENUMRET_CANCEL; } return DDENUMRET_OK; @@ -357,7 +357,7 @@ static IDirect3DDevice7 *create_device(HWND window, DWORD coop_level) IDirectDraw7 *ddraw; IDirect3D7 *d3d7; HRESULT hr; - BOOL hal_ok = FALSE; + struct { REFCLSID riid; BOOL present; } device_data = { &IID_IDirect3DTnLHalDevice, FALSE }; const GUID *devtype = &IID_IDirect3DHALDevice; if (!(ddraw = create_ddraw())) @@ -397,9 +397,9 @@ static IDirect3DDevice7 *create_device(HWND window, DWORD coop_level) return NULL; } - hr = IDirect3D7_EnumDevices(d3d7, enum_devtype_cb, &hal_ok); + hr = IDirect3D7_EnumDevices(d3d7, enum_devtype_cb, &device_data); ok(SUCCEEDED(hr), "Failed to enumerate devices, hr %#x.\n", hr); - if (hal_ok) devtype = &IID_IDirect3DTnLHalDevice; + if (device_data.present) devtype = device_data.riid; memset(&z_fmt, 0, sizeof(z_fmt)); hr = IDirect3D7_EnumZBufferFormats(d3d7, devtype, enum_z_fmt, &z_fmt); @@ -5650,7 +5650,7 @@ static void test_rt_caps(void) PALETTEENTRY palette_entries[256]; IDirectDrawPalette *palette; IDirectDraw7 *ddraw; - BOOL hal_ok = FALSE; + struct { REFCLSID riid; BOOL present; } device_data = { &IID_IDirect3DTnLHalDevice, FALSE }; DDPIXELFORMAT z_fmt; IDirect3D7 *d3d; unsigned int i; @@ -5848,10 +5848,10 @@ static void test_rt_caps(void) goto done; } - hr = IDirect3D7_EnumDevices(d3d, enum_devtype_cb, &hal_ok); + hr = IDirect3D7_EnumDevices(d3d, enum_devtype_cb, &device_data); ok(SUCCEEDED(hr), "Failed to enumerate devices, hr %#x.\n", hr); - if (hal_ok) - devtype = &IID_IDirect3DTnLHalDevice; + if (device_data.present) + devtype = device_data.riid; memset(&z_fmt, 0, sizeof(z_fmt)); hr = IDirect3D7_EnumZBufferFormats(d3d, devtype, enum_z_fmt, &z_fmt); @@ -6133,7 +6133,7 @@ static void test_surface_lock(void) DDSURFACEDESC2 ddsd; ULONG refcount; DDPIXELFORMAT z_fmt; - BOOL hal_ok = FALSE; + struct { REFCLSID riid; BOOL present; } device_data = { &IID_IDirect3DTnLHalDevice, FALSE }; const GUID *devtype = &IID_IDirect3DHALDevice; D3DDEVICEDESC7 device_desc; BOOL cubemap_supported; @@ -6254,10 +6254,10 @@ static void test_surface_lock(void) goto done; } - hr = IDirect3D7_EnumDevices(d3d, enum_devtype_cb, &hal_ok); + hr = IDirect3D7_EnumDevices(d3d, enum_devtype_cb, &device_data); ok(SUCCEEDED(hr), "Failed to enumerate devices, hr %#x.\n", hr); - if (hal_ok) - devtype = &IID_IDirect3DTnLHalDevice; + if (device_data.present) + devtype = device_data.riid; memset(&z_fmt, 0, sizeof(z_fmt)); hr = IDirect3D7_EnumZBufferFormats(d3d, devtype, enum_z_fmt, &z_fmt); -- 2.23.0

3 16

[PATCH 1/2] gdiplus/tests: Add another GdipGetPathGradientCenterPoint test.
by Jeff Smith 22 Jan '20

22 Jan '20

Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> --- dlls/gdiplus/tests/brush.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/dlls/gdiplus/tests/brush.c b/dlls/gdiplus/tests/brush.c index bb645ffef9..ed13b9e4b1 100644 --- a/dlls/gdiplus/tests/brush.c +++ b/dlls/gdiplus/tests/brush.c @@ -1299,6 +1299,7 @@ static void test_pathgradientcenterpoint(void) { static const GpPointF path_points[] = {{0,0}, {3,0}, {0,4}}; GpStatus status; + GpPath* path; GpPathGradient *grad; GpPointF point; @@ -1344,6 +1345,20 @@ static void test_pathgradientcenterpoint(void) todo_wine expectf(1.0, point.X); todo_wine expectf(4.0/3.0, point.Y); + status = GdipCreatePath(FillModeWinding, &path); + expect(Ok, status); + + status = GdipAddPathEllipse(path, 0, 0, 100, 50); + expect(Ok, status); + + status = GdipCreatePathGradientFromPath(path, &grad); + expect(Ok, status); + + status = GdipGetPathGradientCenterPoint(grad, &point); + expect(Ok, status); + todo_wine expectf(700.0/13.0, point.X); + expectf(25.0, point.Y); + status = GdipDeleteBrush((GpBrush*)grad); expect(Ok, status); } -- 2.23.0

2 2

[PATCH] include/winternl.h: Add Vista+ PEB_LDR_DATA structure fields.
by Paul Gofman 22 Jan '20

22 Jan '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48289 Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- include/winternl.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/winternl.h b/include/winternl.h index 0122684483..e5aed5acb1 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -213,6 +213,8 @@ typedef struct _PEB_LDR_DATA LIST_ENTRY InMemoryOrderModuleList; LIST_ENTRY InInitializationOrderModuleList; PVOID EntryInProgress; + BOOLEAN ShutdownInProgress; + HANDLE ShutdownThreadId; } PEB_LDR_DATA, *PPEB_LDR_DATA; typedef struct _GDI_TEB_BATCH -- 2.24.1

1 0

[PATCH] winex11.drv: Fix resizable window has not minsize
by Zhipeng Zhao 22 Jan '20

22 Jan '20

When resizing an resizable window, we can resize it smaller than it's minsize show in Windows, I think it's a bug, and try to fix it. Signed-off-by: Zhipeng Zhao <near2see(a)163.com> --- dlls/winex11.drv/mouse.c | 121 +++++++++++++++++++++++++++++++++++++- dlls/winex11.drv/window.c | 14 ++++- 2 files changed, 131 insertions(+), 4 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 290732fa93..1c5766be09 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -1560,6 +1560,104 @@ BOOL CDECL X11DRV_ClipCursor( LPCRECT clip ) return TRUE; } +/*********************************************************************** + * set_window_minsize + */ +void set_window_minsize(HWND hwnd, RECT* sizingRect, int dir, int* minWidth, int* minHeight) +{ + Display *display = thread_display(); + Window win = X11DRV_get_whole_window( hwnd ); + POINT pos; + GetCursorPos(&pos); + switch (dir) + { + case 7: //_NET_WM_MOVERESIZE_SIZE_LEFT: + case 3: //_NET_WM_MOVERESIZE_SIZE_RIGHT: + if(*minWidth == 0) + { + FIXME("before top = %i, left = %i, right = %i, bottom = %i, width = %i\n", sizingRect->top, sizingRect->left, sizingRect->right, sizingRect->bottom, sizingRect->right-sizingRect->left); + if(dir == 3) + { + if(pos.x > sizingRect->right) return; + sizingRect->right = pos.x; + SendMessageW(hwnd, WM_SIZING, WMSZ_RIGHT, sizingRect); + } + else if(dir == 7) + { + if(pos.x < sizingRect->left) return; + sizingRect->left = pos.x; + SendMessageW(hwnd, WM_SIZING, WMSZ_LEFT, sizingRect); + } + FIXME("after top = %i, left = %i, right = %i, bottom = %i, width = %i\n", sizingRect->top, sizingRect->left, sizingRect->right, sizingRect->bottom, sizingRect->right-sizingRect->left); + if((dir == 3 ? sizingRect->right > pos.x : sizingRect->left < pos.x)) + { + *minWidth = sizingRect->right - sizingRect->left; + XSizeHints* sizehints = XAllocSizeHints(); + LONG ret = -1; + XGetWMNormalHints(display, win, sizehints, &ret); + sizehints->flags |= PMinSize; + sizehints->min_width = *minWidth; + XSetWMNormalHints(display, win, sizehints); + XFree(sizehints); + FIXME("minWidth = %i\n", *minWidth); + } + } + break; + case 1: //_NET_WM_MOVERESIZE_SIZE_TOP: + case 5: //_NET_WM_MOVERESIZE_SIZE_BOTTOM: + if(*minHeight == 0) + { + FIXME("before top = %i, left = %i, right = %i, bottom = %i, width = %i\n", sizingRect->top, sizingRect->left, + sizingRect->right, sizingRect->bottom, sizingRect->right-sizingRect->left); + if(dir == 1) + { + if(pos.y < sizingRect->top) return; + sizingRect->top = pos.y; + SendMessageW(hwnd, WM_SIZING, WMSZ_TOP, sizingRect); + } + else if(dir == 5) + { + if(pos.y > sizingRect->top) return; + sizingRect->bottom = pos.y; + SendMessageW(hwnd, WM_SIZING, WMSZ_BOTTOM, sizingRect); + } + FIXME("after top = %i, left = %i, right = %i, bottom = %i, width = %i\n", sizingRect->top, sizingRect->left, + sizingRect->right, sizingRect->bottom, sizingRect->right-sizingRect->left); + if((dir == 1 ? sizingRect->top < pos.y : sizingRect->bottom > pos.y)) + { + *minHeight = sizingRect->bottom - sizingRect->top; + XSizeHints* sizehints = XAllocSizeHints(); + LONG ret = -1; + XGetWMNormalHints(display, win, sizehints, &ret); + sizehints->flags |= PMinSize; + sizehints->min_height = *minHeight; + XSetWMNormalHints(display, win, sizehints); + XFree(sizehints); + FIXME("minHeight = %i\n", *minHeight); + } + } + break; + case 0: //_NET_WM_MOVERESIZE_SIZE_TOPLEFT + set_window_minsize(hwnd, sizingRect, 1, minWidth, minHeight); + set_window_minsize(hwnd, sizingRect, 7, minWidth, minHeight); + break; + case 2: //_NET_WM_MOVERESIZE_SIZE_TOPRIGHT + set_window_minsize(hwnd, sizingRect, 1, minWidth, minHeight); + set_window_minsize(hwnd, sizingRect, 3, minWidth, minHeight); + break; + case 4: //_NET_WM_MOVERESIZE_SIZE_BOTTOMRIGHT + set_window_minsize(hwnd, sizingRect, 5, minWidth, minHeight); + set_window_minsize(hwnd, sizingRect, 3, minWidth, minHeight); + break; + case 6: //_NET_WM_MOVERESIZE_SIZE_BOTTOMLEFT + set_window_minsize(hwnd, sizingRect, 5, minWidth, minHeight); + set_window_minsize(hwnd, sizingRect, 7, minWidth, minHeight); + break; + default: + break; + } +} + /*********************************************************************** * move_resize_window */ @@ -1572,7 +1670,28 @@ void move_resize_window( HWND hwnd, int dir ) XEvent xev; Window win, root, child; unsigned int xstate; + RECT sizingRect; + LONG minWidth = 0; + LONG minHeight = 0; + MINMAXINFO info; + info.ptMinTrackSize.x = 0; + info.ptMinTrackSize.y = 0; + SendMessageW(hwnd, WM_GETMINMAXINFO, 0, (LPARAM)&info); + if(info.ptMinTrackSize.x !=0 && info.ptMinTrackSize.y != 0) + { + minWidth = info.ptMinTrackSize.x; + minHeight = info.ptMinTrackSize.y; + XSizeHints* sizehints = XAllocSizeHints(); + LONG ret = -1; + XGetWMNormalHints(display, win, sizehints, &ret); + sizehints->flags |= PMinSize; + sizehints->min_height = minHeight; + sizehints->min_width = minWidth; + XSetWMNormalHints(display, win, sizehints); + XFree(sizehints); + } + GetWindowRect( hwnd, &sizingRect); if (!(win = X11DRV_get_whole_window( hwnd ))) return; pt = GetMessagePos(); @@ -1629,7 +1748,7 @@ void move_resize_window( HWND hwnd, int dir ) input.u.mi.dwExtraInfo = 0; __wine_send_input( hwnd, &input ); } - + GetWindowRect( hwnd, &sizingRect); while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) { if (!CallMsgFilterW( &msg, MSGF_SIZE )) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 99e4094ebd..dcbebb801b 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -683,13 +683,21 @@ static void set_size_hints( struct x11drv_win_data *data, DWORD style ) if (!is_window_resizable( data, style )) { + XSizeHints* sizehints = XAllocSizeHints(); + long ret = 0; + XGetWMNormalHints(data->display, data->whole_window, sizehints, &ret); size_hints->max_width = data->whole_rect.right - data->whole_rect.left; size_hints->max_height = data->whole_rect.bottom - data->whole_rect.top; if (size_hints->max_width <= 0 ||size_hints->max_height <= 0) size_hints->max_width = size_hints->max_height = 1; - size_hints->min_width = size_hints->max_width; - size_hints->min_height = size_hints->max_height; - size_hints->flags |= PMinSize | PMaxSize; + size_hints->flags |= PMaxSize ; + if(sizehints->min_height > 0 && sizehints->min_width > 0) + { + size_hints->min_width = sizehints->min_width; + size_hints->min_height = sizehints->min_height; + size_hints->flags |= PMinSize; + } + XFree(sizehints); } } XSetWMNormalHints( data->display, data->whole_window, size_hints ); -- 2.24.1.windows.2

2 1

[PATCH] dmusic: Use wide-char string literals
by Michael Stefaniuc 22 Jan '20

22 Jan '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmusic/dmusic.c | 8 +++----- dlls/dmusic/tests/dmusic.c | 5 ++--- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/dlls/dmusic/dmusic.c b/dlls/dmusic/dmusic.c index cc798ce4d9..1916fb7bd9 100644 --- a/dlls/dmusic/dmusic.c +++ b/dlls/dmusic/dmusic.c @@ -343,20 +343,18 @@ static HRESULT WINAPI IDirectMusic8Impl_EnumMasterClock(LPDIRECTMUSIC8 iface, DW if (!index) { static const GUID guid_system_clock = { 0x58d58419, 0x71b4, 0x11d1, { 0xa7, 0x4c, 0x00, 0x00, 0xf8, 0x75, 0xac, 0x12 } }; - static const WCHAR name_system_clock[] = { 'S','y','s','t','e','m',' ','C','l','o','c','k',0 }; clock_info->ctType = 0; clock_info->guidClock = guid_system_clock; - lstrcpyW(clock_info->wszDescription, name_system_clock); + lstrcpyW(clock_info->wszDescription, L"System Clock"); } else { static const GUID guid_dsound_clock = { 0x58d58420, 0x71b4, 0x11d1, { 0xa7, 0x4c, 0x00, 0x00, 0xf8, 0x75, 0xac, 0x12 } }; - static const WCHAR name_dsound_clock[] = { 'D','i','r','e','c','t','S','o','u','n','d',' ','C','l','o','c','k',0 }; clock_info->ctType = 0; clock_info->guidClock = guid_dsound_clock; - lstrcpyW(clock_info->wszDescription, name_dsound_clock); + lstrcpyW(clock_info->wszDescription, L"DirectSound Clock"); } return S_OK; @@ -496,7 +494,7 @@ static const IDirectMusic8Vtbl DirectMusic8_Vtbl = { static void create_system_ports_list(IDirectMusic8Impl* object) { - static const WCHAR emulated[] = {' ','[','E','m','u','l','a','t','e','d',']',0}; + static const WCHAR emulated[] = L" [Emulated]"; port_info * port; ULONG nb_ports; ULONG nb_midi_out; diff --git a/dlls/dmusic/tests/dmusic.c b/dlls/dmusic/tests/dmusic.c index f6c417af30..776f9d0ec9 100644 --- a/dlls/dmusic/tests/dmusic.c +++ b/dlls/dmusic/tests/dmusic.c @@ -639,7 +639,6 @@ static void test_parsedescriptor(void) IStream *stream; DMUS_OBJECTDESC desc = {0}; HRESULT hr; - const WCHAR s_inam[] = {'I','N','A','M','\0'}; const FOURCC alldesc[] = { FOURCC_RIFF, FOURCC_DLS, DMUS_FOURCC_CATEGORY_CHUNK, FOURCC_LIST, @@ -735,7 +734,7 @@ static void test_parsedescriptor(void) ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr); ok(desc.dwValidData == (DMUS_OBJ_CLASS | DMUS_OBJ_NAME), "Got valid data %#x, expected DMUS_OBJ_CLASS | DMUS_OBJ_NAME\n", desc.dwValidData); - ok(!memcmp(desc.wszName, s_inam, sizeof(s_inam)), "Got name '%s', expected 'INAM'\n", + ok(!lstrcmpW(desc.wszName, L"INAM"), "Got name '%s', expected 'INAM'\n", wine_dbgstr_w(desc.wszName)); IStream_Release(stream); @@ -747,7 +746,7 @@ static void test_parsedescriptor(void) ok(desc.dwValidData == (DMUS_OBJ_CLASS | DMUS_OBJ_NAME | DMUS_OBJ_VERSION), "Got valid data %#x, expected DMUS_OBJ_CLASS | DMUS_OBJ_NAME | DMUS_OBJ_VERSION\n", desc.dwValidData); - ok(!memcmp(desc.wszName, s_inam, sizeof(s_inam)), "Got name '%s', expected 'INAM'\n", + ok(!lstrcmpW(desc.wszName, L"INAM"), "Got name '%s', expected 'INAM'\n", wine_dbgstr_w(desc.wszName)); IStream_Release(stream); -- 2.23.0

3 3

[PATCH v2 1/5] wined3d: Introduce wined3d_device_apply_stateblock().
by Zebediah Figura 22 Jan '20

22 Jan '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- v2: Push all shader constants in one call, and make use of stateblock changed-state tracking for all other states, as per Matteo's suggestion. dlls/wined3d/device.c | 116 ++++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 1 + 3 files changed, 118 insertions(+) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 8913420724..acc915eb55 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3829,6 +3829,122 @@ struct wined3d_texture * CDECL wined3d_device_get_texture(const struct wined3d_d return device->state.textures[stage]; } +void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, + struct wined3d_stateblock *stateblock) +{ + const struct wined3d_d3d_info *d3d_info = &stateblock->device->adapter->d3d_info; + const struct wined3d_stateblock_state *state = &stateblock->stateblock_state; + unsigned int i, j; + + TRACE("device %p, stateblock %p.\n", device, stateblock); + + if (stateblock->changed.vertexShader) + wined3d_device_set_vertex_shader(device, state->vs); + if (stateblock->changed.pixelShader) + wined3d_device_set_pixel_shader(device, state->ps); + + wined3d_device_set_vs_consts_f(device, 0, d3d_info->limits.vs_uniform_count, state->vs_consts_f); + wined3d_device_set_vs_consts_b(device, 0, WINED3D_MAX_CONSTS_B, state->vs_consts_b); + wined3d_device_set_vs_consts_i(device, 0, WINED3D_MAX_CONSTS_I, state->vs_consts_i); + wined3d_device_set_ps_consts_f(device, 0, d3d_info->limits.ps_uniform_count, state->ps_consts_f); + wined3d_device_set_ps_consts_b(device, 0, WINED3D_MAX_CONSTS_B, state->ps_consts_b); + wined3d_device_set_ps_consts_i(device, 0, WINED3D_MAX_CONSTS_I, state->ps_consts_i); + + for (i = 0; i < ARRAY_SIZE(state->light_state->light_map); ++i) + { + const struct wined3d_light_info *light; + + LIST_FOR_EACH_ENTRY(light, &state->light_state->light_map[i], struct wined3d_light_info, entry) + { + wined3d_device_set_light(device, light->OriginalIndex, &light->OriginalParms); + wined3d_device_set_light_enable(device, light->OriginalIndex, light->glIndex != -1); + } + } + + for (i = 0; i < ARRAY_SIZE(state->rs); ++i) + { + if (stateblock->changed.renderState[i >> 5] & (1u << (i & 0x1f))) + { + if (i == WINED3D_RS_BLENDFACTOR) + { + struct wined3d_color color; + wined3d_color_from_d3dcolor(&color, state->rs[i]); + wined3d_device_set_blend_state(device, NULL, &color); + } + else + wined3d_device_set_render_state(device, i, state->rs[i]); + } + } + + for (i = 0; i < ARRAY_SIZE(state->texture_states); ++i) + { + for (j = 0; j < ARRAY_SIZE(state->texture_states[i]); ++j) + { + if (stateblock->changed.textureState[i] & (1u << j)) + wined3d_device_set_texture_stage_state(device, i, j, state->texture_states[i][j]); + } + } + + for (i = 0; i < ARRAY_SIZE(state->sampler_states); ++i) + { + DWORD stage = i; + if (stage >= WINED3D_MAX_FRAGMENT_SAMPLERS) + stage += WINED3DVERTEXTEXTURESAMPLER0 - WINED3D_MAX_FRAGMENT_SAMPLERS; + for (j = 0; j < ARRAY_SIZE(state->sampler_states[j]); ++j) + { + if (stateblock->changed.samplerState[i] & (1 << j)) + wined3d_device_set_sampler_state(device, stage, j, state->sampler_states[i][j]); + } + } + + for (i = 0; i < ARRAY_SIZE(state->transforms); ++i) + { + if (stateblock->changed.transform[i >> 5] & (1u << (i & 0x1f))) + wined3d_device_set_transform(device, i, &state->transforms[i]); + } + + if (stateblock->changed.indices) + wined3d_device_set_index_buffer(device, state->index_buffer, state->index_format, 0); + wined3d_device_set_base_vertex_index(device, state->base_vertex_index); + if (stateblock->changed.vertexDecl) + wined3d_device_set_vertex_declaration(device, state->vertex_declaration); + if (stateblock->changed.material) + wined3d_device_set_material(device, &state->material); + if (stateblock->changed.viewport) + wined3d_device_set_viewports(device, 1, &state->viewport); + if (stateblock->changed.scissorRect) + wined3d_device_set_scissor_rects(device, 1, &state->scissor_rect); + + for (i = 0; i < ARRAY_SIZE(state->streams); ++i) + { + if (stateblock->changed.streamSource & (1u << i)) + wined3d_device_set_stream_source(device, i, state->streams[i].buffer, + state->streams[i].offset, state->streams[i].stride); + if (stateblock->changed.streamFreq & (1u << i)) + wined3d_device_set_stream_source_freq(device, i, + state->streams[i].frequency | state->streams[i].flags); + } + + for (i = 0; i < ARRAY_SIZE(state->textures); ++i) + { + DWORD stage = i; + if (stage >= WINED3D_MAX_FRAGMENT_SAMPLERS) + stage += WINED3DVERTEXTEXTURESAMPLER0 - WINED3D_MAX_FRAGMENT_SAMPLERS; + if (stateblock->changed.textures & (1u << i)) + wined3d_device_set_texture(device, stage, state->textures[i]); + } + + for (i = 0; i < ARRAY_SIZE(state->clip_planes); ++i) + { + if (stateblock->changed.clipplane & (1u << i)) + wined3d_device_set_clip_plane(device, i, &state->clip_planes[i]); + } + + memset(&stateblock->changed, 0, sizeof(stateblock->changed)); + + TRACE("Applied stateblock %p.\n", stateblock); +} + HRESULT CDECL wined3d_device_get_device_caps(const struct wined3d_device *device, struct wined3d_caps *caps) { TRACE("device %p, caps %p.\n", device, caps); diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index e03c57055b..c8ef442c72 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -37,6 +37,7 @@ @ cdecl wined3d_buffer_incref(ptr) @ cdecl wined3d_device_acquire_focus_window(ptr ptr) +@ cdecl wined3d_device_apply_stateblock(ptr ptr) @ cdecl wined3d_device_begin_scene(ptr) @ cdecl wined3d_device_clear(ptr long ptr long ptr float long) @ cdecl wined3d_device_clear_rendertarget_view(ptr ptr ptr long ptr float long) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index db88e11032..8951f92d14 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2288,6 +2288,7 @@ struct wined3d_resource * __cdecl wined3d_buffer_get_resource(struct wined3d_buf ULONG __cdecl wined3d_buffer_incref(struct wined3d_buffer *buffer); HRESULT __cdecl wined3d_device_acquire_focus_window(struct wined3d_device *device, HWND window); +void __cdecl wined3d_device_apply_stateblock(struct wined3d_device *device, struct wined3d_stateblock *stateblock); HRESULT __cdecl wined3d_device_begin_scene(struct wined3d_device *device); HRESULT __cdecl wined3d_device_clear(struct wined3d_device *device, DWORD rect_count, const RECT *rects, DWORD flags, const struct wined3d_color *color, float z, DWORD stencil); -- 2.24.0

3 9

[PATCH 1/4] include: Add xact.idl
by Alistair Leslie-Hughes 22 Jan '20

22 Jan '20

From: Ethan Lee <elee(a)codeweavers.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/Makefile.in | 1 + include/xact3.idl | 560 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 561 insertions(+) create mode 100644 include/xact3.idl diff --git a/include/Makefile.in b/include/Makefile.in index 8284d6fdf3..01fc25ebf8 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -772,6 +772,7 @@ SOURCES = \ wtypes.idl \ wuapi.idl \ x3daudio.h \ + xact3.idl \ xapo.idl \ xapofx.h \ xaudio2.idl \ diff --git a/include/xact3.idl b/include/xact3.idl new file mode 100644 index 0000000000..eaab56203c --- /dev/null +++ b/include/xact3.idl @@ -0,0 +1,560 @@ +/* + * Copyright (c) 2018 Ethan Lee for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "unknwn.idl"; +import "xaudio2.idl"; + +[ + uuid(bcc782bc-6492-4c22-8c35-f5d72fe73c6e) +] +coclass XACTEngine +{ + interface IUnknown; +} + +interface IXACT3Engine; +interface IXACT3SoundBank; +interface IXACT3WaveBank; +interface IXACT3Cue; +interface IXACT3Wave; + +typedef WORD XACTCATEGORY; +typedef BYTE XACTCHANNEL; +typedef WORD XACTINDEX; +typedef BYTE XACTINSTANCELIMIT; +typedef BYTE XACTLOOPCOUNT; +typedef BYTE XACTNOTIFICATIONTYPE; +typedef SHORT XACTPITCH; +typedef LONG XACTTIME; +typedef WORD XACTVARIABLEINDEX; +typedef FLOAT XACTVARIABLEVALUE; +typedef BYTE XACTVARIATIONWEIGHT; +typedef FLOAT XACTVOLUME; + +typedef struct XACT_RENDERER_DETAILS +{ + WCHAR rendererID[0xFF]; + WCHAR displayName[0xFF]; + BOOL defaultDevice; +} XACT_RENDERER_DETAILS; + +typedef BOOL (__stdcall *XACT_READFILE_CALLBACK)( + HANDLE hFile, + LPVOID lpBuffer, + DWORD nNumberOfBytesRead, + LPDWORD lpNumberOfBytesRead, + void* lpOverlapped +); +typedef BOOL (__stdcall *XACT_GETOVERLAPPEDRESULT_CALLBACK)( + HANDLE hFile, + void* lpOverlapped, + LPDWORD lpNumberOfBytesTransferred, + BOOL bWait +); +typedef struct XACT_FILEIO_CALLBACKS +{ + BYTE* readFileCallback; /* FIXME: XACT_READFILE_CALLBACK */ + BYTE* getOverlappedResultCallback; /* FIXME: XACT_GETOVERLAPPEDRESULT_CALLBACK */ +} XACT_FILEIO_CALLBACKS; + +typedef struct XACT_NOTIFICATION XACT_NOTIFICATION; +typedef void (__stdcall *XACT_NOTIFICATION_CALLBACK)( + const XACT_NOTIFICATION *pNotification +); + +typedef struct XACT_RUNTIME_PARAMETERS +{ + DWORD lookAheadTime; + BYTE* pGlobalSettingsBuffer; /* FIXME: void* */ + DWORD globalSettingsBufferSize; + DWORD globalSettingsFlags; + DWORD globalSettingsAllocAttributes; + XACT_FILEIO_CALLBACKS fileIOCallbacks; + BYTE* fnNotificationCallback; /* FIXME: XACT_NOTIFICATION_CALLBACK */ + LPCWSTR pRendererID; + IXAudio2 *pXAudio2; + IXAudio2MasteringVoice *pMasteringVoice; +} XACT_RUNTIME_PARAMETERS; + +typedef struct XACT_STREAMING_PARAMETERS +{ + BYTE* file; /* FIXME: HANDLE */ + DWORD offset; + DWORD flags; + WORD packetSize; +} XACT_STREAMING_PARAMETERS; + +cpp_quote("#include <pshpack1.h>") + +typedef struct WAVEBANKREGION +{ + DWORD dwOffset; + DWORD dwLength; +} WAVEBANKREGION; + +typedef struct WAVEBANKSAMPLEREGION +{ + DWORD dwStartSample; + DWORD dwTotalSamples; +} WAVEBANKSAMPLEREGION; + +typedef union WAVEBANKMINIWAVEFORMAT +{ + union /* struct */ + { + DWORD wFormatTag; /* : 2; */ + DWORD nChannels; /* : 3; */ + DWORD nSamplesPerSec; /* : 18; */ + DWORD wBlockAlign; /* : 8; */ + DWORD wBitsPerSample; /* : 1; */ + } NONAMELESSUNION; + DWORD dwValue; +} WAVEBANKMINIWAVEFORMAT; + +typedef struct WAVEBANKENTRY +{ + union + { + union /* struct */ + { + DWORD dwFlags; /* : 4; */ + DWORD Duration; /* : 28; */ + } NONAMELESSUNION; + DWORD dwFlagsAndDuration; + }; + WAVEBANKMINIWAVEFORMAT Format; + WAVEBANKREGION PlayRegion; + WAVEBANKSAMPLEREGION LoopRegion; +} WAVEBANKENTRY; + +cpp_quote("#include <poppack.h>") + +typedef struct XACT_WAVE_PROPERTIES +{ + char friendlyName[64]; + WAVEBANKMINIWAVEFORMAT format; + DWORD durationInSamples; + WAVEBANKSAMPLEREGION loopRegion; + BOOL streaming; +} XACT_WAVE_PROPERTIES; + +typedef struct XACT_WAVE_INSTANCE_PROPERTIES +{ + XACT_WAVE_PROPERTIES waveProperties; /* FIXME: 'properties' */ + BOOL backgroundMusic; +} XACT_WAVE_INSTANCE_PROPERTIES; + +typedef struct XACT_CUE_PROPERTIES +{ + char friendlyName[0xFF]; + BOOL interactive; + XACTINDEX iaVariableIndex; + XACTINDEX numVariations; + XACTINSTANCELIMIT maxInstances; + XACTINSTANCELIMIT currentInstances; +} XACT_CUE_PROPERTIES; + +typedef struct XACT_TRACK_PROPERTIES +{ + XACTTIME duration; + XACTINDEX numVariations; + XACTCHANNEL numChannels; + XACTINDEX waveVariation; + XACTLOOPCOUNT loopCount; +} XACT_TRACK_PROPERTIES; + +typedef struct XACT_VARIATION_PROPERTIES +{ + XACTINDEX index; + XACTVARIATIONWEIGHT weight; + XACTVARIABLEVALUE iaVariableMin; + XACTVARIABLEVALUE iaVariableMax; + BOOL linger; +} XACT_VARIATION_PROPERTIES; + +typedef struct XACT_SOUND_PROPERTIES +{ + XACTCATEGORY category; + BYTE priority; + XACTPITCH pitch; + XACTVOLUME volume; + XACTINDEX numTracks; + XACT_TRACK_PROPERTIES arrTrackProperties[1]; +} XACT_SOUND_PROPERTIES; + +typedef struct XACT_SOUND_VARIATION_PROPERTIES +{ + XACT_VARIATION_PROPERTIES variationProperties; + XACT_SOUND_PROPERTIES soundProperties; +} XACT_SOUND_VARIATION_PROPERTIES; + +typedef struct XACT_CUE_INSTANCE_PROPERTIES +{ + DWORD allocAttributes; + XACT_CUE_PROPERTIES cueProperties; + XACT_SOUND_VARIATION_PROPERTIES activeVariationProperties; +} XACT_CUE_INSTANCE_PROPERTIES; + +cpp_quote("#include <pshpack1.h>") + +typedef struct XACT_NOTIFICATION_DESCRIPTION +{ + XACTNOTIFICATIONTYPE type; + BYTE flags; + IXACT3SoundBank *pSoundBank; + IXACT3WaveBank *pWaveBank; + IXACT3Cue *pCue; + IXACT3Wave *pWave; + XACTINDEX cueIndex; + XACTINDEX waveIndex; + BYTE* pvContext; /* FIXME: LPVOID */ +} XACT_NOTIFICATION_DESCRIPTION; + +typedef struct XACT_NOTIFICATION_CUE +{ + XACTINDEX cueIndex; + IXACT3SoundBank *pSoundBank; + IXACT3Cue *pCue; +} XACT_NOTIFICATION_CUE; + +typedef struct XACT_NOTIFICATION_MARKER +{ + XACTINDEX cueIndex; + IXACT3SoundBank *pSoundBank; + IXACT3Cue *pCue; + DWORD marker; +} XACT_NOTIFICATION_MARKER; + +typedef struct XACT_NOTIFICATION_SOUNDBANK +{ + IXACT3SoundBank *pSoundBank; +} XACT_NOTIFICATION_SOUNDBANK; + +typedef struct XACT_NOTIFICATION_WAVEBANK +{ + IXACT3WaveBank *pWaveBank; +} XACT_NOTIFICATION_WAVEBANK; + +typedef struct XACT_NOTIFICATION_VARIABLE +{ + XACTINDEX cueIndex; + IXACT3SoundBank *pSoundBank; + IXACT3Cue *pCue; + XACTVARIABLEINDEX variableIndex; + XACTVARIABLEVALUE variableValue; + BOOL local; +} XACT_NOTIFICATION_VARIABLE; + +typedef struct XACT_NOTIFICATION_GUI +{ + DWORD reserved; +} XACT_NOTIFICATION_GUI; + +typedef struct XACT_NOTIFICATION_WAVE +{ + IXACT3WaveBank *pWaveBank; + XACTINDEX waveIndex; + XACTINDEX cueIndex; + IXACT3SoundBank *pSoundBank; + IXACT3Cue *pCue; + IXACT3Wave *pWave; +} XACT_NOTIFICATION_WAVE; + +struct XACT_NOTIFICATION +{ + XACTNOTIFICATIONTYPE type; + LONG timeStamp; + PVOID pvContext; + union + { + XACT_NOTIFICATION_CUE cue; + XACT_NOTIFICATION_MARKER marker; + XACT_NOTIFICATION_SOUNDBANK soundBank; + XACT_NOTIFICATION_WAVEBANK waveBank; + XACT_NOTIFICATION_VARIABLE variable; + XACT_NOTIFICATION_GUI gui; + XACT_NOTIFICATION_WAVE wave; + }; +}; + +cpp_quote("#include <poppack.h>") + +static const XACTNOTIFICATIONTYPE XACTNOTIFICATIONTYPE_CUEDESTROYED = 4; +static const XACTNOTIFICATIONTYPE XACTNOTIFICATIONTYPE_SOUNDBANKDESTROYED = 6; +static const XACTNOTIFICATIONTYPE XACTNOTIFICATIONTYPE_WAVEBANKDESTROYED = 7; +static const XACTNOTIFICATIONTYPE XACTNOTIFICATIONTYPE_WAVEDESTROYED = 16; + +[ + object, + uuid(b1ee676a-d9cd-4d2a-89a8-fa53eb9e480b), +] +interface IXACT3Engine : IUnknown +{ + HRESULT GetRendererCount([out] XACTINDEX *pnRendererCount); + + HRESULT GetRendererDetails( + XACTINDEX nRendererIndex, + [out] XACT_RENDERER_DETAILS *pRendererDetails); + + HRESULT GetFinalMixFormat([out] WAVEFORMATEXTENSIBLE *pFinalMixFormat); + + HRESULT Initialize([in] const XACT_RUNTIME_PARAMETERS *pParams); + + HRESULT ShutDown(); + + HRESULT DoWork(); + + HRESULT CreateSoundBank( + [in] const BYTE* pvBuffer, /* FIXME: void* */ + DWORD dwSize, + DWORD dwFlags, + DWORD dwAllocAttributes, + [out] IXACT3SoundBank **ppSoundBank); + + HRESULT CreateInMemoryWaveBank( + [in] const BYTE* pvBuffer, /* FIXME: void* */ + DWORD dwSize, + DWORD dwFlags, + DWORD dwAllocAttributes, + [out] IXACT3WaveBank **ppWaveBank); + + HRESULT CreateStreamingWaveBank( + [in] const XACT_STREAMING_PARAMETERS *pParms, + [out] IXACT3WaveBank **ppWaveBank); + + HRESULT PrepareWave( + DWORD dwFlags, + [in] LPCSTR szWavePath, + WORD wStreamingPacketSize, + DWORD dwAlignment, + DWORD dwPlayOffset, + XACTLOOPCOUNT nLoopCount, + [out] IXACT3Wave **ppWave); + + HRESULT PrepareInMemoryWave( + DWORD dwFlags, + WAVEBANKENTRY entry, + [in] DWORD *pdwSeekTable, + [in] BYTE *pbWaveData, + DWORD dwPlayOffset, + XACTLOOPCOUNT nLoopCount, + [out] IXACT3Wave **ppWave); + + HRESULT PrepareStreamingWave( + DWORD dwFlags, + WAVEBANKENTRY entry, + XACT_STREAMING_PARAMETERS streamingParams, + DWORD dwAlignment, + [in] DWORD *pdwSeekTable, + DWORD dwPlayOffset, + XACTLOOPCOUNT nLoopCount, + [out] IXACT3Wave **ppWave); + + HRESULT RegisterNotification( + [in] const XACT_NOTIFICATION_DESCRIPTION *pNotificationDesc); + + HRESULT UnRegisterNotification( + [in] const XACT_NOTIFICATION_DESCRIPTION *pNotificationDesc); + + XACTCATEGORY GetCategory( + [in] LPCSTR szFriendlyName); + + HRESULT Stop(XACTCATEGORY nCategory, DWORD dwFlags); + + HRESULT SetVolume(XACTCATEGORY nCategory, XACTVOLUME nVolume); + + HRESULT Pause(XACTCATEGORY nCategory, BOOL fPause); + + XACTVARIABLEINDEX GetGlobalVariableIndex([in] LPCSTR szFriendlyName); + + HRESULT SetGlobalVariable( + XACTVARIABLEINDEX nIndex, + XACTVARIABLEVALUE nValue); + + HRESULT GetGlobalVariable( + XACTVARIABLEINDEX nIndex, + [out] XACTVARIABLEVALUE *nValue); +} + +[ + object, + local +] +interface IXACT3SoundBank +{ + XACTINDEX GetCueIndex([in] LPCSTR szFriendlyName); + + HRESULT GetNumCues([out] XACTINDEX *pnNumCues); + + HRESULT GetCueProperties( + XACTINDEX nCueIndex, + [out] XACT_CUE_PROPERTIES *pProperties); + + HRESULT Prepare( + XACTINDEX nCueIndex, + DWORD dwFlags, + XACTTIME timeOffset, + [out] IXACT3Cue **ppCue); + + HRESULT Play( + XACTINDEX nCueIndex, + DWORD dwFlags, + XACTTIME timeOffset, + [out] IXACT3Cue **ppCue); + + HRESULT Stop(XACTINDEX nCueIndex, DWORD dwFlags); + + HRESULT Destroy(); + + HRESULT GetState([out] DWORD *pdwState); +} + +[ + object, + local +] +interface IXACT3WaveBank +{ + HRESULT Destroy(); + + HRESULT GetNumWaves([out] XACTINDEX *pnNumWaves); + + XACTINDEX GetWaveIndex([in] LPCSTR szFriendlyName); + + HRESULT GetWaveProperties( + XACTINDEX nWaveIndex, + [out] XACT_WAVE_PROPERTIES *pWaveProperties); + + HRESULT Prepare( + XACTINDEX nWaveIndex, + DWORD dwFlags, + DWORD dwPlayOffset, + XACTLOOPCOUNT nLoopCount, + [out] IXACT3Wave **ppWave); + + HRESULT Play( + XACTINDEX nWaveIndex, + DWORD dwFlags, + DWORD dwPlayOffset, + XACTLOOPCOUNT nLoopCount, + [out] IXACT3Wave **ppWave); + + HRESULT Stop(XACTINDEX nWaveIndex, DWORD dwFlags); + + HRESULT GetState([out] DWORD *pdwState); +} + +[ + object, + local +] +interface IXACT34Cue +{ + HRESULT Play(); + + HRESULT Stop(DWORD dwFlags); + + HRESULT GetState([out] DWORD *pdwState); + + HRESULT Destroy(); + + HRESULT SetMatrixCoefficients( + UINT32 uSrcChannelCount, + UINT32 uDstChannelCount, + [in] float *pMatrixCoefficients); + + XACTVARIABLEINDEX GetVariableIndex([in] LPCSTR szFriendlyName); + + HRESULT SetVariable(XACTVARIABLEINDEX nIndex, XACTVARIABLEVALUE nValue); + + HRESULT GetVariable( + XACTVARIABLEINDEX nIndex, + [out] XACTVARIABLEVALUE *nValue); + + HRESULT Pause(BOOL fPause); + + HRESULT GetProperties([out] XACT_CUE_INSTANCE_PROPERTIES **ppProperties); +} + +[ + object, + local +] +interface IXACT3Cue +{ + HRESULT Play(); + + HRESULT Stop(DWORD dwFlags); + + HRESULT GetState([out] DWORD *pdwState); + + HRESULT Destroy(); + + HRESULT SetMatrixCoefficients( + UINT32 uSrcChannelCount, + UINT32 uDstChannelCount, + [in] float *pMatrixCoefficients); + + XACTVARIABLEINDEX GetVariableIndex([in] LPCSTR szFriendlyName); + + HRESULT SetVariable(XACTVARIABLEINDEX nIndex, XACTVARIABLEVALUE nValue); + + HRESULT GetVariable( + XACTVARIABLEINDEX nIndex, + [out] XACTVARIABLEVALUE *nValue); + + HRESULT Pause(BOOL fPause); + + HRESULT GetProperties([out] XACT_CUE_INSTANCE_PROPERTIES **ppProperties); + + HRESULT SetOutputVoices([in] const XAUDIO2_VOICE_SENDS *pSendList); + + HRESULT SetOutputVoiceMatrix( + [in] IXAudio2Voice *pDestinationVoice, + UINT32 SourceChannels, + UINT32 DestinationChannels, + [in, size_is(SourceChannels * DestinationChannels)] const float *pLevelMatrix); +} + +[ + object, + local +] +interface IXACT3Wave +{ + HRESULT Destroy(); + + HRESULT Play(); + + HRESULT Stop(DWORD dwFlags); + + HRESULT Pause(BOOL fPause); + + HRESULT GetState([out] DWORD *pdwState); + + HRESULT SetPitch(XACTPITCH pitch); + + HRESULT SetVolume(XACTVOLUME volume); + + HRESULT SetMatrixCoefficients( + UINT32 uSrcChannelCount, + UINT32 uDstChannelCount, + [in] float *pMatrixCoefficients); + + HRESULT GetProperties([out] XACT_WAVE_INSTANCE_PROPERTIES *pProperties); +} -- 2.24.1

3 2

[PATCH] rpcrt4: Add RpcGetAuthorizationContextForClient stub
by Oleg Dubinskiy 22 Jan '20

22 Jan '20

rpcrt4: Add RpcGetAuthorizationContextForClient stub Signed-off-by: Oleg Dubinskiy <oleg.dubinskij2013(a)yandex.ua> --- dlls/rpcrt4/rpc_async.c | 45 +++++++++++++++++++++++++++++++++++++++++ dlls/rpcrt4/rpcrt4.spec | 1 + 2 files changed, 46 insertions(+) diff --git a/dlls/rpcrt4/rpc_async.c b/dlls/rpcrt4/rpc_async.c index 00c2d6bede..4f7cd9f7e2 100644 --- a/dlls/rpcrt4/rpc_async.c +++ b/dlls/rpcrt4/rpc_async.c @@ -166,3 +166,48 @@ RPC_STATUS WINAPI RpcAsyncCancelCall(PRPC_ASYNC_STATE pAsync, BOOL fAbortCall) FIXME("(%p, %s): stub\n", pAsync, fAbortCall ? "TRUE" : "FALSE"); return RPC_S_INVALID_ASYNC_HANDLE; } + +/*********************************************************************** + * RpcGetAuthorizationContextForClient [RPCRT4.@] + * + * Called by RpcFreeAuthorizationContext to return the Authz context. + * + * PARAMS + * ClientBinding [I] Binding handle, represents a binding to a client on the server. + * ImpersonateOnReturn [I] Directs this function to be represented the client on return. + * Reserved1 [I] Reserved, equal to null. + * expiration_time [I] Points to the exact date and time when the token expires. + * Reserved2 [I] Reserved, equal to a LUID structure which has a members, + * each of them is set to zero. + * Reserved3 [I] Reserved, equal to zero. + * Reserved4 [I] Reserved, equal to null. + * authz_client_context [I] Points to an AUTHZ_CLIENT_CONTEXT_HANDLE structure + * that has direct pass to Authz functions. + * + * RETURNS + * Success: RPC_S_OK. + * Failure: Any error code. + */ +RPC_STATUS +WINAPI +RpcGetAuthorizationContextForClient(RPC_BINDING_HANDLE ClientBinding, + BOOL ImpersonateOnReturn, + void * Reserved1, + PLARGE_INTEGER expiration_time, + LUID Reserved2, + DWORD Reserved3, + PVOID Reserved4, + PVOID *authz_client_context) +{ + FIXME("(%p, %d, %p, %p, (%d, %u), %u, %p, %p): stub\n", + ClientBinding, + ImpersonateOnReturn, + Reserved1, + expiration_time, + Reserved2.HighPart, + Reserved2.LowPart, + Reserved3, + Reserved4, + authz_client_context); + return RPC_S_NO_CONTEXT_AVAILABLE; +} diff --git a/dlls/rpcrt4/rpcrt4.spec b/dlls/rpcrt4/rpcrt4.spec index 5d558bff75..56f96ab29a 100644 --- a/dlls/rpcrt4/rpcrt4.spec +++ b/dlls/rpcrt4/rpcrt4.spec @@ -387,6 +387,7 @@ @ stdcall RpcExceptionFilter(long) @ stub RpcFreeAuthorizationContext # wxp @ stdcall RpcGetAsyncCallStatus(ptr) RpcAsyncGetCallStatus +@ stdcall RpcGetAuthorizationContextForClient(ptr long ptr ptr int64 long ptr ptr) @ stub RpcIfIdVectorFree @ stub RpcIfInqId @ stdcall RpcImpersonateClient(ptr) -- 2.24.1

2 1

[PATCH] include: update thumbcache.idl file
by Biswapriyo Nath 22 Jan '20

22 Jan '20

1 0

[PATCH] include: update dxva2api.idl
by Biswapriyo Nath 22 Jan '20

22 Jan '20

1 0

[PATCH v2] msvcrt/tests: Fix some test failures.
by Zhiyi Zhang 22 Jan '20

22 Jan '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- v2: Supersede 176772. Fix test failures like https://test.winehq.org/data/02f3a133b64ed1f979309e1399738eaa2e204651/xp_fg… dlls/msvcrt/tests/string.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 440bed348a..da0400fa83 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -648,11 +648,11 @@ static void test_strcmp(void) ret = p_strncmp( "abc", "abcd", 3 ); ok( ret == 0, "wrong ret %d\n", ret ); ret = p_strncmp( "", "abc", 3 ); - ok( ret == 0 - 'a', "wrong ret %d\n", ret ); + ok( ret == 0 - 'a' || ret == -1, "wrong ret %d\n", ret ); ret = p_strncmp( "abc", "ab\xa0", 4 ); - ok( ret == 'c' - 0xa0, "wrong ret %d\n", ret ); + ok( ret == 'c' - 0xa0 || ret == -1, "wrong ret %d\n", ret ); ret = p_strncmp( "ab\xb0", "ab\xa0", 3 ); - ok( ret == 0xb0 - 0xa0, "wrong ret %d\n", ret ); + ok( ret == 0xb0 - 0xa0 || ret == 1, "wrong ret %d\n", ret ); ret = p_strncmp( "ab\xb0", "ab\xa0", 2 ); ok( ret == 0, "wrong ret %d\n", ret ); ret = p_strncmp( "ab\xc2", "ab\xc2", 3 ); -- 2.20.1

3 3

Release notes: PE modules
by Giovanni Mascellani 22 Jan '20

22 Jan '20

Hi, in the release notes for Wine 5.0 (BTW, thanks everybody for the release!) it is written that "most modules are built in PE format (Portable Executable, the Windows binary format) instead of ELF when the MinGW compiler is available". Does this mean that section 3.3 ("Wine builtin DLLs") of the Architecture overview[1] on the wiki is now outdated? How do "real" DLLs resolve dependencies towards system ELF objects? Or is this "PE modules" option available only for DLLs that do not have ELF dependencies? [1] https://wiki.winehq.org/Wine_Developer%27s_Guide/Architecture_Overview#Wine… Thanks, Giovanni. -- Giovanni Mascellani <g.mascellani(a)gmail.com> Postdoc researcher - Université Libre de Bruxelles

2 1

[PATCH] testbot: Use a more explicit filename to stage patchsets.
by Francois Gouget 22 Jan '20

22 Jan '20

Use a different filename for patches and patchsets so that in case of trouble one can trace the staging file to its source. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- I was wondering whether 'patch' was for old code that was now using 'patch.diff'. But no. It was for patchsets! testbot/bin/Janitor.pl | 2 +- testbot/lib/WineTestBot/PendingPatchSets.pm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/bin/Janitor.pl b/testbot/bin/Janitor.pl index 121a3a6066..115b7d5eec 100755 --- a/testbot/bin/Janitor.pl +++ b/testbot/bin/Janitor.pl @@ -276,7 +276,7 @@ if (opendir(my $dh, "$DataDir/staging")) # These files always expire after one day $TTL = 1 - $Age; } - elsif ($Entry !~ /^[0-9a-f]{32}_(?:patch|patch\.diff|wine-patches|winetest(?:64)?-latest\.exe)$/) + elsif ($Entry !~ /^[0-9a-f]{32}_(?:patch\.diff|patchset\.diff|wine-patches|winetest(?:64)?-latest\.exe)$/) { my $Deletion = defined $TTL ? " (deletion in $TTL days)" : ""; Error "Found a suspicious file$Deletion: staging/$Entry\n"; diff --git a/testbot/lib/WineTestBot/PendingPatchSets.pm b/testbot/lib/WineTestBot/PendingPatchSets.pm index 286b393142..5be39e4016 100644 --- a/testbot/lib/WineTestBot/PendingPatchSets.pm +++ b/testbot/lib/WineTestBot/PendingPatchSets.pm @@ -104,7 +104,7 @@ sub SubmitSubset($$$) { my ($self, $MaxPart, $FinalPatch) = @_; - my ($CombinedFile, $CombinedFileName) = OpenNewFile("$DataDir/staging", "_patch"); + my ($CombinedFile, $CombinedFileName) = OpenNewFile("$DataDir/staging", "_patchset.diff"); return "Could not create a combined patch file: $!" if (!$CombinedFile); my $ErrMessage; -- 2.20.1

1 0

[PATCH] testbot/UpdateTaskLogs: Fix reporting log access errors.
by Francois Gouget 22 Jan '20

22 Jan '20

Use the error message returned by ParseWineTestReport() when it could not open the report instead of recreating it from scratch. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This is the same fix as the previous WineRun* patch. But I had already copy/pasted the bad code apparently :-( testbot/bin/UpdateTaskLogs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/UpdateTaskLogs b/testbot/bin/UpdateTaskLogs index ae3b305388..ca9bf44a37 100755 --- a/testbot/bin/UpdateTaskLogs +++ b/testbot/bin/UpdateTaskLogs @@ -193,7 +193,7 @@ sub BuildErrFile($$$$) my ($TestUnitCount, $TimeoutCount, $LogFailures, $LogErrors) = ParseWineTestReport("$Dir/$ReportName", $IsWineTest, $TaskTimedOut); if (!defined $LogFailures and @$LogErrors == 1) { - return "Unable to open '$TaskKey/$ReportName' for reading: $!"; + return "$TaskKey: $LogErrors->[0]"; } return undef if (!@$LogErrors); -- 2.20.1

1 0

[PATCH 1/2] ole32: Fix bind speed used in BindToObject() of item moniker.
by Nikolay Sivov 22 Jan '20

22 Jan '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/ole32/itemmoniker.c | 32 +++++++++++++++++++++----------- dlls/ole32/tests/moniker.c | 3 --- 2 files changed, 21 insertions(+), 14 deletions(-) diff --git a/dlls/ole32/itemmoniker.c b/dlls/ole32/itemmoniker.c index bd6fd6fd87..c37d7a87c5 100644 --- a/dlls/ole32/itemmoniker.c +++ b/dlls/ole32/itemmoniker.c @@ -329,6 +329,18 @@ static HRESULT WINAPI ItemMonikerImpl_GetSizeMax(IMoniker* iface, ULARGE_INTEGER return S_OK; } +static DWORD get_bind_speed_from_bindctx(IBindCtx *pbc) +{ + DWORD bind_speed = BINDSPEED_INDEFINITE; + BIND_OPTS bind_opts; + + bind_opts.cbStruct = sizeof(bind_opts); + if (SUCCEEDED(IBindCtx_GetBindOptions(pbc, &bind_opts)) && bind_opts.dwTickCountDeadline) + bind_speed = bind_opts.dwTickCountDeadline < 2500 ? BINDSPEED_IMMEDIATE : BINDSPEED_MODERATE; + + return bind_speed; +} + /****************************************************************************** * ItemMoniker_BindToObject ******************************************************************************/ @@ -339,9 +351,8 @@ static HRESULT WINAPI ItemMonikerImpl_BindToObject(IMoniker* iface, VOID** ppvResult) { ItemMonikerImpl *This = impl_from_IMoniker(iface); - HRESULT res; - IID refid=IID_IOleItemContainer; - IOleItemContainer *poic=0; + IOleItemContainer *container; + HRESULT hr; TRACE("(%p,%p,%p,%s,%p)\n",iface,pbc,pmkToLeft,debugstr_guid(riid),ppvResult); @@ -353,16 +364,15 @@ static HRESULT WINAPI ItemMonikerImpl_BindToObject(IMoniker* iface, *ppvResult=0; - res=IMoniker_BindToObject(pmkToLeft,pbc,NULL,&refid,(void**)&poic); - - if (SUCCEEDED(res)){ - - res=IOleItemContainer_GetObject(poic,This->itemName,BINDSPEED_MODERATE,pbc,riid,ppvResult); - - IOleItemContainer_Release(poic); + hr = IMoniker_BindToObject(pmkToLeft, pbc, NULL, &IID_IOleItemContainer, (void **)&container); + if (SUCCEEDED(hr)) + { + hr = IOleItemContainer_GetObject(container, This->itemName, get_bind_speed_from_bindctx(pbc), pbc, + riid, ppvResult); + IOleItemContainer_Release(container); } - return res; + return hr; } /****************************************************************************** diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index 9a61be4f47..bbd964e723 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -2105,7 +2105,6 @@ todo_wine container_moniker = create_test_moniker(); hr = IMoniker_BindToObject(moniker, bindctx, &container_moniker->IMoniker_iface, &IID_IUnknown, (void **)&unknown); -todo_wine ok(hr == (0x8bee0000 | BINDSPEED_INDEFINITE), "Unexpected hr %#x.\n", hr); bind_opts.cbStruct = sizeof(bind_opts); @@ -2116,14 +2115,12 @@ todo_wine hr = IBindCtx_SetBindOptions(bindctx, &bind_opts); ok(hr == S_OK, "Failed to set bind options, hr %#x.\n", hr); hr = IMoniker_BindToObject(moniker, bindctx, &container_moniker->IMoniker_iface, &IID_IUnknown, (void **)&unknown); -todo_wine ok(hr == (0x8bee0000 | BINDSPEED_IMMEDIATE), "Unexpected hr %#x.\n", hr); bind_opts.dwTickCountDeadline = 2499; hr = IBindCtx_SetBindOptions(bindctx, &bind_opts); ok(hr == S_OK, "Failed to set bind options, hr %#x.\n", hr); hr = IMoniker_BindToObject(moniker, bindctx, &container_moniker->IMoniker_iface, &IID_IUnknown, (void **)&unknown); -todo_wine ok(hr == (0x8bee0000 | BINDSPEED_IMMEDIATE), "Unexpected hr %#x.\n", hr); bind_opts.dwTickCountDeadline = 2500; -- 2.24.1

1 1

[PATCH 1/5] quartz: Simplify FilterGraph2_AddFilter().
by Zebediah Figura 22 Jan '20

22 Jan '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/filtergraph.c | 94 +++++++++++++++++++-------------------- 1 file changed, 45 insertions(+), 49 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 1ed41bdcec..1ef9c6e3af 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -184,7 +184,9 @@ typedef struct _IFilterGraphImpl { LONG ref; IUnknown *punkFilterMapper2; struct list filters; - LONG nameIndex; + + unsigned int name_index; + IReferenceClock *refClock; IBaseFilter *refClockProvider; EventsQueue evqueue; @@ -554,74 +556,68 @@ static IBaseFilter *find_filter_by_name(IFilterGraphImpl *graph, const WCHAR *na } /*** IFilterGraph methods ***/ -static HRESULT WINAPI FilterGraph2_AddFilter(IFilterGraph2 *iface, IBaseFilter *pFilter, - LPCWSTR pName) +static HRESULT WINAPI FilterGraph2_AddFilter(IFilterGraph2 *iface, + IBaseFilter *filter, const WCHAR *name) { - IFilterGraphImpl *This = impl_from_IFilterGraph2(iface); + IFilterGraphImpl *graph = impl_from_IFilterGraph2(iface); + BOOL duplicate_name = FALSE; struct filter *entry; + unsigned int i; HRESULT hr; - int j; - WCHAR* wszFilterName = NULL; - BOOL duplicate_name = FALSE; - TRACE("(%p/%p)->(%p, %s (%p))\n", This, iface, pFilter, debugstr_w(pName), pName); + TRACE("graph %p, filter %p, name %s.\n", graph, filter, debugstr_w(name)); - if (!pFilter) + if (!filter) return E_POINTER; - wszFilterName = CoTaskMemAlloc( (pName ? lstrlenW(pName) + 6 : 5) * sizeof(WCHAR) ); + if (!(entry = heap_alloc(sizeof(*entry)))) + return E_OUTOFMEMORY; - if (pName && find_filter_by_name(This, pName)) + if (!(entry->name = CoTaskMemAlloc((name ? wcslen(name) + 6 : 5) * sizeof(WCHAR)))) + { + heap_free(entry); + return E_OUTOFMEMORY; + } + + if (name && find_filter_by_name(graph, name)) duplicate_name = TRUE; - /* If no name given or name already existing, generate one */ - if (!pName || duplicate_name) + if (!name || duplicate_name) { - static const WCHAR wszFmt1[] = {'%','s',' ','%','0','4','d',0}; - static const WCHAR wszFmt2[] = {'%','0','4','d',0}; - - for (j = 0; j < 10000 ; j++) - { - /* Create name */ - if (pName) - swprintf(wszFilterName, pName ? lstrlenW(pName) + 6 : 5, wszFmt1, pName, This->nameIndex); - else - swprintf(wszFilterName, pName ? lstrlenW(pName) + 6 : 5, wszFmt2, This->nameIndex); - TRACE("Generated name %s\n", debugstr_w(wszFilterName)); + for (i = 0; i < 10000 ; ++i) + { + if (name) + swprintf(entry->name, name ? wcslen(name) + 6 : 5, L"%s %04u", name, graph->name_index); + else + swprintf(entry->name, name ? wcslen(name) + 6 : 5, L"%04u", graph->name_index); - if (This->nameIndex++ == 10000) - This->nameIndex = 1; + graph->name_index = (graph->name_index + 1) % 10000; - if (!find_filter_by_name(This, wszFilterName)) + if (!find_filter_by_name(graph, entry->name)) break; - } - /* Unable to find a suitable name */ - if (j == 10000) - { - CoTaskMemFree(wszFilterName); - return VFW_E_DUPLICATE_NAME; - } + } + + if (i == 10000) + { + CoTaskMemFree(entry->name); + heap_free(entry); + return VFW_E_DUPLICATE_NAME; + } } else - memcpy(wszFilterName, pName, (lstrlenW(pName) + 1) * sizeof(WCHAR)); + wcscpy(entry->name, name); - hr = IBaseFilter_JoinFilterGraph(pFilter, (IFilterGraph *)&This->IFilterGraph2_iface, wszFilterName); - if (FAILED(hr)) + if (FAILED(hr = IBaseFilter_JoinFilterGraph(filter, + (IFilterGraph *)&graph->IFilterGraph2_iface, entry->name))) { - CoTaskMemFree(wszFilterName); + CoTaskMemFree(entry->name); + heap_free(entry); return hr; } - if (!(entry = heap_alloc(sizeof(*entry)))) - { - CoTaskMemFree(wszFilterName); - return E_OUTOFMEMORY; - } - - IBaseFilter_AddRef(entry->filter = pFilter); - entry->name = wszFilterName; - list_add_head(&This->filters, &entry->entry); - This->version++; + IBaseFilter_AddRef(entry->filter = filter); + list_add_head(&graph->filters, &entry->entry); + ++graph->version; return duplicate_name ? VFW_S_DUPLICATE_NAME : hr; } @@ -5706,7 +5702,7 @@ static HRESULT filter_graph_common_create(IUnknown *outer, void **out, BOOL thre fimpl->IGraphVersion_iface.lpVtbl = &IGraphVersion_VTable; fimpl->ref = 1; list_init(&fimpl->filters); - fimpl->nameIndex = 1; + fimpl->name_index = 1; fimpl->refClock = NULL; fimpl->hEventCompletion = CreateEventW(0, TRUE, FALSE, 0); fimpl->HandleEcComplete = TRUE; -- 2.25.0

1 4

[PATCH 4/4] include: Add XACT defines
by Alistair Leslie-Hughes 22 Jan '20

22 Jan '20

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/xact3.idl | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/include/xact3.idl b/include/xact3.idl index a77afff6d4..cfa9e00fdc 100644 --- a/include/xact3.idl +++ b/include/xact3.idl @@ -19,6 +19,9 @@ import "unknwn.idl"; import "xaudio2.idl"; +cpp_quote("#include <limits.h>") +cpp_quote("#include <float.h>") + [ uuid(bcc782bc-6492-4c22-8c35-f5d72fe73c6e) ] @@ -313,6 +316,40 @@ cpp_quote("static const XACTNOTIFICATIONTYPE XACTNOTIFICATIONTYPE_WAVEDESTROYED cpp_quote("static const XACTNOTIFICATIONTYPE XACTNOTIFICATIONTYPE_WAVEBANKPREPARED = 17;") cpp_quote("static const XACTNOTIFICATIONTYPE XACTNOTIFICATIONTYPE_WAVEBANKSTREAMING_INVALIDCONTENT = 18;") +cpp_quote("static const XACTTIME XACTTIME_MIN = INT_MIN;") +cpp_quote("static const XACTTIME XACTTIME_MAX = INT_MAX;") +cpp_quote("static const XACTTIME XACTTIME_INFINITE = INT_MAX;") +cpp_quote("static const XACTINSTANCELIMIT XACTINSTANCELIMIT_INFINITE = 0xff;") +cpp_quote("static const XACTINSTANCELIMIT XACTINSTANCELIMIT_MIN = 0x00;") +cpp_quote("static const XACTINSTANCELIMIT XACTINSTANCELIMIT_MAX = 0xfe;") +cpp_quote("static const XACTINDEX XACTINDEX_MIN = 0x00;") +cpp_quote("static const XACTINDEX XACTINDEX_MAX = 0xfffe;") +cpp_quote("static const XACTINDEX XACTINDEX_INVALID = 0xffff;") +cpp_quote("static const XACTNOTIFICATIONTYPE XACTNOTIFICATIONTYPE_MIN = 0x00;") +cpp_quote("static const XACTNOTIFICATIONTYPE XACTNOTIFICATIONTYPE_MAX = 0xff;") +cpp_quote("static const XACTVARIABLEVALUE XACTVARIABLEVALUE_MIN = -FLT_MAX;") +cpp_quote("static const XACTVARIABLEVALUE XACTVARIABLEVALUE_MAX = FLT_MAX;") +cpp_quote("static const XACTVARIABLEINDEX XACTVARIABLEINDEX_MIN = 0x0000;") +cpp_quote("static const XACTVARIABLEINDEX XACTVARIABLEINDEX_MAX = 0xfffe;") +cpp_quote("static const XACTVARIABLEINDEX XACTVARIABLEINDEX_INVALID = 0xffff;") +cpp_quote("static const XACTCATEGORY XACTCATEGORY_MIN = 0x0;") +cpp_quote("static const XACTCATEGORY XACTCATEGORY_MAX = 0xfffe;") +cpp_quote("static const XACTCATEGORY XACTCATEGORY_INVALID = 0xffff;") +cpp_quote("static const XACTCHANNEL XACTCHANNEL_MIN = 0;") +cpp_quote("static const XACTCHANNEL XACTCHANNEL_MAX = 0xff;") +cpp_quote("static const XACTPITCH XACTPITCH_MIN = -1200;") +cpp_quote("static const XACTPITCH XACTPITCH_MAX = 1200;") +cpp_quote("static const XACTPITCH XACTPITCH_MIN_TOTAL = -2400;") +cpp_quote("static const XACTPITCH XACTPITCH_MAX_TOTAL = 2400;") +cpp_quote("static const XACTVOLUME XACTVOLUME_MIN = 0.0f;") +cpp_quote("static const XACTVOLUME XACTVOLUME_MAX = 16777216.0f;") +cpp_quote("static const XACTVARIABLEVALUE XACTPARAMETERVALUE_MIN = -FLT_MAX;") +cpp_quote("static const XACTVARIABLEVALUE XACTPARAMETERVALUE_MAX = FLT_MAX;") +cpp_quote("static const XACTLOOPCOUNT XACTLOOPCOUNT_MIN = 0x00;") +cpp_quote("static const XACTLOOPCOUNT XACTLOOPCOUNT_MAX = 0xfe;") +cpp_quote("static const XACTLOOPCOUNT XACTLOOPCOUNT_INFINITE = 0xff;") +cpp_quote("static const DWORD XACTWAVEALIGNMENT_MIN = 2048;") + [ object, uuid(b1ee676a-d9cd-4d2a-89a8-fa53eb9e480b), -- 2.24.1

1 0

[PATCH 3/4] include: Add XACTENGINE_* error codes
by Alistair Leslie-Hughes 22 Jan '20

22 Jan '20

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/xact3.idl | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/include/xact3.idl b/include/xact3.idl index 7743d131f6..a77afff6d4 100644 --- a/include/xact3.idl +++ b/include/xact3.idl @@ -572,3 +572,49 @@ interface IXACT3Wave HRESULT GetProperties([out] XACT_WAVE_INSTANCE_PROPERTIES *pProperties); } + +cpp_quote("#define FACILITY_XACTENGINE 0xAC7") +cpp_quote("#define XACTENGINEERROR(n) MAKE_HRESULT(SEVERITY_ERROR, FACILITY_XACTENGINE, n)") + +cpp_quote("#define XACTENGINE_E_OUTOFMEMORY E_OUTOFMEMORY") +cpp_quote("#define XACTENGINE_E_INVALIDARG E_INVALIDARG") +cpp_quote("#define XACTENGINE_E_NOTIMPL E_NOTIMPL") +cpp_quote("#define XACTENGINE_E_FAIL E_FAIL") + +cpp_quote("#define XACTENGINE_E_ALREADYINITIALIZED XACTENGINEERROR(0x001)") +cpp_quote("#define XACTENGINE_E_NOTINITIALIZED XACTENGINEERROR(0x002)") +cpp_quote("#define XACTENGINE_E_EXPIRED XACTENGINEERROR(0x003)") +cpp_quote("#define XACTENGINE_E_NONOTIFICATIONCALLBACK XACTENGINEERROR(0x004)") +cpp_quote("#define XACTENGINE_E_NOTIFICATIONREGISTERED XACTENGINEERROR(0x005)") +cpp_quote("#define XACTENGINE_E_INVALIDUSAGE XACTENGINEERROR(0x006)") +cpp_quote("#define XACTENGINE_E_INVALIDDATA XACTENGINEERROR(0x007)") +cpp_quote("#define XACTENGINE_E_INSTANCELIMITFAILTOPLAY XACTENGINEERROR(0x008)") +cpp_quote("#define XACTENGINE_E_NOGLOBALSETTINGS XACTENGINEERROR(0x009)") +cpp_quote("#define XACTENGINE_E_INVALIDVARIABLEINDEX XACTENGINEERROR(0x00a)") +cpp_quote("#define XACTENGINE_E_INVALIDCATEGORY XACTENGINEERROR(0x00b)") +cpp_quote("#define XACTENGINE_E_INVALIDCUEINDEX XACTENGINEERROR(0x00c)") +cpp_quote("#define XACTENGINE_E_INVALIDWAVEINDEX XACTENGINEERROR(0x00d)") +cpp_quote("#define XACTENGINE_E_INVALIDTRACKINDEX XACTENGINEERROR(0x00e)") +cpp_quote("#define XACTENGINE_E_INVALIDSOUNDOFFSETORINDEX XACTENGINEERROR(0x00f)") +cpp_quote("#define XACTENGINE_E_READFILE XACTENGINEERROR(0x010)") +cpp_quote("#define XACTENGINE_E_UNKNOWNEVENT XACTENGINEERROR(0x011)") +cpp_quote("#define XACTENGINE_E_INCALLBACK XACTENGINEERROR(0x012)") +cpp_quote("#define XACTENGINE_E_NOWAVEBANK XACTENGINEERROR(0x013)") +cpp_quote("#define XACTENGINE_E_SELECTVARIATION XACTENGINEERROR(0x014)") +cpp_quote("#define XACTENGINE_E_MULTIPLEAUDITIONENGINES XACTENGINEERROR(0x015)") +cpp_quote("#define XACTENGINE_E_WAVEBANKNOTPREPARED XACTENGINEERROR(0x016)") +cpp_quote("#define XACTENGINE_E_NORENDERER XACTENGINEERROR(0x017)") +cpp_quote("#define XACTENGINE_E_INVALIDENTRYCOUNT XACTENGINEERROR(0x018)") +cpp_quote("#define XACTENGINE_E_SEEKTIMEBEYONDCUEEND XACTENGINEERROR(0x019)") +cpp_quote("#define XACTENGINE_E_SEEKTIMEBEYONDWAVEEND XACTENGINEERROR(0x01a)") +cpp_quote("#define XACTENGINE_E_NOFRIENDLYNAMES XACTENGINEERROR(0x01b)") + +cpp_quote("#define XACTENGINE_E_AUDITION_WRITEFILE XACTENGINEERROR(0x101)") +cpp_quote("#define XACTENGINE_E_AUDITION_NOSOUNDBANK XACTENGINEERROR(0x102)") +cpp_quote("#define XACTENGINE_E_AUDITION_INVALIDRPCINDEX XACTENGINEERROR(0x103)") +cpp_quote("#define XACTENGINE_E_AUDITION_MISSINGDATA XACTENGINEERROR(0x104)") +cpp_quote("#define XACTENGINE_E_AUDITION_UNKNOWNCOMMAND XACTENGINEERROR(0x105)") +cpp_quote("#define XACTENGINE_E_AUDITION_INVALIDDSPINDEX XACTENGINEERROR(0x106)") +cpp_quote("#define XACTENGINE_E_AUDITION_MISSINGWAVE XACTENGINEERROR(0x107)") +cpp_quote("#define XACTENGINE_E_AUDITION_CREATEDIRECTORYFAILED XACTENGINEERROR(0x108)") +cpp_quote("#define XACTENGINE_E_AUDITION_INVALIDSESSION XACTENGINEERROR(0x109)") -- 2.24.1

1 0

[PATCH 2/4] include: Add XACTNOTIFICATIONTYPE_* values
by Alistair Leslie-Hughes 22 Jan '20

22 Jan '20

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/xact3.idl | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/include/xact3.idl b/include/xact3.idl index eaab56203c..7743d131f6 100644 --- a/include/xact3.idl +++ b/include/xact3.idl @@ -294,10 +294,24 @@ struct XACT_NOTIFICATION cpp_quote("#include <poppack.h>") -static const XACTNOTIFICATIONTYPE XACTNOTIFICATIONTYPE_CUEDESTROYED = 4; -static const XACTNOTIFICATIONTYPE XACTNOTIFICATIONTYPE_SOUNDBANKDESTROYED = 6; -static const XACTNOTIFICATIONTYPE XACTNOTIFICATIONTYPE_WAVEBANKDESTROYED = 7; -static const XACTNOTIFICATIONTYPE XACTNOTIFICATIONTYPE_WAVEDESTROYED = 16; +cpp_quote("static const XACTNOTIFICATIONTYPE XACTNOTIFICATIONTYPE_CUEPREPARED = 1;") +cpp_quote("static const XACTNOTIFICATIONTYPE XACTNOTIFICATIONTYPE_CUEPLAY = 2;") +cpp_quote("static const XACTNOTIFICATIONTYPE XACTNOTIFICATIONTYPE_CUESTOP = 3;") +cpp_quote("static const XACTNOTIFICATIONTYPE XACTNOTIFICATIONTYPE_CUEDESTROYED = 4;") +cpp_quote("static const XACTNOTIFICATIONTYPE XACTNOTIFICATIONTYPE_MARKER = 5;") +cpp_quote("static const XACTNOTIFICATIONTYPE XACTNOTIFICATIONTYPE_SOUNDBANKDESTROYED = 6;") +cpp_quote("static const XACTNOTIFICATIONTYPE XACTNOTIFICATIONTYPE_WAVEBANKDESTROYED = 7;") +cpp_quote("static const XACTNOTIFICATIONTYPE XACTNOTIFICATIONTYPE_LOCALVARIABLECHANGED = 8;") +cpp_quote("static const XACTNOTIFICATIONTYPE XACTNOTIFICATIONTYPE_GLOBALVARIABLECHANGED = 9;") +cpp_quote("static const XACTNOTIFICATIONTYPE XACTNOTIFICATIONTYPE_GUICONNECTED = 10;") +cpp_quote("static const XACTNOTIFICATIONTYPE XACTNOTIFICATIONTYPE_GUIDISCONNECTED = 11;") +cpp_quote("static const XACTNOTIFICATIONTYPE XACTNOTIFICATIONTYPE_WAVEPREPARED = 12;") +cpp_quote("static const XACTNOTIFICATIONTYPE XACTNOTIFICATIONTYPE_WAVEPLAY = 13;") +cpp_quote("static const XACTNOTIFICATIONTYPE XACTNOTIFICATIONTYPE_WAVESTOP = 14;") +cpp_quote("static const XACTNOTIFICATIONTYPE XACTNOTIFICATIONTYPE_WAVELOOPED = 15;") +cpp_quote("static const XACTNOTIFICATIONTYPE XACTNOTIFICATIONTYPE_WAVEDESTROYED = 16;") +cpp_quote("static const XACTNOTIFICATIONTYPE XACTNOTIFICATIONTYPE_WAVEBANKPREPARED = 17;") +cpp_quote("static const XACTNOTIFICATIONTYPE XACTNOTIFICATIONTYPE_WAVEBANKSTREAMING_INVALIDCONTENT = 18;") [ object, -- 2.24.1

1 0

[PATCH] include: Add enum DBPROPFLAGSENUM
by Alistair Leslie-Hughes 21 Jan '20

21 Jan '20

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/dbs.idl | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/include/dbs.idl b/include/dbs.idl index d04aa09ff1..65fd5b1d36 100644 --- a/include/dbs.idl +++ b/include/dbs.idl @@ -95,6 +95,24 @@ typedef struct tagDBPROPSET { typedef DWORD DBPROPFLAGS; +enum DBPROPFLAGSENUM +{ + DBPROPFLAGS_NOTSUPPORTED = 0x0000, + DBPROPFLAGS_COLUMN = 0x0001, + DBPROPFLAGS_DATASOURCE = 0x0002, + DBPROPFLAGS_DATASOURCECREATE = 0x0004, + DBPROPFLAGS_DATASOURCEINFO = 0x0008, + DBPROPFLAGS_DBINIT = 0x0010, + DBPROPFLAGS_INDEX = 0x0020, + DBPROPFLAGS_ROWSET = 0x0040, + DBPROPFLAGS_TABLE = 0x0080, + DBPROPFLAGS_COLUMNOK = 0x0100, + DBPROPFLAGS_READ = 0x0200, + DBPROPFLAGS_WRITE = 0x0400, + DBPROPFLAGS_REQUIRED = 0x0800, + DBPROPFLAGS_SESSION = 0x1000, +}; + typedef struct tagDBPROPINFO { LPOLESTR pwszDescription; DBPROPID dwPropertyID; -- 2.24.1

1 0

[PATCH] include: Add remaining DBPROPSET_* GUID's.
by Alistair Leslie-Hughes 21 Jan '20

21 Jan '20

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/dbs.idl | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/include/dbs.idl b/include/dbs.idl index 53cadedf65..d04aa09ff1 100644 --- a/include/dbs.idl +++ b/include/dbs.idl @@ -482,12 +482,26 @@ cpp_quote(" EXTERN_C const GUID name DECLSPEC_HIDDEN") cpp_quote("#endif") cpp_quote("DEFINE_DBGUID(DB_NULLGUID, 0x00000000, 0x0000, 0x0000, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00);") -cpp_quote("DEFINE_DBGUID(DBPROPSET_DBINIT, 0xc8b522bc, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d);") cpp_quote("DEFINE_DBGUID(DBGUID_SESSION, 0xc8b522f5, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d);") cpp_quote("DEFINE_DBGUID(DBGUID_ROWSET, 0xc8b522f6, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d);") cpp_quote("DEFINE_DBGUID(DBGUID_ROW, 0xc8b522f7, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d);") cpp_quote("DEFINE_DBGUID(DBGUID_STREAM, 0xc8b522f9, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d);") +cpp_quote("DEFINE_DBGUID(DBPROPSET_COLUMN, 0xc8b522b9, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d);") +cpp_quote("DEFINE_DBGUID(DBPROPSET_DATASOURCE, 0xc8b522ba, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d);") +cpp_quote("DEFINE_DBGUID(DBPROPSET_DATASOURCEINFO, 0xc8b522bb, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d);") +cpp_quote("DEFINE_DBGUID(DBPROPSET_DBINIT, 0xc8b522bc, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d);") +cpp_quote("DEFINE_DBGUID(DBPROPSET_INDEX, 0xc8b522bd, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d);") +cpp_quote("DEFINE_DBGUID(DBPROPSET_ROWSET, 0xc8b522be, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d);") +cpp_quote("DEFINE_DBGUID(DBPROPSET_TABLE, 0xc8b522bf, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d);") +cpp_quote("DEFINE_DBGUID(DBPROPSET_DATASOURCEALL, 0xc8b522c0, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d);") +cpp_quote("DEFINE_DBGUID(DBPROPSET_DATASOURCEINFOALL, 0xc8b522c1, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d);") +cpp_quote("DEFINE_DBGUID(DBPROPSET_ROWSETALL, 0xc8b522c2, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d);") +cpp_quote("DEFINE_DBGUID(DBPROPSET_SESSION, 0xc8b522c6, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d);") +cpp_quote("DEFINE_DBGUID(DBPROPSET_SESSIONALL, 0xc8b522c7, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d);") +cpp_quote("DEFINE_DBGUID(DBPROPSET_DBINITALL, 0xc8b522ca, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d);") +cpp_quote("DEFINE_DBGUID(DBPROPSET_PROPERTIESINERROR, 0xc8b522d4, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d);") + cpp_quote("#define DBPROMPT_PROMPT 0x01") cpp_quote("#define DBPROMPT_COMPLETE 0x02") cpp_quote("#define DBPROMPT_COMPLETEREQUIRED 0x03") -- 2.24.1

1 0

[PATCH] include: Add _Inout_updates_bytes_opt_ define
by Alistair Leslie-Hughes 21 Jan '20

21 Jan '20

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/sal.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/sal.h b/include/sal.h index 823361af17..81a828dd97 100644 --- a/include/sal.h +++ b/include/sal.h @@ -97,6 +97,7 @@ #define _Inout_updates_(count) #define _Inout_updates_bytes_(count) #define _Inout_updates_bytes_all_opt_(count) +#define _Inout_updates_bytes_opt_(count) #define _Inout_updates_opt_(count) #define _Inout_updates_z_(count) #define _Inout_updates_opt_z_(count) -- 2.24.1

1 0

[PATCH] include: Add directmanipulation.idl
by Alistair Leslie-Hughes 21 Jan '20

21 Jan '20

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/Makefile.in | 1 + include/directmanipulation.idl | 416 +++++++++++++++++++++++++++++++++ 2 files changed, 417 insertions(+) create mode 100644 include/directmanipulation.idl diff --git a/include/Makefile.in b/include/Makefile.in index 8a05f5d01c..8284d6fdf3 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -200,6 +200,7 @@ SOURCES = \ dimm.idl \ dinput.h \ dinputd.h \ + directmanipulation.idl \ dispdib.h \ dispex.idl \ dlgs.h \ diff --git a/include/directmanipulation.idl b/include/directmanipulation.idl new file mode 100644 index 0000000000..a49f368d11 --- /dev/null +++ b/include/directmanipulation.idl @@ -0,0 +1,416 @@ +/* + * Copyright 2019 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "oaidl.idl"; +import "ocidl.idl"; + +cpp_quote("#if 0") +typedef void* HWND; +cpp_quote("#endif") + +interface IDirectManipulationViewportEventHandler; + +typedef enum DIRECTMANIPULATION_HITTEST_TYPE +{ + DIRECTMANIPULATION_HITTEST_TYPE_ASYNCHRONOUS = 0x00000000, + DIRECTMANIPULATION_HITTEST_TYPE_SYNCHRONOUS = 0x00000001, + DIRECTMANIPULATION_HITTEST_TYPE_AUTO_SYNCHRONOUS = 0x00000002 +} DIRECTMANIPULATION_HITTEST_TYPE; + +typedef enum DIRECTMANIPULATION_STATUS +{ + DIRECTMANIPULATION_BUILDING = 0, + DIRECTMANIPULATION_ENABLED = 1, + DIRECTMANIPULATION_DISABLED = 2, + DIRECTMANIPULATION_RUNNING = 3, + DIRECTMANIPULATION_INERTIA = 4, + DIRECTMANIPULATION_READY = 5, + DIRECTMANIPULATION_SUSPENDED = 6 +} DIRECTMANIPULATION_STATUS; + +typedef enum DIRECTMANIPULATION_VIEWPORT_OPTIONS +{ + DIRECTMANIPULATION_VIEWPORT_OPTIONS_DEFAULT = 0x0000, + DIRECTMANIPULATION_VIEWPORT_OPTIONS_AUTODISABLE = 0x0001, + DIRECTMANIPULATION_VIEWPORT_OPTIONS_MANUALUPDATE = 0x0002, + DIRECTMANIPULATION_VIEWPORT_OPTIONS_INPUT = 0x0004, + DIRECTMANIPULATION_VIEWPORT_OPTIONS_EXPLICITHITTEST = 0x0008, + DIRECTMANIPULATION_VIEWPORT_OPTIONS_DISABLEPIXELSNAPPING = 0x0010, +} DIRECTMANIPULATION_VIEWPORT_OPTIONS; + +typedef enum DIRECTMANIPULATION_CONFIGURATION +{ + DIRECTMANIPULATION_CONFIGURATION_NONE = 0x00000000, + DIRECTMANIPULATION_CONFIGURATION_INTERACTION = 0x00000001, + DIRECTMANIPULATION_CONFIGURATION_TRANSLATION_X = 0x00000002, + DIRECTMANIPULATION_CONFIGURATION_TRANSLATION_Y = 0x00000004, + DIRECTMANIPULATION_CONFIGURATION_SCALING = 0x00000010, + DIRECTMANIPULATION_CONFIGURATION_TRANSLATION_INERTIA = 0x00000020, + DIRECTMANIPULATION_CONFIGURATION_SCALING_INERTIA = 0x00000080, + DIRECTMANIPULATION_CONFIGURATION_RAILS_X = 0x00000100, + DIRECTMANIPULATION_CONFIGURATION_RAILS_Y = 0x00000200, +} DIRECTMANIPULATION_CONFIGURATION; + +typedef enum DIRECTMANIPULATION_GESTURE_CONFIGURATION +{ + DIRECTMANIPULATION_GESTURE_NONE = 0x00000000, + DIRECTMANIPULATION_GESTURE_DEFAULT = 0x00000000, + DIRECTMANIPULATION_GESTURE_CROSS_SLIDE_VERTICAL = 0x00000008, + DIRECTMANIPULATION_GESTURE_CROSS_SLIDE_HORIZONTAL = 0x00000010, + DIRECTMANIPULATION_GESTURE_PINCH_ZOOM = 0x00000020, +} DIRECTMANIPULATION_GESTURE_CONFIGURATION; + +typedef enum DIRECTMANIPULATION_MOTION_TYPES +{ + DIRECTMANIPULATION_MOTION_NONE = 0x0000, + DIRECTMANIPULATION_MOTION_TRANSLATEX = 0x0001, + DIRECTMANIPULATION_MOTION_TRANSLATEY = 0x0002, + DIRECTMANIPULATION_MOTION_ZOOM = 0x0004, + DIRECTMANIPULATION_MOTION_CENTERX = 0x0010, + DIRECTMANIPULATION_MOTION_CENTERY = 0x0020, + DIRECTMANIPULATION_MOTION_ALL = DIRECTMANIPULATION_MOTION_TRANSLATEX | DIRECTMANIPULATION_MOTION_TRANSLATEY | + DIRECTMANIPULATION_MOTION_ZOOM | DIRECTMANIPULATION_MOTION_CENTERX | + DIRECTMANIPULATION_MOTION_CENTERY +} DIRECTMANIPULATION_MOTION_TYPES; + +typedef enum DIRECTMANIPULATION_SNAPPOINT_TYPE +{ + DIRECTMANIPULATION_SNAPPOINT_MANDATORY = 0, + DIRECTMANIPULATION_SNAPPOINT_OPTIONAL = 1, + DIRECTMANIPULATION_SNAPPOINT_MANDATORY_SINGLE = 2, + DIRECTMANIPULATION_SNAPPOINT_OPTIONAL_SINGLE = 3 +} DIRECTMANIPULATION_SNAPPOINT_TYPE; + +typedef enum DIRECTMANIPULATION_SNAPPOINT_COORDINATE +{ + DIRECTMANIPULATION_COORDINATE_BOUNDARY = 0x00, + DIRECTMANIPULATION_COORDINATE_ORIGIN = 0x01, + DIRECTMANIPULATION_COORDINATE_MIRRORED = 0x10 +} DIRECTMANIPULATION_SNAPPOINT_COORDINATE; + +typedef enum DIRECTMANIPULATION_HORIZONTALALIGNMENT +{ + DIRECTMANIPULATION_HORIZONTALALIGNMENT_NONE = 0x00, + DIRECTMANIPULATION_HORIZONTALALIGNMENT_LEFT = 0x01, + DIRECTMANIPULATION_HORIZONTALALIGNMENT_CENTER = 0x02, + DIRECTMANIPULATION_HORIZONTALALIGNMENT_RIGHT = 0x04, + DIRECTMANIPULATION_HORIZONTALALIGNMENT_UNLOCKCENTER = 0x08 +} DIRECTMANIPULATION_HORIZONTALALIGNMENT; + +typedef enum DIRECTMANIPULATION_VERTICALALIGNMENT +{ + DIRECTMANIPULATION_VERTICALALIGNMENT_NONE = 0x00, + DIRECTMANIPULATION_VERTICALALIGNMENT_TOP = 0x01, + DIRECTMANIPULATION_VERTICALALIGNMENT_CENTER = 0x02, + DIRECTMANIPULATION_VERTICALALIGNMENT_BOTTOM = 0x04, + DIRECTMANIPULATION_VERTICALALIGNMENT_UNLOCKCENTER = 0x08 +} DIRECTMANIPULATION_VERTICALALIGNMENT; + +typedef enum DIRECTMANIPULATION_INPUT_MODE +{ + DIRECTMANIPULATION_INPUT_MODE_AUTOMATIC = 0, + DIRECTMANIPULATION_INPUT_MODE_MANUAL = 1 +} DIRECTMANIPULATION_INPUT_MODE; + +[ + local, + object, + uuid(fb759dba-6f4c-4c01-874e-19c8a05907f9), + pointer_default(unique) +] +interface IDirectManipulationFrameInfoProvider : IUnknown +{ + HRESULT GetNextFrameInfo([out] ULONGLONG *time, [out] ULONGLONG *process, [out] ULONGLONG *composition); +} + +[ + local, + object, + uuid(fbf5d3b4-70c7-4163-9322-5a6f660d6fbc), + pointer_default(unique) +] +interface IDirectManipulationManager : IUnknown +{ + HRESULT Activate([in] HWND window); + + HRESULT Deactivate([in] HWND window); + + HRESULT RegisterHitTestTarget([in] HWND window, [in] HWND hittest, [in] DIRECTMANIPULATION_HITTEST_TYPE type); + + HRESULT ProcessInput([in] const MSG *msg, [out, retval] BOOL *handled); + + HRESULT GetUpdateManager([in] REFIID riid, [out, iid_is(riid), retval,] void **obj); + + HRESULT CreateViewport([in] IDirectManipulationFrameInfoProvider *frame, [in] HWND window, + [in] REFIID riid, [out, iid_is(riid), retval] void **obj); + + HRESULT CreateContent([in] IDirectManipulationFrameInfoProvider *frame, [in] REFCLSID clsid, + [in] REFIID riid, [out, iid_is(riid), retval] void **obj); +} + +[ + local, + object, + uuid(b89962cb-3d89-442b-bb58-5098fa0f9f16), + pointer_default(unique) +] +interface IDirectManipulationContent : IUnknown +{ + HRESULT GetContentRect([out] RECT *size); + + HRESULT SetContentRect([in] const RECT *size); + + HRESULT GetViewport([in] REFIID riid, [out, iid_is(riid)] void **object); + + HRESULT GetTag([in] REFIID riid, [out, iid_is(riid)] void **object, [out] UINT32 *id); + + HRESULT SetTag([in, unique] IUnknown *object, [in] UINT32 id); + + HRESULT GetOutputTransform([out] float *matrix, [in] DWORD count); + + HRESULT GetContentTransform([out] float *matrix, [in] DWORD count); + + HRESULT SyncContentTransform([in] const float *matrix, [in] DWORD count); +} + +[ + local, + object, + uuid(790b6337-64f8-4ff5-a269-b32bc2af27a7), + pointer_default(unique) +] +interface IDirectManipulationUpdateHandler : IUnknown +{ + HRESULT Update(); +} + +[ + local, + object, + uuid(b0ae62fd-be34-46e7-9caa-d361facbb9cc), + pointer_default(unique) +] +interface IDirectManipulationUpdateManager : IUnknown +{ + HRESULT RegisterWaitHandleCallback([in] HANDLE handle, [in] IDirectManipulationUpdateHandler *handler, + [out] DWORD *cookie); + + HRESULT UnregisterWaitHandleCallback([in] DWORD cookie); + + HRESULT Update([in] IDirectManipulationFrameInfoProvider *provider); +} + +[ + local, + object, + uuid(537a0825-0387-4efa-b62f-71eb1f085a7e), + pointer_default(unique) +] +interface IDirectManipulationCompositor : IUnknown +{ + HRESULT AddContent([in] IDirectManipulationContent *content, [in] IUnknown *device, + [in] IUnknown *parent, [in] IUnknown *child); + + HRESULT RemoveContent([in] IDirectManipulationContent *content); + + HRESULT SetUpdateManager([in] IDirectManipulationUpdateManager *manager); + + HRESULT Flush(); +} + +[ + local, + object, + uuid(28b85a3d-60a0-48bd-9ba1-5ce8d9ea3a6d), + pointer_default(unique) +] +interface IDirectManipulationViewport : IUnknown +{ + HRESULT Enable(); + + HRESULT Disable(); + + HRESULT SetContact([in] UINT32 id); + + HRESULT ReleaseContact([in] UINT32 id); + + HRESULT ReleaseAllContacts(); + + HRESULT GetStatus([out] DIRECTMANIPULATION_STATUS *status); + + HRESULT GetTag([in] REFIID riid, [out, iid_is(riid)] void **object, [out] UINT32 *id); + + HRESULT SetTag([in, unique] IUnknown *object, [in] UINT32 id); + + HRESULT GetViewportRect([out, retval] RECT *viewport); + + HRESULT SetViewportRect([in] const RECT *viewport); + + HRESULT ZoomToRect([in] const float left, [in] const float top, [in] const float right, + [in] const float bottom, [in] BOOL animate); + + HRESULT SetViewportTransform([in] const float *matrix, [in] DWORD count); + + HRESULT SyncDisplayTransform([in] const float *matrix, [in] DWORD count); + + HRESULT GetPrimaryContent([in] REFIID riid, [out, iid_is(riid)] void **object); + + HRESULT AddContent([in, unique] IDirectManipulationContent *content); + + HRESULT RemoveContent([in, unique] IDirectManipulationContent *content); + + HRESULT SetViewportOptions([in] DIRECTMANIPULATION_VIEWPORT_OPTIONS options); + + HRESULT AddConfiguration([in] DIRECTMANIPULATION_CONFIGURATION configuration); + + HRESULT RemoveConfiguration([in] DIRECTMANIPULATION_CONFIGURATION configuration); + + HRESULT ActivateConfiguration([in] DIRECTMANIPULATION_CONFIGURATION configuration); + + HRESULT SetManualGesture([in] DIRECTMANIPULATION_GESTURE_CONFIGURATION configuration); + + HRESULT SetChaining([in] DIRECTMANIPULATION_MOTION_TYPES enabledTypes); + + HRESULT AddEventHandler([in] HWND window, [in] IDirectManipulationViewportEventHandler *eventHandler, + [out, retval] DWORD *cookie); + + HRESULT RemoveEventHandler([in] DWORD cookie); + + HRESULT SetInputMode([in] DIRECTMANIPULATION_INPUT_MODE mode); + + HRESULT SetUpdateMode([in] DIRECTMANIPULATION_INPUT_MODE mode); + + HRESULT Stop(); + + HRESULT Abandon(); +} + +[ + local, + object, + uuid(923ccaac-61e1-4385-b726-017af189882a), + pointer_default(unique) +] +interface IDirectManipulationViewport2 : IDirectManipulationViewport +{ + HRESULT AddBehavior([in] IUnknown *behavior, [out, retval] DWORD *cookie); + + HRESULT RemoveBehavior([in] DWORD cookie); + + HRESULT RemoveAllBehaviors(); +} + +[ + local, + object, + uuid(952121DA-D69F-45F9-B0F9-F23944321A6D), + pointer_default(unique) +] +interface IDirectManipulationViewportEventHandler : IUnknown +{ + HRESULT OnViewportStatusChanged([in] IDirectManipulationViewport *viewport, [in] DIRECTMANIPULATION_STATUS current, + [in] DIRECTMANIPULATION_STATUS previous); + + HRESULT OnViewportUpdated([in] IDirectManipulationViewport *viewport); + + HRESULT OnContentUpdated([in] IDirectManipulationViewport *viewport, [in] IDirectManipulationContent *content); +} + +[ + local, + object, + uuid(fa1005e9-3d16-484c-bfc9-62b61e56ec4e), + pointer_default(unique) +] +interface IDirectManipulationManager2 : IDirectManipulationManager +{ + HRESULT CreateBehavior([in] REFCLSID clsid, [in] REFIID riid, [out, iid_is(riid), retval] void **obj); +} + +[ + local, + object, + uuid(c12851e4-1698-4625-b9b1-7ca3ec18630b), + pointer_default(unique) +] +interface IDirectManipulationPrimaryContent : IUnknown +{ + HRESULT SetSnapInterval([in] DIRECTMANIPULATION_MOTION_TYPES motion, [in] float interval, [in] float offset); + + HRESULT SetSnapPoints([in] DIRECTMANIPULATION_MOTION_TYPES motion, [in] const float *points, [in] DWORD count); + + HRESULT SetSnapType([in] DIRECTMANIPULATION_MOTION_TYPES motion, [in] DIRECTMANIPULATION_SNAPPOINT_TYPE type); + + HRESULT SetSnapCoordinate([in] DIRECTMANIPULATION_MOTION_TYPES motion, [in] DIRECTMANIPULATION_SNAPPOINT_COORDINATE coordinate, + [in] float origin); + + HRESULT SetZoomBoundaries([in] float minimum, [in] float maximum); + + HRESULT SetHorizontalAlignment([in] DIRECTMANIPULATION_HORIZONTALALIGNMENT alignment); + + HRESULT SetVerticalAlignment([in] DIRECTMANIPULATION_VERTICALALIGNMENT alignment); + + HRESULT GetInertiaEndTransform([out] float *matrix, [in] DWORD count); + + HRESULT GetCenterPoint([out] float *x, [out] float *y); +} + +[ + uuid(9fbedf98-f6d8-4e3b-b488-fa66dbf5e9f3), + version(1.0) +] +library DirectManipulation +{ + [ + uuid(54e211b6-3650-4f75-8334-fa359598e1c5) + ] + coclass DirectManipulationManager + { + interface IDirectManipulationManager2; + [default] interface IDirectManipulationManager; + } + + [ + uuid(99793286-77cc-4b57-96db-3b354f6f9fb5) + ] + coclass DirectManipulationSharedManager + { + interface IDirectManipulationManager2; + [default] interface IDirectManipulationManager; + } + + [ + uuid(79dea627-a08a-43ac-8ef5-6900b9299126) + ] + coclass DCompManipulationCompositor + { + [default] interface IDirectManipulationCompositor; + interface IDirectManipulationFrameInfoProvider; + } + + [ + noncreatable, + hidden, + uuid(34e211b6-3650-4f75-8334-fa359598e1c5) + ] + coclass DirectManipulationViewport + { + interface IDirectManipulationViewport2; + [default] interface IDirectManipulationViewport; + } +} -- 2.24.1

1 0

[PATCH 3/3] dinput: Add missing ASPECT flags to c_dfDIJoystick
by Andrew Eikum 21 Jan '20

21 Jan '20

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/dinput/data_formats.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/dinput/data_formats.c b/dlls/dinput/data_formats.c index b67ac080e57..296e80ada46 100644 --- a/dlls/dinput/data_formats.c +++ b/dlls/dinput/data_formats.c @@ -26,14 +26,14 @@ #include "dinput.h" static const DIOBJECTDATAFORMAT dfDIJoystick[] = { - { &GUID_XAxis,DIJOFS_X,DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0}, - { &GUID_YAxis,DIJOFS_Y,DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0}, - { &GUID_ZAxis,DIJOFS_Z,DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0}, - { &GUID_RxAxis,DIJOFS_RX,DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0}, - { &GUID_RyAxis,DIJOFS_RY,DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0}, - { &GUID_RzAxis,DIJOFS_RZ,DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0}, - { &GUID_Slider,DIJOFS_SLIDER(0),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0}, - { &GUID_Slider,DIJOFS_SLIDER(1),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0}, + { &GUID_XAxis,DIJOFS_X,DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,DIDOI_ASPECTPOSITION}, + { &GUID_YAxis,DIJOFS_Y,DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,DIDOI_ASPECTPOSITION}, + { &GUID_ZAxis,DIJOFS_Z,DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,DIDOI_ASPECTPOSITION}, + { &GUID_RxAxis,DIJOFS_RX,DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,DIDOI_ASPECTPOSITION}, + { &GUID_RyAxis,DIJOFS_RY,DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,DIDOI_ASPECTPOSITION}, + { &GUID_RzAxis,DIJOFS_RZ,DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,DIDOI_ASPECTPOSITION}, + { &GUID_Slider,DIJOFS_SLIDER(0),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,DIDOI_ASPECTPOSITION}, + { &GUID_Slider,DIJOFS_SLIDER(1),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,DIDOI_ASPECTPOSITION}, { &GUID_POV,DIJOFS_POV(0),DIDFT_OPTIONAL|DIDFT_POV|DIDFT_ANYINSTANCE,0}, { &GUID_POV,DIJOFS_POV(1),DIDFT_OPTIONAL|DIDFT_POV|DIDFT_ANYINSTANCE,0}, { &GUID_POV,DIJOFS_POV(2),DIDFT_OPTIONAL|DIDFT_POV|DIDFT_ANYINSTANCE,0}, -- 2.25.0

2 1

[PATCH 2/3] dinput: Add missing ASPECT flags for c_dfDIJoystick2
by Andrew Eikum 21 Jan '20

21 Jan '20

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/dinput/data_formats.c | 64 +++++++++++++++++++------------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/dlls/dinput/data_formats.c b/dlls/dinput/data_formats.c index b5e0efc3cc5..b67ac080e57 100644 --- a/dlls/dinput/data_formats.c +++ b/dlls/dinput/data_formats.c @@ -82,14 +82,14 @@ const DIDATAFORMAT c_dfDIJoystick = { }; static const DIOBJECTDATAFORMAT dfDIJoystick2[] = { - { &GUID_XAxis,DIJOFS_X,DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0}, - { &GUID_YAxis,DIJOFS_Y,DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0}, - { &GUID_ZAxis,DIJOFS_Z,DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0}, - { &GUID_RxAxis,DIJOFS_RX,DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0}, - { &GUID_RyAxis,DIJOFS_RY,DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0}, - { &GUID_RzAxis,DIJOFS_RZ,DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0}, - { &GUID_Slider,DIJOFS_SLIDER(0),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0}, - { &GUID_Slider,DIJOFS_SLIDER(1),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0}, + { &GUID_XAxis,DIJOFS_X,DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,DIDOI_ASPECTPOSITION}, + { &GUID_YAxis,DIJOFS_Y,DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,DIDOI_ASPECTPOSITION}, + { &GUID_ZAxis,DIJOFS_Z,DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,DIDOI_ASPECTPOSITION}, + { &GUID_RxAxis,DIJOFS_RX,DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,DIDOI_ASPECTPOSITION}, + { &GUID_RyAxis,DIJOFS_RY,DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,DIDOI_ASPECTPOSITION}, + { &GUID_RzAxis,DIJOFS_RZ,DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,DIDOI_ASPECTPOSITION}, + { &GUID_Slider,DIJOFS_SLIDER(0),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,DIDOI_ASPECTPOSITION}, + { &GUID_Slider,DIJOFS_SLIDER(1),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,DIDOI_ASPECTPOSITION}, { &GUID_POV,DIJOFS_POV(0),DIDFT_OPTIONAL|DIDFT_POV|DIDFT_ANYINSTANCE,0}, { &GUID_POV,DIJOFS_POV(1),DIDFT_OPTIONAL|DIDFT_POV|DIDFT_ANYINSTANCE,0}, { &GUID_POV,DIJOFS_POV(2),DIDFT_OPTIONAL|DIDFT_POV|DIDFT_ANYINSTANCE,0}, @@ -222,33 +222,33 @@ static const DIOBJECTDATAFORMAT dfDIJoystick2[] = { { NULL,DIJOFS_BUTTON(125),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0}, { NULL,DIJOFS_BUTTON(126),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0}, { NULL,DIJOFS_BUTTON(127),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0}, - { &GUID_XAxis,FIELD_OFFSET(DIJOYSTATE2,lVX),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0}, - { &GUID_YAxis,FIELD_OFFSET(DIJOYSTATE2,lVY),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0}, - { &GUID_ZAxis,FIELD_OFFSET(DIJOYSTATE2,lVZ),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0}, - { &GUID_RxAxis,FIELD_OFFSET(DIJOYSTATE2,lVRx),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0}, - { &GUID_RyAxis,FIELD_OFFSET(DIJOYSTATE2,lVRy),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0}, - { &GUID_RzAxis,FIELD_OFFSET(DIJOYSTATE2,lVRz),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0}, + { &GUID_XAxis,FIELD_OFFSET(DIJOYSTATE2,lVX),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,DIDOI_ASPECTVELOCITY}, + { &GUID_YAxis,FIELD_OFFSET(DIJOYSTATE2,lVY),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,DIDOI_ASPECTVELOCITY}, + { &GUID_ZAxis,FIELD_OFFSET(DIJOYSTATE2,lVZ),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,DIDOI_ASPECTVELOCITY}, + { &GUID_RxAxis,FIELD_OFFSET(DIJOYSTATE2,lVRx),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,DIDOI_ASPECTVELOCITY}, + { &GUID_RyAxis,FIELD_OFFSET(DIJOYSTATE2,lVRy),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,DIDOI_ASPECTVELOCITY}, + { &GUID_RzAxis,FIELD_OFFSET(DIJOYSTATE2,lVRz),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,DIDOI_ASPECTVELOCITY}, /* note: dwOfs value matches Windows */ - { &GUID_Slider,DIJOFS_SLIDER(0),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0}, - { &GUID_Slider,DIJOFS_SLIDER(1),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0}, - { &GUID_XAxis,FIELD_OFFSET(DIJOYSTATE2,lAX),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0}, - { &GUID_YAxis,FIELD_OFFSET(DIJOYSTATE2,lAY),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0}, - { &GUID_ZAxis,FIELD_OFFSET(DIJOYSTATE2,lAZ),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0}, - { &GUID_RxAxis,FIELD_OFFSET(DIJOYSTATE2,lARx),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0}, - { &GUID_RyAxis,FIELD_OFFSET(DIJOYSTATE2,lARy),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0}, - { &GUID_RzAxis,FIELD_OFFSET(DIJOYSTATE2,lARz),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0}, + { &GUID_Slider,DIJOFS_SLIDER(0),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,DIDOI_ASPECTVELOCITY}, + { &GUID_Slider,DIJOFS_SLIDER(1),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,DIDOI_ASPECTVELOCITY}, + { &GUID_XAxis,FIELD_OFFSET(DIJOYSTATE2,lAX),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,DIDOI_ASPECTACCEL}, + { &GUID_YAxis,FIELD_OFFSET(DIJOYSTATE2,lAY),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,DIDOI_ASPECTACCEL}, + { &GUID_ZAxis,FIELD_OFFSET(DIJOYSTATE2,lAZ),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,DIDOI_ASPECTACCEL}, + { &GUID_RxAxis,FIELD_OFFSET(DIJOYSTATE2,lARx),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,DIDOI_ASPECTACCEL}, + { &GUID_RyAxis,FIELD_OFFSET(DIJOYSTATE2,lARy),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,DIDOI_ASPECTACCEL}, + { &GUID_RzAxis,FIELD_OFFSET(DIJOYSTATE2,lARz),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,DIDOI_ASPECTACCEL}, /* note: dwOfs value matches Windows */ - { &GUID_Slider,DIJOFS_SLIDER(0),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0}, - { &GUID_Slider,DIJOFS_SLIDER(1),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0}, - { &GUID_XAxis,FIELD_OFFSET(DIJOYSTATE2,lFX),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0}, - { &GUID_YAxis,FIELD_OFFSET(DIJOYSTATE2,lFY),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0}, - { &GUID_ZAxis,FIELD_OFFSET(DIJOYSTATE2,lFZ),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0}, - { &GUID_RxAxis,FIELD_OFFSET(DIJOYSTATE2,lFRx),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0}, - { &GUID_RyAxis,FIELD_OFFSET(DIJOYSTATE2,lFRy),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0}, - { &GUID_RzAxis,FIELD_OFFSET(DIJOYSTATE2,lFRz),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0}, + { &GUID_Slider,DIJOFS_SLIDER(0),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,DIDOI_ASPECTACCEL}, + { &GUID_Slider,DIJOFS_SLIDER(1),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,DIDOI_ASPECTACCEL}, + { &GUID_XAxis,FIELD_OFFSET(DIJOYSTATE2,lFX),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,DIDOI_ASPECTFORCE}, + { &GUID_YAxis,FIELD_OFFSET(DIJOYSTATE2,lFY),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,DIDOI_ASPECTFORCE}, + { &GUID_ZAxis,FIELD_OFFSET(DIJOYSTATE2,lFZ),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,DIDOI_ASPECTFORCE}, + { &GUID_RxAxis,FIELD_OFFSET(DIJOYSTATE2,lFRx),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,DIDOI_ASPECTFORCE}, + { &GUID_RyAxis,FIELD_OFFSET(DIJOYSTATE2,lFRy),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,DIDOI_ASPECTFORCE}, + { &GUID_RzAxis,FIELD_OFFSET(DIJOYSTATE2,lFRz),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,DIDOI_ASPECTFORCE}, /* note: dwOfs value matches Windows */ - { &GUID_Slider,DIJOFS_SLIDER(0),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0}, - { &GUID_Slider,DIJOFS_SLIDER(1),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0}, + { &GUID_Slider,DIJOFS_SLIDER(0),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,DIDOI_ASPECTFORCE}, + { &GUID_Slider,DIJOFS_SLIDER(1),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,DIDOI_ASPECTFORCE}, }; const DIDATAFORMAT c_dfDIJoystick2 = { -- 2.25.0

2 1

[PATCH] dxgi/tests: Test IDXGISwapchain::GetFullscreenState after window is destroyed
by Andrew Eikum 21 Jan '20

21 Jan '20

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/dxgi/tests/dxgi.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index b2b53f7a4ca..3fbb50ca3f9 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -2365,6 +2365,7 @@ static void test_set_fullscreen(IUnknown *device, BOOL is_d3d12) IDXGIOutput *output; ULONG refcount; HRESULT hr; + BOOL fs_state; get_factory(device, is_d3d12, &factory); @@ -2432,11 +2433,20 @@ static void test_set_fullscreen(IUnknown *device, BOOL is_d3d12) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = IDXGISwapChain_GetFullscreenState(swapchain, &fs_state, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(fs_state == FALSE, "Got wrong fullscreen state %u\n", fs_state); DestroyWindow(swapchain_desc.OutputWindow); hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = IDXGISwapChain_GetFullscreenState(swapchain, &fs_state, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(fs_state == FALSE, "Got wrong fullscreen state %u\n", fs_state); hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, NULL); ok(hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE, "Got unexpected hr %#x.\n", hr); + hr = IDXGISwapChain_GetFullscreenState(swapchain, &fs_state, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(fs_state == FALSE, "Got wrong fullscreen state %u\n", fs_state); hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); refcount = IDXGISwapChain_Release(swapchain); @@ -2448,13 +2458,25 @@ static void test_set_fullscreen(IUnknown *device, BOOL is_d3d12) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, NULL); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = IDXGISwapChain_GetFullscreenState(swapchain, &fs_state, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(fs_state == TRUE, "Got wrong fullscreen state %u\n", fs_state); DestroyWindow(swapchain_desc.OutputWindow); hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, NULL); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = IDXGISwapChain_GetFullscreenState(swapchain, &fs_state, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(fs_state == TRUE, "Got wrong fullscreen state %u\n", fs_state); hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = IDXGISwapChain_GetFullscreenState(swapchain, &fs_state, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(fs_state == FALSE, "Got wrong fullscreen state %u\n", fs_state); hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, NULL); ok(hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE, "Got unexpected hr %#x.\n", hr); + hr = IDXGISwapChain_GetFullscreenState(swapchain, &fs_state, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(fs_state == FALSE, "Got wrong fullscreen state %u\n", fs_state); hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); refcount = IDXGISwapChain_Release(swapchain); -- 2.25.0

2 1

Wine staging 5.0 release
by Alistair Leslie-Hughes 21 Jan '20

21 Jan '20

Binary packages for various distributions will be available from: https://www.winehq.org/download Summary since last release * Rebased to current wine 5.0 (877 patches are applied to wine vanilla) Upstreamed (Either directly from staging or fixed with a similar patch). * None Added: * [48489] gdiplus: Reference count the GpFontFamily object. Updated: * ntdll-ForceBottomUpAlloc Where can you help * Run Steam/Battle.net/GOG/UPlay/Epic * Test your favorite game. * Test your favorite applications. * Improve staging patches and get them accepted upstream. As always, if you find a bug, please report it via https://bugs.winehq.org Best Regards Alistair.

1 0

[PATCH v2] dmime: IDirectMusicPerformance8_FreePMsg Release the unknown pointer.
by Michael Stefaniuc 21 Jan '20

21 Jan '20

From: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- v2: resend (Deferred) dlls/dmime/performance.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index 2124c1fe35..3dd54a6cb6 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -531,7 +531,9 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_FreePMsg(IDirectMusicPerforma DMUS_ItemRemoveFromQueue( This, pItem ); LeaveCriticalSection(&This->safe); - /** TODO: see if we should Release the pItem->pMsg->punkUser and others Interfaces */ + if (pPMSG->punkUser) + IUnknown_Release(pPMSG->punkUser); + HeapFree(GetProcessHeap(), 0, pItem); return S_OK; } -- 2.24.1

1 0

[PATCH v2] dmloader: Use wide-char string literals
by Michael Stefaniuc 21 Jan '20

21 Jan '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- v2: resend (Deferred) dlls/dmloader/loader.c | 8 ++++---- dlls/dmloader/tests/loader.c | 11 +++++------ 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/dlls/dmloader/loader.c b/dlls/dmloader/loader.c index 51eeb57879..c5f5094fab 100644 --- a/dlls/dmloader/loader.c +++ b/dlls/dmloader/loader.c @@ -621,7 +621,6 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_SetSearchDirectory(IDirectMusicLoad static HRESULT WINAPI IDirectMusicLoaderImpl_ScanDirectory(IDirectMusicLoader8 *iface, REFGUID rguidClass, WCHAR *pwzFileExtension, WCHAR *pwzScanFileName) { IDirectMusicLoaderImpl *This = impl_from_IDirectMusicLoader8(iface); - static const WCHAR wszAny[] = {'*',0}; WIN32_FIND_DATAW FileData; HANDLE hSearch; WCHAR wszSearchString[MAX_PATH]; @@ -643,11 +642,12 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_ScanDirectory(IDirectMusicLoader8 * p = wszSearchString + lstrlenW(wszSearchString); if (p > wszSearchString && p[-1] != '\\') *p++ = '\\'; *p++ = '*'; /* any file */ - if (lstrcmpW (pwzFileExtension, wszAny)) *p++ = '.'; /* if we have actual extension, put a dot */ + if (lstrcmpW (pwzFileExtension, L"*")) + *p++ = '.'; /* if we have actual extension, put a dot */ lstrcpyW (p, pwzFileExtension); - + TRACE(": search string: %s\n", debugstr_w(wszSearchString)); - + hSearch = FindFirstFileW (wszSearchString, &FileData); if (hSearch == INVALID_HANDLE_VALUE) { TRACE(": no files found\n"); diff --git a/dlls/dmloader/tests/loader.c b/dlls/dmloader/tests/loader.c index 0ab2e9eaba..418a4ebb7a 100644 --- a/dlls/dmloader/tests/loader.c +++ b/dlls/dmloader/tests/loader.c @@ -48,10 +48,10 @@ static void test_directory(void) { IDirectMusicLoader8 *loader = NULL; HRESULT hr; - WCHAR con[] = {'c', 'o', 'n', 0}; + WCHAR con[] = L"con"; + WCHAR empty[] = L""; + WCHAR invalid_path[] = L"/invalid path"; WCHAR path[MAX_PATH]; - WCHAR empty[] = {0}; - WCHAR invalid_path[] = {'/', 'i', 'n', 'v', 'a', 'l', 'i', 'd', ' ', 'p', 'a', 't', 'h', 0}; hr = CoCreateInstance(&CLSID_DirectMusicLoader, NULL, CLSCTX_INPROC, &IID_IDirectMusicLoader8, (void**)&loader); @@ -477,7 +477,6 @@ static void test_parsedescriptor(void) DMUS_OBJECTDESC desc; HRESULT hr; DWORD valid; - const WCHAR s_unam[] = {'U','N','A','M','\0'}; const FOURCC alldesc[] = { FOURCC_RIFF, DMUS_FOURCC_CONTAINER_FORM, DMUS_FOURCC_CATEGORY_CHUNK, FOURCC_LIST, @@ -562,7 +561,7 @@ static void test_parsedescriptor(void) wine_dbgstr_guid(&desc.guidClass)); ok(IsEqualGUID(&desc.guidObject, &GUID_NULL), "Got object guid %s, expected GUID_NULL\n", wine_dbgstr_guid(&desc.guidClass)); - ok(!memcmp(desc.wszName, s_unam, sizeof(s_unam)), "Got name '%s', expected 'UNAM'\n", + ok(!lstrcmpW(desc.wszName, L"UNAM"), "Got name '%s', expected 'UNAM'\n", wine_dbgstr_w(desc.wszName)); IStream_Release(stream); @@ -596,7 +595,7 @@ static void test_parsedescriptor(void) ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr); valid = DMUS_OBJ_OBJECT|DMUS_OBJ_CLASS|DMUS_OBJ_NAME|DMUS_OBJ_CATEGORY|DMUS_OBJ_VERSION; ok(desc.dwValidData == valid, "Got valid data %#x, expected %#x\n", desc.dwValidData, valid); - ok(!memcmp(desc.wszName, s_unam, sizeof(s_unam)), "Got name '%s', expected 'UNAM'\n", + ok(!lstrcmpW(desc.wszName, L"UNAM"), "Got name '%s', expected 'UNAM'\n", wine_dbgstr_w(desc.wszName)); IStream_Release(stream); -- 2.24.1

1 0

[PATCH v2] dmusic: Use wide-char string literals
by Michael Stefaniuc 21 Jan '20

21 Jan '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- v2: resend (Deferred) dlls/dmusic/dmusic.c | 8 +++----- dlls/dmusic/tests/dmusic.c | 5 ++--- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/dlls/dmusic/dmusic.c b/dlls/dmusic/dmusic.c index 0d1f5269a4..8dc9e78885 100644 --- a/dlls/dmusic/dmusic.c +++ b/dlls/dmusic/dmusic.c @@ -344,20 +344,18 @@ static HRESULT WINAPI IDirectMusic8Impl_EnumMasterClock(LPDIRECTMUSIC8 iface, DW if (!index) { static const GUID guid_system_clock = { 0x58d58419, 0x71b4, 0x11d1, { 0xa7, 0x4c, 0x00, 0x00, 0xf8, 0x75, 0xac, 0x12 } }; - static const WCHAR name_system_clock[] = { 'S','y','s','t','e','m',' ','C','l','o','c','k',0 }; clock_info->ctType = 0; clock_info->guidClock = guid_system_clock; - lstrcpyW(clock_info->wszDescription, name_system_clock); + lstrcpyW(clock_info->wszDescription, L"System Clock"); } else { static const GUID guid_dsound_clock = { 0x58d58420, 0x71b4, 0x11d1, { 0xa7, 0x4c, 0x00, 0x00, 0xf8, 0x75, 0xac, 0x12 } }; - static const WCHAR name_dsound_clock[] = { 'D','i','r','e','c','t','S','o','u','n','d',' ','C','l','o','c','k',0 }; clock_info->ctType = 0; clock_info->guidClock = guid_dsound_clock; - lstrcpyW(clock_info->wszDescription, name_dsound_clock); + lstrcpyW(clock_info->wszDescription, L"DirectSound Clock"); } return S_OK; @@ -497,7 +495,7 @@ static const IDirectMusic8Vtbl DirectMusic8_Vtbl = { static void create_system_ports_list(IDirectMusic8Impl* object) { - static const WCHAR emulated[] = {' ','[','E','m','u','l','a','t','e','d',']',0}; + static const WCHAR emulated[] = L" [Emulated]"; port_info * port; ULONG nb_ports; ULONG nb_midi_out; diff --git a/dlls/dmusic/tests/dmusic.c b/dlls/dmusic/tests/dmusic.c index f6c417af30..776f9d0ec9 100644 --- a/dlls/dmusic/tests/dmusic.c +++ b/dlls/dmusic/tests/dmusic.c @@ -639,7 +639,6 @@ static void test_parsedescriptor(void) IStream *stream; DMUS_OBJECTDESC desc = {0}; HRESULT hr; - const WCHAR s_inam[] = {'I','N','A','M','\0'}; const FOURCC alldesc[] = { FOURCC_RIFF, FOURCC_DLS, DMUS_FOURCC_CATEGORY_CHUNK, FOURCC_LIST, @@ -735,7 +734,7 @@ static void test_parsedescriptor(void) ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr); ok(desc.dwValidData == (DMUS_OBJ_CLASS | DMUS_OBJ_NAME), "Got valid data %#x, expected DMUS_OBJ_CLASS | DMUS_OBJ_NAME\n", desc.dwValidData); - ok(!memcmp(desc.wszName, s_inam, sizeof(s_inam)), "Got name '%s', expected 'INAM'\n", + ok(!lstrcmpW(desc.wszName, L"INAM"), "Got name '%s', expected 'INAM'\n", wine_dbgstr_w(desc.wszName)); IStream_Release(stream); @@ -747,7 +746,7 @@ static void test_parsedescriptor(void) ok(desc.dwValidData == (DMUS_OBJ_CLASS | DMUS_OBJ_NAME | DMUS_OBJ_VERSION), "Got valid data %#x, expected DMUS_OBJ_CLASS | DMUS_OBJ_NAME | DMUS_OBJ_VERSION\n", desc.dwValidData); - ok(!memcmp(desc.wszName, s_inam, sizeof(s_inam)), "Got name '%s', expected 'INAM'\n", + ok(!lstrcmpW(desc.wszName, L"INAM"), "Got name '%s', expected 'INAM'\n", wine_dbgstr_w(desc.wszName)); IStream_Release(stream); -- 2.24.1

1 0

[PATCH v2 1/3] kernel32/tests: Fix GetLastError() checks in environment tests.
by Vladimir Panteleev 21 Jan '20

21 Jan '20

Lack of SetLastError() calls caused tests to compare stale errors, instead of the effects of the tested (immediately previously called) functions. Add SetLastError calls, and fix a broken test (copy check from A to W tests). Signed-off-by: Vladimir Panteleev <git(a)vladimir.panteleev.md> --- dlls/kernel32/tests/environ.c | 29 ++++++++++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/environ.c b/dlls/kernel32/tests/environ.c index 44a6a0cff0..128a5fdbe5 100644 --- a/dlls/kernel32/tests/environ.c +++ b/dlls/kernel32/tests/environ.c @@ -131,6 +131,7 @@ static void test_GetSetEnvironmentVariableA(void) ok(ret == TRUE, "should erase existing variable\n"); lstrcpyA(buf, "foo"); + SetLastError(0xdeadbeef); ret_size = GetEnvironmentVariableA(name, buf, lstrlenA(value) + 1); ok(lstrcmpA(buf, "foo") == 0, "should not touch the buffer\n"); ok(ret_size == 0 && GetLastError() == ERROR_ENVVAR_NOT_FOUND, @@ -163,16 +164,19 @@ static void test_GetSetEnvironmentVariableA(void) name, ret_size, GetLastError(), buf); /* Test the limits */ + SetLastError(0xdeadbeef); ret_size = GetEnvironmentVariableA(NULL, NULL, 0); ok(ret_size == 0 && (GetLastError() == ERROR_INVALID_PARAMETER || GetLastError() == ERROR_ENVVAR_NOT_FOUND), "should not find variable but ret_size=%d GetLastError=%d\n", ret_size, GetLastError()); + SetLastError(0xdeadbeef); ret_size = GetEnvironmentVariableA(NULL, buf, lstrlenA(value) + 1); ok(ret_size == 0 && (GetLastError() == ERROR_INVALID_PARAMETER || GetLastError() == ERROR_ENVVAR_NOT_FOUND), "should not find variable but ret_size=%d GetLastError=%d\n", ret_size, GetLastError()); + SetLastError(0xdeadbeef); ret_size = GetEnvironmentVariableA("", buf, lstrlenA(value) + 1); ok(ret_size == 0 && GetLastError() == ERROR_ENVVAR_NOT_FOUND, "should not find variable but ret_size=%d GetLastError=%d\n", @@ -233,6 +237,7 @@ static void test_GetSetEnvironmentVariableW(void) ok(ret == TRUE, "should erase existing variable\n"); lstrcpyW(buf, fooW); + SetLastError(0xdeadbeef); ret_size = GetEnvironmentVariableW(name, buf, lstrlenW(value) + 1); ok(lstrcmpW(buf, fooW) == 0, "should not touch the buffer\n"); ok(ret_size == 0 && GetLastError() == ERROR_ENVVAR_NOT_FOUND, @@ -255,25 +260,31 @@ static void test_GetSetEnvironmentVariableW(void) ok(ret == TRUE, "should not fail with empty value but GetLastError=%d\n", GetLastError()); lstrcpyW(buf, fooW); + SetLastError(0); ret_size = GetEnvironmentVariableW(name, buf, lstrlenW(value) + 1); - ok(ret_size == 0 && GetLastError() == ERROR_ENVVAR_NOT_FOUND, - "should not find variable but ret_size=%d GetLastError=%d\n", + ok(ret_size == 0 && + ((GetLastError() == 0 && lstrcmpW(buf, empty_strW) == 0) || + (GetLastError() == ERROR_ENVVAR_NOT_FOUND)), + "should be set to \"\" (NT) or removed (Win9x) but ret_size=%d GetLastError=%d\n", ret_size, GetLastError()); ok(lstrcmpW(buf, empty_strW) == 0, "should copy an empty string\n"); /* Test the limits */ + SetLastError(0xdeadbeef); ret_size = GetEnvironmentVariableW(NULL, NULL, 0); - ok(ret_size == 0 && GetLastError() == ERROR_ENVVAR_NOT_FOUND, + ok(ret_size == 0 && (GetLastError() == ERROR_INVALID_PARAMETER || GetLastError() == ERROR_ENVVAR_NOT_FOUND), "should not find variable but ret_size=%d GetLastError=%d\n", ret_size, GetLastError()); if (0) /* Both tests crash on Vista */ { + SetLastError(0xdeadbeef); ret_size = GetEnvironmentVariableW(NULL, buf, lstrlenW(value) + 1); ok(ret_size == 0 && GetLastError() == ERROR_ENVVAR_NOT_FOUND, "should not find variable but ret_size=%d GetLastError=%d\n", ret_size, GetLastError()); + SetLastError(0xdeadbeef); ret = SetEnvironmentVariableW(NULL, NULL); ok(ret == FALSE && (GetLastError() == ERROR_INVALID_PARAMETER || GetLastError() == ERROR_ENVVAR_NOT_FOUND), "should fail with NULL, NULL but ret=%d and GetLastError=%d\n", @@ -342,6 +353,7 @@ static void test_ExpandEnvironmentStringsA(void) ret_size = ExpandEnvironmentStringsA(buf, buf2, sizeof(buf2)); ok(!strcmp(buf, buf2), "ExpandEnvironmentStrings failed %s vs %s. ret_size = %d\n", buf, buf2, ret_size); + SetLastError(0xdeadbeef); ret_size1 = GetWindowsDirectoryA(buf1,256); ok ((ret_size1 >0) && (ret_size1<256), "GetWindowsDirectory Failed\n"); ret_size = ExpandEnvironmentStringsA("%SystemRoot%",buf,sizeof(buf)); @@ -374,6 +386,7 @@ static void test_GetComputerName(void) int name_len; size = 0; + SetLastError(0xdeadbeef); ret = GetComputerNameA((LPSTR)0xdeadbeef, &size); error = GetLastError(); ok(!ret && error == ERROR_BUFFER_OVERFLOW, "GetComputerNameA should have failed with ERROR_BUFFER_OVERFLOW instead of %d\n", error); @@ -433,6 +446,7 @@ static void test_GetComputerNameExA(void) } size = 0; + SetLastError(0xdeadbeef); ret = pGetComputerNameExA(ComputerNameDnsDomain, (LPSTR)0xdeadbeef, &size); error = GetLastError(); ok(ret == 0, "Expected 0, got %d\n", ret); @@ -452,6 +466,7 @@ static void test_GetComputerNameExA(void) HeapFree(GetProcessHeap(), 0, name); size = 0; + SetLastError(0xdeadbeef); ret = pGetComputerNameExA(ComputerNameDnsFullyQualified, (LPSTR)0xdeadbeef, &size); error = GetLastError(); ok(ret == 0, "Expected 0, got %d\n", ret); @@ -468,6 +483,7 @@ static void test_GetComputerNameExA(void) HeapFree(GetProcessHeap(), 0, name); size = 0; + SetLastError(0xdeadbeef); ret = pGetComputerNameExA(ComputerNameDnsHostname, (LPSTR)0xdeadbeef, &size); error = GetLastError(); ok(ret == 0, "Expected 0, got %d\n", ret); @@ -484,12 +500,14 @@ static void test_GetComputerNameExA(void) HeapFree(GetProcessHeap(), 0, name); size = 0; + SetLastError(0xdeadbeef); ret = pGetComputerNameExA(ComputerNameNetBIOS, (LPSTR)0xdeadbeef, &size); error = GetLastError(); ok(ret == 0, "Expected 0, got %d\n", ret); ok(error == ERROR_MORE_DATA, "Expected ERROR_MORE_DATA, got %d\n", error); size = 0; + SetLastError(0xdeadbeef); ret = pGetComputerNameExA(ComputerNameNetBIOS, NULL, &size); error = GetLastError(); ok(ret == 0, "Expected 0, got %d\n", ret); @@ -520,6 +538,7 @@ static void test_GetComputerNameExW(void) } size = 0; + SetLastError(0xdeadbeef); ret = pGetComputerNameExW(ComputerNameDnsDomain, (LPWSTR)0xdeadbeef, &size); error = GetLastError(); ok(!ret && error == ERROR_MORE_DATA, "GetComputerNameExW should have failed with ERROR_MORE_DATA instead of %d\n", error); @@ -530,6 +549,7 @@ static void test_GetComputerNameExW(void) HeapFree(GetProcessHeap(), 0, nameW); size = 0; + SetLastError(0xdeadbeef); ret = pGetComputerNameExW(ComputerNameDnsFullyQualified, (LPWSTR)0xdeadbeef, &size); error = GetLastError(); ok(!ret && error == ERROR_MORE_DATA, "GetComputerNameExW should have failed with ERROR_MORE_DATA instead of %d\n", error); @@ -540,6 +560,7 @@ static void test_GetComputerNameExW(void) HeapFree(GetProcessHeap(), 0, nameW); size = 0; + SetLastError(0xdeadbeef); ret = pGetComputerNameExW(ComputerNameDnsHostname, (LPWSTR)0xdeadbeef, &size); error = GetLastError(); ok(!ret && error == ERROR_MORE_DATA, "GetComputerNameExW should have failed with ERROR_MORE_DATA instead of %d\n", error); @@ -550,6 +571,7 @@ static void test_GetComputerNameExW(void) HeapFree(GetProcessHeap(), 0, nameW); size = 0; + SetLastError(0xdeadbeef); ret = pGetComputerNameExW(ComputerNameNetBIOS, (LPWSTR)0xdeadbeef, &size); error = GetLastError(); ok(!ret && error == ERROR_MORE_DATA, "GetComputerNameExW should have failed with ERROR_MORE_DATA instead of %d\n", error); @@ -560,6 +582,7 @@ static void test_GetComputerNameExW(void) HeapFree(GetProcessHeap(), 0, nameW); size = 0; + SetLastError(0xdeadbeef); ret = pGetComputerNameExW(ComputerNameNetBIOS, NULL, &size); error = GetLastError(); ok(!ret && error == ERROR_MORE_DATA, "GetComputerNameExW should have failed with ERROR_MORE_DATA instead of %d\n", error); -- 2.25.0

2 3

[PATCH 5/5] winegcc: Use Wine crt when linking builtin EXEs.
by Jacek Caban 21 Jan '20

21 Jan '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- This will cover all Wine builtin executables. My plan is to use use_msvcrt instead of wine_builtin, which will also cover tests and a good chunk of pe-only builds. This requires some final touches on tests to avoid mingwex dependency, so I left it for another series. tools/winegcc/winegcc.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)

1 0

[PATCH 1/3] dinput: Fix V/A/FSlider dwOfs values in c_dfDIJoystick2
by Andrew Eikum 21 Jan '20

21 Jan '20

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/dinput/data_formats.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/dinput/data_formats.c b/dlls/dinput/data_formats.c index 9c9f00f8f62..b5e0efc3cc5 100644 --- a/dlls/dinput/data_formats.c +++ b/dlls/dinput/data_formats.c @@ -228,24 +228,27 @@ static const DIOBJECTDATAFORMAT dfDIJoystick2[] = { { &GUID_RxAxis,FIELD_OFFSET(DIJOYSTATE2,lVRx),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0}, { &GUID_RyAxis,FIELD_OFFSET(DIJOYSTATE2,lVRy),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0}, { &GUID_RzAxis,FIELD_OFFSET(DIJOYSTATE2,lVRz),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0}, - { &GUID_Slider,FIELD_OFFSET(DIJOYSTATE2,rglVSlider[0]),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0}, - { &GUID_Slider,FIELD_OFFSET(DIJOYSTATE2,rglVSlider[1]),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0}, + /* note: dwOfs value matches Windows */ + { &GUID_Slider,DIJOFS_SLIDER(0),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0}, + { &GUID_Slider,DIJOFS_SLIDER(1),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0}, { &GUID_XAxis,FIELD_OFFSET(DIJOYSTATE2,lAX),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0}, { &GUID_YAxis,FIELD_OFFSET(DIJOYSTATE2,lAY),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0}, { &GUID_ZAxis,FIELD_OFFSET(DIJOYSTATE2,lAZ),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0}, { &GUID_RxAxis,FIELD_OFFSET(DIJOYSTATE2,lARx),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0}, { &GUID_RyAxis,FIELD_OFFSET(DIJOYSTATE2,lARy),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0}, { &GUID_RzAxis,FIELD_OFFSET(DIJOYSTATE2,lARz),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0}, - { &GUID_Slider,FIELD_OFFSET(DIJOYSTATE2,rglASlider[0]),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0}, - { &GUID_Slider,FIELD_OFFSET(DIJOYSTATE2,rglASlider[1]),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0}, + /* note: dwOfs value matches Windows */ + { &GUID_Slider,DIJOFS_SLIDER(0),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0}, + { &GUID_Slider,DIJOFS_SLIDER(1),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0}, { &GUID_XAxis,FIELD_OFFSET(DIJOYSTATE2,lFX),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0}, { &GUID_YAxis,FIELD_OFFSET(DIJOYSTATE2,lFY),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0}, { &GUID_ZAxis,FIELD_OFFSET(DIJOYSTATE2,lFZ),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0}, { &GUID_RxAxis,FIELD_OFFSET(DIJOYSTATE2,lFRx),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0}, { &GUID_RyAxis,FIELD_OFFSET(DIJOYSTATE2,lFRy),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0}, { &GUID_RzAxis,FIELD_OFFSET(DIJOYSTATE2,lFRz),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0}, - { &GUID_Slider,FIELD_OFFSET(DIJOYSTATE2,rglFSlider[0]),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0}, - { &GUID_Slider,FIELD_OFFSET(DIJOYSTATE2,rglFSlider[1]),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0}, + /* note: dwOfs value matches Windows */ + { &GUID_Slider,DIJOFS_SLIDER(0),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0}, + { &GUID_Slider,DIJOFS_SLIDER(1),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0}, }; const DIDATAFORMAT c_dfDIJoystick2 = { -- 2.25.0

1 0

[PATCH 4/5] msvcrt: Provide EXE entry points in importlib.
by Jacek Caban 21 Jan '20

21 Jan '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- Those are very minimalistic, but Wine is very minimalistic about used features, so it should be enough for our needs. We can extend it to support more features like DLL-aware atexit() or global constructors if needed. After experimenting, I think that crt importlib seems the best place for this and it's what MSVC does. mingw instead has separated object files with entry point implementation that are linked into modules. Both this solution and having them in winecrt0 (which would be another possibility) introduces problematic dependency on msvcrt importlib. This can be done, but leads to some unpleasant problems with supporting multiple runtimes. Having it in crt importlibs will allow easy customisations. dlls/msvcrt/Makefile.in | 5 ++++ dlls/msvcrt/crt_gccmain.c | 31 ++++++++++++++++++++ dlls/msvcrt/crt_main.c | 59 +++++++++++++++++++++++++++++++++++++ dlls/msvcrt/crt_winmain.c | 58 ++++++++++++++++++++++++++++++++++++ dlls/msvcrt/crt_wmain.c | 59 +++++++++++++++++++++++++++++++++++++ dlls/msvcrt/crt_wwinmain.c | 60 ++++++++++++++++++++++++++++++++++++++ 6 files changed, 272 insertions(+) create mode 100644 dlls/msvcrt/crt_gccmain.c create mode 100644 dlls/msvcrt/crt_main.c create mode 100644 dlls/msvcrt/crt_winmain.c create mode 100644 dlls/msvcrt/crt_wmain.c create mode 100644 dlls/msvcrt/crt_wwinmain.c

1 0

[PATCH 3/5] winegcc: Add support for -Wl,--entry argument.
by Jacek Caban 21 Jan '20

21 Jan '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- tools/winegcc/winegcc.c | 45 ++++++++++++++++++++++++++--------------- 1 file changed, 29 insertions(+), 16 deletions(-)

1 0

[PATCH 2/5] makedep: Link importlib object files into module only when it's explicitly imported.
by Jacek Caban 21 Jan '20

21 Jan '20

To prevent msvcrt linking its own importlib into DLL. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/dinput/Makefile.in | 2 +- dlls/dinput8/Makefile.in | 2 +- tools/makedep.c | 5 ++++- 3 files changed, 6 insertions(+), 3 deletions(-)

1 0

[PATCH 1/5] winbase.h: Add wWinMain declaration.
by Jacek Caban 21 Jan '20

21 Jan '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/winbase.h | 1 + 1 file changed, 1 insertion(+)

1 0

[PATCH 1/3] ucrtbase/tests: Test what iswctype considers a blank character.
by Jeff Smith 21 Jan '20

21 Jan '20

Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> --- dlls/ucrtbase/tests/misc.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index f637997a0d..6b5977c4d8 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -154,6 +154,7 @@ static MSVCRT_lldiv_t* (CDECL *p_lldiv)(MSVCRT_lldiv_t*,LONGLONG,LONGLONG); static int (CDECL *p__isctype)(int,int); static int (CDECL *p_isblank)(int); static int (CDECL *p__isblank_l)(int,_locale_t); +static int (CDECL *p_iswctype)(int,int); static int (CDECL *p__iswctype_l)(int,int,_locale_t); static int (CDECL *p_iswblank)(int); static int (CDECL *p__iswblank_l)(wint_t,_locale_t); @@ -531,6 +532,7 @@ static BOOL init(void) p__isctype = (void*)GetProcAddress(module, "_isctype"); p_isblank = (void*)GetProcAddress(module, "isblank"); p__isblank_l = (void*)GetProcAddress(module, "_isblank_l"); + p_iswctype = (void*)GetProcAddress(module, "iswctype"); p__iswctype_l = (void*)GetProcAddress(module, "_iswctype_l"); p_iswblank = (void*)GetProcAddress(module, "iswblank"); p__iswblank_l = (void*)GetProcAddress(module, "_iswblank_l"); @@ -646,14 +648,18 @@ static void test_isblank(void) for(c = 0; c <= 0xffff; c++) { if(c == '\t' || c == ' ' || c == 0x3000 || c == 0xfeff) { - if(c == '\t') + if(c == '\t') { + todo_wine ok(!p_iswctype(c, _BLANK), "tab shouldn't be blank\n", c); todo_wine ok(!p__iswctype_l(c, _BLANK, NULL), "tab shouldn't be blank\n"); - else + } else { + ok(p_iswctype(c, _BLANK), "%d should be blank\n", c); ok(p__iswctype_l(c, _BLANK, NULL), "%d should be blank\n", c); + } ok(p_iswblank(c), "%d should be blank\n", c); ok(p__iswblank_l(c, NULL), "%d should be blank\n", c); } else { todo_wine_if(c == 0xa0) { + ok(!p_iswctype(c, _BLANK), "%d shouldn't be blank\n", c); ok(!p__iswctype_l(c, _BLANK, NULL), "%d shouldn't be blank\n", c); ok(!p_iswblank(c), "%d shouldn't be blank\n", c); ok(!p__iswblank_l(c, NULL), "%d shouldn't be blank\n", c); -- 2.23.0

3 8

[PATCH 1/3] user32/tests: Add control color tests.
by Jeff Smith 21 Jan '20

21 Jan '20

Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> --- A question I have with this patchset is where this test should go. I currently have it as a new test, but I could make it work as part of the static test (though my test does cover buttons as well). dlls/user32/tests/Makefile.in | 1 + dlls/user32/tests/colormsg.c | 203 ++++++++++++++++++++++++++++++++++ 2 files changed, 204 insertions(+) create mode 100644 dlls/user32/tests/colormsg.c diff --git a/dlls/user32/tests/Makefile.in b/dlls/user32/tests/Makefile.in index dd101d69f3..38f1572cbb 100644 --- a/dlls/user32/tests/Makefile.in +++ b/dlls/user32/tests/Makefile.in @@ -5,6 +5,7 @@ C_SRCS = \ broadcast.c \ class.c \ clipboard.c \ + colormsg.c \ combo.c \ cursoricon.c \ dce.c \ diff --git a/dlls/user32/tests/colormsg.c b/dlls/user32/tests/colormsg.c new file mode 100644 index 0000000000..69566a6545 --- /dev/null +++ b/dlls/user32/tests/colormsg.c @@ -0,0 +1,203 @@ +/* Unit test suite for control coloring via messages. + * + * Copyright 2019 Jeff Smith + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> +#include <stdio.h> + +#define STRICT +#define WIN32_LEAN_AND_MEAN +#include <windows.h> + +#include "wine/test.h" + +#define CTRL_ID 1995 + +struct color_values +{ + HBRUSH brush; + COLORREF brushcolor; + COLORREF altbrushcolor; + COLORREF pencolor; + COLORREF textcolor; + COLORREF bkcolor; + int bkmode; +} *color_test = NULL; + +UINT msg_expect; + +static HWND hMainWnd; + +static HWND build_child(const char *class, DWORD style) +{ + return CreateWindowA(class, "Test", WS_VISIBLE|WS_CHILD|style, 5, 5, 100, 100, hMainWnd, (HMENU)CTRL_ID, NULL, 0); +} + +static LRESULT CALLBACK WndProc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) +{ + switch (msg) + { + case WM_CTLCOLORBTN: + case WM_CTLCOLORSTATIC: + if (color_test) + ok(msg == msg_expect, "Expected message %#x got %#x\n", msg, msg_expect); + if (msg == msg_expect && color_test && color_test->brush != (HBRUSH)-1) + { + HDC hdc = (HDC)wparam; + if (color_test->bkmode) + SetBkMode(hdc, color_test->bkmode); + if (color_test->altbrushcolor != CLR_INVALID) + SetDCBrushColor(hdc, color_test->altbrushcolor); + if (color_test->pencolor != CLR_INVALID) + SetDCPenColor(hdc, color_test->pencolor); + if (color_test->textcolor != CLR_INVALID) + SetTextColor(hdc, color_test->textcolor); + if (color_test->bkcolor != CLR_INVALID) + SetBkColor(hdc, color_test->bkcolor); + if (color_test->brush == NULL && color_test->brushcolor != CLR_INVALID) + color_test->brush = CreateSolidBrush(color_test->brushcolor); + return (LRESULT)color_test->brush; + } + } + + return DefWindowProcA(hwnd, msg, wparam, lparam); +} + +static void test_style_message(const char *class, int style, LONG inside_x, LONG inside_y) +{ +#define INV CLR_INVALID + struct color_values tests[] = + { + /* WndProc will return NULL */ + {NULL, INV, INV, INV, INV, INV}, + /* WndProc will return non-object */ + {(HBRUSH)(COLOR_HIGHLIGHT+1), INV, INV, INV, INV, INV}, + /* WndProc will return object */ + {NULL, RGB(255,0,0), INV, INV, INV, INV}, + {NULL, RGB(255,0,0), INV, INV, INV, INV, TRANSPARENT}, + {NULL, RGB(255,0,0), RGB(0,255,0), RGB(0,0,255), RGB(255,255,0), + RGB(255,0,255)}, + {NULL, RGB(255,0,0), RGB(0,255,0), RGB(0,0,255), RGB(255,255,0), + RGB(255,0,255), TRANSPARENT}, + }; +#undef INV + COLORREF icolor0, ocolor0; + COLORREF icolor_exp, ocolor_exp; + POINT ptOutside = {90, 90}; + HWND hChild; + HDC hdc; + int i; + + int is_simple = !strcmp(class,"static") && style == SS_SIMPLE; + int is_groupbox = !strcmp(class,"button") && style == BS_GROUPBOX; + int is_pushbutton = !strcmp(class,"button") && + (style == BS_PUSHBUTTON || style == BS_DEFPUSHBUTTON || style == BS_USERBUTTON); + + hChild = build_child(class, style); + SetWindowTextA(hChild, "____"); + msg_expect = is_pushbutton ? WM_CTLCOLORBTN : WM_CTLCOLORSTATIC; + + /* Get system colors for child window */ + InvalidateRect(hChild, NULL, FALSE); + UpdateWindow(hChild); + hdc = GetDC(hChild); + icolor0 = GetPixel(hdc, inside_x, inside_y); + ocolor0 = GetPixel(hdc, ptOutside.x, ptOutside.y); + ReleaseDC(hChild, hdc); + + ocolor_exp = (is_simple || is_groupbox) ? RGB(255, 255, 255) : icolor0; + ok(ocolor0 == ocolor_exp, "(%s,%#x) Expected color %#x outside text area, got %#x\n", + class, style, ocolor_exp, ocolor0); + + for (i = 0; i < ARRAY_SIZE(tests); i++) + { + COLORREF icolor, ocolor; + + /* Update child window with default colors */ + InvalidateRect(hChild, NULL, FALSE); + UpdateWindow(hChild); + + /* Update child window to exercise control color message */ + color_test = &tests[i]; + InvalidateRect(hChild, NULL, FALSE); + UpdateWindow(hChild); + color_test = NULL; + hdc = GetDC(hChild); + icolor = GetPixel(hdc, inside_x, inside_y); + ocolor = GetPixel(hdc, ptOutside.x, ptOutside.y); + ReleaseDC(hChild, hdc); + + icolor_exp = (tests[i].brushcolor == CLR_INVALID || is_pushbutton) ? icolor0 : + (is_simple && tests[i].bkmode == TRANSPARENT) ? icolor0 : + (tests[i].bkmode == TRANSPARENT) ? tests[i].brushcolor : + (tests[i].bkcolor != CLR_INVALID) ? tests[i].bkcolor : RGB(255, 255, 255); + ocolor_exp = (tests[i].brushcolor == CLR_INVALID || is_pushbutton || is_simple || + is_groupbox) ? ocolor0 : tests[i].brushcolor; + todo_wine_if(tests[i].brush != NULL && tests[i].brushcolor == CLR_INVALID && !is_pushbutton) + ok(icolor == icolor_exp, "(%s,%#x,%d) Expected color %#x inside text area, got %#x\n", + class, style, i, icolor_exp, icolor); + todo_wine_if(tests[i].brush != NULL && tests[i].brushcolor == CLR_INVALID && !is_pushbutton && + !is_simple && !is_groupbox) + ok(ocolor == ocolor_exp, "(%s,%#x,%d) Expected color %#x outside text area, got %#x\n", + class, style, i, ocolor_exp, ocolor); + } + DestroyWindow(hChild); +} + +START_TEST(colormsg) +{ + static const char szClassName[] = "testclass"; + WNDCLASSEXA wndclass; + + wndclass.cbSize = sizeof(wndclass); + wndclass.style = CS_HREDRAW | CS_VREDRAW; + wndclass.lpfnWndProc = WndProc; + wndclass.cbClsExtra = 0; + wndclass.cbWndExtra = 0; + wndclass.hInstance = GetModuleHandleA(NULL); + wndclass.hIcon = LoadIconA(NULL, (LPCSTR)IDI_APPLICATION); + wndclass.hIconSm = LoadIconA(NULL, (LPCSTR)IDI_APPLICATION); + wndclass.hCursor = LoadCursorA(NULL, (LPCSTR)IDC_ARROW); + wndclass.hbrBackground = GetStockObject(WHITE_BRUSH); + wndclass.lpszClassName = szClassName; + wndclass.lpszMenuName = NULL; + RegisterClassExA(&wndclass); + + hMainWnd = CreateWindowA(szClassName, "Test", WS_OVERLAPPEDWINDOW, 0, 0, 500, 500, NULL, NULL, GetModuleHandleA(NULL), NULL); + ShowWindow(hMainWnd, SW_SHOW); + + test_style_message("static", SS_SIMPLE, 5, 5); + test_style_message("static", SS_LEFT, 5, 5); + test_style_message("static", SS_RIGHT, 95, 5); + test_style_message("static", SS_CENTER, 50, 5); + test_style_message("static", SS_LEFTNOWORDWRAP, 5, 5); + + test_style_message("button", BS_CHECKBOX, 25, 50); + test_style_message("button", BS_AUTOCHECKBOX, 25, 50); + test_style_message("button", BS_RADIOBUTTON, 25, 50); + test_style_message("button", BS_AUTORADIOBUTTON, 25, 50); + test_style_message("button", BS_3STATE, 25, 50); + test_style_message("button", BS_AUTO3STATE, 25, 50); + test_style_message("button", BS_GROUPBOX, 20, 5); + + test_style_message("button", BS_PUSHBUTTON, 50, 50); + test_style_message("button", BS_DEFPUSHBUTTON, 50, 50); + test_style_message("button", BS_USERBUTTON, 50, 50); + + DestroyWindow(hMainWnd); +} -- 2.23.0

2 5

[PATCH] winebus.sys: Don't return too early if SDL initialization succeeds
by Andrew Eikum 21 Jan '20

21 Jan '20

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- CCing Zeb as this was moved here in a60a014dc4f76f36031fa560531192ac9a335bf4. dlls/winebus.sys/main.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index 8bba9682023..2388033ceda 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -559,7 +559,10 @@ static NTSTATUS fdo_pnp_dispatch(DEVICE_OBJECT *device, IRP *irp) if (check_bus_option(&SDL_enabled, 1)) { if (sdl_driver_init() == STATUS_SUCCESS) - return STATUS_SUCCESS; + { + irp->IoStatus.u.Status = STATUS_SUCCESS; + break; + } } udev_driver_init(); iohid_driver_init(); -- 2.25.0

2 1

[PATCH] d3d9/tests: Add test for alpha to coverage.
by Paul Gofman 21 Jan '20

21 Jan '20

Related to https://bugs.winehq.org/show_bug.cgi?id=37073 Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- dlls/d3d9/tests/visual.c | 180 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 180 insertions(+) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 341b5ea517..c50508b009 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -26920,6 +26920,185 @@ static void test_sample_attached_rendertarget(void) DestroyWindow(window); } +static void test_alpha_to_coverage(void) +{ + static const struct + { + struct vec3 position; + struct vec2 texcoord; + } + quad[] = + { + {{-1.0f, -1.0f, 0.1f}, {0.0f, 0.0f}}, + {{-1.0f, 1.0f, 0.1f}, {0.0f, 1.0f}}, + {{ 1.0f, -1.0f, 0.1f}, {1.0f, 0.0f}}, + {{ 1.0f, 1.0f, 0.1f}, {1.0f, 1.0f}}, + }; + + IDirect3DSurface9 *rt, *ms_rt, *surface; + D3DADAPTER_IDENTIFIER9 identifier; + struct surface_readback rb; + IDirect3DTexture9 *texture; + IDirect3DDevice9 *device; + DWORD quality_levels; + BOOL nvidia_mode; + IDirect3D9 *d3d; + ULONG refcount; + DWORD colour; + HWND window; + HRESULT hr; + + window = create_window(); + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + + if (IDirect3D9_CheckDeviceMultiSampleType(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, + D3DFMT_A8R8G8B8, TRUE, D3DMULTISAMPLE_2_SAMPLES, &quality_levels) == D3DERR_NOTAVAILABLE) + { + skip("Multisampling not supported for D3DFMT_A8R8G8B8.\n"); + IDirect3D9_Release(d3d); + DestroyWindow(window); + return; + } + + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a 3D device.\n"); + IDirect3D9_Release(d3d); + DestroyWindow(window); + return; + } + + if (IDirect3D9_CheckDeviceFormat(d3d, 0, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, 0, + D3DRTYPE_SURFACE, MAKEFOURCC('A','T','O','C')) == D3D_OK) + { + /* ATOC pseudo format is introduced by Nvidia. Some Intel GPUs support + * alpha to coverage the same way as Nvidia. */ + nvidia_mode = TRUE; + } + else + { + nvidia_mode = FALSE; + hr = IDirect3D9_GetAdapterIdentifier(d3d, D3DADAPTER_DEFAULT, 0, &identifier); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + if (identifier.VendorId != 0x1002 /* AMD */) + { + skip("Alpha to coverage is not supported.\n"); + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D9_Release(d3d); + DestroyWindow(window); + return; + } + } + + hr = IDirect3DDevice9_CreateRenderTarget(device, 128, 128, + D3DFMT_A8R8G8B8, D3DMULTISAMPLE_NONE, 0, FALSE, &rt, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_CreateRenderTarget(device, 128, 128, + D3DFMT_A8R8G8B8, D3DMULTISAMPLE_2_SAMPLES, 0, FALSE, &ms_rt, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetRenderTarget(device, 0, ms_rt); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetDepthStencilSurface(device, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice9_CreateTexture(device, 128, 128, 1, D3DUSAGE_DYNAMIC, D3DFMT_A8R8G8B8, + D3DPOOL_DEFAULT, &texture, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DTexture9_GetSurfaceLevel(texture, 0, &surface); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice9_BeginScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + fill_surface(surface, 0xff2000ff, 0); + + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_LIGHTING, FALSE); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ZENABLE, FALSE); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffff0000, 0.0f, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_TEX1); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetTexture(device, 0, (IDirect3DBaseTexture9 *)texture); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, sizeof(quad[0])); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + if (nvidia_mode) + { + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ADAPTIVETESS_Y, MAKEFOURCC('A','T','O','C')); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + /* While undocumented, Nvidia also requires to enable alpha test to enable + * alpha to coverage. Intel does not. */ + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ALPHATESTENABLE, TRUE); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + } + else + { + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_POINTSIZE, MAKEFOURCC('A','2','M','1')); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + } + + fill_surface(surface, 0x40608000, 0); + + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, sizeof(quad[0])); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice9_StretchRect(device, ms_rt, NULL, rt, NULL, D3DTEXF_POINT); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + get_rt_readback(rt, &rb); + colour = get_readback_color(&rb, 64, 64); + + /* Nvidia is probably using some proprietary algorithm for averaging sample colour values. */ + todo_wine ok(color_match(colour, 0x9f404080, 1) || color_match(colour, 0x9f485cbc, 1) /* Nvidia */, + "Got unexpected colour %08x.\n", colour); + release_surface_readback(&rb); + + if (nvidia_mode) + { + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ADAPTIVETESS_Y, D3DFMT_UNKNOWN); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + } + else + { + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_POINTSIZE, MAKEFOURCC('A','2','M','0')); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + } + + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, sizeof(quad[0])); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice9_StretchRect(device, ms_rt, NULL, rt, NULL, D3DTEXF_POINT); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + get_rt_readback(rt, &rb); + colour = get_readback_color(&rb, 64, 64); + ok(colour == 0x40608000, "Got unexpected colour %08x.\n", colour); + release_surface_readback(&rb); + + hr = IDirect3DDevice9_EndScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + IDirect3DSurface9_Release(surface); + IDirect3DTexture9_Release(texture); + IDirect3DSurface9_Release(ms_rt); + IDirect3DSurface9_Release(rt); + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D9_Release(d3d); + DestroyWindow(window); +} + START_TEST(visual) { D3DADAPTER_IDENTIFIER9 identifier; @@ -27067,4 +27246,5 @@ START_TEST(visual) test_mismatched_sample_types(); test_draw_mapped_buffer(); test_sample_attached_rendertarget(); + test_alpha_to_coverage(); } -- 2.24.1

2 1

[PATCH] d2d1: Fix miter drawing for degenerated rectangles.
by Giovanni Mascellani 21 Jan '20

21 Jan '20

When a rectangle side has zero length, the miter join generator is confused because it cannot recover the join angle. This patch avoids that by using artificially non-degenerate previous and next vertices. Signed-off-by: Giovanni Mascellani <gio(a)debian.org> --- dlls/d2d1/geometry.c | 19 ++++++++++++++----- dlls/d2d1/tests/d2d1.c | 6 +++--- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index 6f4f4e5188..59f4e77d90 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -3789,7 +3789,7 @@ static const struct ID2D1RectangleGeometryVtbl d2d_rectangle_geometry_vtbl = HRESULT d2d_rectangle_geometry_init(struct d2d_geometry *geometry, ID2D1Factory *factory, const D2D1_RECT_F *rect) { struct d2d_face *f; - D2D1_POINT_2F *v; + D2D1_POINT_2F *v, v0p, v0n, v1p, v1n, v2p, v2n, v3p, v3n; float l, r, t, b; d2d_geometry_init(geometry, factory, &identity, (ID2D1GeometryVtbl *)&d2d_rectangle_geometry_vtbl); @@ -3818,6 +3818,15 @@ HRESULT d2d_rectangle_geometry_init(struct d2d_geometry *geometry, ID2D1Factory d2d_face_set(&f[1], 0, 2, 3); geometry->fill.face_count = 2; + d2d_point_set(&v0p, l+1.0f, t); + d2d_point_set(&v0n, l, t+1.0f); + d2d_point_set(&v1p, l, b-1.0f); + d2d_point_set(&v1n, l+1.0f, b); + d2d_point_set(&v2p, r-1.0f, b); + d2d_point_set(&v2n, r, b-1.0f); + d2d_point_set(&v3p, r, t+1.0f); + d2d_point_set(&v3n, r-1.0f, t); + if (!d2d_geometry_outline_add_line_segment(geometry, &v[0], &v[1])) goto fail; if (!d2d_geometry_outline_add_line_segment(geometry, &v[1], &v[2])) @@ -3827,13 +3836,13 @@ HRESULT d2d_rectangle_geometry_init(struct d2d_geometry *geometry, ID2D1Factory if (!d2d_geometry_outline_add_line_segment(geometry, &v[3], &v[0])) goto fail; - if (!d2d_geometry_outline_add_join(geometry, &v[3], &v[0], &v[1])) + if (!d2d_geometry_outline_add_join(geometry, &v0p, &v[0], &v0n)) goto fail; - if (!d2d_geometry_outline_add_join(geometry, &v[0], &v[1], &v[2])) + if (!d2d_geometry_outline_add_join(geometry, &v1p, &v[1], &v1n)) goto fail; - if (!d2d_geometry_outline_add_join(geometry, &v[1], &v[2], &v[3])) + if (!d2d_geometry_outline_add_join(geometry, &v2p, &v[2], &v2n)) goto fail; - if (!d2d_geometry_outline_add_join(geometry, &v[2], &v[3], &v[0])) + if (!d2d_geometry_outline_add_join(geometry, &v3p, &v[3], &v3n)) goto fail; return S_OK; diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 60dfb924cb..42cf524deb 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -5889,16 +5889,16 @@ static void test_draw_geometry(void) ok(match, "Figure does not match.\n"); match = compare_figure(surface, 0, 160, 160, 160, 0xff652e89, 0, "5mAUjAEUjAEUjAEUjAEUhmIA"); - todo_wine ok(match, "Figure does not match.\n"); + ok(match, "Figure does not match.\n"); match = compare_figure(surface, 160, 160, 160, 160, 0xff652e89, 0, "vmBkPGQ8ZDxkPGTeYQAA"); - todo_wine ok(match, "Figure does not match.\n"); + ok(match, "Figure does not match.\n"); match = compare_figure(surface, 320, 160, 160, 160, 0xff652e89, 0, "5i4UjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEU" "jAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEU" "jAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEU" "jAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEU" "jAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUhjAA"); - todo_wine ok(match, "Figure does not match.\n"); + ok(match, "Figure does not match.\n"); match = compare_figure(surface, 480, 160, 160, 160, 0xff652e89, 0, "vi5kPGQ8ZDxkPGQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8FDwU" "PBQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8" -- 2.25.0.rc2

2 1

[PATCH 1/3] ddraw/tests: Disable a test that causes heap corruption on some Nvidia (v2).
by Stefan Dösinger 21 Jan '20

21 Jan '20

Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com --- Version 2: Disable the test only on Nvidia and see if we run into problems elsewhere. The other parts of test_clipper_refcount appear to work fine on the affected system, including the invokation of Release() on a destroyed clipper and destroying the surface that has the destroyed clipper attached to it. --- dlls/ddraw/tests/ddraw1.c | 16 +++++++++++++--- dlls/ddraw/tests/ddraw2.c | 16 +++++++++++++--- dlls/ddraw/tests/ddraw4.c | 16 +++++++++++++--- dlls/ddraw/tests/ddraw7.c | 16 +++++++++++++--- 4 files changed, 52 insertions(+), 12 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index b513121fbbc..80c96fccc4c 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -12908,9 +12908,19 @@ static void test_clipper_refcount(void) IDirectDrawClipper_Release(clipper); IDirectDrawClipper_Release(clipper); - hr = IDirectDrawSurface_GetClipper(surface, &clipper2); - ok(SUCCEEDED(hr), "Failed to get clipper, hr %#x.\n", hr); - ok(clipper == clipper2, "Got clipper %p, expected %p.\n", clipper2, clipper); + if (!ddraw_is_nvidia(ddraw)) + { + /* Disabled because it causes heap corruption (HeapValidate fails and random + * hangs in a later HeapFree) on Windows on one of my Machines: MacbookPro 10,1 + * running Windows 10 18363.535 and Nvidia driver 425.31. Driver version 441.66 + * is affected too. + * + * The same Windows and driver versions run the test without heap corruption on + * a Geforce 1060 GTX card. I have not seen the problem on AMD GPUs either. */ + hr = IDirectDrawSurface_GetClipper(surface, &clipper2); + ok(SUCCEEDED(hr), "Failed to get clipper, hr %#x.\n", hr); + ok(clipper == clipper2, "Got clipper %p, expected %p.\n", clipper2, clipper); + } /* Show that invoking the Release method does not crash, but don't get the * vtable through the clipper pointer because it is no longer pointing to diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 541362c7488..00937fd0a7c 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -13734,9 +13734,19 @@ static void test_clipper_refcount(void) IDirectDrawClipper_Release(clipper); IDirectDrawClipper_Release(clipper); - hr = IDirectDrawSurface_GetClipper(surface, &clipper2); - ok(SUCCEEDED(hr), "Failed to get clipper, hr %#x.\n", hr); - ok(clipper == clipper2, "Got clipper %p, expected %p.\n", clipper2, clipper); + if (!ddraw_is_nvidia(ddraw)) + { + /* Disabled because it causes heap corruption (HeapValidate fails and random + * hangs in a later HeapFree) on Windows on one of my Machines: MacbookPro 10,1 + * running Windows 10 18363.535 and Nvidia driver 425.31. Driver version 441.66 + * is affected too. + * + * The same Windows and driver versions run the test without heap corruption on + * a Geforce 1060 GTX card. I have not seen the problem on AMD GPUs either. */ + hr = IDirectDrawSurface_GetClipper(surface, &clipper2); + ok(SUCCEEDED(hr), "Failed to get clipper, hr %#x.\n", hr); + ok(clipper == clipper2, "Got clipper %p, expected %p.\n", clipper2, clipper); + } /* Show that invoking the Release method does not crash, but don't get the * vtable through the clipper pointer because it is no longer pointing to diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 8cadfae52a0..29d72dfbbae 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -16386,9 +16386,19 @@ static void test_clipper_refcount(void) IDirectDrawClipper_Release(clipper); IDirectDrawClipper_Release(clipper); - hr = IDirectDrawSurface4_GetClipper(surface, &clipper2); - ok(SUCCEEDED(hr), "Failed to get clipper, hr %#x.\n", hr); - ok(clipper == clipper2, "Got clipper %p, expected %p.\n", clipper2, clipper); + if (!ddraw_is_nvidia(ddraw)) + { + /* Disabled because it causes heap corruption (HeapValidate fails and random + * hangs in a later HeapFree) on Windows on one of my Machines: MacbookPro 10,1 + * running Windows 10 18363.535 and Nvidia driver 425.31. Driver version 441.66 + * is affected too. + * + * The same Windows and driver versions run the test without heap corruption on + * a Geforce 1060 GTX card. I have not seen the problem on AMD GPUs either. */ + hr = IDirectDrawSurface4_GetClipper(surface, &clipper2); + ok(SUCCEEDED(hr), "Failed to get clipper, hr %#x.\n", hr); + ok(clipper == clipper2, "Got clipper %p, expected %p.\n", clipper2, clipper); + } /* Show that invoking the Release method does not crash, but don't get the * vtable through the clipper pointer because it is no longer pointing to diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index f4a709711b0..20a1bc5f3af 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -16290,9 +16290,19 @@ static void test_clipper_refcount(void) IDirectDrawClipper_Release(clipper); IDirectDrawClipper_Release(clipper); - hr = IDirectDrawSurface7_GetClipper(surface, &clipper2); - ok(SUCCEEDED(hr), "Failed to get clipper, hr %#x.\n", hr); - ok(clipper == clipper2, "Got clipper %p, expected %p.\n", clipper2, clipper); + if (!ddraw_is_nvidia(ddraw)) + { + /* Disabled because it causes heap corruption (HeapValidate fails and random + * hangs in a later HeapFree) on Windows on one of my Machines: MacbookPro 10,1 + * running Windows 10 18363.535 and Nvidia driver 425.31. Driver version 441.66 + * is affected too. + * + * The same Windows and driver versions run the test without heap corruption on + * a Geforce 1060 GTX card. I have not seen the problem on AMD GPUs either. */ + hr = IDirectDrawSurface7_GetClipper(surface, &clipper2); + ok(SUCCEEDED(hr), "Failed to get clipper, hr %#x.\n", hr); + ok(clipper == clipper2, "Got clipper %p, expected %p.\n", clipper2, clipper); + } /* Show that invoking the Release method does not crash, but don't get the * vtable through the clipper pointer because it is no longer pointing to -- 2.24.1

4 7

[PATCH v2] ddraw/tests: Fix some test failures.
by Zebediah Figura 21 Jan '20

21 Jan '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48150 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ddraw/tests/ddraw2.c | 9 ++++++--- dlls/ddraw/tests/ddraw4.c | 6 ++++-- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 541362c748..a2a27d86f0 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -1010,9 +1010,12 @@ static void test_coop_level_d3d_state(void) hr = IDirect3DDevice2_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, D3DVT_LVERTEX, quad, ARRAY_SIZE(quad), 0); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice2_EndScene(device); - ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); - color = get_surface_color(rt, 320, 240); - ok(compare_color(color, 0x0000ff80, 1), "Got unexpected color 0x%08x.\n", color); + ok(hr == DD_OK || broken(ddraw_is_warp(ddraw) && hr == DDERR_SURFACELOST), "Got unexpected hr %#x.\n", hr); + if (hr == DD_OK) + { + color = get_surface_color(rt, 320, 240); + ok(compare_color(color, 0x0000ff80, 1), "Got unexpected color 0x%08x.\n", color); + } destroy_viewport(device, viewport); destroy_material(background); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 8cadfae52a..77cf6f4511 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -1171,7 +1171,6 @@ static void test_coop_level_d3d_state(void) ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); hr = IDirectDraw4_RestoreAllSurfaces(ddraw); ok(SUCCEEDED(hr), "Failed to restore surfaces, hr %#x.\n", hr); - IDirectDraw4_Release(ddraw); hr = IDirect3DDevice3_GetRenderTarget(device, &surface); ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); @@ -1197,12 +1196,15 @@ static void test_coop_level_d3d_state(void) hr = IDirect3DDevice3_EndScene(device); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); color = get_surface_color(rt, 320, 240); - ok(compare_color(color, 0x0000ff80, 1), "Got unexpected color 0x%08x.\n", color); + ok(compare_color(color, 0x0000ff80, 1) + || broken(ddraw_is_warp(ddraw) && compare_color(color, 0x0000ff00, 0)), + "Got unexpected color 0x%08x.\n", color); destroy_viewport(device, viewport); IDirectDrawSurface4_Release(surface); IDirectDrawSurface4_Release(rt); IDirect3DDevice3_Release(device); + IDirectDraw4_Release(ddraw); DestroyWindow(window); } -- 2.24.1

3 2

[PATCH] testbot/Submit: Ensure the staged patch can be cleaned up if submit fails.
by Francois Gouget 21 Jan '20

21 Jan '20

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- Janitor now reports errors to the TestBot administrators and it has been reporting an unexpected staging file called 'e4b15422eaed510e12c4cd7735335c41gdi32_test.exe'. That file got created by the Submit script on the 30th of December but should not have stayed there. What normally happens is this: 1. The uploaded patch or executable is saved in the staging directory as '<sessionid>-websubmit_<filename>'. 2. When the user clicks on the Submit button the file is renamed to '<rnd><filename'. This is how the file above got there. 3. Then the Submit script creates the new job and if that fails it renames the file back. 4. Otherwise, once the job id is known, it renames the file again to '<jobid>_<filename>'. 5. Later on the Engine picks up the new job and sets it up which involves moving the file out of the directory and to the job's directory. So something wrong happened between steps 2 and 4 but did not trigger the step 3 rollback. The most likely culprit is a Perl error. In the web server log I found a couple of 'Undefined subroutine &WineTestBot::Jobs::CreatePatches' errors that typically happen when Apache needs to be restarted after a TestBot code update. This is likely to be the reason for this issue. So this patch renames the step 2 file so Janitor can identify it and automatically clean it up. testbot/bin/Janitor.pl | 2 +- testbot/web/Submit.pl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/bin/Janitor.pl b/testbot/bin/Janitor.pl index f78c75d72e..121a3a6066 100755 --- a/testbot/bin/Janitor.pl +++ b/testbot/bin/Janitor.pl @@ -271,7 +271,7 @@ if (opendir(my $dh, "$DataDir/staging")) my $Age = int((-M $FileName) + 0.5); my $TTL = $JobPurgeDays ? $JobPurgeDays - $Age : undef; - if ($Entry =~ /^[0-9a-f]{32}-websubmit_/) + if ($Entry =~ /^[0-9a-f]{32}-websubmit2?_/) { # These files always expire after one day $TTL = 1 - $Age; diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index bd3dc9fe13..1943b426e9 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -1292,7 +1292,7 @@ sub OnSubmit($) # Rename the staging file to avoid race conditions if the user clicks on # Submit multiple times my $OldStaging = $self->_GetStagingFilePath(); - my $Staging = CreateNewLink($OldStaging, "$DataDir/staging", $self->{FileName}); + my $Staging = CreateNewLink($OldStaging, "$DataDir/staging", "-websubmit2_$self->{FileName}"); if (!defined $Staging) { $self->{ErrMessage} = "Could not rename '$self->{FileName}': $!"; -- 2.20.1

1 0

[PATCH 1/2] kernelbase: Don't return ERROR_INSUFFICIENT_BUFFER from GetEnvironmentVariableW.
by Vladimir Panteleev 20 Jan '20

20 Jan '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48471 Signed-off-by: Vladimir Panteleev <git(a)vladimir.panteleev.md> --- dlls/kernelbase/process.c | 3 +- dlls/kernelbase/tests/Makefile.in | 1 + dlls/kernelbase/tests/process.c | 52 +++++++++++++++++++++++++++++++ 3 files changed, 55 insertions(+), 1 deletion(-) create mode 100644 dlls/kernelbase/tests/process.c diff --git a/dlls/kernelbase/process.c b/dlls/kernelbase/process.c index a07dddb1fc..788f03f220 100644 --- a/dlls/kernelbase/process.c +++ b/dlls/kernelbase/process.c @@ -1274,7 +1274,8 @@ DWORD WINAPI DECLSPEC_HOTPATCH GetEnvironmentVariableW( LPCWSTR name, LPWSTR val status = RtlQueryEnvironmentVariable_U( NULL, &us_name, &us_value ); len = us_value.Length / sizeof(WCHAR); - if (!set_ntstatus( status )) return (status == STATUS_BUFFER_TOO_SMALL) ? len + 1 : 0; + if (status == STATUS_BUFFER_TOO_SMALL) return len + 1; + if (!set_ntstatus( status )) return 0; if (size) val[len] = 0; return len; } diff --git a/dlls/kernelbase/tests/Makefile.in b/dlls/kernelbase/tests/Makefile.in index 22e4a17a58..4c90809012 100644 --- a/dlls/kernelbase/tests/Makefile.in +++ b/dlls/kernelbase/tests/Makefile.in @@ -2,4 +2,5 @@ TESTDLL = kernelbase.dll C_SRCS = \ path.c \ + process.c \ sync.c diff --git a/dlls/kernelbase/tests/process.c b/dlls/kernelbase/tests/process.c new file mode 100644 index 0000000000..24ab2c4b71 --- /dev/null +++ b/dlls/kernelbase/tests/process.c @@ -0,0 +1,52 @@ +/* + * Process tests for kernelbase.dll + * + * Copyright 2020 Vladimir Panteleev + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> +#include <windef.h> +#include <winbase.h> +#include <stdlib.h> +#include <winerror.h> + +#include "wine/test.h" + +static DWORD (WINAPI *pGetEnvironmentVariableW)(LPCWSTR, LPWSTR, DWORD); +static BOOL (WINAPI *pSetEnvironmentVariableW)(LPCWSTR, LPCWSTR); + +static void test_GetEnvironmentVariableW(void) +{ + DWORD gle; + + pSetEnvironmentVariableW(L"TESTVAR", L"abc"); + SetLastError(0xdeadbeef); + pGetEnvironmentVariableW(L"TESTVAR", NULL, 0); + gle = GetLastError(); + ok(gle == 0xdeadbeef, "got %d\n", gle); +} + +START_TEST(process) +{ + HMODULE hmod; + + hmod = LoadLibraryA("kernelbase.dll"); + pGetEnvironmentVariableW = (void *)GetProcAddress(hmod, "GetEnvironmentVariableW"); + pSetEnvironmentVariableW = (void *)GetProcAddress(hmod, "SetEnvironmentVariableW"); + + test_GetEnvironmentVariableW(); +} -- 2.25.0

4 6

[PATCH] testbot/UpdateTaskLogs: Delete or recreate files derived from task logs.
by Francois Gouget 20 Jan '20

20 Jan '20

UpdateTaskLogs can rebuild the reference WineTest reports used for the detection of new failures, and the .err files that store extra errors. The reference reports are created from the reports of the WineTest tasks, based on their completion time. Note that it is not possible to recreate reference reports for tasks that are older than the first completed WineTest task. But such issues should go away when these tasks get expired on the next day. This allows fixing up the reference reports after an upgrade or a downgrade. For instance for a downgrade one could run 'UpdateTaskLogs --delete' first to delete files specific to the new code, then downgrade and run 'UpdateTaskLogs' to regenerate the files needed by the old code. Note however that this does not undo any rename operations done when upgrading. Those would need to be reverted by hand. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/UpdateTaskLogs | 468 +++++++++++++++++++++++++++++++++++++ 1 file changed, 468 insertions(+) create mode 100755 testbot/bin/UpdateTaskLogs diff --git a/testbot/bin/UpdateTaskLogs b/testbot/bin/UpdateTaskLogs new file mode 100755 index 0000000000..ae3b305388 --- /dev/null +++ b/testbot/bin/UpdateTaskLogs @@ -0,0 +1,468 @@ +#!/usr/bin/perl -Tw +# -*- Mode: Perl; perl-indent-level: 2; indent-tabs-mode: nil -*- +# +# Updates or recreates the reference reports for the specified tasks and the +# latest directory. +# +# Copyright 2019 Francois Gouget +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + +use strict; + +sub BEGIN +{ + if ($0 !~ m=^/=) + { + # Turn $0 into an absolute path so it can safely be used in @INC + require Cwd; + $0 = Cwd::cwd() . "/$0"; + } + if ($0 =~ m=^(/.*)/[^/]+/[^/]+$=) + { + $::RootDir = $1; + unshift @INC, "$::RootDir/lib"; + } +} +my $Name0 = $0; +$Name0 =~ s+^.*/++; + + +use File::Basename; + +use WineTestBot::Config; +use WineTestBot::Jobs; +use WineTestBot::Log; +use WineTestBot::LogUtils; + + +# +# Logging and error handling helpers +# + +my $Debug; +sub Debug(@) +{ + print STDERR @_ if ($Debug); +} + +my $LogOnly; +sub Error(@) +{ + print STDERR "$Name0:error: ", @_ if (!$LogOnly); + LogMsg @_; +} + + +# +# Setup and command line processing +# + +my $Usage; +sub ValidateNumber($$) +{ + my ($Name, $Value) = @_; + + # Validate and untaint the value + return $1 if ($Value =~ /^(\d+)$/); + Error "$Value is not a valid $Name\n"; + $Usage = 2; + return undef; +} + +my ($OptDelete, $OptRebuild, $OptJobId, $OptStepNo, $OptTaskNo); +while (@ARGV) +{ + my $Arg = shift @ARGV; + if ($Arg eq "--delete") + { + $OptDelete = 1; + } + elsif ($Arg eq "--rebuild") + { + $OptRebuild = 1; + } + elsif ($Arg eq "--debug") + { + $Debug = 1; + } + elsif ($Arg eq "--log-only") + { + $LogOnly = 1; + } + elsif ($Arg =~ /^(?:-\?|-h|--help)$/) + { + $Usage = 0; + last; + } + elsif ($Arg =~ /^-/) + { + Error "unknown option '$Arg'\n"; + $Usage = 2; + last; + } + elsif (!defined $OptJobId) + { + $OptJobId = ValidateNumber('job id', $Arg); + } + elsif (!defined $OptStepNo) + { + $OptStepNo = ValidateNumber('step number', $Arg); + } + elsif (!defined $OptTaskNo) + { + $OptTaskNo = ValidateNumber('task number', $Arg); + } + else + { + Error "unexpected argument '$Arg'\n"; + $Usage = 2; + last; + } +} + +# Check parameters +if (!defined $Usage) +{ + if ($OptDelete and $OptRebuild) + { + Error "--delete and --rebuild are mutually exclusive\n"; + $Usage = 2; + } +} +if (defined $Usage) +{ + print "Usage: $Name0 [--rebuild] [--log-only] [--debug] [--help] [JOBID [STEPNO [TASKNO]]]\n"; + print "\n"; + print "Deletes, upgrades or recreates the reference reports and .err files for the specified tasks and the latest directory.\n"; + print "\n"; + print "Where:\n"; + print " --delete Delete generated files of both the latest directory and the\n"; + print " tasks.\n"; + print " --rebuild Delete and recreate the generated files of both the latest\n"; + print " directory and the tasks from the reports of the WineTest tasks,\n"; + print " based on their completion time. For tasks older than the first\n"; + print " completed WineTest task, the individual tasks' reference\n"; + print " reports are preserved. If these tasks don't have reference\n"; + print " reports, an error is shown.\n"; + print " Without this option only the missing reference reports and\n"; + print " .err files are added.\n"; + print " JOBID STEPNO TASKNO Only the tasks matching the specified JOBID, STEPNO and\n"; + print " TASKNO will be modified.\n"; + print " --log-only Only print errors to the log. By default they also go to stderr.\n"; + print " --debug Print additional debugging information.\n"; + print " --help Shows this usage message.\n"; + + exit $Usage; +} + +sub TaskKeyStr($) +{ + my ($Task) = @_; + return join("/", @{$Task->GetMasterKey()}); +} + +sub Path2TaskKey($) +{ + my ($Path) = @_; + + return "latest" if (!defined $Path); + return "latest" if ($Path =~ m~/latest(?:/|$)~); + $Path =~ s~^.*/jobs/(\d+/\d+/\d+)(/.*)?$~$1~; + return $Path; +} + +sub BuildErrFile($$$$) +{ + my ($Dir, $ReportName, $IsWineTest, $TaskTimedOut) = @_; + + my $TaskKey = Path2TaskKey($Dir); + + my ($TestUnitCount, $TimeoutCount, $LogFailures, $LogErrors) = ParseWineTestReport("$Dir/$ReportName", $IsWineTest, $TaskTimedOut); + if (!defined $LogFailures and @$LogErrors == 1) + { + return "Unable to open '$TaskKey/$ReportName' for reading: $!"; + } + return undef if (!@$LogErrors); + + Debug("$TaskKey: Creating $ReportName.err\n"); + if (open(my $Log, ">", "$Dir/$ReportName.err")) + { + # Save the extra errors detected by ParseWineTestReport() in + # $ReportName.err (see WineRunWineTest.pl). + print $Log "$_\n" for (@$LogErrors); + close($Log); + return undef; + } + return "Unable to open '$TaskKey/$ReportName' for reading: $!"; +} + +# Maps the reference report name to its full pathname. +# Note that the file may not be in latest/. +my %LatestReports; + +# The set of latest/ reference report files to rebuild. +my %LatestRebuilds; + +sub DoUpdateLatestReport($$$) +{ + my ($Task, $ReportName, $SrcReportPath) = @_; + + my $RefReportName = $Task->GetRefReportName($ReportName); + my $LatestReportPath = "$DataDir/latest/$RefReportName"; + if (!defined $OptJobId and !$OptDelete and !-f $LatestReportPath) + { + $LatestRebuilds{$RefReportName} = 1; + } + + my $Rc = 0; + if ($LatestRebuilds{$RefReportName}) + { + # Add the reference report to latest/ + Debug("latest: Adding $RefReportName from ". Path2TaskKey($SrcReportPath) ."\n"); + + foreach my $Suffix ("", ".err") + { + unlink("$LatestReportPath$Suffix"); + if (-f "$SrcReportPath$Suffix" and + !link("$SrcReportPath$Suffix", "$LatestReportPath$Suffix")) + { + Error "Could not replace 'latest/$RefReportName$Suffix': $!\n"; + $Rc = 1; + } + } + $LatestReports{$RefReportName} = $LatestReportPath; + } + # else only add task reports, not their own reference reports + elsif ($SrcReportPath =~ m~/\Q$ReportName\E$~) + { + $LatestReports{$RefReportName} = $SrcReportPath; + } + return $Rc; +} + +sub ProcessTaskLogs($$$) +{ + my ($Step, $Task, $CollectOnly) = @_; + + my $Rc = 0; + my $StepDir = $Step->GetDir(); + my $TaskDir = $Task->GetDir(); + + if (($OptDelete or $OptRebuild) and !$CollectOnly) + { + # Save / delete the task's reference reports + foreach my $ReportName (@{GetLogFileNames($TaskDir)}) + { + next if ($ReportName !~ /\.report$/); + + my $RefReportName = $Task->GetRefReportName($ReportName); + my $RefReportPath = "$StepDir/$RefReportName"; + + if (-f $RefReportPath or -f "$RefReportPath.err") + { + if (!-f "$RefReportPath.err") + { + # (Re)Build the .err file before adding the reference report to + # latest/. + my $ErrMessage = BuildErrFile($StepDir, $RefReportName, 1, 0); + if (defined $ErrMessage) + { + Error "$ErrMessage\n"; + $Rc = 1; + } + } + + # Save this report to latest/ in case it's not already present there + # (this would be the case for the oldest tasks with --rebuild) + $Rc += DoUpdateLatestReport($Task, $ReportName, $RefReportPath); + + Debug(TaskKeyStr($Task) .": Deleting ../$RefReportName\n"); + } + foreach my $Suffix ("", ".err") + { + if (!unlink "$RefReportPath$Suffix" and -e "$RefReportPath$Suffix") + { + Error "Could not delete '$RefReportPath$Suffix': $!\n"; + $Rc = 1; + } + } + + next if (!-f "$TaskDir/$ReportName.err"); + Debug(TaskKeyStr($Task) .": Deleting $ReportName.err\n"); + if (!unlink "$TaskDir/$ReportName.err") + { + Error "Could not delete '$ReportName.err': $!\n"; + $Rc = 1; + } + } + } + + if (!$OptDelete and !$CollectOnly and $Task->Status eq "completed") + { + # Take a snapshot of the latest reference reports + foreach my $ReportName (@{GetLogFileNames($TaskDir)}) + { + next if ($ReportName !~ /\.report$/); + my $RefReportName = $Task->GetRefReportName($ReportName); + next if (-f "$StepDir/$RefReportName"); + + my $LatestReportPath = $LatestReports{$RefReportName}; + if (!defined $LatestReportPath) + { + Error TaskKeyStr($Task) .": Missing '$RefReportName' reference report\n"; + $Rc = 1; + } + else + { + Debug(TaskKeyStr($Task) .": Snapshotting $RefReportName from ". Path2TaskKey($LatestReportPath) ."\n"); + foreach my $Suffix ("", ".err") + { + unlink "$StepDir/$RefReportName$Suffix"; + if (-f "$LatestReportPath$Suffix" and + !link("$LatestReportPath$Suffix", "$StepDir/$RefReportName$Suffix")) + { + Error "Could not link '$RefReportName$Suffix': $!\n"; + $Rc = 1; + } + } + } + } + + # And (re)build the .err files + if ($Task->Status !~ /^(?:queued|running)$/) + { + my ($IsWineTest, $TaskTimedOut); + if ($Task->Started and $Task->Ended) + { + my $Duration = $Task->Ended - $Task->Started; + $TaskTimedOut = $Duration > $Task->Timeout; + $IsWineTest = ($Step->Type eq "patch" or $Step->Type eq "suite"); + } + foreach my $ReportName (@{GetLogFileNames($TaskDir)}) + { + next if ($ReportName !~ /\.report$/); + next if (-f "$TaskDir/$ReportName.err"); + my $ErrMessage = BuildErrFile($TaskDir, $ReportName, $IsWineTest, $TaskTimedOut); + if (defined $ErrMessage) + { + Error "$ErrMessage\n"; + $Rc = 1; + } + } + } + } + + if (!$OptDelete and $Task->Status eq "completed" and $Step->Type eq "suite") + { + # Update the latest reference reports + # WineTest runs that timed out are missing results which would cause false + # positives. So don't use them as reference results. Also note that + # WineTest tasks have a single WineTest run so a task timeout is the same + # as a WineTest timeout. + my $Duration = $Task->Ended - $Task->Started; + if ($Duration < $Task->Timeout) + { + foreach my $ReportName (@{GetLogFileNames($TaskDir)}) + { + next if ($ReportName !~ /\.report$/); + next if (-z "$TaskDir/$ReportName"); + $Rc += DoUpdateLatestReport($Task, $ReportName, "$TaskDir/$ReportName"); + } + } + } + + return $Rc; +} + +sub ProcessLatestReports() +{ + my $Rc = 0; + my $LatestGlob = "$DataDir/latest/*.report"; + + # Perform cleanups and updates + foreach my $LatestReportPath (glob("$LatestGlob $LatestGlob.err")) + { + my $RefReportName = basename($LatestReportPath); + # Keep the regexp in sync with WineTestBot::Task::GetRefReportName() + next if ($RefReportName !~ /^([a-zA-Z0-9_]+_[a-zA-Z0-9_]+\.report)(?:\.err)?$/); + $RefReportName = $1; # untaint + $LatestReportPath = "$DataDir/latest/$RefReportName"; + + if ($OptDelete or $OptRebuild) + { + # Delete the reports that should be deleted / rebuilt + foreach my $Suffix ("", ".err") + { + next if (!-f "$LatestReportPath$Suffix"); + Debug("latest: Deleting $RefReportName$Suffix\n"); + next if (unlink "$LatestReportPath$Suffix"); + Error "Could not delete '$LatestReportPath$Suffix': $!\n"; + $Rc = 1; + } + } + elsif (!-f "$LatestReportPath") + { + Debug("latest: Deleting orphaned $RefReportName.err\n"); + if (!unlink "$LatestReportPath.err") + { + Error "Could not delete orphaned '$LatestReportPath.err': $!\n"; + $Rc = 1; + } + } + elsif (!$OptDelete and !-f "$LatestReportPath.err") + { + # Build the missing .err file + my $ErrMessage = BuildErrFile("$DataDir/latest", $RefReportName, 1, 0); + if (defined $ErrMessage) + { + Error "$ErrMessage\n"; + $Rc = 1; + } + } + } + + return $Rc; +} + +my $Rc = 0; +$Rc = ProcessLatestReports() if (!defined $OptJobId); + +my @AllTasks; +foreach my $Job (@{CreateJobs()->GetItems()}) +{ + foreach my $Step (@{$Job->Steps->GetItems()}) + { + foreach my $Task (@{$Step->Tasks->GetItems()}) + { + push @AllTasks, $Task if ($Task->Status !~ /^(?:queued|running)$/); + } + } +} + +# Process the tasks in completion order so the reference logs +# are updated in the right order. +my $Jobs = CreateJobs(); +foreach my $Task (sort { ($a->Ended || 0) <=> ($b->Ended || 0) } @AllTasks) +{ + my ($JobId, $StepNo, $TaskNo) = @{$Task->GetMasterKey()}; + my $Step = $Jobs->GetItem($JobId)->Steps->GetItem($StepNo); + my $CollectOnly = ((defined $OptJobId and $OptJobId ne $JobId) or + (defined $OptStepNo and $OptStepNo ne $StepNo) or + (defined $OptTaskNo and $OptTaskNo ne $TaskNo)); + $Rc += ProcessTaskLogs($Step, $Task, $CollectOnly); +} + +exit $Rc ? 1 : 0; -- 2.20.1

1 0

[PATCH] testbot/LogUtils: Add _AddLogError() and _AddLogGroup().
by Francois Gouget 20 Jan '20

20 Jan '20

This simplifies registering an additional log error. Also rename _AddErrorGroup() to _AddLogGroup() to match. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/LogUtils.pm | 30 ++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 815e0d8dbb..c83b63d25d 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -675,7 +675,7 @@ sub _DumpErrors($$) } } -sub _AddErrorGroup($$) +sub _AddLogGroup($$) { my ($LogInfo, $GroupName) = @_; @@ -689,6 +689,14 @@ sub _AddErrorGroup($$) return $LogInfo->{ErrGroups}->{$GroupName}; } +sub _AddLogError($$$) +{ + my ($LogInfo, $ErrGroup, $Line) = @_; + + push @{$ErrGroup->{Errors}}, $Line; + $LogInfo->{ErrCount}++; +} + =pod =over 12 @@ -763,18 +771,16 @@ sub GetLogErrors($) } if (!$CurrentGroup) { - $CurrentGroup = _AddErrorGroup($LogInfo, $CurrentModule); + $CurrentGroup = _AddLogGroup($LogInfo, $CurrentModule); } - push @{$CurrentGroup->{Errors}}, $Line; - $LogInfo->{ErrCount}++; + _AddLogError($LogInfo, $CurrentGroup, $Line); } close($LogFile); } elsif (-f $LogFileName) { - my $Group = _AddErrorGroup($LogInfo, "TestBot errors"); - push @{$Group->{Errors}}, "Could not open '". basename($LogFileName) ."' for reading: $!"; - $LogInfo->{ErrCount}++; + my $Group = _AddLogGroup($LogInfo, "TestBot errors"); + _AddLogError($LogInfo, $Group, "Could not open '". basename($LogFileName) ."' for reading: $!"); } if (open(my $LogFile, "<", "$LogFileName.err")) @@ -790,18 +796,16 @@ sub GetLogErrors($) # Note: $GroupName must not depend on the previous content as this # would break diffs. my $GroupName = $IsReport ? "Report errors" : "Task errors"; - $CurrentGroup = _AddErrorGroup($LogInfo, $GroupName); + $CurrentGroup = _AddLogGroup($LogInfo, $GroupName); } - push @{$CurrentGroup->{Errors}}, $Line; - $LogInfo->{ErrCount}++; + _AddLogError($LogInfo, $CurrentGroup, $Line); } close($LogFile); } elsif (-f "$LogFileName.err") { - my $Group = _AddErrorGroup($LogInfo, "TestBot errors"); - push @{$Group->{Errors}}, "Could not open '". basename($LogFileName) .".err' for reading: $!"; - $LogInfo->{ErrCount}++; + my $Group = _AddLogGroup($LogInfo, "TestBot errors"); + _AddLogError($LogInfo, $Group, "Could not open '". basename($LogFileName) .".err' for reading: $!"); } return $LogInfo; -- 2.20.1

1 0

[PATCH] msvcrt/tests: Fix test failures on XP and 2003.
by Zhiyi Zhang 20 Jan '20

20 Jan '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- Fix test failures like https://test.winehq.org/data/02f3a133b64ed1f979309e1399738eaa2e204651/xp_fg… dlls/msvcrt/tests/string.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 440bed348a..30d346e303 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -648,11 +648,11 @@ static void test_strcmp(void) ret = p_strncmp( "abc", "abcd", 3 ); ok( ret == 0, "wrong ret %d\n", ret ); ret = p_strncmp( "", "abc", 3 ); - ok( ret == 0 - 'a', "wrong ret %d\n", ret ); + ok( ret == 0 - 'a' || ret < 0, "wrong ret %d\n", ret ); ret = p_strncmp( "abc", "ab\xa0", 4 ); - ok( ret == 'c' - 0xa0, "wrong ret %d\n", ret ); + ok( ret == 'c' - 0xa0 || ret < 0, "wrong ret %d\n", ret ); ret = p_strncmp( "ab\xb0", "ab\xa0", 3 ); - ok( ret == 0xb0 - 0xa0, "wrong ret %d\n", ret ); + ok( ret == 0xb0 - 0xa0 || ret > 0, "wrong ret %d\n", ret ); ret = p_strncmp( "ab\xb0", "ab\xa0", 2 ); ok( ret == 0, "wrong ret %d\n", ret ); ret = p_strncmp( "ab\xc2", "ab\xc2", 3 ); -- 2.20.1

2 1

[PATCH 1/2] winex11.drv: Use a helper to retrieve the decoration rect for managed windows.
by Gabriel Ivăncescu 20 Jan '20

20 Jan '20

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- This simplifies the next patch and avoids duplicating code. dlls/winex11.drv/window.c | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 99e4094..5b35e03 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1153,18 +1153,15 @@ void make_window_embedded( struct x11drv_win_data *data ) /*********************************************************************** - * X11DRV_window_to_X_rect - * - * Convert a rect from client to X window coordinates + * get_decoration_rect */ -static void X11DRV_window_to_X_rect( struct x11drv_win_data *data, RECT *rect ) +static void get_decoration_rect( struct x11drv_win_data *data, RECT *rect ) { DWORD style, ex_style, style_mask = 0, ex_style_mask = 0; unsigned long decor; - RECT rc; + SetRectEmpty( rect ); if (!data->managed) return; - if (IsRectEmpty( rect )) return; style = GetWindowLongW( data->hwnd, GWL_STYLE ); ex_style = GetWindowLongW( data->hwnd, GWL_EXSTYLE ); @@ -1177,9 +1174,22 @@ static void X11DRV_window_to_X_rect( struct x11drv_win_data *data, RECT *rect ) ex_style_mask |= WS_EX_DLGMODALFRAME; } - SetRectEmpty( &rc ); - AdjustWindowRectEx( &rc, style & style_mask, FALSE, ex_style & ex_style_mask ); + AdjustWindowRectEx( rect, style & style_mask, FALSE, ex_style & ex_style_mask ); +} + + +/*********************************************************************** + * X11DRV_window_to_X_rect + * + * Convert a rect from client to X window coordinates + */ +static void X11DRV_window_to_X_rect( struct x11drv_win_data *data, RECT *rect ) +{ + RECT rc; + + if (IsRectEmpty( rect )) return; + get_decoration_rect( data, &rc ); rect->left -= rc.left; rect->right -= rc.right; rect->top -= rc.top; -- 2.21.0

1 1

[PATCH 1/8] user32: Fix some spec file entries
by André Hentschel 20 Jan '20

20 Jan '20

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/user32/user32.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 1aedc32de28..6d24550d19f 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -10,7 +10,7 @@ @ stdcall AnyPopup() @ stdcall AppendMenuA(long long long ptr) @ stdcall AppendMenuW(long long long ptr) -@ stdcall AreDpiAwarenessContextsEqual(long long) +@ stdcall AreDpiAwarenessContextsEqual(ptr ptr) @ stdcall ArrangeIconicWindows(long) @ stdcall AttachThreadInput(long long long) @ stdcall BeginDeferWindowPos(long) @@ -256,7 +256,7 @@ @ stdcall GetAppCompatFlags2(long) @ stdcall GetAsyncKeyState(long) @ stdcall GetAutoRotationState(ptr) -@ stdcall GetAwarenessFromDpiAwarenessContext(long) +@ stdcall GetAwarenessFromDpiAwarenessContext(ptr) @ stdcall GetCapture() @ stdcall GetCaretBlinkTime() @ stdcall GetCaretPos(ptr) @@ -472,7 +472,7 @@ @ stdcall IsRectEmpty(ptr) # @ stub IsServerSideWindow @ stdcall IsTouchWindow(long ptr) -@ stdcall IsValidDpiAwarenessContext(long) +@ stdcall IsValidDpiAwarenessContext(ptr) @ stdcall IsWinEventHookInstalled(long) @ stdcall IsWindow(long) @ stdcall IsWindowEnabled(long) @@ -687,7 +687,7 @@ @ stdcall SetPhysicalCursorPos(long long) @ stdcall SetProcessDPIAware() @ stdcall SetProcessDefaultLayout(long) -@ stdcall SetProcessDpiAwarenessContext(long) +@ stdcall SetProcessDpiAwarenessContext(ptr) @ stdcall SetProcessDpiAwarenessInternal(long) @ stdcall SetProcessWindowStation(long) @ stdcall SetProgmanWindow (long) -- 2.17.1

3 2

[PATCH] vulkan-1/tests: Fix some test failures.
by Zhiyi Zhang 20 Jan '20

20 Jan '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- Fix test failures like https://test.winehq.org/data/02f3a133b64ed1f979309e1399738eaa2e204651/win10… dlls/vulkan-1/tests/vulkan.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/vulkan-1/tests/vulkan.c b/dlls/vulkan-1/tests/vulkan.c index 9a93e2af6f..63fd48b33d 100644 --- a/dlls/vulkan-1/tests/vulkan.c +++ b/dlls/vulkan-1/tests/vulkan.c @@ -177,10 +177,9 @@ static void test_enumerate_physical_device2(void) ok(vr == VK_SUCCESS, "Got unexpected VkResult %d.\n", vr); vr = vkEnumeratePhysicalDevices(vk_instance, &count, NULL); - ok(vr == VK_SUCCESS, "Got unexpected VkResult %d.\n", vr); - if (!count) + if (vr || !count) { - skip("No physical devices.\n"); + skip("No physical devices. VkResult %d.\n", vr); vkDestroyInstance(vk_instance, NULL); return; } @@ -397,10 +396,9 @@ static void for_each_device(void (*test_func)(VkPhysicalDevice)) ok(vr == VK_SUCCESS, "Got unexpected VkResult %d.\n", vr); vr = vkEnumeratePhysicalDevices(vk_instance, &count, NULL); - ok(vr == VK_SUCCESS, "Got unexpected VkResult %d.\n", vr); - if (!count) + if (vr || !count) { - skip("No physical devices.\n"); + skip("No physical devices. VkResult %d.\n", vr); vkDestroyInstance(vk_instance, NULL); return; } -- 2.20.1

1 0

[PATCH] rasenh/tests: Fix a test failure.
by Zhiyi Zhang 20 Jan '20

20 Jan '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- Fix test failures like https://test.winehq.org/data/28ab23db56347f4e5c6c617ae35fbb6269f6e16a/win8_… dlls/rsaenh/tests/rsaenh.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index 3e782be279..3039971474 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -2388,8 +2388,11 @@ static void test_rsa_encrypt(void) /* It is not allowed to use the signature key for encryption/decryption */ result = CryptGetUserKey(hProv, AT_SIGNATURE, &hRSAKey); - ok (result, "%08x\n", GetLastError()); - if (!result) return; + if (!result) + { + skip("No signature key in provider %s found, error %#x.\n", szProviders[iProv], GetLastError()); + return; + } dwVal = 0xdeadbeef; dwLen = sizeof(DWORD); -- 2.20.1

1 0

[PATCH 8/8] ntdll: Fix some spec file entries
by André Hentschel 19 Jan '20

19 Jan '20

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/ntdll/ntdll.spec | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index fe36235bdad..920b996bffc 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -93,7 +93,7 @@ @ stdcall LdrGetProcedureAddress(ptr ptr long ptr) # @ stub LdrHotPatchRoutine @ stub LdrInitShimEngineDynamic -@ stdcall LdrInitializeThunk(ptr long long long) +@ stdcall LdrInitializeThunk(ptr ptr long long) @ stub LdrLoadAlternateResourceModule @ stdcall LdrLoadDll(wstr long ptr ptr) @ stdcall LdrLockLoaderLock(long ptr ptr) @@ -220,7 +220,7 @@ @ stdcall -norelay NtGetContextThread(long ptr) @ stdcall NtGetCurrentProcessorNumber() # @ stub NtGetDevicePowerState -@ stdcall NtGetNlsSectionPtr(long long long ptr ptr) +@ stdcall NtGetNlsSectionPtr(long long ptr ptr ptr) @ stub NtGetPlugPlayEvent @ stdcall NtGetTickCount() @ stdcall NtGetWriteWatch(long long ptr long ptr ptr ptr) @@ -579,7 +579,7 @@ @ stub RtlDeleteNoSplay @ stub RtlDeleteOwnersRanges @ stub RtlDeleteRange -@ stdcall RtlDeleteRegistryValue(long ptr ptr) +@ stdcall RtlDeleteRegistryValue(long wstr wstr) @ stdcall RtlDeleteResource(ptr) @ stdcall RtlDeleteSecurityObject(ptr) @ stdcall RtlDeleteTimer(ptr ptr ptr) @@ -872,7 +872,7 @@ @ stub RtlQueryProperties @ stub RtlQueryPropertyNames @ stub RtlQueryPropertySet -@ stdcall RtlQueryRegistryValues(long ptr ptr ptr ptr) +@ stdcall RtlQueryRegistryValues(long wstr ptr ptr ptr) @ stub RtlQuerySecurityObject @ stub RtlQueryTagHeap @ stdcall RtlQueryTimeZoneInformation(ptr) @@ -1037,7 +1037,7 @@ @ stdcall -arch=x86_64 RtlWow64GetThreadContext(long ptr) @ stdcall -arch=x86_64 RtlWow64SetThreadContext(long ptr) @ stub RtlWriteMemoryStream -@ stdcall RtlWriteRegistryValue(long ptr ptr long ptr long) +@ stdcall RtlWriteRegistryValue(long wstr wstr long ptr long) @ stub RtlZeroHeap @ stdcall RtlZeroMemory(ptr long) @ stdcall RtlZombifyActivationContext(ptr) @@ -1184,7 +1184,7 @@ @ stdcall -private -norelay ZwGetContextThread(long ptr) NtGetContextThread @ stdcall -private ZwGetCurrentProcessorNumber() NtGetCurrentProcessorNumber # @ stub ZwGetDevicePowerState -@ stdcall -private ZwGetNlsSectionPtr(long long long ptr ptr) NtGetNlsSectionPtr +@ stdcall -private ZwGetNlsSectionPtr(long long ptr ptr ptr) NtGetNlsSectionPtr @ stub ZwGetPlugPlayEvent @ stdcall -private ZwGetTickCount() NtGetTickCount @ stdcall -private ZwGetWriteWatch(long long ptr long ptr ptr ptr) NtGetWriteWatch @@ -1400,7 +1400,7 @@ @ cdecl -private -arch=i386 _CIpow() NTDLL__CIpow @ cdecl -private -arch=i386 _CIsin() NTDLL__CIsin @ cdecl -private -arch=i386 _CIsqrt() NTDLL__CIsqrt -@ stdcall -arch=x86_64 __C_specific_handler(ptr long ptr ptr) +@ stdcall -arch=x86_64 __C_specific_handler(ptr ptr ptr ptr) @ stdcall -private -arch=arm,x86_64 -norelay __chkstk() @ cdecl __isascii(long) NTDLL___isascii @ cdecl __iscsym(long) NTDLL___iscsym -- 2.17.1

2 1

[PATCH 6/8] oleaut32: Fix some spec file entries
by André Hentschel 19 Jan '20

19 Jan '20

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/oleaut32/oleaut32.spec | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/oleaut32/oleaut32.spec b/dlls/oleaut32/oleaut32.spec index cc18a04befe..82f6ea76642 100644 --- a/dlls/oleaut32/oleaut32.spec +++ b/dlls/oleaut32/oleaut32.spec @@ -15,8 +15,8 @@ 16 stdcall SafeArrayDestroy(ptr) 17 stdcall SafeArrayGetDim(ptr) 18 stdcall SafeArrayGetElemsize(ptr) -19 stdcall SafeArrayGetUBound(ptr long long) -20 stdcall SafeArrayGetLBound(ptr long long) +19 stdcall SafeArrayGetUBound(ptr long ptr) +20 stdcall SafeArrayGetLBound(ptr long ptr) 21 stdcall SafeArrayLock(ptr) 22 stdcall SafeArrayUnlock(ptr) 23 stdcall SafeArrayAccessData(ptr ptr) @@ -320,18 +320,18 @@ 330 stdcall VarDateFromUdate(ptr long ptr) 331 stdcall VarUdateFromDate(double long ptr) 332 stdcall GetAltMonthNames(long ptr) -333 stdcall VarI8FromUI1(long long) -334 stdcall VarI8FromI2(long long) -335 stdcall VarI8FromR4(float long) -336 stdcall VarI8FromR8(double long) +333 stdcall VarI8FromUI1(long ptr) +334 stdcall VarI8FromI2(long ptr) +335 stdcall VarI8FromR4(float ptr) +336 stdcall VarI8FromR8(double ptr) 337 stdcall VarI8FromCy(int64 ptr) -338 stdcall VarI8FromDate(double long) +338 stdcall VarI8FromDate(double ptr) 339 stdcall VarI8FromStr(wstr long long ptr) 340 stdcall VarI8FromDisp(ptr long ptr) -341 stdcall VarI8FromBool(long long) -342 stdcall VarI8FromI1(long long) -343 stdcall VarI8FromUI2(long long) -344 stdcall VarI8FromUI4(long long) +341 stdcall VarI8FromBool(long ptr) +342 stdcall VarI8FromI1(long ptr) +343 stdcall VarI8FromUI2(long ptr) +344 stdcall VarI8FromUI4(long ptr) 345 stdcall VarI8FromDec(ptr ptr) 346 stdcall VarI2FromI8(int64 ptr) 347 stdcall VarI2FromUI8(int64 ptr) @@ -409,7 +409,7 @@ 438 stdcall VarUI8FromI1(long ptr) 439 stdcall VarUI8FromUI2(long ptr) 440 stdcall VarUI8FromUI4(long ptr) -441 stdcall VarUI8FromDec(long ptr) +441 stdcall VarUI8FromDec(ptr ptr) 442 stdcall RegisterTypeLibForUser(ptr wstr wstr) 443 stdcall UnRegisterTypeLibForUser(ptr long long long long) -- 2.17.1

2 1

[PATCH 5/8] advapi32: Fix some spec file entries
by André Hentschel 19 Jan '20

19 Jan '20

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/advapi32/advapi32.spec | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index 5a4344852ee..d9bdccc69ed 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -91,7 +91,7 @@ # @ stub CancelOverlappedAccess @ stdcall ChangeServiceConfig2A(long long ptr) @ stdcall ChangeServiceConfig2W(long long ptr) -@ stdcall ChangeServiceConfigA(long long long long wstr str ptr str str str str) +@ stdcall ChangeServiceConfigA(long long long long str str ptr str str str str) @ stdcall ChangeServiceConfigW(long long long long wstr wstr ptr wstr wstr wstr wstr) # @ stub CheckForHiberboot @ stdcall -import CheckTokenMembership(long ptr ptr) @@ -129,8 +129,8 @@ # @ stub ConvertStringSDToSDRootDomainW @ stdcall ConvertStringSecurityDescriptorToSecurityDescriptorA(str long ptr ptr) @ stdcall ConvertStringSecurityDescriptorToSecurityDescriptorW(wstr long ptr ptr) -@ stdcall ConvertStringSidToSidA(ptr ptr) -@ stdcall ConvertStringSidToSidW(ptr ptr) +@ stdcall ConvertStringSidToSidA(str ptr) +@ stdcall ConvertStringSidToSidW(wstr ptr) @ stdcall -import ConvertToAutoInheritPrivateObjectSecurity(ptr ptr ptr ptr long ptr) @ stdcall -import CopySid(long ptr ptr) # @ stub CreateCodeAuthzLevel @@ -429,16 +429,16 @@ @ stdcall LogonUserW(wstr wstr wstr long long ptr) @ stdcall LookupAccountNameA(str str ptr ptr ptr ptr ptr) @ stdcall LookupAccountNameW(wstr wstr ptr ptr ptr ptr ptr) -@ stdcall LookupAccountSidA(ptr ptr ptr ptr ptr ptr ptr) +@ stdcall LookupAccountSidA(str ptr ptr ptr ptr ptr ptr) @ stdcall LookupAccountSidLocalA(ptr ptr ptr ptr ptr ptr) @ stdcall LookupAccountSidLocalW(ptr ptr ptr ptr ptr ptr) -@ stdcall LookupAccountSidW(ptr ptr ptr ptr ptr ptr ptr) +@ stdcall LookupAccountSidW(wstr ptr ptr ptr ptr ptr ptr) @ stdcall LookupPrivilegeDisplayNameA(str str str ptr ptr) @ stdcall LookupPrivilegeDisplayNameW(wstr wstr wstr ptr ptr) @ stdcall LookupPrivilegeNameA(str ptr ptr ptr) @ stdcall LookupPrivilegeNameW(wstr ptr ptr ptr) -@ stdcall LookupPrivilegeValueA(ptr ptr ptr) -@ stdcall LookupPrivilegeValueW(ptr ptr ptr) +@ stdcall LookupPrivilegeValueA(str str ptr) +@ stdcall LookupPrivilegeValueW(wstr wstr ptr) @ stdcall LookupSecurityDescriptorPartsA(ptr ptr ptr ptr ptr ptr ptr) @ stdcall LookupSecurityDescriptorPartsW(ptr ptr ptr ptr ptr ptr ptr) @ stdcall LsaAddAccountRights(ptr ptr ptr long) @@ -478,7 +478,7 @@ # @ stub LsaManageSidNameMapping @ stdcall LsaNtStatusToWinError(long) @ stub LsaOpenAccount -@ stdcall LsaOpenPolicy(long ptr long long) +@ stdcall LsaOpenPolicy(ptr ptr long long) # @ stub LsaOpenPolicySce @ stub LsaOpenSecret @ stub LsaOpenTrustedDomain @@ -681,17 +681,17 @@ @ stdcall RegReplaceKeyW(long wstr wstr wstr) @ stdcall -import RegRestoreKeyA(long str long) @ stdcall -import RegRestoreKeyW(long wstr long) -@ stdcall RegSaveKeyA(long ptr ptr) +@ stdcall RegSaveKeyA(long str ptr) @ stdcall -import RegSaveKeyExA(long str ptr long) @ stdcall -import RegSaveKeyExW(long wstr ptr long) -@ stdcall RegSaveKeyW(long ptr ptr) +@ stdcall RegSaveKeyW(long wstr ptr) @ stdcall -import RegSetKeySecurity(long long ptr) @ stdcall -import RegSetKeyValueA(long str str long ptr long) @ stdcall -import RegSetKeyValueW(long wstr wstr long ptr long) -@ stdcall RegSetValueA(long str long ptr long) +@ stdcall RegSetValueA(long str long str long) @ stdcall -import RegSetValueExA(long str long long ptr long) @ stdcall -import RegSetValueExW(long wstr long long ptr long) -@ stdcall RegSetValueW(long wstr long ptr long) +@ stdcall RegSetValueW(long wstr long wstr long) @ stdcall -import RegUnLoadKeyA(long str) @ stdcall -import RegUnLoadKeyW(long wstr) @ stdcall RegisterEventSourceA(str str) -- 2.17.1

2 1

[PATCH 4/8] shell32: Fix some spec file entries
by André Hentschel 19 Jan '20

19 Jan '20

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/shell32/shell32.spec | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index 96251a87ca9..68c0f43cdd9 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -46,7 +46,7 @@ 48 stdcall -noname PathSetDlgItemPath(long long ptr) PathSetDlgItemPathAW 49 stdcall -ordinal PathQualify(ptr) PathQualifyAW 50 stdcall -noname PathStripToRoot(ptr) PathStripToRootAW - 51 stdcall PathResolve(str long long) PathResolveAW + 51 stdcall PathResolve(str ptr long) PathResolveAW 52 stdcall -noname PathGetArgs(str) PathGetArgsAW 53 stdcall DoEnvironmentSubst(ptr long) DoEnvironmentSubstAW 54 stub LogoffWindowsDialog @@ -108,7 +108,7 @@ 113 stdcall -noname FileMenu_ReplaceUsingPidl(long long ptr long ptr) 114 stdcall -noname FileMenu_Create(long long long long long) 115 stdcall -noname FileMenu_AppendItem(long ptr long long long long) FileMenu_AppendItemAW - 116 stdcall -noname FileMenu_TrackPopupMenuEx(long long long long long long) + 116 stdcall -noname FileMenu_TrackPopupMenuEx(long long long long long ptr) 117 stdcall -noname FileMenu_DeleteItemByCmd(long long) 118 stdcall -noname FileMenu_Destroy(long) 119 stdcall -ordinal IsLFNDrive(ptr) IsLFNDriveAW @@ -160,11 +160,11 @@ 168 stdcall -ordinal SHCreatePropSheetExtArray(long wstr long) 169 stdcall -ordinal SHDestroyPropSheetExtArray(long) 170 stdcall -ordinal SHReplaceFromPropSheetExtArray(long long ptr long) - 171 stdcall -ordinal PathCleanupSpec(ptr ptr) + 171 stdcall -ordinal PathCleanupSpec(wstr ptr) 172 stdcall -noname SHCreateLinks(long str ptr long ptr) 173 stdcall -ordinal SHValidateUNC(long wstr long) 174 stdcall -ordinal SHCreateShellFolderViewEx(ptr ptr) - 175 stdcall -noname SHGetSpecialFolderPath(long long long long) SHGetSpecialFolderPathAW + 175 stdcall -noname SHGetSpecialFolderPath(long ptr long long) SHGetSpecialFolderPathAW 176 stdcall -ordinal SHSetInstanceExplorer(ptr) shcore.SetProcessReference 177 stub DAD_SetDragImageFromListView 178 stdcall -ordinal SHObjectProperties(long long wstr wstr) @@ -217,11 +217,11 @@ #300 stub Shl3216_ThunkData32 505 stdcall SHRegCloseKey (long) - 506 stdcall SHRegOpenKeyA (long str long) - 507 stdcall SHRegOpenKeyW (long wstr long) + 506 stdcall SHRegOpenKeyA (long str ptr) + 507 stdcall SHRegOpenKeyW (long wstr ptr) 508 stdcall SHRegQueryValueA(long str ptr ptr) 509 stdcall SHRegQueryValueExA(long str ptr ptr ptr ptr) - 510 stdcall SHRegQueryValueW (long long long long) + 510 stdcall SHRegQueryValueW (long wstr ptr ptr) 511 stdcall SHRegQueryValueExW (long wstr ptr ptr ptr ptr) 512 stdcall SHRegDeleteKeyW (long wstr) @@ -247,7 +247,7 @@ 651 stdcall -noname @(ptr long) ReadCabinetState # OldReadCabinetState 652 stdcall -noname WriteCabinetState(ptr) - 653 stdcall -noname PathProcessCommand(long long long long) PathProcessCommandAW + 653 stdcall -noname PathProcessCommand(ptr ptr long long) PathProcessCommandAW 654 stdcall ReadCabinetState(ptr long) 660 stdcall -noname FileIconInit(long) @@ -431,9 +431,9 @@ @ stub SheFullPathA @ stub SheFullPathW @ stub SheGetCurDrive -@ stdcall SheGetDirA(long long) +@ stdcall SheGetDirA(long ptr) @ stub SheGetDirExW -@ stdcall SheGetDirW (long long) +@ stdcall SheGetDirW (long ptr) @ stub SheGetPathOffsetW @ stub SheRemoveQuotesA @ stub SheRemoveQuotesW @@ -446,9 +446,9 @@ @ stdcall ShellExec_RunDLLA(long long str long) @ stdcall ShellExec_RunDLLW(long long wstr long) @ stdcall ShellExecuteA(long str str str str long) -@ stdcall ShellExecuteEx (long) ShellExecuteExA -@ stdcall ShellExecuteExA (long) -@ stdcall ShellExecuteExW (long) +@ stdcall ShellExecuteEx (ptr) ShellExecuteExA +@ stdcall ShellExecuteExA (ptr) +@ stdcall ShellExecuteExW (ptr) @ stdcall ShellExecuteW (long wstr wstr wstr wstr long) @ stdcall ShellHookProc(long long long) @ stdcall Shell_NotifyIcon(long ptr) Shell_NotifyIconA -- 2.17.1

2 1

[PATCH] winedump: Add a default case to numeric_leaf().
by Gerald Pfeifer 19 Jan '20

19 Jan '20

This addresses two warnings issues by GCC 10 (currently in development stage 4, so this is unlikely to change): msc.c:687:9: warning: 'value' may be used uninitialized in this function msc.c:301:13: warning: 'value' may be used uninitialized in this function Gerald --- tools/winedump/msc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/winedump/msc.c b/tools/winedump/msc.c index fbe7f9e541..6843f899b1 100644 --- a/tools/winedump/msc.c +++ b/tools/winedump/msc.c @@ -206,6 +206,7 @@ static int numeric_leaf(int* value, const unsigned short int* leaf) { case fv_integer: *value = fv.v.i; break; case fv_longlong: *value = (unsigned)fv.v.llu; printf("bad conversion\n"); break; + default: assert( 0 ); *value = 0; } return len; } -- 2.24.0

1 0

[PATCH 7/8] shlwapi: Fix some spec file entries
by André Hentschel 19 Jan '20

19 Jan '20

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/shlwapi/shlwapi.spec | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec index 9b4b6357c65..0dffb519651 100644 --- a/dlls/shlwapi/shlwapi.spec +++ b/dlls/shlwapi/shlwapi.spec @@ -219,7 +219,7 @@ 219 stdcall -import QISearch(ptr ptr ptr ptr) 220 stdcall -noname SHSetDefaultDialogFont(ptr long) 221 stdcall -noname SHRemoveDefaultDialogFont(ptr) -222 stdcall -noname SHGlobalCounterCreate(long) +222 stdcall -noname SHGlobalCounterCreate(ptr) 223 stdcall -noname SHGlobalCounterGetValue(long) 224 stdcall -noname SHGlobalCounterIncrement(long) 225 stdcall -ordinal SHStripMneumonicW(wstr) @@ -257,15 +257,15 @@ 257 stdcall -noname SHCreateWorkerWindowA(ptr ptr long long ptr long) 258 stub -noname SHRegisterWaitForSingleObject 259 stub -noname SHUnregisterWait -260 stdcall -noname SHQueueUserWorkItem(long long long long long long long) +260 stdcall -noname SHQueueUserWorkItem(ptr ptr long long ptr str long) 261 stub -noname SHCreateTimerQueue 262 stub -noname SHDeleteTimerQueue 263 stdcall -noname SHSetTimerQueueTimer(long ptr ptr long long str long) 264 stub -noname SHChangeTimerQueueTimer 265 stub -noname SHCancelTimerQueueTimer 266 stdcall -noname SHRestrictionLookup(long wstr ptr ptr) -267 stdcall -noname SHWeakQueryInterface(long long long long) -268 stdcall -noname SHWeakReleaseInterface(long long) +267 stdcall -noname SHWeakQueryInterface(ptr ptr ptr ptr) +268 stdcall -noname SHWeakReleaseInterface(ptr ptr) 269 stdcall -noname GUIDFromStringA(str ptr) 270 stdcall -noname GUIDFromStringW(wstr ptr) 271 stdcall -noname SHGetRestriction(wstr wstr wstr) @@ -280,7 +280,7 @@ 280 stdcall -ordinal SHRegGetIntW(ptr wstr long) shcore.SHRegGetIntW 281 stdcall -noname SHPackDispParamsV(ptr ptr long ptr) 282 varargs -noname SHPackDispParams(ptr ptr long) -283 stdcall -noname IConnectionPoint_InvokeWithCancel(ptr long long long long) +283 stdcall -noname IConnectionPoint_InvokeWithCancel(ptr long ptr long long) 284 stdcall -noname IConnectionPoint_SimpleInvoke(ptr long ptr) 285 stdcall -noname IConnectionPoint_OnChanged(ptr long) 286 varargs -noname IUnknown_CPContainerInvokeParam(ptr ptr long ptr long) @@ -354,7 +354,7 @@ 354 stdcall -ordinal SHFormatDateTimeW(ptr ptr wstr long) 355 stdcall -noname IUnknown_EnableModeless(ptr long) 356 stdcall -noname CreateAllAccessSecurityAttributes(ptr ptr long) -357 stdcall -noname SHGetNewLinkInfoWrapW(wstr wstr wstr long long) +357 stdcall -noname SHGetNewLinkInfoWrapW(wstr wstr wstr ptr long) 358 stdcall -noname SHDefExtractIconWrapW(wstr long long ptr ptr long) 359 stdcall -noname OpenEventWrapW(long long wstr) kernel32.OpenEventW 360 stdcall -noname RemoveDirectoryWrapW(wstr) kernel32.RemoveDirectoryW @@ -481,14 +481,14 @@ 481 stdcall -noname IUnknown_HasFocusIO(ptr) 482 stub -noname SHMessageBoxHelpA 483 stub -noname SHMessageBoxHelpW -484 stdcall -noname IUnknown_QueryServiceExec(ptr ptr ptr long long long ptr) +484 stdcall -noname IUnknown_QueryServiceExec(ptr ptr ptr long long ptr ptr) 485 stub -noname MapWin32ErrorToSTG 486 stub -noname ModeToCreateFileFlags 487 stdcall -ordinal SHLoadIndirectString(wstr ptr long ptr) 488 stub -noname SHConvertGraphicsFile 489 stdcall -noname GlobalAddAtomWrapW(wstr) kernel32.GlobalAddAtomW 490 stdcall -noname GlobalFindAtomWrapW(wstr) kernel32.GlobalFindAtomW -491 stdcall -noname SHGetShellKey(long long long) +491 stdcall -noname SHGetShellKey(long wstr long) 492 stub -noname PrettifyFileDescriptionW 493 stub -noname SHPropertyBag_ReadType 494 stub -noname SHPropertyBag_ReadStr @@ -663,8 +663,8 @@ @ stdcall -import PathRenameExtensionW(wstr wstr) @ stdcall -import PathSearchAndQualifyA(str ptr long) @ stdcall -import PathSearchAndQualifyW(wstr ptr long) -@ stdcall PathSetDlgItemPathA (long long ptr) -@ stdcall PathSetDlgItemPathW (long long ptr) +@ stdcall PathSetDlgItemPathA (long long str) +@ stdcall PathSetDlgItemPathW (long long wstr) @ stdcall -import PathSkipRootA(str) @ stdcall -import PathSkipRootW(wstr) @ stdcall -import PathStripPathA(str) -- 2.17.1

1 0

[PATCH 3/8] kernelbase: Fix some spec file entries
by André Hentschel 19 Jan '20

19 Jan '20

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/kernelbase/kernelbase.spec | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index f36d4d525c9..8793e69ac53 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -211,7 +211,7 @@ @ stdcall CreateProcessInternalA(long str str ptr ptr long long ptr str ptr ptr ptr) @ stdcall CreateProcessInternalW(long wstr wstr ptr ptr long long ptr wstr ptr ptr ptr) @ stdcall CreateProcessW(wstr wstr ptr ptr long long ptr wstr ptr ptr) -@ stdcall CreateRemoteThread(long ptr long ptr long long ptr) +@ stdcall CreateRemoteThread(long ptr long ptr ptr long ptr) @ stdcall CreateRemoteThreadEx(long ptr long ptr ptr long ptr ptr) @ stdcall CreateRestrictedToken(long long long ptr long ptr long ptr ptr) @ stdcall CreateSemaphoreExW(ptr long long wstr long long) @@ -222,7 +222,7 @@ # @ stub CreateStateLock # @ stub CreateStateSubcontainer @ stdcall CreateSymbolicLinkW(wstr wstr long) kernel32.CreateSymbolicLinkW -@ stdcall CreateThread(ptr long ptr long long ptr) +@ stdcall CreateThread(ptr long ptr ptr long ptr) @ stdcall CreateThreadpool(ptr) @ stdcall CreateThreadpoolCleanupGroup() @ stdcall CreateThreadpoolIo(ptr ptr ptr ptr) @@ -372,7 +372,7 @@ @ stdcall FindNextVolumeW(long ptr long) kernel32.FindNextVolumeW # @ stub FindPackagesByPackageFamily @ stdcall FindResourceExW(long wstr wstr long) -@ stdcall FindResourceW(long wstr wstr) +@ stdcall FindResourceW(ptr wstr wstr) @ stdcall FindStringOrdinal(long wstr long wstr long long) @ stdcall FindVolumeClose(ptr) kernel32.FindVolumeClose @ stdcall FlsAlloc(ptr) @@ -381,7 +381,7 @@ @ stdcall FlsSetValue(long ptr) @ stdcall FlushConsoleInputBuffer(long) kernel32.FlushConsoleInputBuffer @ stdcall FlushFileBuffers(long) -@ stdcall FlushInstructionCache(long long long) +@ stdcall FlushInstructionCache(long ptr long) @ stdcall FlushProcessWriteBuffers() kernel32.FlushProcessWriteBuffers @ stdcall FlushViewOfFile(ptr long) @ stdcall FoldStringW(long wstr long ptr long) @@ -394,7 +394,7 @@ @ stdcall FreeEnvironmentStringsW(ptr) # @ stub FreeGPOListInternalA # @ stub FreeGPOListInternalW -@ stdcall FreeLibrary(long) +@ stdcall FreeLibrary(ptr) @ stdcall FreeLibraryAndExitThread(long long) @ stdcall FreeLibraryWhenCallbackReturns(ptr ptr) ntdll.TpCallbackUnloadDllOnCompletion @ stdcall FreeResource(long) @@ -435,8 +435,8 @@ @ stdcall GetCommTimeouts(long ptr) @ stdcall GetCommandLineA() @ stdcall GetCommandLineW() -@ stdcall GetCompressedFileSizeA(long ptr) -@ stdcall GetCompressedFileSizeW(long ptr) +@ stdcall GetCompressedFileSizeA(str ptr) +@ stdcall GetCompressedFileSizeW(wstr ptr) @ stdcall GetComputerNameExA(long ptr ptr) @ stdcall GetComputerNameExW(long ptr ptr) @ stdcall GetConsoleCP() @@ -766,7 +766,7 @@ # @ stub GetWsChangesEx # @ stub GetXStateFeaturesMask @ stdcall GlobalAlloc(long long) -@ stdcall GlobalFree(long) +@ stdcall GlobalFree(ptr) @ stdcall GlobalMemoryStatusEx(ptr) # @ stub GuardCheckLongJumpTarget # @ stub HasPolicyForegroundProcessingCompletedInternal @@ -927,7 +927,7 @@ @ stdcall LoadLibraryExW(wstr long long) @ stdcall LoadLibraryW(wstr) # @ stub LoadPackagedLibrary -@ stdcall LoadResource(long long) +@ stdcall LoadResource(ptr long) @ stdcall LoadStringA(long long ptr long) @ stub LoadStringBaseExW @ stub LoadStringByReference @@ -1383,8 +1383,8 @@ @ stdcall SHTruncateString(str long) # @ stub SaveAlternatePackageRootPath # @ stub SaveStateRootFolderPath -@ stdcall ScrollConsoleScreenBufferA(long ptr ptr ptr ptr) -@ stdcall ScrollConsoleScreenBufferW(long ptr ptr ptr ptr) +@ stdcall ScrollConsoleScreenBufferA(long ptr ptr long ptr) +@ stdcall ScrollConsoleScreenBufferW(long ptr ptr long ptr) @ stdcall SearchPathA(str str str long ptr ptr) @ stdcall SearchPathW(wstr wstr wstr long ptr ptr) @ stdcall SetAclInformation(ptr ptr long long) @@ -1509,7 +1509,7 @@ @ stdcall SetupComm(long long long) # @ stub SharedLocalIsEnabled @ stdcall SignalObjectAndWait(long long long long) -@ stdcall SizeofResource(long long) +@ stdcall SizeofResource(ptr long) @ stdcall Sleep(long) @ stdcall SleepConditionVariableCS(ptr ptr long) @ stdcall SleepConditionVariableSRW(ptr ptr long long) -- 2.17.1

1 0

[PATCH 2/8] gdi32: Fix some spec file entries
by André Hentschel 19 Jan '20

19 Jan '20

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/gdi32/gdi32.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index 8faa2978f49..2282f05d119 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -1,5 +1,5 @@ # ordinal exports -100 stdcall @(long long str str str) GDI_CallDevInstall16 +100 stdcall @(ptr long str str str) GDI_CallDevInstall16 101 stdcall @(long str str ptr) GDI_CallExtDeviceModePropSheet16 102 stdcall @(long ptr str str ptr str long) GDI_CallExtDeviceMode16 103 stdcall @(long str ptr ptr) GDI_CallAdvancedSetupDialog16 -- 2.17.1

1 0

Wine staging 5.0 rc6 release
by Alistair Leslie-Hughes 19 Jan '20

19 Jan '20

Binary packages for various distributions will be available from: https://www.winehq.org/download Summary since last release * Rebased to current wine 5.0 rc6 (864 patches are applied to wine vanilla) Upstreamed (Either directly from staging or fixed with a similar patch). * dinput: Support default DIPROP_BUFFERSIZE buffer size * setupapi: Add support for IDF_CHECKFIRST flag in SetupPromptForDiskW. * setupapi/tests: Add test for IDF_CHECKFIRST and SetupPromptForDiskA/W. * setupapi/tests: Determine path to system32 directory at runtime. Added: * None Updated: * winebuild-Fake_Dlls Where can you help * Run Steam/Battle.net/GOG/UPlay/Epic * Test your favorite game. * Test your favorite applications. * Improve staging patches and get them accepted upstream. As always, if you find a bug, please report it via https://bugs.winehq.org Best Regards Alistair.

1 0

[PATCH] add: SetEnvironmentStringsW
by Frank Uhlig 18 Jan '20

18 Jan '20

From: Frank Uhlig <fuulish(a)users.noreply.github.com> Signed-off-by: Frank Uhlig <uhlig.frank(a)gmail.com> --- ...ms-win-core-processenvironment-l1-1-0.spec | 2 +- ...ms-win-core-processenvironment-l1-2-0.spec | 2 +- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/tests/environ.c | 61 +++++++++++++++++++ dlls/kernelbase/kernelbase.spec | 2 +- dlls/kernelbase/process.c | 29 +++++++++ include/winbase.h | 1 + 7 files changed, 95 insertions(+), 4 deletions(-) diff --git a/dlls/api-ms-win-core-processenvironment-l1-1-0/api-ms-win-core-processenvironment-l1-1-0.spec b/dlls/api-ms-win-core-processenvironment-l1-1-0/api-ms-win-core-processenvironment-l1-1-0.spec index e3698d6efd..7a62b74390 100644 --- a/dlls/api-ms-win-core-processenvironment-l1-1-0/api-ms-win-core-processenvironment-l1-1-0.spec +++ b/dlls/api-ms-win-core-processenvironment-l1-1-0/api-ms-win-core-processenvironment-l1-1-0.spec @@ -15,7 +15,7 @@ @ stdcall SearchPathW(wstr wstr wstr long ptr ptr) kernel32.SearchPathW @ stdcall SetCurrentDirectoryA(str) kernel32.SetCurrentDirectoryA @ stdcall SetCurrentDirectoryW(wstr) kernel32.SetCurrentDirectoryW -@ stub SetEnvironmentStringsW +@ stdcall SetEnvironmentStringsW(ptr) kernel32.SetEnvironmentStringsW @ stdcall SetEnvironmentVariableA(str str) kernel32.SetEnvironmentVariableA @ stdcall SetEnvironmentVariableW(wstr wstr) kernel32.SetEnvironmentVariableW @ stdcall SetStdHandle(long long) kernel32.SetStdHandle diff --git a/dlls/api-ms-win-core-processenvironment-l1-2-0/api-ms-win-core-processenvironment-l1-2-0.spec b/dlls/api-ms-win-core-processenvironment-l1-2-0/api-ms-win-core-processenvironment-l1-2-0.spec index 2c25ee1a07..c93d221c5e 100644 --- a/dlls/api-ms-win-core-processenvironment-l1-2-0/api-ms-win-core-processenvironment-l1-2-0.spec +++ b/dlls/api-ms-win-core-processenvironment-l1-2-0/api-ms-win-core-processenvironment-l1-2-0.spec @@ -17,7 +17,7 @@ @ stdcall SearchPathW(wstr wstr wstr long ptr ptr) kernel32.SearchPathW @ stdcall SetCurrentDirectoryA(str) kernel32.SetCurrentDirectoryA @ stdcall SetCurrentDirectoryW(wstr) kernel32.SetCurrentDirectoryW -@ stub SetEnvironmentStringsW +@ stdcall SetEnvironmentStringsW(ptr) kernel32.SetEnvironmentStringsW @ stdcall SetEnvironmentVariableA(str str) kernel32.SetEnvironmentVariableA @ stdcall SetEnvironmentVariableW(wstr wstr) kernel32.SetEnvironmentVariableW @ stdcall SetStdHandle(long long) kernel32.SetStdHandle diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index be48ef1694..2b74a4182e 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1387,7 +1387,7 @@ # @ stub SetDynamicTimeZoneInformation @ stdcall -import SetEndOfFile(long) # @ stub SetEnvironmentStringsA -# @ stub SetEnvironmentStringsW +@ stdcall -import SetEnvironmentStringsW (ptr) @ stdcall -import SetEnvironmentVariableA(str str) @ stdcall -import SetEnvironmentVariableW(wstr wstr) @ stdcall -import SetErrorMode(long) diff --git a/dlls/kernel32/tests/environ.c b/dlls/kernel32/tests/environ.c index 44a6a0cff0..44c29fd05f 100644 --- a/dlls/kernel32/tests/environ.c +++ b/dlls/kernel32/tests/environ.c @@ -579,6 +579,66 @@ static void test_GetEnvironmentStringsW(void) FreeEnvironmentStringsW(env2); } +static void test_SetEnvironmentStringsW(void) +{ + DWORD buf_len; + BOOL ret; + DWORD ret_size; + + static WCHAR buf[256]; + + static WCHAR name[] = {'N','a','m','e',0}; + static WCHAR value[] = {'V','a','l','u','e',0}; + static WCHAR env[] = {'N','a','m','e','=','V','a','l','u','e',0}; + + static WCHAR eman[] = {'e','m','a','N',0}; + static WCHAR eulav[] = {'e','u','l','a','V',0}; + static WCHAR vne[] = {'e','m','a','N','=','e','u','l','a','V',0}; + + static WCHAR var[] = {'V','a','r'}; + static WCHAR val[] = {'V','a','l'}; + static WCHAR rav[] = {'r','a','V'}; + static WCHAR lav[] = {'l','a','V'}; + static WCHAR mul[] = {'V','a','r','=','V','a','l',' ','r','a','V','=','l','a','V',0}; + + static WCHAR empty[] = {'V','a','r','=',0}; + + buf_len = sizeof(buf) / 2; + + ret = SetEnvironmentStringsW(env); + ok( ret, "Setting environment strings failed" ); + + ret_size = GetEnvironmentVariableW(name, buf, buf_len); + ok( ((0 != ret_size) && (0 == wcscmp(buf, value))), + "Environment String settings resulted in different value"); + + ret = SetEnvironmentStringsW(vne); + ok( ret, "Setting environment strings failed" ); + + ret_size = GetEnvironmentVariableW(eman, buf, buf_len); + ok( ((0 != ret_size) && (0 == wcscmp(buf, eulav))), + "Environment String settings resulted in different value"); + + ret = SetEnvironmentStringsW(mul); + ok( ret, "Setting environment strings failed" ); + + ret_size = GetEnvironmentVariableW(var, buf, buf_len); + ok( ((0 != ret_size) && (0 == wcscmp(buf, val))), + "Environment String settings resulted in different value"); + + ret_size = GetEnvironmentVariableW(rav, buf, buf_len); + ok( ((0 != ret_size) && (0 == wcscmp(buf, lav))), + "Environment String settings resulted in different value"); + + ret = SetEnvironmentStringsW(empty); + ok( ret, "Setting environment strings failed" ); + + ret_size = GetEnvironmentVariableW(var, buf, buf_len); + ok( (0 == ret_size), + "Environment String settings resulted in different value"); + +} + START_TEST(environ) { init_functionpointers(); @@ -591,4 +651,5 @@ START_TEST(environ) test_GetComputerNameExA(); test_GetComputerNameExW(); test_GetEnvironmentStringsW(); + test_SetEnvironmentStringsW(); } diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index f36d4d525c..a5e30b938f 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1422,7 +1422,7 @@ @ stdcall SetDefaultDllDirectories(long) # @ stub SetDynamicTimeZoneInformation @ stdcall SetEndOfFile(long) -@ stub SetEnvironmentStringsW +@ stdcall SetEnvironmentStringsW(ptr) @ stdcall SetEnvironmentVariableA(str str) @ stdcall SetEnvironmentVariableW(wstr wstr) @ stdcall SetErrorMode(long) diff --git a/dlls/kernelbase/process.c b/dlls/kernelbase/process.c index a07dddb1fc..97b59b9548 100644 --- a/dlls/kernelbase/process.c +++ b/dlls/kernelbase/process.c @@ -1345,6 +1345,35 @@ BOOL WINAPI DECLSPEC_HOTPATCH SetEnvironmentVariableW( LPCWSTR name, LPCWSTR val } +/*********************************************************************** + * SetEnvironmentStringsW (kernelbase.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH SetEnvironmentStringsW( LPWCH NewEnvironment ) +{ + + BOOL rc = FALSE; + WCHAR *var, *val; + const WCHAR delim[] = {' ','=','\n',0}; + + TRACE( "(%s)\n", debugstr_w(NewEnvironment)); + + if (NULL == NewEnvironment) + return rc; + + var = wcstok(NewEnvironment, delim); + val = wcstok(NULL, delim); + + while (var != NULL) { + if (FALSE == (rc = SetEnvironmentVariableW(var, val))) + break; + var = wcstok(NULL, delim); + val = wcstok(NULL, delim); + } + + return rc; +} + + /*********************************************************************** * Process/thread attribute lists ***********************************************************************/ diff --git a/include/winbase.h b/include/winbase.h index 655eb48f0f..0c1aa19b42 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2621,6 +2621,7 @@ WINBASEAPI BOOL WINAPI SetEndOfFile(HANDLE); WINBASEAPI BOOL WINAPI SetEnvironmentVariableA(LPCSTR,LPCSTR); WINBASEAPI BOOL WINAPI SetEnvironmentVariableW(LPCWSTR,LPCWSTR); #define SetEnvironmentVariable WINELIB_NAME_AW(SetEnvironmentVariable) +WINBASEAPI BOOL WINAPI SetEnvironmentStringsW(LPWCH); WINBASEAPI UINT WINAPI SetErrorMode(UINT); WINBASEAPI BOOL WINAPI SetEvent(HANDLE); WINBASEAPI VOID WINAPI SetFileApisToANSI(void); -- 2.24.1

2 1

[PATCH] shell32/tests: Fix some failures in test_contextmenu().
by Zebediah Figura 18 Jan '20

18 Jan '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/shell32/tests/shlfolder.c | 34 ++++++++++++---------------------- 1 file changed, 12 insertions(+), 22 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 43cbbfda2c..14d243a03b 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -4356,23 +4356,19 @@ if (hr == S_OK) static void test_contextmenu(IContextMenu *menu, BOOL background) { HMENU hmenu = CreatePopupMenu(); - const int id_upper_limit = 32767; - const int baseItem = 0x40; - INT max_id, max_id_check; - UINT count, i; + UINT count, i, max_id; HRESULT hr; test_contextmenu_qi(menu, FALSE); - hr = IContextMenu_QueryContextMenu(menu, hmenu, 0, baseItem, id_upper_limit, CMF_NORMAL); + hr = IContextMenu_QueryContextMenu(menu, hmenu, 0, 64, 32767, CMF_NORMAL); ok(SUCCEEDED(hr), "Failed to query the menu, hr %#x.\n", hr); max_id = HRESULT_CODE(hr) - 1; /* returns max_id + 1 */ - ok(max_id <= id_upper_limit, "Got %d\n", max_id); + ok(max_id <= 32767, "Got %d\n", max_id); count = GetMenuItemCount(hmenu); ok(count, "Got %d\n", count); - max_id_check = 0; for (i = 0; i < count; i++) { MENUITEMINFOA mii; @@ -4387,26 +4383,20 @@ static void test_contextmenu(IContextMenu *menu, BOOL background) res = GetMenuItemInfoA(hmenu, i, TRUE, &mii); ok(res, "Failed to get menu item info, error %d.\n", GetLastError()); - ok((mii.wID <= id_upper_limit) || (mii.fType & MFT_SEPARATOR), - "Got non-separator ID out of range: %d (type: %x)\n", mii.wID, mii.fType); if (!(mii.fType & MFT_SEPARATOR)) { - max_id_check = (mii.wID > max_id_check) ? mii.wID : max_id_check; - hr = IContextMenu_GetCommandString(menu, mii.wID - baseItem, GCS_VERBA, 0, buf, sizeof(buf)); + ok(mii.wID >= 64 && mii.wID <= 64 + max_id, + "Expected between 64 and %d, got %d.\n", 64 + max_id, mii.wID); + hr = IContextMenu_GetCommandString(menu, mii.wID - 64, GCS_VERBA, 0, buf, sizeof(buf)); todo_wine_if(background) - ok(SUCCEEDED(hr) || hr == E_NOTIMPL, "for id 0x%x got 0x%08x (menustr: %s)\n", mii.wID - baseItem, hr, mii.dwTypeData); - if (SUCCEEDED(hr)) - trace("for id 0x%x got string %s (menu string: %s)\n", mii.wID - baseItem, buf, mii.dwTypeData); - else if (hr == E_NOTIMPL) - trace("for id 0x%x got E_NOTIMPL (menu string: %s)\n", mii.wID - baseItem, mii.dwTypeData); + ok(hr == S_OK || hr == E_NOTIMPL || hr == E_INVALIDARG, + "Got unexpected hr %#x for ID %d, string %s.\n", hr, mii.wID, debugstr_a(mii.dwTypeData)); + if (hr == S_OK) + trace("Got ID %d, verb %s, string %s.\n", mii.wID, debugstr_a(buf), debugstr_a(mii.dwTypeData)); + else + trace("Got ID %d, hr %#x, string %s.\n", mii.wID, hr, debugstr_a(mii.dwTypeData)); } } - max_id_check -= baseItem; - ok((max_id_check == max_id) || - (max_id_check == max_id-1) || /* Win 7 */ - (max_id_check == max_id-2) || /* Win 8 */ - (max_id_check == max_id-3), - "Not equal (or near equal), got %d and %d\n", max_id_check, max_id); if (count) { -- 2.25.0

2 1

[PATCH] add: SetEnvironmentStringsW
by Frank Uhlig 17 Jan '20

17 Jan '20

Please find attached my suggestion for an implementation of SetEnvironmentStringsW with tests. Currently cannot get sendmail to work properly, so sorry for the inconvenience. Frank

3 3

[RFC 0/2] Refactor FileSchemeHandler and add stub MPEG4ByteStreamHandler.
by Derek Lesho 17 Jan '20

17 Jan '20

I'm submitting these patches as RFCs as I'm new to this API, and I'm not sure about the best way to abstract functionality in COM classes when using C. Derek Lesho (2): mf: Move generic handler to code to helper functions. mf: Implement stub MPEG4 ByteStream handler. dlls/mf/Makefile.in | 2 + dlls/mf/handler.c | 360 +++++++++++++++++++++++++++++++++++++++++ dlls/mf/main.c | 371 +++++-------------------------------------- dlls/mf/mf.idl | 7 + dlls/mf/mf.rgs | 7 + dlls/mf/mf_private.h | 26 +++ dlls/mf/mpeg4.c | 149 +++++++++++++++++ 7 files changed, 593 insertions(+), 329 deletions(-) create mode 100644 dlls/mf/handler.c create mode 100644 dlls/mf/mpeg4.c -- 2.25.0

1 2

Wine32 requires 32bit libraries? No fix?
by Klaus-J. Wolf 17 Jan '20

17 Jan '20

I recently noted that some Linux* distributions stop their x86 32bit flavor because 32bit care occupies lots of time (apparently more and more since AMD64 mechanisms are missing) not outweighed by the number of 32bit platform users remaining. I also noted that apparently, there is no way to compile/link the Wine32 executable with 64bit libs. Since I’m a developer by profession, I would like to ask what the main problems are and if I can help. Any notes welcome.

8 8

[PATCH] urlmon: Fix CoInternetParse{Url,IUri} spec entry.
by Piotr Caban 17 Jan '20

17 Jan '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/urlmon/urlmon.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

2 1

[PATCH 1/2] urlmon/tests: Avoid testing that only certain interfaces are queried.
by Zebediah Figura 17 Jan '20

17 Jan '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/urlmon/tests/url.c | 46 +++++++---------------------------------- 1 file changed, 7 insertions(+), 39 deletions(-) diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index 7c8d1abdb76..3a6ad1390fa 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -43,7 +43,6 @@ static HRESULT (WINAPI *pCreateUri)(LPCWSTR, DWORD, DWORD_PTR, IUri**); DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); DEFINE_GUID(CLSID_IdentityUnmarshal,0x0000001b,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); DEFINE_GUID(IID_IBindStatusCallbackHolder,0x79eac9cc,0xbaf9,0x11ce,0x8c,0x82,0x00,0xaa,0x00,0x4b,0xa9,0x0b); -static const IID IID_undocumentedIE11 = {0xd5ae15f6,0x2032,0x488e,{0x8f,0x96,0xf9,0x24,0x06,0xd8,0xd8,0xb4}}; extern CLSID CLSID_AboutProtocol; #define DEFINE_EXPECT(func) \ @@ -366,7 +365,7 @@ static IInternetPriority InternetPriority = { &InternetPriorityVtbl }; static HRESULT WINAPI Protocol_QueryInterface(IInternetProtocol *iface, REFIID riid, void **ppv) { - static const IID IID_undocumentedIE10 = {0x7daf9908,0x8415,0x4005,{0x95,0xae,0xbd,0x27,0xf6,0xe3,0xdc,0x00}}; + if (winetest_debug > 1) trace("IInternetProtocol::QueryInterface(%s)\n", debugstr_guid(riid)); *ppv = NULL; @@ -383,15 +382,6 @@ static HRESULT WINAPI Protocol_QueryInterface(IInternetProtocol *iface, REFIID r return S_OK; } - if(IsEqualGUID(&IID_IInternetProtocolEx, riid)) - return E_NOINTERFACE; /* TODO */ - - if(IsEqualGUID(&IID_undocumentedIE10, riid)) { - trace("QI(%s)\n", wine_dbgstr_guid(riid)); - return E_NOINTERFACE; /* TODO */ - } - - ok(0, "unexpected call %s\n", wine_dbgstr_guid(riid)); return E_NOINTERFACE; } @@ -1403,6 +1393,10 @@ static ULONG WINAPI ServiceProvider_Release(IServiceProvider *iface) static HRESULT WINAPI ServiceProvider_QueryService(IServiceProvider *iface, REFGUID guidService, REFIID riid, void **ppv) { + if (winetest_debug > 1) + trace("IServiceProvider::QueryService(service %s, iid %s)\n", + debugstr_guid(guidService), debugstr_guid(riid)); + if(IsEqualGUID(&IID_IAuthenticate, guidService)) { CHECK_EXPECT(QueryService_IAuthenticate); return E_NOTIMPL; @@ -1430,19 +1424,7 @@ static HRESULT WINAPI ServiceProvider_QueryService(IServiceProvider *iface, return S_OK; } - if(IsEqualGUID(&IID_IGetBindHandle, guidService)) { - trace("QueryService(IID_IGetBindHandle)\n"); - *ppv = NULL; - return E_NOINTERFACE; - } - - if(IsEqualGUID(&IID_undocumentedIE11, guidService)) { - trace("QueryService(IID_undocumentedIE11)\n"); - *ppv = NULL; - return E_NOINTERFACE; - } - - ok(0, "unexpected service %s\n", wine_dbgstr_guid(guidService)); + *ppv = NULL; return E_NOINTERFACE; } @@ -1505,7 +1487,7 @@ static void test_WinInetHttpInfo(IWinInetHttpInfo *http_info, DWORD progress) static HRESULT WINAPI statusclb_QueryInterface(IBindStatusCallbackEx *iface, REFIID riid, void **ppv) { - static const IID IID_undocumentedIE10 = {0xf286fa56,0xc1fd,0x4270,{0x8e,0x67,0xb3,0xeb,0x79,0x0a,0x81,0xe8}}; + if (winetest_debug > 1) trace("IBindStatusCallback::QueryInterface(%s)\n", debugstr_guid(riid)); ok(GetCurrentThreadId() == thread_id, "wrong thread %d\n", GetCurrentThreadId()); @@ -1554,20 +1536,6 @@ static HRESULT WINAPI statusclb_QueryInterface(IBindStatusCallbackEx *iface, REF }else if(IsEqualGUID(&IID_IHttpSecurity, riid)) { CHECK_EXPECT2(QueryInterface_IHttpSecurity); return E_NOINTERFACE; - }else if(IsEqualGUID(&IID_IGetBindHandle, riid)) { - trace("QI(IID_IGetBindHandle)\n"); - *ppv = NULL; - return E_NOINTERFACE; - }else if(IsEqualGUID(&IID_undocumentedIE10, riid)) { - trace("QI(IID_undocumentedIE10)\n"); - *ppv = NULL; - return E_NOINTERFACE; - }else if(IsEqualGUID(&IID_undocumentedIE11, riid)) { - trace("QI(IID_undocumentedIE11)\n"); - *ppv = NULL; - return E_NOINTERFACE; - }else { - ok(0, "unexpected interface %s\n", wine_dbgstr_guid(riid)); } return E_NOINTERFACE; -- 2.24.1

3 5

[PATCH] comctl32/datetime: Simplify last digits calculation.
by Gabriel Ivăncescu 17 Jan '20

17 Jan '20

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/comctl32/datetime.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/datetime.c b/dlls/comctl32/datetime.c index 05ae3a6..51c20a7 100644 --- a/dlls/comctl32/datetime.c +++ b/dlls/comctl32/datetime.c @@ -472,10 +472,10 @@ DATETIME_ReturnTxt (const DATETIME_INFO *infoPtr, int count, LPWSTR result, int result[1] = 0; break; case ONEDIGITYEAR: - wsprintfW (result, fmt_dW, date.wYear-10* (int) floor(date.wYear/10)); + wsprintfW (result, fmt_dW, date.wYear % 10); break; case TWODIGITYEAR: - wsprintfW (result, fmt__2dW, date.wYear-100* (int) floor(date.wYear/100)); + wsprintfW (result, fmt__2dW, date.wYear % 100); break; case INVALIDFULLYEAR: case FULLYEAR: -- 2.21.0

1 0

[PATCH 1/2] msi/tests: Fix test_feature_override() to properly clean up its features on removal.
by Zebediah Figura 17 Jan '20

17 Jan '20

This was leaving behind registry entries (as well as the already accounted-for program files), which apparently caused subsequent test failures when running msi:action. While Wine is not behaving exactly correctly here (i.e. and removing the feature anyway), I suspect it is not sufficiently interesting to test whether we behave correctly with what is essentially a buggy package. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- For reference: http://windows-installer-xml-wix-toolset.687559.n2.nabble.com/Using-Conditi… dlls/msi/tests/install.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 365f1d3a756..0bd82a621fc 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -966,8 +966,8 @@ static const CHAR fo_feature_dat[] = "Feature\tFeature_Parent\tTitle\tDescriptio static const CHAR fo_condition_dat[] = "Feature_\tLevel\tCondition\n" "s38\ti2\tS255\n" "Condition\tFeature_\tLevel\n" - "preselected\t0\tPreselected\n" - "notpreselected\t0\tNOT Preselected\n"; + "preselected\t0\tPreselected AND NOT REMOVE\n" + "notpreselected\t0\tNOT Preselected AND NOT REMOVE\n"; static const CHAR fo_feature_comp_dat[] = "Feature_\tComponent_\n" "s38\ts72\n" @@ -5464,10 +5464,8 @@ static void test_feature_override(void) ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); ok(!delete_pf("msitest\\override.txt", TRUE), "file not removed\n"); - todo_wine { - ok(delete_pf("msitest\\preselected.txt", TRUE), "file removed\n"); - ok(delete_pf("msitest", FALSE), "directory removed\n"); - } + ok(!delete_pf("msitest\\preselected.txt", TRUE), "file not removed\n"); + ok(!delete_pf("msitest", FALSE), "directory not removed\n"); r = MsiInstallProductA(msifile, NULL); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); @@ -5480,10 +5478,8 @@ static void test_feature_override(void) ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); ok(!delete_pf("msitest\\override.txt", TRUE), "file not removed\n"); - todo_wine { - ok(delete_pf("msitest\\preselected.txt", TRUE), "file removed\n"); - ok(delete_pf("msitest", FALSE), "directory removed\n"); - } + ok(!delete_pf("msitest\\preselected.txt", TRUE), "file not removed\n"); + ok(!delete_pf("msitest", FALSE), "directory not removed\n"); delete_key(HKEY_LOCAL_MACHINE, "Software\\Wine\\msitest", access); -- 2.24.1

3 5

[PATCH] msctf/tests: Fix some test failures on Windows 10.
by Zebediah Figura 16 Jan '20

16 Jan '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/msctf/tests/inputprocessor.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index 38c591ea409..b9a225af588 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -2405,6 +2405,7 @@ static void test_AssociateFocus(void) ITfThreadMgr_SetFocus(g_tm,dmorig); sink_check_ok(&test_OnSetFocus,"OnSetFocus"); + test_OnInitDocumentMgr = test_OnPushContext = SINK_OPTIONAL; /* Win10 1709+ */ test_CurrentFocus = FOCUS_SAVE; test_PrevFocus = FOCUS_SAVE; test_OnSetFocus = SINK_SAVE; @@ -2421,11 +2422,13 @@ static void test_AssociateFocus(void) ok(olddm == dm1, "incorrect old DocumentMgr returned\n"); ITfDocumentMgr_Release(olddm); + test_OnInitDocumentMgr = test_OnPushContext = SINK_OPTIONAL; /* Win10 1709+ */ test_OnSetFocus = SINK_IGNORE; /* OnSetFocus fires a couple of times on Win7 */ test_CurrentFocus = FOCUS_IGNORE; test_PrevFocus = FOCUS_IGNORE; SetFocus(wnd2); processPendingMessages(); + test_OnInitDocumentMgr = test_OnPushContext = SINK_OPTIONAL; /* Win10 1709+ */ SetFocus(wnd1); processPendingMessages(); test_OnSetFocus = SINK_UNEXPECTED; @@ -2433,6 +2436,7 @@ static void test_AssociateFocus(void) ITfDocumentMgr_Release(dm1); ITfDocumentMgr_Release(dm2); + test_OnPopContext = SINK_OPTIONAL; /* Win10 1709+ */ test_CurrentFocus = dmorig; test_PrevFocus = FOCUS_IGNORE; test_OnSetFocus = SINK_OPTIONAL; @@ -2443,8 +2447,9 @@ static void test_AssociateFocus(void) test_CurrentFocus = FOCUS_IGNORE; test_PrevFocus = FOCUS_IGNORE; DestroyWindow(wnd1); + test_OnPopContext = SINK_OPTIONAL; /* Win10 1709+ */ DestroyWindow(wnd2); - test_OnPopContext = SINK_OPTIONAL; /* Vista and greater */ + test_OnPopContext = SINK_IGNORE; /* Vista+, twice Win10 1709+ */ test_OnSetFocus = SINK_OPTIONAL; /* Vista and greater */ ITfThreadMgr_GetFocus(g_tm, &test_PrevFocus); test_CurrentFocus = NULL; -- 2.24.1

2 1

[PATCH] user32/tests: Fix some test failures with Windows 10.
by Zebediah Figura 16 Jan '20

16 Jan '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- This doesn't fix SM_CXMIN(TRACK) or SM_C[XY]SMICON. The former seems to be scaled in a similar manner to SM_CYMIN, but I was unable to easily figure out how to adapt the text width algorithm. The latter probably interacts with DPI in ways I was unable to sufficiently test. dlls/user32/tests/sysparams.c | 55 ++++++++++++++++++++++++----------- 1 file changed, 38 insertions(+), 17 deletions(-) diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index e40d49e8f80..431b87cde14 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -664,19 +664,17 @@ static BOOL run_spi_setmouse_test( int curr_val[], POINT *req_change, POINT *pro rc=SystemParametersInfoA( SPI_GETMOUSE, 0, mi, 0 ); ok(rc, "SystemParametersInfoA: rc=%d err=%d\n", rc, GetLastError()); - for (i = 0; i < 3; i++) - { - ok(mi[i] == curr_val[i], - "incorrect value for %d: %d != %d\n", i, mi[i], curr_val[i]); - } + ok(mi[0] == curr_val[0], "expected X threshold %d, got %d\n", curr_val[0], mi[0]); + ok(mi[1] == curr_val[1], "expected Y threshold %d, got %d\n", curr_val[1], mi[1]); + ok(mi[2] == curr_val[2] || broken(mi[2] == 1) /* Win10 1709+ */, + "expected acceleration %d, got %d\n", curr_val[2], mi[2]); rc=SystemParametersInfoW( SPI_GETMOUSE, 0, mi, 0 ); ok(rc, "SystemParametersInfoW: rc=%d err=%d\n", rc, GetLastError()); - for (i = 0; i < 3; i++) - { - ok(mi[i] == curr_val[i], - "incorrect value for %d: %d != %d\n", i, mi[i], curr_val[i]); - } + ok(mi[0] == curr_val[0], "expected X threshold %d, got %d\n", curr_val[0], mi[0]); + ok(mi[1] == curr_val[1], "expected Y threshold %d, got %d\n", curr_val[1], mi[1]); + ok(mi[2] == curr_val[2] || broken(mi[2] == 1) /* Win10 1709+ */, + "expected acceleration %d, got %d\n", curr_val[2], mi[2]); if (0) { @@ -2921,7 +2919,7 @@ static void test_GetSystemMetrics( void) static void compare_font( const LOGFONTW *lf1, const LOGFONTW *lf2, int dpi, int custom_dpi, int line ) { - ok_(__FILE__,line)( lf1->lfHeight == MulDiv( lf2->lfHeight, dpi, custom_dpi ), + ok_(__FILE__,line)( lf2->lfHeight == (dpi == custom_dpi) ? lf1->lfHeight : MulDiv( lf1->lfHeight, custom_dpi, 2 * dpi ), "wrong lfHeight %d vs %d\n", lf1->lfHeight, lf2->lfHeight ); ok_(__FILE__,line)( abs( lf1->lfWidth - MulDiv( lf2->lfWidth, dpi, custom_dpi )) <= 1, "wrong lfWidth %d vs %d\n", lf1->lfWidth, lf2->lfWidth ); @@ -3015,6 +3013,13 @@ static void test_metrics_for_dpi( int custom_dpi ) "%u: wrong value %u vs %u font %u vs %u\n", i, ret1, ret2, get_tmheightW( &ncm1.lfMenuFont, 1 ), get_tmheightW( &ncm2.lfMenuFont, 1 )); break; + case SM_CYMIN: + case SM_CYMINTRACK: + val = pGetSystemMetricsForDpi( SM_CYCAPTION, custom_dpi ); + val += 2 * pGetSystemMetricsForDpi( SM_CYFRAME, custom_dpi ); + val += 2 * ncm2.iPaddedBorderWidth; + ok( ret1 == ret2 || ret2 == val /* Win10 1709+ */, "%u: expected %u or %u, got %u\n", i, ret1, val, ret2 ); + break; default: ok( ret1 == ret2, "%u: wrong value %u vs %u\n", i, ret1, ret2 ); break; @@ -3684,32 +3689,48 @@ static void test_dpi_context(void) switch (i) { case 0x10: + ok( awareness == DPI_AWARENESS_UNAWARE || awareness == DPI_AWARENESS_INVALID /* Win10 1709+ */, + "%lx: wrong value %u\n", i, awareness ); + break; case 0x11: case 0x12: ok( awareness == (i & ~0x10), "%lx: wrong value %u\n", i, awareness ); - ok( pIsValidDpiAwarenessContext( (DPI_AWARENESS_CONTEXT)i ), "%lx: not valid\n", i ); + break; + case 0x22: + ok( awareness == DPI_AWARENESS_INVALID || awareness == DPI_AWARENESS_PER_MONITOR_AWARE /* Win10 1709+ */, + "%lx: wrong value %u\n", i, awareness ); break; default: ok( awareness == DPI_AWARENESS_INVALID, "%lx: wrong value %u\n", i, awareness ); - ok( !pIsValidDpiAwarenessContext( (DPI_AWARENESS_CONTEXT)i ), "%lx: valid\n", i ); break; } + ret = pIsValidDpiAwarenessContext( (DPI_AWARENESS_CONTEXT)i ); + ok( ret == (awareness != DPI_AWARENESS_INVALID), "%lx: expected %d, got %d\n", + i, (awareness != DPI_AWARENESS_INVALID), ret ); + awareness = pGetAwarenessFromDpiAwarenessContext( (DPI_AWARENESS_CONTEXT)(i | 0x80000000) ); switch (i) { case 0x10: + ok( awareness == DPI_AWARENESS_UNAWARE || awareness == DPI_AWARENESS_INVALID /* Win10 1709+ */, + "%lx: wrong value %u\n", i | 0x80000000, awareness ); + break; case 0x11: case 0x12: ok( awareness == (i & ~0x10), "%lx: wrong value %u\n", i | 0x80000000, awareness ); - ok( pIsValidDpiAwarenessContext( (DPI_AWARENESS_CONTEXT)(i | 0x80000000) ), - "%lx: not valid\n", i | 0x80000000 ); + break; + case 0x22: + ok( awareness == DPI_AWARENESS_INVALID || awareness == DPI_AWARENESS_PER_MONITOR_AWARE /* Win10 1709+ */, + "%lx: wrong value %u\n", i, awareness ); break; default: ok( awareness == DPI_AWARENESS_INVALID, "%lx: wrong value %u\n", i | 0x80000000, awareness ); - ok( !pIsValidDpiAwarenessContext( (DPI_AWARENESS_CONTEXT)(i | 0x80000000) ), - "%lx: valid\n", i | 0x80000000 ); break; } + ret = pIsValidDpiAwarenessContext( (DPI_AWARENESS_CONTEXT)(i | 0x80000000) ); + ok( ret == (awareness != DPI_AWARENESS_INVALID), "%lx: expected %d, got %d\n", + (i | 0x80000000), (awareness != DPI_AWARENESS_INVALID), ret ); + awareness = pGetAwarenessFromDpiAwarenessContext( (DPI_AWARENESS_CONTEXT)~i ); switch (~i) { -- 2.24.1

2 1

[PATCH] atl: Fix the ATL_WNDCLASSINFOW::m_szAutoName member definition and construction.
by Hermès BÉLUSCA-MAÏTO 16 Jan '20

16 Jan '20

- Document the m_szAutoName size. - Make the format actually MS-compatible: "ATL" followed by colon, followed by hexadecimal digits of pointer (4*2 digits on 32-bit platforms, 8*2 digits on 64-bit platforms). This correctly fix x64 compilation and still make the autogenerated name "unique". - Add a test that checks the name prefix. Signed-off-by: Hermes Belusca-Maito <hermes.belusca(a)sfr.fr>

2 3

[PATCH] testbot/LogUtils: Return the log errors as a single object.
by Francois Gouget 16 Jan '20

16 Jan '20

The $LogInfo structure is more extensible and can carry additional information such as the total number of errors (ErrCount) and the total number of new errors (NewCount). Adjust _AddErrorGroup(), TagNewErrors() and _DumpErrors() to take the new $LogInfo structure returned by GetLogErrors() instead of the ($Groups, $Errors) tuple. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/WineSendLog.pl | 26 +++--- testbot/lib/WineTestBot/LogUtils.pm | 129 +++++++++++++++++----------- testbot/web/JobDetails.pl | 21 +++-- 3 files changed, 103 insertions(+), 73 deletions(-) diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl index 6704f9828..fdf7e2409 100755 --- a/testbot/bin/WineSendLog.pl +++ b/testbot/bin/WineSendLog.pl @@ -208,18 +208,18 @@ EOF $JobErrors->{$Key}->{LogNames} = $LogNames; foreach my $LogName (@$LogNames) { - my ($Groups, $Errors) = GetLogErrors("$TaskDir/$LogName"); - next if (!$Groups or !@$Groups); + my $LogInfo = GetLogErrors("$TaskDir/$LogName"); + next if (!$LogInfo->{ErrCount}); $JobErrors->{$Key}->{HasErrors} = 1; - $JobErrors->{$Key}->{$LogName}->{Groups} = $Groups; - $JobErrors->{$Key}->{$LogName}->{Errors} = $Errors; + $JobErrors->{$Key}->{$LogName} = $LogInfo; print $Sendmail "\n=== ", GetTitle($StepTask, $LogName), " ===\n"; - foreach my $GroupName (@$Groups) + foreach my $GroupName (@{$LogInfo->{ErrGroupNames}}) { print $Sendmail ($GroupName ? "\n$GroupName:\n" : "\n"); - print $Sendmail "$_\n" for (@{$Errors->{$GroupName}->{Errors}}); + my $Group = $LogInfo->{ErrGroups}->{$GroupName}; + print $Sendmail "$_\n" for (@{$Group->{Errors}}); } } } @@ -288,14 +288,14 @@ EOF foreach my $LogName (@{$JobErrors->{$Key}->{LogNames}}) { - my $LogErrors = $JobErrors->{$Key}->{$LogName}; + my $LogInfo = $JobErrors->{$Key}->{$LogName}; # Skip if there are no errors - next if (!$LogErrors->{Groups}); + next if (!$LogInfo->{ErrCount}); my $AllNew; my $RefReportPath = $StepTask->GetFullFileName($StepTask->GetRefReportName($LogName)); - my $NewCount = TagNewErrors($RefReportPath, $LogErrors->{Groups}, $LogErrors->{Errors}); - if (!defined $NewCount) + TagNewErrors($RefReportPath, $LogInfo); + if (!defined $LogInfo->{NewCount}) { # Test reports should have reference WineTest results and if not # reporting the errors as new would cause false positives. @@ -304,7 +304,7 @@ EOF # Build logs don't have reference logs so for them every error is new. $AllNew = 1; } - elsif (!$NewCount) + elsif (!$LogInfo->{NewCount}) { # There is no new error next; @@ -312,9 +312,9 @@ EOF push @Messages, "\n=== ". GetTitle($StepTask, $LogName) ." ===\n"; - foreach my $GroupName (@{$LogErrors->{Groups}}) + foreach my $GroupName (@{$LogInfo->{ErrGroupNames}}) { - my $Group = $LogErrors->{Errors}->{$GroupName}; + my $Group = $LogInfo->{ErrGroups}->{$GroupName}; next if (!$AllNew and !$Group->{NewCount}); push @Messages, ($GroupName ? "\n$GroupName:\n" : "\n"); diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index e1a8176ac..815e0d8db 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -658,33 +658,35 @@ sub GetLogLabel($) } -sub _DumpErrors($$$) +sub _DumpErrors($$) { - my ($Label, $Groups, $Errors) = @_; + my ($Label, $LogInfo) = @_; - print STDERR "$Label:\n"; - print STDERR " Groups=", scalar(@$Groups), " [", join(",", @$Groups), "]\n"; - my @ErrorKeys = sort keys %$Errors; + print STDERR "$Label: ", join(" ", keys %$LogInfo), "\n"; + my $GroupNames = $LogInfo->{ErrGroupNames}; + print STDERR " Groups=", scalar(@$GroupNames), " [", join(",", @$GroupNames), "]\n"; + my @ErrorKeys = sort keys %{$LogInfo->{Groups}}; print STDERR " Errors=", scalar(@ErrorKeys), " [", join(",", @ErrorKeys), "]\n"; - foreach my $GroupName (@$Groups) + foreach my $GroupName (@$GroupNames) { print STDERR " [$GroupName]\n"; - print STDERR " [$_]\n" for (@{$Errors->{$GroupName}->{Errors}}); + my $Group = $LogInfo->{Groups}->{$GroupName}; + print STDERR " [$_]\n" for (@{$Group->{Errors}}); } } -sub _AddErrorGroup($$$) +sub _AddErrorGroup($$) { - my ($Groups, $Errors, $GroupName) = @_; + my ($LogInfo, $GroupName) = @_; # In theory the error group names are all unique. But, just in case, make - # sure we don't overwrite $Errors->{$GroupName}. - if (!$Errors->{$GroupName}) + # sure we don't overwrite $LogInfo->{ErrGroups}->{$GroupName}. + if (!$LogInfo->{ErrGroups}->{$GroupName}) { - push @$Groups, $GroupName; - $Errors->{$GroupName} = {Errors => []}; + push @{$LogInfo->{ErrGroupNames}}, $GroupName; + $LogInfo->{ErrGroups}->{$GroupName} = { Errors => [] }; } - return $Errors->{$GroupName}; + return $LogInfo->{ErrGroups}->{$GroupName}; } =pod @@ -696,8 +698,24 @@ Analyzes the specified log and associated error file to filter out unimportant messages and only return the errors, split by module (for Wine reports that's per dll / program being tested). -Returns a list of modules containing errors, and a hashtable containing the list of errors for each module. +Returns a hashtable containing: +=over + +=item ErrCount +The number of errors. This is undefined if no log file was found. + +=item ErrGroupNames +An array containing the names of all the error groups. + +=item ErrGroups +A hashtable indexed by the error group name. Each entry contains: + +=over +=item Errors +An array containing the error messages. +=back +=back =back =cut @@ -716,12 +734,14 @@ sub GetLogErrors($) $GetCategory = \&GetLogLineCategory; } - my $NoLog = 1; - my $Groups = []; - my $Errors = {}; + my $LogInfo = { + ErrCount => undef, # until we open a log + ErrGroupNames => [], + ErrGroups => {}, + }; if (open(my $LogFile, "<", $LogFileName)) { - $NoLog = 0; + $LogInfo->{ErrCount} ||= 0; my $CurrentModule = ""; my $CurrentGroup; foreach my $Line (<$LogFile>) @@ -743,22 +763,23 @@ sub GetLogErrors($) } if (!$CurrentGroup) { - $CurrentGroup = _AddErrorGroup($Groups, $Errors, $CurrentModule); + $CurrentGroup = _AddErrorGroup($LogInfo, $CurrentModule); } push @{$CurrentGroup->{Errors}}, $Line; + $LogInfo->{ErrCount}++; } close($LogFile); } elsif (-f $LogFileName) { - $NoLog = 0; - my $Group = _AddErrorGroup($Groups, $Errors, "TestBot errors"); - $Group->{Errors} = ["Could not open '". basename($LogFileName) ."' for reading: $!"]; + my $Group = _AddErrorGroup($LogInfo, "TestBot errors"); + push @{$Group->{Errors}}, "Could not open '". basename($LogFileName) ."' for reading: $!"; + $LogInfo->{ErrCount}++; } if (open(my $LogFile, "<", "$LogFileName.err")) { - $NoLog = 0; + $LogInfo->{ErrCount} ||= 0; # Add the related extra errors my $CurrentGroup; foreach my $Line (<$LogFile>) @@ -769,20 +790,21 @@ sub GetLogErrors($) # Note: $GroupName must not depend on the previous content as this # would break diffs. my $GroupName = $IsReport ? "Report errors" : "Task errors"; - $CurrentGroup = _AddErrorGroup($Groups, $Errors, $GroupName); + $CurrentGroup = _AddErrorGroup($LogInfo, $GroupName); } push @{$CurrentGroup->{Errors}}, $Line; + $LogInfo->{ErrCount}++; } close($LogFile); } elsif (-f "$LogFileName.err") { - $NoLog = 0; - my $Group = _AddErrorGroup($Groups, $Errors, "TestBot errors"); - $Group->{Errors} = ["Could not open '". basename($LogFileName) .".err' for reading: $!"]; + my $Group = _AddErrorGroup($LogInfo, "TestBot errors"); + push @{$Group->{Errors}}, "Could not open '". basename($LogFileName) .".err' for reading: $!"; + $LogInfo->{ErrCount}++; } - return $NoLog ? (undef, undef) : ($Groups, $Errors); + return $LogInfo; } sub _DumpDiff($$) @@ -849,42 +871,52 @@ sub _GetLineKey($) Compares the specified errors to the reference report to identify new errors. -Adds two fields to each error group: +The $LogInfo structure is augmented with the following fields: =over =item NewCount -A count of the new errors. +The total number of new errors or undef if the reference log could not be read. + +=item ErrGroups +=over + +=item NewCount +A count of the group's new errors. =item IsNew -An array where entries are set to true to identify new errors. +An array indicating which entries in the group's Errors array are new +or undef if there are no new errors in this group. =back -Returns a global count of the new errors. Returns undef if there is no -reference log to identify the new errors. - +=back =back =cut -sub TagNewErrors($$$) +sub TagNewErrors($$) { - my ($RefLogPath, $Groups, $Errors) = @_; + my ($RefLogPath, $LogInfo) = @_; - return 0 if (!$Groups or !@$Groups); + if (!$LogInfo->{ErrCount}) + { + $LogInfo->{NewCount} = 0; + return; + } - my ($RefGroups, $RefErrors) = GetLogErrors($RefLogPath); - return undef if (!$RefGroups); + my $RefInfo = GetLogErrors($RefLogPath); + # Don't tag the errors as new if there is no reference log + return if (!defined $RefInfo->{ErrCount}); - my $NewCount = 0; - foreach my $GroupName (@$Groups) + $LogInfo->{NewCount} = 0; + foreach my $GroupName (@{$LogInfo->{ErrGroupNames}}) { - my $Group = $Errors->{$GroupName}; + my $Group = $LogInfo->{ErrGroups}->{$GroupName}; $Group->{NewCount} = 0; - if ($RefErrors->{$GroupName}) + my $RefGroup = $RefInfo->{ErrGroups}->{$GroupName}; + if ($RefGroup) { - my $Diff = Algorithm::Diff->new($RefErrors->{$GroupName}->{Errors}, - $Group->{Errors}, + my $Diff = Algorithm::Diff->new($RefGroup->{Errors}, $Group->{Errors}, { keyGen => \&_GetLineKey }); my $ErrIndex = 0; while ($Diff->Next()) @@ -909,6 +941,7 @@ sub TagNewErrors($$$) } else { + # All errors in this group are new $Group->{NewCount} = @{$Group->{Errors}}; if ($Group->{NewCount}) { @@ -918,10 +951,8 @@ sub TagNewErrors($$$) } } } - $NewCount += $Group->{NewCount}; + $LogInfo->{NewCount} += $Group->{NewCount}; } - - return $NewCount; } 1; diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index ee4013a1b..76de1bb23 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -500,21 +500,20 @@ EOF # # Figure out which logs / reports actually have errors - my $LogSummaries; + my $LogInfos; foreach my $LogName (@{$MoreInfo->{Logs}}) { next if ($LogName =~ /^old_/); - my ($Groups, $Errors) = GetLogErrors("$TaskDir/$LogName"); - next if (!$Groups or !@$Groups); - $LogSummaries->{$LogName}->{Groups} = $Groups; - $LogSummaries->{$LogName}->{Errors} = $Errors; + my $LogInfo = GetLogErrors("$TaskDir/$LogName"); + next if (!$LogInfo->{ErrCount}); + $LogInfos->{$LogName} = $LogInfo; } - my $ShowLogName = ($ReportCount > 1 or scalar(keys %$LogSummaries) > 1); + my $ShowLogName = ($ReportCount > 1 or scalar(keys %$LogInfos) > 1); my $LogIsEmpty = 1; foreach my $LogName (@{$MoreInfo->{Logs}}) { - next if (!$LogSummaries->{$LogName}); + next if (!$LogInfos->{$LogName}); $LogIsEmpty = 0; if ($ShowLogName) @@ -524,21 +523,21 @@ EOF print "<div class='HrTitle'>$Label<div class='HrLine'></div></div>\n"; } - my $Summary = $LogSummaries->{$LogName}; + my $LogInfo = $LogInfos->{$LogName}; if ($LogName =~ /\.report$/) { # For test reports try to identify the new errors my $RefReportPath = $StepTask->GetFullFileName($StepTask->GetRefReportName($LogName)); - TagNewErrors($RefReportPath, $Summary->{Groups}, $Summary->{Errors}); + TagNewErrors($RefReportPath, $LogInfo); } - foreach my $GroupName (@{$Summary->{Groups}}) + foreach my $GroupName (@{$LogInfo->{ErrGroupNames}}) { print "<div class='LogDllName'>$GroupName</div>\n" if ($GroupName); print "<pre><code>"; my $ErrIndex = 0; - my $Group = $Summary->{Errors}->{$GroupName}; + my $Group = $LogInfo->{ErrGroups}->{$GroupName}; foreach my $Line (@{$Group->{Errors}}) { if ($Group->{IsNew}->[$ErrIndex]) -- 2.20.1

1 0

[PATCH] testbot/Janitor: There should be no *_work file in staging/.
by Francois Gouget 16 Jan '20

16 Jan '20

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/Janitor.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/Janitor.pl b/testbot/bin/Janitor.pl index 579a43275..f78c75d72 100755 --- a/testbot/bin/Janitor.pl +++ b/testbot/bin/Janitor.pl @@ -276,7 +276,7 @@ if (opendir(my $dh, "$DataDir/staging")) # These files always expire after one day $TTL = 1 - $Age; } - elsif ($Entry !~ /^[0-9a-f]{32}_(?:patch|patch\.diff|wine-patches|winetest(?:64)?-latest\.exe|work)$/) + elsif ($Entry !~ /^[0-9a-f]{32}_(?:patch|patch\.diff|wine-patches|winetest(?:64)?-latest\.exe)$/) { my $Deletion = defined $TTL ? " (deletion in $TTL days)" : ""; Error "Found a suspicious file$Deletion: staging/$Entry\n"; -- 2.20.1

1 0

[PATCH] dwrite/tests: Improve DrawUnderline() test reliability by using text tested font actually supports.
by Nikolay Sivov 16 Jan '20

16 Jan '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- Currently used string "ae" trigger fallback for fonts that don't support this Latin range, it's easy to reproduce with Noto fonts that target specific script. dlls/dwrite/tests/layout.c | 34 ++++++++++++++++++++++++++++------ 1 file changed, 28 insertions(+), 6 deletions(-) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 8532555e06..48b2880079 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -5346,14 +5346,17 @@ todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); count = IDWriteFontCollection_GetFontFamilyCount(syscollection); - for (i = 0; i < count; i++) { + for (i = 0; i < count; ++i) + { DWRITE_FONT_METRICS fontmetrics; IDWriteLocalizedStrings *names; struct renderer_context ctxt; IDWriteFontFamily *family; IDWriteFontFace *fontface; + WCHAR nameW[256], str[1]; IDWriteFont *font; - WCHAR nameW[256]; + UINT32 codepoint; + UINT16 glyph; BOOL exists; format = NULL; @@ -5414,19 +5417,38 @@ todo_wine DWRITE_FONT_STRETCH_NORMAL, fontmetrics.designUnitsPerEm, enusW, &format); ok(hr == S_OK, "got 0x%08x\n", hr); - hr = IDWriteFactory_CreateTextLayout(factory, strW, 2, format, 30000.0f, 100.0f, &layout); - ok(hr == S_OK, "got 0x%08x\n", hr); + /* Look for first supported character to avoid triggering fallback path. With fallback it's harder to test + DrawUnderline() metrics, because actual resolved fontface is not passed to it. Grabbing fontface instance + from corresponding DrawGlyphRun() call is not straightforward. */ + for (codepoint = ' '; codepoint < 0xffff; ++codepoint) + { + glyph = 0; + hr = IDWriteFontFace_GetGlyphIndices(fontface, &codepoint, 1, &glyph); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + if (glyph) + break; + } + + if (!glyph) + { + skip("Couldn't find reasonable test string.\n"); + goto cleanup; + } + + str[0] = codepoint; + hr = IDWriteFactory_CreateTextLayout(factory, str, 1, format, 30000.0f, 100.0f, &layout); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); range.startPosition = 0; range.length = 2; hr = IDWriteTextLayout_SetUnderline(layout, TRUE, range); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); memset(&ctxt, 0, sizeof(ctxt)); ctxt.format = format; ctxt.familyW = nameW; hr = IDWriteTextLayout_Draw(layout, &ctxt, &testrenderer, 0.0f, 0.0f); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); cleanup: if (layout) -- 2.24.1

1 0

[PATCH v2 2/2] api-ms-win-core-rtlsupport-l1-2-0: Add missing spec file entries.
by Zhiyi Zhang 16 Jan '20

16 Jan '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48416 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- .../api-ms-win-core-rtlsupport-l1-2-0.spec | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/api-ms-win-core-rtlsupport-l1-2-0/api-ms-win-core-rtlsupport-l1-2-0.spec b/dlls/api-ms-win-core-rtlsupport-l1-2-0/api-ms-win-core-rtlsupport-l1-2-0.spec index a037b0d260..35f7dbba72 100644 --- a/dlls/api-ms-win-core-rtlsupport-l1-2-0/api-ms-win-core-rtlsupport-l1-2-0.spec +++ b/dlls/api-ms-win-core-rtlsupport-l1-2-0/api-ms-win-core-rtlsupport-l1-2-0.spec @@ -1,6 +1,16 @@ +@ cdecl -arch=arm,arm64,x86_64 RtlAddFunctionTable(ptr long long) ntdll.RtlAddFunctionTable +@ stdcall -arch=arm,arm64,x86_64 RtlAddGrowableFunctionTable(ptr ptr long long long long) ntdll.RtlAddGrowableFunctionTable @ stdcall -norelay RtlCaptureContext(ptr) ntdll.RtlCaptureContext @ stdcall RtlCaptureStackBackTrace(long long ptr ptr) ntdll.RtlCaptureStackBackTrace @ stdcall RtlCompareMemory(ptr ptr long) ntdll.RtlCompareMemory +@ cdecl -arch=arm,arm64,x86_64 RtlDeleteFunctionTable(ptr) ntdll.RtlDeleteFunctionTable +@ stdcall -arch=arm,arm64,x86_64 RtlDeleteGrowableFunctionTable(ptr) ntdll.RtlDeleteGrowableFunctionTable +@ stdcall -arch=arm,arm64,x86_64 RtlGrowFunctionTable(ptr long) ntdll.RtlGrowFunctionTable +@ cdecl -arch=arm,arm64,x86_64 RtlInstallFunctionTableCallback(long long long ptr ptr wstr) ntdll.RtlInstallFunctionTableCallback +@ stdcall -arch=arm,arm64,x86_64 RtlLookupFunctionEntry(long ptr ptr) ntdll.RtlLookupFunctionEntry @ stdcall RtlPcToFileHeader(ptr ptr) ntdll.RtlPcToFileHeader @ stdcall -norelay RtlRaiseException(ptr) ntdll.RtlRaiseException +@ cdecl -arch=x86_64 RtlRestoreContext(ptr ptr) ntdll.RtlRestoreContext @ stdcall -norelay RtlUnwind(ptr ptr ptr ptr) ntdll.RtlUnwind +@ stdcall -arch=arm64,x86_64 RtlUnwindEx(ptr ptr ptr ptr ptr ptr) ntdll.RtlUnwindEx +@ stdcall -arch=arm64,x86_64 RtlVirtualUnwind(long long long ptr ptr ptr ptr ptr) ntdll.RtlVirtualUnwind -- 2.20.1

2 1

[PATCH v2 1/2] ntdll: Fix some Rtl* functions having wrong calling convention.
by Zhiyi Zhang 16 Jan '20

16 Jan '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- v2: Fix more errors. .../api-ms-win-core-rtlsupport-l1-1-0.spec | 2 +- dlls/kernel32/kernel32.spec | 2 +- dlls/ntdll/ntdll.spec | 6 +++--- dlls/ntdll/signal_x86_64.c | 2 +- dlls/ntdll/tests/exception.c | 8 ++++---- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/api-ms-win-core-rtlsupport-l1-1-0/api-ms-win-core-rtlsupport-l1-1-0.spec b/dlls/api-ms-win-core-rtlsupport-l1-1-0/api-ms-win-core-rtlsupport-l1-1-0.spec index 030506858b..0554127929 100644 --- a/dlls/api-ms-win-core-rtlsupport-l1-1-0/api-ms-win-core-rtlsupport-l1-1-0.spec +++ b/dlls/api-ms-win-core-rtlsupport-l1-1-0/api-ms-win-core-rtlsupport-l1-1-0.spec @@ -9,7 +9,7 @@ @ stdcall -arch=arm,arm64,x86_64 RtlLookupFunctionEntry(long ptr ptr) ntdll.RtlLookupFunctionEntry @ stdcall RtlPcToFileHeader(ptr ptr) ntdll.RtlPcToFileHeader @ stdcall -norelay RtlRaiseException(ptr) ntdll.RtlRaiseException -@ stdcall -arch=x86_64 RtlRestoreContext(ptr ptr) ntdll.RtlRestoreContext +@ cdecl -arch=x86_64 RtlRestoreContext(ptr ptr) ntdll.RtlRestoreContext @ stdcall -norelay RtlUnwind(ptr ptr ptr ptr) ntdll.RtlUnwind @ stdcall -arch=arm64,x86_64 RtlUnwindEx(ptr ptr ptr ptr ptr ptr) ntdll.RtlUnwindEx @ stdcall -arch=arm64,x86_64 RtlVirtualUnwind(long long long ptr ptr ptr ptr ptr) ntdll.RtlVirtualUnwind diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index a14bed04be..be48ef1694 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1299,7 +1299,7 @@ @ stdcall RtlMoveMemory(ptr ptr long) ntdll.RtlMoveMemory @ stdcall -arch=x86_64,arm,arm64 RtlPcToFileHeader(ptr ptr) ntdll.RtlPcToFileHeader @ stdcall -arch=arm -norelay RtlRaiseException(ptr) ntdll.RtlRaiseException -@ stdcall -arch=x86_64 RtlRestoreContext(ptr ptr) ntdll.RtlRestoreContext +@ cdecl -arch=x86_64 RtlRestoreContext(ptr ptr) ntdll.RtlRestoreContext @ stdcall RtlUnwind(ptr ptr ptr long) ntdll.RtlUnwind @ stdcall -arch=arm64,x86_64 RtlUnwindEx(long long ptr long ptr) ntdll.RtlUnwindEx @ stdcall -arch=arm64,x86_64 RtlVirtualUnwind(long long long ptr ptr ptr ptr ptr) ntdll.RtlVirtualUnwind diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 415a43ab53..fe36235bda 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -463,7 +463,7 @@ @ stdcall RtlAddMandatoryAce(ptr long long long long ptr) # @ stub RtlAddRange @ cdecl -arch=arm,arm64,x86_64 RtlAddFunctionTable(ptr long long) -@ cdecl -arch=arm,arm64,x86_64 RtlAddGrowableFunctionTable(ptr ptr long long long long) +@ stdcall -arch=arm,arm64,x86_64 RtlAddGrowableFunctionTable(ptr ptr long long long long) @ stdcall RtlAddRefActivationContext(ptr) # @ stub RtlAddRefMemoryStream @ stdcall RtlAddVectoredContinueHandler(long ptr) @@ -572,7 +572,7 @@ @ stdcall RtlDeleteAce(ptr long) @ stdcall RtlDeleteAtomFromAtomTable(ptr long) @ stdcall RtlDeleteCriticalSection(ptr) -@ cdecl -arch=arm,arm64,x86_64 RtlDeleteGrowableFunctionTable(ptr) +@ stdcall -arch=arm,arm64,x86_64 RtlDeleteGrowableFunctionTable(ptr) @ stub RtlDeleteElementGenericTable @ stub RtlDeleteElementGenericTableAvl @ cdecl -arch=arm,arm64,x86_64 RtlDeleteFunctionTable(ptr) @@ -902,7 +902,7 @@ @ stdcall RtlRemoveVectoredContinueHandler(ptr) @ stdcall RtlRemoveVectoredExceptionHandler(ptr) @ stdcall RtlResetRtlTranslations(ptr) -@ stdcall -arch=x86_64 RtlRestoreContext(ptr ptr) +@ cdecl -arch=x86_64 RtlRestoreContext(ptr ptr) @ stdcall RtlRestoreLastWin32Error(long) RtlSetLastWin32Error @ stub RtlRevertMemoryStream @ stub RtlRunDecodeUnicodeString diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index c372f65b34..04f3854388 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -3747,7 +3747,7 @@ __ASM_GLOBAL_FUNC( call_consolidate_callback, /******************************************************************* * RtlRestoreContext (NTDLL.@) */ -void WINAPI RtlRestoreContext( CONTEXT *context, EXCEPTION_RECORD *rec ) +void CDECL RtlRestoreContext( CONTEXT *context, EXCEPTION_RECORD *rec ) { EXCEPTION_REGISTRATION_RECORD *teb_frame = NtCurrentTeb()->Tib.ExceptionList; diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 7b77cbb795..e8b481e703 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -150,15 +150,15 @@ static BOOLEAN (CDECL *pRtlAddFunctionTable)(RUNTIME_FUNCTION*, DWORD, DWORD64 static BOOLEAN (CDECL *pRtlDeleteFunctionTable)(RUNTIME_FUNCTION*); static BOOLEAN (CDECL *pRtlInstallFunctionTableCallback)(DWORD64, DWORD64, DWORD, PGET_RUNTIME_FUNCTION_CALLBACK, PVOID, PCWSTR); static PRUNTIME_FUNCTION (WINAPI *pRtlLookupFunctionEntry)(ULONG64, ULONG64*, UNWIND_HISTORY_TABLE*); -static DWORD (CDECL *pRtlAddGrowableFunctionTable)(void**, RUNTIME_FUNCTION*, DWORD, DWORD, ULONG_PTR, ULONG_PTR); -static void (CDECL *pRtlGrowFunctionTable)(void*, DWORD); -static void (CDECL *pRtlDeleteGrowableFunctionTable)(void*); +static DWORD (WINAPI *pRtlAddGrowableFunctionTable)(void**, RUNTIME_FUNCTION*, DWORD, DWORD, ULONG_PTR, ULONG_PTR); +static void (WINAPI *pRtlGrowFunctionTable)(void*, DWORD); +static void (WINAPI *pRtlDeleteGrowableFunctionTable)(void*); static EXCEPTION_DISPOSITION (WINAPI *p__C_specific_handler)(EXCEPTION_RECORD*, ULONG64, CONTEXT*, DISPATCHER_CONTEXT*); static VOID (WINAPI *pRtlCaptureContext)(CONTEXT*); static VOID (CDECL *pRtlRestoreContext)(CONTEXT*, EXCEPTION_RECORD*); static NTSTATUS (WINAPI *pRtlWow64GetThreadContext)(HANDLE, WOW64_CONTEXT *); static NTSTATUS (WINAPI *pRtlWow64SetThreadContext)(HANDLE, const WOW64_CONTEXT *); -static VOID (CDECL *pRtlUnwindEx)(VOID*, VOID*, EXCEPTION_RECORD*, VOID*, CONTEXT*, UNWIND_HISTORY_TABLE*); +static VOID (WINAPI *pRtlUnwindEx)(VOID*, VOID*, EXCEPTION_RECORD*, VOID*, CONTEXT*, UNWIND_HISTORY_TABLE*); static int (CDECL *p_setjmp)(_JUMP_BUFFER*); #endif -- 2.20.1

1 0

[PATCH 2/2 resend] api-ms-win-core-rtlsupport-l1-2-0: Add missing spec file entries.
by Zhiyi Zhang 16 Jan '20

16 Jan '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48416 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- .../api-ms-win-core-rtlsupport-l1-2-0.spec | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/api-ms-win-core-rtlsupport-l1-2-0/api-ms-win-core-rtlsupport-l1-2-0.spec b/dlls/api-ms-win-core-rtlsupport-l1-2-0/api-ms-win-core-rtlsupport-l1-2-0.spec index a037b0d260..4ac8f65079 100644 --- a/dlls/api-ms-win-core-rtlsupport-l1-2-0/api-ms-win-core-rtlsupport-l1-2-0.spec +++ b/dlls/api-ms-win-core-rtlsupport-l1-2-0/api-ms-win-core-rtlsupport-l1-2-0.spec @@ -1,6 +1,16 @@ +@ cdecl -arch=arm,arm64,x86_64 RtlAddFunctionTable(ptr long long) ntdll.RtlAddFunctionTable +@ cdecl -arch=arm,arm64,x86_64 RtlAddGrowableFunctionTable(ptr ptr long long long long) ntdll.RtlAddGrowableFunctionTable @ stdcall -norelay RtlCaptureContext(ptr) ntdll.RtlCaptureContext @ stdcall RtlCaptureStackBackTrace(long long ptr ptr) ntdll.RtlCaptureStackBackTrace @ stdcall RtlCompareMemory(ptr ptr long) ntdll.RtlCompareMemory +@ cdecl -arch=arm,arm64,x86_64 RtlDeleteFunctionTable(ptr) ntdll.RtlDeleteFunctionTable +@ stdcall -arch=arm,arm64,x86_64 RtlDeleteGrowableFunctionTable(ptr) ntdll.RtlDeleteGrowableFunctionTable +@ stdcall -arch=arm,arm64,x86_64 RtlGrowFunctionTable(ptr long) ntdll.RtlGrowFunctionTable +@ cdecl -arch=arm,arm64,x86_64 RtlInstallFunctionTableCallback(long long long ptr ptr wstr) ntdll.RtlInstallFunctionTableCallback +@ stdcall -arch=arm,arm64,x86_64 RtlLookupFunctionEntry(long ptr ptr) ntdll.RtlLookupFunctionEntry @ stdcall RtlPcToFileHeader(ptr ptr) ntdll.RtlPcToFileHeader @ stdcall -norelay RtlRaiseException(ptr) ntdll.RtlRaiseException +@ stdcall -arch=x86_64 RtlRestoreContext(ptr ptr) ntdll.RtlRestoreContext @ stdcall -norelay RtlUnwind(ptr ptr ptr ptr) ntdll.RtlUnwind +@ stdcall -arch=arm64,x86_64 RtlUnwindEx(ptr ptr ptr ptr ptr ptr) ntdll.RtlUnwindEx +@ stdcall -arch=arm64,x86_64 RtlVirtualUnwind(long long long ptr ptr ptr ptr ptr) ntdll.RtlVirtualUnwind -- 2.20.1

1 0

[PATCH 1/2 resend] ntdll: Fix RtlDeleteGrowableFunctionTable() calling convention.
by Zhiyi Zhang 16 Jan '20

16 Jan '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- Forgot to tell my newly installed Thunderbird client not to mess with patches. dlls/ntdll/ntdll.spec | 2 +- dlls/ntdll/tests/exception.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 415a43ab53..0a017185ee 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -572,7 +572,7 @@ @ stdcall RtlDeleteAce(ptr long) @ stdcall RtlDeleteAtomFromAtomTable(ptr long) @ stdcall RtlDeleteCriticalSection(ptr) -@ cdecl -arch=arm,arm64,x86_64 RtlDeleteGrowableFunctionTable(ptr) +@ stdcall -arch=arm,arm64,x86_64 RtlDeleteGrowableFunctionTable(ptr) @ stub RtlDeleteElementGenericTable @ stub RtlDeleteElementGenericTableAvl @ cdecl -arch=arm,arm64,x86_64 RtlDeleteFunctionTable(ptr) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 7b77cbb795..c016527e92 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -152,7 +152,7 @@ static BOOLEAN (CDECL *pRtlInstallFunctionTableCallback)(DWORD64, DWORD64, DWO static PRUNTIME_FUNCTION (WINAPI *pRtlLookupFunctionEntry)(ULONG64, ULONG64*, UNWIND_HISTORY_TABLE*); static DWORD (CDECL *pRtlAddGrowableFunctionTable)(void**, RUNTIME_FUNCTION*, DWORD, DWORD, ULONG_PTR, ULONG_PTR); static void (CDECL *pRtlGrowFunctionTable)(void*, DWORD); -static void (CDECL *pRtlDeleteGrowableFunctionTable)(void*); +static void (WINAPI *pRtlDeleteGrowableFunctionTable)(void*); static EXCEPTION_DISPOSITION (WINAPI *p__C_specific_handler)(EXCEPTION_RECORD*, ULONG64, CONTEXT*, DISPATCHER_CONTEXT*); static VOID (WINAPI *pRtlCaptureContext)(CONTEXT*); static VOID (CDECL *pRtlRestoreContext)(CONTEXT*, EXCEPTION_RECORD*); -- 2.20.1

1 0

[PATCH 1/2] ntdll: Fix RtlDeleteGrowableFunctionTable() calling convention.
by Zhiyi Zhang 16 Jan '20

16 Jan '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/ntdll/ntdll.spec | 2 +- dlls/ntdll/tests/exception.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 415a43ab53..0a017185ee 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -572,7 +572,7 @@ @ stdcall RtlDeleteAce(ptr long) @ stdcall RtlDeleteAtomFromAtomTable(ptr long) @ stdcall RtlDeleteCriticalSection(ptr) -@ cdecl -arch=arm,arm64,x86_64 RtlDeleteGrowableFunctionTable(ptr) +@ stdcall -arch=arm,arm64,x86_64 RtlDeleteGrowableFunctionTable(ptr) @ stub RtlDeleteElementGenericTable @ stub RtlDeleteElementGenericTableAvl @ cdecl -arch=arm,arm64,x86_64 RtlDeleteFunctionTable(ptr) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 7b77cbb795..c016527e92 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -152,7 +152,7 @@ static BOOLEAN (CDECL *pRtlInstallFunctionTableCallback)(DWORD64, DWORD64, DWO static PRUNTIME_FUNCTION (WINAPI *pRtlLookupFunctionEntry)(ULONG64, ULONG64*, UNWIND_HISTORY_TABLE*); static DWORD (CDECL *pRtlAddGrowableFunctionTable)(void**, RUNTIME_FUNCTION*, DWORD, DWORD, ULONG_PTR, ULONG_PTR); static void (CDECL *pRtlGrowFunctionTable)(void*, DWORD); -static void (CDECL *pRtlDeleteGrowableFunctionTable)(void*); +static void (WINAPI *pRtlDeleteGrowableFunctionTable)(void*); static EXCEPTION_DISPOSITION (WINAPI *p__C_specific_handler)(EXCEPTION_RECORD*, ULONG64, CONTEXT*, DISPATCHER_CONTEXT*); static VOID (WINAPI *pRtlCaptureContext)(CONTEXT*); static VOID (CDECL *pRtlRestoreContext)(CONTEXT*, EXCEPTION_RECORD*); -- 2.20.1

2 1

[PATCH 2/2] api-ms-win-core-rtlsupport-l1-2-0: Add missing spec file entries.
by Zhiyi Zhang 16 Jan '20

16 Jan '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48416 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- .../api-ms-win-core-rtlsupport-l1-2-0.spec | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/api-ms-win-core-rtlsupport-l1-2-0/api-ms-win-core-rtlsupport-l1-2-0.spec b/dlls/api-ms-win-core-rtlsupport-l1-2-0/api-ms-win-core-rtlsupport-l1-2-0.spec index a037b0d260..4ac8f65079 100644 --- a/dlls/api-ms-win-core-rtlsupport-l1-2-0/api-ms-win-core-rtlsupport-l1-2-0.spec +++ b/dlls/api-ms-win-core-rtlsupport-l1-2-0/api-ms-win-core-rtlsupport-l1-2-0.spec @@ -1,6 +1,16 @@ +@ cdecl -arch=arm,arm64,x86_64 RtlAddFunctionTable(ptr long long) ntdll.RtlAddFunctionTable +@ cdecl -arch=arm,arm64,x86_64 RtlAddGrowableFunctionTable(ptr ptr long long long long) ntdll.RtlAddGrowableFunctionTable @ stdcall -norelay RtlCaptureContext(ptr) ntdll.RtlCaptureContext @ stdcall RtlCaptureStackBackTrace(long long ptr ptr) ntdll.RtlCaptureStackBackTrace @ stdcall RtlCompareMemory(ptr ptr long) ntdll.RtlCompareMemory +@ cdecl -arch=arm,arm64,x86_64 RtlDeleteFunctionTable(ptr) ntdll.RtlDeleteFunctionTable +@ stdcall -arch=arm,arm64,x86_64 RtlDeleteGrowableFunctionTable(ptr) ntdll.RtlDeleteGrowableFunctionTable +@ stdcall -arch=arm,arm64,x86_64 RtlGrowFunctionTable(ptr long) ntdll.RtlGrowFunctionTable +@ cdecl -arch=arm,arm64,x86_64 RtlInstallFunctionTableCallback(long long long ptr ptr wstr) ntdll.RtlInstallFunctionTableCallback +@ stdcall -arch=arm,arm64,x86_64 RtlLookupFunctionEntry(long ptr ptr) ntdll.RtlLookupFunctionEntry @ stdcall RtlPcToFileHeader(ptr ptr) ntdll.RtlPcToFileHeader @ stdcall -norelay RtlRaiseException(ptr) ntdll.RtlRaiseException +@ stdcall -arch=x86_64 RtlRestoreContext(ptr ptr) ntdll.RtlRestoreContext @ stdcall -norelay RtlUnwind(ptr ptr ptr ptr) ntdll.RtlUnwind +@ stdcall -arch=arm64,x86_64 RtlUnwindEx(ptr ptr ptr ptr ptr ptr) ntdll.RtlUnwindEx +@ stdcall -arch=arm64,x86_64 RtlVirtualUnwind(long long long ptr ptr ptr ptr ptr) ntdll.RtlVirtualUnwind -- 2.20.1

1 0

[PATCH 1/3] qedit: Use wide character string literals.
by Zebediah Figura 16 Jan '20

16 Jan '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/qedit/mediadet.c | 10 +++------- dlls/qedit/nullrenderer.c | 4 +--- dlls/qedit/tests/mediadet.c | 14 ++++++-------- dlls/qedit/tests/nullrenderer.c | 19 ++++++++---------- dlls/qedit/tests/samplegrabber.c | 33 ++++++++++++++------------------ 5 files changed, 32 insertions(+), 48 deletions(-) diff --git a/dlls/qedit/mediadet.c b/dlls/qedit/mediadet.c index 1d70a86a5a..d5c01aff6b 100644 --- a/dlls/qedit/mediadet.c +++ b/dlls/qedit/mediadet.c @@ -340,8 +340,6 @@ static HRESULT WINAPI MediaDet_get_Filename(IMediaDet* iface, BSTR *pVal) /* From quartz, 2008/04/07 */ static HRESULT GetFilterInfo(IMoniker *pMoniker, GUID *pclsid, VARIANT *pvar) { - static const WCHAR wszClsidName[] = {'C','L','S','I','D',0}; - static const WCHAR wszFriendlyName[] = {'F','r','i','e','n','d','l','y','N','a','m','e',0}; IPropertyBag *pPropBagCat = NULL; HRESULT hr; @@ -352,7 +350,7 @@ static HRESULT GetFilterInfo(IMoniker *pMoniker, GUID *pclsid, VARIANT *pvar) (LPVOID *) &pPropBagCat); if (SUCCEEDED(hr)) - hr = IPropertyBag_Read(pPropBagCat, wszClsidName, pvar, NULL); + hr = IPropertyBag_Read(pPropBagCat, L"CLSID", pvar, NULL); if (SUCCEEDED(hr)) { @@ -362,7 +360,7 @@ static HRESULT GetFilterInfo(IMoniker *pMoniker, GUID *pclsid, VARIANT *pvar) } if (SUCCEEDED(hr)) - hr = IPropertyBag_Read(pPropBagCat, wszFriendlyName, pvar, NULL); + hr = IPropertyBag_Read(pPropBagCat, L"FriendlyName", pvar, NULL); if (SUCCEEDED(hr)) TRACE("Moniker = %s - %s\n", debugstr_guid(pclsid), debugstr_w(V_BSTR(pvar))); @@ -484,7 +482,6 @@ retry: static HRESULT WINAPI MediaDet_put_Filename(IMediaDet* iface, BSTR newVal) { - static const WCHAR reader[] = {'R','e','a','d','e','r',0}; MediaDetImpl *This = impl_from_IMediaDet(iface); IGraphBuilder *gb; IBaseFilter *bf; @@ -503,8 +500,7 @@ static HRESULT WINAPI MediaDet_put_Filename(IMediaDet* iface, BSTR newVal) if (FAILED(hr)) return hr; - hr = IGraphBuilder_AddSourceFilter(gb, newVal, reader, &bf); - if (FAILED(hr)) + if (FAILED(hr = IGraphBuilder_AddSourceFilter(gb, newVal, L"Reader", &bf))) { IGraphBuilder_Release(gb); return hr; diff --git a/dlls/qedit/nullrenderer.c b/dlls/qedit/nullrenderer.c index b3267d1ba1..575ecea89b 100644 --- a/dlls/qedit/nullrenderer.c +++ b/dlls/qedit/nullrenderer.c @@ -64,8 +64,6 @@ static const struct strmbase_renderer_ops renderer_ops = HRESULT NullRenderer_create(IUnknown *outer, void **out) { - static const WCHAR sink_name[] = {'I','n',0}; - HRESULT hr; NullRendererImpl *pNullRenderer; @@ -74,7 +72,7 @@ HRESULT NullRenderer_create(IUnknown *outer, void **out) pNullRenderer = CoTaskMemAlloc(sizeof(NullRendererImpl)); hr = strmbase_renderer_init(&pNullRenderer->renderer, outer, - &CLSID_NullRenderer, sink_name, &renderer_ops); + &CLSID_NullRenderer, L"In", &renderer_ops); if (FAILED(hr)) CoTaskMemFree(pNullRenderer); diff --git a/dlls/qedit/tests/mediadet.c b/dlls/qedit/tests/mediadet.c index 311d77bfa0..e52ee618dd 100644 --- a/dlls/qedit/tests/mediadet.c +++ b/dlls/qedit/tests/mediadet.c @@ -137,8 +137,6 @@ static WCHAR test_sound_avi_filename[MAX_PATH]; static BOOL unpack_avi_file(int id, WCHAR name[MAX_PATH]) { static WCHAR temp_path[MAX_PATH]; - static const WCHAR prefix[] = {'D','E','S',0}; - static const WCHAR avi[] = {'a','v','i',0}; HRSRC res; HGLOBAL data; char *mem; @@ -166,11 +164,11 @@ static BOOL unpack_avi_file(int id, WCHAR name[MAX_PATH]) return FALSE; /* We might end up relying on the extension here, so .TMP is no good. */ - if (!GetTempFileNameW(temp_path, prefix, 0, name)) + if (!GetTempFileNameW(temp_path, L"DES", 0, name)) return FALSE; DeleteFileW(name); - lstrcpyW(name + lstrlenW(name) - 3, avi); + wcscpy(name + wcslen(name) - 3, L"avi"); fh = CreateFileW(name, GENERIC_WRITE, 0, NULL, CREATE_NEW, FILE_ATTRIBUTE_NORMAL, NULL); @@ -272,8 +270,8 @@ static void test_mediadet(void) filename = NULL; hr = IMediaDet_get_Filename(pM, &filename); ok(hr == S_OK, "IMediaDet_get_Filename failed: %08x\n", hr); - ok(lstrcmpW(filename, test_avi_filename) == 0, - "IMediaDet_get_Filename\n"); + ok(!wcscmp(filename, test_avi_filename), "Expected filename %s, got %s.\n", + debugstr_w(test_avi_filename), debugstr_w(filename)); SysFreeString(filename); hr = IMediaDet_get_Filename(pM, NULL); @@ -344,8 +342,8 @@ static void test_mediadet(void) filename = NULL; hr = IMediaDet_get_Filename(pM, &filename); ok(hr == S_OK, "IMediaDet_get_Filename failed: %08x\n", hr); - ok(lstrcmpW(filename, test_sound_avi_filename) == 0, - "IMediaDet_get_Filename\n"); + ok(!wcscmp(filename, test_sound_avi_filename), "Expected filename %s, got %s.\n", + debugstr_w(test_sound_avi_filename), debugstr_w(filename)); SysFreeString(filename); /* I don't know if the stream order is deterministic. Just check diff --git a/dlls/qedit/tests/nullrenderer.c b/dlls/qedit/tests/nullrenderer.c index ab4cf54fa5..8f26e4716e 100644 --- a/dlls/qedit/tests/nullrenderer.c +++ b/dlls/qedit/tests/nullrenderer.c @@ -22,8 +22,6 @@ #include "dshow.h" #include "wine/test.h" -static const WCHAR sink_id[] = {'I','n',0}; - static IBaseFilter *create_null_renderer(void) { IBaseFilter *filter = NULL; @@ -79,7 +77,7 @@ static void test_interfaces(void) check_interface(filter, &IID_IReferenceClock, FALSE); check_interface(filter, &IID_IVideoWindow, FALSE); - IBaseFilter_FindPin(filter, sink_id, &pin); + IBaseFilter_FindPin(filter, L"In", &pin); check_interface(pin, &IID_IMemInputPin, TRUE); check_interface(pin, &IID_IPin, TRUE); @@ -187,20 +185,19 @@ static void test_enum_pins(void) static void test_find_pin(void) { - static const WCHAR input_pinW[] = {'i','n','p','u','t',' ','p','i','n',0}; IBaseFilter *filter = create_null_renderer(); IEnumPins *enum_pins; IPin *pin, *pin2; HRESULT hr; ULONG ref; - hr = IBaseFilter_FindPin(filter, input_pinW, &pin); + hr = IBaseFilter_FindPin(filter, L"input pin", &pin); ok(hr == VFW_E_NOT_FOUND, "Got hr %#x.\n", hr); hr = IBaseFilter_EnumPins(filter, &enum_pins); ok(hr == S_OK, "Got hr %#x.\n", hr); - hr = IBaseFilter_FindPin(filter, sink_id, &pin); + hr = IBaseFilter_FindPin(filter, L"In", &pin); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IEnumPins_Next(enum_pins, 1, &pin2, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -223,7 +220,7 @@ static void test_pin_info(void) ULONG ref; IPin *pin; - hr = IBaseFilter_FindPin(filter, sink_id, &pin); + hr = IBaseFilter_FindPin(filter, L"In", &pin); ok(hr == S_OK, "Got hr %#x.\n", hr); ref = get_refcount(filter); ok(ref == 2, "Got unexpected refcount %d.\n", ref); @@ -234,7 +231,7 @@ static void test_pin_info(void) ok(hr == S_OK, "Got hr %#x.\n", hr); ok(info.pFilter == filter, "Expected filter %p, got %p.\n", filter, info.pFilter); ok(info.dir == PINDIR_INPUT, "Got direction %d.\n", info.dir); - ok(!lstrcmpW(info.achName, sink_id), "Got name %s.\n", wine_dbgstr_w(info.achName)); + ok(!wcscmp(info.achName, L"In"), "Got name %s.\n", wine_dbgstr_w(info.achName)); ref = get_refcount(filter); ok(ref == 3, "Got unexpected refcount %d.\n", ref); ref = get_refcount(pin); @@ -247,7 +244,7 @@ static void test_pin_info(void) hr = IPin_QueryId(pin, &id); ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(!lstrcmpW(id, sink_id), "Got id %s.\n", wine_dbgstr_w(id)); + ok(!wcscmp(id, L"In"), "Got id %s.\n", wine_dbgstr_w(id)); CoTaskMemFree(id); hr = IPin_QueryInternalConnections(pin, NULL, NULL); @@ -361,7 +358,7 @@ static void test_media_types(void) ULONG ref; IPin *pin; - IBaseFilter_FindPin(filter, sink_id, &pin); + IBaseFilter_FindPin(filter, L"In", &pin); hr = IPin_EnumMediaTypes(pin, &enummt); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -388,7 +385,7 @@ static void test_enum_media_types(void) HRESULT hr; IPin *pin; - IBaseFilter_FindPin(filter, sink_id, &pin); + IBaseFilter_FindPin(filter, L"In", &pin); hr = IPin_EnumMediaTypes(pin, &enum1); ok(hr == S_OK, "Got hr %#x.\n", hr); diff --git a/dlls/qedit/tests/samplegrabber.c b/dlls/qedit/tests/samplegrabber.c index 2fcfe100ce..545e0062b0 100644 --- a/dlls/qedit/tests/samplegrabber.c +++ b/dlls/qedit/tests/samplegrabber.c @@ -23,11 +23,6 @@ #include "qedit.h" #include "wine/test.h" -static const WCHAR sink_id[] = {'I','n',0}; -static const WCHAR source_id[] = {'O','u','t',0}; -static const WCHAR sink_name[] = {'I','n','p','u','t',0}; -static const WCHAR source_name[] = {'O','u','t','p','u','t',0}; - static IBaseFilter *create_sample_grabber(void) { IBaseFilter *filter = NULL; @@ -97,7 +92,7 @@ static void test_interfaces(void) check_interface(filter, &IID_ISeekingPassThru, FALSE); check_interface(filter, &IID_IVideoWindow, FALSE); - IBaseFilter_FindPin(filter, sink_id, &pin); + IBaseFilter_FindPin(filter, L"In", &pin); check_interface(pin, &IID_IMemInputPin, TRUE); check_interface(pin, &IID_IPin, TRUE); @@ -110,7 +105,7 @@ static void test_interfaces(void) IPin_Release(pin); - IBaseFilter_FindPin(filter, source_id, &pin); + IBaseFilter_FindPin(filter, L"Out", &pin); /* Queries for IMediaPosition or IMediaSeeking do not seem to increase the * reference count. */ @@ -263,15 +258,15 @@ static void test_find_pin(void) HRESULT hr; ULONG ref; - hr = IBaseFilter_FindPin(filter, sink_name, &pin); + hr = IBaseFilter_FindPin(filter, L"Input", &pin); ok(hr == VFW_E_NOT_FOUND, "Got hr %#x.\n", hr); - hr = IBaseFilter_FindPin(filter, source_name, &pin); + hr = IBaseFilter_FindPin(filter, L"Output", &pin); ok(hr == VFW_E_NOT_FOUND, "Got hr %#x.\n", hr); hr = IBaseFilter_EnumPins(filter, &enum_pins); ok(hr == S_OK, "Got hr %#x.\n", hr); - hr = IBaseFilter_FindPin(filter, sink_id, &pin); + hr = IBaseFilter_FindPin(filter, L"In", &pin); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IEnumPins_Next(enum_pins, 1, &pin2, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -279,7 +274,7 @@ static void test_find_pin(void) IPin_Release(pin2); IPin_Release(pin); - hr = IBaseFilter_FindPin(filter, source_id, &pin); + hr = IBaseFilter_FindPin(filter, L"Out", &pin); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IEnumPins_Next(enum_pins, 1, &pin2, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -303,14 +298,14 @@ static void test_pin_info(void) ULONG ref; IPin *pin; - hr = IBaseFilter_FindPin(filter, sink_id, &pin); + hr = IBaseFilter_FindPin(filter, L"In", &pin); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IPin_QueryPinInfo(pin, &info); ok(hr == S_OK, "Got hr %#x.\n", hr); ok(info.pFilter == filter, "Expected filter %p, got %p.\n", filter, info.pFilter); ok(info.dir == PINDIR_INPUT, "Got direction %d.\n", info.dir); - todo_wine ok(!lstrcmpW(info.achName, sink_name), "Got name %s.\n", wine_dbgstr_w(info.achName)); + todo_wine ok(!wcscmp(info.achName, L"Input"), "Got name %s.\n", wine_dbgstr_w(info.achName)); IBaseFilter_Release(info.pFilter); hr = IPin_QueryDirection(pin, &dir); @@ -319,7 +314,7 @@ static void test_pin_info(void) hr = IPin_QueryId(pin, &id); ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(!lstrcmpW(id, sink_id), "Got id %s.\n", wine_dbgstr_w(id)); + ok(!wcscmp(id, L"In"), "Got id %s.\n", wine_dbgstr_w(id)); CoTaskMemFree(id); hr = IPin_QueryInternalConnections(pin, NULL, &count); @@ -327,14 +322,14 @@ static void test_pin_info(void) IPin_Release(pin); - hr = IBaseFilter_FindPin(filter, source_id, &pin); + hr = IBaseFilter_FindPin(filter, L"Out", &pin); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IPin_QueryPinInfo(pin, &info); ok(hr == S_OK, "Got hr %#x.\n", hr); ok(info.pFilter == filter, "Expected filter %p, got %p.\n", filter, info.pFilter); ok(info.dir == PINDIR_OUTPUT, "Got direction %d.\n", info.dir); - todo_wine ok(!lstrcmpW(info.achName, source_name), "Got name %s.\n", wine_dbgstr_w(info.achName)); + todo_wine ok(!wcscmp(info.achName, L"Output"), "Got name %s.\n", wine_dbgstr_w(info.achName)); IBaseFilter_Release(info.pFilter); hr = IPin_QueryDirection(pin, &dir); @@ -343,7 +338,7 @@ static void test_pin_info(void) hr = IPin_QueryId(pin, &id); ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(!lstrcmpW(id, source_id), "Got id %s.\n", wine_dbgstr_w(id)); + ok(!wcscmp(id, L"Out"), "Got id %s.\n", wine_dbgstr_w(id)); CoTaskMemFree(id); hr = IPin_QueryInternalConnections(pin, NULL, &count); @@ -458,7 +453,7 @@ static void test_media_types(void) ULONG ref; IPin *pin; - IBaseFilter_FindPin(filter, sink_id, &pin); + IBaseFilter_FindPin(filter, L"In", &pin); hr = IPin_EnumMediaTypes(pin, &enummt); todo_wine ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#x.\n", hr); @@ -469,7 +464,7 @@ static void test_media_types(void) IPin_Release(pin); - IBaseFilter_FindPin(filter, source_id, &pin); + IBaseFilter_FindPin(filter, L"Out", &pin); hr = IPin_EnumMediaTypes(pin, &enummt); todo_wine ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#x.\n", hr); -- 2.25.0

1 2

[PATCH] http.sys: Translate WSAEADDRINUSE to STATUS_SHARING_VIOLATION.
by Zebediah Figura 15 Jan '20

15 Jan '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/http.sys/http.c | 7 ++++++- dlls/httpapi/tests/httpapi.c | 6 ++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/http.sys/http.c b/dlls/http.sys/http.c index 91d81400e65..4259ca618f3 100644 --- a/dlls/http.sys/http.c +++ b/dlls/http.sys/http.c @@ -1104,10 +1104,15 @@ static NTSTATUS http_add_url(struct request_queue *queue, IRP *irp) addr.sin_addr.S_un.S_addr = INADDR_ANY; if (bind(s, (struct sockaddr *)&addr, sizeof(addr)) == -1) { - ERR("Failed to bind socket, error %u.\n", WSAGetLastError()); LeaveCriticalSection(&http_cs); closesocket(s); heap_free(url); + if (WSAGetLastError() == WSAEADDRINUSE) + { + WARN("Address %s is already in use.\n", debugstr_a(params->url)); + return STATUS_SHARING_VIOLATION; + } + ERR("Failed to bind socket, error %u.\n", WSAGetLastError()); return STATUS_UNSUCCESSFUL; } diff --git a/dlls/httpapi/tests/httpapi.c b/dlls/httpapi/tests/httpapi.c index ee585948abd..a52a3f6c344 100644 --- a/dlls/httpapi/tests/httpapi.c +++ b/dlls/httpapi/tests/httpapi.c @@ -113,8 +113,9 @@ static unsigned short add_url_v1(HANDLE queue) for (port = 50000; port < 51000; ++port) { swprintf(url, ARRAY_SIZE(url), L"http://localhost:%u/", port); - if ((ret = HttpAddUrl(queue, url, NULL)) != ERROR_SHARING_VIOLATION) + if (!(ret = HttpAddUrl(queue, url, NULL))) return port; + ok(ret == ERROR_SHARING_VIOLATION, "Failed to add %s, error %u.\n", debugstr_w(url), ret); } ok(0, "Failed to add url %s, error %u.\n", debugstr_w(url), ret); return 0; @@ -129,8 +130,9 @@ static ULONG add_url_v2(HTTP_URL_GROUP_ID group) for (port = 50010; port < 51000; ++port) { swprintf(url, ARRAY_SIZE(url), L"http://localhost:%u/", port); - if ((ret = pHttpAddUrlToUrlGroup(group, url, 0xdeadbeef, 0)) != ERROR_SHARING_VIOLATION) + if (!(ret = pHttpAddUrlToUrlGroup(group, url, 0xdeadbeef, 0))) return port; + ok(ret == ERROR_SHARING_VIOLATION, "Failed to add %s, error %u.\n", debugstr_w(url), ret); } ok(0, "Failed to add url %s, error %u.\n", debugstr_w(url), ret); return 0; -- 2.24.1

1 0

[PATCH] msctf: Always provide a context when from GetBase/Top.
by Derek Lesho 15 Jan '20

15 Jan '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48405 Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> --- dlls/msctf/documentmgr.c | 20 +++++++++++++++++--- dlls/msctf/tests/inputprocessor.c | 26 ++++++++++++++++++++++++-- 2 files changed, 41 insertions(+), 5 deletions(-) diff --git a/dlls/msctf/documentmgr.c b/dlls/msctf/documentmgr.c index 44856db632..37d55557f5 100644 --- a/dlls/msctf/documentmgr.c +++ b/dlls/msctf/documentmgr.c @@ -44,6 +44,7 @@ typedef struct tagDocumentMgr { /* Aggregation */ ITfCompartmentMgr *CompartmentMgr; + ITfContext* initialContext; ITfContext* contextStack[2]; /* limit of 2 contexts */ ITfThreadMgrEventSink* ThreadMgrSink; @@ -87,6 +88,8 @@ static void DocumentMgr_Destructor(DocumentMgr *This) ITfThreadMgr_Release(tm); } + if (This->initialContext) + ITfContext_Release(This->initialContext); if (This->contextStack[0]) ITfContext_Release(This->contextStack[0]); if (This->contextStack[1]) @@ -222,14 +225,21 @@ static HRESULT WINAPI DocumentMgr_Pop(ITfDocumentMgr *iface, DWORD dwFlags) static HRESULT WINAPI DocumentMgr_GetTop(ITfDocumentMgr *iface, ITfContext **ppic) { DocumentMgr *This = impl_from_ITfDocumentMgr(iface); + ITfContext *tgt; + TRACE("(%p)\n",This); if (!ppic) return E_INVALIDARG; if (This->contextStack[0]) - ITfContext_AddRef(This->contextStack[0]); + tgt = This->contextStack[0]; + else + tgt = This->initialContext; + + if (tgt) + ITfContext_AddRef(tgt); - *ppic = This->contextStack[0]; + *ppic = tgt; return S_OK; } @@ -245,8 +255,10 @@ static HRESULT WINAPI DocumentMgr_GetBase(ITfDocumentMgr *iface, ITfContext **pp if (This->contextStack[1]) tgt = This->contextStack[1]; - else + else if (This->contextStack[0]) tgt = This->contextStack[0]; + else + tgt = This->initialContext; if (tgt) ITfContext_AddRef(tgt); @@ -342,6 +354,7 @@ static const ITfSourceVtbl DocumentMgrSourceVtbl = HRESULT DocumentMgr_Constructor(ITfThreadMgrEventSink *ThreadMgrSink, ITfDocumentMgr **ppOut) { DocumentMgr *This; + DWORD cookie; This = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(DocumentMgr)); if (This == NULL) @@ -354,6 +367,7 @@ HRESULT DocumentMgr_Constructor(ITfThreadMgrEventSink *ThreadMgrSink, ITfDocumen list_init(&This->TransitoryExtensionSink); CompartmentMgr_Constructor((IUnknown*)&This->ITfDocumentMgr_iface, &IID_IUnknown, (IUnknown**)&This->CompartmentMgr); + Context_Constructor(processId,NULL,&This->ITfDocumentMgr_iface, &This->initialContext, &cookie); *ppOut = &This->ITfDocumentMgr_iface; TRACE("returning %p\n", *ppOut); diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index 38c591ea40..52921ec7cd 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -1639,10 +1639,10 @@ static HRESULT TextEditSink_Constructor(ITfTextEditSink **ppOut) static void test_startSession(void) { HRESULT hr; - DWORD cnt; + DWORD cnt, initial_ctx_cnt; DWORD editCookie; ITfDocumentMgr *dmtest; - ITfContext *cxt,*cxt2,*cxt3,*cxtTest; + ITfContext *cxt,*cxt2,*cxt3,*cxtTest,*initial_ctx; ITextStoreACP *ts = NULL; TfClientId cid2 = 0; ITfThreadMgrEx *tmex; @@ -1684,6 +1684,23 @@ static void test_startSession(void) hr = ITfThreadMgr_CreateDocumentMgr(g_tm,&g_dm); ok(SUCCEEDED(hr),"CreateDocumentMgr failed\n"); + test_OnPushContext = SINK_EXPECTED; + test_OnInitDocumentMgr = SINK_EXPECTED; + + /* For some reason, even when the object isn't initialized, this yields a context */ + hr = ITfDocumentMgr_GetBase(g_dm, &initial_ctx); + ok(SUCCEEDED(hr), "GetBase Failed\n"); + hr = ITfDocumentMgr_GetTop(g_dm, &cxtTest); + ok(SUCCEEDED(hr), "GetTop Failed\n"); + ok(cxtTest == initial_ctx, "GetTop != GetBase\n"); + + ok(initial_ctx != NULL, "Expected initial context\n"); + initial_ctx_cnt = check_context_refcount(initial_ctx); + hr = ITfContext_GetDocumentMgr(initial_ctx,&dmtest); + ok(hr == S_OK, "ITfContext_GetDocumentMgr failed with %x\n",hr); + ok(dmtest == g_dm, "Wrong documentmgr\n"); + ITfDocumentMgr_Release(dmtest); + test_EnumDocumentMgr(g_tm,g_dm,NULL); hr = ITfThreadMgr_CreateDocumentMgr(g_tm,&dmtest); @@ -1740,6 +1757,7 @@ static void test_startSession(void) test_OnPushContext = SINK_EXPECTED; test_ACP_AdviseSink = SINK_EXPECTED; test_OnInitDocumentMgr = SINK_EXPECTED; + hr = ITfDocumentMgr_Push(g_dm, cxt); ok(SUCCEEDED(hr),"Push Failed\n"); ok(check_context_refcount(cxt) > cnt, "Ref count did not increase\n"); @@ -1749,6 +1767,9 @@ static void test_startSession(void) test_EnumContexts(g_dm, cxt); + /* the initial context is released with the document manager */ + ok(initial_ctx_cnt == check_context_refcount(initial_ctx), "Context ref count changed after documentmgr initialization\n"); + hr = ITfDocumentMgr_GetTop(g_dm, &cxtTest); ok(SUCCEEDED(hr),"GetTop Failed\n"); ok(cxtTest == cxt, "Wrong context on top\n"); @@ -1859,6 +1880,7 @@ static void test_startSession(void) ITfContext_Release(cxt); ITfContext_Release(cxt2); ITfContext_Release(cxt3); + ITfContext_Release(initial_ctx); ITextStoreACP_Release(ts); } -- 2.25.0

2 1

[PATCH] winex11.drv: Don't confine the pointer to any window when just checking for active grab.
by Gabriel Ivăncescu 15 Jan '20

15 Jan '20

Fixes a regression introduced by 74efb3e872aebf57a42d62b52e149ae26f320c9a, which caused some random pointer warping on a setup with multiple "workspaces" when switching between them and a full screen game that warped the mouse. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- As I understand, that commit was supposed to just check for a pointer grab, and temporarily "lock it" if it was free, while the pointer is warped via XWarpPointer. There's no need to confine it to root_window in this case, which causes issues with multiple workspaces apparently. It's not easy to reproduce reliably, but an example game to reproduce this with is SpellForce. Place the game in a Virtual Desktop that covers the entire screen on a different workspace (say, to the right of the current one). When entering a map, move the mouse in game to the left so it moves the map view. While this happens, quickly switch to the left workspace (with shortcuts), then the pointer will at seemingly random times warp to the right edge of the screen while you are in the new workspace (because the game's workspace is to the right). This patch, however, fixes that issue and many others that are hard to reproduce reliably, while switching workspaces from a fullscreen game. dlls/winex11.drv/mouse.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 290732f..7f0edd9 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -1478,7 +1478,7 @@ BOOL CDECL X11DRV_SetCursorPos( INT x, INT y ) if (!clipping_cursor && XGrabPointer( data->display, root_window, False, PointerMotionMask | ButtonPressMask | ButtonReleaseMask, - GrabModeAsync, GrabModeAsync, root_window, None, CurrentTime ) != GrabSuccess) + GrabModeAsync, GrabModeAsync, None, None, CurrentTime ) != GrabSuccess) { WARN( "refusing to warp pointer to %u, %u without exclusive grab\n", pos.x, pos.y ); return FALSE; -- 2.21.0

2 3

[PATCH] explorerframe/tests: Remove some failing tests.
by Zebediah Figura 15 Jan '20

15 Jan '20

These fail on Windows 10 1607+ with nonsensical error codes. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/explorerframe/tests/nstc.c | 42 +++++++++------------------------ 1 file changed, 11 insertions(+), 31 deletions(-) diff --git a/dlls/explorerframe/tests/nstc.c b/dlls/explorerframe/tests/nstc.c index 44bdf317f2d..a48e3affefe 100644 --- a/dlls/explorerframe/tests/nstc.c +++ b/dlls/explorerframe/tests/nstc.c @@ -885,7 +885,7 @@ static void test_basics(void) ok(hr == S_OK || broken(hr == E_FAIL), "Got 0x%08x\n", hr); if(hr == S_OK) { - static const NSTCSTYLE styles_setable[] = + static const NSTCSTYLE styles[] = { NSTCS_HASEXPANDOS,NSTCS_HASLINES,NSTCS_SINGLECLICKEXPAND, NSTCS_FULLROWSELECT,NSTCS_HORIZONTALSCROLL, NSTCS_ROOTHASEXPANDO,NSTCS_SHOWSELECTIONALWAYS,NSTCS_NOINFOTIP, @@ -894,11 +894,6 @@ static void test_basics(void) NSTCS_TABSTOP,NSTCS_FAVORITESMODE,NSTCS_EMPTYTEXT,NSTCS_CHECKBOXES, NSTCS_ALLOWJUNCTIONS,NSTCS_SHOWTABSBUTTON,NSTCS_SHOWDELETEBUTTON, NSTCS_SHOWREFRESHBUTTON, 0}; - static const NSTCSTYLE styles_nonsetable[] = - { NSTCS_SPRINGEXPAND, NSTCS_RICHTOOLTIP, NSTCS_AUTOHSCROLL, - NSTCS_FADEINOUTEXPANDOS, - NSTCS_PARTIALCHECKBOXES, NSTCS_EXCLUSIONCHECKBOXES, - NSTCS_DIMMEDCHECKBOXES, NSTCS_NOINDENTCHECKS,0}; /* Set/GetControlStyle */ style = style2 = 0xdeadbeef; @@ -909,22 +904,12 @@ static void test_basics(void) hr = INameSpaceTreeControl2_SetControlStyle(pnstc2, 0, 0xFFFFFFF); ok(hr == S_OK, "Got 0x%08x\n", hr); - hr = INameSpaceTreeControl2_SetControlStyle(pnstc2, 0xFFFFFFFF, 0); - ok(hr == E_FAIL, "Got 0x%08x\n", hr); - hr = INameSpaceTreeControl2_SetControlStyle(pnstc2, 0xFFFFFFFF, 0xFFFFFFFF); - ok(hr == E_FAIL, "Got 0x%08x\n", hr); - tmp = 0; - for(i = 0; styles_setable[i] != 0; i++) - { - hr = INameSpaceTreeControl2_SetControlStyle(pnstc2, styles_setable[i], styles_setable[i]); - ok(hr == S_OK, "Got 0x%08x (%x)\n", hr, styles_setable[i]); - if(SUCCEEDED(hr)) tmp |= styles_setable[i]; - } - for(i = 0; styles_nonsetable[i] != 0; i++) + for(i = 0; styles[i] != 0; i++) { - hr = INameSpaceTreeControl2_SetControlStyle(pnstc2, styles_nonsetable[i], styles_nonsetable[i]); - ok(hr == E_FAIL, "Got 0x%08x (%x)\n", hr, styles_nonsetable[i]); + hr = INameSpaceTreeControl2_SetControlStyle(pnstc2, styles[i], styles[i]); + ok(hr == S_OK, "Got 0x%08x (%x)\n", hr, styles[i]); + if(SUCCEEDED(hr)) tmp |= styles[i]; } hr = INameSpaceTreeControl2_GetControlStyle(pnstc2, 0xFFFFFFFF, &style); @@ -933,23 +918,18 @@ static void test_basics(void) if(SUCCEEDED(hr)) { DWORD tmp2; - for(i = 0; styles_setable[i] != 0; i++) + for(i = 0; styles[i] != 0; i++) { - hr = INameSpaceTreeControl2_GetControlStyle(pnstc2, styles_setable[i], &tmp2); + hr = INameSpaceTreeControl2_GetControlStyle(pnstc2, styles[i], &tmp2); ok(hr == S_OK, "Got 0x%08x\n", hr); - ok(tmp2 == (style & styles_setable[i]), "Got %x\n", tmp2); + ok(tmp2 == (style & styles[i]), "Got %x\n", tmp2); } } - for(i = 0; styles_setable[i] != 0; i++) - { - hr = INameSpaceTreeControl2_SetControlStyle(pnstc2, styles_setable[i], 0); - ok(hr == S_OK, "Got 0x%08x (%x)\n", hr, styles_setable[i]); - } - for(i = 0; styles_nonsetable[i] != 0; i++) + for(i = 0; styles[i] != 0; i++) { - hr = INameSpaceTreeControl2_SetControlStyle(pnstc2, styles_nonsetable[i], 0); - ok(hr == E_FAIL, "Got 0x%08x (%x)\n", hr, styles_nonsetable[i]); + hr = INameSpaceTreeControl2_SetControlStyle(pnstc2, styles[i], 0); + ok(hr == S_OK, "Got 0x%08x (%x)\n", hr, styles[i]); } hr = INameSpaceTreeControl2_GetControlStyle(pnstc2, 0xFFFFFFFF, &style); ok(hr == S_OK, "Got 0x%08x\n", hr); -- 2.24.1

2 1

[PATCH resend] msctf: Clear the corresponding DocumentMgr pointers for Associated Focus Windows on destruction.
by Gabriel Ivăncescu 15 Jan '20

15 Jan '20

Fixes a regression introduced by d541087079a8770bb02bae830c56a6d3c0b6424e. AssociateFocus does not grab ownership of the Document Manager, but it does return it in the "prev" output parameter with an increased refcount. So, if the docmgr gets destroyed and AssociateFocus is called again, its "prev" parameter will refer to freed memory. Windows sets it to NULL in such case. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48469 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- v2: Added Wine-Bug. dlls/msctf/tests/inputprocessor.c | 15 +++++++++++++-- dlls/msctf/threadmgr.c | 14 ++++++++++++-- 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index 38c591e..f8ec492 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -2287,6 +2287,7 @@ static void test_AssociateFocus(void) ITfDocumentMgr *dm1, *dm2, *olddm, *dmcheck, *dmorig; HWND wnd1, wnd2, wnd3; HRESULT hr; + ULONG ref; ITfThreadMgr_GetFocus(g_tm, &dmorig); test_CurrentFocus = NULL; @@ -2428,10 +2429,20 @@ static void test_AssociateFocus(void) processPendingMessages(); SetFocus(wnd1); processPendingMessages(); - test_OnSetFocus = SINK_UNEXPECTED; + + hr = ITfThreadMgr_AssociateFocus(g_tm,wnd2,dm2,&olddm); + ok(SUCCEEDED(hr),"AssociateFocus failed\n"); + + /* Vista doesn't return NULL */ + if (olddm) ITfDocumentMgr_Release(olddm); + ref = ITfDocumentMgr_Release(dm2); + ok(ref == 0, "incorrect DocumentMgr ref %d\n", ref); + + hr = ITfThreadMgr_AssociateFocus(g_tm,wnd2,NULL,&olddm); + ok(SUCCEEDED(hr),"AssociateFocus failed\n"); + ok(olddm == NULL, "incorrect old DocumentMgr returned\n"); ITfDocumentMgr_Release(dm1); - ITfDocumentMgr_Release(dm2); test_CurrentFocus = dmorig; test_PrevFocus = FOCUS_IGNORE; diff --git a/dlls/msctf/threadmgr.c b/dlls/msctf/threadmgr.c index 2c208fb..77cf47c 100644 --- a/dlls/msctf/threadmgr.c +++ b/dlls/msctf/threadmgr.c @@ -1530,6 +1530,8 @@ void ThreadMgr_OnDocumentMgrDestruction(ITfThreadMgr *iface, ITfDocumentMgr *mgr { ThreadMgr *This = impl_from_ITfThreadMgrEx((ITfThreadMgrEx *)iface); struct list *cursor; + BOOL found = FALSE; + LIST_FOR_EACH(cursor, &This->CreatedDocumentMgrs) { DocumentMgrEntry *mgrentry = LIST_ENTRY(cursor,DocumentMgrEntry,entry); @@ -1537,8 +1539,16 @@ void ThreadMgr_OnDocumentMgrDestruction(ITfThreadMgr *iface, ITfDocumentMgr *mgr { list_remove(cursor); HeapFree(GetProcessHeap(),0,mgrentry); - return; + found = TRUE; + break; } } - FIXME("ITfDocumentMgr %p not found in this thread\n",mgr); + if (!found) FIXME("ITfDocumentMgr %p not found in this thread\n",mgr); + + LIST_FOR_EACH(cursor, &This->AssociatedFocusWindows) + { + AssociatedWindow *wnd = LIST_ENTRY(cursor,AssociatedWindow,entry); + if (wnd->docmgr == mgr) + wnd->docmgr = NULL; + } } -- 2.21.0

2 1

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel