wine-commits September 2021

wine-commits@winehq.org

2 participants
1030 discussions

Connor McAdams : oleacc: Add Client_get_accFocus tests.
by Alexandre Julliard 20 Sep '21

20 Sep '21

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

Connor McAdams : oleacc: Add Client_get_accFocus implementation.
by Alexandre Julliard 20 Sep '21

20 Sep '21

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

Jacek Caban : gdi32: Handle scalable fonts directly in AddFontResourceExW and RemoveFontResourceExW.
by Alexandre Julliard 20 Sep '21

20 Sep '21

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

Jacek Caban : gdi32: Move CreateScalableFontResourceW to text.c.
by Alexandre Julliard 20 Sep '21

20 Sep '21

Module: wine Branch: master Commit: 0d35d2aa19d562dea8b62405fba01a37d0daf7a3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0d35d2aa19d562dea8b62405… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 20 13:14:14 2021 +0200 gdi32: Move CreateScalableFontResourceW to text.c. 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 | 248 +--------------------------------------------- dlls/gdi32/gdi_private.h | 2 + dlls/gdi32/text.c | 251 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 257 insertions(+), 244 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0d35d2aa19d562dea8b6…

1 0

Jacek Caban : gdi32: Move load_script_name call to EnumFontFamiliesExW.
by Alexandre Julliard 20 Sep '21

20 Sep '21

Module: wine Branch: master Commit: c5d71400546706f9fa38275a629ec1a8c8fc9b07 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c5d71400546706f9fa38275a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 20 13:13:47 2021 +0200 gdi32: Move load_script_name call to EnumFontFamiliesExW. 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 | 32 ++++---------------------------- dlls/gdi32/gdi_private.h | 2 ++ dlls/gdi32/text.c | 25 +++++++++++++++++++++++++ 3 files changed, 31 insertions(+), 28 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 839244545cb..95a6bad3b92 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -32,7 +32,6 @@ #include "winternl.h" #include "winreg.h" #include "ntgdi_private.h" -#include "resource.h" #include "wine/exception.h" #include "wine/heap.h" #include "wine/rbtree.h" @@ -2589,29 +2588,6 @@ struct enum_charset DWORD script; }; -static int load_script_name( UINT id, WCHAR buffer[LF_FACESIZE] ) -{ - HRSRC rsrc; - HGLOBAL hMem; - WCHAR *p; - int i; - - id += IDS_FIRST_SCRIPT; - rsrc = FindResourceW( gdi32_module, (LPCWSTR)(ULONG_PTR)((id >> 4) + 1), (LPCWSTR)6 /*RT_STRING*/ ); - if (!rsrc) return 0; - hMem = LoadResource( gdi32_module, rsrc ); - if (!hMem) return 0; - - p = LockResource( hMem ); - id &= 0x000f; - while (id--) p += *p + 1; - - i = min(LF_FACESIZE - 1, *p); - memcpy(buffer, p + 1, i * sizeof(WCHAR)); - buffer[i] = 0; - return i; -} - static BOOL is_complex_script_ansi_cp( UINT ansi_cp ) { return (ansi_cp == 874 /* Thai */ @@ -2678,7 +2654,7 @@ static DWORD create_enum_charset_list(DWORD charset, struct enum_charset *list) { list->mask = ~mask; list->charset = DEFAULT_CHARSET; - list->script = IDS_OTHER - IDS_FIRST_SCRIPT; + list->script = 33; /* other */ list++; } } @@ -2834,7 +2810,7 @@ static BOOL enum_face_charsets( const struct gdi_font_family *family, struct gdi if (face->fs.fsCsb[0] == 0) /* OEM */ { elf.elfLogFont.lfCharSet = ntm.ntmTm.tmCharSet = OEM_CHARSET; - load_script_name( IDS_OEM_DOS - IDS_FIRST_SCRIPT, elf.elfScript ); + elf.elfScript[0] = 32; i = count; /* break out of loop after enumeration */ } else @@ -2843,8 +2819,8 @@ static BOOL enum_face_charsets( const struct gdi_font_family *family, struct gdi /* use the DEFAULT_CHARSET case only if no other charset is present */ if (list[i].charset == DEFAULT_CHARSET && (face->fs.fsCsb[0] & ~list[i].mask)) continue; elf.elfLogFont.lfCharSet = ntm.ntmTm.tmCharSet = list[i].charset; - load_script_name( list[i].script, elf.elfScript ); - if (!elf.elfScript[0]) FIXME("Unknown elfscript for id %u\n", list[i].script); + /* caller may fill elfScript with the actual string, see load_script_name */ + elf.elfScript[0] = list[i].script; } TRACE( "face %s full %s style %s charset = %d type %d script %s it %d weight %d ntmflags %08x\n", debugstr_w(elf.elfLogFont.lfFaceName), debugstr_w(elf.elfFullName), debugstr_w(elf.elfStyle), diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 238ae3b7de1..cf09cf85ad4 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -299,4 +299,6 @@ static inline int get_dib_info_size( const BITMAPINFO *info, UINT coloruse ) return FIELD_OFFSET( BITMAPINFO, bmiColors[info->bmiHeader.biClrUsed] ); } +extern HMODULE gdi32_module DECLSPEC_HIDDEN; + #endif /* __WINE_GDI_PRIVATE_H */ diff --git a/dlls/gdi32/text.c b/dlls/gdi32/text.c index 4037eaa4b65..641c15aab70 100644 --- a/dlls/gdi32/text.c +++ b/dlls/gdi32/text.c @@ -54,6 +54,7 @@ #include "usp10.h" #include "wine/debug.h" #include "gdi_private.h" +#include "resource.h" WINE_DEFAULT_DEBUG_CHANNEL(bidi); @@ -2037,6 +2038,29 @@ BOOL WINAPI GdiRealizationInfo( HDC hdc, struct realization_info *info ) return TRUE; } +static void load_script_name( UINT id, WCHAR buffer[LF_FACESIZE] ) +{ + HRSRC rsrc; + HGLOBAL hMem; + WCHAR *p; + int i; + + id += IDS_FIRST_SCRIPT; + buffer[0] = 0; + rsrc = FindResourceW( gdi32_module, (LPCWSTR)(ULONG_PTR)((id >> 4) + 1), (LPCWSTR)6 /*RT_STRING*/ ); + if (!rsrc) return; + hMem = LoadResource( gdi32_module, rsrc ); + if (!hMem) return; + + p = LockResource( hMem ); + id &= 0x000f; + while (id--) p += *p + 1; + + i = min( LF_FACESIZE - 1, *p ); + memcpy( buffer, p + 1, i * sizeof(WCHAR) ); + buffer[i] = 0; +} + /*********************************************************************** * EnumFontFamiliesExW (GDI32.@) */ @@ -2072,6 +2096,7 @@ INT WINAPI EnumFontFamiliesExW( HDC hdc, LOGFONTW *lf, FONTENUMPROCW efproc, count /= sizeof(*entries); for (i = 0; ret && i < count; i++) { + load_script_name( entries[i].lf.elfScript[0], entries[i].lf.elfScript ); ret = efproc( (const LOGFONTW *)&entries[i].lf, (const TEXTMETRICW *)&entries[i].tm, entries[i].type, lparam ); }

1 0

Jacek Caban : include: Add some missing ntgdi declarations.
by Alexandre Julliard 20 Sep '21

20 Sep '21

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

Alexandre Julliard : winegcc: Skip the post-link steps for Unix libraries.
by Alexandre Julliard 20 Sep '21

20 Sep '21

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

Alexandre Julliard : makefiles: Make -mno-cygwin the default.
by Alexandre Julliard 20 Sep '21

20 Sep '21

1 0

Alexandre Julliard : makefiles: Add a -mcygwin flag to specify the inverse of -mno-cygwin.
by Alexandre Julliard 20 Sep '21

20 Sep '21

1 0

Alexandre Julliard : makefiles: Link with the full library name for Unix library imports.
by Alexandre Julliard 20 Sep '21

20 Sep '21

Module: wine Branch: master Commit: eda25a58c5e886bde89cce6b05c299646a0a667e URL: https://source.winehq.org/git/wine.git/?a=commit;h=eda25a58c5e886bde89cce6b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 20 15:30:27 2021 +0200 makefiles: Link with the full library name for Unix library imports. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 39 ++++++++++++++++++++++++--------------- 1 file changed, 24 insertions(+), 15 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index acc3dc67e25..7a3b55421aa 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2111,6 +2111,18 @@ static const char *get_static_lib( const struct makefile *make, const char *name } +/******************************************************************* + * get_native_unix_lib + */ +static const char *get_native_unix_lib( const struct makefile *make, const char *name ) +{ + if (!make->unixlib) return NULL; + if (strncmp( make->unixlib, name, strlen(name) )) return NULL; + if (make->unixlib[strlen(name)] != '.') return NULL; + return obj_dir_path( make, make->unixlib ); +} + + /******************************************************************* * get_parent_makefile */ @@ -2162,13 +2174,15 @@ static int needs_implib_symlink( const struct makefile *make ) /******************************************************************* * add_unix_libraries */ -static struct strarray add_unix_libraries( const struct makefile *make, struct strarray *deps ) +static struct strarray add_unix_libraries( const struct makefile *make, struct strarray *deps, + int native_unix ) { struct strarray ret = empty_strarray; struct strarray all_libs = empty_strarray; unsigned int i, j; strarray_add( &all_libs, "-lwine_port" ); + if (native_unix && strcmp( make->module, "ntdll.dll" )) strarray_add( &all_libs, "-lntdll" ); strarray_addall( &all_libs, get_expanded_make_var_array( make, "EXTRALIBS" )); strarray_addall( &all_libs, libs ); @@ -2182,6 +2196,9 @@ static struct strarray add_unix_libraries( const struct makefile *make, struct s for (j = 0; j < subdirs.count; j++) if ((lib = get_static_lib( submakes[j], name ))) break; + if (!lib && native_unix) + for (j = 0; j < subdirs.count; j++) + if ((lib = get_native_unix_lib( submakes[j], name ))) break; } if (lib) @@ -3325,7 +3342,7 @@ static void output_module( struct makefile *make ) } else if (*dll_ext) { - if (!make->use_msvcrt) strarray_addall( &all_libs, add_unix_libraries( make, &dep_libs )); + if (!make->use_msvcrt) strarray_addall( &all_libs, add_unix_libraries( make, &dep_libs, 0 )); for (i = 0; i < make->delayimports.count; i++) strarray_add( &all_libs, strmake( "-Wl,-delayload,%s%s", make->delayimports.str[i], strchr( make->delayimports.str[i], '.' ) ? "" : ".dll" )); @@ -3339,7 +3356,7 @@ static void output_module( struct makefile *make ) } else { - strarray_addall( &all_libs, add_unix_libraries( make, &dep_libs )); + strarray_addall( &all_libs, add_unix_libraries( make, &dep_libs, 0 )); strarray_add( &make->all_targets, make->module ); add_install_rule( make, make->module, make->module, strmake( "p$(%s)/%s", spec_file ? "dlldir" : "bindir", make->module )); @@ -3376,15 +3393,7 @@ static void output_module( struct makefile *make ) struct strarray extra_libs = get_expanded_make_var_array( make, "EXTRALIBS" ); int native_unix_lib = strarray_exists( &extra_libs, "-Wl,--subsystem,unixlib" ); - if (native_unix_lib) - { - if (strcmp( make->module, "ntdll.dll" )) - { - strarray_add( &unix_libs, "-lntdll" ); - strarray_add( &unix_deps, obj_dir_path( top_makefile, "dlls/ntdll/ntdll.so" )); - } - } - else + if (!native_unix_lib) { struct strarray unix_imports = empty_strarray; @@ -3399,7 +3408,7 @@ static void output_module( struct makefile *make ) strarray_addall( &unix_libs, add_import_libs( make, &unix_deps, unix_imports, 0, 1 )); } - strarray_addall( &unix_libs, add_unix_libraries( make, &unix_deps )); + strarray_addall( &unix_libs, add_unix_libraries( make, &unix_deps, native_unix_lib )); strarray_add( &make->all_targets, make->unixlib ); add_install_rule( make, make->module, make->unixlib, strmake( "p%s/%s", so_dir, make->unixlib )); @@ -3546,7 +3555,7 @@ static void output_shared_lib( struct makefile *make ) strarray_addall( &dep_libs, get_local_dependencies( make, basename, make->in_files )); strarray_addall( &all_libs, get_expanded_file_local_var( make, basename, "LDFLAGS" )); - strarray_addall( &all_libs, add_unix_libraries( make, &dep_libs )); + strarray_addall( &all_libs, add_unix_libraries( make, &dep_libs, 0 )); output( "%s:", obj_dir_path( make, make->sharedlib )); output_filenames_obj_dir( make, make->object_files ); @@ -3660,7 +3669,7 @@ static void output_programs( struct makefile *make ) if (!objs.count) objs = make->object_files; if (!strarray_exists( &all_libs, "-nodefaultlibs" )) - strarray_addall( &all_libs, add_unix_libraries( make, &deps )); + strarray_addall( &all_libs, add_unix_libraries( make, &deps, 0 )); output( "%s:", obj_dir_path( make, program ) ); output_filenames_obj_dir( make, objs );

1 0

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-commits September 2021