September 2021 - Wine-Commits

Rémi Bernon : hidparse.sys: Split struct hid_value_caps start_bit into start_byte / start_bit.
by Alexandre Julliard Sept. 20, 2021

Sept. 20, 2021

Module: wine Branch: master Commit: 6fa0d12724be45407f0a5ccdb9db8bd4b53db6c8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6fa0d12724be45407f0a5ccd… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Sep 17 09:18:54 2021 +0200 hidparse.sys: Split struct hid_value_caps start_bit into start_byte / start_bit. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hid/hidp.c | 63 +++++++++++++++++++++++++++++++++++------------- dlls/hidparse.sys/main.c | 16 ++++++------ include/wine/hid.h | 3 ++- 3 files changed, 57 insertions(+), 25 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6fa0d12724be45407f0a…

1 0

Alexandre Julliard : makefiles: Add a -mcygwin flag to specify the inverse of -mno-cygwin.
by Alexandre Julliard Sept. 20, 2021

Sept. 20, 2021

1 0

Alexandre Julliard : makefiles: Make -mno-cygwin the default.
by Alexandre Julliard Sept. 20, 2021

Sept. 20, 2021

1 0

Alexandre Julliard : winegcc: Skip the post-link steps for Unix libraries.
by Alexandre Julliard Sept. 20, 2021

Sept. 20, 2021

Module: wine Branch: master Commit: 20830b6c7007d56961c1d11d077c2d09a40612ae URL: https://source.winehq.org/git/wine.git/?a=commit;h=20830b6c7007d56961c1d11d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 20 16:17:36 2021 +0200 winegcc: Skip the post-link steps for Unix libraries. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 3877a19e173..ff37cb75576 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -1517,6 +1517,8 @@ static void build(struct options* opts) strarray_free(tool); } + if (opts->unix_lib) return; + if (opts->out_implib && !is_pe) { if (!spec_file)

1 0

Piotr Caban : oleacc: Introduce helper for checking accessibility object hwnd.
by Alexandre Julliard Sept. 20, 2021

Sept. 20, 2021

Module: wine Branch: master Commit: 82b8b361d2794f0fdaae07bb715a2e0167bd703c URL: https://source.winehq.org/git/wine.git/?a=commit;h=82b8b361d2794f0fdaae07bb… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Sep 20 18:03:40 2021 +0200 oleacc: Introduce helper for checking accessibility object hwnd. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleacc/tests/main.c | 47 +++++++++++++++++++---------------------------- 1 file changed, 19 insertions(+), 28 deletions(-) diff --git a/dlls/oleacc/tests/main.c b/dlls/oleacc/tests/main.c index 7d1c376bc25..98da7eb3ddc 100644 --- a/dlls/oleacc/tests/main.c +++ b/dlls/oleacc/tests/main.c @@ -896,6 +896,21 @@ static void _check_acc_state(unsigned line, IAccessible *acc, INT state) ok_(__FILE__, line)(V_I4(&v) == state, "V_I4(&v) = %x\n", V_I4(&v)); } +#define check_acc_hwnd(unk, hwnd) _check_acc_hwnd(__LINE__, unk, hwnd) +static void _check_acc_hwnd(unsigned line, IUnknown *unk, HWND exp) +{ + IOleWindow *ow; + HRESULT hr; + HWND hwnd; + + hr = IUnknown_QueryInterface(unk, &IID_IOleWindow, (void**)&ow); + ok_(__FILE__, line)(hr == S_OK, "got %x\n", hr); + hr = IOleWindow_GetWindow(ow, &hwnd); + ok_(__FILE__, line)(hr == S_OK, "got %x\n", hr); + ok_(__FILE__, line)(hwnd == exp, "hwnd = %p, expected %p\n", hwnd, exp); + IOleWindow_Release(ow); +} + static DWORD WINAPI default_client_thread(LPVOID param) { IAccessible *acc = param; @@ -918,7 +933,6 @@ static void test_default_client_accessible_object(void) { IAccessible *acc, *win; IDispatch *disp; - IOleWindow *ow; IEnumVARIANT *ev; HWND chld, chld2, btn, hwnd, hwnd2; HRESULT hr; @@ -989,15 +1003,10 @@ static void test_default_client_accessible_object(void) hr = CreateStdAccessibleObject(hwnd, OBJID_CLIENT, &IID_IAccessible, (void**)&acc); ok(hr == S_OK, "got %x\n", hr); - hr = IAccessible_QueryInterface(acc, &IID_IOleWindow, (void**)&ow); - ok(hr == S_OK, "got %x\n", hr); - hr = IOleWindow_GetWindow(ow, &hwnd2); - ok(hr == S_OK, "got %x\n", hr); - ok(hwnd == hwnd2, "hwnd2 = %p, expected %p\n", hwnd2, hwnd); + check_acc_hwnd((IUnknown*)acc, hwnd); hr = WindowFromAccessibleObject(acc, &hwnd2); ok(hr == S_OK, "got %x\n", hr); ok(hwnd == hwnd2, "hwnd2 = %p, expected %p\n", hwnd2, hwnd); - IOleWindow_Release(ow); hr = IAccessible_get_accChildCount(acc, &l); ok(hr == S_OK, "got %x\n", hr); @@ -1035,13 +1044,7 @@ static void test_default_client_accessible_object(void) ok(hr == S_OK, "hr %#x\n", hr); ok(V_VT(&v) == VT_DISPATCH, "V_VT(&v) = %d\n", V_VT(&v)); ok(V_DISPATCH(&v) != NULL, "V_DISPATCH(&v) = %p\n", V_DISPATCH(&v)); - - hr = IDispatch_QueryInterface(V_DISPATCH(&v), &IID_IOleWindow, (void**)&ow); - ok(hr == S_OK, "got %x\n", hr); - hr = IOleWindow_GetWindow(ow, &hwnd2); - ok(hr == S_OK, "got %x\n", hr); - ok(btn == hwnd2, "hwnd2 = %p, expected %p\n", hwnd2, btn); - IOleWindow_Release(ow); + check_acc_hwnd((IUnknown*)V_DISPATCH(&v), btn); hr = IDispatch_QueryInterface(V_DISPATCH(&v), &IID_IAccessible, (void**)&win); ok(hr == S_OK, "got %x\n", hr); @@ -1060,13 +1063,7 @@ static void test_default_client_accessible_object(void) ok(hr == S_OK, "hr %#x\n", hr); ok(V_VT(&v) == VT_DISPATCH, "V_VT(&v) = %d\n", V_VT(&v)); ok(V_DISPATCH(&v) != NULL, "V_DISPATCH(&v) = %p\n", V_DISPATCH(&v)); - - hr = IDispatch_QueryInterface(V_DISPATCH(&v), &IID_IOleWindow, (void**)&ow); - ok(hr == S_OK, "got %x\n", hr); - hr = IOleWindow_GetWindow(ow, &hwnd2); - ok(hr == S_OK, "got %x\n", hr); - ok(chld == hwnd2, "hwnd2 = %p, expected %p\n", hwnd2, chld); - IOleWindow_Release(ow); + check_acc_hwnd((IUnknown*)V_DISPATCH(&v), chld); hr = IDispatch_QueryInterface(V_DISPATCH(&v), &IID_IAccessible, (void**)&win); ok(hr == S_OK, "got %x\n", hr); @@ -1084,13 +1081,7 @@ static void test_default_client_accessible_object(void) ok(hr == S_OK, "hr %#x\n", hr); ok(V_VT(&v) == VT_DISPATCH, "V_VT(&v) = %d\n", V_VT(&v)); ok(V_DISPATCH(&v) != NULL, "V_DISPATCH(&v) = %p\n", V_DISPATCH(&v)); - - hr = IDispatch_QueryInterface(V_DISPATCH(&v), &IID_IOleWindow, (void**)&ow); - ok(hr == S_OK, "got %x\n", hr); - hr = IOleWindow_GetWindow(ow, &hwnd2); - ok(hr == S_OK, "got %x\n", hr); - ok(chld2 == hwnd2, "hwnd2 = %p, expected %p\n", hwnd2, chld2); - IOleWindow_Release(ow); + check_acc_hwnd((IUnknown*)V_DISPATCH(&v), chld2); hr = IDispatch_QueryInterface(V_DISPATCH(&v), &IID_IAccessible, (void**)&win); ok(hr == S_OK, "got %x\n", hr);

1 0

Connor McAdams : oleacc: Add Client_get_accFocus implementation.
by Alexandre Julliard Sept. 20, 2021

Sept. 20, 2021

Module: wine Branch: master Commit: 57895ed8aeb3f32989e6f80de25ef158a2a3d6d2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=57895ed8aeb3f32989e6f80d… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Mon Sep 20 18:03:25 2021 +0200 oleacc: Add Client_get_accFocus implementation. 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 | 32 +++++++++++++++++++++++++++++--- 1 file changed, 29 insertions(+), 3 deletions(-) diff --git a/dlls/oleacc/client.c b/dlls/oleacc/client.c index 0c2215fe62e..93f6b590f78 100644 --- a/dlls/oleacc/client.c +++ b/dlls/oleacc/client.c @@ -303,11 +303,37 @@ static HRESULT WINAPI Client_get_accKeyboardShortcut(IAccessible *iface, return S_OK; } -static HRESULT WINAPI Client_get_accFocus(IAccessible *iface, VARIANT *pvarID) +static HRESULT WINAPI Client_get_accFocus(IAccessible *iface, VARIANT *focus) { Client *This = impl_from_Client(iface); - FIXME("(%p)->(%p)\n", This, pvarID); - return E_NOTIMPL; + GUITHREADINFO info; + + TRACE("(%p)->(%p)\n", This, focus); + + V_VT(focus) = VT_EMPTY; + info.cbSize = sizeof(info); + if(GetGUIThreadInfo(0, &info) && info.hwndFocus) { + if(info.hwndFocus == This->hwnd) { + V_VT(focus) = VT_I4; + V_I4(focus) = CHILDID_SELF; + } + else if(IsChild(This->hwnd, info.hwndFocus)) { + IDispatch *disp; + HRESULT hr; + + hr = AccessibleObjectFromWindow(info.hwndFocus, OBJID_WINDOW, + &IID_IDispatch, (void**)&disp); + if(FAILED(hr)) + return hr; + if(!disp) + return E_FAIL; + + V_VT(focus) = VT_DISPATCH; + V_DISPATCH(focus) = disp; + } + } + + return S_OK; } static HRESULT WINAPI Client_get_accSelection(IAccessible *iface, VARIANT *pvarID)

1 0

Zhiyi Zhang : setupapi/tests: Add display device interface tests.
by Alexandre Julliard Sept. 20, 2021

Sept. 20, 2021

Module: wine Branch: master Commit: 5030f4cf26c31bc709d6565182b51af1165953a6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5030f4cf26c31bc709d65651… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Sep 20 08:56:16 2021 +0800 setupapi/tests: Add display device interface tests. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/tests/misc.c | 85 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 85 insertions(+) diff --git a/dlls/setupapi/tests/misc.c b/dlls/setupapi/tests/misc.c index f16f310b3f7..10ea7c0cba8 100644 --- a/dlls/setupapi/tests/misc.c +++ b/dlls/setupapi/tests/misc.c @@ -28,6 +28,9 @@ #include "winnls.h" #include "winuser.h" #include "winreg.h" +#include "devguid.h" +#include "initguid.h" +#include "ntddvdeo.h" #include "setupapi.h" #include "cfgmgr32.h" @@ -819,6 +822,87 @@ static void test_CM_Get_Version(void) ok(ret == 0x0400, "got version %#x\n", ret); } +#define check_device_interface(a, b) _check_device_interface(__LINE__, a, b) +static void _check_device_interface(int line, const char *instance_id, const GUID *guid) +{ + SP_DEVICE_INTERFACE_DATA iface_data = {sizeof(iface_data)}; + SP_DEVINFO_DATA device_data = {sizeof(device_data)}; + HDEVINFO devinfo; + BOOL ret; + + devinfo = SetupDiGetClassDevsA(guid, instance_id, NULL, DIGCF_DEVICEINTERFACE | DIGCF_PRESENT); + ret = SetupDiEnumDeviceInfo(devinfo, 0, &device_data); + ok_(__FILE__, line)(ret || broken(!ret) /* <= Win7 */, + "SetupDiEnumDeviceInfo failed, error %u.\n", GetLastError()); + if (!ret) + { + SetupDiDestroyDeviceInfoList(devinfo); + return; + } + ret = SetupDiEnumDeviceInterfaces(devinfo, &device_data, guid, 0, &iface_data); + ok_(__FILE__, line)(ret, "SetupDiEnumDeviceInterfaces failed, error %u.\n", GetLastError()); + ok_(__FILE__, line)(IsEqualGUID(&iface_data.InterfaceClassGuid, guid), + "Expected guid %s, got %s.\n", wine_dbgstr_guid(guid), + wine_dbgstr_guid(&iface_data.InterfaceClassGuid)); + + SetupDiDestroyDeviceInfoList(devinfo); +} + +static void test_device_interfaces(void) +{ + SP_DEVICE_INTERFACE_DATA iface_data = {sizeof(iface_data)}; + SP_DEVINFO_DATA device_data = {sizeof(device_data)}; + char instance_id[MAX_DEVICE_ID_LEN]; + DWORD device_idx = 0, size, error; + HDEVINFO devinfo; + BOOL ret; + + /* GPUs */ + devinfo = SetupDiGetClassDevsW(&GUID_DEVCLASS_DISPLAY, NULL, NULL, DIGCF_PRESENT); + ok(devinfo != INVALID_HANDLE_VALUE, "SetupDiGetClassDevsW failed, error %u.\n", GetLastError()); + while ((ret = SetupDiEnumDeviceInfo(devinfo, device_idx, &device_data))) + { + ret = SetupDiGetDeviceInstanceIdA(devinfo, &device_data, instance_id, + ARRAY_SIZE(instance_id), &size); + ok(ret, "SetupDiGetDeviceInstanceIdA failed, error %u.\n", GetLastError()); + + winetest_push_context("GPU %d", device_idx); + + check_device_interface(instance_id, &GUID_DEVINTERFACE_DISPLAY_ADAPTER); + check_device_interface(instance_id, &GUID_DISPLAY_DEVICE_ARRIVAL); + + winetest_pop_context(); + ++device_idx; + } + error = GetLastError(); + ok(error == ERROR_NO_MORE_ITEMS, "Expected error %u, got %u.\n", ERROR_NO_MORE_ITEMS, error); + ok(device_idx > 0, "Expected at least one GPU.\n"); + SetupDiDestroyDeviceInfoList(devinfo); + + /* Monitors */ + device_idx = 0; + devinfo = SetupDiGetClassDevsW(&GUID_DEVCLASS_MONITOR, L"DISPLAY", NULL, DIGCF_PRESENT); + ok(devinfo != INVALID_HANDLE_VALUE, "SetupDiGetClassDevsW failed, error %u.\n", GetLastError()); + while ((ret = SetupDiEnumDeviceInfo(devinfo, device_idx, &device_data))) + { + ret = SetupDiGetDeviceInstanceIdA(devinfo, &device_data, instance_id, + ARRAY_SIZE(instance_id), &size); + ok(ret, "SetupDiGetDeviceInstanceIdA failed, error %u.\n", GetLastError()); + + winetest_push_context("Monitor %d", device_idx); + + check_device_interface(instance_id, &GUID_DEVINTERFACE_MONITOR); + + winetest_pop_context(); + ++device_idx; + } + error = GetLastError(); + ok(error == ERROR_NO_MORE_ITEMS, "Expected error %u, got %u.\n", ERROR_NO_MORE_ITEMS, error); + ok(device_idx > 0 || broken(device_idx == 0) /* w7u_2qxl TestBot */, + "Expected at least one monitor.\n"); + SetupDiDestroyDeviceInfoList(devinfo); +} + START_TEST(misc) { HMODULE hsetupapi = GetModuleHandleA("setupapi.dll"); @@ -841,4 +925,5 @@ START_TEST(misc) test_defaultcallback(); test_SetupLogError(); test_CM_Get_Version(); + test_device_interfaces(); }

1 0

Jacek Caban : gdi32: Handle scalable fonts directly in AddFontResourceExW and RemoveFontResourceExW.
by Alexandre Julliard Sept. 20, 2021

Sept. 20, 2021

Module: wine Branch: master Commit: c332707df4b90803ff2e814f7f6d7bc2464300ea URL: https://source.winehq.org/git/wine.git/?a=commit;h=c332707df4b90803ff2e814f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 20 13:14:47 2021 +0200 gdi32: Handle scalable fonts directly in AddFontResourceExW and RemoveFontResourceExW. 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 | 101 -------------------------------------------------- dlls/gdi32/text.c | 109 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 107 insertions(+), 103 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 224dc6b3a77..07b4d248261 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -5560,91 +5560,6 @@ static BOOL CALLBACK load_enumed_resource(HMODULE hModule, LPCWSTR type, LPWSTR return TRUE; } -static void *map_file( const WCHAR *filename, LARGE_INTEGER *size ) -{ - HANDLE file, mapping; - void *ptr; - - file = CreateFileW( filename, GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL ); - if (file == INVALID_HANDLE_VALUE) return NULL; - - if (!GetFileSizeEx( file, size ) || size->u.HighPart) - { - CloseHandle( file ); - return NULL; - } - - mapping = CreateFileMappingW( file, NULL, PAGE_READONLY, 0, 0, NULL ); - CloseHandle( file ); - if (!mapping) return NULL; - - ptr = MapViewOfFile( mapping, FILE_MAP_READ, 0, 0, 0 ); - CloseHandle( mapping ); - - return ptr; -} - -static void *find_resource( BYTE *ptr, WORD type, DWORD rsrc_off, DWORD size, DWORD *len ) -{ - WORD align, type_id, count; - DWORD res_off; - - if (size < rsrc_off + 10) return NULL; - align = *(WORD *)(ptr + rsrc_off); - rsrc_off += 2; - type_id = *(WORD *)(ptr + rsrc_off); - while (type_id && type_id != type) - { - count = *(WORD *)(ptr + rsrc_off + 2); - rsrc_off += 8 + count * 12; - if (size < rsrc_off + 8) return NULL; - type_id = *(WORD *)(ptr + rsrc_off); - } - if (!type_id) return NULL; - count = *(WORD *)(ptr + rsrc_off + 2); - if (size < rsrc_off + 8 + count * 12) return NULL; - res_off = *(WORD *)(ptr + rsrc_off + 8) << align; - *len = *(WORD *)(ptr + rsrc_off + 10) << align; - if (size < res_off + *len) return NULL; - return ptr + res_off; -} - -static WCHAR *get_scalable_filename( const WCHAR *res, BOOL *hidden ) -{ - LARGE_INTEGER size; - BYTE *ptr = map_file( res, &size ); - const IMAGE_DOS_HEADER *dos; - const IMAGE_OS2_HEADER *ne; - WORD *fontdir; - char *data; - WCHAR *name = NULL; - DWORD len; - - if (!ptr) return NULL; - - if (size.u.LowPart < sizeof( *dos )) goto fail; - dos = (const IMAGE_DOS_HEADER *)ptr; - if (dos->e_magic != IMAGE_DOS_SIGNATURE) goto fail; - if (size.u.LowPart < dos->e_lfanew + sizeof( *ne )) goto fail; - ne = (const IMAGE_OS2_HEADER *)(ptr + dos->e_lfanew); - - fontdir = find_resource( ptr, 0x8007, dos->e_lfanew + ne->ne_rsrctab, size.u.LowPart, &len ); - if (!fontdir) goto fail; - *hidden = (fontdir[35] & 0x80) != 0; /* fontdir->dfType */ - - data = find_resource( ptr, 0x80cc, dos->e_lfanew + ne->ne_rsrctab, size.u.LowPart, &len ); - if (!data) goto fail; - if (!memchr( data, 0, len )) goto fail; - - len = MultiByteToWideChar( CP_ACP, 0, data, -1, NULL, 0 ); - name = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ); - if (name) MultiByteToWideChar( CP_ACP, 0, data, -1, name, len ); - -fail: - UnmapViewOfFile( ptr ); - return name; -} - static int add_system_font_resource( const WCHAR *file, DWORD flags ) { WCHAR path[MAX_PATH]; @@ -5967,8 +5882,6 @@ INT WINAPI NtGdiAddFontResourceW( const WCHAR *str, ULONG size, ULONG files, DWO DWORD tid, void *dv ) { int ret; - WCHAR *filename; - BOOL hidden; if (!font_funcs) return 1; if (!(ret = add_font_resource( str, flags ))) @@ -5986,12 +5899,6 @@ INT WINAPI NtGdiAddFontResourceW( const WCHAR *str, ULONG size, ULONG files, DWO ret = num_resources; FreeLibrary(hModule); } - else if ((filename = get_scalable_filename( str, &hidden )) != NULL) - { - if (hidden) flags |= FR_PRIVATE | FR_NOT_ENUM; - ret = add_font_resource( filename, flags ); - HeapFree( GetProcessHeap(), 0, filename ); - } } return ret; } @@ -6061,8 +5968,6 @@ BOOL WINAPI NtGdiRemoveFontResourceW( const WCHAR *str, ULONG size, ULONG files, DWORD tid, void *dv ) { int ret; - WCHAR *filename; - BOOL hidden; if (!font_funcs) return TRUE; @@ -6075,12 +5980,6 @@ BOOL WINAPI NtGdiRemoveFontResourceW( const WCHAR *str, ULONG size, ULONG files, WARN("Can't unload resources from PE file %s\n", wine_dbgstr_w(str)); FreeLibrary(hModule); } - else if ((filename = get_scalable_filename( str, &hidden )) != NULL) - { - if (hidden) flags |= FR_PRIVATE | FR_NOT_ENUM; - ret = remove_font_resource( filename, flags ); - HeapFree( GetProcessHeap(), 0, filename ); - } } return ret; } diff --git a/dlls/gdi32/text.c b/dlls/gdi32/text.c index b7c6706ef22..41333903c0c 100644 --- a/dlls/gdi32/text.c +++ b/dlls/gdi32/text.c @@ -2300,12 +2300,107 @@ BOOL WINAPI RemoveFontResourceExA( const char *str, DWORD fl, void *pdv ) return ret; } +static void *map_file( const WCHAR *filename, LARGE_INTEGER *size ) +{ + HANDLE file, mapping; + void *ptr; + + file = CreateFileW( filename, GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL ); + if (file == INVALID_HANDLE_VALUE) return NULL; + + if (!GetFileSizeEx( file, size ) || size->u.HighPart) + { + CloseHandle( file ); + return NULL; + } + + mapping = CreateFileMappingW( file, NULL, PAGE_READONLY, 0, 0, NULL ); + CloseHandle( file ); + if (!mapping) return NULL; + + ptr = MapViewOfFile( mapping, FILE_MAP_READ, 0, 0, 0 ); + CloseHandle( mapping ); + + return ptr; +} + +static void *find_resource( BYTE *ptr, WORD type, DWORD rsrc_off, DWORD size, DWORD *len ) +{ + WORD align, type_id, count; + DWORD res_off; + + if (size < rsrc_off + 10) return NULL; + align = *(WORD *)(ptr + rsrc_off); + rsrc_off += 2; + type_id = *(WORD *)(ptr + rsrc_off); + while (type_id && type_id != type) + { + count = *(WORD *)(ptr + rsrc_off + 2); + rsrc_off += 8 + count * 12; + if (size < rsrc_off + 8) return NULL; + type_id = *(WORD *)(ptr + rsrc_off); + } + if (!type_id) return NULL; + count = *(WORD *)(ptr + rsrc_off + 2); + if (size < rsrc_off + 8 + count * 12) return NULL; + res_off = *(WORD *)(ptr + rsrc_off + 8) << align; + *len = *(WORD *)(ptr + rsrc_off + 10) << align; + if (size < res_off + *len) return NULL; + return ptr + res_off; +} + +static WCHAR *get_scalable_filename( const WCHAR *res, BOOL *hidden ) +{ + LARGE_INTEGER size; + BYTE *ptr = map_file( res, &size ); + const IMAGE_DOS_HEADER *dos; + const IMAGE_OS2_HEADER *ne; + WORD *fontdir; + char *data; + WCHAR *name = NULL; + DWORD len; + + if (!ptr) return NULL; + + if (size.u.LowPart < sizeof( *dos )) goto fail; + dos = (const IMAGE_DOS_HEADER *)ptr; + if (dos->e_magic != IMAGE_DOS_SIGNATURE) goto fail; + if (size.u.LowPart < dos->e_lfanew + sizeof( *ne )) goto fail; + ne = (const IMAGE_OS2_HEADER *)(ptr + dos->e_lfanew); + + fontdir = find_resource( ptr, 0x8007, dos->e_lfanew + ne->ne_rsrctab, size.u.LowPart, &len ); + if (!fontdir) goto fail; + *hidden = (fontdir[35] & 0x80) != 0; /* fontdir->dfType */ + + data = find_resource( ptr, 0x80cc, dos->e_lfanew + ne->ne_rsrctab, size.u.LowPart, &len ); + if (!data) goto fail; + if (!memchr( data, 0, len )) goto fail; + + len = MultiByteToWideChar( CP_ACP, 0, data, -1, NULL, 0 ); + name = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ); + if (name) MultiByteToWideChar( CP_ACP, 0, data, -1, name, len ); + +fail: + UnmapViewOfFile( ptr ); + return name; +} + /*********************************************************************** * AddFontResourceExW (GDI32.@) */ INT WINAPI AddFontResourceExW( const WCHAR *str, DWORD flags, void *dv ) { - return NtGdiAddFontResourceW( str, 0, 1, flags, 0, dv ); + WCHAR *filename = NULL; + BOOL hidden; + INT ret; + + if ((ret = NtGdiAddFontResourceW( str, 0, 1, flags, 0, dv ))) return ret; + + if (!(filename = get_scalable_filename( str, &hidden ))) return 0; + if (hidden) flags |= FR_PRIVATE | FR_NOT_ENUM; + ret = NtGdiAddFontResourceW( filename, 0, 1, flags, 0, dv ); + HeapFree( GetProcessHeap(), 0, filename ); + return ret; } /*********************************************************************** @@ -2313,7 +2408,17 @@ INT WINAPI AddFontResourceExW( const WCHAR *str, DWORD flags, void *dv ) */ BOOL WINAPI RemoveFontResourceExW( const WCHAR *str, DWORD flags, void *dv ) { - return NtGdiRemoveFontResourceW( str, 0, 1, flags, 0, dv ); + WCHAR *filename = NULL; + BOOL hidden; + INT ret; + + if ((ret = NtGdiRemoveFontResourceW( str, 0, 1, flags, 0, dv ))) return ret; + + if (!(filename = get_scalable_filename( str, &hidden ))) return 0; + if (hidden) flags |= FR_PRIVATE | FR_NOT_ENUM; + ret = NtGdiRemoveFontResourceW( filename, 0, 1, flags, 0, dv ); + HeapFree( GetProcessHeap(), 0, filename ); + return ret; } /***********************************************************************

1 0

Connor McAdams : oleacc: Add Client_get_accFocus tests.
by Alexandre Julliard Sept. 20, 2021

Sept. 20, 2021

Module: wine Branch: master Commit: 1a3db363c6b4065af532a8db1e6309be753b1781 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1a3db363c6b4065af532a8db… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Mon Sep 20 18:03:31 2021 +0200 oleacc: Add Client_get_accFocus tests. 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 | 99 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 97 insertions(+), 2 deletions(-) diff --git a/dlls/oleacc/tests/main.c b/dlls/oleacc/tests/main.c index 97fc625ac8b..180113b29f9 100644 --- a/dlls/oleacc/tests/main.c +++ b/dlls/oleacc/tests/main.c @@ -916,11 +916,11 @@ static DWORD WINAPI default_client_thread(LPVOID param) static void test_default_client_accessible_object(void) { - IAccessible *acc; + IAccessible *acc, *win; IDispatch *disp; IOleWindow *ow; IEnumVARIANT *ev; - HWND chld, btn, hwnd, hwnd2; + HWND chld, chld2, btn, hwnd, hwnd2; HRESULT hr; VARIANT vid, v; BSTR str; @@ -939,6 +939,9 @@ static void test_default_client_accessible_object(void) btn = CreateWindowA("BUTTON", "btn &t &junk", WS_TABSTOP | WS_VISIBLE | WS_CHILD | BS_DEFPUSHBUTTON, 50, 0, 50, 50, hwnd, NULL, NULL, NULL); ok(btn != NULL, "CreateWindow failed\n"); + chld2 = CreateWindowA("static", "static &t &junk", WS_CHILD | WS_VISIBLE, + 0, 0, 50, 50, chld, NULL, NULL, NULL); + ok(chld2 != NULL, "CreateWindow failed\n"); hr = CreateStdAccessibleObject(NULL, OBJID_CLIENT, &IID_IAccessible, (void**)&acc); ok(hr == E_FAIL, "got %x\n", hr); @@ -1013,6 +1016,94 @@ static void test_default_client_accessible_object(void) ok(hr == E_INVALIDARG, "get_accChild returned %x\n", hr); ok(disp == NULL, "disp = %p\n", disp); + /* Neither the parent nor any child windows have focus, VT_EMPTY. */ + hr = IAccessible_get_accFocus(acc, &v); + ok(hr == S_OK, "hr %#x\n", hr); + ok(V_VT(&v) == VT_EMPTY, "V_VT(&v) = %d\n", V_VT(&v)); + + /* Set the focus to the parent window. */ + ShowWindow(hwnd, SW_SHOW); + SetFocus(hwnd); + hr = IAccessible_get_accFocus(acc, &v); + ok(hr == S_OK, "hr %#x\n", hr); + ok(V_VT(&v) == VT_I4, "V_VT(&v) = %d\n", V_VT(&v)); + ok(V_I4(&v) == CHILDID_SELF, "V_I4(&v) = %d\n", V_I4(&v)); + + /* Set focus to each child window. */ + SetFocus(btn); + hr = IAccessible_get_accFocus(acc, &v); + ok(hr == S_OK, "hr %#x\n", hr); + ok(V_VT(&v) == VT_DISPATCH, "V_VT(&v) = %d\n", V_VT(&v)); + ok(V_DISPATCH(&v) != NULL, "V_DISPATCH(&v) = %p\n", V_DISPATCH(&v)); + + hr = IDispatch_QueryInterface(V_DISPATCH(&v), &IID_IOleWindow, (void**)&ow); + ok(hr == S_OK, "got %x\n", hr); + hr = IOleWindow_GetWindow(ow, &hwnd2); + todo_wine ok(hr == S_OK, "got %x\n", hr); + todo_wine ok(btn == hwnd2, "hwnd2 = %p, expected %p\n", hwnd2, btn); + IOleWindow_Release(ow); + + hr = IDispatch_QueryInterface(V_DISPATCH(&v), &IID_IAccessible, (void**)&win); + ok(hr == S_OK, "got %x\n", hr); + IDispatch_Release(V_DISPATCH(&v)); + + V_VT(&vid) = VT_I4; + V_I4(&vid) = CHILDID_SELF; + hr = IAccessible_get_accRole(win, vid, &v); + todo_wine ok(hr == S_OK, "got %x\n", hr); + todo_wine ok(V_VT(&v) == VT_I4, "V_VT(&v) = %d\n", V_VT(&v)); + todo_wine ok(V_I4(&v) == ROLE_SYSTEM_WINDOW, "V_I4(&v) = %d\n", V_I4(&v)); + IAccessible_Release(win); + + SetFocus(chld); + hr = IAccessible_get_accFocus(acc, &v); + ok(hr == S_OK, "hr %#x\n", hr); + ok(V_VT(&v) == VT_DISPATCH, "V_VT(&v) = %d\n", V_VT(&v)); + ok(V_DISPATCH(&v) != NULL, "V_DISPATCH(&v) = %p\n", V_DISPATCH(&v)); + + hr = IDispatch_QueryInterface(V_DISPATCH(&v), &IID_IOleWindow, (void**)&ow); + ok(hr == S_OK, "got %x\n", hr); + hr = IOleWindow_GetWindow(ow, &hwnd2); + todo_wine ok(hr == S_OK, "got %x\n", hr); + todo_wine ok(chld == hwnd2, "hwnd2 = %p, expected %p\n", hwnd2, chld); + IOleWindow_Release(ow); + + hr = IDispatch_QueryInterface(V_DISPATCH(&v), &IID_IAccessible, (void**)&win); + ok(hr == S_OK, "got %x\n", hr); + IDispatch_Release(V_DISPATCH(&v)); + + hr = IAccessible_get_accRole(win, vid, &v); + todo_wine ok(hr == S_OK, "got %x\n", hr); + todo_wine ok(V_VT(&v) == VT_I4, "V_VT(&v) = %d\n", V_VT(&v)); + todo_wine ok(V_I4(&v) == ROLE_SYSTEM_WINDOW, "V_I4(&v) = %d\n", V_I4(&v)); + IAccessible_Release(win); + + /* Child of a child, still works on parent HWND. */ + SetFocus(chld2); + hr = IAccessible_get_accFocus(acc, &v); + ok(hr == S_OK, "hr %#x\n", hr); + ok(V_VT(&v) == VT_DISPATCH, "V_VT(&v) = %d\n", V_VT(&v)); + ok(V_DISPATCH(&v) != NULL, "V_DISPATCH(&v) = %p\n", V_DISPATCH(&v)); + + hr = IDispatch_QueryInterface(V_DISPATCH(&v), &IID_IOleWindow, (void**)&ow); + ok(hr == S_OK, "got %x\n", hr); + hr = IOleWindow_GetWindow(ow, &hwnd2); + todo_wine ok(hr == S_OK, "got %x\n", hr); + todo_wine ok(chld2 == hwnd2, "hwnd2 = %p, expected %p\n", hwnd2, chld2); + IOleWindow_Release(ow); + + hr = IDispatch_QueryInterface(V_DISPATCH(&v), &IID_IAccessible, (void**)&win); + ok(hr == S_OK, "got %x\n", hr); + IDispatch_Release(V_DISPATCH(&v)); + + hr = IAccessible_get_accRole(win, vid, &v); + todo_wine ok(hr == S_OK, "got %x\n", hr); + todo_wine ok(V_VT(&v) == VT_I4, "V_VT(&v) = %d\n", V_VT(&v)); + todo_wine ok(V_I4(&v) == ROLE_SYSTEM_WINDOW, "V_I4(&v) = %d\n", V_I4(&v)); + IAccessible_Release(win); + + ShowWindow(hwnd, SW_HIDE); + hr = IAccessible_QueryInterface(acc, &IID_IEnumVARIANT, (void**)&ev); ok(hr == S_OK, "got %x\n", hr); @@ -1195,6 +1286,10 @@ static void test_default_client_accessible_object(void) ok(V_VT(&v) == VT_I4, "V_VT(&v) = %d\n", V_VT(&v)); ok(V_I4(&v) == STATE_SYSTEM_INVISIBLE, "V_I4(&v) = %x\n", V_I4(&v)); + hr = IAccessible_get_accFocus(acc, &v); + ok(hr == S_OK, "hr %#x\n", hr); + ok(V_VT(&v) == VT_EMPTY, "V_VT(&v) = %d\n", V_VT(&v)); + hr = IAccessible_accHitTest(acc, 200, 200, &v); ok(hr == S_OK, "got %x\n", hr); ok(V_VT(&v) == VT_I4, "V_VT(&v) = %d\n", V_VT(&v));

1 0

Jacek Caban : include: Add some missing ntgdi declarations.
by Alexandre Julliard Sept. 20, 2021

Sept. 20, 2021

Module: wine Branch: master Commit: c630576b47c7fbe109936c50e645822df7b20451 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c630576b47c7fbe109936c50… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 20 13:12:53 2021 +0200 include: Add some missing ntgdi declarations. 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/driver.c | 8 +++---- include/d3dukmdt.h | 13 ++++++++++ include/ddk/d3dkmthk.h | 27 +++++++++++++++++++++ include/ntgdi.h | 64 +++++++++++++++++++++++++++----------------------- 4 files changed, 79 insertions(+), 33 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c630576b47c7fbe10993…

1 0