wine-devel May 2022

wine-devel@winehq.org

77 participants
705 discussions

[PATCH] uiautomationcore: Fix header compatibility with C++
by Philip Allison 14 May '22

14 May '22

Rename arguments to UiaRaiseAutomationPropertyChangedEvent to avoid conflicts with reserved words when included from C++ applications. Signed-off-by: Philip Allison <mangobrain(a)gmail.com> --- dlls/uiautomationcore/uia_main.c | 4 ++-- include/uiautomationcoreapi.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/uiautomationcore/uia_main.c b/dlls/uiautomationcore/uia_main.c index 9f257684333..4b0fb545c51 100644 --- a/dlls/uiautomationcore/uia_main.c +++ b/dlls/uiautomationcore/uia_main.c @@ -328,9 +328,9 @@ HRESULT WINAPI UiaRaiseAutomationEvent(IRawElementProviderSimple *provider, EVEN /*********************************************************************** * UiaRaiseAutomationPropertyChangedEvent (uiautomationcore.@) */ -HRESULT WINAPI UiaRaiseAutomationPropertyChangedEvent(IRawElementProviderSimple *provider, PROPERTYID id, VARIANT old, VARIANT new) +HRESULT WINAPI UiaRaiseAutomationPropertyChangedEvent(IRawElementProviderSimple *provider, PROPERTYID id, VARIANT oldValue, VARIANT newValue) { - FIXME("(%p, %d, %s, %s): stub\n", provider, id, debugstr_variant(&old), debugstr_variant(&new)); + FIXME("(%p, %d, %s, %s): stub\n", provider, id, debugstr_variant(&oldValue), debugstr_variant(&newValue)); return S_OK; } diff --git a/include/uiautomationcoreapi.h b/include/uiautomationcoreapi.h index 22b3888dc6e..cc44501e1a0 100644 --- a/include/uiautomationcoreapi.h +++ b/include/uiautomationcoreapi.h @@ -69,7 +69,7 @@ HRESULT WINAPI UiaGetReservedNotSupportedValue(IUnknown **value); int WINAPI UiaLookupId(enum AutomationIdentifierType type, const GUID *guid); BOOL WINAPI UiaPatternRelease(HUIAPATTERNOBJECT hobj); HRESULT WINAPI UiaRaiseAutomationEvent(IRawElementProviderSimple *provider, EVENTID id); -HRESULT WINAPI UiaRaiseAutomationPropertyChangedEvent(IRawElementProviderSimple *provider, PROPERTYID id, VARIANT old, VARIANT new); +HRESULT WINAPI UiaRaiseAutomationPropertyChangedEvent(IRawElementProviderSimple *provider, PROPERTYID id, VARIANT oldValue, VARIANT newValue); void WINAPI UiaRegisterProviderCallback(UiaProviderCallback *pCallback); LRESULT WINAPI UiaReturnRawElementProvider(HWND hwnd, WPARAM wParam, LPARAM lParam, IRawElementProviderSimple *elprov); BOOL WINAPI UiaTextRangeRelease(HUIATEXTRANGE hobj); -- 2.32.0

2 2

[PATCH 1/3] include: Add defines for D2D1_PROPERTY_BINDING.
by Ziqing Hui 14 May '22

14 May '22

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- include/d2d1effectauthor.idl | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/include/d2d1effectauthor.idl b/include/d2d1effectauthor.idl index b53aa515e85..a58ec35b4b5 100644 --- a/include/d2d1effectauthor.idl +++ b/include/d2d1effectauthor.idl @@ -18,6 +18,12 @@ import "d2d1_1.idl"; +typedef HRESULT (__stdcall *PD2D1_PROPERTY_SET_FUNCTION)(IUnknown *effect, + const BYTE *data, UINT32 data_size); + +typedef HRESULT (__stdcall *PD2D1_PROPERTY_GET_FUNCTION)(const IUnknown *effect, + BYTE *data, UINT32 data_size, UINT32 *actual_size); + typedef enum D2D1_FILTER { D2D1_FILTER_MIN_MAG_MIP_POINT = 0x00, @@ -39,6 +45,13 @@ typedef enum D2D1_FEATURE D2D1_FEATURE_FORCE_DWORD = 0xffffffff } D2D1_FEATURE; +typedef struct D2D1_PROPERTY_BINDING +{ + const WCHAR *propertyName; + PD2D1_PROPERTY_SET_FUNCTION setFunction; + PD2D1_PROPERTY_GET_FUNCTION getFunction; +} D2D1_PROPERTY_BINDING; + typedef enum D2D1_CHANNEL_DEPTH { D2D1_CHANNEL_DEPTH_DEFAULT = 0x0, -- 2.25.1

5 7

[PATCH] msi/tests: Fix an intermittent test failure.
by Hans Leidekker 14 May '22

14 May '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52993 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msi/tests/action.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index 224637eb286..e5c862e206c 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -3690,9 +3690,10 @@ static void test_publish(void) LONG res; HKEY uninstall, prodkey, uninstall_32node = NULL; INSTALLSTATE state; - char date[MAX_PATH], temp[MAX_PATH], prodcode[] = "{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}"; + char date[MAX_PATH], date2[MAX_PATH], temp[MAX_PATH], buf[MAX_PATH]; + const char prodcode[] = "{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}"; REGSAM access = KEY_ALL_ACCESS; - DWORD error; + DWORD error, type, size; if (!pMsiQueryFeatureStateExA) { @@ -4216,7 +4217,15 @@ static void test_publish(void) CHECK_REG_STR(prodkey, "DisplayName", "MSITEST"); CHECK_REG_STR(prodkey, "DisplayVersion", "1.1.1"); - CHECK_REG_STR(prodkey, "InstallDate", date); + + get_date_str(date2); + size = ARRAY_SIZE(buf); + buf[0] = '\0'; + res = RegQueryValueExA(prodkey, "InstallDate", NULL, &type, (BYTE *)buf, &size); + ok(!res, "Failed to query value, error %ld\n", res); + ok(type == REG_SZ, "Got wrong type %lu\n", type); + ok(!strcmp(buf, date) || !strcmp(buf, date2), "got %s\n", debugstr_a(buf)); + CHECK_REG_STR(prodkey, "InstallSource", temp); CHECK_REG_ISTR(prodkey, "ModifyPath", "MsiExec.exe /X{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}"); CHECK_REG_STR(prodkey, "Publisher", "Wine"); -- 2.30.2

1 0

[PATCH v4 0/5] MR34: windows.media.speech: Changes for IAsyncAction.
by Bernhard Kölbl (＠besentv) 14 May '22

14 May '22

Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> -- v4: windows.media.speech: Rename async_operation to async_inspectable. windows.media.speech/tests: Add a test for IAsyncOperation_get_Completed. windows.media.speech/tests: Remove some unreliable ref checks. windows.media.speech/tests: Make the IAsyncInfo_Close block test more consistent. https://gitlab.winehq.org/wine/wine/-/merge_requests/34

3 6

[PATCH] d3d11: Implement CreateBlendState1 and GetDesc1.
by James McDonnell 14 May '22

14 May '22

Signed-off-by: James McDonnell <topgamer7(a)gmail.com> --- dlls/d3d11/d3d11_private.h | 6 ++-- dlls/d3d11/device.c | 40 ++++++++++++++++++++++---- dlls/d3d11/state.c | 58 ++++++++++++++++++++++++++++---------- 3 files changed, 80 insertions(+), 24 deletions(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index efe26551258..b8faf457870 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -411,7 +411,7 @@ HRESULT d3d11_class_linkage_create(struct d3d_device *device, /* ID3D11BlendState, ID3D10BlendState1 */ struct d3d_blend_state { - ID3D11BlendState ID3D11BlendState_iface; + ID3D11BlendState1 ID3D11BlendState1_iface; ID3D10BlendState1 ID3D10BlendState1_iface; LONG refcount; @@ -422,9 +422,9 @@ struct d3d_blend_state ID3D11Device2 *device; }; -static inline struct d3d_blend_state *impl_from_ID3D11BlendState(ID3D11BlendState *iface) +static inline struct d3d_blend_state *impl_from_ID3D11BlendState(ID3D11BlendState1 *iface) { - return CONTAINING_RECORD(iface, struct d3d_blend_state, ID3D11BlendState_iface); + return CONTAINING_RECORD(iface, struct d3d_blend_state, ID3D11BlendState1_iface); } HRESULT d3d_blend_state_create(struct d3d_device *device, const D3D11_BLEND_DESC *desc, diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index ecf45e9ce33..117620472f5 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -2204,7 +2204,7 @@ static void STDMETHODCALLTYPE d3d11_device_context_OMGetBlendState(ID3D11DeviceC if (wined3d_state) { blend_state_impl = wined3d_blend_state_get_parent(wined3d_state); - ID3D11BlendState_AddRef(*blend_state = &blend_state_impl->ID3D11BlendState_iface); + ID3D11BlendState_AddRef(*blend_state = &blend_state_impl->ID3D11BlendState1_iface); } else *blend_state = NULL; @@ -3644,7 +3644,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateBlendState(ID3D11Device2 *if if (FAILED(hr = d3d_blend_state_create(device, desc, &object))) return hr; - *blend_state = &object->ID3D11BlendState_iface; + *blend_state = &object->ID3D11BlendState1_iface; return S_OK; } @@ -4282,11 +4282,39 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateDeferredContext1(ID3D11Devic } static HRESULT STDMETHODCALLTYPE d3d11_device_CreateBlendState1(ID3D11Device2 *iface, - const D3D11_BLEND_DESC1 *desc, ID3D11BlendState1 **state) + const D3D11_BLEND_DESC1 *desc, ID3D11BlendState1 **blend_state) { - FIXME("iface %p, desc %p, state %p stub!\n", iface, desc, state); + struct d3d_device *device = impl_from_ID3D11Device2(iface); + struct d3d_blend_state *object; + HRESULT hr; + unsigned i, j; + D3D11_BLEND_DESC simple_desc; - return E_NOTIMPL; + TRACE("iface %p, desc %p, blend_state %p.\n", iface, desc, blend_state); + FIXME("Logical operations are not implemented.\n"); + + memset(&simple_desc, 0, sizeof(simple_desc)); + simple_desc.AlphaToCoverageEnable = desc->AlphaToCoverageEnable; + simple_desc.IndependentBlendEnable = desc->IndependentBlendEnable; + for (i = 0; i < D3D11_SIMULTANEOUS_RENDER_TARGET_COUNT; ++i) + { + j = desc->IndependentBlendEnable ? i : 0; + simple_desc.RenderTarget[i].BlendEnable = desc->RenderTarget[j].BlendEnable; + simple_desc.RenderTarget[i].SrcBlend = desc->RenderTarget[j].SrcBlend; + simple_desc.RenderTarget[i].DestBlend = desc->RenderTarget[j].DestBlend; + simple_desc.RenderTarget[i].BlendOp = desc->RenderTarget[j].BlendOp; + simple_desc.RenderTarget[i].SrcBlendAlpha = desc->RenderTarget[j].SrcBlendAlpha; + simple_desc.RenderTarget[i].DestBlendAlpha = desc->RenderTarget[j].DestBlendAlpha; + simple_desc.RenderTarget[i].BlendOpAlpha = desc->RenderTarget[j].BlendOpAlpha; + simple_desc.RenderTarget[i].RenderTargetWriteMask = desc->RenderTarget[j].RenderTargetWriteMask; + } + + if (FAILED(hr = d3d_blend_state_create(device, &simple_desc, &object))) + return hr; + + *blend_state = (ID3D11BlendState1*)&object->ID3D11BlendState1_iface; + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d11_device_CreateRasterizerState1(ID3D11Device2 *iface, @@ -4993,7 +5021,7 @@ static void STDMETHODCALLTYPE d3d10_device_OMSetBlendState(ID3D10Device1 *iface, blend_state_object = unsafe_impl_from_ID3D10BlendState(blend_state); d3d11_device_context_OMSetBlendState(&device->immediate_context.ID3D11DeviceContext1_iface, - blend_state_object ? &blend_state_object->ID3D11BlendState_iface : NULL, blend_factor, sample_mask); + blend_state_object ? &blend_state_object->ID3D11BlendState1_iface : NULL, blend_factor, sample_mask); } static void STDMETHODCALLTYPE d3d10_device_OMSetDepthStencilState(ID3D10Device1 *iface, diff --git a/dlls/d3d11/state.c b/dlls/d3d11/state.c index f67017ff1ef..6c8d8fa611c 100644 --- a/dlls/d3d11/state.c +++ b/dlls/d3d11/state.c @@ -23,7 +23,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d11); /* ID3D11BlendState methods */ -static HRESULT STDMETHODCALLTYPE d3d11_blend_state_QueryInterface(ID3D11BlendState *iface, +static HRESULT STDMETHODCALLTYPE d3d11_blend_state_QueryInterface(ID3D11BlendState1 *iface, REFIID riid, void **object) { struct d3d_blend_state *state = impl_from_ID3D11BlendState(iface); @@ -54,7 +54,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_blend_state_QueryInterface(ID3D11BlendSta return E_NOINTERFACE; } -static ULONG STDMETHODCALLTYPE d3d11_blend_state_AddRef(ID3D11BlendState *iface) +static ULONG STDMETHODCALLTYPE d3d11_blend_state_AddRef(ID3D11BlendState1 *iface) { struct d3d_blend_state *state = impl_from_ID3D11BlendState(iface); ULONG refcount = InterlockedIncrement(&state->refcount); @@ -70,7 +70,7 @@ static ULONG STDMETHODCALLTYPE d3d11_blend_state_AddRef(ID3D11BlendState *iface) return refcount; } -static ULONG STDMETHODCALLTYPE d3d11_blend_state_Release(ID3D11BlendState *iface) +static ULONG STDMETHODCALLTYPE d3d11_blend_state_Release(ID3D11BlendState1 *iface) { struct d3d_blend_state *state = impl_from_ID3D11BlendState(iface); ULONG refcount = InterlockedDecrement(&state->refcount); @@ -87,7 +87,7 @@ static ULONG STDMETHODCALLTYPE d3d11_blend_state_Release(ID3D11BlendState *iface return refcount; } -static void STDMETHODCALLTYPE d3d11_blend_state_GetDevice(ID3D11BlendState *iface, +static void STDMETHODCALLTYPE d3d11_blend_state_GetDevice(ID3D11BlendState1 *iface, ID3D11Device **device) { struct d3d_blend_state *state = impl_from_ID3D11BlendState(iface); @@ -98,7 +98,7 @@ static void STDMETHODCALLTYPE d3d11_blend_state_GetDevice(ID3D11BlendState *ifac ID3D11Device_AddRef(*device); } -static HRESULT STDMETHODCALLTYPE d3d11_blend_state_GetPrivateData(ID3D11BlendState *iface, +static HRESULT STDMETHODCALLTYPE d3d11_blend_state_GetPrivateData(ID3D11BlendState1 *iface, REFGUID guid, UINT *data_size, void *data) { struct d3d_blend_state *state = impl_from_ID3D11BlendState(iface); @@ -108,7 +108,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_blend_state_GetPrivateData(ID3D11BlendSta return d3d_get_private_data(&state->private_store, guid, data_size, data); } -static HRESULT STDMETHODCALLTYPE d3d11_blend_state_SetPrivateData(ID3D11BlendState *iface, +static HRESULT STDMETHODCALLTYPE d3d11_blend_state_SetPrivateData(ID3D11BlendState1 *iface, REFGUID guid, UINT data_size, const void *data) { struct d3d_blend_state *state = impl_from_ID3D11BlendState(iface); @@ -118,7 +118,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_blend_state_SetPrivateData(ID3D11BlendSta return d3d_set_private_data(&state->private_store, guid, data_size, data); } -static HRESULT STDMETHODCALLTYPE d3d11_blend_state_SetPrivateDataInterface(ID3D11BlendState *iface, +static HRESULT STDMETHODCALLTYPE d3d11_blend_state_SetPrivateDataInterface(ID3D11BlendState1 *iface, REFGUID guid, const IUnknown *data) { struct d3d_blend_state *state = impl_from_ID3D11BlendState(iface); @@ -128,7 +128,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_blend_state_SetPrivateDataInterface(ID3D1 return d3d_set_private_data_interface(&state->private_store, guid, data); } -static void STDMETHODCALLTYPE d3d11_blend_state_GetDesc(ID3D11BlendState *iface, D3D11_BLEND_DESC *desc) +static void STDMETHODCALLTYPE d3d11_blend_state_GetDesc(ID3D11BlendState1 *iface, D3D11_BLEND_DESC *desc) { struct d3d_blend_state *state = impl_from_ID3D11BlendState(iface); @@ -137,7 +137,33 @@ static void STDMETHODCALLTYPE d3d11_blend_state_GetDesc(ID3D11BlendState *iface, *desc = state->desc; } -static const struct ID3D11BlendStateVtbl d3d11_blend_state_vtbl = +static void STDMETHODCALLTYPE d3d11_blend_state_GetDesc1(ID3D11BlendState1 *iface, D3D11_BLEND_DESC1 *desc) +{ + struct d3d_blend_state *state = impl_from_ID3D11BlendState(iface); + D3D11_BLEND_DESC1 d3d11_1_desc; + unsigned i; + + TRACE("iface %p, desc %p.\n", iface, desc); + FIXME("LogicOp is not yet supported.\n"); + + d3d11_1_desc.AlphaToCoverageEnable = desc->AlphaToCoverageEnable; + d3d11_1_desc.IndependentBlendEnable = desc->IndependentBlendEnable; + for (i = 0; i < D3D11_SIMULTANEOUS_RENDER_TARGET_COUNT; i++) { + d3d11_1_desc.RenderTarget[i].BlendEnable = desc->RenderTarget[i].BlendEnable; + d3d11_1_desc.RenderTarget[i].SrcBlend = desc->RenderTarget[i].SrcBlend; + d3d11_1_desc.RenderTarget[i].DestBlend = desc->RenderTarget[i].DestBlend; + d3d11_1_desc.RenderTarget[i].BlendOp = desc->RenderTarget[i].BlendOp; + d3d11_1_desc.RenderTarget[i].SrcBlendAlpha = desc->RenderTarget[i].SrcBlendAlpha; + d3d11_1_desc.RenderTarget[i].DestBlendAlpha = desc->RenderTarget[i].DestBlendAlpha; + d3d11_1_desc.RenderTarget[i].BlendOpAlpha = desc->RenderTarget[i].BlendOpAlpha; + d3d11_1_desc.RenderTarget[i].LogicOp = D3D11_LOGIC_OP_CLEAR; + d3d11_1_desc.RenderTarget[i].LogicOpEnable = 0; + d3d11_1_desc.RenderTarget[i].RenderTargetWriteMask = desc->RenderTarget[i].RenderTargetWriteMask; + } + *desc = d3d11_1_desc; +} + +static const struct ID3D11BlendState1Vtbl d3d11_blend_state_vtbl = { /* IUnknown methods */ d3d11_blend_state_QueryInterface, @@ -150,6 +176,8 @@ static const struct ID3D11BlendStateVtbl d3d11_blend_state_vtbl = d3d11_blend_state_SetPrivateDataInterface, /* ID3D11BlendState methods */ d3d11_blend_state_GetDesc, + /* ID3D11BlendState1 methods */ + d3d11_blend_state_GetDesc1, }; /* ID3D10BlendState methods */ @@ -168,7 +196,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_blend_state_QueryInterface(ID3D10BlendSta TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object); - return d3d11_blend_state_QueryInterface(&state->ID3D11BlendState_iface, riid, object); + return d3d11_blend_state_QueryInterface(&state->ID3D11BlendState1_iface, riid, object); } static ULONG STDMETHODCALLTYPE d3d10_blend_state_AddRef(ID3D10BlendState1 *iface) @@ -177,7 +205,7 @@ static ULONG STDMETHODCALLTYPE d3d10_blend_state_AddRef(ID3D10BlendState1 *iface TRACE("iface %p.\n", iface); - return d3d11_blend_state_AddRef(&state->ID3D11BlendState_iface); + return d3d11_blend_state_AddRef(&state->ID3D11BlendState1_iface); } static ULONG STDMETHODCALLTYPE d3d10_blend_state_Release(ID3D10BlendState1 *iface) @@ -186,7 +214,7 @@ static ULONG STDMETHODCALLTYPE d3d10_blend_state_Release(ID3D10BlendState1 *ifac TRACE("iface %p.\n", iface); - return d3d11_blend_state_Release(&state->ID3D11BlendState_iface); + return d3d11_blend_state_Release(&state->ID3D11BlendState1_iface); } /* ID3D10DeviceChild methods */ @@ -366,7 +394,7 @@ HRESULT d3d_blend_state_create(struct d3d_device *device, const D3D11_BLEND_DESC object = WINE_RB_ENTRY_VALUE(entry, struct d3d_blend_state, entry); TRACE("Returning existing blend state %p.\n", object); - ID3D11BlendState_AddRef(&object->ID3D11BlendState_iface); + ID3D11BlendState_AddRef(&object->ID3D11BlendState1_iface); *state = object; wined3d_mutex_unlock(); @@ -379,7 +407,7 @@ HRESULT d3d_blend_state_create(struct d3d_device *device, const D3D11_BLEND_DESC return E_OUTOFMEMORY; } - object->ID3D11BlendState_iface.lpVtbl = &d3d11_blend_state_vtbl; + object->ID3D11BlendState1_iface.lpVtbl = (struct ID3D11BlendState1Vtbl *)&d3d11_blend_state_vtbl; object->ID3D10BlendState1_iface.lpVtbl = &d3d10_blend_state_vtbl; object->refcount = 1; wined3d_private_store_init(&object->private_store); @@ -436,7 +464,7 @@ struct d3d_blend_state *unsafe_impl_from_ID3D11BlendState(ID3D11BlendState *ifac return NULL; assert(iface->lpVtbl == &d3d11_blend_state_vtbl); - return impl_from_ID3D11BlendState(iface); + return impl_from_ID3D11BlendState((ID3D11BlendState1 *)iface); } struct d3d_blend_state *unsafe_impl_from_ID3D10BlendState(ID3D10BlendState *iface) -- 2.35.1

3 3

Re: [PATCH v2 0/2] MR63: Test and fix an out-of-order RECT in RedrawWindow()
by Pedro Perdigão (＠pperdigao) 13 May '22

13 May '22

On Fri May 13 22:57:37 2022 +0000, **** wrote: > Zebediah Figura replied on the mailing list: > ``` > On 5/12/22 07:51, Pedro Perdigão wrote: > > @@ -8186,7 +8187,10 @@ static void check_update_rgn_( int line, HWND > hwnd, HRGN hrgn ) > > ok( ret != ERROR, "GetUpdateRgn failed\n" ); > > if (ret == NULLREGION) > > { > > - ok_(__FILE__,line)( !hrgn, "Update region shouldn't be > empty\n" ); > > + if(todo) > > + todo_wine ok_(__FILE__,line)( !hrgn, "Update region > shouldn't be empty\n" ); > > + else > > + ok_(__FILE__,line)( !hrgn, "Update region shouldn't be > empty\n" ); > > } > > else > > { > This was already committed, but for future reference, there's a > "todo_wine_if()" macro for this. > ``` Ok, thanks. But this changes was removed by commit 1146bde3 -- https://gitlab.winehq.org/wine/wine/-/merge_requests/63#note_864

1 0

[PATCH 0/2] MR63: Test and fix an out-of-order RECT in RedrawWindow()
by Pedro Perdigão (＠pperdigao) 13 May '22

13 May '22

Signed-off-by: Pedro Perdigão <pperdigao(a)codeweavers.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/63

5 6

[PATCH] uiautomationcore: Fix header compatibility with C++
by Philip Allison 13 May '22

13 May '22

Rename arguments to UiaRaiseAutomationPropertyChangedEvent to avoid conflicts with reserved words when included from C++ applications. Signed-off-by: Philip Allison <mangobrain(a)googlemail.com> --- dlls/uiautomationcore/uia_main.c | 4 ++-- include/uiautomationcoreapi.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/uiautomationcore/uia_main.c b/dlls/uiautomationcore/uia_main.c index 9f257684333..4b0fb545c51 100644 --- a/dlls/uiautomationcore/uia_main.c +++ b/dlls/uiautomationcore/uia_main.c @@ -328,9 +328,9 @@ HRESULT WINAPI UiaRaiseAutomationEvent(IRawElementProviderSimple *provider, EVEN /*********************************************************************** * UiaRaiseAutomationPropertyChangedEvent (uiautomationcore.@) */ -HRESULT WINAPI UiaRaiseAutomationPropertyChangedEvent(IRawElementProviderSimple *provider, PROPERTYID id, VARIANT old, VARIANT new) +HRESULT WINAPI UiaRaiseAutomationPropertyChangedEvent(IRawElementProviderSimple *provider, PROPERTYID id, VARIANT oldValue, VARIANT newValue) { - FIXME("(%p, %d, %s, %s): stub\n", provider, id, debugstr_variant(&old), debugstr_variant(&new)); + FIXME("(%p, %d, %s, %s): stub\n", provider, id, debugstr_variant(&oldValue), debugstr_variant(&newValue)); return S_OK; } diff --git a/include/uiautomationcoreapi.h b/include/uiautomationcoreapi.h index 22b3888dc6e..cc44501e1a0 100644 --- a/include/uiautomationcoreapi.h +++ b/include/uiautomationcoreapi.h @@ -69,7 +69,7 @@ HRESULT WINAPI UiaGetReservedNotSupportedValue(IUnknown **value); int WINAPI UiaLookupId(enum AutomationIdentifierType type, const GUID *guid); BOOL WINAPI UiaPatternRelease(HUIAPATTERNOBJECT hobj); HRESULT WINAPI UiaRaiseAutomationEvent(IRawElementProviderSimple *provider, EVENTID id); -HRESULT WINAPI UiaRaiseAutomationPropertyChangedEvent(IRawElementProviderSimple *provider, PROPERTYID id, VARIANT old, VARIANT new); +HRESULT WINAPI UiaRaiseAutomationPropertyChangedEvent(IRawElementProviderSimple *provider, PROPERTYID id, VARIANT oldValue, VARIANT newValue); void WINAPI UiaRegisterProviderCallback(UiaProviderCallback *pCallback); LRESULT WINAPI UiaReturnRawElementProvider(HWND hwnd, WPARAM wParam, LPARAM lParam, IRawElementProviderSimple *elprov); BOOL WINAPI UiaTextRangeRelease(HUIATEXTRANGE hobj); -- 2.32.0

1 0

[PATCH] uiautomationcore: Fix header compatibility with C++
by Philip Allison 13 May '22

13 May '22

Rename arguments to UiaRaiseAutomationPropertyChangedEvent to avoid conflicts with reserved words when included from C++ applications. Signed-off-by: Philip Allison <mangobrain(a)googlemail.com> --- dlls/uiautomationcore/uia_main.c | 4 ++-- include/uiautomationcoreapi.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/uiautomationcore/uia_main.c b/dlls/uiautomationcore/uia_main.c index 9f257684333..4b0fb545c51 100644 --- a/dlls/uiautomationcore/uia_main.c +++ b/dlls/uiautomationcore/uia_main.c @@ -328,9 +328,9 @@ HRESULT WINAPI UiaRaiseAutomationEvent(IRawElementProviderSimple *provider, EVEN /*********************************************************************** * UiaRaiseAutomationPropertyChangedEvent (uiautomationcore.@) */ -HRESULT WINAPI UiaRaiseAutomationPropertyChangedEvent(IRawElementProviderSimple *provider, PROPERTYID id, VARIANT old, VARIANT new) +HRESULT WINAPI UiaRaiseAutomationPropertyChangedEvent(IRawElementProviderSimple *provider, PROPERTYID id, VARIANT oldValue, VARIANT newValue) { - FIXME("(%p, %d, %s, %s): stub\n", provider, id, debugstr_variant(&old), debugstr_variant(&new)); + FIXME("(%p, %d, %s, %s): stub\n", provider, id, debugstr_variant(&oldValue), debugstr_variant(&newValue)); return S_OK; } diff --git a/include/uiautomationcoreapi.h b/include/uiautomationcoreapi.h index 22b3888dc6e..cc44501e1a0 100644 --- a/include/uiautomationcoreapi.h +++ b/include/uiautomationcoreapi.h @@ -69,7 +69,7 @@ HRESULT WINAPI UiaGetReservedNotSupportedValue(IUnknown **value); int WINAPI UiaLookupId(enum AutomationIdentifierType type, const GUID *guid); BOOL WINAPI UiaPatternRelease(HUIAPATTERNOBJECT hobj); HRESULT WINAPI UiaRaiseAutomationEvent(IRawElementProviderSimple *provider, EVENTID id); -HRESULT WINAPI UiaRaiseAutomationPropertyChangedEvent(IRawElementProviderSimple *provider, PROPERTYID id, VARIANT old, VARIANT new); +HRESULT WINAPI UiaRaiseAutomationPropertyChangedEvent(IRawElementProviderSimple *provider, PROPERTYID id, VARIANT oldValue, VARIANT newValue); void WINAPI UiaRegisterProviderCallback(UiaProviderCallback *pCallback); LRESULT WINAPI UiaReturnRawElementProvider(HWND hwnd, WPARAM wParam, LPARAM lParam, IRawElementProviderSimple *elprov); BOOL WINAPI UiaTextRangeRelease(HUIATEXTRANGE hobj); -- 2.35.3

1 0

Re: [PATCH v2 0/5] MR51: Fix handling of dbghelp's basic type - approved
by Alexandre Julliard (＠julliard) 13 May '22

13 May '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/51

1 0

← Newer
1
...
43
44
45
46
47
48
49
...
71
Older →

Jump to page:

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 May 2022