- wine-devel - winehq.org

[PATCH] win32u: Return client menu name from NtUserUnregisterClass.
by Jacek Caban 27 Mar '22

27 Mar '22

Spotted by Esme Povirk. --- dlls/win32u/class.c | 1 + 1 file changed, 1 insertion(+)

1 0

[PATCH] oleacc/tests: Fix crash when current thread is not in foreground state.
by Piotr Caban 27 Mar '22

27 Mar '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52079 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/oleacc/tests/main.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-)

2 1

[PATCH 1/2] propsys: Implement VariantToStringWithDefault.
by Mohamad Al-Jaf 27 Mar '22

27 Mar '22

IE8 runtime calls upon this function and crashes without it. Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> --- Kept the same naming convention as the other functions for consistency. --- dlls/propsys/propsys.spec | 2 +- dlls/propsys/propvar.c | 17 +++++++++++++++++ include/propvarutil.h | 6 ++++++ 3 files changed, 24 insertions(+), 1 deletion(-) diff --git a/dlls/propsys/propsys.spec b/dlls/propsys/propsys.spec index 15749952e95..7391cf4aaa2 100644 --- a/dlls/propsys/propsys.spec +++ b/dlls/propsys/propsys.spec @@ -194,7 +194,7 @@ @ stub VariantToStringAlloc @ stub VariantToStringArray @ stub VariantToStringArrayAlloc -@ stub VariantToStringWithDefault +@ stdcall VariantToStringWithDefault(ptr wstr) @ stub VariantToUInt16 @ stub VariantToUInt16Array @ stub VariantToUInt16ArrayAlloc diff --git a/dlls/propsys/propvar.c b/dlls/propsys/propvar.c index 8f6c52f7aa7..18953cf381e 100644 --- a/dlls/propsys/propvar.c +++ b/dlls/propsys/propvar.c @@ -416,6 +416,23 @@ PCWSTR WINAPI PropVariantToStringWithDefault(REFPROPVARIANT propvarIn, LPCWSTR p return pszDefault; } +/****************************************************************** + * VariantToStringWithDefault (PROPSYS.@) + */ +PCWSTR WINAPI VariantToStringWithDefault(const VARIANT *pvar, LPCWSTR pszDefault) +{ + TRACE("(%p, %s)\n", pvar, debugstr_w(pszDefault)); + + if (V_VT(pvar) == VT_BSTR) + { + if (V_BSTR(pvar) == NULL) + return L""; + + return V_BSTR(pvar); + } + + return pszDefault; +} /****************************************************************** * PropVariantChangeType (PROPSYS.@) diff --git a/include/propvarutil.h b/include/propvarutil.h index 36a670f56e6..c8c9bae31e0 100644 --- a/include/propvarutil.h +++ b/include/propvarutil.h @@ -93,6 +93,7 @@ HRESULT WINAPI PropVariantToBoolean(REFPROPVARIANT propvarIn, BOOL *ret); HRESULT WINAPI PropVariantToBuffer(REFPROPVARIANT propvarIn, void *ret, UINT cb); HRESULT WINAPI PropVariantToString(REFPROPVARIANT propvarIn, PWSTR ret, UINT cch); PCWSTR WINAPI PropVariantToStringWithDefault(REFPROPVARIANT propvarIn, LPCWSTR pszDefault); +PCWSTR WINAPI VariantToStringWithDefault(const VARIANT *pvar, LPCWSTR pszDefault); HRESULT WINAPI PropVariantToStringAlloc(REFPROPVARIANT propvarIn, WCHAR **ret); @@ -201,6 +202,11 @@ inline BOOL IsPropVariantString(REFPROPVARIANT propvar) return (PropVariantToStringWithDefault(propvar, NULL) != NULL); } +inline BOOL IsVariantString(const VARIANT *var) +{ + return (VariantToStringWithDefault(var, NULL) != NULL); +} + #endif /* NO_PROPVAR_INLINES */ #endif /* __cplusplus */ -- 2.35.1

2 4

[PATCH 1/2] user32: Remove redundant #ifdef around #undef.
by Zebediah Figura 27 Mar '22

27 Mar '22

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/user32/class.c | 11 ----------- dlls/user32/win.c | 11 ----------- 2 files changed, 22 deletions(-) diff --git a/dlls/user32/class.c b/dlls/user32/class.c index e2eb60d8bbf..cc342cf507b 100644 --- a/dlls/user32/class.c +++ b/dlls/user32/class.c @@ -765,21 +765,10 @@ BOOL16 WINAPI ClassNext16( CLASSENTRY *pClassEntry ) /* 64bit versions */ -#ifdef GetClassLongPtrA #undef GetClassLongPtrA -#endif - -#ifdef GetClassLongPtrW #undef GetClassLongPtrW -#endif - -#ifdef SetClassLongPtrA #undef SetClassLongPtrA -#endif - -#ifdef SetClassLongPtrW #undef SetClassLongPtrW -#endif /*********************************************************************** * GetClassLongPtrA (USER32.@) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index b49afec9bd1..619bbba1dfe 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -1831,21 +1831,10 @@ BOOL WINAPI SetProcessDefaultLayout( DWORD layout ) /* 64bit versions */ -#ifdef GetWindowLongPtrW #undef GetWindowLongPtrW -#endif - -#ifdef GetWindowLongPtrA #undef GetWindowLongPtrA -#endif - -#ifdef SetWindowLongPtrW #undef SetWindowLongPtrW -#endif - -#ifdef SetWindowLongPtrA #undef SetWindowLongPtrA -#endif /***************************************************************************** * GetWindowLongPtrW (USER32.@) -- 2.34.1

2 3

[PATCH] amstream: Use CRT memory allocators.
by Zebediah Figura 27 Mar '22

27 Mar '22

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/amstream/amstream_private.h | 1 - dlls/amstream/audiodata.c | 22 +++++++++------------- dlls/amstream/audiostream.c | 24 +++++++++++------------- dlls/amstream/ddrawstream.c | 16 +++++++--------- dlls/amstream/filter.c | 24 ++++++++++++------------ dlls/amstream/main.c | 6 +++--- dlls/amstream/multimedia.c | 6 +++--- 7 files changed, 45 insertions(+), 54 deletions(-) diff --git a/dlls/amstream/amstream_private.h b/dlls/amstream/amstream_private.h index e71563cb115..999081db754 100644 --- a/dlls/amstream/amstream_private.h +++ b/dlls/amstream/amstream_private.h @@ -32,7 +32,6 @@ #include "mmstream.h" #include "austream.h" #include "amstream.h" -#include "wine/heap.h" HRESULT multimedia_stream_create(IUnknown *outer, void **out) DECLSPEC_HIDDEN; HRESULT AMAudioData_create(IUnknown *pUnkOuter, LPVOID *ppObj) DECLSPEC_HIDDEN; diff --git a/dlls/amstream/audiodata.c b/dlls/amstream/audiodata.c index 1f8c0c44064..752651b1afe 100644 --- a/dlls/amstream/audiodata.c +++ b/dlls/amstream/audiodata.c @@ -71,19 +71,16 @@ static ULONG WINAPI IAudioDataImpl_AddRef(IAudioData* iface) static ULONG WINAPI IAudioDataImpl_Release(IAudioData* iface) { - AMAudioDataImpl *This = impl_from_IAudioData(iface); - ULONG ref = InterlockedDecrement(&This->ref); + AMAudioDataImpl *audiodata = impl_from_IAudioData(iface); + ULONG ref = InterlockedDecrement(&audiodata->ref); - TRACE("(%p)->(): new ref = %lu\n", iface, This->ref); + TRACE("%p decreasing refcount to %lu.\n", audiodata, ref); if (!ref) { - if (This->data_owned) - { - CoTaskMemFree(This->data); - } - - HeapFree(GetProcessHeap(), 0, This); + if (audiodata->data_owned) + free(audiodata->data); + free(audiodata); } return ref; @@ -103,7 +100,7 @@ static HRESULT WINAPI IAudioDataImpl_SetBuffer(IAudioData* iface, DWORD size, BY if (This->data_owned) { - CoTaskMemFree(This->data); + free(This->data); This->data_owned = FALSE; } @@ -112,7 +109,7 @@ static HRESULT WINAPI IAudioDataImpl_SetBuffer(IAudioData* iface, DWORD size, BY if (!This->data) { - This->data = CoTaskMemAlloc(This->size); + This->data = malloc(This->size); This->data_owned = TRUE; if (!This->data) { @@ -228,8 +225,7 @@ HRESULT AMAudioData_create(IUnknown *pUnkOuter, LPVOID *ppObj) if (pUnkOuter) return CLASS_E_NOAGGREGATION; - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(AMAudioDataImpl)); - if (!object) + if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; object->IAudioData_iface.lpVtbl = &AudioData_Vtbl; diff --git a/dlls/amstream/audiostream.c b/dlls/amstream/audiostream.c index a043390f5b1..d76156cb682 100644 --- a/dlls/amstream/audiostream.c +++ b/dlls/amstream/audiostream.c @@ -202,7 +202,7 @@ static ULONG WINAPI audio_sample_Release(IAudioStreamSample *iface) IAMMediaStream_Release(&sample->parent->IAMMediaStream_iface); IAudioData_Release(sample->audio_data); CloseHandle(sample->update_event); - HeapFree(GetProcessHeap(), 0, sample); + free(sample); } return refcount; } @@ -383,8 +383,7 @@ static HRESULT audiostreamsample_create(struct audio_stream *parent, IAudioData TRACE("(%p)\n", audio_stream_sample); - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); - if (!object) + if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; object->IAudioStreamSample_iface.lpVtbl = &AudioStreamSample_Vtbl; @@ -456,15 +455,15 @@ static ULONG WINAPI audio_IAMMediaStream_AddRef(IAMMediaStream *iface) static ULONG WINAPI audio_IAMMediaStream_Release(IAMMediaStream *iface) { - struct audio_stream *This = impl_from_IAMMediaStream(iface); - ULONG ref = InterlockedDecrement(&This->ref); + struct audio_stream *stream = impl_from_IAMMediaStream(iface); + ULONG ref = InterlockedDecrement(&stream->ref); - TRACE("(%p/%p)->(): new ref = %lu\n", iface, This, ref); + TRACE("%p decreasing refcount to %lu.\n", stream, ref); if (!ref) { - DeleteCriticalSection(&This->cs); - HeapFree(GetProcessHeap(), 0, This); + DeleteCriticalSection(&stream->cs); + free(stream); } return ref; @@ -830,7 +829,7 @@ static ULONG WINAPI enum_media_types_Release(IEnumMediaTypes *iface) ULONG refcount = InterlockedDecrement(&enum_media_types->refcount); TRACE("%p decreasing refcount to %lu.\n", enum_media_types, refcount); if (!refcount) - heap_free(enum_media_types); + free(enum_media_types); return refcount; } @@ -904,7 +903,7 @@ static HRESULT WINAPI enum_media_types_Clone(IEnumMediaTypes *iface, IEnumMediaT TRACE("iface %p, out %p.\n", iface, out); - if (!(object = heap_alloc(sizeof(*object)))) + if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; object->IEnumMediaTypes_iface.lpVtbl = &enum_media_types_vtbl; @@ -1121,7 +1120,7 @@ static HRESULT WINAPI audio_sink_EnumMediaTypes(IPin *iface, IEnumMediaTypes **e if (!enum_media_types) return E_POINTER; - if (!(object = heap_alloc(sizeof(*object)))) + if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; object->IEnumMediaTypes_iface.lpVtbl = &enum_media_types_vtbl; @@ -1394,8 +1393,7 @@ HRESULT audio_stream_create(IUnknown *outer, void **out) if (outer) return CLASS_E_NOAGGREGATION; - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); - if (!object) + if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; object->IAMMediaStream_iface.lpVtbl = &audio_IAMMediaStream_vtbl; diff --git a/dlls/amstream/ddrawstream.c b/dlls/amstream/ddrawstream.c index 7b0c92c5f61..e31e0d106d3 100644 --- a/dlls/amstream/ddrawstream.c +++ b/dlls/amstream/ddrawstream.c @@ -229,7 +229,7 @@ static ULONG WINAPI ddraw_IAMMediaStream_Release(IAMMediaStream *iface) DeleteCriticalSection(&stream->cs); if (stream->ddraw) IDirectDraw_Release(stream->ddraw); - HeapFree(GetProcessHeap(), 0, stream); + free(stream); } return ref; @@ -815,7 +815,7 @@ static ULONG WINAPI enum_media_types_Release(IEnumMediaTypes *iface) ULONG refcount = InterlockedDecrement(&enum_media_types->refcount); TRACE("%p decreasing refcount to %lu.\n", enum_media_types, refcount); if (!refcount) - heap_free(enum_media_types); + free(enum_media_types); return refcount; } @@ -873,7 +873,7 @@ static HRESULT WINAPI enum_media_types_Clone(IEnumMediaTypes *iface, IEnumMediaT TRACE("iface %p, out %p.\n", iface, out); - if (!(object = heap_alloc(sizeof(*object)))) + if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; object->IEnumMediaTypes_iface.lpVtbl = &enum_media_types_vtbl; @@ -1148,7 +1148,7 @@ static HRESULT WINAPI ddraw_sink_EnumMediaTypes(IPin *iface, IEnumMediaTypes **e if (!enum_media_types) return E_POINTER; - if (!(object = heap_alloc(sizeof(*object)))) + if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; object->IEnumMediaTypes_iface.lpVtbl = &enum_media_types_vtbl; @@ -1460,8 +1460,7 @@ HRESULT ddraw_stream_create(IUnknown *outer, void **out) if (outer) return CLASS_E_NOAGGREGATION; - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); - if (!object) + if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; object->IAMMediaStream_iface.lpVtbl = &ddraw_IAMMediaStream_vtbl; @@ -1539,7 +1538,7 @@ static ULONG WINAPI ddraw_sample_Release(IDirectDrawStreamSample *iface) if (sample->surface) IDirectDrawSurface_Release(sample->surface); - HeapFree(GetProcessHeap(), 0, sample); + free(sample); } return ref; @@ -1736,8 +1735,7 @@ static HRESULT ddrawstreamsample_create(struct ddraw_stream *parent, IDirectDraw TRACE("(%p)\n", ddraw_stream_sample); - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); - if (!object) + if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; object->IDirectDrawStreamSample_iface.lpVtbl = &DirectDrawStreamSample_Vtbl; diff --git a/dlls/amstream/filter.c b/dlls/amstream/filter.c index f5a855d6a96..c1c97630bb9 100644 --- a/dlls/amstream/filter.c +++ b/dlls/amstream/filter.c @@ -76,8 +76,8 @@ static ULONG WINAPI enum_pins_Release(IEnumPins *iface) { for (i = 0; i < enum_pins->count; ++i) IPin_Release(enum_pins->pins[i]); - heap_free(enum_pins->pins); - heap_free(enum_pins); + free(enum_pins->pins); + free(enum_pins); } return refcount; } @@ -131,16 +131,16 @@ static HRESULT WINAPI enum_pins_Clone(IEnumPins *iface, IEnumPins **out) TRACE("iface %p, out %p.\n", iface, out); - if (!(object = heap_alloc(sizeof(*object)))) + if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; object->IEnumPins_iface.lpVtbl = &enum_pins_vtbl; object->refcount = 1; object->count = enum_pins->count; object->index = enum_pins->index; - if (!(object->pins = heap_alloc(enum_pins->count * sizeof(*object->pins)))) + if (!(object->pins = malloc(enum_pins->count * sizeof(*object->pins)))) { - heap_free(object); + free(object); return E_OUTOFMEMORY; } for (i = 0; i < enum_pins->count; ++i) @@ -251,11 +251,11 @@ static ULONG WINAPI filter_Release(IMediaStreamFilter *iface) IAMMediaStream_JoinFilter(filter->streams[i], NULL); IAMMediaStream_Release(filter->streams[i]); } - heap_free(filter->streams); + free(filter->streams); if (filter->clock) IReferenceClock_Release(filter->clock); DeleteCriticalSection(&filter->cs); - heap_free(filter); + free(filter); } return refcount; @@ -424,7 +424,7 @@ static HRESULT WINAPI filter_EnumPins(IMediaStreamFilter *iface, IEnumPins **enu if (!enum_pins) return E_POINTER; - if (!(object = heap_alloc(sizeof(*object)))) + if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; EnterCriticalSection(&filter->cs); @@ -433,9 +433,9 @@ static HRESULT WINAPI filter_EnumPins(IMediaStreamFilter *iface, IEnumPins **enu object->refcount = 1; object->count = filter->nb_streams; object->index = 0; - if (!(object->pins = heap_alloc(filter->nb_streams * sizeof(*object->pins)))) + if (!(object->pins = malloc(filter->nb_streams * sizeof(*object->pins)))) { - heap_free(object); + free(object); LeaveCriticalSection(&filter->cs); return E_OUTOFMEMORY; } @@ -543,7 +543,7 @@ static HRESULT WINAPI filter_AddMediaStream(IMediaStreamFilter *iface, IAMMediaS TRACE("(%p)->(%p)\n", iface, pAMMediaStream); - streams = CoTaskMemRealloc(This->streams, (This->nb_streams + 1) * sizeof(IAMMediaStream*)); + streams = realloc(This->streams, (This->nb_streams + 1) * sizeof(*streams)); if (!streams) return E_OUTOFMEMORY; This->streams = streams; @@ -1092,7 +1092,7 @@ HRESULT filter_create(IUnknown *outer, void **out) if (outer) return CLASS_E_NOAGGREGATION; - if (!(object = heap_alloc_zero(sizeof(*object)))) + if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; object->IMediaStreamFilter_iface.lpVtbl = &filter_vtbl; diff --git a/dlls/amstream/main.c b/dlls/amstream/main.c index 3d091135257..a78377d0b7e 100644 --- a/dlls/amstream/main.c +++ b/dlls/amstream/main.c @@ -93,7 +93,7 @@ static ULONG WINAPI AMCF_Release(IClassFactory *iface) ULONG ref = InterlockedDecrement(&This->ref); if (ref == 0) - HeapFree(GetProcessHeap(), 0, This); + free(This); return ref; } @@ -173,8 +173,8 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) return CLASS_E_CLASSNOTAVAILABLE; } - factory = HeapAlloc(GetProcessHeap(), 0, sizeof(*factory)); - if (factory == NULL) return E_OUTOFMEMORY; + if (!(factory = calloc(1, sizeof(*factory)))) + return E_OUTOFMEMORY; factory->IClassFactory_iface.lpVtbl = &DSCF_Vtbl; factory->ref = 1; diff --git a/dlls/amstream/multimedia.c b/dlls/amstream/multimedia.c index 70c0210840f..dc855901c77 100644 --- a/dlls/amstream/multimedia.c +++ b/dlls/amstream/multimedia.c @@ -100,7 +100,7 @@ static ULONG WINAPI multimedia_stream_Release(IAMMultiMediaStream *iface) IMediaControl_Release(This->media_control); if (This->graph) IGraphBuilder_Release(This->graph); - HeapFree(GetProcessHeap(), 0, This); + free(This); } return ref; @@ -562,7 +562,7 @@ HRESULT multimedia_stream_create(IUnknown *outer, void **out) if (outer) return CLASS_E_NOAGGREGATION; - if (!(object = heap_alloc_zero(sizeof(*object)))) + if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; object->IAMMultiMediaStream_iface.lpVtbl = &multimedia_stream_vtbl; @@ -572,7 +572,7 @@ HRESULT multimedia_stream_create(IUnknown *outer, void **out) CLSCTX_INPROC_SERVER, &IID_IMediaStreamFilter, (void **)&object->filter))) { ERR("Failed to create stream filter, hr %#lx.\n", hr); - heap_free(object); + free(object); return hr; } -- 2.34.1

1 0

[PATCH] shell32: Use COM wrappers for IShellPropSheetExt and IShellExtInit.
by Zebediah Figura 27 Mar '22

27 Mar '22

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/shell32/shellord.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/shell32/shellord.c b/dlls/shell32/shellord.c index 55b02d4188f..66e5caf08da 100644 --- a/dlls/shell32/shellord.c +++ b/dlls/shell32/shellord.c @@ -1674,7 +1674,7 @@ UINT WINAPI SHAddFromPropSheetExtArray(HPSXA hpsxa, LPFNADDPROPSHEETPAGE lpfnAdd /* Call the AddPage method of all registered IShellPropSheetExt interfaces */ for (i = 0; i != psxa->uiCount; i++) { - psxa->pspsx[i]->lpVtbl->AddPages(psxa->pspsx[i], PsxaCall, (LPARAM)&Call); + IShellPropSheetExt_AddPages(psxa->pspsx[i], PsxaCall, (LPARAM)&Call); } return Call.uiCount; @@ -1764,21 +1764,21 @@ HPSXA WINAPI SHCreatePropSheetExtArrayEx(HKEY hKey, LPCWSTR pszSubKey, UINT max_ Then call IShellExtInit's Initialize method. */ if (SUCCEEDED(CoCreateInstance(&clsid, NULL, CLSCTX_INPROC_SERVER/* | CLSCTX_NO_CODE_DOWNLOAD */, &IID_IShellPropSheetExt, (LPVOID *)&pspsx))) { - if (SUCCEEDED(pspsx->lpVtbl->QueryInterface(pspsx, &IID_IShellExtInit, (PVOID *)&psxi))) + if (SUCCEEDED(IShellPropSheetExt_QueryInterface(pspsx, &IID_IShellExtInit, (PVOID *)&psxi))) { - if (SUCCEEDED(psxi->lpVtbl->Initialize(psxi, NULL, pDataObj, hKey))) + if (SUCCEEDED(IShellExtInit_Initialize(psxi, NULL, pDataObj, hKey))) { /* Add the IShellPropSheetExt instance to the array */ psxa->pspsx[psxa->uiCount++] = pspsx; } else { - psxi->lpVtbl->Release(psxi); - pspsx->lpVtbl->Release(pspsx); + IShellExtInit_Release(psxi); + IShellPropSheetExt_Release(pspsx); } } else - pspsx->lpVtbl->Release(pspsx); + IShellPropSheetExt_Release(pspsx); } } @@ -1821,7 +1821,7 @@ UINT WINAPI SHReplaceFromPropSheetExtArray(HPSXA hpsxa, UINT uPageID, LPFNADDPRO for (i = 0; i != psxa->uiCount; i++) { Call.bCalled = FALSE; - psxa->pspsx[i]->lpVtbl->ReplacePage(psxa->pspsx[i], uPageID, PsxaCall, (LPARAM)&Call); + IShellPropSheetExt_ReplacePage(psxa->pspsx[i], uPageID, PsxaCall, (LPARAM)&Call); } return Call.uiCount; @@ -1844,7 +1844,7 @@ void WINAPI SHDestroyPropSheetExtArray(HPSXA hpsxa) { for (i = 0; i != psxa->uiCount; i++) { - psxa->pspsx[i]->lpVtbl->Release(psxa->pspsx[i]); + IShellPropSheetExt_Release(psxa->pspsx[i]); } LocalFree(psxa); -- 2.34.1

1 0

[PATCH] winealsa: Add missing includes.
by Huw Davies 26 Mar '22

26 Mar '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52728 Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winealsa.drv/alsamidi.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/winealsa.drv/alsamidi.c b/dlls/winealsa.drv/alsamidi.c index 476ea383a25..4f3f5538891 100644 --- a/dlls/winealsa.drv/alsamidi.c +++ b/dlls/winealsa.drv/alsamidi.c @@ -30,6 +30,8 @@ #include <stdarg.h> #include <stdio.h> +#include <stdint.h> +#include <unistd.h> #include <pthread.h> #include <time.h> #include <alsa/asoundlib.h> -- 2.25.1

1 0

[PATCH resend 7/7] comctl32/tests: remove now unused TODO_COUNT in static control tests
by Rafał Harabień 26 Mar '22

26 Mar '22

Signed-off-by: Rafał Harabień <rafalh92(a)outlook.com> --- dlls/comctl32/tests/static.c | 42 +++++++++++++++--------------------- 1 file changed, 17 insertions(+), 25 deletions(-) diff --git a/dlls/comctl32/tests/static.c b/dlls/comctl32/tests/static.c index a07dbcc26bf..473f126c04a 100644 --- a/dlls/comctl32/tests/static.c +++ b/dlls/comctl32/tests/static.c @@ -32,8 +32,6 @@ #include "v6util.h" -#define TODO_COUNT 1 - #define CTRL_ID 1995 static HWND hMainWnd; @@ -79,7 +77,7 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lpara return DefWindowProcA(hwnd, msg, wparam, lparam); } -static void test_updates(int style, int flags) +static void test_updates(int style) { HWND hStatic = create_static(style); RECT r1 = {5, 5, 30, 30}, rcClient; @@ -130,13 +128,7 @@ static void test_updates(int style, int flags) else exp = 2; /* SS_ETCHEDHORZ/SS_ETCHEDVERT have empty client rect so WM_CTLCOLORSTATIC is sent only when parent window is invalidated */ - if (flags & TODO_COUNT) - todo_wine - ok(g_nReceivedColorStatic == exp, "Unexpected WM_CTLCOLORSTATIC value %d\n", g_nReceivedColorStatic); - else if ((style & SS_TYPEMASK) == SS_ICON || (style & SS_TYPEMASK) == SS_BITMAP) - ok(g_nReceivedColorStatic == exp, "Unexpected %u got %u\n", exp, g_nReceivedColorStatic); - else - ok(g_nReceivedColorStatic == exp, "Unexpected WM_CTLCOLORSTATIC value %d\n", g_nReceivedColorStatic); + ok(g_nReceivedColorStatic == exp, "expected %u, got %u\n", exp, g_nReceivedColorStatic); DestroyWindow(hStatic); } @@ -424,21 +416,21 @@ START_TEST(static) GetModuleHandleA(NULL), NULL); ShowWindow(hMainWnd, SW_SHOW); - test_updates(0, 0); - test_updates(SS_ICON, 0); - test_updates(SS_BLACKRECT, 0); - test_updates(SS_WHITERECT, 0); - test_updates(SS_BLACKFRAME, 0); - test_updates(SS_WHITEFRAME, 0); - test_updates(SS_USERITEM, 0); - test_updates(SS_SIMPLE, 0); - test_updates(SS_OWNERDRAW, 0); - test_updates(SS_BITMAP, 0); - test_updates(SS_BITMAP | SS_CENTERIMAGE, 0); - test_updates(SS_ETCHEDHORZ, 0); - test_updates(SS_ETCHEDVERT, 0); - test_updates(SS_ETCHEDFRAME, 0); - test_updates(SS_SUNKEN, 0); + test_updates(0); + test_updates(SS_ICON); + test_updates(SS_BLACKRECT); + test_updates(SS_WHITERECT); + test_updates(SS_BLACKFRAME); + test_updates(SS_WHITEFRAME); + test_updates(SS_USERITEM); + test_updates(SS_SIMPLE); + test_updates(SS_OWNERDRAW); + test_updates(SS_BITMAP); + test_updates(SS_BITMAP | SS_CENTERIMAGE); + test_updates(SS_ETCHEDHORZ); + test_updates(SS_ETCHEDVERT); + test_updates(SS_ETCHEDFRAME); + test_updates(SS_SUNKEN); test_set_text(); test_set_image(); test_STM_SETIMAGE(); -- 2.25.1

2 1

[PATCH resend 6/7] comctl32/tests: fix invalidation in static control tests
by Rafał Harabień 26 Mar '22

26 Mar '22

Rectangle used for invalidation was outside of windows rect of static controls with SS_ETCHEDHORZ/SS_ETCHEDVERT style because they resize after creation. Improve test by changing the invalidated rect and add more details in comment about SS_ETCHEDHORZ/SS_ETCHEDVERT styles. Signed-off-by: Rafał Harabień <rafalh92(a)outlook.com> --- dlls/comctl32/tests/static.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/static.c b/dlls/comctl32/tests/static.c index 324301212dc..a07dbcc26bf 100644 --- a/dlls/comctl32/tests/static.c +++ b/dlls/comctl32/tests/static.c @@ -82,7 +82,7 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lpara static void test_updates(int style, int flags) { HWND hStatic = create_static(style); - RECT r1 = {20, 20, 30, 30}, rcClient; + RECT r1 = {5, 5, 30, 30}, rcClient; int exp; LONG exstyle; @@ -128,7 +128,7 @@ static void test_updates(int style, int flags) if (style != SS_ETCHEDHORZ && style != SS_ETCHEDVERT) exp = 4; else - exp = 1; /* SS_ETCHED* seems to send WM_CTLCOLORSTATIC only sometimes */ + exp = 2; /* SS_ETCHEDHORZ/SS_ETCHEDVERT have empty client rect so WM_CTLCOLORSTATIC is sent only when parent window is invalidated */ if (flags & TODO_COUNT) todo_wine -- 2.25.1

2 1

[PATCH resend 5/7] comctl32: send WM_CTLCOLORSTATIC for all static control types
by Rafał Harabień 26 Mar '22

26 Mar '22

Signed-off-by: Rafał Harabień <rafalh92(a)outlook.com> --- dlls/comctl32/static.c | 134 ++++++++++++++++------------------- dlls/comctl32/tests/static.c | 16 ++--- 2 files changed, 69 insertions(+), 81 deletions(-) diff --git a/dlls/comctl32/static.c b/dlls/comctl32/static.c index 1b5d1ade291..2fb914b3fb2 100644 --- a/dlls/comctl32/static.c +++ b/dlls/comctl32/static.c @@ -44,13 +44,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(static); -static void STATIC_PaintOwnerDrawfn( HWND hwnd, HDC hdc, DWORD style ); -static void STATIC_PaintTextfn( HWND hwnd, HDC hdc, DWORD style ); -static void STATIC_PaintRectfn( HWND hwnd, HDC hdc, DWORD style ); -static void STATIC_PaintIconfn( HWND hwnd, HDC hdc, DWORD style ); -static void STATIC_PaintBitmapfn( HWND hwnd, HDC hdc, DWORD style ); -static void STATIC_PaintEnhMetafn( HWND hwnd, HDC hdc, DWORD style ); -static void STATIC_PaintEtchedfn( HWND hwnd, HDC hdc, DWORD style ); +static void STATIC_PaintOwnerDrawfn( HWND hwnd, HDC hdc, HBRUSH hbrush, DWORD style ); +static void STATIC_PaintTextfn( HWND hwnd, HDC hdc, HBRUSH hbrush, DWORD style ); +static void STATIC_PaintRectfn( HWND hwnd, HDC hdc, HBRUSH hbrush, DWORD style ); +static void STATIC_PaintIconfn( HWND hwnd, HDC hdc, HBRUSH hbrush, DWORD style ); +static void STATIC_PaintBitmapfn( HWND hwnd, HDC hdc, HBRUSH hbrush, DWORD style ); +static void STATIC_PaintEnhMetafn( HWND hwnd, HDC hdc, HBRUSH hbrush, DWORD style ); +static void STATIC_PaintEtchedfn( HWND hwnd, HDC hdc, HBRUSH hbrush, DWORD style ); struct static_extra_info { @@ -64,7 +64,7 @@ struct static_extra_info BOOL image_has_alpha; }; -typedef void (*pfPaint)( HWND hwnd, HDC hdc, DWORD style ); +typedef void (*pfPaint)( HWND hwnd, HDC hdc, HBRUSH hbrush, DWORD style ); static const pfPaint staticPaintFunc[SS_TYPEMASK+1] = { @@ -360,6 +360,22 @@ static HICON STATIC_LoadIconW( HINSTANCE hInstance, LPCWSTR name, DWORD style ) return hicon; } +static HBRUSH STATIC_SendWmCtlColorStatic(HWND hwnd, HDC hdc) +{ + HBRUSH hBrush; + HWND parent = GetParent(hwnd); + + if (!parent) parent = hwnd; + hBrush = (HBRUSH) SendMessageW( parent, WM_CTLCOLORSTATIC, (WPARAM)hdc, (LPARAM)hwnd ); + if (!hBrush) /* did the app forget to call DefWindowProc ? */ + { + /* FIXME: DefWindowProc should return different colors if a + manifest is present */ + hBrush = (HBRUSH)DefWindowProcW( parent, WM_CTLCOLORSTATIC, (WPARAM)hdc, (LPARAM)hwnd); + } + return hBrush; +} + /*********************************************************************** * STATIC_TryPaintFcn * @@ -367,40 +383,26 @@ static HICON STATIC_LoadIconW( HINSTANCE hInstance, LPCWSTR name, DWORD style ) */ static VOID STATIC_TryPaintFcn(HWND hwnd, LONG full_style) { - LONG style = full_style & SS_TYPEMASK; - RECT rc; - - GetClientRect( hwnd, &rc ); - if (!IsRectEmpty(&rc) && IsWindowVisible(hwnd) && staticPaintFunc[style]) + if (IsWindowVisible(hwnd)) { + RECT rc; HDC hdc; HRGN hrgn; + HBRUSH hbrush; + LONG style = full_style & SS_TYPEMASK; + GetClientRect( hwnd, &rc ); hdc = GetDC( hwnd ); hrgn = set_control_clipping( hdc, &rc ); - (staticPaintFunc[style])( hwnd, hdc, full_style ); + hbrush = STATIC_SendWmCtlColorStatic( hwnd, hdc ); + if (staticPaintFunc[style]) + (staticPaintFunc[style])( hwnd, hdc, hbrush, full_style ); SelectClipRgn( hdc, hrgn ); if (hrgn) DeleteObject( hrgn ); ReleaseDC( hwnd, hdc ); } } -static HBRUSH STATIC_SendWmCtlColorStatic(HWND hwnd, HDC hdc) -{ - HBRUSH hBrush; - HWND parent = GetParent(hwnd); - - if (!parent) parent = hwnd; - hBrush = (HBRUSH) SendMessageW( parent, WM_CTLCOLORSTATIC, (WPARAM)hdc, (LPARAM)hwnd ); - if (!hBrush) /* did the app forget to call DefWindowProc ? */ - { - /* FIXME: DefWindowProc should return different colors if a - manifest is present */ - hBrush = (HBRUSH)DefWindowProcW( parent, WM_CTLCOLORSTATIC, (WPARAM)hdc, (LPARAM)hwnd); - } - return hBrush; -} - /*********************************************************************** * hasTextStyle * @@ -481,14 +483,16 @@ static LRESULT CALLBACK STATIC_WindowProc( HWND hwnd, UINT uMsg, WPARAM wParam, PAINTSTRUCT ps; RECT rect; HDC hdc = wParam ? (HDC)wParam : BeginPaint(hwnd, &ps); + HRGN hrgn; + HBRUSH hbrush; + GetClientRect( hwnd, &rect ); + hrgn = set_control_clipping( hdc, &rect ); + hbrush = STATIC_SendWmCtlColorStatic( hwnd, hdc ); if (staticPaintFunc[style]) - { - HRGN hrgn = set_control_clipping( hdc, &rect ); - (staticPaintFunc[style])( hwnd, hdc, full_style ); - SelectClipRgn( hdc, hrgn ); - if (hrgn) DeleteObject( hrgn ); - } + (staticPaintFunc[style])( hwnd, hdc, hbrush, full_style ); + SelectClipRgn( hdc, hrgn ); + if (hrgn) DeleteObject( hrgn ); if (!wParam) EndPaint(hwnd, &ps); } break; @@ -642,7 +646,7 @@ static LRESULT CALLBACK STATIC_WindowProc( HWND hwnd, UINT uMsg, WPARAM wParam, return lResult; } -static void STATIC_PaintOwnerDrawfn( HWND hwnd, HDC hdc, DWORD style ) +static void STATIC_PaintOwnerDrawfn( HWND hwnd, HDC hdc, HBRUSH hbrush, DWORD style ) { DRAWITEMSTRUCT dis; HFONT font, oldFont = NULL; @@ -660,15 +664,13 @@ static void STATIC_PaintOwnerDrawfn( HWND hwnd, HDC hdc, DWORD style ) font = STATIC_GetFont( hwnd ); if (font) oldFont = SelectObject( hdc, font ); - SendMessageW( GetParent(hwnd), WM_CTLCOLORSTATIC, (WPARAM)hdc, (LPARAM)hwnd ); SendMessageW( GetParent(hwnd), WM_DRAWITEM, id, (LPARAM)&dis ); if (font) SelectObject( hdc, oldFont ); } -static void STATIC_PaintTextfn( HWND hwnd, HDC hdc, DWORD style ) +static void STATIC_PaintTextfn( HWND hwnd, HDC hdc, HBRUSH hbrush, DWORD style ) { RECT rc; - HBRUSH hBrush; HFONT hFont, hOldFont = NULL; UINT format; INT len, buf_size; @@ -725,13 +727,9 @@ static void STATIC_PaintTextfn( HWND hwnd, HDC hdc, DWORD style ) if ((hFont = STATIC_GetFont( hwnd ))) hOldFont = SelectObject( hdc, hFont ); - /* SS_SIMPLE controls: WM_CTLCOLORSTATIC is sent, but the returned - brush is not used */ - hBrush = STATIC_SendWmCtlColorStatic(hwnd, hdc); - if ((style & SS_TYPEMASK) != SS_SIMPLE) { - FillRect( hdc, &rc, hBrush ); + FillRect( hdc, &rc, hbrush ); if (!IsWindowEnabled(hwnd)) SetTextColor(hdc, GetSysColor(COLOR_GRAYTEXT)); } @@ -768,56 +766,52 @@ no_TextOut: SelectObject( hdc, hOldFont ); } -static void STATIC_PaintRectfn( HWND hwnd, HDC hdc, DWORD style ) +static void STATIC_PaintRectfn( HWND hwnd, HDC hdc, HBRUSH hbrush, DWORD style ) { RECT rc; - HBRUSH hBrush; GetClientRect( hwnd, &rc); - /* FIXME: send WM_CTLCOLORSTATIC */ switch (style & SS_TYPEMASK) { case SS_BLACKRECT: - hBrush = CreateSolidBrush(comctl32_color.clr3dDkShadow); - FillRect( hdc, &rc, hBrush ); + hbrush = CreateSolidBrush(comctl32_color.clr3dDkShadow); + FillRect( hdc, &rc, hbrush ); break; case SS_GRAYRECT: - hBrush = CreateSolidBrush(comctl32_color.clr3dShadow); - FillRect( hdc, &rc, hBrush ); + hbrush = CreateSolidBrush(comctl32_color.clr3dShadow); + FillRect( hdc, &rc, hbrush ); break; case SS_WHITERECT: - hBrush = CreateSolidBrush(comctl32_color.clr3dHilight); - FillRect( hdc, &rc, hBrush ); + hbrush = CreateSolidBrush(comctl32_color.clr3dHilight); + FillRect( hdc, &rc, hbrush ); break; case SS_BLACKFRAME: - hBrush = CreateSolidBrush(comctl32_color.clr3dDkShadow); - FrameRect( hdc, &rc, hBrush ); + hbrush = CreateSolidBrush(comctl32_color.clr3dDkShadow); + FrameRect( hdc, &rc, hbrush ); break; case SS_GRAYFRAME: - hBrush = CreateSolidBrush(comctl32_color.clr3dShadow); - FrameRect( hdc, &rc, hBrush ); + hbrush = CreateSolidBrush(comctl32_color.clr3dShadow); + FrameRect( hdc, &rc, hbrush ); break; case SS_WHITEFRAME: - hBrush = CreateSolidBrush(comctl32_color.clr3dHilight); - FrameRect( hdc, &rc, hBrush ); + hbrush = CreateSolidBrush(comctl32_color.clr3dHilight); + FrameRect( hdc, &rc, hbrush ); break; default: return; } - DeleteObject( hBrush ); + DeleteObject( hbrush ); } -static void STATIC_PaintIconfn( HWND hwnd, HDC hdc, DWORD style ) +static void STATIC_PaintIconfn( HWND hwnd, HDC hdc, HBRUSH hbrush, DWORD style ) { RECT rc, iconRect; - HBRUSH hbrush; HICON hIcon; SIZE size; GetClientRect( hwnd, &rc ); - hbrush = STATIC_SendWmCtlColorStatic(hwnd, hdc); hIcon = STATIC_GetImage( hwnd, IMAGE_ICON, style ); if (!hIcon || !get_icon_size( hIcon, &size )) { @@ -840,13 +834,10 @@ static void STATIC_PaintIconfn( HWND hwnd, HDC hdc, DWORD style ) } } -static void STATIC_PaintBitmapfn(HWND hwnd, HDC hdc, DWORD style ) +static void STATIC_PaintBitmapfn(HWND hwnd, HDC hdc, HBRUSH hbrush, DWORD style ) { HDC hMemDC; HBITMAP hBitmap, oldbitmap; - HBRUSH hbrush; - - hbrush = STATIC_SendWmCtlColorStatic(hwnd, hdc); if ((hBitmap = STATIC_GetImage( hwnd, IMAGE_BITMAP, style )) && (GetObjectType(hBitmap) == OBJ_BITMAP) @@ -891,14 +882,12 @@ static void STATIC_PaintBitmapfn(HWND hwnd, HDC hdc, DWORD style ) } } -static void STATIC_PaintEnhMetafn(HWND hwnd, HDC hdc, DWORD style ) +static void STATIC_PaintEnhMetafn(HWND hwnd, HDC hdc, HBRUSH hbrush, DWORD style ) { HENHMETAFILE hEnhMetaFile; RECT rc; - HBRUSH hbrush; GetClientRect(hwnd, &rc); - hbrush = STATIC_SendWmCtlColorStatic(hwnd, hdc); FillRect(hdc, &rc, hbrush); if ((hEnhMetaFile = STATIC_GetImage( hwnd, IMAGE_ENHMETAFILE, style ))) { @@ -909,11 +898,10 @@ static void STATIC_PaintEnhMetafn(HWND hwnd, HDC hdc, DWORD style ) } } -static void STATIC_PaintEtchedfn( HWND hwnd, HDC hdc, DWORD style ) +static void STATIC_PaintEtchedfn( HWND hwnd, HDC hdc, HBRUSH hbrush, DWORD style ) { RECT rc; - /* FIXME: sometimes (not always) sends WM_CTLCOLORSTATIC */ GetClientRect( hwnd, &rc ); DrawEdge(hdc, &rc, EDGE_ETCHED, BF_RECT); } diff --git a/dlls/comctl32/tests/static.c b/dlls/comctl32/tests/static.c index 7206e19c070..324301212dc 100644 --- a/dlls/comctl32/tests/static.c +++ b/dlls/comctl32/tests/static.c @@ -426,18 +426,18 @@ START_TEST(static) test_updates(0, 0); test_updates(SS_ICON, 0); - test_updates(SS_BLACKRECT, TODO_COUNT); - test_updates(SS_WHITERECT, TODO_COUNT); - test_updates(SS_BLACKFRAME, TODO_COUNT); - test_updates(SS_WHITEFRAME, TODO_COUNT); - test_updates(SS_USERITEM, TODO_COUNT); + test_updates(SS_BLACKRECT, 0); + test_updates(SS_WHITERECT, 0); + test_updates(SS_BLACKFRAME, 0); + test_updates(SS_WHITEFRAME, 0); + test_updates(SS_USERITEM, 0); test_updates(SS_SIMPLE, 0); test_updates(SS_OWNERDRAW, 0); test_updates(SS_BITMAP, 0); test_updates(SS_BITMAP | SS_CENTERIMAGE, 0); - test_updates(SS_ETCHEDHORZ, TODO_COUNT); - test_updates(SS_ETCHEDVERT, TODO_COUNT); - test_updates(SS_ETCHEDFRAME, TODO_COUNT); + test_updates(SS_ETCHEDHORZ, 0); + test_updates(SS_ETCHEDVERT, 0); + test_updates(SS_ETCHEDFRAME, 0); test_updates(SS_SUNKEN, 0); test_set_text(); test_set_image(); -- 2.25.1

2 1

[PATCH resend 4/7] comctl32: fix handling of SS_ETCHEDHORZ/SS_ETCHEDVERT static control styles
by Rafał Harabień 26 Mar '22

26 Mar '22

Instead of drawing the frame in WM_PAINT use WS_EX_STATICEDGE style that adds the frame outside of the client rect and change control size after creation to make it look like a line. Signed-off-by: Rafał Harabień <rafalh92(a)outlook.com> --- dlls/comctl32/static.c | 30 +++++++++++++++--------------- dlls/comctl32/tests/static.c | 6 +++--- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/comctl32/static.c b/dlls/comctl32/static.c index 7a3ac958111..1b5d1ade291 100644 --- a/dlls/comctl32/static.c +++ b/dlls/comctl32/static.c @@ -84,8 +84,8 @@ static const pfPaint staticPaintFunc[SS_TYPEMASK+1] = STATIC_PaintOwnerDrawfn, /* SS_OWNERDRAW */ STATIC_PaintBitmapfn, /* SS_BITMAP */ STATIC_PaintEnhMetafn, /* SS_ENHMETAFILE */ - STATIC_PaintEtchedfn, /* SS_ETCHEDHORZ */ - STATIC_PaintEtchedfn, /* SS_ETCHEDVERT */ + NULL, /* SS_ETCHEDHORZ */ + NULL, /* SS_ETCHEDVERT */ STATIC_PaintEtchedfn, /* SS_ETCHEDFRAME */ }; @@ -519,10 +519,21 @@ static LRESULT CALLBACK STATIC_WindowProc( HWND hwnd, UINT uMsg, WPARAM wParam, { CREATESTRUCTW *cs = (CREATESTRUCTW *)lParam; - if (full_style & SS_SUNKEN) + if (full_style & SS_SUNKEN || style == SS_ETCHEDHORZ || style == SS_ETCHEDVERT) SetWindowLongW( hwnd, GWL_EXSTYLE, GetWindowLongW( hwnd, GWL_EXSTYLE ) | WS_EX_STATICEDGE ); + if (style == SS_ETCHEDHORZ || style == SS_ETCHEDVERT) { + RECT rc; + GetClientRect(hwnd, &rc); + if (style == SS_ETCHEDHORZ) + rc.bottom = rc.top; + else + rc.right = rc.left; + AdjustWindowRectEx(&rc, full_style, FALSE, GetWindowLongW(hwnd, GWL_EXSTYLE)); + SetWindowPos(hwnd, NULL, 0, 0, rc.right - rc.left, rc.bottom - rc.top, SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOZORDER); + } + switch (style) { case SS_ICON: @@ -904,18 +915,7 @@ static void STATIC_PaintEtchedfn( HWND hwnd, HDC hdc, DWORD style ) /* FIXME: sometimes (not always) sends WM_CTLCOLORSTATIC */ GetClientRect( hwnd, &rc ); - switch (style & SS_TYPEMASK) - { - case SS_ETCHEDHORZ: - DrawEdge(hdc, &rc, EDGE_ETCHED, BF_TOP | BF_BOTTOM); - break; - case SS_ETCHEDVERT: - DrawEdge(hdc, &rc, EDGE_ETCHED, BF_LEFT | BF_RIGHT); - break; - case SS_ETCHEDFRAME: - DrawEdge(hdc, &rc, EDGE_ETCHED, BF_RECT); - break; - } + DrawEdge(hdc, &rc, EDGE_ETCHED, BF_RECT); } void STATIC_Register(void) diff --git a/dlls/comctl32/tests/static.c b/dlls/comctl32/tests/static.c index d1573b84d64..7206e19c070 100644 --- a/dlls/comctl32/tests/static.c +++ b/dlls/comctl32/tests/static.c @@ -91,17 +91,17 @@ static void test_updates(int style, int flags) exstyle = GetWindowLongW(hStatic, GWL_EXSTYLE); if (style == SS_ETCHEDHORZ || style == SS_ETCHEDVERT || style == SS_SUNKEN) - todo_wine_if(style == SS_ETCHEDHORZ || style == SS_ETCHEDVERT) ok(exstyle == WS_EX_STATICEDGE, "expected WS_EX_STATICEDGE, got %d\n", exstyle); + ok(exstyle == WS_EX_STATICEDGE, "expected WS_EX_STATICEDGE, got %d\n", exstyle); else ok(exstyle == 0, "expected 0, got %d\n", exstyle); GetClientRect(hStatic, &rcClient); if (style == SS_ETCHEDVERT) - todo_wine ok(rcClient.right == 0, "expected zero width, got %d\n", rcClient.right); + ok(rcClient.right == 0, "expected zero width, got %d\n", rcClient.right); else ok(rcClient.right > 0, "expected non-zero width, got %d\n", rcClient.right); if (style == SS_ETCHEDHORZ) - todo_wine ok(rcClient.bottom == 0, "expected zero height, got %d\n", rcClient.bottom); + ok(rcClient.bottom == 0, "expected zero height, got %d\n", rcClient.bottom); else ok(rcClient.bottom > 0, "expected non-zero height, got %d\n", rcClient.bottom); -- 2.25.1

2 1

[PATCH resend 3/7] comctl32/tests: add more static control tests
by Rafał Harabień 26 Mar '22

26 Mar '22

Signed-off-by: Rafał Harabień <rafalh92(a)outlook.com> --- dlls/comctl32/tests/static.c | 33 +++++++++++++++++++++++++++++---- 1 file changed, 29 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/tests/static.c b/dlls/comctl32/tests/static.c index b8f43142d6b..d1573b84d64 100644 --- a/dlls/comctl32/tests/static.c +++ b/dlls/comctl32/tests/static.c @@ -82,10 +82,29 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lpara static void test_updates(int style, int flags) { HWND hStatic = create_static(style); - RECT r1 = {20, 20, 30, 30}; + RECT r1 = {20, 20, 30, 30}, rcClient; int exp; + LONG exstyle; flush_events(); + trace("Testing style 0x%x\n", style); + + exstyle = GetWindowLongW(hStatic, GWL_EXSTYLE); + if (style == SS_ETCHEDHORZ || style == SS_ETCHEDVERT || style == SS_SUNKEN) + todo_wine_if(style == SS_ETCHEDHORZ || style == SS_ETCHEDVERT) ok(exstyle == WS_EX_STATICEDGE, "expected WS_EX_STATICEDGE, got %d\n", exstyle); + else + ok(exstyle == 0, "expected 0, got %d\n", exstyle); + + GetClientRect(hStatic, &rcClient); + if (style == SS_ETCHEDVERT) + todo_wine ok(rcClient.right == 0, "expected zero width, got %d\n", rcClient.right); + else + ok(rcClient.right > 0, "expected non-zero width, got %d\n", rcClient.right); + if (style == SS_ETCHEDHORZ) + todo_wine ok(rcClient.bottom == 0, "expected zero height, got %d\n", rcClient.bottom); + else + ok(rcClient.bottom > 0, "expected non-zero height, got %d\n", rcClient.bottom); + g_nReceivedColorStatic = 0; /* during each update parent WndProc will test the WM_CTLCOLORSTATIC message */ InvalidateRect(hMainWnd, NULL, FALSE); @@ -406,14 +425,20 @@ START_TEST(static) ShowWindow(hMainWnd, SW_SHOW); test_updates(0, 0); - test_updates(SS_SIMPLE, 0); test_updates(SS_ICON, 0); - test_updates(SS_BITMAP, 0); - test_updates(SS_BITMAP | SS_CENTERIMAGE, 0); test_updates(SS_BLACKRECT, TODO_COUNT); test_updates(SS_WHITERECT, TODO_COUNT); + test_updates(SS_BLACKFRAME, TODO_COUNT); + test_updates(SS_WHITEFRAME, TODO_COUNT); + test_updates(SS_USERITEM, TODO_COUNT); + test_updates(SS_SIMPLE, 0); + test_updates(SS_OWNERDRAW, 0); + test_updates(SS_BITMAP, 0); + test_updates(SS_BITMAP | SS_CENTERIMAGE, 0); test_updates(SS_ETCHEDHORZ, TODO_COUNT); test_updates(SS_ETCHEDVERT, TODO_COUNT); + test_updates(SS_ETCHEDFRAME, TODO_COUNT); + test_updates(SS_SUNKEN, 0); test_set_text(); test_set_image(); test_STM_SETIMAGE(); -- 2.25.1

2 1

[PATCH resend 2/7] user32: use SWP_NOACTIVATE flag when resizing etched static control
by Rafał Harabień 26 Mar '22

26 Mar '22

Signed-off-by: Rafał Harabień <rafalh92(a)outlook.com> --- dlls/user32/static.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/static.c b/dlls/user32/static.c index d19df22dcb9..dc9a210862a 100644 --- a/dlls/user32/static.c +++ b/dlls/user32/static.c @@ -425,7 +425,7 @@ LRESULT StaticWndProc_common( HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam else rc.right = rc.left; AdjustWindowRectEx(&rc, full_style, FALSE, GetWindowLongW(hwnd, GWL_EXSTYLE)); - SetWindowPos(hwnd, NULL, 0, 0, rc.right - rc.left, rc.bottom - rc.top, SWP_NOMOVE | SWP_NOZORDER); + SetWindowPos(hwnd, NULL, 0, 0, rc.right - rc.left, rc.bottom - rc.top, SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOZORDER); } switch (style) { -- 2.25.1

2 1

[PATCH resend 1/7] user32/tests: remove redundant SS_*RECT static control tests
by Rafał Harabień 26 Mar '22

26 Mar '22

Signed-off-by: Rafał Harabień <rafalh92(a)outlook.com> --- dlls/user32/tests/static.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/user32/tests/static.c b/dlls/user32/tests/static.c index 0899f4c6187..999ff2a8d76 100644 --- a/dlls/user32/tests/static.c +++ b/dlls/user32/tests/static.c @@ -344,8 +344,6 @@ START_TEST(static) test_updates(SS_OWNERDRAW); test_updates(SS_BITMAP); test_updates(SS_BITMAP | SS_CENTERIMAGE); - test_updates(SS_BLACKRECT); - test_updates(SS_WHITERECT); test_updates(SS_ETCHEDHORZ); test_updates(SS_ETCHEDVERT); test_updates(SS_ETCHEDFRAME); -- 2.25.1

1 0

[PATCH 0/2] wmd speedup
by Eric Pouech 26 Mar '22

26 Mar '22

The following series drastically improves cmd performance by caching label resolution when executing a batch file. Testbot is hitting a timeout when running the tests. See https://bugs.winehq.org/show_bug.cgi?id=52720 Local tests show a reduction of test duration of 90%! Don't always expect those numbers; in some extreme cases, the patchset will even slightly increase execution time. Note: the reason why testbot started timing out is still unknown. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- Eric Pouech (2): programs/cmd: introduce structure BATCH_FILE to hold information about a .cmd file programs/cmd: add label => file offset lookup in BATCH_FILE programs/cmd/batch.c | 153 ++++++++++++++++++++++++++++++++++++++-- programs/cmd/builtins.c | 63 +++-------------- programs/cmd/wcmd.h | 19 ++++- 3 files changed, 172 insertions(+), 63 deletions(-)

1 2

Wine staging 7.5 release
by Alistair Leslie-Hughes 26 Mar '22

26 Mar '22

Binary packages for various distributions will be available from: https://www.winehq.org/download Summary since last release * Rebased to current wine 7.5 (561 patches are applied to wine vanilla) Upstreamed (Either directly from staging or fixed with a similar patch). * None Added: * None Updated: * Various patches to remove the long warnings. 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 1/5 v2] cmd/tests: Add tests for the magic environment variables.
by Francois Gouget 25 Mar '22

25 Mar '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- v2: - Some locales add the day-of-week before the date. Adjust the tests accordingly. - Add more for %cd%, %errorlevel%, defined, tests. - Compare date /t with %date%, and time /t with %time%. - Modify the tests so they work with @todo_wine@. --- programs/cmd/tests/test_builtins.cmd | 39 +++++++++++++++++++++++- programs/cmd/tests/test_builtins.cmd.exp | 15 ++++++++- 2 files changed, 52 insertions(+), 2 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 3f410e55166..f9e26da34b6 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -585,7 +585,6 @@ cd dummydir echo %~dp0 cd .. rmdir dummydir -echo CD value %CD% echo %% echo P% echo %P @@ -1789,6 +1788,44 @@ set /a WINE_foo=5 set /a WINE_bar=WINE_foo=6 call :checkenvvars WINE_foo 6 WINE_bar 6 +echo --- Magic environment variables +if defined cd (echo Has %%cd%%) else (echo Not defined) +echo CD value %CD% + +rem Some locales include the day-of-week either before or after the +rem day-month-year part. This makes it impossible to check the content of %date% +if defined date (echo Has %%date%%) else (echo Not defined) +set WINE_foo=%date:~9,1% +if defined WINE_foo (echo Good %%date%%) else (echo Too short) + +set WINE_before=%date% +for /f "usebackq tokens=*" %%i in (`date /t`) do set WINE_foo=%%i +set WINE_after=%date% +rem Use extra parentheses to work around a Wine bug +if not "%WINE_foo%"=="%WINE_before% " (if not "%WINE_foo%"=="%WINE_after% " (echo date /t != %%date%%) else (echo Match)) else (echo Match) + +if defined errorlevel (echo Has %%errorlevel%%) else (echo Not defined) + +if defined time (echo Has %%time%%) else (echo Not defined) +set WINE_foo=%time:~7,1% +if defined WINE_foo (echo %%time%% has seconds) else (echo Too short) +set WINE_foo=%time:~10,1% +if defined WINE_foo (echo %%time%% has 1/100s) else (echo Too short) +set WINE_foo=%time:~11,1% +if not defined WINE_foo (echo End of %%time%%) else (echo Too long) + +rem %time% has a leading space instead of a zero so ignore the first character +set WINE_before=%time:~1,4% +for /f "usebackq tokens=*" %%i in (`time /t`) do set WINE_foo=%%i +set WINE_after=%time:~1,4% +set WINE_foo=%WINE_foo:~1,99% +rem Use extra parentheses to work around a Wine bug +if not "%WINE_foo%"=="%WINE_before%" (if not "%WINE_foo%"=="%WINE_after%" (echo time /t != %%time:~1,4%%) else (echo Match)) else (echo Match) + +if defined random (echo Has %%random%%) else (echo Not defined) +set WINE_foo=%random% +if %WINE_foo% neq %random% (echo %%random%% looks random) else (echo Constant?) + echo --- for /F mkdir foobar & cd foobar echo ------ string argument diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 8b6e0914112..15fda131a5c 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -500,7 +500,6 @@ I'm here!@space@ ~dp0 should be directory containing batch file @drive@@path@ @drive@@path@ -CD value @pwd@@or_broken@CD value@space@ % P P @@ -1216,6 +1215,20 @@ WINE_foo correctly 7 WINE_foo correctly 8@or_broken@ERROR: WINE_foo incorrectly 4 [8] WINE_foo correctly 6@or_broken@ERROR: WINE_foo incorrectly 5 [6] WINE_bar correctly 6@or_broken@ERROR: WINE_bar incorrectly 5 [6] +--- Magic environment variables +@todo_wine@Has %cd% +CD value @pwd@@or_broken@CD value@space@ +@todo_wine@Has %date% +@todo_wine@Good %date% +@todo_wine@Match +@todo_wine@Has %errorlevel% +@todo_wine@Has %time% +@todo_wine@%time% has seconds +@todo_wine@%time% has 1/100s +End of %time% +@todo_wine@Match +@todo_wine@Has %random% +%random% looks random --- for /F ------ string argument a -- 2.30.2

2 9

[PATCH v8 0/7] Fix sock_send reordering issue (#52401)
by Jinoh Kang 25 Mar '22

25 Mar '22

This fixes the send part of the issue #52401 [1]: "Improper synchronization in sock_recv/sock_send leads to arbitrary reordering of completion of I/O requests", which was initially reported (outside Bugzilla) by Dongwan Kim [2]. Changelog: v1 -> v2: - drop patch "server: Compact struct set_async_direct_result_reply." - add async and fd arguments to async_initial_status_callback - recv_socket_initial_callback: pass OOB flag via private instead of implementing two separate functions for OOB and non-OOB - detect short write in send_socket_initial_callback - preserve the behaviour of returning success if we had a short write and the socket is nonblocking and force_async is unset v2 -> v3: - fix typo in comment v3 -> v4: - fix typo in commit message - address feedback - drop patch "server: Defer postprocessing until after setting initial status in recv_socket handler." v4 -> v5: - drop patch "server: Add async_initial_status_callback." - drop patch "server: Defer postprocessing until after setting initial status in send_socket handler." - add patch "server: Ensure completion_callback is called before async is destroyed." - add patch "ws2_32/tests: Continue sending remaining data on short write in test_write_events." - add patch "server: Defer clearing events until async is either pending or completed in send_socket handler." - add patch "server: Ensure datagram sockets are bound in send_socket." v5 -> v6: - centralise status code computation in one place, even for bind errno translation - fix erroneous subject (s/either pending or completed/completed/) v6 -> v7: - drop patch "server: Ensure completion_callback is called before async is destroyed." - add patch "server: Ensure async completion callback is called on synchronous failure." - add patch "server: Allow async completion callback to retrieve status on synchronous failure." v7 -> v8: - drop committed patches - edit commit message of "server: Ensure completion_callback is called before async is destroyed." as per feedback (thanks zf) - move a sock_reselect() into the prior if block (thanks zf) Supersedes 227636 - 227644. Supersedes 228988 - 228998. Supersedes 230282 - 230293 (sans already committed patches). [1] https://bugs.winehq.org/show_bug.cgi?id=52401 [2] https://www.winehq.org/pipermail/wine-devel/2021-May/186454.html Jinoh Kang (7): server: Generalise async completion callback to be called on synchronous failure. server: Allow async completion callback to retrieve status on synchronous failure. server: Defer clearing events until async is completed in send_socket handler. server: Attempt to complete I/O request immediately in send_socket. server: Ensure datagram sockets are bound in send_socket. ntdll: Don't call try_send before server call in sock_send. server: Replace redundant send_socket status fields with force_async boolean field. dlls/ntdll/unix/socket.c | 89 +++++++++++++++------- dlls/ws2_32/tests/sock.c | 14 ++-- server/async.c | 14 +++- server/protocol.def | 4 +- server/sock.c | 161 +++++++++++++++++++++++++++------------ 5 files changed, 195 insertions(+), 87 deletions(-) -- 2.34.1

3 15

[PATCH] user32: Avoid pointer truncation in free_user_handle.
by Rémi Bernon 25 Mar '22

25 Mar '22

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/user32/win.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 77dfc131928..fac534a7c87 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -72,7 +72,7 @@ void release_user_handle_ptr( void *ptr ) */ void *free_user_handle( HANDLE handle, unsigned int type ) { - return UlongToHandle( NtUserCallTwoParam( HandleToUlong(handle), type, NtUserFreeHandle )); + return (void *)NtUserCallTwoParam( HandleToUlong(handle), type, NtUserFreeHandle ); } -- 2.35.1

3 4

[PATCH 3/6] user32: Split client and kernel parts of unpack_message.
by Jacek Caban 25 Mar '22

25 Mar '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/message.c | 133 +++++++++-------------- dlls/user32/winproc.c | 247 +++++++++++++++++++++++++++++++++++++++++- dlls/win32u/message.c | 2 + include/ntuser.h | 1 + 4 files changed, 297 insertions(+), 86 deletions(-)

4 4

[PATCH 0/3] Implementing filename completion in cmd
by Eric Pouech 25 Mar '22

25 Mar '22

The following series implements filename completion in cmd, à la Windows (tab (resp. shift-tab) rotates in alphabetical order (resp. backwards alpha order) the available filenames starting with a given prefix). It requires two fixes in programs/conhost. Notes to Jacek - for the second patch, I tried to pick most of the APIs requiring cursor positionning. I wonder if SetConsoleCursorPosition (when y is outside a given interval) shouldn't be part of it (no concrete example at sight, just wild thinking) (something like deltay < -5 || deltay > 0) (This can be done later on anyway) Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- Eric Pouech (3): programs/conhost: correctly recompute start of edit line on ReadConsole programs/conhost: support relative cursor positionning programs/cmd: implement filename completion programs/cmd/batch.c | 279 ++++++++++++++++++++++++++++++++++++- programs/conhost/conhost.c | 22 ++- programs/conhost/conhost.h | 1 + 3 files changed, 294 insertions(+), 8 deletions(-)

3 7

[PATCH vkd3d v7 6/6] vkd3d-shader/hlsl: Treat all braceless initializers as assignments.
by Francisco Casas 25 Mar '22

25 Mar '22

Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- v7: - No changes from v5. Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.y | 91 +++++++++++++++++++++------------------- 1 file changed, 48 insertions(+), 43 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 1b47187e..9e09054b 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1603,61 +1603,66 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t if (v->initializer.args_count) { - unsigned int size = initializer_size(&v->initializer); - struct hlsl_ir_load *load; - - if (type->type <= HLSL_CLASS_LAST_NUMERIC && v->initializer.braces - && type->dimx * type->dimy != size) + if (v->initializer.braces) { - hlsl_error(ctx, &v->loc, VKD3D_SHADER_ERROR_HLSL_WRONG_PARAMETER_COUNT, - "Expected %u components in numeric initializer, but got %u.", - type->dimx * type->dimy, v->initializer.args_count); - free_parse_initializer(&v->initializer); - vkd3d_free(v); - continue; - } + unsigned int size = initializer_size(&v->initializer); - if ((type->type == HLSL_CLASS_STRUCT || type->type == HLSL_CLASS_ARRAY) - && hlsl_type_component_count(type) != size) - { - hlsl_error(ctx, &v->loc, VKD3D_SHADER_ERROR_HLSL_WRONG_PARAMETER_COUNT, - "Expected %u components in initializer, but got %u.", hlsl_type_component_count(type), size); - free_parse_initializer(&v->initializer); - vkd3d_free(v); - continue; - } + if (type->type <= HLSL_CLASS_LAST_NUMERIC && type->dimx * type->dimy != size) + { + hlsl_error(ctx, &v->loc, VKD3D_SHADER_ERROR_HLSL_WRONG_PARAMETER_COUNT, + "Expected %u components in numeric initializer, but got %u.", + type->dimx * type->dimy, v->initializer.args_count); + free_parse_initializer(&v->initializer); + vkd3d_free(v); + continue; + } - if (type->type > HLSL_CLASS_LAST_NUMERIC && type->type != HLSL_CLASS_STRUCT) - { - FIXME("Initializers for non scalar/struct variables not supported yet.\n"); - free_parse_initializer(&v->initializer); - vkd3d_free(v); - continue; - } + if ((type->type == HLSL_CLASS_STRUCT || type->type == HLSL_CLASS_ARRAY) + && hlsl_type_component_count(type) != size) + { + hlsl_error(ctx, &v->loc, VKD3D_SHADER_ERROR_HLSL_WRONG_PARAMETER_COUNT, + "Expected %u components in initializer, but got %u.", hlsl_type_component_count(type), size); + free_parse_initializer(&v->initializer); + vkd3d_free(v); + continue; + } - if (type->type == HLSL_CLASS_STRUCT) - { - struct_var_initializer(ctx, statements_list, var, &v->initializer); - vkd3d_free(v); - continue; + if (type->type > HLSL_CLASS_LAST_NUMERIC && type->type != HLSL_CLASS_STRUCT) + { + FIXME("Initializers for non scalar/struct variables not supported yet.\n"); + free_parse_initializer(&v->initializer); + vkd3d_free(v); + continue; + } + + if (type->type == HLSL_CLASS_STRUCT) + { + struct_var_initializer(ctx, statements_list, var, &v->initializer); + vkd3d_free(v); + continue; + } + else + { + hlsl_fixme(ctx, &v->loc, "Complex initializer."); + free_parse_initializer(&v->initializer); + vkd3d_free(v); + continue; + } } - if (v->initializer.args_count > 1) + else { - hlsl_fixme(ctx, &v->loc, "Complex initializer."); - free_parse_initializer(&v->initializer); - vkd3d_free(v); - continue; - } + struct hlsl_ir_load *load = hlsl_new_var_load(ctx, var, var->loc); - load = hlsl_new_var_load(ctx, var, var->loc); - list_add_tail(v->initializer.instrs, &load->node.entry); - add_assignment(ctx, v->initializer.instrs, &load->node, ASSIGN_OP_ASSIGN, v->initializer.args[0]); - vkd3d_free(v->initializer.args); + assert(v->initializer.args_count == 1); + list_add_tail(v->initializer.instrs, &load->node.entry); + add_assignment(ctx, v->initializer.instrs, &load->node, ASSIGN_OP_ASSIGN, v->initializer.args[0]); + } if (modifiers & HLSL_STORAGE_STATIC) list_move_tail(&ctx->static_initializers, v->initializer.instrs); else list_move_tail(statements_list, v->initializer.instrs); + vkd3d_free(v->initializer.args); vkd3d_free(v->initializer.instrs); } vkd3d_free(v); -- 2.25.1

1 0

[PATCH vkd3d v7 5/6] vkd3d-shader/hlsl: Don't check exact number of components for braceless initialization of numeric types.
by Francisco Casas 25 Mar '22

25 Mar '22

The implicit conversion in add_assignment() takes responsability now. Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- v7: - No changes from v5. Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.y | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 98602f71..1b47187e 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1606,19 +1606,17 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t unsigned int size = initializer_size(&v->initializer); struct hlsl_ir_load *load; - if (type->type <= HLSL_CLASS_LAST_NUMERIC - && type->dimx * type->dimy != size && size != 1) + if (type->type <= HLSL_CLASS_LAST_NUMERIC && v->initializer.braces + && type->dimx * type->dimy != size) { - if (size < type->dimx * type->dimy) - { - hlsl_error(ctx, &v->loc, VKD3D_SHADER_ERROR_HLSL_WRONG_PARAMETER_COUNT, - "Expected %u components in numeric initializer, but got %u.", - type->dimx * type->dimy, size); - free_parse_initializer(&v->initializer); - vkd3d_free(v); - continue; - } + hlsl_error(ctx, &v->loc, VKD3D_SHADER_ERROR_HLSL_WRONG_PARAMETER_COUNT, + "Expected %u components in numeric initializer, but got %u.", + type->dimx * type->dimy, v->initializer.args_count); + free_parse_initializer(&v->initializer); + vkd3d_free(v); + continue; } + if ((type->type == HLSL_CLASS_STRUCT || type->type == HLSL_CLASS_ARRAY) && hlsl_type_component_count(type) != size) { -- 2.25.1

1 0

[PATCH vkd3d v7 4/6] vkd3d-shader/hlsl: Properly free parse_variable_def memory.
by Francisco Casas 25 Mar '22

25 Mar '22

Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- v7: - No changes from v6. Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.y | 42 +++++++++++++++++++++++++++------------- 1 file changed, 29 insertions(+), 13 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index c84003fd..98602f71 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -668,6 +668,15 @@ static struct hlsl_type *apply_type_modifiers(struct hlsl_ctx *ctx, struct hlsl_ return new_type; } +static void free_parse_variable_def(struct parse_variable_def *v) +{ + free_parse_initializer(&v->initializer); + vkd3d_free(v->arrays.sizes); + vkd3d_free(v->name); + vkd3d_free((void *)v->semantic.name); + vkd3d_free(v); +} + static struct list *gen_struct_fields(struct hlsl_ctx *ctx, struct hlsl_type *type, struct list *fields) { struct parse_variable_def *v, *v_next; @@ -685,13 +694,14 @@ static struct list *gen_struct_fields(struct hlsl_ctx *ctx, struct hlsl_type *ty if (!(field = hlsl_alloc(ctx, sizeof(*field)))) { - vkd3d_free(v); - return list; + free_parse_variable_def(v); + continue; } field->type = type; for (i = 0; i < v->arrays.count; ++i) field->type = hlsl_new_array_type(ctx, field->type, v->arrays.sizes[i]); + vkd3d_free(v->arrays.sizes); field->loc = v->loc; field->name = v->name; field->semantic = v->semantic; @@ -719,18 +729,29 @@ static bool add_typedef(struct hlsl_ctx *ctx, DWORD modifiers, struct hlsl_type if (!v->arrays.count) { if (!(type = hlsl_type_clone(ctx, orig_type, 0, modifiers))) - return false; + { + free_parse_variable_def(v); + continue; + } } else { type = orig_type; } + ret = true; for (i = 0; i < v->arrays.count; ++i) { if (!(type = hlsl_new_array_type(ctx, type, v->arrays.sizes[i]))) - return false; + { + free_parse_variable_def(v); + ret = false; + break; + } } + if (!ret) + continue; + vkd3d_free(v->arrays.sizes); vkd3d_free((void *)type->name); type->name = v->name; @@ -747,6 +768,7 @@ static bool add_typedef(struct hlsl_ctx *ctx, DWORD modifiers, struct hlsl_type if (!ret) hlsl_error(ctx, &v->loc, VKD3D_SHADER_ERROR_HLSL_REDEFINED, "Type '%s' is already defined.", v->name); + free_parse_initializer(&v->initializer); vkd3d_free(v); } vkd3d_free(list); @@ -1470,15 +1492,6 @@ static void struct_var_initializer(struct hlsl_ctx *ctx, struct list *list, stru vkd3d_free(initializer->args); } -static void free_parse_variable_def(struct parse_variable_def *v) -{ - free_parse_initializer(&v->initializer); - vkd3d_free(v->arrays.sizes); - vkd3d_free(v->name); - vkd3d_free((void *)v->semantic.name); - vkd3d_free(v); -} - static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_type, DWORD modifiers, struct list *var_list) { @@ -1510,6 +1523,7 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t type = basic_type; for (i = 0; i < v->arrays.count; ++i) type = hlsl_new_array_type(ctx, type, v->arrays.sizes[i]); + vkd3d_free(v->arrays.sizes); if (type->type != HLSL_CLASS_MATRIX) check_invalid_matrix_modifiers(ctx, modifiers, v->loc); @@ -1569,6 +1583,7 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t hlsl_error(ctx, &v->loc, VKD3D_SHADER_ERROR_HLSL_MISSING_INITIALIZER, "Const variable \"%s\" is missing an initializer.", var->name); hlsl_free_var(var); + free_parse_initializer(&v->initializer); vkd3d_free(v); continue; } @@ -1581,6 +1596,7 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t "Variable \"%s\" was already declared in this scope.", var->name); hlsl_note(ctx, &old->loc, VKD3D_SHADER_LOG_ERROR, "\"%s\" was previously declared here.", old->name); hlsl_free_var(var); + free_parse_initializer(&v->initializer); vkd3d_free(v); continue; } -- 2.25.1

1 0

[PATCH vkd3d v7 3/6] vkd3d-shader/hlsl: Add 'braces' flag to parse initializers.
by Francisco Casas 25 Mar '22

25 Mar '22

Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- v7: - No changes from v5. Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.y | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index cc0c2e26..c84003fd 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -48,6 +48,7 @@ struct parse_initializer struct hlsl_ir_node **args; unsigned int args_count; struct list *instrs; + bool braces; }; struct parse_array_sizes @@ -3215,14 +3216,17 @@ complex_initializer: } $$.args[0] = node_from_list($1); $$.instrs = $1; + $$.braces = false; } | '{' complex_initializer_list '}' { $$ = $2; + $$.braces = true; } | '{' complex_initializer_list ',' '}' { $$ = $2; + $$.braces = true; } complex_initializer_list: @@ -3257,6 +3261,7 @@ initializer_expr_list: YYABORT; $$.args[0] = node_from_list($1); $$.instrs = $1; + $$.braces = false; } | initializer_expr_list ',' initializer_expr { @@ -3393,6 +3398,7 @@ func_arguments: $$.args_count = 0; if (!($$.instrs = make_empty_list(ctx))) YYABORT; + $$.braces = false; } | initializer_expr_list -- 2.25.1

1 0

[PATCH vkd3d v7 2/6] vkd3d-shader/hlsl: Concatenate nested initializers.
by Francisco Casas 25 Mar '22

25 Mar '22

Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- v7: - No changes from v6. Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.y | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 2b26d0b0..cc0c2e26 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -2408,6 +2408,7 @@ static bool add_method_call(struct hlsl_ctx *ctx, struct list *instrs, struct hl %type <function> func_prototype %type <initializer> complex_initializer +%type <initializer> complex_initializer_list %type <initializer> func_arguments %type <initializer> initializer_expr_list @@ -3215,15 +3216,36 @@ complex_initializer: $$.args[0] = node_from_list($1); $$.instrs = $1; } - | '{' initializer_expr_list '}' + | '{' complex_initializer_list '}' { $$ = $2; } - | '{' initializer_expr_list ',' '}' + | '{' complex_initializer_list ',' '}' { $$ = $2; } +complex_initializer_list: + complex_initializer + | complex_initializer_list ',' complex_initializer + { + struct hlsl_ir_node **new_args; + unsigned int i; + + $$ = $1; + if (!(new_args = hlsl_realloc(ctx, $$.args, ($$.args_count + $3.args_count) * sizeof(*$$.args)))) + { + free_parse_initializer(&$$); + free_parse_initializer(&$3); + YYABORT; + } + $$.args = new_args; + for (i = 0; i < $3.args_count; i++) + $$.args[$$.args_count++] = $3.args[i]; + list_move_tail($$.instrs, $3.instrs); + free_parse_initializer(&$3); + } + initializer_expr: assignment_expr -- 2.25.1

1 0

[PATCH vkd3d v7 1/6] vkd3d-shader/hlsl: Avoid leaks on memory allocation failures when parsing initializers.
by Francisco Casas 25 Mar '22

25 Mar '22

Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- v7: - No changes from v5. Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.y | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 1ab56fba..2b26d0b0 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -3208,7 +3208,10 @@ complex_initializer: { $$.args_count = 1; if (!($$.args = hlsl_alloc(ctx, sizeof(*$$.args)))) + { + destroy_instr_list($1); YYABORT; + } $$.args[0] = node_from_list($1); $$.instrs = $1; } @@ -3235,9 +3238,16 @@ initializer_expr_list: } | initializer_expr_list ',' initializer_expr { + struct hlsl_ir_node **new_args; + $$ = $1; - if (!($$.args = hlsl_realloc(ctx, $$.args, ($$.args_count + 1) * sizeof(*$$.args)))) + if (!(new_args = hlsl_realloc(ctx, $$.args, ($$.args_count + 1) * sizeof(*$$.args)))) + { + free_parse_initializer(&$$); + destroy_instr_list($3); YYABORT; + } + $$.args = new_args; $$.args[$$.args_count++] = node_from_list($3); list_move_tail($$.instrs, $3); vkd3d_free($3); -- 2.25.1

1 0

[PATCH] kernel32/tests: Add a test to show that services.exe is supposed to run in the session 0.
by Dmitry Timoshkov 25 Mar '22

25 Mar '22

IsWindowsService() from Microsoft.Extensions.Hosting.WindowsServices (.Net 4.6, 4.8, 5.0) depends on this. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/kernel32/tests/process.c | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index e9e8555c32e..8f18a0d37a7 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -4959,6 +4959,40 @@ static void test_job_list_attribute(HANDLE parent_job) ok(ret, "SetInformationJobObject error %lu\n", GetLastError()); } +static void test_services_exe(void) +{ + NTSTATUS status; + ULONG size, offset; + char *buf; + SYSTEM_PROCESS_INFORMATION *spi; + ULONG services_pid = 0, services_session_id = ~0; + + status = NtQuerySystemInformation(SystemProcessInformation, NULL, 0, &size); + ok(status == STATUS_INFO_LENGTH_MISMATCH, "got %#lx\n", status); + + buf = malloc(size); + status = NtQuerySystemInformation(SystemProcessInformation, buf, size, &size); + ok(status == STATUS_SUCCESS, "got %#lx\n", status); + + spi = (SYSTEM_PROCESS_INFORMATION *)buf; + offset = 0; + + do + { + spi = (SYSTEM_PROCESS_INFORMATION *)(buf + offset); + if (!wcsnicmp(spi->ProcessName.Buffer, L"services.exe", spi->ProcessName.Length/sizeof(WCHAR))) + { + services_pid = HandleToUlong(spi->UniqueProcessId); + services_session_id = spi->SessionId; + } + offset += spi->NextEntryOffset; + } while (spi->NextEntryOffset != 0); + + ok(services_pid != 0, "services.exe not found\n"); + todo_wine + ok(services_session_id == 0, "got services.exe SessionId %lu\n", services_session_id); +} + START_TEST(process) { HANDLE job, hproc, h, h2; @@ -5088,6 +5122,7 @@ START_TEST(process) test_parent_process_attribute(0, NULL); test_handle_list_attribute(FALSE, NULL, NULL); test_dead_process(); + test_services_exe(); /* things that can be tested: * lookup: check the way program to be executed is searched -- 2.35.1

1 0

[PATCH] bcrypt: Use GNUTLS_DIG_UNKNOWN for an unknown digest.
by Huw Davies 25 Mar '22

25 Mar '22

Mainly to avoid a clang warning. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/bcrypt/gnutls.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c index ba251c72fa1..b38bf4ba8ff 100644 --- a/dlls/bcrypt/gnutls.c +++ b/dlls/bcrypt/gnutls.c @@ -1552,7 +1552,7 @@ static gnutls_digest_algorithm_t get_digest_from_id( const WCHAR *alg_id ) if (!wcscmp( alg_id, BCRYPT_SHA512_ALGORITHM )) return GNUTLS_DIG_SHA512; if (!wcscmp( alg_id, BCRYPT_MD2_ALGORITHM )) return GNUTLS_DIG_MD2; if (!wcscmp( alg_id, BCRYPT_MD5_ALGORITHM )) return GNUTLS_DIG_MD5; - return -1; + return GNUTLS_DIG_UNKNOWN; } static NTSTATUS key_asymmetric_verify( void *args ) @@ -1596,7 +1596,7 @@ static NTSTATUS key_asymmetric_verify( void *args ) if (!(flags & BCRYPT_PAD_PKCS1) || !info) return STATUS_INVALID_PARAMETER; if (!info->pszAlgId) return STATUS_INVALID_SIGNATURE; - if ((hash_alg = get_digest_from_id(info->pszAlgId)) == -1) + if ((hash_alg = get_digest_from_id(info->pszAlgId)) == GNUTLS_DIG_UNKNOWN) { FIXME( "hash algorithm %s not supported\n", debugstr_w(info->pszAlgId) ); return STATUS_NOT_SUPPORTED; @@ -1751,7 +1751,7 @@ static NTSTATUS key_asymmetric_sign( void *args ) return STATUS_INVALID_PARAMETER; } - if ((hash_alg = get_digest_from_id( pad->pszAlgId )) == -1) + if ((hash_alg = get_digest_from_id( pad->pszAlgId )) == GNUTLS_DIG_UNKNOWN) { FIXME( "hash algorithm %s not recognized\n", debugstr_w(pad->pszAlgId) ); return STATUS_NOT_SUPPORTED; -- 2.23.0

2 1

[PATCH vkd3d v6 3/8] vkd3d-shader/hlsl: Concatenate nested initializers.
by Francisco Casas 25 Mar '22

25 Mar '22

Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- v6: - Declaration of "unsigned int i" moved out of the 'for' initialization clause. Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.y | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index aca246f6..c40957c2 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -2411,6 +2411,7 @@ static bool add_method_call(struct hlsl_ctx *ctx, struct list *instrs, struct hl %type <function> func_prototype %type <initializer> complex_initializer +%type <initializer> complex_initializer_list %type <initializer> func_arguments %type <initializer> initializer_expr_list @@ -3218,15 +3219,36 @@ complex_initializer: $$.args[0] = node_from_list($1); $$.instrs = $1; } - | '{' initializer_expr_list '}' + | '{' complex_initializer_list '}' { $$ = $2; } - | '{' initializer_expr_list ',' '}' + | '{' complex_initializer_list ',' '}' { $$ = $2; } +complex_initializer_list: + complex_initializer + | complex_initializer_list ',' complex_initializer + { + struct hlsl_ir_node **new_args; + unsigned int i; + + $$ = $1; + if (!(new_args = hlsl_realloc(ctx, $$.args, ($$.args_count + $3.args_count) * sizeof(*$$.args)))) + { + free_parse_initializer(&$$); + free_parse_initializer(&$3); + YYABORT; + } + $$.args = new_args; + for (i = 0; i < $3.args_count; i++) + $$.args[$$.args_count++] = $3.args[i]; + list_move_tail($$.instrs, $3.instrs); + free_parse_initializer(&$3); + } + initializer_expr: assignment_expr -- 2.25.1

1 1

[PATCH] win32u: Move menu handle management from user32.
by Jacek Caban 25 Mar '22

25 Mar '22

4 4

[PATCH 1/2] user32/tests: Test a recursive activation loop on WM_ACTIVATE.
by Rémi Bernon 25 Mar '22

25 Mar '22

From: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Windows only sends the activation messages and hooks once, until the SetActiveWindow completes for that window. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46274 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- AFAICS these two patches help with the recent user32 tests failures on the testbot. Although I believe the patches are correct, I'm not sure the failure root cause is that windows are now activated recursively. Instead, I think that some change caused window procs to now be always called recursively when they weren't before. dlls/user32/tests/msg.c | 91 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 90 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index a2adf56565d..adb167bdad3 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -10203,6 +10203,40 @@ static LRESULT WINAPI ShowWindowProcA(HWND hwnd, UINT message, WPARAM wParam, LP return ret; } +static LRESULT WINAPI SetActiveWindowProcA(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + static LONG defwndproc_counter = 0; + struct recvd_message msg; + LRESULT ret; + + switch (message) + { + /* log only specific messages we are interested in */ + case WM_NCACTIVATE: + case WM_ACTIVATE: + case WM_SETFOCUS: + case WM_KILLFOCUS: + break; + default: + return DefWindowProcA(hwnd, message, wParam, lParam); + } + + msg.hwnd = hwnd; + msg.message = message; + msg.flags = sent|wparam|lparam; + if (defwndproc_counter) msg.flags |= defwinproc; + msg.wParam = wParam; + msg.lParam = lParam; + msg.descr = "activation"; + add_message(&msg); + + defwndproc_counter++; + ret = DefWindowProcA(hwnd, message, wParam, lParam); + defwndproc_counter--; + + return ret; +} + static LRESULT WINAPI PaintLoopProcA(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { switch (msg) @@ -10300,6 +10334,10 @@ static BOOL RegisterWindowClasses(void) cls.lpszClassName = "ShowWindowClass"; if(!RegisterClassA(&cls)) return FALSE; + cls.lpfnWndProc = SetActiveWindowProcA; + cls.lpszClassName = "SetActiveWindowClass"; + if(!RegisterClassA(&cls)) return FALSE; + cls.lpfnWndProc = PopupMsgCheckProcA; cls.lpszClassName = "TestPopupClass"; if(!RegisterClassA(&cls)) return FALSE; @@ -10355,6 +10393,7 @@ static BOOL is_our_logged_class(HWND hwnd) { if (!lstrcmpiA(buf, "TestWindowClass") || !lstrcmpiA(buf, "ShowWindowClass") || + !lstrcmpiA(buf, "SetActiveWindowClass") || !lstrcmpiA(buf, "TestParentClass") || !lstrcmpiA(buf, "TestPopupClass") || !lstrcmpiA(buf, "SimpleWindowClass") || @@ -14758,10 +14797,46 @@ static const struct message SetActiveWindowSeq4[] = { 0 } }; +static LRESULT WINAPI test_recursive_set_active_window_proc(HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam) +{ + if (message == WM_ACTIVATE && LOWORD(wparam) != WA_INACTIVE) + { + SetActiveWindow((HWND)lparam); + SetActiveWindow(hwnd); + return 0; + } + + return DefWindowProcA(hwnd, message, wparam, lparam); +} + +static void test_set_active_window_recursive(HWND hwnd, HWND hwnd2) +{ + const struct message RecursiveActivationSeq[] = + { + { HCBT_ACTIVATE, hook|wparam, (WPARAM)hwnd }, + { WM_NCACTIVATE, sent|wparam|lparam, FALSE, (LPARAM)hwnd }, + { WM_ACTIVATE, sent|wparam|lparam, WA_INACTIVE, (LPARAM)hwnd }, + { EVENT_SYSTEM_FOREGROUND, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, + { HCBT_ACTIVATE, hook|wparam, (WPARAM)hwnd2 }, + { EVENT_SYSTEM_FOREGROUND, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, + { WM_NCACTIVATE, sent|wparam|lparam, FALSE, (LPARAM)hwnd }, + { WM_ACTIVATE, sent|wparam|lparam, WA_ACTIVE, (LPARAM)hwnd }, + { 0 } + }; + SetActiveWindow(hwnd2); + + flush_sequence(); + SetActiveWindow(hwnd); + ok_sequence(RecursiveActivationSeq, "recursive activation", TRUE); + + DestroyWindow(hwnd2); + DestroyWindow(hwnd); + flush_sequence(); +} static void test_SetActiveWindow(void) { - HWND hwnd, popup, ret; + HWND hwnd, hwnd2, popup, ret; hwnd = CreateWindowExA(0, "TestWindowClass", "Test SetActiveWindow", WS_OVERLAPPEDWINDOW | WS_VISIBLE, @@ -14812,6 +14887,20 @@ static void test_SetActiveWindow(void) trace("done\n"); DestroyWindow(hwnd); + + hwnd = CreateWindowExA(0, "SimpleWindowClass", NULL, WS_OVERLAPPED|WS_VISIBLE, + 100, 100, 200, 200, 0, 0, 0, NULL); + ok(hwnd != 0, "Failed to create simple window\n"); + SetWindowLongPtrA(hwnd, GWLP_WNDPROC, (LONG_PTR)test_recursive_set_active_window_proc); + + hwnd2 = CreateWindowExA(0, "SetActiveWindowClass", NULL, WS_OVERLAPPED|WS_VISIBLE, + 10, 10, 50, 50, hwnd, 0, 0, NULL); + ok(hwnd2 != 0, "Failed to create recursive activation window\n"); + + test_set_active_window_recursive(hwnd, hwnd2); + + DestroyWindow(hwnd2); + DestroyWindow(hwnd); } static const struct message SetForegroundWindowSeq[] = -- 2.35.1

3 5

[PATCH 6/6] winealsa: Build with msvcrt.
by Huw Davies 25 Mar '22

25 Mar '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winealsa.drv/Makefile.in | 2 -- dlls/winealsa.drv/midi.c | 9 --------- dlls/winealsa.drv/mmdevdrv.c | 17 ++++++----------- 3 files changed, 6 insertions(+), 22 deletions(-) diff --git a/dlls/winealsa.drv/Makefile.in b/dlls/winealsa.drv/Makefile.in index 2113594fbe3..1349f6f9dab 100644 --- a/dlls/winealsa.drv/Makefile.in +++ b/dlls/winealsa.drv/Makefile.in @@ -5,8 +5,6 @@ IMPORTS = uuid ole32 advapi32 DELAYIMPORTS = winmm EXTRALIBS = $(ALSA_LIBS) $(PTHREAD_LIBS) -EXTRADLLFLAGS = -mcygwin - C_SRCS = \ alsa.c \ alsamidi.c \ diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index 4db38537dd0..fc2205de6f6 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -22,17 +22,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - -#include <string.h> #include <stdarg.h> -#include <stdio.h> -#include <unistd.h> -#include <fcntl.h> -#include <errno.h> -#include "ntstatus.h" -#define WIN32_NO_STATUS #include "windef.h" #include "winbase.h" #include "wingdi.h" diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 389c40b47de..7dc01940dc9 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -18,23 +18,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define NONAMELESSUNION #define COBJMACROS -#include "config.h" #include <stdarg.h> -#include <stdio.h> -#include <math.h> #include "windef.h" #include "winbase.h" #include "winnls.h" #include "winreg.h" -#include "wine/debug.h" -#include "wine/unicode.h" -#include "wine/list.h" -#include "wine/unixlib.h" - +#include "winternl.h" #include "propsys.h" #include "initguid.h" #include "ole2.h" @@ -44,11 +36,14 @@ #include "mmsystem.h" #include "dsound.h" -#include "initguid.h" #include "endpointvolume.h" #include "audioclient.h" #include "audiopolicy.h" +#include "wine/debug.h" +#include "wine/list.h" +#include "wine/unixlib.h" + #include "unixlib.h" WINE_DEFAULT_DEBUG_CHANNEL(alsa); @@ -371,7 +366,7 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids_out, GUID **gu } for(i = 0; i < params.num; i++){ - unsigned int size = (strlenW(params.endpoints[i].name) + 1) * sizeof(WCHAR); + unsigned int size = (wcslen(params.endpoints[i].name) + 1) * sizeof(WCHAR); ids[i] = HeapAlloc(GetProcessHeap(), 0, size); if(!ids[i]){ params.result = E_OUTOFMEMORY; -- 2.25.1

2 1

[PATCH 5/6] winealsa: Move DRVM_INIT to the unixlib.
by Huw Davies 25 Mar '22

25 Mar '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winealsa.drv/alsa.c | 1 - dlls/winealsa.drv/alsamidi.c | 25 ++++++++++++------------- dlls/winealsa.drv/midi.c | 27 --------------------------- dlls/winealsa.drv/unixlib.h | 7 ------- 4 files changed, 12 insertions(+), 48 deletions(-) diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c index e068f6608f3..e5f755b69ed 100644 --- a/dlls/winealsa.drv/alsa.c +++ b/dlls/winealsa.drv/alsa.c @@ -2444,7 +2444,6 @@ unixlib_entry_t __wine_unix_call_funcs[] = set_event_handle, is_started, get_prop_value, - midi_init, midi_release, midi_out_message, midi_in_message, diff --git a/dlls/winealsa.drv/alsamidi.c b/dlls/winealsa.drv/alsamidi.c index 8ec646281d2..476ea383a25 100644 --- a/dlls/winealsa.drv/alsamidi.c +++ b/dlls/winealsa.drv/alsamidi.c @@ -400,27 +400,22 @@ static void port_add(snd_seq_client_info_t* cinfo, snd_seq_port_info_t* pinfo, u } } -NTSTATUS midi_init(void *args) +static UINT midi_init(void) { - struct midi_init_params *params = args; static BOOL init_done; snd_seq_client_info_t *cinfo; snd_seq_port_info_t *pinfo; snd_seq_t *seq; - if (init_done) { - *params->err = ERROR_ALREADY_INITIALIZED; - return STATUS_SUCCESS; - } + if (init_done) + return ERROR_ALREADY_INITIALIZED; TRACE("Initializing the MIDI variables.\n"); init_done = TRUE; /* try to open device */ - if (!(seq = seq_open(NULL))) { - *params->err = ERROR_OPEN_FAILED; - return STATUS_SUCCESS; - } + if (!(seq = seq_open(NULL))) + return ERROR_OPEN_FAILED; cinfo = calloc( 1, snd_seq_client_info_sizeof() ); pinfo = calloc( 1, snd_seq_port_info_sizeof() ); @@ -454,11 +449,9 @@ NTSTATUS midi_init(void *args) free( cinfo ); free( pinfo ); - *params->err = NOERROR; - TRACE("End\n"); - return STATUS_SUCCESS; + return NOERROR; } NTSTATUS midi_release(void *args) @@ -1369,6 +1362,9 @@ NTSTATUS midi_out_message(void *args) switch (params->msg) { + case DRVM_INIT: + *params->err = midi_init(); + break; case DRVM_EXIT: case DRVM_ENABLE: case DRVM_DISABLE: @@ -1424,6 +1420,9 @@ NTSTATUS midi_in_message(void *args) switch (params->msg) { + case DRVM_INIT: + *params->err = midi_init(); + break; case DRVM_EXIT: case DRVM_ENABLE: case DRVM_DISABLE: diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index b768517e655..4db38537dd0 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -59,22 +59,6 @@ static void notify_client(struct notify_context *notify) * MIDI entry points * *======================================================================*/ -/************************************************************************** - * ALSA_MidiInit [internal] - * - * Initializes the MIDI devices information variables - */ -static BOOL ALSA_MidiInit(void) -{ - struct midi_init_params params; - UINT err; - - params.err = &err; - ALSA_CALL(midi_init, &params); - - return TRUE; -} - /************************************************************************** * midMessage (WINEALSA.@) */ @@ -87,11 +71,6 @@ DWORD WINAPI ALSA_midMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, TRACE("(%04X, %04X, %08lX, %08lX, %08lX);\n", wDevID, wMsg, dwUser, dwParam1, dwParam2); - switch (wMsg) { - case DRVM_INIT: - ALSA_MidiInit(); - return 0; - } params.dev_id = wDevID; params.msg = wMsg; @@ -123,12 +102,6 @@ DWORD WINAPI ALSA_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, TRACE("(%04X, %04X, %08lX, %08lX, %08lX);\n", wDevID, wMsg, dwUser, dwParam1, dwParam2); - switch (wMsg) { - case DRVM_INIT: - ALSA_MidiInit(); - return 0; - } - params.dev_id = wDevID; params.msg = wMsg; params.user = dwUser; diff --git a/dlls/winealsa.drv/unixlib.h b/dlls/winealsa.drv/unixlib.h index ad8865a0988..7d7be1e140d 100644 --- a/dlls/winealsa.drv/unixlib.h +++ b/dlls/winealsa.drv/unixlib.h @@ -207,11 +207,6 @@ struct get_prop_value_params unsigned int *buffer_size; }; -struct midi_init_params -{ - UINT *err; -}; - struct notify_context { BOOL send_notify; @@ -278,14 +273,12 @@ enum alsa_funcs alsa_set_event_handle, alsa_is_started, alsa_get_prop_value, - alsa_midi_init, alsa_midi_release, alsa_midi_out_message, alsa_midi_in_message, alsa_midi_notify_wait, }; -NTSTATUS midi_init(void *args) DECLSPEC_HIDDEN; NTSTATUS midi_release(void *args) DECLSPEC_HIDDEN; NTSTATUS midi_out_message(void *args) DECLSPEC_HIDDEN; NTSTATUS midi_in_message(void *args) DECLSPEC_HIDDEN; -- 2.25.1

2 1

[PATCH 4/6] winealsa: Move MIDM_OPEN and MIDM_CLOSE to the unixlib.
by Huw Davies 25 Mar '22

25 Mar '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winealsa.drv/Makefile.in | 2 +- dlls/winealsa.drv/alsa.c | 4 - dlls/winealsa.drv/alsamidi.c | 231 ++++++++++++++++++++++++--- dlls/winealsa.drv/midi.c | 287 ---------------------------------- dlls/winealsa.drv/unixlib.h | 33 ---- 5 files changed, 206 insertions(+), 351 deletions(-) diff --git a/dlls/winealsa.drv/Makefile.in b/dlls/winealsa.drv/Makefile.in index 41be57d8b83..2113594fbe3 100644 --- a/dlls/winealsa.drv/Makefile.in +++ b/dlls/winealsa.drv/Makefile.in @@ -3,7 +3,7 @@ MODULE = winealsa.drv UNIXLIB = winealsa.so IMPORTS = uuid ole32 advapi32 DELAYIMPORTS = winmm -EXTRALIBS = $(ALSA_LIBS) +EXTRALIBS = $(ALSA_LIBS) $(PTHREAD_LIBS) EXTRADLLFLAGS = -mcygwin diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c index b18588ab1c0..e068f6608f3 100644 --- a/dlls/winealsa.drv/alsa.c +++ b/dlls/winealsa.drv/alsa.c @@ -2449,8 +2449,4 @@ unixlib_entry_t __wine_unix_call_funcs[] = midi_out_message, midi_in_message, midi_notify_wait, - - midi_seq_lock, /* temporary */ - midi_seq_open, - midi_handle_event, }; diff --git a/dlls/winealsa.drv/alsamidi.c b/dlls/winealsa.drv/alsamidi.c index 1633268b533..8ec646281d2 100644 --- a/dlls/winealsa.drv/alsamidi.c +++ b/dlls/winealsa.drv/alsamidi.c @@ -60,6 +60,19 @@ struct midi_dest int port_out; }; +struct midi_src +{ + int state; /* -1 disabled, 0 is no recording started, 1 in recording, bit 2 set if in sys exclusive recording */ + MIDIOPENDESC midiDesc; + WORD wFlags; + MIDIHDR *lpQueueHdr; + UINT startTime; + MIDIINCAPSW caps; + snd_seq_t *seq; + snd_seq_addr_t addr; + int port_in; +}; + static pthread_mutex_t seq_mutex = PTHREAD_MUTEX_INITIALIZER; static pthread_mutex_t in_buffer_mutex = PTHREAD_MUTEX_INITIALIZER; @@ -70,6 +83,10 @@ static snd_seq_t *midi_seq; static unsigned int seq_refs; static int port_in = -1; +static unsigned int num_midi_in_started; +static int rec_cancel_pipe[2]; +static pthread_t rec_thread_id; + static pthread_mutex_t notify_mutex = PTHREAD_MUTEX_INITIALIZER; static pthread_cond_t notify_cond = PTHREAD_COND_INITIALIZER; static BOOL notify_quit; @@ -87,14 +104,6 @@ static void seq_unlock(void) pthread_mutex_unlock(&seq_mutex); } -NTSTATUS midi_seq_lock(void *args) -{ - if (args) seq_lock(); - else seq_unlock(); - - return STATUS_SUCCESS; -} - static void in_buffer_lock(void) { pthread_mutex_lock(&in_buffer_mutex); @@ -233,18 +242,6 @@ static void seq_close(void) seq_unlock(); } -NTSTATUS midi_seq_open(void *args) -{ - struct midi_seq_open_params *params = args; - - if (!params->close) - params->seq = seq_open(params->port_in); - else - seq_close(); - - return STATUS_SUCCESS; -} - static int alsa_to_win_device_type(unsigned int type) { /* MOD_MIDIPORT output port @@ -458,8 +455,6 @@ NTSTATUS midi_init(void *args) free( pinfo ); *params->err = NOERROR; - params->num_srcs = num_srcs; - params->srcs = srcs; TRACE("End\n"); @@ -1033,9 +1028,8 @@ static void handle_regular_event(struct midi_src *src, snd_seq_event_t *ev) } } -NTSTATUS midi_handle_event(void *args) +static void midi_handle_event(snd_seq_event_t *ev) { - snd_seq_event_t *ev = args; struct midi_src *src; /* Find the target device */ @@ -1043,14 +1037,193 @@ NTSTATUS midi_handle_event(void *args) if ((ev->source.client == src->addr.client) && (ev->source.port == src->addr.port)) break; if ((src == srcs + num_srcs) || (src->state != 1)) - return STATUS_SUCCESS; + return; if (ev->type == SND_SEQ_EVENT_SYSEX) handle_sysex_event(src, ev->data.ext.ptr, ev->data.ext.len); else handle_regular_event(src, ev); +} - return STATUS_SUCCESS; +static void *rec_thread_proc(void *arg) +{ + snd_seq_t *midi_seq = (snd_seq_t *)arg; + int num_fds; + struct pollfd *pollfd; + int ret; + + /* Add on one for the read end of the cancel pipe */ + num_fds = snd_seq_poll_descriptors_count(midi_seq, POLLIN) + 1; + pollfd = malloc(num_fds * sizeof(struct pollfd)); + + while(1) + { + pollfd[0].fd = rec_cancel_pipe[0]; + pollfd[0].events = POLLIN; + + seq_lock(); + snd_seq_poll_descriptors(midi_seq, pollfd + 1, num_fds - 1, POLLIN); + seq_unlock(); + + /* Check if an event is present */ + if (poll(pollfd, num_fds, -1) <= 0) + continue; + + if (pollfd[0].revents & POLLIN) /* cancelled */ + break; + + do + { + snd_seq_event_t *ev; + + seq_lock(); + snd_seq_event_input(midi_seq, &ev); + seq_unlock(); + + if (ev) + { + midi_handle_event(ev); + snd_seq_free_event(ev); + } + + seq_lock(); + ret = snd_seq_event_input_pending(midi_seq, 0); + seq_unlock(); + } while(ret > 0); + } + + free(pollfd); + return 0; +} + +static UINT midi_in_open(WORD dev_id, MIDIOPENDESC *desc, UINT flags, struct notify_context *notify) +{ + struct midi_src *src; + int ret = 0, port_in; + snd_seq_t *midi_seq; + + TRACE("(%04X, %p, %08X);\n", dev_id, desc, flags); + + if (!desc) + { + WARN("Invalid Parameter !\n"); + return MMSYSERR_INVALPARAM; + } + + /* FIXME: check that contents of desc are correct */ + + if (dev_id >= num_srcs) + { + WARN("dev_id too large (%u) !\n", dev_id); + return MMSYSERR_BADDEVICEID; + } + src = srcs + dev_id; + + if (src->state == -1) + { + WARN("device disabled\n"); + return MIDIERR_NODEVICE; + } + if (src->midiDesc.hMidi) + { + WARN("device already open !\n"); + return MMSYSERR_ALLOCATED; + } + if (flags & MIDI_IO_STATUS) + { + WARN("No support for MIDI_IO_STATUS in flags yet, ignoring it\n"); + flags &= ~MIDI_IO_STATUS; + } + if (flags & ~CALLBACK_TYPEMASK) + { + FIXME("Bad flags %08X\n", flags); + return MMSYSERR_INVALFLAG; + } + + if (!(midi_seq = seq_open(&port_in))) + return MMSYSERR_ERROR; + + src->wFlags = HIWORD(flags & CALLBACK_TYPEMASK); + + src->lpQueueHdr = NULL; + src->midiDesc = *desc; + src->state = 0; + src->startTime = 0; + src->seq = midi_seq; + src->port_in = port_in; + + /* Connect our app port to the device port */ + seq_lock(); + ret = snd_seq_connect_from(midi_seq, port_in, src->addr.client, src->addr.port); + seq_unlock(); + if (ret < 0) + return MMSYSERR_NOTENABLED; + + TRACE("Input port :%d connected %d:%d\n", port_in, src->addr.client, src->addr.port); + + if (num_midi_in_started++ == 0) + { + pipe(rec_cancel_pipe); + if (pthread_create(&rec_thread_id, NULL, rec_thread_proc, midi_seq)) + { + close(rec_cancel_pipe[0]); + close(rec_cancel_pipe[1]); + num_midi_in_started = 0; + WARN("Couldn't create thread for midi-in\n"); + seq_close(); + return MMSYSERR_ERROR; + } + } + + set_in_notify(notify, src, dev_id, MIM_OPEN, 0, 0); + return MMSYSERR_NOERROR; +} + +static UINT midi_in_close(WORD dev_id, struct notify_context *notify) +{ + struct midi_src *src; + + TRACE("(%04X);\n", dev_id); + + if (dev_id >= num_srcs) + { + WARN("dev_id too big (%u) !\n", dev_id); + return MMSYSERR_BADDEVICEID; + } + src = srcs + dev_id; + if (!src->midiDesc.hMidi) + { + WARN("device not opened !\n"); + return MMSYSERR_ERROR; + } + if (src->lpQueueHdr) + return MIDIERR_STILLPLAYING; + + if (src->seq == NULL) + { + WARN("ooops !\n"); + return MMSYSERR_ERROR; + } + if (--num_midi_in_started == 0) + { + TRACE("Stopping thread for midi-in\n"); + write(rec_cancel_pipe[1], "x", 1); + pthread_join(rec_thread_id, NULL); + close(rec_cancel_pipe[0]); + close(rec_cancel_pipe[1]); + TRACE("Stopped thread for midi-in\n"); + } + + seq_lock(); + snd_seq_disconnect_from(src->seq, src->port_in, src->addr.client, src->addr.port); + seq_unlock(); + seq_close(); + + set_in_notify(notify, src, dev_id, MIM_CLOSE, 0, 0); + src->midiDesc.hMidi = 0; + src->seq = NULL; + + return MMSYSERR_NOERROR; } static UINT midi_in_add_buffer(WORD dev_id, MIDIHDR *hdr, UINT hdr_size) @@ -1257,6 +1430,12 @@ NTSTATUS midi_in_message(void *args) /* FIXME: Pretend this is supported */ *params->err = MMSYSERR_NOERROR; break; + case MIDM_OPEN: + *params->err = midi_in_open(params->dev_id, (MIDIOPENDESC *)params->param_1, params->param_2, params->notify); + break; + case MIDM_CLOSE: + *params->err = midi_in_close(params->dev_id, params->notify); + break; case MIDM_ADDBUFFER: *params->err = midi_in_add_buffer(params->dev_id, (MIDIHDR *)params->param_1, params->param_2); break; diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index 327d4b7b200..b768517e655 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -47,26 +47,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(midi); -static WINE_MIDIIN *MidiInDev; - -/* this is the total number of MIDI out devices found */ -static int MIDM_NumDevs = 0; - -static int numStartedMidiIn = 0; - -static int rec_cancel_pipe[2]; -static HANDLE hThread; - -static void seq_lock(void) -{ - ALSA_CALL(midi_seq_lock, (void *)(UINT_PTR)1); -} - -static void seq_unlock(void) -{ - ALSA_CALL(midi_seq_lock, (void *)(UINT_PTR)0); -} - static void notify_client(struct notify_context *notify) { TRACE("dev_id = %d msg = %d param1 = %04lX param2 = %04lX\n", notify->dev_id, notify->msg, notify->param_1, notify->param_2); @@ -75,264 +55,6 @@ static void notify_client(struct notify_context *notify) notify->instance, notify->param_1, notify->param_2); } -/*======================================================================* - * Low level MIDI implementation * - *======================================================================*/ - -#if 0 /* Debug Purpose */ -static void error_handler(const char* file, int line, const char* function, int err, const char* fmt, ...) -{ - va_list arg; - if (err == ENOENT) - return; - va_start(arg, fmt); - fprintf(stderr, "ALSA lib %s:%i:(%s) ", file, line, function); - vfprintf(stderr, fmt, arg); - if (err) - fprintf(stderr, ": %s", snd_strerror(err)); - putc('\n', stderr); - va_end(arg); -} -#endif - -/************************************************************************** - * MIDI_NotifyClient [internal] - */ -static void MIDI_NotifyClient(UINT wDevID, WORD wMsg, - DWORD_PTR dwParam1, DWORD_PTR dwParam2) -{ - DWORD_PTR dwCallBack; - UINT uFlags; - HANDLE hDev; - DWORD_PTR dwInstance; - - TRACE("wDevID = %04X wMsg = %d dwParm1 = %04lX dwParam2 = %04lX\n", - wDevID, wMsg, dwParam1, dwParam2); - - switch (wMsg) { - case MIM_OPEN: - case MIM_CLOSE: - if (wDevID > MIDM_NumDevs) return; - - dwCallBack = MidiInDev[wDevID].midiDesc.dwCallback; - uFlags = MidiInDev[wDevID].wFlags; - hDev = MidiInDev[wDevID].midiDesc.hMidi; - dwInstance = MidiInDev[wDevID].midiDesc.dwInstance; - break; - default: - ERR("Unsupported MSW-MIDI message %u\n", wMsg); - return; - } - - DriverCallback(dwCallBack, uFlags, hDev, wMsg, dwInstance, dwParam1, dwParam2); -} - -/************************************************************************** - * midiOpenSeq [internal] - */ -static snd_seq_t *midiOpenSeq(int *port_in_ret) -{ - struct midi_seq_open_params params; - - params.port_in = port_in_ret; - params.close = 0; - ALSA_CALL(midi_seq_open, &params); - - return params.seq; -} - -/************************************************************************** - * midiCloseSeq [internal] - */ -static int midiCloseSeq(void) -{ - struct midi_seq_open_params params; - - params.port_in = NULL; - params.close = 1; - ALSA_CALL(midi_seq_open, &params); - - return 0; -} - -static DWORD WINAPI midRecThread(void *arg) -{ - snd_seq_t *midi_seq = arg; - int num_fds; - struct pollfd *pollfd; - int ret; - - /* Add on one for the read end of the cancel pipe */ - num_fds = snd_seq_poll_descriptors_count(midi_seq, POLLIN) + 1; - pollfd = malloc(num_fds * sizeof(struct pollfd)); - - while(1) { - pollfd[0].fd = rec_cancel_pipe[0]; - pollfd[0].events = POLLIN; - - seq_lock(); - snd_seq_poll_descriptors(midi_seq, pollfd + 1, num_fds - 1, POLLIN); - seq_unlock(); - - /* Check if an event is present */ - if (poll(pollfd, num_fds, -1) <= 0) - continue; - - if (pollfd[0].revents & POLLIN) /* cancelled */ - break; - - do { - snd_seq_event_t *ev; - - seq_lock(); - snd_seq_event_input(midi_seq, &ev); - seq_unlock(); - - if (ev) { - ALSA_CALL(midi_handle_event, ev); - snd_seq_free_event(ev); - } - - seq_lock(); - ret = snd_seq_event_input_pending(midi_seq, 0); - seq_unlock(); - } while(ret > 0); - } - - free(pollfd); - return 0; -} - -/************************************************************************** - * midOpen [internal] - */ -static DWORD midOpen(WORD wDevID, LPMIDIOPENDESC lpDesc, DWORD dwFlags) -{ - int ret = 0, port_in; - snd_seq_t *midi_seq; - - TRACE("(%04X, %p, %08X);\n", wDevID, lpDesc, dwFlags); - - if (lpDesc == NULL) { - WARN("Invalid Parameter !\n"); - return MMSYSERR_INVALPARAM; - } - - /* FIXME : - * how to check that content of lpDesc is correct ? - */ - if (wDevID >= MIDM_NumDevs) { - WARN("wDevID too large (%u) !\n", wDevID); - return MMSYSERR_BADDEVICEID; - } - if (MidiInDev[wDevID].state == -1) { - WARN("device disabled\n"); - return MIDIERR_NODEVICE; - } - if (MidiInDev[wDevID].midiDesc.hMidi != 0) { - WARN("device already open !\n"); - return MMSYSERR_ALLOCATED; - } - if ((dwFlags & MIDI_IO_STATUS) != 0) { - WARN("No support for MIDI_IO_STATUS in dwFlags yet, ignoring it\n"); - dwFlags &= ~MIDI_IO_STATUS; - } - if ((dwFlags & ~CALLBACK_TYPEMASK) != 0) { - FIXME("Bad dwFlags\n"); - return MMSYSERR_INVALFLAG; - } - - if (!(midi_seq = midiOpenSeq(&port_in))) { - return MMSYSERR_ERROR; - } - - MidiInDev[wDevID].wFlags = HIWORD(dwFlags & CALLBACK_TYPEMASK); - - MidiInDev[wDevID].lpQueueHdr = NULL; - MidiInDev[wDevID].midiDesc = *lpDesc; - MidiInDev[wDevID].state = 0; - MidiInDev[wDevID].startTime = 0; - MidiInDev[wDevID].seq = midi_seq; - MidiInDev[wDevID].port_in = port_in; - - /* Connect our app port to the device port */ - seq_lock(); - ret = snd_seq_connect_from(midi_seq, port_in, MidiInDev[wDevID].addr.client, - MidiInDev[wDevID].addr.port); - seq_unlock(); - if (ret < 0) - return MMSYSERR_NOTENABLED; - - TRACE("Input port :%d connected %d:%d\n",port_in,MidiInDev[wDevID].addr.client,MidiInDev[wDevID].addr.port); - - if (numStartedMidiIn++ == 0) { - pipe(rec_cancel_pipe); - hThread = CreateThread(NULL, 0, midRecThread, midi_seq, 0, NULL); - if (!hThread) { - close(rec_cancel_pipe[0]); - close(rec_cancel_pipe[1]); - numStartedMidiIn = 0; - WARN("Couldn't create thread for midi-in\n"); - midiCloseSeq(); - return MMSYSERR_ERROR; - } - SetThreadPriority(hThread, THREAD_PRIORITY_TIME_CRITICAL); - TRACE("Created thread for midi-in\n"); - } - - MIDI_NotifyClient(wDevID, MIM_OPEN, 0L, 0L); - return MMSYSERR_NOERROR; -} - -/************************************************************************** - * midClose [internal] - */ -static DWORD midClose(WORD wDevID) -{ - int ret = MMSYSERR_NOERROR; - - TRACE("(%04X);\n", wDevID); - - if (wDevID >= MIDM_NumDevs) { - WARN("wDevID too big (%u) !\n", wDevID); - return MMSYSERR_BADDEVICEID; - } - if (MidiInDev[wDevID].midiDesc.hMidi == 0) { - WARN("device not opened !\n"); - return MMSYSERR_ERROR; - } - if (MidiInDev[wDevID].lpQueueHdr != 0) { - return MIDIERR_STILLPLAYING; - } - - if (MidiInDev[wDevID].seq == NULL) { - WARN("ooops !\n"); - return MMSYSERR_ERROR; - } - if (--numStartedMidiIn == 0) { - TRACE("Stopping thread for midi-in\n"); - write(rec_cancel_pipe[1], "x", 1); - if (WaitForSingleObject(hThread, 5000) != WAIT_OBJECT_0) { - WARN("Thread end not signaled, force termination\n"); - TerminateThread(hThread, 0); - } - close(rec_cancel_pipe[0]); - close(rec_cancel_pipe[1]); - TRACE("Stopped thread for midi-in\n"); - } - - seq_lock(); - snd_seq_disconnect_from(MidiInDev[wDevID].seq, MidiInDev[wDevID].port_in, MidiInDev[wDevID].addr.client, MidiInDev[wDevID].addr.port); - seq_unlock(); - midiCloseSeq(); - - MIDI_NotifyClient(wDevID, MIM_CLOSE, 0L, 0L); - MidiInDev[wDevID].midiDesc.hMidi = 0; - MidiInDev[wDevID].seq = NULL; - - return ret; -} - /*======================================================================* * MIDI entry points * *======================================================================*/ @@ -350,11 +72,6 @@ static BOOL ALSA_MidiInit(void) params.err = &err; ALSA_CALL(midi_init, &params); - if (!err) - { - MIDM_NumDevs = params.num_srcs; - MidiInDev = params.srcs; - } return TRUE; } @@ -374,10 +91,6 @@ DWORD WINAPI ALSA_midMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, case DRVM_INIT: ALSA_MidiInit(); return 0; - case MIDM_OPEN: - return midOpen(wDevID, (LPMIDIOPENDESC)dwParam1, dwParam2); - case MIDM_CLOSE: - return midClose(wDevID); } params.dev_id = wDevID; diff --git a/dlls/winealsa.drv/unixlib.h b/dlls/winealsa.drv/unixlib.h index 46f256a1c6a..ad8865a0988 100644 --- a/dlls/winealsa.drv/unixlib.h +++ b/dlls/winealsa.drv/unixlib.h @@ -207,27 +207,9 @@ struct get_prop_value_params unsigned int *buffer_size; }; -#include <alsa/asoundlib.h> -#include "mmddk.h" - -typedef struct midi_src -{ - int state; /* -1 disabled, 0 is no recording started, 1 in recording, bit 2 set if in sys exclusive recording */ - MIDIOPENDESC midiDesc; - WORD wFlags; - MIDIHDR *lpQueueHdr; - UINT startTime; - MIDIINCAPSW caps; - snd_seq_t *seq; - snd_seq_addr_t addr; - int port_in; -} WINE_MIDIIN; - struct midi_init_params { UINT *err; - unsigned int num_srcs; - void *srcs; }; struct notify_context @@ -271,13 +253,6 @@ struct midi_notify_wait_params struct notify_context *notify; }; -struct midi_seq_open_params -{ - int close; - snd_seq_t *seq; - int *port_in; -}; - enum alsa_funcs { alsa_get_endpoint_ids, @@ -308,10 +283,6 @@ enum alsa_funcs alsa_midi_out_message, alsa_midi_in_message, alsa_midi_notify_wait, - - alsa_midi_seq_lock, /* temporary */ - alsa_midi_seq_open, - alsa_midi_handle_event, }; NTSTATUS midi_init(void *args) DECLSPEC_HIDDEN; @@ -320,10 +291,6 @@ NTSTATUS midi_out_message(void *args) DECLSPEC_HIDDEN; NTSTATUS midi_in_message(void *args) DECLSPEC_HIDDEN; NTSTATUS midi_notify_wait(void *args) DECLSPEC_HIDDEN; -NTSTATUS midi_seq_lock(void *args) DECLSPEC_HIDDEN; -NTSTATUS midi_seq_open(void *args) DECLSPEC_HIDDEN; -NTSTATUS midi_handle_event(void *args) DECLSPEC_HIDDEN; - extern unixlib_handle_t alsa_handle; #define ALSA_CALL(func, params) __wine_unix_call(alsa_handle, alsa_ ## func, params) -- 2.25.1

2 1

[PATCH 3/6] winealsa: Use a pipe to signal the end of the record thread.
by Huw Davies 25 Mar '22

25 Mar '22

This means the thread doesn't have to wake every 250ms to test "end_thread". Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winealsa.drv/midi.c | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index 4cc906b03ca..327d4b7b200 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -54,7 +54,7 @@ static int MIDM_NumDevs = 0; static int numStartedMidiIn = 0; -static int end_thread; +static int rec_cancel_pipe[2]; static HANDLE hThread; static void seq_lock(void) @@ -162,18 +162,25 @@ static DWORD WINAPI midRecThread(void *arg) struct pollfd *pollfd; int ret; - num_fds = snd_seq_poll_descriptors_count(midi_seq, POLLIN); + /* Add on one for the read end of the cancel pipe */ + num_fds = snd_seq_poll_descriptors_count(midi_seq, POLLIN) + 1; pollfd = malloc(num_fds * sizeof(struct pollfd)); - while(!end_thread) { + while(1) { + pollfd[0].fd = rec_cancel_pipe[0]; + pollfd[0].events = POLLIN; + seq_lock(); - snd_seq_poll_descriptors(midi_seq, pollfd, num_fds, POLLIN); + snd_seq_poll_descriptors(midi_seq, pollfd + 1, num_fds - 1, POLLIN); seq_unlock(); /* Check if an event is present */ - if (poll(pollfd, num_fds, 250) <= 0) + if (poll(pollfd, num_fds, -1) <= 0) continue; + if (pollfd[0].revents & POLLIN) /* cancelled */ + break; + do { snd_seq_event_t *ev; @@ -259,9 +266,11 @@ static DWORD midOpen(WORD wDevID, LPMIDIOPENDESC lpDesc, DWORD dwFlags) TRACE("Input port :%d connected %d:%d\n",port_in,MidiInDev[wDevID].addr.client,MidiInDev[wDevID].addr.port); if (numStartedMidiIn++ == 0) { - end_thread = 0; + pipe(rec_cancel_pipe); hThread = CreateThread(NULL, 0, midRecThread, midi_seq, 0, NULL); if (!hThread) { + close(rec_cancel_pipe[0]); + close(rec_cancel_pipe[1]); numStartedMidiIn = 0; WARN("Couldn't create thread for midi-in\n"); midiCloseSeq(); @@ -302,11 +311,13 @@ static DWORD midClose(WORD wDevID) } if (--numStartedMidiIn == 0) { TRACE("Stopping thread for midi-in\n"); - end_thread = 1; + write(rec_cancel_pipe[1], "x", 1); if (WaitForSingleObject(hThread, 5000) != WAIT_OBJECT_0) { WARN("Thread end not signaled, force termination\n"); TerminateThread(hThread, 0); } + close(rec_cancel_pipe[0]); + close(rec_cancel_pipe[1]); TRACE("Stopped thread for midi-in\n"); } -- 2.25.1

2 1

[PATCH 2/6] winealsa: Allocate the pollfd array at the start.
by Huw Davies 25 Mar '22

25 Mar '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winealsa.drv/midi.c | 30 +++++++++--------------------- 1 file changed, 9 insertions(+), 21 deletions(-) diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index 8009b23ce3d..4cc906b03ca 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -158,33 +158,21 @@ static int midiCloseSeq(void) static DWORD WINAPI midRecThread(void *arg) { snd_seq_t *midi_seq = arg; - int npfd; - struct pollfd *pfd; + int num_fds; + struct pollfd *pollfd; int ret; - TRACE("Thread startup\n"); + num_fds = snd_seq_poll_descriptors_count(midi_seq, POLLIN); + pollfd = malloc(num_fds * sizeof(struct pollfd)); while(!end_thread) { - TRACE("Thread loop\n"); seq_lock(); - npfd = snd_seq_poll_descriptors_count(midi_seq, POLLIN); - pfd = HeapAlloc(GetProcessHeap(), 0, npfd * sizeof(struct pollfd)); - snd_seq_poll_descriptors(midi_seq, pfd, npfd, POLLIN); + snd_seq_poll_descriptors(midi_seq, pollfd, num_fds, POLLIN); seq_unlock(); /* Check if an event is present */ - if (poll(pfd, npfd, 250) <= 0) { - HeapFree(GetProcessHeap(), 0, pfd); - continue; - } - - /* Note: This definitely does not work. - * while(snd_seq_event_input_pending(midi_seq, 0) > 0) { - snd_seq_event_t* ev; - snd_seq_event_input(midi_seq, &ev); - .................... - snd_seq_free_event(ev); - }*/ + if (poll(pollfd, num_fds, 250) <= 0) + continue; do { snd_seq_event_t *ev; @@ -202,9 +190,9 @@ static DWORD WINAPI midRecThread(void *arg) ret = snd_seq_event_input_pending(midi_seq, 0); seq_unlock(); } while(ret > 0); - - HeapFree(GetProcessHeap(), 0, pfd); } + + free(pollfd); return 0; } -- 2.25.1

2 1

[PATCH 1/6] winealsa: Introduce a helper to retrieve the time.
by Huw Davies 25 Mar '22

25 Mar '22

The motivation is that this will need to be called from a non-Win32 thread and so shouldn't use the Win32 API. An added benefit is that it will eliminate the 16ms jitter associated with GetTickCount(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winealsa.drv/alsamidi.c | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/dlls/winealsa.drv/alsamidi.c b/dlls/winealsa.drv/alsamidi.c index 30c46eee64d..1633268b533 100644 --- a/dlls/winealsa.drv/alsamidi.c +++ b/dlls/winealsa.drv/alsamidi.c @@ -31,6 +31,7 @@ #include <stdarg.h> #include <stdio.h> #include <pthread.h> +#include <time.h> #include <alsa/asoundlib.h> #include "ntstatus.h" @@ -104,6 +105,18 @@ static void in_buffer_unlock(void) pthread_mutex_unlock(&in_buffer_mutex); } +static uint64_t get_time_msec(void) +{ + struct timespec now = {0, 0}; + +#ifdef CLOCK_MONOTONIC_RAW + if (!clock_gettime(CLOCK_MONOTONIC_RAW, &now)) + return (uint64_t)now.tv_sec * 1000 + now.tv_nsec / 1000000; +#endif + clock_gettime(CLOCK_MONOTONIC, &now); + return (uint64_t)now.tv_sec * 1000 + now.tv_nsec / 1000000; +} + static void set_in_notify(struct notify_context *notify, struct midi_src *src, WORD dev_id, WORD msg, UINT_PTR param_1, UINT_PTR param_2) { @@ -924,7 +937,7 @@ static UINT midi_out_reset(WORD dev_id) static void handle_sysex_event(struct midi_src *src, BYTE *data, UINT len) { - UINT pos = 0, copy_len, current_time = NtGetTickCount() - src->startTime; + UINT pos = 0, copy_len, current_time = get_time_msec() - src->startTime; struct notify_context notify; MIDIHDR *hdr; @@ -957,7 +970,7 @@ static void handle_sysex_event(struct midi_src *src, BYTE *data, UINT len) static void handle_regular_event(struct midi_src *src, snd_seq_event_t *ev) { - UINT data = 0, value, current_time = NtGetTickCount() - src->startTime; + UINT data = 0, value, current_time = get_time_msec() - src->startTime; struct notify_context notify; switch (ev->type) @@ -1127,7 +1140,7 @@ static UINT midi_in_start(WORD dev_id) if (src->state == -1) return MIDIERR_NODEVICE; src->state = 1; - src->startTime = NtGetTickCount(); + src->startTime = get_time_msec(); return MMSYSERR_NOERROR; } @@ -1147,7 +1160,7 @@ static UINT midi_in_stop(WORD dev_id) static DWORD midi_in_reset(WORD dev_id, struct notify_context *notify) { - UINT cur_time = NtGetTickCount(); + UINT cur_time = get_time_msec(); UINT err = MMSYSERR_NOERROR; struct midi_src *src; MIDIHDR *hdr; -- 2.25.1

2 1

[PATCH v2] wined3d: Add full dirty region at texture creation.
by Paul Gofman 25 Mar '22

25 Mar '22

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- v2: - dirtify all layers. dlls/d3d8/tests/visual.c | 20 +++++++++++++++++--- dlls/d3d9/tests/visual.c | 20 +++++++++++++++++--- dlls/wined3d/texture.c | 12 ++++++++---- 3 files changed, 42 insertions(+), 10 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index b7f6dd62e9c..41fc0cbf16a 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -5531,9 +5531,6 @@ static void add_dirty_rect_test(void) hr = IDirect3DTexture8_GetSurfaceLevel(tex_dynamic, 0, &surface_dynamic); ok(SUCCEEDED(hr), "Failed to get surface level, hr %#x.\n", hr); - fill_surface(surface_src_red, 0x00ff0000, 0); - fill_surface(surface_src_green, 0x0000ff00, 0); - hr = IDirect3DDevice8_SetVertexShader(device, D3DFVF_XYZ | D3DFVF_TEX1); ok(SUCCEEDED(hr), "Failed to set fvf, hr %#x.\n", hr); hr = IDirect3DDevice8_SetTextureStageState(device, 0, D3DTSS_COLOROP, D3DTOP_SELECTARG1); @@ -5543,6 +5540,23 @@ static void add_dirty_rect_test(void) hr = IDirect3DDevice8_SetTextureStageState(device, 0, D3DTSS_MIPFILTER, D3DTEXF_POINT); ok(SUCCEEDED(hr), "Failed to set mip filter, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetTexture(device, 0, (IDirect3DBaseTexture8 *)tex_dst2); + ok(hr == D3D_OK, "Unexpected hr %#x.\n", hr); + hr = IDirect3DDevice8_UpdateTexture(device, (IDirect3DBaseTexture8 *)tex_src_red, + (IDirect3DBaseTexture8 *)tex_dst2); + fill_surface(surface_src_green, 0x00000080, D3DLOCK_NO_DIRTY_UPDATE); + hr = IDirect3DDevice8_UpdateTexture(device, (IDirect3DBaseTexture8 *)tex_src_green, + (IDirect3DBaseTexture8 *)tex_dst2); + ok(hr == D3D_OK, "Unexpected hr %#x.\n", hr); + add_dirty_rect_test_draw(device); + color = getPixelColor(device, 320, 240); + ok(color_match(color, 0x00000080, 1), "Unexpected colour 0x%08x.\n", color); + hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); + ok(hr == D3D_OK, "Unexpected hr %#x.\n", hr); + + fill_surface(surface_src_red, 0x00ff0000, 0); + fill_surface(surface_src_green, 0x0000ff00, 0); + hr = IDirect3DDevice8_UpdateTexture(device, (IDirect3DBaseTexture8 *)tex_src_green, (IDirect3DBaseTexture8 *)tex_dst1); ok(SUCCEEDED(hr), "Failed to update texture, hr %#x.\n", hr); diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 89f9e9cf2c6..9f9055483b1 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -19394,9 +19394,6 @@ static void add_dirty_rect_test(void) hr = IDirect3DTexture9_GetSurfaceLevel(tex_dynamic, 0, &surface_dynamic); ok(SUCCEEDED(hr), "Failed to get surface level, hr %#x.\n", hr); - fill_surface(surface_src_red, 0x00ff0000, 0); - fill_surface(surface_src_green, 0x0000ff00, 0); - hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_TEX1); ok(SUCCEEDED(hr), "Failed to set fvf, hr %#x.\n", hr); hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_COLOROP, D3DTOP_SELECTARG1); @@ -19406,6 +19403,23 @@ static void add_dirty_rect_test(void) hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_MIPFILTER, D3DTEXF_POINT); ok(SUCCEEDED(hr), "Failed to set sampler state, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetTexture(device, 0, (IDirect3DBaseTexture9 *)tex_dst2); + ok(hr == D3D_OK, "Unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_UpdateTexture(device, (IDirect3DBaseTexture9 *)tex_src_red, + (IDirect3DBaseTexture9 *)tex_dst2); + fill_surface(surface_src_green, 0x00000080, D3DLOCK_NO_DIRTY_UPDATE); + hr = IDirect3DDevice9_UpdateTexture(device, (IDirect3DBaseTexture9 *)tex_src_green, + (IDirect3DBaseTexture9 *)tex_dst2); + ok(hr == D3D_OK, "Unexpected hr %#x.\n", hr); + add_dirty_rect_test_draw(device); + color = getPixelColor(device, 320, 240); + ok(color_match(color, 0x00000080, 1), "Unexpected colour 0x%08x.\n", color); + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(hr == D3D_OK, "Unexpected hr %#x.\n", hr); + + fill_surface(surface_src_red, 0x00ff0000, 0); + fill_surface(surface_src_green, 0x0000ff00, 0); + hr = IDirect3DDevice9_UpdateTexture(device, (IDirect3DBaseTexture9 *)tex_src_green, (IDirect3DBaseTexture9 *)tex_dst1); ok(SUCCEEDED(hr), "Failed to update texture, hr %#x.\n", hr); diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index ebe770af0d2..c495de171d5 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -3895,11 +3895,15 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc texture->flags |= WINED3D_TEXTURE_GENERATE_MIPMAPS; } - if (flags & WINED3D_TEXTURE_CREATE_RECORD_DIRTY_REGIONS - && !(texture->dirty_regions = heap_calloc(texture->layer_count, sizeof(*texture->dirty_regions)))) + if (flags & WINED3D_TEXTURE_CREATE_RECORD_DIRTY_REGIONS) { - wined3d_texture_cleanup_sync(texture); - return E_OUTOFMEMORY; + if (!(texture->dirty_regions = heap_calloc(texture->layer_count, sizeof(*texture->dirty_regions)))) + { + wined3d_texture_cleanup_sync(texture); + return E_OUTOFMEMORY; + } + for (i = 0; i < texture->layer_count; ++i) + wined3d_texture_dirty_region_add(texture, i, NULL); } /* Precalculated scaling for 'faked' non power of two texture coords. */ -- 2.35.1

2 1

[PATCH v2] wined3d: Reuse deferred uploads heaps.
by Jan Sikorski 25 Mar '22

25 Mar '22

Avoids needing to fault-in the memory on each recording. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> --- The HeapFree loop over uploads in a command list is still a little concerning. If it turns out to be an issue, we could allocate larger buffers based on previous usage and fit multiple uploads in it. v2: Fixed heap_alloc size. --- dlls/wined3d/cs.c | 55 +++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 46 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 63d6ed4c123..cf7debe4256 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -49,13 +49,15 @@ struct wined3d_command_list SIZE_T data_size; void *data; - HANDLE upload_heap; SIZE_T resource_count; struct wined3d_resource **resources; SIZE_T upload_count; struct wined3d_deferred_upload *uploads; + HANDLE upload_heap; + LONG *upload_heap_refcount; + /* List of command lists queued for execution on this command list. We might * be the only thing holding a pointer to another command list, so we need * to hold a reference here (and in wined3d_deferred_context) as well. */ @@ -3960,7 +3962,6 @@ static void wined3d_cs_packet_incref_objects(struct wined3d_cs_packet *packet) struct wined3d_deferred_context { struct wined3d_device_context c; - HANDLE upload_heap; SIZE_T data_size, data_capacity; void *data; @@ -3971,6 +3972,9 @@ struct wined3d_deferred_context SIZE_T upload_count, uploads_capacity; struct wined3d_deferred_upload *uploads; + HANDLE upload_heap; + LONG *upload_heap_refcount; + /* List of command lists queued for execution on this context. A command * list can be the only thing holding a pointer to another command list, so * we need to hold a reference here and in wined3d_command_list as well. */ @@ -4090,12 +4094,22 @@ static bool wined3d_deferred_context_map_upload_bo(struct wined3d_device_context deferred->upload_count + 1, sizeof(*deferred->uploads))) return false; - if (!deferred->upload_heap) - deferred->upload_heap = HeapCreate(HEAP_NO_SERIALIZE, 0, 0); if (!deferred->upload_heap) { - ERR("Failed to create upload heap.\n"); - return false; + if (!(deferred->upload_heap = HeapCreate(0, 0, 0))) + { + ERR("Failed to create upload heap.\n"); + return false; + } + + if (!(deferred->upload_heap_refcount = heap_alloc(sizeof(*deferred->upload_heap_refcount)))) + { + HeapDestroy(deferred->upload_heap); + deferred->upload_heap = 0; + return false; + } + + *deferred->upload_heap_refcount = 1; } if (!(sysmem = HeapAlloc(deferred->upload_heap, 0, size + RESOURCE_ALIGNMENT - 1))) @@ -4243,9 +4257,20 @@ void CDECL wined3d_deferred_context_destroy(struct wined3d_device_context *conte heap_free(deferred->resources); for (i = 0; i < deferred->upload_count; ++i) + { wined3d_resource_decref(deferred->uploads[i].resource); + HeapFree(deferred->upload_heap, 0, deferred->uploads[i].resource); + } + if (deferred->upload_heap) - HeapDestroy(deferred->upload_heap); + { + if (!InterlockedDecrement(deferred->upload_heap_refcount)) + { + HeapDestroy(deferred->upload_heap); + heap_free(deferred->upload_heap_refcount); + } + } + heap_free(deferred->uploads); for (i = 0; i < deferred->command_list_count; ++i) @@ -4331,7 +4356,8 @@ HRESULT CDECL wined3d_deferred_context_record_command_list(struct wined3d_device deferred->query_count = 0; object->upload_heap = deferred->upload_heap; - deferred->upload_heap = 0; + if ((object->upload_heap_refcount = deferred->upload_heap_refcount)) + InterlockedIncrement(object->upload_heap_refcount); /* This is in fact recorded into a subsequent command list. */ if (restore) @@ -4349,11 +4375,22 @@ HRESULT CDECL wined3d_deferred_context_record_command_list(struct wined3d_device static void wined3d_command_list_destroy_object(void *object) { struct wined3d_command_list *list = object; + unsigned int i; TRACE("list %p.\n", list); + for (i = 0; i < list->upload_count; ++i) + HeapFree(list->upload_heap, 0, list->uploads[i].sysmem); + if (list->upload_heap) - HeapDestroy(list->upload_heap); + { + if (!InterlockedDecrement(list->upload_heap_refcount)) + { + HeapDestroy(list->upload_heap); + heap_free(list->upload_heap_refcount); + } + } + heap_free(list); } -- 2.32.0

2 1

[PATCH] crypt32: Add partial support for decoding OCSP_BASIC_RESPONSE_INFO structures.
by Hans Leidekker 25 Mar '22

25 Mar '22

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/crypt32/decode.c | 243 ++++++++++++++++++++++++++++++++++++ dlls/crypt32/tests/encode.c | 58 +++++++++ 2 files changed, 301 insertions(+) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index be36d3ef7b8..762d1b54661 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -6287,6 +6287,246 @@ static BOOL WINAPI CRYPT_AsnDecodeOCSPBasicSignedResponse(DWORD dwCertEncodingTy return ret; } +static BOOL CRYPT_AsnDecodeOCSPHashAlgorithm(const BYTE *pbEncoded, + DWORD cbEncoded, DWORD dwFlags, void *pvStructInfo, DWORD *pcbStructInfo, + DWORD *pcbDecoded) +{ + DWORD dataLen; + BOOL ret; + + if (!cbEncoded) + { + SetLastError(CRYPT_E_ASN1_EOD); + return FALSE; + } + if (pbEncoded[0] != ASN_SEQUENCEOF) + { + SetLastError(CRYPT_E_ASN1_BADTAG); + return FALSE; + } + + if ((ret = CRYPT_GetLen(pbEncoded, cbEncoded, &dataLen))) + { + BYTE lenBytes = GET_LEN_BYTES(pbEncoded[1]); + DWORD bytesDecoded; + if (dataLen) + { + ret = CRYPT_AsnDecodeAlgorithmId(pbEncoded + 1 + lenBytes, cbEncoded - 1 - lenBytes, dwFlags, + pvStructInfo, pcbStructInfo, &bytesDecoded); + if (ret) *pcbDecoded = bytesDecoded + lenBytes + 1; + } + } + return ret; +} + +static BOOL CRYPT_AsnDecodeOCSPNextUpdate(const BYTE *pbEncoded, + DWORD cbEncoded, DWORD dwFlags, void *pvStructInfo, DWORD *pcbStructInfo, + DWORD *pcbDecoded) +{ + DWORD dataLen; + BOOL ret; + + if (!cbEncoded) + { + SetLastError(CRYPT_E_ASN1_EOD); + return FALSE; + } + if (pbEncoded[0] != (ASN_CONTEXT | ASN_CONSTRUCTOR)) + { + SetLastError(CRYPT_E_ASN1_BADTAG); + return FALSE; + } + + if ((ret = CRYPT_GetLen(pbEncoded, cbEncoded, &dataLen))) + { + BYTE lenBytes = GET_LEN_BYTES(pbEncoded[1]); + DWORD bytesDecoded; + if (dataLen) + { + ret = CRYPT_AsnDecodeGeneralizedTime(pbEncoded + 1 + lenBytes, cbEncoded - 1 - lenBytes, dwFlags, + pvStructInfo, pcbStructInfo, &bytesDecoded); + if (ret) *pcbDecoded = bytesDecoded + lenBytes + 1; + } + } + return ret; +} + +static BOOL CRYPT_AsnDecodeOCSPBasicResponseEntry(const BYTE *pbEncoded, DWORD cbEncoded, + DWORD dwFlags, void *pvStructInfo, DWORD *pcbStructInfo, DWORD *pcbDecoded) +{ + struct AsnDecodeSequenceItem items[] = { + { ASN_SEQUENCEOF, offsetof(OCSP_BASIC_RESPONSE_ENTRY, CertId.HashAlgorithm.pszObjId), + CRYPT_AsnDecodeOCSPHashAlgorithm, sizeof(CRYPT_ALGORITHM_IDENTIFIER), FALSE, TRUE, + offsetof(OCSP_BASIC_RESPONSE_ENTRY, CertId.HashAlgorithm.pszObjId), 0 }, + { ASN_OCTETSTRING, offsetof(OCSP_BASIC_RESPONSE_ENTRY, CertId.IssuerNameHash), + CRYPT_AsnDecodeOctets, sizeof(CRYPT_HASH_BLOB), FALSE, TRUE, + offsetof(OCSP_BASIC_RESPONSE_ENTRY, CertId.IssuerNameHash.pbData), 0 }, + { ASN_OCTETSTRING, offsetof(OCSP_BASIC_RESPONSE_ENTRY, CertId.IssuerKeyHash), + CRYPT_AsnDecodeOctets, sizeof(CRYPT_HASH_BLOB), FALSE, TRUE, + offsetof(OCSP_BASIC_RESPONSE_ENTRY, CertId.IssuerKeyHash.pbData), 0 }, + { ASN_INTEGER, offsetof(OCSP_BASIC_RESPONSE_ENTRY, CertId.SerialNumber), + CRYPT_AsnDecodeIntegerInternal, sizeof(CRYPT_INTEGER_BLOB), FALSE, TRUE, + offsetof(OCSP_BASIC_RESPONSE_ENTRY, CertId.SerialNumber.pbData), 0 }, + { ASN_CONTEXT, offsetof(OCSP_BASIC_RESPONSE_ENTRY, dwCertStatus), + CRYPT_AsnDecodeIntInternal, sizeof(DWORD), FALSE, FALSE, + 0, 0 }, + /* FIXME: pRevokedInfo */ + { ASN_GENERALTIME, offsetof(OCSP_BASIC_RESPONSE_ENTRY, ThisUpdate), + CRYPT_AsnDecodeGeneralizedTime, sizeof(FILETIME), FALSE, FALSE, + 0, 0 }, + { ASN_CONTEXT | ASN_CONSTRUCTOR, offsetof(OCSP_BASIC_RESPONSE_ENTRY, NextUpdate), + CRYPT_AsnDecodeOCSPNextUpdate, sizeof(FILETIME), TRUE, FALSE, + 0, 0 }, + { ASN_CONTEXT | ASN_CONSTRUCTOR /* FIXME */, offsetof(OCSP_BASIC_RESPONSE_ENTRY, cExtension), + CRYPT_AsnDecodeCertExtensions, FINALMEMBERSIZE(OCSP_BASIC_RESPONSE_ENTRY, cExtension), + TRUE, TRUE, offsetof(OCSP_BASIC_RESPONSE_ENTRY, rgExtension), 0 }, + }; + + return CRYPT_AsnDecodeSequence(items, ARRAY_SIZE(items), + pbEncoded, cbEncoded, dwFlags, NULL, pvStructInfo, + pcbStructInfo, pcbDecoded, NULL); +} + +static BOOL CRYPT_AsnDecodeOCSPBasicResponseEntriesArray(const BYTE *pbEncoded, + DWORD cbEncoded, DWORD dwFlags, void *pvStructInfo, DWORD *pcbStructInfo, + DWORD *pcbDecoded) +{ + struct AsnArrayDescriptor arrayDesc = { ASN_SEQUENCEOF, + offsetof(OCSP_BASIC_RESPONSE_INFO, cResponseEntry), offsetof(OCSP_BASIC_RESPONSE_INFO, rgResponseEntry), + MEMBERSIZE(OCSP_BASIC_RESPONSE_INFO, cResponseEntry, cExtension), + CRYPT_AsnDecodeOCSPBasicResponseEntry, sizeof(OCSP_BASIC_RESPONSE_ENTRY), + FALSE, 0 }; + + return CRYPT_AsnDecodeArray(&arrayDesc, pbEncoded, cbEncoded, + dwFlags, NULL, pvStructInfo, pcbStructInfo, pcbDecoded); +} + +static BOOL CRYPT_AsnDecodeResponderID(const BYTE *pbEncoded, + DWORD cbEncoded, DWORD dwFlags, void *pvStructInfo, DWORD *pcbStructInfo, + DWORD *pcbDecoded) +{ + OCSP_BASIC_RESPONSE_INFO *info = pvStructInfo; + BYTE tag = pbEncoded[0] & ~3, choice = pbEncoded[0] & 3; + DWORD decodedLen, dataLen, lenBytes, bytesNeeded = sizeof(*info), len; + CERT_NAME_BLOB *blob; + + if (tag != (ASN_CONTEXT | ASN_CONSTRUCTOR)) + { + WARN("Unexpected tag %02x\n", tag); + SetLastError(CRYPT_E_ASN1_BADTAG); + return FALSE; + } + if (choice > 2) + { + WARN("Unexpected choice %02x\n", choice); + SetLastError(CRYPT_E_ASN1_CORRUPT); + return FALSE; + } + + if (pvStructInfo && *pcbStructInfo >= bytesNeeded) + info->dwResponderIdChoice = choice; + + if (!CRYPT_GetLen(pbEncoded, cbEncoded, &dataLen)) + return FALSE; + lenBytes = GET_LEN_BYTES(pbEncoded[1]); + cbEncoded -= 1 + lenBytes; + decodedLen = 1 + lenBytes; + + if (dataLen > cbEncoded) + { + SetLastError(CRYPT_E_ASN1_EOD); + return FALSE; + } + pbEncoded += 1 + lenBytes; + if (pbEncoded[0] != ASN_OCTETSTRING) + { + WARN("Unexpected tag %02x\n", pbEncoded[0]); + SetLastError(CRYPT_E_ASN1_BADTAG); + return FALSE; + } + + if (!CRYPT_GetLen(pbEncoded, cbEncoded, &len)) + return FALSE; + lenBytes = GET_LEN_BYTES(pbEncoded[1]); + decodedLen += 1 + lenBytes + len; + cbEncoded -= 1 + lenBytes; + + if (len > cbEncoded) + { + SetLastError(CRYPT_E_ASN1_EOD); + return FALSE; + } + pbEncoded += 1 + lenBytes; + + if (!(dwFlags & CRYPT_DECODE_NOCOPY_FLAG)) bytesNeeded += len; + if (pvStructInfo && *pcbStructInfo >= bytesNeeded) + { + blob = &info->u.ByNameResponderId; + blob->cbData = len; + if (dwFlags & CRYPT_DECODE_NOCOPY_FLAG) + blob->pbData = (BYTE *)pbEncoded; + else if (blob->cbData) + { + blob->pbData = (BYTE *)(info + 1); + memcpy(blob->pbData, pbEncoded, blob->cbData); + } + } + + if (pcbDecoded) + *pcbDecoded = decodedLen; + + if (!pvStructInfo) + { + *pcbStructInfo = bytesNeeded; + return TRUE; + } + + if (*pcbStructInfo < bytesNeeded) + { + SetLastError(ERROR_MORE_DATA); + *pcbStructInfo = bytesNeeded; + return FALSE; + } + + *pcbStructInfo = bytesNeeded; + return TRUE; +} + +static BOOL WINAPI CRYPT_AsnDecodeOCSPBasicResponse(DWORD dwCertEncodingType, + LPCSTR lpszStructType, const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags, + CRYPT_DECODE_PARA *pDecodePara, void *pvStructInfo, DWORD *pcbStructInfo) +{ + struct AsnDecodeSequenceItem items[] = { + { 0, 0, + CRYPT_AsnDecodeResponderID, offsetof(OCSP_BASIC_RESPONSE_INFO, ProducedAt), FALSE, TRUE, + offsetof(OCSP_BASIC_RESPONSE_INFO, u.ByNameResponderId.pbData), 0 }, + { ASN_GENERALTIME, offsetof(OCSP_BASIC_RESPONSE_INFO, ProducedAt), + CRYPT_AsnDecodeGeneralizedTime, sizeof(FILETIME), FALSE, FALSE, + 0, 0 }, + { ASN_SEQUENCEOF, offsetof(OCSP_BASIC_RESPONSE_INFO, cResponseEntry), + CRYPT_AsnDecodeOCSPBasicResponseEntriesArray, MEMBERSIZE(OCSP_BASIC_RESPONSE_INFO, cResponseEntry, cExtension), + TRUE, TRUE, offsetof(OCSP_BASIC_RESPONSE_INFO, rgResponseEntry) }, + { ASN_CONTEXT | ASN_CONSTRUCTOR, offsetof(OCSP_BASIC_RESPONSE_INFO, cExtension), + CRYPT_AsnDecodeCertExtensions, FINALMEMBERSIZE(OCSP_BASIC_RESPONSE_INFO, cExtension), + TRUE, TRUE, offsetof(OCSP_BASIC_RESPONSE_INFO, rgExtension), 0 }, + }; + BOOL ret; + + __TRY + { + ret = CRYPT_AsnDecodeSequence(items, ARRAY_SIZE(items), + pbEncoded, cbEncoded, dwFlags, pDecodePara, pvStructInfo, + pcbStructInfo, NULL, NULL); + } + __EXCEPT_PAGE_FAULT + { + SetLastError(STATUS_ACCESS_VIOLATION); + ret = FALSE; + } + __ENDTRY + return ret; +} + static CryptDecodeObjectExFunc CRYPT_GetBuiltinDecoder(DWORD dwCertEncodingType, LPCSTR lpszStructType) { @@ -6441,6 +6681,9 @@ static CryptDecodeObjectExFunc CRYPT_GetBuiltinDecoder(DWORD dwCertEncodingType, case LOWORD(OCSP_BASIC_SIGNED_RESPONSE): decodeFunc = CRYPT_AsnDecodeOCSPBasicSignedResponse; break; + case LOWORD(OCSP_BASIC_RESPONSE): + decodeFunc = CRYPT_AsnDecodeOCSPBasicResponse; + break; default: FIXME("Unimplemented decoder for lpszStructType OID %d\n", LOWORD(lpszStructType)); } diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index c4417a27e2c..b6325efd518 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -8948,6 +8948,63 @@ static void test_decodeOCSPBasicSignedResponseInfo(DWORD dwEncoding) LocalFree(info); } +static void test_decodeOCSPBasicResponseInfo(DWORD dwEncoding) +{ + static const BYTE resp_id[] = { + 0xb7, 0x6b, 0xa2, 0xea, 0xa8, 0xaa, 0x84, 0x8c, 0x79, 0xea, 0xb4, 0xda, 0x0f, 0x98, 0xb2, 0xc5, + 0x95, 0x76, 0xb9, 0xf4}; + static const BYTE name_hash[] = { + 0xe4, 0xe3, 0x95, 0xa2, 0x29, 0xd3, 0xd4, 0xc1, 0xc3, 0x1f, 0xf0, 0x98, 0x0c, 0x0b, 0x4e, 0xc0, + 0x09, 0x8a, 0xab, 0xd8}; + static const BYTE key_hash[] = { + 0xb7, 0x6b, 0xa2, 0xea, 0xa8, 0xaa, 0x84, 0x8c, 0x79, 0xea, 0xb4, 0xda, 0x0f, 0x98, 0xb2, 0xc5, + 0x95, 0x76, 0xb9, 0xf4}; + static const BYTE serial[] = { + 0xb1, 0xc1, 0x87, 0x54, 0x54, 0xac, 0x1e, 0x55, 0x40, 0xfb, 0xef, 0xd9, 0x6d, 0x8f, 0x49, 0x08}; + OCSP_BASIC_RESPONSE_INFO *info; + OCSP_BASIC_RESPONSE_ENTRY *entry; + DWORD size; + BOOL ret; + + size = 0; + ret = pCryptDecodeObjectEx(dwEncoding, OCSP_BASIC_RESPONSE, ocsp_to_be_signed, + sizeof(ocsp_to_be_signed), CRYPT_DECODE_ALLOC_FLAG, NULL, &info, &size); + ok(ret, "got %08lx\n", GetLastError()); + + ok(!info->dwVersion, "got %lu\n", info->dwVersion); + ok(info->dwResponderIdChoice == 2, "got %lu\n", info->dwResponderIdChoice); + ok(info->ByKeyResponderId.cbData == sizeof(resp_id), "got %lu\n", info->ByKeyResponderId.cbData); + ok(!memcmp(info->ByKeyResponderId.pbData, resp_id, sizeof(resp_id)), "wrong data\n"); + ok(info->ProducedAt.dwLowDateTime == 3438583808, "got %lu\n", info->ProducedAt.dwLowDateTime); + ok(info->ProducedAt.dwHighDateTime == 30946477, "got %lu\n", info->ProducedAt.dwHighDateTime); + ok(info->cResponseEntry == 1, "got %lu\n", info->cResponseEntry); + ok(info->rgResponseEntry != NULL, "got %p\n", info->rgResponseEntry); + + entry = info->rgResponseEntry; + ok(!strcmp(entry->CertId.HashAlgorithm.pszObjId, szOID_OIWSEC_sha1), "got '%s'\n", entry->CertId.HashAlgorithm.pszObjId); + ok(entry->CertId.HashAlgorithm.Parameters.cbData == 2, "got %lu\n", entry->CertId.HashAlgorithm.Parameters.cbData); + ok(entry->CertId.HashAlgorithm.Parameters.pbData[0] == 5, "got 0x%02x\n", entry->CertId.HashAlgorithm.Parameters.pbData[0]); + ok(!entry->CertId.HashAlgorithm.Parameters.pbData[1], "got 0x%02x\n", entry->CertId.HashAlgorithm.Parameters.pbData[1]); + ok(entry->CertId.IssuerNameHash.cbData == 20, "got %lu\n", entry->CertId.IssuerNameHash.cbData); + ok(!memcmp(entry->CertId.IssuerNameHash.pbData, name_hash, sizeof(name_hash)), "wrong data\n"); + ok(entry->CertId.IssuerKeyHash.cbData == 20, "got %lu\n", entry->CertId.IssuerKeyHash.cbData); + ok(!memcmp(entry->CertId.IssuerKeyHash.pbData, key_hash, sizeof(key_hash)), "wrong data\n"); + ok(entry->CertId.SerialNumber.cbData == 16, "got %lu\n", entry->CertId.SerialNumber.cbData); + ok(!memcmp(entry->CertId.SerialNumber.pbData, serial, sizeof(serial)), "wrong data\n"); + ok(entry->dwCertStatus == 0, "got %lu\n", entry->dwCertStatus); + ok(entry->pRevokedInfo == NULL, "got %p\n", entry->pRevokedInfo); + ok(entry->ThisUpdate.dwLowDateTime == 2558518400, "got %lu\n", entry->ThisUpdate.dwLowDateTime); + ok(entry->ThisUpdate.dwHighDateTime == 30946475, "got %lu\n", entry->ThisUpdate.dwHighDateTime); + ok(entry->NextUpdate.dwLowDateTime == 2014369408, "got %lu\n", entry->NextUpdate.dwLowDateTime); + ok(entry->NextUpdate.dwHighDateTime == 30947877, "got %lu\n", entry->NextUpdate.dwHighDateTime); + ok(!entry->cExtension, "got %lu\n", entry->cExtension); + ok(entry->rgExtension == NULL, "got %p\n", entry->rgExtension); + + ok(!info->cExtension, "got %lu\n", info->cExtension); + ok(info->rgExtension == NULL, "got %p\n", info->rgExtension); + LocalFree(info); +} + START_TEST(encode) { static const DWORD encodings[] = { X509_ASN_ENCODING, PKCS_7_ASN_ENCODING, @@ -9044,6 +9101,7 @@ START_TEST(encode) test_encodeOCSPRequestInfo(encodings[i]); test_decodeOCSPResponseInfo(encodings[i]); test_decodeOCSPBasicSignedResponseInfo(encodings[i]); + test_decodeOCSPBasicResponseInfo(encodings[i]); } testPortPublicKeyInfo(); } -- 2.30.2

1 0

[PATCH] kernel32/tests: Use HeapAlloc function pointer to silent a warning.
by Rémi Bernon 25 Mar '22

25 Mar '22

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/kernel32/tests/heap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index bc573050d16..c597ff9590b 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -898,7 +898,7 @@ static void test_heap_checks( DWORD flags ) if (flags & HEAP_PAGE_ALLOCS) return; /* no tests for that case yet */ trace( "testing heap flags %08lx\n", flags ); - p = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, 17 ); + p = pHeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, 17 ); ok( p != NULL, "HeapAlloc failed\n" ); ret = HeapValidate( GetProcessHeap(), 0, p ); -- 2.35.1

1 0

[PATCH] mountmgr: Fix long type warnings on macOS.
by Huw Davies 25 Mar '22

25 Mar '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/mountmgr.sys/diskarb.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/mountmgr.sys/diskarb.c b/dlls/mountmgr.sys/diskarb.c index 50a32bef079..462ff82c691 100644 --- a/dlls/mountmgr.sys/diskarb.c +++ b/dlls/mountmgr.sys/diskarb.c @@ -229,7 +229,7 @@ void run_diskarbitration_loop(void) #if defined(HAVE_SYSTEMCONFIGURATION_SCDYNAMICSTORECOPYDHCPINFO_H) && defined(HAVE_SYSTEMCONFIGURATION_SCNETWORKCONFIGURATION_H) -static UInt8 map_option( ULONG option ) +static UInt8 map_option( unsigned int option ) { switch (option) { @@ -314,7 +314,7 @@ NTSTATUS dhcp_request( void *args ) case OPTION_ROUTER_ADDRESS: case OPTION_BROADCAST_ADDRESS: { - DWORD *ptr = (DWORD *)(params->buffer + params->offset); + unsigned int *ptr = (unsigned int *)(params->buffer + params->offset); if (len == sizeof(*ptr) && params->size >= sizeof(*ptr)) { CFDataGetBytes( value, CFRangeMake(0, len), (UInt8 *)ptr ); @@ -341,7 +341,7 @@ NTSTATUS dhcp_request( void *args ) break; } default: - FIXME( "option %u not supported\n", params->req->id ); + FIXME( "option %u not supported\n", (unsigned int)params->req->id ); break; } -- 2.23.0

1 0

[PATCH] wined3d: Add full dirty region at texture creation.
by Paul Gofman 25 Mar '22

25 Mar '22

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- Fixes rendering in Guilty Gear Isuka which (d3d8 game) which regressed with commit 513d3e1376761889a792719d4dccaf41bc6d2829. dlls/d3d8/tests/visual.c | 20 +++++++++++++++++--- dlls/d3d9/tests/visual.c | 20 +++++++++++++++++--- dlls/wined3d/texture.c | 11 +++++++---- 3 files changed, 41 insertions(+), 10 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index b7f6dd62e9c..41fc0cbf16a 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -5531,9 +5531,6 @@ static void add_dirty_rect_test(void) hr = IDirect3DTexture8_GetSurfaceLevel(tex_dynamic, 0, &surface_dynamic); ok(SUCCEEDED(hr), "Failed to get surface level, hr %#x.\n", hr); - fill_surface(surface_src_red, 0x00ff0000, 0); - fill_surface(surface_src_green, 0x0000ff00, 0); - hr = IDirect3DDevice8_SetVertexShader(device, D3DFVF_XYZ | D3DFVF_TEX1); ok(SUCCEEDED(hr), "Failed to set fvf, hr %#x.\n", hr); hr = IDirect3DDevice8_SetTextureStageState(device, 0, D3DTSS_COLOROP, D3DTOP_SELECTARG1); @@ -5543,6 +5540,23 @@ static void add_dirty_rect_test(void) hr = IDirect3DDevice8_SetTextureStageState(device, 0, D3DTSS_MIPFILTER, D3DTEXF_POINT); ok(SUCCEEDED(hr), "Failed to set mip filter, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetTexture(device, 0, (IDirect3DBaseTexture8 *)tex_dst2); + ok(hr == D3D_OK, "Unexpected hr %#x.\n", hr); + hr = IDirect3DDevice8_UpdateTexture(device, (IDirect3DBaseTexture8 *)tex_src_red, + (IDirect3DBaseTexture8 *)tex_dst2); + fill_surface(surface_src_green, 0x00000080, D3DLOCK_NO_DIRTY_UPDATE); + hr = IDirect3DDevice8_UpdateTexture(device, (IDirect3DBaseTexture8 *)tex_src_green, + (IDirect3DBaseTexture8 *)tex_dst2); + ok(hr == D3D_OK, "Unexpected hr %#x.\n", hr); + add_dirty_rect_test_draw(device); + color = getPixelColor(device, 320, 240); + ok(color_match(color, 0x00000080, 1), "Unexpected colour 0x%08x.\n", color); + hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); + ok(hr == D3D_OK, "Unexpected hr %#x.\n", hr); + + fill_surface(surface_src_red, 0x00ff0000, 0); + fill_surface(surface_src_green, 0x0000ff00, 0); + hr = IDirect3DDevice8_UpdateTexture(device, (IDirect3DBaseTexture8 *)tex_src_green, (IDirect3DBaseTexture8 *)tex_dst1); ok(SUCCEEDED(hr), "Failed to update texture, hr %#x.\n", hr); diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 89f9e9cf2c6..9f9055483b1 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -19394,9 +19394,6 @@ static void add_dirty_rect_test(void) hr = IDirect3DTexture9_GetSurfaceLevel(tex_dynamic, 0, &surface_dynamic); ok(SUCCEEDED(hr), "Failed to get surface level, hr %#x.\n", hr); - fill_surface(surface_src_red, 0x00ff0000, 0); - fill_surface(surface_src_green, 0x0000ff00, 0); - hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_TEX1); ok(SUCCEEDED(hr), "Failed to set fvf, hr %#x.\n", hr); hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_COLOROP, D3DTOP_SELECTARG1); @@ -19406,6 +19403,23 @@ static void add_dirty_rect_test(void) hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_MIPFILTER, D3DTEXF_POINT); ok(SUCCEEDED(hr), "Failed to set sampler state, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetTexture(device, 0, (IDirect3DBaseTexture9 *)tex_dst2); + ok(hr == D3D_OK, "Unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_UpdateTexture(device, (IDirect3DBaseTexture9 *)tex_src_red, + (IDirect3DBaseTexture9 *)tex_dst2); + fill_surface(surface_src_green, 0x00000080, D3DLOCK_NO_DIRTY_UPDATE); + hr = IDirect3DDevice9_UpdateTexture(device, (IDirect3DBaseTexture9 *)tex_src_green, + (IDirect3DBaseTexture9 *)tex_dst2); + ok(hr == D3D_OK, "Unexpected hr %#x.\n", hr); + add_dirty_rect_test_draw(device); + color = getPixelColor(device, 320, 240); + ok(color_match(color, 0x00000080, 1), "Unexpected colour 0x%08x.\n", color); + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(hr == D3D_OK, "Unexpected hr %#x.\n", hr); + + fill_surface(surface_src_red, 0x00ff0000, 0); + fill_surface(surface_src_green, 0x0000ff00, 0); + hr = IDirect3DDevice9_UpdateTexture(device, (IDirect3DBaseTexture9 *)tex_src_green, (IDirect3DBaseTexture9 *)tex_dst1); ok(SUCCEEDED(hr), "Failed to update texture, hr %#x.\n", hr); diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index fdd2c70c667..94a1b848a2a 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -3895,11 +3895,14 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc texture->flags |= WINED3D_TEXTURE_GENERATE_MIPMAPS; } - if (flags & WINED3D_TEXTURE_CREATE_RECORD_DIRTY_REGIONS - && !(texture->dirty_regions = heap_calloc(texture->layer_count, sizeof(*texture->dirty_regions)))) + if (flags & WINED3D_TEXTURE_CREATE_RECORD_DIRTY_REGIONS) { - wined3d_texture_cleanup_sync(texture); - return E_OUTOFMEMORY; + if (!(texture->dirty_regions = heap_calloc(texture->layer_count, sizeof(*texture->dirty_regions)))) + { + wined3d_texture_cleanup_sync(texture); + return E_OUTOFMEMORY; + } + wined3d_texture_dirty_region_add(texture, 0, NULL); } /* Precalculated scaling for 'faked' non power of two texture coords. */ -- 2.35.1

2 2

[PATCH] win32u: Make some functions static.
by Francois Gouget 25 Mar '22

25 Mar '22

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/win32u/sysparams.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 6e6300c502b..f22f6604454 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -1347,7 +1347,7 @@ static void unlock_display_devices(void) pthread_mutex_unlock( &display_lock ); } -HDC get_display_dc(void) +static HDC get_display_dc(void) { pthread_mutex_lock( &display_dc_lock ); if (!display_dc) @@ -1365,7 +1365,7 @@ HDC get_display_dc(void) return display_dc; } -void release_display_dc( HDC hdc ) +static void release_display_dc( HDC hdc ) { pthread_mutex_unlock( &display_dc_lock ); } -- 2.30.2

2 1

[PATCH] wined3d: Reuse deferred uploads heaps.
by Jan Sikorski 25 Mar '22

25 Mar '22

Avoids needing to fault-in the memory on each recording. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> --- The HeapFree loop over uploads in a command list is still a little concerning. If it turns out to be an issue, we could allocate larger buffers based on previous usage and fit multiple uploads in it. --- dlls/wined3d/cs.c | 55 +++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 46 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 63d6ed4c123..87d7b60bc15 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -49,13 +49,15 @@ struct wined3d_command_list SIZE_T data_size; void *data; - HANDLE upload_heap; SIZE_T resource_count; struct wined3d_resource **resources; SIZE_T upload_count; struct wined3d_deferred_upload *uploads; + HANDLE upload_heap; + LONG *upload_heap_refcount; + /* List of command lists queued for execution on this command list. We might * be the only thing holding a pointer to another command list, so we need * to hold a reference here (and in wined3d_deferred_context) as well. */ @@ -3960,7 +3962,6 @@ static void wined3d_cs_packet_incref_objects(struct wined3d_cs_packet *packet) struct wined3d_deferred_context { struct wined3d_device_context c; - HANDLE upload_heap; SIZE_T data_size, data_capacity; void *data; @@ -3971,6 +3972,9 @@ struct wined3d_deferred_context SIZE_T upload_count, uploads_capacity; struct wined3d_deferred_upload *uploads; + HANDLE upload_heap; + LONG *upload_heap_refcount; + /* List of command lists queued for execution on this context. A command * list can be the only thing holding a pointer to another command list, so * we need to hold a reference here and in wined3d_command_list as well. */ @@ -4090,12 +4094,22 @@ static bool wined3d_deferred_context_map_upload_bo(struct wined3d_device_context deferred->upload_count + 1, sizeof(*deferred->uploads))) return false; - if (!deferred->upload_heap) - deferred->upload_heap = HeapCreate(HEAP_NO_SERIALIZE, 0, 0); if (!deferred->upload_heap) { - ERR("Failed to create upload heap.\n"); - return false; + if (!(deferred->upload_heap = HeapCreate(0, 0, 0))) + { + ERR("Failed to create upload heap.\n"); + return false; + } + + if (!(deferred->upload_heap_refcount = heap_alloc(sizeof(deferred->upload_heap_refcount)))) + { + HeapDestroy(deferred->upload_heap); + deferred->upload_heap = 0; + return false; + } + + *deferred->upload_heap_refcount = 1; } if (!(sysmem = HeapAlloc(deferred->upload_heap, 0, size + RESOURCE_ALIGNMENT - 1))) @@ -4243,9 +4257,20 @@ void CDECL wined3d_deferred_context_destroy(struct wined3d_device_context *conte heap_free(deferred->resources); for (i = 0; i < deferred->upload_count; ++i) + { wined3d_resource_decref(deferred->uploads[i].resource); + HeapFree(deferred->upload_heap, 0, deferred->uploads[i].resource); + } + if (deferred->upload_heap) - HeapDestroy(deferred->upload_heap); + { + if (!InterlockedDecrement(deferred->upload_heap_refcount)) + { + HeapDestroy(deferred->upload_heap); + heap_free(deferred->upload_heap_refcount); + } + } + heap_free(deferred->uploads); for (i = 0; i < deferred->command_list_count; ++i) @@ -4331,7 +4356,8 @@ HRESULT CDECL wined3d_deferred_context_record_command_list(struct wined3d_device deferred->query_count = 0; object->upload_heap = deferred->upload_heap; - deferred->upload_heap = 0; + if ((object->upload_heap_refcount = deferred->upload_heap_refcount)) + InterlockedIncrement(object->upload_heap_refcount); /* This is in fact recorded into a subsequent command list. */ if (restore) @@ -4349,11 +4375,22 @@ HRESULT CDECL wined3d_deferred_context_record_command_list(struct wined3d_device static void wined3d_command_list_destroy_object(void *object) { struct wined3d_command_list *list = object; + unsigned int i; TRACE("list %p.\n", list); + for (i = 0; i < list->upload_count; ++i) + HeapFree(list->upload_heap, 0, list->uploads[i].sysmem); + if (list->upload_heap) - HeapDestroy(list->upload_heap); + { + if (!InterlockedDecrement(list->upload_heap_refcount)) + { + HeapDestroy(list->upload_heap); + heap_free(list->upload_heap_refcount); + } + } + heap_free(list); } -- 2.32.0

2 1

[PATCH] DO NOT COMMIT
by Eric Pouech 25 Mar '22

25 Mar '22

not to be committed (looking out for timeouts cause in cmd tests) Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- Eric Pouech (1): programs/cmd: don't recurse into paths longer than MAX_PATH programs/cmd/builtins.c | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-)

1 1

[tools] testbot/web: Provide a property list for the special jobs page.
by Francois Gouget 25 Mar '22

25 Mar '22

The property descriptors list can be empty, but it must not be left undefined forever. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- The patch reordering the FormPage methods contained a change it shouldn't have which broke the special jobs page. At least that's much less of an issue than breaking the submit page (see previous patch). It would probably be even better to provide a list of EnumPropertyDescriptor()s instead of having the page roll its own. But then this page should be rewritten to use checkboxes similar to the ones of the Submit page. Which also means this type of VM selection code should be shared. And further extended to allow choosing between 32- and 64-bit for each VM. That will all have to wait though. --- testbot/web/admin/SpecialJobs.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/web/admin/SpecialJobs.pl b/testbot/web/admin/SpecialJobs.pl index 02d9f8ea9..79160e42f 100644 --- a/testbot/web/admin/SpecialJobs.pl +++ b/testbot/web/admin/SpecialJobs.pl @@ -90,7 +90,7 @@ sub _initialize($$$) $JobTemplate->{VMKey} ||= "*No"; } - $self->SUPER::_initialize($Request, $RequiredRole, undef); + $self->SUPER::_initialize($Request, $RequiredRole, []); } -- 2.30.2

1 0

[tools] testbot/web: The Submit page should always provide a property list.
by Francois Gouget 25 Mar '22

25 Mar '22

FormPage expects to be provided with a property list when it calls GetPropertyDescriptors() at the very latest. So while that method may return an empty list, returning undef is not allowed. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- The patch reordering the FormPage methods contained a change it shouldn't have which broke the submit job page. The FormPage methods were inconsistent about whether they would correctly deal with $self->GetPropertyDescriptors() returning undef (this specific issue is in the most used method, GenerateFields()). Now they don't accept it and so the subclasses should make sure to always provide a property list. This updates the Submit page accordingly. --- testbot/web/Submit.pl | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index 79d1c8772..472622dd5 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -665,16 +665,23 @@ sub GetPropertyDescriptors($) my ($self) = @_; # Note that this may be called for different pages. For instance first to - # validate the properties of the page 1, then again to generate the form - # fields of page 2. See _SetPage(). - if ($self->{Page} == 1) + # validate the page 1 properties, then again to generate the page 2 form + # fields. See _SetPage(). + if ($self->{PropertyDescriptors}) { - $self->{PropertyDescriptors} ||= [ + # The property descriptors list is already set for $self->{Page} + } + elsif ($self->{Page} == 1) + { + $self->{PropertyDescriptors} = [ CreateBasicPropertyDescriptor("Remarks", "Remarks", !1, !1, "A", 128), ]; } - elsif (($self->{Page} == 3 or $self->{Page} == 4) and - !$self->{PropertyDescriptors}) + elsif ($self->{Page} == 2) + { + $self->{PropertyDescriptors} = []; # no fields, only a collection block + } + elsif ($self->{Page} == 3 or $self->{Page} == 4) { if ($self->{Page} == 4) { @@ -960,9 +967,12 @@ sub _SetPage($$) { my ($self, $Page) = @_; - $self->{Page} = $Page; - # Changing the page also changes the fields of the HTML form - delete $self->{PropertyDescriptors}; + if ($self->{Page} != $Page) + { + $self->{Page} = $Page; + # Changing the page also changes the fields of the HTML form + $self->{PropertyDescriptors} = undef; + } } sub OnUnset($) -- 2.30.2

1 0

[PATH] shell32: Fix a behavior of shfileoperationw
by Ming Shao 25 Mar '22

25 Mar '22

From: shaoming <shaoming(a)uniontech.com> Signed-off-by: shaoming <shaoming(a)uniontech.com> --- dlls/shell32/shlfileop.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/shell32/shlfileop.c b/dlls/shell32/shlfileop.c index 17a8e7046c7..aa69c7a3232 100644 --- a/dlls/shell32/shlfileop.c +++ b/dlls/shell32/shlfileop.c @@ -1519,6 +1519,14 @@ int WINAPI SHFileOperationW(LPSHFILEOPSTRUCTW lpFileOp) ZeroMemory(&flFrom, sizeof(FILE_LIST)); ZeroMemory(&flTo, sizeof(FILE_LIST)); + //windows look likes select first path when lpFileOp->pTo have more then one paths + if(lpFileOp->wFunc == FO_RENAME) + { + LPWSTR lpRefTo = lpFileOp->pTo; + while(*lpRefTo++); + if(*lpRefTo) *lpRefTo = '\0'; + } + if ((ret = parse_file_list(&flFrom, lpFileOp->pFrom))) return ret; -- 2.20.1

1 0

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