- Wine-Devel - list.winehq.org

[PATCH 1/6] dinput: Replace stub EnumEffects with generic implementation.
by Rémi Bernon Oct. 21, 2021

Oct. 21, 2021

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/dinput/device.c | 73 ++++++++++++++++++++++++++++++++++---- dlls/dinput/joystick_hid.c | 73 +------------------------------------- 2 files changed, 67 insertions(+), 79 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 8858bfa26bb..e5713f4713d 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -1661,14 +1661,73 @@ HRESULT WINAPI IDirectInputDevice2WImpl_CreateEffect(LPDIRECTINPUTDEVICE8W iface return DIERR_UNSUPPORTED; } -HRESULT WINAPI IDirectInputDevice2WImpl_EnumEffects( - LPDIRECTINPUTDEVICE8W iface, - LPDIENUMEFFECTSCALLBACKW lpCallback, - LPVOID lpvRef, - DWORD dwFlags) +HRESULT WINAPI IDirectInputDevice2WImpl_EnumEffects( IDirectInputDevice8W *iface, LPDIENUMEFFECTSCALLBACKW callback, + void *context, DWORD type ) { - IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8W(iface); - FIXME("(%p)->(%p,%p,0x%08x): stub!\n", This, lpCallback, lpvRef, dwFlags); + DIEFFECTINFOW info = {.dwSize = sizeof(info)}; + HRESULT hr; + + TRACE( "iface %p, callback %p, context %p, type %#x.\n", iface, callback, context, type ); + + if (!callback) return DIERR_INVALIDPARAM; + + type = DIEFT_GETTYPE( type ); + + if (type == DIEFT_ALL || type == DIEFT_CONSTANTFORCE) + { + hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_ConstantForce ); + if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; + if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; + } + + if (type == DIEFT_ALL || type == DIEFT_RAMPFORCE) + { + hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_RampForce ); + if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; + if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; + } + + if (type == DIEFT_ALL || type == DIEFT_PERIODIC) + { + hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_Square ); + if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; + if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; + + hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_Sine ); + if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; + if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; + + hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_Triangle ); + if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; + if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; + + hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_SawtoothUp ); + if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; + if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; + + hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_SawtoothDown ); + if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; + if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; + } + + if (type == DIEFT_ALL || type == DIEFT_CONDITION) + { + hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_Spring ); + if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; + if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; + + hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_Damper ); + if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; + if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; + + hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_Inertia ); + if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; + if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; + + hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_Friction ); + if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; + if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; + } return DI_OK; } diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 766e022ebe0..91b6020d1f1 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -838,77 +838,6 @@ failed: return hr; } -static HRESULT WINAPI hid_joystick_EnumEffects( IDirectInputDevice8W *iface, LPDIENUMEFFECTSCALLBACKW callback, - void *context, DWORD type ) -{ - DIEFFECTINFOW info = {.dwSize = sizeof(info)}; - HRESULT hr; - - TRACE( "iface %p, callback %p, context %p, type %#x.\n", iface, callback, context, type ); - - if (!callback) return DIERR_INVALIDPARAM; - - type = DIEFT_GETTYPE( type ); - - if (type == DIEFT_ALL || type == DIEFT_CONSTANTFORCE) - { - hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_ConstantForce ); - if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; - if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; - } - - if (type == DIEFT_ALL || type == DIEFT_RAMPFORCE) - { - hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_RampForce ); - if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; - if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; - } - - if (type == DIEFT_ALL || type == DIEFT_PERIODIC) - { - hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_Square ); - if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; - if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; - - hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_Sine ); - if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; - if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; - - hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_Triangle ); - if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; - if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; - - hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_SawtoothUp ); - if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; - if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; - - hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_SawtoothDown ); - if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; - if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; - } - - if (type == DIEFT_ALL || type == DIEFT_CONDITION) - { - hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_Spring ); - if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; - if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; - - hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_Damper ); - if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; - if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; - - hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_Inertia ); - if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; - if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; - - hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_Friction ); - if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; - if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; - } - - return DI_OK; -} - static HRESULT WINAPI hid_joystick_GetEffectInfo( IDirectInputDevice8W *iface, DIEFFECTINFOW *info, const GUID *guid ) { @@ -1155,7 +1084,7 @@ static const IDirectInputDevice8WVtbl hid_joystick_vtbl = IDirectInputDevice2WImpl_Initialize, /*** IDirectInputDevice2 methods ***/ hid_joystick_CreateEffect, - hid_joystick_EnumEffects, + IDirectInputDevice2WImpl_EnumEffects, hid_joystick_GetEffectInfo, hid_joystick_GetForceFeedbackState, hid_joystick_SendForceFeedbackCommand, -- 2.33.0

1 5

[PATCH] po: Update German translation.
by Julian Rüger Oct. 21, 2021

Oct. 21, 2021

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

1 0

[PATCH v2] msxml3/tests: Test VBSAXXMLReader.
by Jefferson Carpenter Oct. 21, 2021

Oct. 21, 2021

Removed vb_reader_support_data. Looped through reader_support_data, but incremented a flag through SAXObjectType and VB_SAXObjectType while incrementing the table. thanks, Jefferson

2 4

[PATCH] include: Add MFVideoAlphaBitmapFlags in evr9.idl
by Biswapriyo Nath Oct. 21, 2021

Oct. 21, 2021

2 2

[PATCH 1/3] winegstreamer: Move the IWMPacketSize2 implementation to the wm_reader object.
by Zebediah Figura Oct. 21, 2021

Oct. 21, 2021

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/winegstreamer/gst_private.h | 1 + dlls/winegstreamer/wm_asyncreader.c | 68 ----------------------------- dlls/winegstreamer/wm_reader.c | 67 ++++++++++++++++++++++++++++ dlls/wmvcore/tests/wmvcore.c | 4 +- 4 files changed, 70 insertions(+), 70 deletions(-) diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index 6dc0ad3e291..519be33dadd 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -117,6 +117,7 @@ struct wm_reader { IWMHeaderInfo3 IWMHeaderInfo3_iface; IWMLanguageList IWMLanguageList_iface; + IWMPacketSize2 IWMPacketSize2_iface; IWMProfile3 IWMProfile3_iface; LONG refcount; diff --git a/dlls/winegstreamer/wm_asyncreader.c b/dlls/winegstreamer/wm_asyncreader.c index a36718ef453..d2891730bfb 100644 --- a/dlls/winegstreamer/wm_asyncreader.c +++ b/dlls/winegstreamer/wm_asyncreader.c @@ -33,7 +33,6 @@ struct async_reader IWMReaderTimecode IWMReaderTimecode_iface; IWMReaderPlaylistBurn IWMReaderPlaylistBurn_iface; IReferenceClock IReferenceClock_iface; - IWMPacketSize2 IWMPacketSize2_iface; }; static struct async_reader *impl_from_IWMReader(IWMReader *iface) @@ -1322,68 +1321,6 @@ static const IReferenceClockVtbl ReferenceClockVtbl = refclock_Unadvise }; -static struct async_reader *impl_from_IWMPacketSize2(IWMPacketSize2 *iface) -{ - return CONTAINING_RECORD(iface, struct async_reader, IWMPacketSize2_iface); -} - -static HRESULT WINAPI packetsize_QueryInterface(IWMPacketSize2 *iface, REFIID riid, void **ppv) -{ - struct async_reader *This = impl_from_IWMPacketSize2(iface); - return IWMReader_QueryInterface(&This->IWMReader_iface, riid, ppv); -} - -static ULONG WINAPI packetsize_AddRef(IWMPacketSize2 *iface) -{ - struct async_reader *This = impl_from_IWMPacketSize2(iface); - return IWMReader_AddRef(&This->IWMReader_iface); -} - -static ULONG WINAPI packetsize_Release(IWMPacketSize2 *iface) -{ - struct async_reader *This = impl_from_IWMPacketSize2(iface); - return IWMReader_Release(&This->IWMReader_iface); -} - -static HRESULT WINAPI packetsize_GetMaxPacketSize(IWMPacketSize2 *iface, DWORD *size) -{ - struct async_reader *This = impl_from_IWMPacketSize2(iface); - FIXME("%p, %p\n", This, size); - return E_NOTIMPL; -} - -static HRESULT WINAPI packetsize_SetMaxPacketSize(IWMPacketSize2 *iface, DWORD size) -{ - struct async_reader *This = impl_from_IWMPacketSize2(iface); - FIXME("%p, %d\n", This, size); - return E_NOTIMPL; -} - -static HRESULT WINAPI packetsize_GetMinPacketSize(IWMPacketSize2 *iface, DWORD *size) -{ - struct async_reader *This = impl_from_IWMPacketSize2(iface); - FIXME("%p, %p\n", This, size); - return E_NOTIMPL; -} - -static HRESULT WINAPI packetsize_SetMinPacketSize(IWMPacketSize2 *iface, DWORD size) -{ - struct async_reader *This = impl_from_IWMPacketSize2(iface); - FIXME("%p, %d\n", This, size); - return E_NOTIMPL; -} - -static const IWMPacketSize2Vtbl WMPacketSize2Vtbl = -{ - packetsize_QueryInterface, - packetsize_AddRef, - packetsize_Release, - packetsize_GetMaxPacketSize, - packetsize_SetMaxPacketSize, - packetsize_GetMinPacketSize, - packetsize_SetMinPacketSize -}; - static struct async_reader *impl_from_wm_reader(struct wm_reader *iface) { return CONTAINING_RECORD(iface, struct async_reader, reader); @@ -1398,10 +1335,6 @@ static void *async_reader_query_interface(struct wm_reader *iface, REFIID iid) if (IsEqualIID(iid, &IID_IReferenceClock)) return &reader->IReferenceClock_iface; - if (IsEqualIID(iid, &IID_IWMPacketSize) - || IsEqualIID(iid, &IID_IWMPacketSize2)) - return &reader->IWMPacketSize2_iface; - if (IsEqualIID(iid, &IID_IWMReader)) return &reader->IWMReader_iface; @@ -1462,7 +1395,6 @@ HRESULT WINAPI winegstreamer_create_wm_async_reader(IWMReader **reader) wm_reader_init(&object->reader, &async_reader_ops); object->IReferenceClock_iface.lpVtbl = &ReferenceClockVtbl; - object->IWMPacketSize2_iface.lpVtbl = &WMPacketSize2Vtbl; object->IWMReader_iface.lpVtbl = &WMReaderVtbl; object->IWMReaderAdvanced6_iface.lpVtbl = &WMReaderAdvanced6Vtbl; object->IWMReaderAccelerator_iface.lpVtbl = &WMReaderAcceleratorVtbl; diff --git a/dlls/winegstreamer/wm_reader.c b/dlls/winegstreamer/wm_reader.c index b72ff98cd18..edf8f227308 100644 --- a/dlls/winegstreamer/wm_reader.c +++ b/dlls/winegstreamer/wm_reader.c @@ -41,6 +41,11 @@ static HRESULT WINAPI profile_QueryInterface(IWMProfile3 *iface, REFIID iid, voi { *out = &reader->IWMLanguageList_iface; } + else if (IsEqualIID(iid, &IID_IWMPacketSize) + || IsEqualIID(iid, &IID_IWMPacketSize2)) + { + *out = &reader->IWMPacketSize2_iface; + } else if (IsEqualIID(iid, &IID_IUnknown) || IsEqualIID(iid, &IID_IWMProfile) || IsEqualIID(iid, &IID_IWMProfile2) @@ -572,10 +577,72 @@ static const IWMLanguageListVtbl language_list_vtbl = language_list_AddLanguageByRFC1766String, }; +static struct wm_reader *impl_from_IWMPacketSize2(IWMPacketSize2 *iface) +{ + return CONTAINING_RECORD(iface, struct wm_reader, IWMPacketSize2_iface); +} + +static HRESULT WINAPI packet_size_QueryInterface(IWMPacketSize2 *iface, REFIID iid, void **out) +{ + struct wm_reader *reader = impl_from_IWMPacketSize2(iface); + + return IWMProfile3_QueryInterface(&reader->IWMProfile3_iface, iid, out); +} + +static ULONG WINAPI packet_size_AddRef(IWMPacketSize2 *iface) +{ + struct wm_reader *reader = impl_from_IWMPacketSize2(iface); + + return IWMProfile3_AddRef(&reader->IWMProfile3_iface); +} + +static ULONG WINAPI packet_size_Release(IWMPacketSize2 *iface) +{ + struct wm_reader *reader = impl_from_IWMPacketSize2(iface); + + return IWMProfile3_Release(&reader->IWMProfile3_iface); +} + +static HRESULT WINAPI packet_size_GetMaxPacketSize(IWMPacketSize2 *iface, DWORD *size) +{ + FIXME("iface %p, size %p, stub!\n", iface, size); + return E_NOTIMPL; +} + +static HRESULT WINAPI packet_size_SetMaxPacketSize(IWMPacketSize2 *iface, DWORD size) +{ + FIXME("iface %p, size %u, stub!\n", iface, size); + return E_NOTIMPL; +} + +static HRESULT WINAPI packet_size_GetMinPacketSize(IWMPacketSize2 *iface, DWORD *size) +{ + FIXME("iface %p, size %p, stub!\n", iface, size); + return E_NOTIMPL; +} + +static HRESULT WINAPI packet_size_SetMinPacketSize(IWMPacketSize2 *iface, DWORD size) +{ + FIXME("iface %p, size %u, stub!\n", iface, size); + return E_NOTIMPL; +} + +static const IWMPacketSize2Vtbl packet_size_vtbl = +{ + packet_size_QueryInterface, + packet_size_AddRef, + packet_size_Release, + packet_size_GetMaxPacketSize, + packet_size_SetMaxPacketSize, + packet_size_GetMinPacketSize, + packet_size_SetMinPacketSize, +}; + void wm_reader_init(struct wm_reader *reader, const struct wm_reader_ops *ops) { reader->IWMHeaderInfo3_iface.lpVtbl = &header_info_vtbl; reader->IWMLanguageList_iface.lpVtbl = &language_list_vtbl; + reader->IWMPacketSize2_iface.lpVtbl = &packet_size_vtbl; reader->IWMProfile3_iface.lpVtbl = &profile_vtbl; reader->refcount = 1; reader->ops = ops; diff --git a/dlls/wmvcore/tests/wmvcore.c b/dlls/wmvcore/tests/wmvcore.c index 9f9c5ed393f..0662c035617 100644 --- a/dlls/wmvcore/tests/wmvcore.c +++ b/dlls/wmvcore/tests/wmvcore.c @@ -148,8 +148,8 @@ static void test_wmsyncreader_interfaces(void) check_interface(reader, &IID_IWMHeaderInfo2, TRUE); check_interface(reader, &IID_IWMHeaderInfo3, TRUE); check_interface(reader, &IID_IWMLanguageList, TRUE); - todo_wine check_interface(reader, &IID_IWMPacketSize, TRUE); - todo_wine check_interface(reader, &IID_IWMPacketSize2, TRUE); + check_interface(reader, &IID_IWMPacketSize, TRUE); + check_interface(reader, &IID_IWMPacketSize2, TRUE); check_interface(reader, &IID_IWMProfile, TRUE); check_interface(reader, &IID_IWMProfile2, TRUE); check_interface(reader, &IID_IWMProfile3, TRUE); -- 2.33.0

1 2

[PATCH] user32: Fix event queue congestion can cause WINPOS_WindowFromPoint is null.
by Chao Long Oct. 21, 2021

Oct. 21, 2021

Signed-off-by: Chao Long <longchao(a)uniontech.com> --- dlls/user32/input.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index b4e3579f5e8..b19fadbf195 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -1815,7 +1815,7 @@ TrackMouseEvent (TRACKMOUSEEVENT *ptme) tracking_info.tme.dwHoverTime = 0; } - if (ptme->hwndTrack == hwnd) + if (ptme->hwndTrack == hwnd || (ptme->dwFlags & TME_LEAVE && hittest==HTNOWHERE)) { /* Adding new mouse event to the tracking list */ tracking_info.tme = *ptme; -- 2.20.1

2 1

[PATCH 2/2] uxtheme: Check LoadedBefore registry key before loading theme.
by Zhiyi Zhang Oct. 21, 2021

Oct. 21, 2021

Only save unthemed system metrics to the registry when the LoadedBefore registry key value is '0'. This avoids saving themed system metrics when two processes are trying to activate theming at the same time. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/system.c | 37 +++++++++++++++++++++++++------------ dlls/uxtheme/uxthemedll.h | 4 ++++ 2 files changed, 29 insertions(+), 12 deletions(-) diff --git a/dlls/uxtheme/system.c b/dlls/uxtheme/system.c index d9eedf6543b..0298fe61d4a 100644 --- a/dlls/uxtheme/system.c +++ b/dlls/uxtheme/system.c @@ -185,7 +185,7 @@ static void UXTHEME_LoadTheme(void) lstrcpynW(szCurrentColor, pt->pszSelectedColor, ARRAY_SIZE(szCurrentColor)); lstrcpynW(szCurrentSize, pt->pszSelectedSize, ARRAY_SIZE(szCurrentSize)); - MSSTYLES_SetActiveTheme(pt, FALSE); + UXTHEME_SetActiveTheme(pt); TRACE("Theme active: %s %s %s\n", debugstr_w(szCurrentTheme), debugstr_w(szCurrentColor), debugstr_w(szCurrentSize)); MSSTYLES_CloseThemeFile(pt); @@ -419,27 +419,38 @@ static void UXTHEME_SaveSystemMetrics(struct system_metrics *metrics, BOOL send_ * * Change the current active theme */ -static HRESULT UXTHEME_SetActiveTheme(PTHEME_FILE tf) +HRESULT UXTHEME_SetActiveTheme(PTHEME_FILE tf) { + BOOL ret, loaded_before = FALSE; struct system_metrics metrics; + DWORD size; HKEY hKey; WCHAR tmp[2]; HRESULT hr; - if (tf && !bThemeActive) - { - if (UXTHEME_GetSystemMetrics(&metrics)) - UXTHEME_SaveUnthemedSystemMetrics(&metrics); - } - - hr = MSSTYLES_SetActiveTheme(tf, TRUE); - if(FAILED(hr)) - return hr; if(tf) { bThemeActive = TRUE; lstrcpynW(szCurrentTheme, tf->szThemeFile, ARRAY_SIZE(szCurrentTheme)); lstrcpynW(szCurrentColor, tf->pszSelectedColor, ARRAY_SIZE(szCurrentColor)); lstrcpynW(szCurrentSize, tf->pszSelectedSize, ARRAY_SIZE(szCurrentSize)); + + ret = UXTHEME_GetSystemMetrics(&metrics); + + /* Check if theming is already active */ + if (!RegOpenKeyW(HKEY_CURRENT_USER, szThemeManager, &hKey)) + { + size = sizeof(tmp); + if (!RegQueryValueExW(hKey, L"LoadedBefore", NULL, NULL, (BYTE *)tmp, &size)) + loaded_before = (tmp[0] != '0'); + else + WARN("Failed to get LoadedBefore: %d\n", GetLastError()); + RegCloseKey(hKey); + } + if (loaded_before) + return MSSTYLES_SetActiveTheme(tf, FALSE); + + if (ret) + UXTHEME_SaveUnthemedSystemMetrics(&metrics); } else { bThemeActive = FALSE; @@ -460,18 +471,20 @@ static HRESULT UXTHEME_SetActiveTheme(PTHEME_FILE tf) (lstrlenW(szCurrentSize)+1)*sizeof(WCHAR)); RegSetValueExW(hKey, L"DllName", 0, REG_SZ, (const BYTE*)szCurrentTheme, (lstrlenW(szCurrentTheme)+1)*sizeof(WCHAR)); + RegSetValueExW(hKey, L"LoadedBefore", 0, REG_SZ, (const BYTE *)tmp, sizeof(WCHAR) * 2); } else { RegDeleteValueW(hKey, L"ColorName"); RegDeleteValueW(hKey, L"SizeName"); RegDeleteValueW(hKey, L"DllName"); - + RegDeleteValueW(hKey, L"LoadedBefore"); } RegCloseKey(hKey); } else TRACE("Failed to open theme registry key\n"); + hr = MSSTYLES_SetActiveTheme(tf, TRUE); if (bThemeActive) { if (UXTHEME_GetSystemMetrics(&metrics)) diff --git a/dlls/uxtheme/uxthemedll.h b/dlls/uxtheme/uxthemedll.h index 4b8f95764d6..67130774392 100644 --- a/dlls/uxtheme/uxthemedll.h +++ b/dlls/uxtheme/uxthemedll.h @@ -21,7 +21,10 @@ #ifndef __WINE_UXTHEMEDLL_H #define __WINE_UXTHEMEDLL_H +#include <wingdi.h> #include <winuser.h> +#include <uxtheme.h> +#include <msstyles.h> typedef HANDLE HTHEMEFILE; @@ -99,6 +102,7 @@ BOOL WINAPI ThemeHooksInstall(void) DECLSPEC_HIDDEN; BOOL WINAPI ThemeHooksRemove(void) DECLSPEC_HIDDEN; extern void UXTHEME_InitSystem(HINSTANCE hInst) DECLSPEC_HIDDEN; +extern HRESULT UXTHEME_SetActiveTheme(PTHEME_FILE tf) DECLSPEC_HIDDEN; extern void UXTHEME_UninitSystem(void) DECLSPEC_HIDDEN; extern struct user_api_hook user_api DECLSPEC_HIDDEN; -- 2.32.0

1 0

[PATCH 1/2] uxtheme: Save temporary system metrics to a struct in memory.
by Zhiyi Zhang Oct. 21, 2021

Oct. 21, 2021

So that temporary system metrics are not saved in the registry. Saving them to the registry creates a race condition when two processes are trying to activate theming at the same time, one process might save themed system metrics instead of unthemed system metrics to the registry. The race condition will be more apparent when initializing a wine prefix after theming is turned on by default in wine.inf. This patch refactors the system metric helper functions to use an in-memory struct and is a prerequisite to remove the race condition. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/system.c | 344 ++++++++++++++++++++---------------------- 1 file changed, 161 insertions(+), 183 deletions(-) diff --git a/dlls/uxtheme/system.c b/dlls/uxtheme/system.c index 628bd9bfdc4..d9eedf6543b 100644 --- a/dlls/uxtheme/system.c +++ b/dlls/uxtheme/system.c @@ -236,217 +236,182 @@ static const WCHAR * const SysColorsNames[] = static const WCHAR strColorKey[] = L"Control Panel\\Colors"; -static const struct BackupSysParam -{ - int spiGet, spiSet; - const WCHAR* keyName; -} backupSysParams[] = -{ - {SPI_GETFLATMENU, SPI_SETFLATMENU, L"FlatMenu"}, - {SPI_GETGRADIENTCAPTIONS, SPI_SETGRADIENTCAPTIONS, L"GradientCaption"}, - {-1, -1, 0} -}; - #define NUM_SYS_COLORS (COLOR_MENUBAR+1) -static void save_sys_colors (HKEY baseKey) +struct system_metrics { - WCHAR colorStr[13]; - HKEY hKey; - int i, length; + COLORREF system_colors[NUM_SYS_COLORS]; + NONCLIENTMETRICSW non_client_metrics; + LOGFONTW icon_title_font; + DWORD gradient_caption; + DWORD flat_menu; +}; - if (RegCreateKeyExW( baseKey, strColorKey, - 0, 0, 0, KEY_ALL_ACCESS, - 0, &hKey, 0 ) == ERROR_SUCCESS) - { - for (i = 0; i < NUM_SYS_COLORS; i++) - { - COLORREF col = GetSysColor (i); - - length = swprintf(colorStr, ARRAY_SIZE(colorStr), L"%d %d %d", GetRValue(col), - GetGValue(col), GetBValue(col)); - RegSetValueExW(hKey, SysColorsNames[i], 0, REG_SZ, (BYTE *)colorStr, - (length + 1) * sizeof(WCHAR)); - } - RegCloseKey (hKey); - } -} - -/* Before activating a theme, query current system colors, certain settings - * and backup them in the registry, so they can be restored when the theme - * is deactivated */ -static void UXTHEME_BackupSystemMetrics(void) +static BOOL UXTHEME_GetSystemMetrics(struct system_metrics *metrics) { DPI_AWARENESS_CONTEXT old_context; - HKEY hKey; - const struct BackupSysParam* bsp = backupSysParams; + BOOL ret = FALSE; + int i; + + for (i = 0; i < NUM_SYS_COLORS; ++i) + metrics->system_colors[i] = GetSysColor(i); old_context = SetThreadDpiAwarenessContext(DPI_AWARENESS_CONTEXT_UNAWARE); - if (RegCreateKeyExW( HKEY_CURRENT_USER, szThemeManager, - 0, 0, 0, KEY_ALL_ACCESS, - 0, &hKey, 0) == ERROR_SUCCESS) - { - NONCLIENTMETRICSW ncm; - LOGFONTW iconTitleFont; - - /* back up colors */ - save_sys_colors (hKey); - - /* back up "other" settings */ - while (bsp->spiGet >= 0) - { - DWORD value; - - SystemParametersInfoW (bsp->spiGet, 0, &value, 0); - RegSetValueExW (hKey, bsp->keyName, 0, REG_DWORD, - (LPBYTE)&value, sizeof (value)); - - bsp++; - } - - /* back up non-client metrics */ - memset (&ncm, 0, sizeof (ncm)); - ncm.cbSize = sizeof (ncm); - SystemParametersInfoW (SPI_GETNONCLIENTMETRICS, sizeof (ncm), &ncm, 0); - RegSetValueExW (hKey, L"NonClientMetrics", 0, REG_BINARY, (BYTE*)&ncm, - sizeof (ncm)); - memset (&iconTitleFont, 0, sizeof (iconTitleFont)); - SystemParametersInfoW (SPI_GETICONTITLELOGFONT, sizeof (iconTitleFont), - &iconTitleFont, 0); - RegSetValueExW (hKey, L"IconTitleFont", 0, REG_BINARY, - (LPBYTE)&iconTitleFont, sizeof (iconTitleFont)); - - RegCloseKey (hKey); - } + memset(&metrics->non_client_metrics, 0, sizeof(metrics->non_client_metrics)); + metrics->non_client_metrics.cbSize = sizeof(metrics->non_client_metrics); + if (!SystemParametersInfoW(SPI_GETNONCLIENTMETRICS, sizeof(metrics->non_client_metrics), + &metrics->non_client_metrics, 0)) + goto done; + memset(&metrics->icon_title_font, 0, sizeof(metrics->icon_title_font)); + if (!SystemParametersInfoW(SPI_GETICONTITLELOGFONT, sizeof(metrics->icon_title_font), + &metrics->icon_title_font, 0)) + goto done; + if (!SystemParametersInfoW(SPI_GETGRADIENTCAPTIONS, 0, &metrics->gradient_caption, 0)) + goto done; + if (!SystemParametersInfoW(SPI_GETFLATMENU, 0, &metrics->flat_menu, 0)) + goto done; + ret = TRUE; +done: SetThreadDpiAwarenessContext(old_context); + return ret; } /* Read back old settings after a theme was deactivated */ -static void UXTHEME_RestoreSystemMetrics(void) +static BOOL UXTHEME_GetUnthemedSystemMetrics(struct system_metrics *metrics) { - DPI_AWARENESS_CONTEXT old_context; - HKEY hKey; - const struct BackupSysParam* bsp = backupSysParams; + HKEY theme_manager_key = NULL, color_key = NULL; + BOOL ret = FALSE; + WCHAR string[13]; + int i, r, g, b; + DWORD size; - old_context = SetThreadDpiAwarenessContext(DPI_AWARENESS_CONTEXT_UNAWARE); + if (RegOpenKeyExW(HKEY_CURRENT_USER, szThemeManager, 0, KEY_QUERY_VALUE, &theme_manager_key)) + goto done; - if (RegOpenKeyExW (HKEY_CURRENT_USER, szThemeManager, - 0, KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS) + if (RegOpenKeyExW(theme_manager_key, strColorKey, 0, KEY_QUERY_VALUE, &color_key)) + goto done; + + for (i = 0; i < NUM_SYS_COLORS; ++i) { - HKEY colorKey; - - /* read backed-up colors */ - if (RegOpenKeyExW (hKey, strColorKey, - 0, KEY_QUERY_VALUE, &colorKey) == ERROR_SUCCESS) - { - int i; - COLORREF sysCols[NUM_SYS_COLORS]; - int sysColsIndices[NUM_SYS_COLORS]; - int sysColCount = 0; - - for (i = 0; i < NUM_SYS_COLORS; i++) - { - DWORD type; - WCHAR colorStr[13]; - DWORD count = sizeof(colorStr); + size = sizeof(string); + if (RegQueryValueExW(color_key, SysColorsNames[i], 0, NULL, (BYTE *)string, &size)) + goto done; - if (RegQueryValueExW(colorKey, SysColorsNames[i], 0, &type, (LPBYTE)colorStr, - &count) == ERROR_SUCCESS) - { - int r, g, b; - if (swscanf(colorStr, L"%d %d %d", &r, &g, &b) == 3) - { - sysColsIndices[sysColCount] = i; - sysCols[sysColCount] = RGB(r, g, b); - sysColCount++; - } - } - } - RegCloseKey (colorKey); - - SetSysColors (sysColCount, sysColsIndices, sysCols); - } - - /* read backed-up other settings */ - while (bsp->spiGet >= 0) - { - DWORD value; - DWORD count = sizeof(value); - DWORD type; - - if (RegQueryValueExW (hKey, bsp->keyName, 0, - &type, (LPBYTE)&value, &count) == ERROR_SUCCESS) - { - SystemParametersInfoW (bsp->spiSet, 0, UlongToPtr(value), SPIF_UPDATEINIFILE); - } - - bsp++; - } - - /* read backed-up non-client metrics */ - { - NONCLIENTMETRICSW ncm; - LOGFONTW iconTitleFont; - DWORD count = sizeof(ncm); - DWORD type; + if (swscanf(string, L"%d %d %d", &r, &g, &b) != 3) + goto done; - if (RegQueryValueExW (hKey, L"NonClientMetrics", 0, - &type, (LPBYTE)&ncm, &count) == ERROR_SUCCESS) - { - SystemParametersInfoW (SPI_SETNONCLIENTMETRICS, - count, &ncm, SPIF_UPDATEINIFILE); - } - - count = sizeof(iconTitleFont); - - if (RegQueryValueExW (hKey, L"IconTitleFont", 0, - &type, (LPBYTE)&iconTitleFont, &count) == ERROR_SUCCESS) - { - SystemParametersInfoW (SPI_SETICONTITLELOGFONT, - count, &iconTitleFont, SPIF_UPDATEINIFILE); - } - } - - RegCloseKey (hKey); + metrics->system_colors[i] = RGB(r, g, b); } - SetThreadDpiAwarenessContext(old_context); + size = sizeof(metrics->non_client_metrics); + if (RegQueryValueExW(theme_manager_key, L"NonClientMetrics", 0, NULL, + (BYTE *)&metrics->non_client_metrics, &size)) + goto done; + size = sizeof(metrics->icon_title_font); + if (RegQueryValueExW(theme_manager_key, L"IconTitleFont", 0, NULL, + (BYTE *)&metrics->icon_title_font, &size)) + goto done; + size = sizeof(metrics->gradient_caption); + if (RegQueryValueExW(theme_manager_key, L"GradientCaption", 0, NULL, + (BYTE *)&metrics->gradient_caption, &size)) + goto done; + size = sizeof(metrics->flat_menu); + if (RegQueryValueExW(theme_manager_key, L"FlatMenu", 0, NULL, (BYTE *)&metrics->flat_menu, + &size)) + goto done; + + ret = TRUE; +done: + RegCloseKey(color_key); + RegCloseKey(theme_manager_key); + return ret; +} + +static void UXTHEME_SaveUnthemedSystemMetrics(struct system_metrics *metrics) +{ + HKEY theme_manager_key, color_key; + WCHAR string[13]; + DWORD length; + int i; + + if (!RegCreateKeyExW(HKEY_CURRENT_USER, szThemeManager, 0, 0, 0, KEY_ALL_ACCESS, 0, + &theme_manager_key, 0)) + { + if (!RegCreateKeyExW(theme_manager_key, strColorKey, 0, 0, 0, KEY_ALL_ACCESS, 0, &color_key, + 0)) + { + for (i = 0; i < NUM_SYS_COLORS; ++i) + { + length = swprintf(string, ARRAY_SIZE(string), L"%d %d %d", + GetRValue(metrics->system_colors[i]), + GetGValue(metrics->system_colors[i]), + GetBValue(metrics->system_colors[i])); + RegSetValueExW(color_key, SysColorsNames[i], 0, REG_SZ, (BYTE *)string, + (length + 1) * sizeof(WCHAR)); + } + + RegCloseKey(color_key); + } + + RegSetValueExW(theme_manager_key, L"NonClientMetrics", 0, REG_BINARY, + (BYTE *)&metrics->non_client_metrics, sizeof(metrics->non_client_metrics)); + RegSetValueExW(theme_manager_key, L"IconTitleFont", 0, REG_BINARY, + (BYTE *)&metrics->icon_title_font, sizeof(metrics->icon_title_font)); + RegSetValueExW(theme_manager_key, L"GradientCaption", 0, REG_DWORD, + (BYTE *)&metrics->gradient_caption, sizeof(metrics->gradient_caption)); + RegSetValueExW(theme_manager_key, L"FlatMenu", 0, REG_DWORD, (BYTE *)&metrics->flat_menu, + sizeof(metrics->flat_menu)); + RegCloseKey(theme_manager_key); + } } /* Make system settings persistent, so they're in effect even w/o uxtheme * loaded. * For efficiency reasons, only the last SystemParametersInfoW sets * SPIF_SENDWININICHANGE */ -static void UXTHEME_SaveSystemMetrics(void) +static void UXTHEME_SaveSystemMetrics(struct system_metrics *metrics, BOOL send_syscolor_change) { - const struct BackupSysParam* bsp = backupSysParams; - NONCLIENTMETRICSW ncm; - LOGFONTW iconTitleFont; + int i, length, index[NUM_SYS_COLORS]; + DPI_AWARENESS_CONTEXT old_context; + WCHAR string[13]; + HKEY hkey; - save_sys_colors (HKEY_CURRENT_USER); - - while (bsp->spiGet >= 0) + if (!RegCreateKeyExW(HKEY_CURRENT_USER, strColorKey, 0, 0, 0, KEY_ALL_ACCESS, 0, &hkey, 0)) { - DWORD value; - - SystemParametersInfoW (bsp->spiGet, 0, &value, 0); - SystemParametersInfoW (bsp->spiSet, 0, UlongToPtr(value), SPIF_UPDATEINIFILE); - bsp++; + for (i = 0; i < NUM_SYS_COLORS; ++i) + { + length = swprintf(string, ARRAY_SIZE(string), L"%d %d %d", + GetRValue(metrics->system_colors[i]), + GetGValue(metrics->system_colors[i]), + GetBValue(metrics->system_colors[i])); + RegSetValueExW(hkey, SysColorsNames[i], 0, REG_SZ, (BYTE *)string, + (length + 1) * sizeof(WCHAR)); + } + RegCloseKey(hkey); } - - memset (&ncm, 0, sizeof (ncm)); - ncm.cbSize = sizeof (ncm); - SystemParametersInfoW (SPI_GETNONCLIENTMETRICS, sizeof (ncm), &ncm, 0); - SystemParametersInfoW (SPI_SETNONCLIENTMETRICS, sizeof (ncm), &ncm, - SPIF_UPDATEINIFILE); - memset (&iconTitleFont, 0, sizeof (iconTitleFont)); - SystemParametersInfoW (SPI_GETICONTITLELOGFONT, sizeof (iconTitleFont), - &iconTitleFont, 0); - SystemParametersInfoW (SPI_SETICONTITLELOGFONT, sizeof (iconTitleFont), - &iconTitleFont, SPIF_UPDATEINIFILE | SPIF_SENDCHANGE); + if (send_syscolor_change) + { + for (i = 0; i < NUM_SYS_COLORS; ++i) + index[i] = i; + + SetSysColors(NUM_SYS_COLORS, index, metrics->system_colors); + } + + old_context = SetThreadDpiAwarenessContext(DPI_AWARENESS_CONTEXT_UNAWARE); + + SystemParametersInfoW(SPI_SETNONCLIENTMETRICS, sizeof(metrics->non_client_metrics), + &metrics->non_client_metrics, SPIF_UPDATEINIFILE); + SystemParametersInfoW(SPI_SETICONTITLELOGFONT, sizeof(metrics->icon_title_font), + &metrics->icon_title_font, SPIF_UPDATEINIFILE); + SystemParametersInfoW(SPI_SETGRADIENTCAPTIONS, 0, (void *)(INT_PTR)metrics->gradient_caption, + SPIF_UPDATEINIFILE); + SystemParametersInfoW(SPI_SETFLATMENU, 0, (void *)(INT_PTR)metrics->flat_menu, + SPIF_UPDATEINIFILE | SPIF_SENDCHANGE); + + SetThreadDpiAwarenessContext(old_context); } /*********************************************************************** @@ -456,11 +421,17 @@ static void UXTHEME_SaveSystemMetrics(void) */ static HRESULT UXTHEME_SetActiveTheme(PTHEME_FILE tf) { + struct system_metrics metrics; HKEY hKey; WCHAR tmp[2]; HRESULT hr; - if(tf && !bThemeActive) UXTHEME_BackupSystemMetrics(); + if (tf && !bThemeActive) + { + if (UXTHEME_GetSystemMetrics(&metrics)) + UXTHEME_SaveUnthemedSystemMetrics(&metrics); + } + hr = MSSTYLES_SetActiveTheme(tf, TRUE); if(FAILED(hr)) return hr; @@ -471,7 +442,6 @@ static HRESULT UXTHEME_SetActiveTheme(PTHEME_FILE tf) lstrcpynW(szCurrentSize, tf->pszSelectedSize, ARRAY_SIZE(szCurrentSize)); } else { - UXTHEME_RestoreSystemMetrics(); bThemeActive = FALSE; szCurrentTheme[0] = '\0'; szCurrentColor[0] = '\0'; @@ -501,9 +471,17 @@ static HRESULT UXTHEME_SetActiveTheme(PTHEME_FILE tf) } else TRACE("Failed to open theme registry key\n"); - - UXTHEME_SaveSystemMetrics (); - + + if (bThemeActive) + { + if (UXTHEME_GetSystemMetrics(&metrics)) + UXTHEME_SaveSystemMetrics(&metrics, FALSE); + } + else + { + if (UXTHEME_GetUnthemedSystemMetrics(&metrics)) + UXTHEME_SaveSystemMetrics(&metrics, TRUE); + } return hr; } -- 2.32.0

1 0

[PATCH] ntdll: Fix size comparison in NtQuerySystemInformation(SystemCodeIntegrityInformation).
by Paul Gofman Oct. 20, 2021

Oct. 20, 2021

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/ntdll/unix/system.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index 82c9f0da492..9d518719942 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -3061,7 +3061,7 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, len = sizeof(SYSTEM_CODEINTEGRITY_INFORMATION); - if (size < len) + if (size >= len) integrity_info->CodeIntegrityOptions = CODEINTEGRITY_OPTION_ENABLED; else ret = STATUS_INFO_LENGTH_MISMATCH; -- 2.31.1

1 0

[PATCH] gdiplus: Switch to STRETCH_HALFTONE mode before playing a blit record.
by Huw Davies Oct. 20, 2021

Oct. 20, 2021

This is done even if the emf contains a previous EMR_SETSTRETCHBLTMODE record. Thanks to Sebastián Aedo for some of the testing. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdiplus/metafile.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index d79c939218c..1b4bba18048 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -2486,6 +2486,9 @@ GpStatus WINGDIPAPI GdipPlayMetafileRecord(GDIPCONST GpMetafile *metafile, record->nSize = dataSize + 8; memcpy(record->dParm, data, dataSize); + if (record->iType == EMR_BITBLT || record->iType == EMR_STRETCHBLT) + SetStretchBltMode(metafile->playback_dc, STRETCH_HALFTONE); + if(PlayEnhMetaFileRecord(metafile->playback_dc, metafile->handle_table, record, metafile->handle_count) == 0) ERR("PlayEnhMetaFileRecord failed\n"); -- 2.23.0

2 1