April 2022 - Wine-commits - list.winehq.org

Zebediah Figura : user32: Query CursorBlinkRate from the registry.
by Alexandre Julliard 26 Apr '22

26 Apr '22

Module: wine Branch: master Commit: 535682cd79251c921121b0c87857a1f77cc27607 URL: https://source.winehq.org/git/wine.git/?a=commit;h=535682cd79251c921121b0c8… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Apr 26 16:06:03 2022 +0100 user32: Query CursorBlinkRate from the registry. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/caret.c | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/dlls/user32/caret.c b/dlls/user32/caret.c index bdc7780bf8f..7b21e03c764 100644 --- a/dlls/user32/caret.c +++ b/dlls/user32/caret.c @@ -96,6 +96,24 @@ void CDECL toggle_caret( HWND hwnd ) } +static unsigned int get_caret_registry_timeout(void) +{ + unsigned int ret = 500; + WCHAR value[11]; + DWORD size; + HKEY key; + + if (RegOpenKeyExW( HKEY_CURRENT_USER, L"Control Panel\\Desktop", 0, KEY_READ, &key )) + return ret; + + size = sizeof(value); + if (!RegQueryValueExW( key, L"CursorBlinkRate", NULL, NULL, (BYTE *)value, &size )) + ret = wcstoul( value, NULL, 10 ); + RegCloseKey( key ); + return ret; +} + + /***************************************************************** * CreateCaret (USER32.@) */ @@ -185,7 +203,8 @@ BOOL WINAPI CreateCaret( HWND hwnd, HBITMAP bitmap, INT width, INT height ) if (Caret.hBmp) DeleteObject( Caret.hBmp ); Caret.hBmp = hBmp; - Caret.timeout = GetProfileIntA( "windows", "CursorBlinkRate", 500 ); + + Caret.timeout = get_caret_registry_timeout(); return TRUE; }

1 0

Zebediah Figura : win32u: Move caret APIs from user32.
by Alexandre Julliard 26 Apr '22

26 Apr '22

Module: wine Branch: master Commit: b8732c80b112af388264ac84d726aad09d93c8c6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b8732c80b112af388264ac84… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Apr 26 16:06:04 2022 +0100 win32u: Move caret APIs from user32. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/caret.c | 371 +---------------------------------------- dlls/user32/edit.c | 8 +- dlls/user32/menu.c | 4 +- dlls/user32/painting.c | 4 +- dlls/user32/scroll.c | 20 +-- dlls/user32/user32.spec | 10 +- dlls/user32/user_main.c | 4 - dlls/user32/user_private.h | 1 - dlls/win32u/dce.c | 4 +- dlls/win32u/gdiobj.c | 3 + dlls/win32u/input.c | 384 +++++++++++++++++++++++++++++++++++++++++++ dlls/win32u/message.c | 3 +- dlls/win32u/ntuser_private.h | 4 - dlls/win32u/syscall.c | 2 + dlls/win32u/sysparams.c | 9 + dlls/win32u/win32u.spec | 10 +- dlls/win32u/win32u_private.h | 7 + dlls/win32u/window.c | 13 +- dlls/win32u/wrappers.c | 18 ++ dlls/wow64win/syscall.h | 2 + dlls/wow64win/user.c | 12 ++ include/ntuser.h | 23 +++ 22 files changed, 500 insertions(+), 416 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b8732c80b112af388264…

1 0

Zebediah Figura : user32: Merge caret.c into input.c.
by Alexandre Julliard 26 Apr '22

26 Apr '22

Module: wine Branch: master Commit: ba8024bfcdb26d4a7eb8dc1ad53a3424d13df7e2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ba8024bfcdb26d4a7eb8dc1a… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Apr 26 16:06:05 2022 +0100 user32: Merge caret.c into input.c. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/Makefile.in | 1 - dlls/user32/caret.c | 58 ------------------------------------------------- dlls/user32/input.c | 27 +++++++++++++++++++++++ 3 files changed, 27 insertions(+), 59 deletions(-) diff --git a/dlls/user32/Makefile.in b/dlls/user32/Makefile.in index dd83ecec5cf..92d5c1ec1d9 100644 --- a/dlls/user32/Makefile.in +++ b/dlls/user32/Makefile.in @@ -7,7 +7,6 @@ DELAYIMPORTS = hid setupapi imm32 C_SRCS = \ button.c \ - caret.c \ class.c \ clipboard.c \ combo.c \ diff --git a/dlls/user32/caret.c b/dlls/user32/caret.c deleted file mode 100644 index 9e0ff5ca48c..00000000000 --- a/dlls/user32/caret.c +++ /dev/null @@ -1,58 +0,0 @@ -/* - * Caret functions - * - * Copyright 1993 David Metcalfe - * Copyright 1996 Frans van Dorsselaer - * Copyright 2001 Eric Pouech - * Copyright 2002 Alexandre Julliard - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "ntuser.h" -#include "user_private.h" -#include "wine/server.h" -#include "wine/debug.h" - -/***************************************************************** - * DestroyCaret (USER32.@) - */ -BOOL WINAPI DestroyCaret(void) -{ - return NtUserDestroyCaret(); -} - - -/***************************************************************** - * SetCaretPos (USER32.@) - */ -BOOL WINAPI SetCaretPos( INT x, INT y ) -{ - return NtUserSetCaretPos( x, y ); -} - - -/***************************************************************** - * SetCaretBlinkTime (USER32.@) - */ -BOOL WINAPI SetCaretBlinkTime( unsigned int time ) -{ - return NtUserSetCaretBlinkTime( time ); -} diff --git a/dlls/user32/input.c b/dlls/user32/input.c index dcb46df22b5..06756b5551e 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -162,6 +162,33 @@ HWND WINAPI GetCapture(void) } +/***************************************************************** + * DestroyCaret (USER32.@) + */ +BOOL WINAPI DestroyCaret(void) +{ + return NtUserDestroyCaret(); +} + + +/***************************************************************** + * SetCaretPos (USER32.@) + */ +BOOL WINAPI SetCaretPos( int x, int y ) +{ + return NtUserSetCaretPos( x, y ); +} + + +/***************************************************************** + * SetCaretBlinkTime (USER32.@) + */ +BOOL WINAPI SetCaretBlinkTime( unsigned int time ) +{ + return NtUserSetCaretBlinkTime( time ); +} + + /*********************************************************************** * GetInputState (USER32.@) */

1 0

Jacek Caban : win32u: Introduce data-only mode in NtUserGetClipboardData.
by Alexandre Julliard 26 Apr '22

26 Apr '22

Module: wine Branch: master Commit: 286471a307792dc6662043ce36438a285cb506a4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=286471a307792dc6662043ce… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 26 16:06:06 2022 +0100 win32u: Introduce data-only mode in NtUserGetClipboardData. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/win32u/clipboard.c | 19 +++++++++++++++---- include/ntuser.h | 1 + 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/win32u/clipboard.c b/dlls/win32u/clipboard.c index 63306702b1c..67bdd0ba391 100644 --- a/dlls/win32u/clipboard.c +++ b/dlls/win32u/clipboard.c @@ -631,7 +631,7 @@ done: */ HANDLE WINAPI NtUserGetClipboardData( UINT format, struct get_clipboard_params *params ) { - struct cached_format *cache; + struct cached_format *cache = NULL; NTSTATUS status; UINT from, data_seqno; size_t size; @@ -642,7 +642,7 @@ HANDLE WINAPI NtUserGetClipboardData( UINT format, struct get_clipboard_params * { pthread_mutex_lock( &clipboard_mutex ); - cache = get_cached_format( format ); + if (!params->data_only) cache = get_cached_format( format ); SERVER_START_REQ( get_clipboard_data ) { @@ -662,6 +662,8 @@ HANDLE WINAPI NtUserGetClipboardData( UINT format, struct get_clipboard_params * } SERVER_END_REQ; + params->size = size; + if (!status && size) { if (cache) @@ -679,8 +681,18 @@ HANDLE WINAPI NtUserGetClipboardData( UINT format, struct get_clipboard_params * list_add_tail( &formats_to_free, &cache->entry ); } + if (params->data_only) + { + pthread_mutex_unlock( &clipboard_mutex ); + return params->data; + } + /* allocate new cache entry */ - if (!(cache = malloc( sizeof(*cache) ))) return 0; + if (!(cache = malloc( sizeof(*cache) ))) + { + pthread_mutex_unlock( &clipboard_mutex ); + return 0; + } cache->format = format; cache->seqno = data_seqno; @@ -690,7 +702,6 @@ HANDLE WINAPI NtUserGetClipboardData( UINT format, struct get_clipboard_params * pthread_mutex_unlock( &clipboard_mutex ); TRACE( "%s needs unmarshaling\n", debugstr_format( format ) ); params->data_size = ~0; - params->size = size; return 0; } pthread_mutex_unlock( &clipboard_mutex ); diff --git a/include/ntuser.h b/include/ntuser.h index f49c9bc7723..cad90b91882 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -257,6 +257,7 @@ struct get_clipboard_params size_t size; size_t data_size; UINT seqno; + BOOL data_only; }; /* NtUserSetClipboardData params, not compatible with Windows */

1 0

Connor McAdams : oleacc/tests: Add tests for IIS_IsOleaccProxy service on default accessible objects.
by Alexandre Julliard 26 Apr '22

26 Apr '22

Module: wine Branch: master Commit: e75ceba11a62ae226d2530cad610c120df4303ac URL: https://source.winehq.org/git/wine.git/?a=commit;h=e75ceba11a62ae226d2530ca… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Mon Apr 25 15:08:00 2022 -0400 oleacc/tests: Add tests for IIS_IsOleaccProxy service on default accessible objects. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleacc/tests/main.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/dlls/oleacc/tests/main.c b/dlls/oleacc/tests/main.c index 5522867b085..ba7ac3cc3ac 100644 --- a/dlls/oleacc/tests/main.c +++ b/dlls/oleacc/tests/main.c @@ -27,6 +27,7 @@ #include <ole2.h> #include <commctrl.h> #include <oleacc.h> +#include <servprov.h> #define DEFINE_EXPECT(func) \ static BOOL expect_ ## func = FALSE, called_ ## func = FALSE @@ -1409,6 +1410,32 @@ static LRESULT WINAPI test_query_class(HWND hwnd, UINT msg, WPARAM wparam, LPARA return 0; } +#define check_acc_proxy_service( acc ) \ + check_acc_proxy_service_( (acc), __LINE__) +static void check_acc_proxy_service_(IAccessible *acc, int line) +{ + IServiceProvider *service = NULL; + IUnknown *unk = NULL; + HRESULT hr; + + hr = IAccessible_QueryInterface(acc, &IID_IServiceProvider, (void **)&service); + todo_wine ok(hr == S_OK, "got %#lx\n", hr); + if (SUCCEEDED(hr)) + { + hr = IServiceProvider_QueryService(service, &IIS_IsOleaccProxy, &IID_IUnknown, (void **)&unk); + ok(hr == S_OK, "got %#lx\n", hr); + ok(!!unk, "unk == NULL\n"); + ok(iface_cmp(unk, (IUnknown*)acc), "unk != acc\n"); + IUnknown_Release(unk); + + unk = (IUnknown*)0xdeadbeef; + hr = IServiceProvider_QueryService(service, &IID_IUnknown, &IID_IUnknown, (void **)&unk); + ok(hr == E_INVALIDARG, "got %#lx\n", hr); + ok(!unk, "unk != NULL\n"); + IServiceProvider_Release(service); + } +} + static void test_CreateStdAccessibleObject_classes(void) { static const struct { @@ -1463,6 +1490,7 @@ static void test_CreateStdAccessibleObject_classes(void) ok(hr == S_OK, "CreateStdAccessibleObject failed %lx\n", hr); if (tests[i].client) CHECK_CALLED(winproc_GETOBJECT); + check_acc_proxy_service(acc); IAccessible_Release(acc); if (tests[i].window) @@ -1471,6 +1499,7 @@ static void test_CreateStdAccessibleObject_classes(void) ok(hr == S_OK, "CreateStdAccessibleObject failed %lx\n", hr); if (tests[i].window) CHECK_CALLED(winproc_GETOBJECT); + check_acc_proxy_service(acc); IAccessible_Release(acc); SetWindowLongPtrW(hwnd, GWLP_WNDPROC, (LONG_PTR)win_proc);

1 0

Connor McAdams : oleacc: Add IServiceProvider interface to default accessible objects.
by Alexandre Julliard 26 Apr '22

26 Apr '22

Module: wine Branch: master Commit: 46a2f3e42fbabdb2cb0b5da20698b4a7390108a1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=46a2f3e42fbabdb2cb0b5da2… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Mon Apr 25 15:08:01 2022 -0400 oleacc: Add IServiceProvider interface to default accessible objects. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleacc/client.c | 48 ++++++++++++++++++++++++++++++++++++++++++++ dlls/oleacc/oleacc_private.h | 1 + dlls/oleacc/tests/main.c | 26 +++++++++++------------- dlls/oleacc/window.c | 48 ++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 109 insertions(+), 14 deletions(-) diff --git a/dlls/oleacc/client.c b/dlls/oleacc/client.c index 20993109d28..8a8fd3d240d 100644 --- a/dlls/oleacc/client.c +++ b/dlls/oleacc/client.c @@ -32,6 +32,7 @@ typedef struct { IAccessible IAccessible_iface; IOleWindow IOleWindow_iface; IEnumVARIANT IEnumVARIANT_iface; + IServiceProvider IServiceProvider_iface; LONG ref; @@ -114,6 +115,8 @@ static HRESULT WINAPI Client_QueryInterface(IAccessible *iface, REFIID riid, voi *ppv = &This->IOleWindow_iface; }else if(IsEqualIID(riid, &IID_IEnumVARIANT)) { *ppv = &This->IEnumVARIANT_iface; + }else if(IsEqualIID(riid, &IID_IServiceProvider)) { + *ppv = &This->IServiceProvider_iface; }else { WARN("no interface: %s\n", debugstr_guid(riid)); *ppv = NULL; @@ -703,6 +706,50 @@ static const IEnumVARIANTVtbl ClientEnumVARIANTVtbl = { Client_EnumVARIANT_Clone }; +static inline Client* impl_from_Client_ServiceProvider(IServiceProvider *iface) +{ + return CONTAINING_RECORD(iface, Client, IServiceProvider_iface); +} + +static HRESULT WINAPI Client_ServiceProvider_QueryInterface(IServiceProvider *iface, REFIID riid, void **ppv) +{ + Client *This = impl_from_Client_ServiceProvider(iface); + return IAccessible_QueryInterface(&This->IAccessible_iface, riid, ppv); +} + +static ULONG WINAPI Client_ServiceProvider_AddRef(IServiceProvider *iface) +{ + Client *This = impl_from_Client_ServiceProvider(iface); + return IAccessible_AddRef(&This->IAccessible_iface); +} + +static ULONG WINAPI Client_ServiceProvider_Release(IServiceProvider *iface) +{ + Client *This = impl_from_Client_ServiceProvider(iface); + return IAccessible_Release(&This->IAccessible_iface); +} + +static HRESULT WINAPI Client_ServiceProvider_QueryService(IServiceProvider *iface, REFGUID guid_service, + REFIID riid, void **ppv) +{ + Client *This = impl_from_Client_ServiceProvider(iface); + + TRACE("(%p)->(%s %s %p)\n", This, debugstr_guid(guid_service), debugstr_guid(riid), ppv); + + *ppv = NULL; + if (IsEqualIID(guid_service, &IIS_IsOleaccProxy)) + return IAccessible_QueryInterface(&This->IAccessible_iface, riid, ppv); + + return E_INVALIDARG; +} + +static const IServiceProviderVtbl ClientServiceProviderVtbl = { + Client_ServiceProvider_QueryInterface, + Client_ServiceProvider_AddRef, + Client_ServiceProvider_Release, + Client_ServiceProvider_QueryService +}; + static void edit_init(Client *client) { client->role = ROLE_SYSTEM_TEXT; @@ -872,6 +919,7 @@ HRESULT create_client_object(HWND hwnd, const IID *iid, void **obj) client->IAccessible_iface.lpVtbl = &ClientVtbl; client->IOleWindow_iface.lpVtbl = &ClientOleWindowVtbl; client->IEnumVARIANT_iface.lpVtbl = &ClientEnumVARIANTVtbl; + client->IServiceProvider_iface.lpVtbl = &ClientServiceProviderVtbl; client->ref = 1; client->hwnd = hwnd; client->enum_pos = 0; diff --git a/dlls/oleacc/oleacc_private.h b/dlls/oleacc/oleacc_private.h index a01fc3615fe..c91b1465a79 100644 --- a/dlls/oleacc/oleacc_private.h +++ b/dlls/oleacc/oleacc_private.h @@ -17,6 +17,7 @@ */ #include "oleacc_classes.h" +#include "servprov.h" struct win_class_data { const WCHAR *name; diff --git a/dlls/oleacc/tests/main.c b/dlls/oleacc/tests/main.c index ba7ac3cc3ac..7854764ec08 100644 --- a/dlls/oleacc/tests/main.c +++ b/dlls/oleacc/tests/main.c @@ -1419,21 +1419,19 @@ static void check_acc_proxy_service_(IAccessible *acc, int line) HRESULT hr; hr = IAccessible_QueryInterface(acc, &IID_IServiceProvider, (void **)&service); - todo_wine ok(hr == S_OK, "got %#lx\n", hr); - if (SUCCEEDED(hr)) - { - hr = IServiceProvider_QueryService(service, &IIS_IsOleaccProxy, &IID_IUnknown, (void **)&unk); - ok(hr == S_OK, "got %#lx\n", hr); - ok(!!unk, "unk == NULL\n"); - ok(iface_cmp(unk, (IUnknown*)acc), "unk != acc\n"); - IUnknown_Release(unk); + ok(hr == S_OK, "got %#lx\n", hr); - unk = (IUnknown*)0xdeadbeef; - hr = IServiceProvider_QueryService(service, &IID_IUnknown, &IID_IUnknown, (void **)&unk); - ok(hr == E_INVALIDARG, "got %#lx\n", hr); - ok(!unk, "unk != NULL\n"); - IServiceProvider_Release(service); - } + hr = IServiceProvider_QueryService(service, &IIS_IsOleaccProxy, &IID_IUnknown, (void **)&unk); + ok(hr == S_OK, "got %#lx\n", hr); + ok(!!unk, "unk == NULL\n"); + ok(iface_cmp(unk, (IUnknown*)acc), "unk != acc\n"); + IUnknown_Release(unk); + + unk = (IUnknown*)0xdeadbeef; + hr = IServiceProvider_QueryService(service, &IID_IUnknown, &IID_IUnknown, (void **)&unk); + ok(hr == E_INVALIDARG, "got %#lx\n", hr); + ok(!unk, "unk != NULL\n"); + IServiceProvider_Release(service); } static void test_CreateStdAccessibleObject_classes(void) diff --git a/dlls/oleacc/window.c b/dlls/oleacc/window.c index 470bfd5b362..6a7aa3d0318 100644 --- a/dlls/oleacc/window.c +++ b/dlls/oleacc/window.c @@ -30,6 +30,7 @@ typedef struct { IAccessible IAccessible_iface; IOleWindow IOleWindow_iface; IEnumVARIANT IEnumVARIANT_iface; + IServiceProvider IServiceProvider_iface; LONG ref; @@ -55,6 +56,8 @@ static HRESULT WINAPI Window_QueryInterface(IAccessible *iface, REFIID riid, voi *ppv = &This->IOleWindow_iface; }else if(IsEqualIID(riid, &IID_IEnumVARIANT)) { *ppv = &This->IEnumVARIANT_iface; + }else if(IsEqualIID(riid, &IID_IServiceProvider)) { + *ppv = &This->IServiceProvider_iface; }else { WARN("no interface: %s\n", debugstr_guid(riid)); *ppv = NULL; @@ -444,6 +447,50 @@ static const IEnumVARIANTVtbl WindowEnumVARIANTVtbl = { Window_EnumVARIANT_Clone }; +static inline Window* impl_from_Window_ServiceProvider(IServiceProvider *iface) +{ + return CONTAINING_RECORD(iface, Window, IServiceProvider_iface); +} + +static HRESULT WINAPI Window_ServiceProvider_QueryInterface(IServiceProvider *iface, REFIID riid, void **ppv) +{ + Window *This = impl_from_Window_ServiceProvider(iface); + return IAccessible_QueryInterface(&This->IAccessible_iface, riid, ppv); +} + +static ULONG WINAPI Window_ServiceProvider_AddRef(IServiceProvider *iface) +{ + Window *This = impl_from_Window_ServiceProvider(iface); + return IAccessible_AddRef(&This->IAccessible_iface); +} + +static ULONG WINAPI Window_ServiceProvider_Release(IServiceProvider *iface) +{ + Window *This = impl_from_Window_ServiceProvider(iface); + return IAccessible_Release(&This->IAccessible_iface); +} + +static HRESULT WINAPI Window_ServiceProvider_QueryService(IServiceProvider *iface, REFGUID guid_service, + REFIID riid, void **ppv) +{ + Window *This = impl_from_Window_ServiceProvider(iface); + + TRACE("(%p)->(%s %s %p)\n", This, debugstr_guid(guid_service), debugstr_guid(riid), ppv); + + *ppv = NULL; + if (IsEqualIID(guid_service, &IIS_IsOleaccProxy)) + return IAccessible_QueryInterface(&This->IAccessible_iface, riid, ppv); + + return E_INVALIDARG; +} + +static const IServiceProviderVtbl WindowServiceProviderVtbl = { + Window_ServiceProvider_QueryInterface, + Window_ServiceProvider_AddRef, + Window_ServiceProvider_Release, + Window_ServiceProvider_QueryService +}; + static const struct win_class_data classes[] = { {WC_LISTBOXW, 0x10000, TRUE}, {L"#32768", 0x10001, TRUE}, /* menu */ @@ -467,6 +514,7 @@ HRESULT create_window_object(HWND hwnd, const IID *iid, void **obj) window->IAccessible_iface.lpVtbl = &WindowVtbl; window->IOleWindow_iface.lpVtbl = &WindowOleWindowVtbl; window->IEnumVARIANT_iface.lpVtbl = &WindowEnumVARIANTVtbl; + window->IServiceProvider_iface.lpVtbl = &WindowServiceProviderVtbl; window->ref = 1; window->hwnd = hwnd;

1 0

Nikolay Sivov : dwrite: Implement CreateTextFormat() for IDWriteFactory6.
by Alexandre Julliard 26 Apr '22

26 Apr '22

Module: wine Branch: master Commit: cecf7d55a951c593ba35840bfe0fbc5afcbbc3df URL: https://source.winehq.org/git/wine.git/?a=commit;h=cecf7d55a951c593ba35840b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 26 09:15:25 2022 +0300 dwrite: Implement CreateTextFormat() for IDWriteFactory6. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 5 +++-- dlls/dwrite/format.c | 13 ++++++++----- dlls/dwrite/main.c | 34 ++++++++++++++++++++++++++++------ dlls/dwrite/tests/layout.c | 5 +---- 4 files changed, 40 insertions(+), 17 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index fdc916adc40..944f4cab635 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -286,8 +286,9 @@ struct dwrite_fontface }; extern HRESULT create_numbersubstitution(DWRITE_NUMBER_SUBSTITUTION_METHOD,const WCHAR *locale,BOOL,IDWriteNumberSubstitution**) DECLSPEC_HIDDEN; -extern HRESULT create_textformat(const WCHAR*,IDWriteFontCollection*,DWRITE_FONT_WEIGHT,DWRITE_FONT_STYLE,DWRITE_FONT_STRETCH, - FLOAT,const WCHAR*,IDWriteTextFormat**) DECLSPEC_HIDDEN; +extern HRESULT create_text_format(const WCHAR *family_name, IDWriteFontCollection *collection, DWRITE_FONT_WEIGHT weight, + DWRITE_FONT_STYLE style, DWRITE_FONT_STRETCH stretch, float size, const WCHAR *locale, REFIID riid, + void **out) DECLSPEC_HIDDEN; extern HRESULT create_textlayout(const struct textlayout_desc*,IDWriteTextLayout**) DECLSPEC_HIDDEN; extern HRESULT create_trimmingsign(IDWriteFactory7 *factory, IDWriteTextFormat *format, IDWriteInlineObject **sign) DECLSPEC_HIDDEN; diff --git a/dlls/dwrite/format.c b/dlls/dwrite/format.c index 133ca87e97f..dd120fe032e 100644 --- a/dlls/dwrite/format.c +++ b/dlls/dwrite/format.c @@ -711,12 +711,14 @@ struct dwrite_textformat *unsafe_impl_from_IDWriteTextFormat(IDWriteTextFormat * CONTAINING_RECORD(iface, struct dwrite_textformat, IDWriteTextFormat3_iface) : NULL; } -HRESULT create_textformat(const WCHAR *family_name, IDWriteFontCollection *collection, DWRITE_FONT_WEIGHT weight, - DWRITE_FONT_STYLE style, DWRITE_FONT_STRETCH stretch, float size, const WCHAR *locale, IDWriteTextFormat **format) +HRESULT create_text_format(const WCHAR *family_name, IDWriteFontCollection *collection, DWRITE_FONT_WEIGHT weight, + DWRITE_FONT_STYLE style, DWRITE_FONT_STRETCH stretch, float size, const WCHAR *locale, + REFIID riid, void **out) { struct dwrite_textformat *object; + HRESULT hr; - *format = NULL; + *out = NULL; if (size <= 0.0f) return E_INVALIDARG; @@ -746,9 +748,10 @@ HRESULT create_textformat(const WCHAR *family_name, IDWriteFontCollection *colle object->format.collection = collection; IDWriteFontCollection_AddRef(object->format.collection); - *format = (IDWriteTextFormat *)&object->IDWriteTextFormat3_iface; + hr = IDWriteTextFormat3_QueryInterface(&object->IDWriteTextFormat3_iface, riid, out); + IDWriteTextFormat3_Release(&object->IDWriteTextFormat3_iface); - return S_OK; + return hr; } static HRESULT WINAPI dwritetrimmingsign_QueryInterface(IDWriteInlineObject *iface, REFIID riid, void **obj) diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index 01b47e673bb..c869ec3df54 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -1199,7 +1199,8 @@ static HRESULT WINAPI dwritefactory_CreateTextFormat(IDWriteFactory7 *iface, WCH return hr; } - hr = create_textformat(family_name, collection, weight, style, stretch, size, locale, format); + hr = create_text_format(family_name, collection, weight, style, stretch, size, locale, + &IID_IDWriteTextFormat, (void **)format); IDWriteFontCollection_Release(collection); return hr; } @@ -1895,14 +1896,35 @@ static HRESULT WINAPI dwritefactory6_CreateFontSetBuilder(IDWriteFactory7 *iface return create_fontset_builder(iface, builder); } -static HRESULT WINAPI dwritefactory6_CreateTextFormat(IDWriteFactory7 *iface, const WCHAR *familyname, +static HRESULT WINAPI dwritefactory6_CreateTextFormat(IDWriteFactory7 *iface, const WCHAR *family_name, IDWriteFontCollection *collection, DWRITE_FONT_AXIS_VALUE const *axis_values, UINT32 num_axis, - FLOAT fontsize, const WCHAR *localename, IDWriteTextFormat3 **format) + float size, const WCHAR *locale, IDWriteTextFormat3 **format) { - FIXME("%p, %s, %p, %p, %u, %.8e, %s, %p.\n", iface, debugstr_w(familyname), collection, axis_values, num_axis, - fontsize, debugstr_w(localename), format); + struct dwritefactory *factory = impl_from_IDWriteFactory7(iface); + HRESULT hr; - return E_NOTIMPL; + TRACE("%p, %s, %p, %p, %u, %.8e, %s, %p.\n", iface, debugstr_w(family_name), collection, axis_values, num_axis, + size, debugstr_w(locale), format); + + *format = NULL; + + if (axis_values) + FIXME("Axis values are ignored.\n"); + + if (collection) + { + IDWriteFontCollection_AddRef(collection); + } + else if (FAILED(hr = factory_get_system_collection(factory, DWRITE_FONT_FAMILY_MODEL_TYPOGRAPHIC, + &IID_IDWriteFontCollection, (void **)&collection))) + { + return hr; + } + + hr = create_text_format(family_name, collection, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, + DWRITE_FONT_STRETCH_NORMAL, size, locale, &IID_IDWriteTextFormat3, (void **)format); + IDWriteFontCollection_Release(collection); + return hr; } static HRESULT WINAPI dwritefactory7_GetSystemFontSet(IDWriteFactory7 *iface, BOOL include_downloadable, diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 43b6efa107b..24ec3be7585 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -5986,11 +5986,8 @@ static void test_text_format_axes(void) } hr = IDWriteFactory6_CreateTextFormat(factory, L"test_family", NULL, NULL, 0, 10.0f, L"en-us", &format3); - todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); -if (SUCCEEDED(hr)) -{ hr = IDWriteTextFormat3_GetFontCollection(format3, &collection); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); @@ -6025,7 +6022,7 @@ if (SUCCEEDED(hr)) ok(weight == DWRITE_FONT_WEIGHT_NORMAL, "Unexpected font weight %d.\n", weight); IDWriteTextFormat3_Release(format3); -} + hr = IDWriteFactory_CreateTextFormat((IDWriteFactory *)factory, L"test_family", NULL, DWRITE_FONT_WEIGHT_BOLD, DWRITE_FONT_STYLE_ITALIC, DWRITE_FONT_STRETCH_EXPANDED, 10.0f, L"en-us", &format);

1 0

Nikolay Sivov : include: Fix IDWriteFontResource definition.
by Alexandre Julliard 26 Apr '22

26 Apr '22

Module: wine Branch: master Commit: 075730925af01cec1a7a0fb9f4e5596180cfe095 URL: https://source.winehq.org/git/wine.git/?a=commit;h=075730925af01cec1a7a0fb9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 26 09:15:26 2022 +0300 include: Fix IDWriteFontResource definition. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 4 ++-- include/dwrite_3.idl | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 385c7fdeb03..ff95d3e57d9 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -7431,7 +7431,7 @@ static UINT32 WINAPI dwritefontresource_GetFontAxisCount(IDWriteFontResource *if } static HRESULT WINAPI dwritefontresource_GetDefaultFontAxisValues(IDWriteFontResource *iface, - DWRITE_FONT_AXIS_VALUE const *values, UINT32 num_values) + DWRITE_FONT_AXIS_VALUE *values, UINT32 num_values) { FIXME("%p, %p, %u.\n", iface, values, num_values); @@ -7439,7 +7439,7 @@ static HRESULT WINAPI dwritefontresource_GetDefaultFontAxisValues(IDWriteFontRes } static HRESULT WINAPI dwritefontresource_GetFontAxisRanges(IDWriteFontResource *iface, - DWRITE_FONT_AXIS_RANGE const *ranges, UINT32 num_ranges) + DWRITE_FONT_AXIS_RANGE *ranges, UINT32 num_ranges) { FIXME("%p, %p, %u.\n", iface, ranges, num_ranges); diff --git a/include/dwrite_3.idl b/include/dwrite_3.idl index 3542fbc8f1d..845754f6e3f 100644 --- a/include/dwrite_3.idl +++ b/include/dwrite_3.idl @@ -219,10 +219,10 @@ interface IDWriteFontResource : IUnknown UINT32 GetFontFaceIndex(); UINT32 GetFontAxisCount(); HRESULT GetDefaultFontAxisValues( - DWRITE_FONT_AXIS_VALUE const *values, + DWRITE_FONT_AXIS_VALUE *values, UINT32 num_values); HRESULT GetFontAxisRanges( - DWRITE_FONT_AXIS_RANGE const *ranges, + DWRITE_FONT_AXIS_RANGE *ranges, UINT32 num_ranges); DWRITE_FONT_AXIS_ATTRIBUTES GetFontAxisAttributes( UINT32 axis);

1 0

Nikolay Sivov : dwrite: Implement variation axis value methods for the resource object.
by Alexandre Julliard 26 Apr '22

26 Apr '22

Module: wine Branch: master Commit: 2c408860aeef16f7cd4dbe8eb72a52387414a8a9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2c408860aeef16f7cd4dbe8e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 26 09:15:27 2022 +0300 dwrite: Implement variation axis value methods for the resource object. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 15 +++- dlls/dwrite/font.c | 74 +++++++++++++++--- dlls/dwrite/opentype.c | 174 ++++++++++++++++++++++++++++++++++++------- 3 files changed, 225 insertions(+), 38 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2c408860aeef16f7cd4d…

1 0

Nikolay Sivov : dwrite/opentype: Use stdint types for layout table structures.
by Alexandre Julliard 26 Apr '22

26 Apr '22

Module: wine Branch: master Commit: e1270c99fe8ff776415369b3864e3c77bb389842 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e1270c99fe8ff776415369b3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 26 09:15:28 2022 +0300 dwrite/opentype: Use stdint types for layout table structures. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 318 +++++++++++++++++++++++++------------------------ 1 file changed, 160 insertions(+), 158 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e1270c99fe8ff7764153…

1 0