September 2021 - Wine-commits

Connor McAdams : oleacc: Add get_accName function for edit client accessible object.
by Alexandre Julliard 27 Sep '21

27 Sep '21

Module: wine Branch: master Commit: 583caf555d123ad15d96b84ddd42eca4e5896292 URL: https://source.winehq.org/git/wine.git/?a=commit;h=583caf555d123ad15d96b84d… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Mon Sep 27 16:11:05 2021 +0200 oleacc: Add get_accName function for edit client accessible object. 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 | 92 ++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 72 insertions(+), 20 deletions(-) diff --git a/dlls/oleacc/client.c b/dlls/oleacc/client.c index c94be37df0f..032f8867d31 100644 --- a/dlls/oleacc/client.c +++ b/dlls/oleacc/client.c @@ -45,8 +45,30 @@ typedef struct { struct win_class_vtbl { void (*init)(Client*); HRESULT (*get_state)(Client*, VARIANT, VARIANT*); + HRESULT (*get_name)(Client*, VARIANT, BSTR*); }; +static HRESULT win_get_name(HWND hwnd, BSTR *name) +{ + WCHAR buf[1024]; + UINT i, len; + + len = SendMessageW(hwnd, WM_GETTEXT, ARRAY_SIZE(buf), (LPARAM)buf); + if(!len) + return S_FALSE; + + for(i=0; i<len; i++) { + if(buf[i] == '&') { + len--; + memmove(buf+i, buf+i+1, (len-i)*sizeof(WCHAR)); + break; + } + } + + *name = SysAllocStringLen(buf, len); + return *name ? S_OK : E_OUTOFMEMORY; +} + static inline Client* impl_from_Client(IAccessible *iface) { return CONTAINING_RECORD(iface, Client, IAccessible_iface); @@ -166,32 +188,20 @@ static HRESULT WINAPI Client_get_accChild(IAccessible *iface, return E_INVALIDARG; } -static HRESULT WINAPI Client_get_accName(IAccessible *iface, VARIANT varID, BSTR *pszName) +static HRESULT WINAPI Client_get_accName(IAccessible *iface, VARIANT id, BSTR *name) { Client *This = impl_from_Client(iface); - WCHAR name[1024]; - UINT i, len; - - TRACE("(%p)->(%s %p)\n", This, debugstr_variant(&varID), pszName); - *pszName = NULL; - if(convert_child_id(&varID) != CHILDID_SELF || !IsWindow(This->hwnd)) - return E_INVALIDARG; + TRACE("(%p)->(%s %p)\n", This, debugstr_variant(&id), name); - len = SendMessageW(This->hwnd, WM_GETTEXT, ARRAY_SIZE(name), (LPARAM)name); - if(!len) - return S_FALSE; + *name = NULL; + if(This->vtbl && This->vtbl->get_name) + return This->vtbl->get_name(This, id, name); - for(i=0; i<len; i++) { - if(name[i] == '&') { - len--; - memmove(name+i, name+i+1, (len-i)*sizeof(WCHAR)); - break; - } - } + if(convert_child_id(&id) != CHILDID_SELF || !IsWindow(This->hwnd)) + return E_INVALIDARG; - *pszName = SysAllocStringLen(name, len); - return *pszName ? S_OK : E_OUTOFMEMORY; + return win_get_name(This->hwnd, name); } static HRESULT WINAPI Client_get_accValue(IAccessible *iface, VARIANT varID, BSTR *pszValue) @@ -693,9 +703,51 @@ static HRESULT edit_get_state(Client *client, VARIANT id, VARIANT *state) return S_OK; } +/* + * Edit control objects have their name property defined by the first static + * text control preceding them in the order of window creation. If one is not + * found, the edit has no name property. In the case of the keyboard shortcut + * property, the first preceding visible static text control is used. + */ +static HWND edit_find_label(HWND hwnd, BOOL visible) +{ + HWND cur; + + for(cur = hwnd; cur; cur = GetWindow(cur, GW_HWNDPREV)) { + WCHAR class_name[64]; + + if(!RealGetWindowClassW(cur, class_name, ARRAY_SIZE(class_name))) + continue; + + if(!wcsicmp(class_name, WC_STATICW)) { + if(visible && !(GetWindowLongW(cur, GWL_STYLE) & WS_VISIBLE)) + continue; + else + break; + } + } + + return cur; +} + +static HRESULT edit_get_name(Client *client, VARIANT id, BSTR *name) +{ + HWND label; + + if(convert_child_id(&id) != CHILDID_SELF || !IsWindow(client->hwnd)) + return E_INVALIDARG; + + label = edit_find_label(client->hwnd, FALSE); + if(!label) + return S_FALSE; + + return win_get_name(label, name); +} + static const win_class_vtbl edit_vtbl = { edit_init, edit_get_state, + edit_get_name, }; static const struct win_class_data classes[] = {

1 0

Connor McAdams : oleacc: Add get_accKeyboardShortcut function for edit client accessible object.
by Alexandre Julliard 27 Sep '21

27 Sep '21

Module: wine Branch: master Commit: dbdebac3166f79207eef7fcd1ff7d7dfcf725924 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dbdebac3166f79207eef7fcd… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Mon Sep 27 16:11:09 2021 +0200 oleacc: Add get_accKeyboardShortcut function for edit client accessible object. 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 | 67 ++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 47 insertions(+), 20 deletions(-) diff --git a/dlls/oleacc/client.c b/dlls/oleacc/client.c index 032f8867d31..6419e8dec31 100644 --- a/dlls/oleacc/client.c +++ b/dlls/oleacc/client.c @@ -46,6 +46,7 @@ struct win_class_vtbl { void (*init)(Client*); HRESULT (*get_state)(Client*, VARIANT, VARIANT*); HRESULT (*get_name)(Client*, VARIANT, BSTR*); + HRESULT (*get_kbd_shortcut)(Client*, VARIANT, BSTR*); }; static HRESULT win_get_name(HWND hwnd, BSTR *name) @@ -69,6 +70,29 @@ static HRESULT win_get_name(HWND hwnd, BSTR *name) return *name ? S_OK : E_OUTOFMEMORY; } +static HRESULT win_get_kbd_shortcut(HWND hwnd, BSTR *shortcut) +{ + WCHAR buf[1024]; + UINT i, len; + + len = SendMessageW(hwnd, WM_GETTEXT, ARRAY_SIZE(buf), (LPARAM)buf); + if(!len) + return S_FALSE; + + for(i=0; i<len; i++) { + if(buf[i] == '&') + break; + } + if(i+1 >= len) + return S_FALSE; + + *shortcut = SysAllocString(L"Alt+!"); + if(!*shortcut) + return E_OUTOFMEMORY; + (*shortcut)[4] = buf[i+1]; + return S_OK; +} + static inline Client* impl_from_Client(IAccessible *iface) { return CONTAINING_RECORD(iface, Client, IAccessible_iface); @@ -304,32 +328,20 @@ static HRESULT WINAPI Client_get_accHelpTopic(IAccessible *iface, } static HRESULT WINAPI Client_get_accKeyboardShortcut(IAccessible *iface, - VARIANT varID, BSTR *pszKeyboardShortcut) + VARIANT id, BSTR *shortcut) { Client *This = impl_from_Client(iface); - WCHAR name[1024]; - UINT i, len; - - TRACE("(%p)->(%s %p)\n", This, debugstr_variant(&varID), pszKeyboardShortcut); - *pszKeyboardShortcut = NULL; - if(convert_child_id(&varID) != CHILDID_SELF) - return E_INVALIDARG; + TRACE("(%p)->(%s %p)\n", This, debugstr_variant(&id), shortcut); - len = SendMessageW(This->hwnd, WM_GETTEXT, ARRAY_SIZE(name), (LPARAM)name); - for(i=0; i<len; i++) { - if(name[i] == '&') - break; - } - if(i+1 >= len) - return S_FALSE; + *shortcut = NULL; + if(This->vtbl && This->vtbl->get_kbd_shortcut) + return This->vtbl->get_kbd_shortcut(This, id, shortcut); - *pszKeyboardShortcut = SysAllocString(L"Alt+!"); - if(!*pszKeyboardShortcut) - return E_OUTOFMEMORY; + if(convert_child_id(&id) != CHILDID_SELF) + return E_INVALIDARG; - (*pszKeyboardShortcut)[4] = name[i+1]; - return S_OK; + return win_get_kbd_shortcut(This->hwnd, shortcut); } static HRESULT WINAPI Client_get_accFocus(IAccessible *iface, VARIANT *focus) @@ -744,10 +756,25 @@ static HRESULT edit_get_name(Client *client, VARIANT id, BSTR *name) return win_get_name(label, name); } +static HRESULT edit_get_kbd_shortcut(Client *client, VARIANT id, BSTR *shortcut) +{ + HWND label; + + if(convert_child_id(&id) != CHILDID_SELF) + return E_INVALIDARG; + + label = edit_find_label(client->hwnd, TRUE); + if(!label) + return S_FALSE; + + return win_get_kbd_shortcut(label, shortcut); +} + static const win_class_vtbl edit_vtbl = { edit_init, edit_get_state, edit_get_name, + edit_get_kbd_shortcut, }; static const struct win_class_data classes[] = {

1 0

Connor McAdams : oleacc: Add get_accValue function for edit client accessible object.
by Alexandre Julliard 27 Sep '21

27 Sep '21

Module: wine Branch: master Commit: b23af7300a6e05edac67a1124213bfc919a38e20 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b23af7300a6e05edac67a112… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Mon Sep 27 16:11:13 2021 +0200 oleacc: Add get_accValue function for edit client accessible object. 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 | 35 +++++++++++++++++++++++++++++++---- 1 file changed, 31 insertions(+), 4 deletions(-) diff --git a/dlls/oleacc/client.c b/dlls/oleacc/client.c index 6419e8dec31..f111a1b9af8 100644 --- a/dlls/oleacc/client.c +++ b/dlls/oleacc/client.c @@ -47,6 +47,7 @@ struct win_class_vtbl { HRESULT (*get_state)(Client*, VARIANT, VARIANT*); HRESULT (*get_name)(Client*, VARIANT, BSTR*); HRESULT (*get_kbd_shortcut)(Client*, VARIANT, BSTR*); + HRESULT (*get_value)(Client*, VARIANT, BSTR*); }; static HRESULT win_get_name(HWND hwnd, BSTR *name) @@ -228,14 +229,17 @@ static HRESULT WINAPI Client_get_accName(IAccessible *iface, VARIANT id, BSTR *n return win_get_name(This->hwnd, name); } -static HRESULT WINAPI Client_get_accValue(IAccessible *iface, VARIANT varID, BSTR *pszValue) +static HRESULT WINAPI Client_get_accValue(IAccessible *iface, VARIANT id, BSTR *value) { Client *This = impl_from_Client(iface); - TRACE("(%p)->(%s %p)\n", This, debugstr_variant(&varID), pszValue); + TRACE("(%p)->(%s %p)\n", This, debugstr_variant(&id), value); - *pszValue = NULL; - if(convert_child_id(&varID) != CHILDID_SELF) + *value = NULL; + if(This->vtbl && This->vtbl->get_value) + return This->vtbl->get_value(This, id, value); + + if(convert_child_id(&id) != CHILDID_SELF) return E_INVALIDARG; return S_FALSE; } @@ -770,11 +774,34 @@ static HRESULT edit_get_kbd_shortcut(Client *client, VARIANT id, BSTR *shortcut) return win_get_kbd_shortcut(label, shortcut); } +static HRESULT edit_get_value(Client *client, VARIANT id, BSTR *value_out) +{ + WCHAR *buf; + UINT len; + + if(convert_child_id(&id) != CHILDID_SELF) + return E_INVALIDARG; + + if(GetWindowLongW(client->hwnd, GWL_STYLE) & ES_PASSWORD) + return E_ACCESSDENIED; + + len = SendMessageW(client->hwnd, WM_GETTEXTLENGTH, 0, 0); + buf = heap_alloc_zero((len + 1) * sizeof(*buf)); + if(!buf) + return E_OUTOFMEMORY; + + SendMessageW(client->hwnd, WM_GETTEXT, len + 1, (LPARAM)buf); + *value_out = SysAllocString(buf); + heap_free(buf); + return S_OK; +} + static const win_class_vtbl edit_vtbl = { edit_init, edit_get_state, edit_get_name, edit_get_kbd_shortcut, + edit_get_value, }; static const struct win_class_data classes[] = {

1 0

Piotr Caban : oleacc: Add default client IAccessible::put_accValue implementation.
by Alexandre Julliard 27 Sep '21

27 Sep '21

Module: wine Branch: master Commit: 38229c8a758f29f7cf81572f37972ce56da89cb0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=38229c8a758f29f7cf81572f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Sep 27 16:11:16 2021 +0200 oleacc: Add default client IAccessible::put_accValue implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleacc/client.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/oleacc/client.c b/dlls/oleacc/client.c index f111a1b9af8..1dd18240179 100644 --- a/dlls/oleacc/client.c +++ b/dlls/oleacc/client.c @@ -487,11 +487,15 @@ static HRESULT WINAPI Client_put_accName(IAccessible *iface, VARIANT varID, BSTR return E_NOTIMPL; } -static HRESULT WINAPI Client_put_accValue(IAccessible *iface, VARIANT varID, BSTR pszValue) +static HRESULT WINAPI Client_put_accValue(IAccessible *iface, VARIANT id, BSTR value) { Client *This = impl_from_Client(iface); - FIXME("(%p)->(%s %s)\n", This, debugstr_variant(&varID), debugstr_w(pszValue)); - return E_NOTIMPL; + + TRACE("(%p)->(%s %p)\n", This, debugstr_variant(&id), value); + + if(convert_child_id(&id) != CHILDID_SELF) + return E_INVALIDARG; + return S_FALSE; } static const IAccessibleVtbl ClientVtbl = {

1 0

Connor McAdams : oleacc: Add put_accValue function for edit client accessible object.
by Alexandre Julliard 27 Sep '21

27 Sep '21

Module: wine Branch: master Commit: b8d0118517e8a42a7987dc7cdc61e1a7a59f9578 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b8d0118517e8a42a7987dc7c… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Mon Sep 27 16:11:20 2021 +0200 oleacc: Add put_accValue function for edit client accessible object. 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 | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/dlls/oleacc/client.c b/dlls/oleacc/client.c index 1dd18240179..192a006bdba 100644 --- a/dlls/oleacc/client.c +++ b/dlls/oleacc/client.c @@ -48,6 +48,7 @@ struct win_class_vtbl { HRESULT (*get_name)(Client*, VARIANT, BSTR*); HRESULT (*get_kbd_shortcut)(Client*, VARIANT, BSTR*); HRESULT (*get_value)(Client*, VARIANT, BSTR*); + HRESULT (*put_value)(Client*, VARIANT, BSTR); }; static HRESULT win_get_name(HWND hwnd, BSTR *name) @@ -493,6 +494,9 @@ static HRESULT WINAPI Client_put_accValue(IAccessible *iface, VARIANT id, BSTR v TRACE("(%p)->(%s %p)\n", This, debugstr_variant(&id), value); + if(This->vtbl && This->vtbl->put_value) + return This->vtbl->put_value(This, id, value); + if(convert_child_id(&id) != CHILDID_SELF) return E_INVALIDARG; return S_FALSE; @@ -800,12 +804,22 @@ static HRESULT edit_get_value(Client *client, VARIANT id, BSTR *value_out) return S_OK; } +static HRESULT edit_put_value(Client *client, VARIANT id, BSTR value) +{ + if(convert_child_id(&id) != CHILDID_SELF || !IsWindow(client->hwnd)) + return E_INVALIDARG; + + SendMessageW(client->hwnd, WM_SETTEXT, 0, (LPARAM)value); + return S_OK; +} + static const win_class_vtbl edit_vtbl = { edit_init, edit_get_state, edit_get_name, edit_get_kbd_shortcut, edit_get_value, + edit_put_value, }; static const struct win_class_data classes[] = {

1 0

Paul Gofman : ntdll: Implement LdrGetDllHandleEx() function.
by Alexandre Julliard 27 Sep '21

27 Sep '21

Module: wine Branch: master Commit: cf0a828b02af45beb0b42ce9dbb08e3ee702deff URL: https://source.winehq.org/git/wine.git/?a=commit;h=cf0a828b02af45beb0b42ce9… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Sep 27 13:50:01 2021 +0300 ntdll: Implement LdrGetDllHandleEx() function. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/module.c | 107 +++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/loader.c | 44 ++++++++++++++++-- dlls/ntdll/ntdll.spec | 1 + include/winternl.h | 5 ++ 4 files changed, 152 insertions(+), 5 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=cf0a828b02af45beb0b4…

1 0

Paul Gofman : kernelbase: Sanitize flags in GetModuleHandleExW().
by Alexandre Julliard 27 Sep '21

27 Sep '21

Module: wine Branch: master Commit: 7ddd79b8f5e814437afc4aaa25fa82fe45e0c742 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7ddd79b8f5e814437afc4aaa… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Sep 27 13:50:02 2021 +0300 kernelbase: Sanitize flags in GetModuleHandleExW(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/module.c | 17 +++++++++++++++++ dlls/kernelbase/loader.c | 10 ++++++++++ 2 files changed, 27 insertions(+) diff --git a/dlls/kernel32/tests/module.c b/dlls/kernel32/tests/module.c index 5ca137ad6ba..bfa389ac9ab 100644 --- a/dlls/kernel32/tests/module.c +++ b/dlls/kernel32/tests/module.c @@ -1011,6 +1011,23 @@ static void testGetModuleHandleEx(void) ok( error == ERROR_MOD_NOT_FOUND, "got %u\n", error ); ok( mod == NULL, "got %p\n", mod ); + SetLastError( 0xdeadbeef ); + mod = (HMODULE)0xdeadbeef; + ret = GetModuleHandleExW( GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS | GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT + | GET_MODULE_HANDLE_EX_FLAG_PIN, (LPCWSTR)mod_kernel32, &mod ); + error = GetLastError(); + ok( !ret, "unexpected success\n" ); + ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); + ok( mod == NULL, "got %p\n", mod ); + + SetLastError( 0xdeadbeef ); + mod = (HMODULE)0xdeadbeef; + ret = GetModuleHandleExW( 8, kernel32W, &mod ); + error = GetLastError(); + ok( !ret, "unexpected success\n" ); + ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); + ok( mod == NULL, "got %p\n", mod ); + FreeLibrary( mod_kernel32 ); } diff --git a/dlls/kernelbase/loader.c b/dlls/kernelbase/loader.c index ac463528e3c..9aff460c955 100644 --- a/dlls/kernelbase/loader.c +++ b/dlls/kernelbase/loader.c @@ -384,6 +384,16 @@ BOOL WINAPI DECLSPEC_HOTPATCH GetModuleHandleExW( DWORD flags, LPCWSTR name, HMO return FALSE; } + if ((flags & ~(GET_MODULE_HANDLE_EX_FLAG_PIN | GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT + | GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS)) + || (flags & (GET_MODULE_HANDLE_EX_FLAG_PIN | GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT)) + == (GET_MODULE_HANDLE_EX_FLAG_PIN | GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT)) + { + *module = NULL; + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } + /* if we are messing with the refcount, grab the loader lock */ lock = (flags & GET_MODULE_HANDLE_EX_FLAG_PIN) || !(flags & GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT); if (lock) LdrLockLoaderLock( 0, NULL, &magic );

1 0

Paul Gofman : kernelbase: Don't use LdrLockLoaderLock() in GetModuleHandleExW().
by Alexandre Julliard 27 Sep '21

27 Sep '21

Module: wine Branch: master Commit: 4e50b6179f8f8d4c2f9eda395d479f81f7199bed URL: https://source.winehq.org/git/wine.git/?a=commit;h=4e50b6179f8f8d4c2f9eda39… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Sep 27 13:50:03 2021 +0300 kernelbase: Don't use LdrLockLoaderLock() in GetModuleHandleExW(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/loader.c | 47 +++++++++++++++++++++-------------------------- 1 file changed, 21 insertions(+), 26 deletions(-) diff --git a/dlls/kernelbase/loader.c b/dlls/kernelbase/loader.c index 9aff460c955..da139e91176 100644 --- a/dlls/kernelbase/loader.c +++ b/dlls/kernelbase/loader.c @@ -373,10 +373,9 @@ BOOL WINAPI DECLSPEC_HOTPATCH GetModuleHandleExA( DWORD flags, LPCSTR name, HMOD */ BOOL WINAPI DECLSPEC_HOTPATCH GetModuleHandleExW( DWORD flags, LPCWSTR name, HMODULE *module ) { - NTSTATUS status = STATUS_SUCCESS; HMODULE ret = NULL; - ULONG_PTR magic; - BOOL lock; + NTSTATUS status; + void *dummy; if (!module) { @@ -394,35 +393,31 @@ BOOL WINAPI DECLSPEC_HOTPATCH GetModuleHandleExW( DWORD flags, LPCWSTR name, HMO return FALSE; } - /* if we are messing with the refcount, grab the loader lock */ - lock = (flags & GET_MODULE_HANDLE_EX_FLAG_PIN) || !(flags & GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT); - if (lock) LdrLockLoaderLock( 0, NULL, &magic ); - - if (!name) - { - ret = NtCurrentTeb()->Peb->ImageBaseAddress; - } - else if (flags & GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS) - { - void *dummy; - if (!(ret = RtlPcToFileHeader( (void *)name, &dummy ))) status = STATUS_DLL_NOT_FOUND; - } - else + if (name && !(flags & GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS)) { UNICODE_STRING wstr; - RtlInitUnicodeString( &wstr, name ); - status = LdrGetDllHandle( NULL, 0, &wstr, &ret ); - } + ULONG ldr_flags = 0; - if (status == STATUS_SUCCESS) - { if (flags & GET_MODULE_HANDLE_EX_FLAG_PIN) - LdrAddRefDll( LDR_ADDREF_DLL_PIN, ret ); - else if (!(flags & GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT)) - LdrAddRefDll( 0, ret ); + ldr_flags |= LDR_GET_DLL_HANDLE_EX_FLAG_PIN; + if (flags & GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT) + ldr_flags |= LDR_GET_DLL_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT; + + RtlInitUnicodeString( &wstr, name ); + status = LdrGetDllHandleEx( ldr_flags, NULL, NULL, &wstr, &ret ); } + else + { + ret = name ? RtlPcToFileHeader( (void *)name, &dummy ) : NtCurrentTeb()->Peb->ImageBaseAddress; - if (lock) LdrUnlockLoaderLock( 0, magic ); + if (ret) + { + if (!(flags & GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT)) + status = LdrAddRefDll( flags & GET_MODULE_HANDLE_EX_FLAG_PIN ? LDR_ADDREF_DLL_PIN : 0, ret ); + else + status = STATUS_SUCCESS; + } else status = STATUS_DLL_NOT_FOUND; + } *module = ret; return set_ntstatus( status );

1 0

Jacek Caban : gdi32: Directly use ntdll in init_font_options.
by Alexandre Julliard 27 Sep '21

27 Sep '21

Module: wine Branch: master Commit: 1cdc74b2d62d1c94005c46f9c8f4b566aa8bdcbd URL: https://source.winehq.org/git/wine.git/?a=commit;h=1cdc74b2d62d1c94005c46f9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 27 13:08:46 2021 +0200 gdi32: Directly use ntdll in init_font_options. 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/gdi32/font.c | 61 +++++++++++++++++++++++++++++++------------------------ 1 file changed, 35 insertions(+), 26 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index f81af591e33..5fefa1ea01e 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -4137,37 +4137,42 @@ const struct gdi_dc_funcs font_driver = GDI_PRIORITY_FONT_DRV /* priority */ }; -static DWORD get_key_value( HKEY key, const WCHAR *name, DWORD *value ) +static BOOL get_key_value( HKEY key, const char *name, DWORD *value ) { - WCHAR buf[12]; - DWORD count = sizeof(buf), type, err; + char value_buffer[FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION, Data[12 * sizeof(WCHAR)])]; + KEY_VALUE_PARTIAL_INFORMATION *info = (void *)value_buffer; + DWORD count; - err = RegQueryValueExW( key, name, NULL, &type, (BYTE *)buf, &count ); - if (!err) + count = query_reg_ascii_value( key, name, info, sizeof(value_buffer) ); + if (count) { - if (type == REG_DWORD) memcpy( value, buf, sizeof(*value) ); - else *value = wcstol( buf, NULL, 10 ); + if (info->Type == REG_DWORD) memcpy( value, info->Data, sizeof(*value) ); + else *value = wcstol( (const WCHAR *)info->Data, NULL, 10 ); } - return err; + return !!count; } -static void init_font_options(void) +static void init_font_options( HKEY hkcu ) { + char value_buffer[FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION, Data[20 * sizeof(WCHAR)])]; + KEY_VALUE_PARTIAL_INFORMATION *info = (void *)value_buffer; HKEY key; - DWORD i, type, size, val, gamma = 1400; - WCHAR buffer[20]; + DWORD i, val, gamma = 1400; + + static const WCHAR desktop_keyW[] = + { 'C','o','n','t','r','o','l',' ','P','a','n','e','l','\\','D','e','s','k','t','o','p' }; - size = sizeof(buffer); - if (!RegQueryValueExW( wine_fonts_key, L"AntialiasFakeBoldOrItalic", NULL, - &type, (BYTE *)buffer, &size) && type == REG_SZ && size >= 1) + if (query_reg_ascii_value( wine_fonts_key, "AntialiasFakeBoldOrItalic", + info, sizeof(value_buffer) ) && info->Type == REG_SZ) { - antialias_fakes = (wcschr(L"yYtT1", buffer[0]) != NULL); + static const WCHAR valsW[] = {'y','Y','t','T','1',0}; + antialias_fakes = (wcschr( valsW, *(const WCHAR *)info->Data ) != NULL); } - if (!RegOpenKeyW( HKEY_CURRENT_USER, L"Control Panel\\Desktop", &key )) + if ((key = reg_open_key( hkcu, desktop_keyW, sizeof(desktop_keyW) ))) { /* FIXME: handle vertical orientations even though Windows doesn't */ - if (!get_key_value( key, L"FontSmoothingOrientation", &val )) + if (get_key_value( key, "FontSmoothingOrientation", &val )) { switch (val) { @@ -4179,18 +4184,18 @@ static void init_font_options(void) break; } } - if (!get_key_value( key, L"FontSmoothing", &val ) && val /* enabled */) + if (get_key_value( key, "FontSmoothing", &val ) && val /* enabled */) { - if (!get_key_value( key, L"FontSmoothingType", &val ) && val == 2 /* FE_FONTSMOOTHINGCLEARTYPE */) + if (get_key_value( key, "FontSmoothingType", &val ) && val == 2 /* FE_FONTSMOOTHINGCLEARTYPE */) font_smoothing = subpixel_orientation; else font_smoothing = GGO_GRAY4_BITMAP; } - if (!get_key_value( key, L"FontSmoothingGamma", &val ) && val) + if (get_key_value( key, "FontSmoothingGamma", &val ) && val) { gamma = min( max( val, 1000 ), 2200 ); } - RegCloseKey( key ); + NtClose( key ); } /* Calibrating the difference between the registry value and the Wine gamma value. @@ -6091,19 +6096,23 @@ void font_init(void) { OBJECT_ATTRIBUTES attr = { sizeof(attr) }; UNICODE_STRING name; - HANDLE mutex; + HANDLE mutex, hkcu; DWORD disposition; static WCHAR wine_font_mutexW[] = {'\\','B','a','s','e','N','a','m','e','d','O','b','j','e','c','t','s', '\\','_','_','W','I','N','E','_','F','O','N','T','_','M','U','T','E','X','_','_'}; + static const WCHAR wine_fonts_keyW[] = + {'S','o','f','t','w','a','r','e','\\','W','i','n','e','\\','F','o','n','t','s'}; - if (RegCreateKeyExW( HKEY_CURRENT_USER, L"Software\\Wine\\Fonts", 0, NULL, 0, - KEY_ALL_ACCESS, NULL, &wine_fonts_key, NULL )) - return; + if (RtlOpenCurrentUser( MAXIMUM_ALLOWED, &hkcu )) return; - init_font_options(); + wine_fonts_key = reg_create_key( hkcu, wine_fonts_keyW, sizeof(wine_fonts_keyW), 0, NULL ); + if (wine_fonts_key) init_font_options( hkcu ); + NtClose( hkcu ); + if (!wine_fonts_key) return; update_codepage(); + if (__wine_init_unix_lib( gdi32_module, DLL_PROCESS_ATTACH, &callback_funcs, &font_funcs )) return; load_system_bitmap_fonts();

1 0

Jacek Caban : gdi32: Directly use ntdll in get_associated_charset_info.
by Alexandre Julliard 27 Sep '21

27 Sep '21

Module: wine Branch: master Commit: 1262b1aeab42e5a1978bca53031b2aa295f0400d URL: https://source.winehq.org/git/wine.git/?a=commit;h=1262b1aeab42e5a1978bca53… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 27 13:04:56 2021 +0200 gdi32: Directly use ntdll in get_associated_charset_info. 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/gdi32/font.c | 37 +++++++++++++++++++++++-------------- 1 file changed, 23 insertions(+), 14 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 5fefa1ea01e..700a7e1c327 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -103,6 +103,17 @@ static const WCHAR system_link_keyW[] = '\\','S','y','s','t','e','m','L','i','n','k' }; +static const WCHAR associated_charset_keyW[] = +{ + '\\','R','e','g','i','s','t','r','y', + '\\','M','a','c','h','i','n','e', + '\\','S','y','s','t','e','m', + '\\','C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t', + '\\','C','o','n','t','r','o','l', + '\\','F','o','n','t','A','s','s','o','c', + '\\','A','s','s','o','c','i','a','t','e','d',' ','C','h','a','r','s','e','t' +}; + static const WCHAR software_config_keyW[] = { '\\','R','e','g','i','s','t','r','y', @@ -4386,32 +4397,30 @@ static DWORD get_associated_charset_info(void) if (associated_charset == -1) { + char value_buffer[FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION, Data[32 * sizeof(WCHAR)])]; + KEY_VALUE_PARTIAL_INFORMATION *info = (void *)value_buffer; HKEY hkey; - WCHAR dataW[32]; - DWORD type, data_len; + + static const WCHAR yesW[] = {'y','e','s',0}; associated_charset = 0; - if (RegOpenKeyW(HKEY_LOCAL_MACHINE, - L"System\\CurrentControlSet\\Control\\FontAssoc\\Associated Charset", &hkey)) + if (!(hkey = reg_open_key( NULL, associated_charset_keyW, sizeof(associated_charset_keyW) ))) return 0; - data_len = sizeof(dataW); - if (!RegQueryValueExW(hkey, L"ANSI(00)", NULL, &type, (LPBYTE)dataW, &data_len) && - type == REG_SZ && !wcsicmp(dataW, L"yes")) + if (query_reg_ascii_value( hkey, "ANSI(00)", info, sizeof(value_buffer) ) && + info->Type == REG_SZ && !wcsicmp( (const WCHAR *)info->Data, yesW )) associated_charset |= ASSOC_CHARSET_ANSI; - data_len = sizeof(dataW); - if (!RegQueryValueExW(hkey, L"OEM(FF)", NULL, &type, (LPBYTE)dataW, &data_len) && - type == REG_SZ && !wcsicmp(dataW, L"yes")) + if (query_reg_ascii_value( hkey, "OEM(FF)", info, sizeof(value_buffer) ) && + info->Type == REG_SZ && !wcsicmp( (const WCHAR *)info->Data, yesW )) associated_charset |= ASSOC_CHARSET_OEM; - data_len = sizeof(dataW); - if (!RegQueryValueExW(hkey, L"SYMBOL(02)", NULL, &type, (LPBYTE)dataW, &data_len) && - type == REG_SZ && !wcsicmp(dataW, L"yes")) + if (query_reg_ascii_value( hkey, "SYMBOL(02)", info, sizeof(value_buffer) ) && + info->Type == REG_SZ && !wcsicmp( (const WCHAR *)info->Data, yesW )) associated_charset |= ASSOC_CHARSET_SYMBOL; - RegCloseKey(hkey); + NtClose( hkey ); TRACE("associated_charset = %d\n", associated_charset); }

1 0