wine-commits July 2022

wine-commits@winehq.org

1 participants
639 discussions

Nikolay Sivov : dwrite: Override existing ranges with AddMapping().
by Alexandre Julliard 22 Jul '22

22 Jul '22

Module: wine Branch: master Commit: f2ad1d8b93f36a05b05b6b206767d916fc616576 URL: https://gitlab.winehq.org/wine/wine/-/commit/f2ad1d8b93f36a05b05b6b206767d9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jul 17 18:32:34 2022 +0300 dwrite: Override existing ranges with AddMapping(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/analyzer.c | 41 ++++++++++++++++++++++++++++++++++++++--- 1 file changed, 38 insertions(+), 3 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index c6c4fa2d654..e4a52fa95a6 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -2452,7 +2452,7 @@ static HRESULT WINAPI fontfallbackbuilder_AddMapping(IDWriteFontFallbackBuilder struct dwrite_fontfallback_builder *builder = impl_from_IDWriteFontFallbackBuilder(iface); struct fallback_mapping *mapping; struct fallback_locale *locale; - unsigned int i, count; + unsigned int i, j, m, count; TRACE("%p, %p, %u, %p, %u, %p, %s, %s, %f.\n", iface, ranges, ranges_count, families, families_count, collection, debugstr_w(locale_name), debugstr_w(base_family), scale); @@ -2502,12 +2502,47 @@ static HRESULT WINAPI fontfallbackbuilder_AddMapping(IDWriteFontFallbackBuilder mapping->families_count = families_count; for (i = 0; i < families_count; i++) if (!(mapping->families[i] = wcsdup(families[i]))) goto failed; + mapping->scale = scale; + + if (FAILED(fallback_locale_add_mapping(locale, builder->data.count))) goto failed; + + /* Mappings with explicit collections take priority, for that reduce existing mappings ranges + by newly added ranges. */ + mapping->collection = collection; if (mapping->collection) + { IDWriteFontCollection_AddRef(mapping->collection); - mapping->scale = scale; - if (FAILED(fallback_locale_add_mapping(locale, builder->data.count))) goto failed; + for (m = 0; m < builder->data.count; ++m) + { + struct fallback_mapping *c = &builder->data.mappings[m]; + if (c->collection) continue; + for (i = 0; i < count; ++i) + { + const DWRITE_UNICODE_RANGE *new_range = &mapping->ranges[i]; + + for (j = 0; j < c->ranges_count; ++j) + { + DWRITE_UNICODE_RANGE *range = &c->ranges[j]; + + /* In case existing ranges intersect, disable or reduce them */ + if (range->first >= new_range->first && range->last <= new_range->last) + { + range->first = range->last = ~0u; + } + else if (range->first >= new_range->first && range->first <= new_range->last) + { + range->first = new_range->last; + } + else if (range->last >= new_range->first && range->last <= new_range->last) + { + range->last = new_range->first; + } + } + } + } + } builder->data.count++; return S_OK;

1 0

Nikolay Sivov : dwrite: Keep locales separate for fallback data.
by Alexandre Julliard 22 Jul '22

22 Jul '22

Module: wine Branch: master Commit: 76e675a011dddcb141414c56d0da767aa3fd88e4 URL: https://gitlab.winehq.org/wine/wine/-/commit/76e675a011dddcb141414c56d0da76… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jul 17 17:42:59 2022 +0300 dwrite: Keep locales separate for fallback data. Each locale entry contains a "list" of its mappings. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/analyzer.c | 93 +++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 89 insertions(+), 4 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 1522d7638bc..c6c4fa2d654 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -220,16 +220,78 @@ static const DWRITE_UNICODE_RANGE cjk_ranges[] = { 0x4e00, 0x9fff }, /* CJK Unified Ideographs */ }; -struct fallback_mapping { +struct fallback_mapping +{ DWRITE_UNICODE_RANGE *ranges; UINT32 ranges_count; WCHAR **families; UINT32 families_count; IDWriteFontCollection *collection; - WCHAR *locale; - FLOAT scale; + float scale; +}; + +struct fallback_locale +{ + struct list entry; + WCHAR name[LOCALE_NAME_MAX_LENGTH]; + struct + { + size_t *data; + size_t count; + size_t size; + } ranges; }; +static void fallback_locale_list_destroy(struct list *locales) +{ + struct fallback_locale *cur, *cur2; + + LIST_FOR_EACH_ENTRY_SAFE(cur, cur2, locales, struct fallback_locale, entry) + { + list_remove(&cur->entry); + free(cur->ranges.data); + free(cur); + } +} + +static HRESULT fallback_locale_add_mapping(struct fallback_locale *locale, size_t index) +{ + size_t count = locale->ranges.count; + + /* Append to last range, or start a new one. */ + if (count && locale->ranges.data[count - 1] == (index - 1)) + { + locale->ranges.data[count - 1] = index; + return S_OK; + } + + if (!dwrite_array_reserve((void **)&locale->ranges.data, &locale->ranges.size, count + 2, + sizeof(*locale->ranges.data))) + { + return E_OUTOFMEMORY; + } + + locale->ranges.data[count] = locale->ranges.data[count + 1] = index; + locale->ranges.count += 2; + + return S_OK; +} + +/* TODO: potentially needs improvement to consider partially matching locale names. */ +static struct fallback_locale * font_fallback_get_locale(const struct list *locales, + const WCHAR *locale_name) +{ + struct fallback_locale *locale, *neutral = NULL; + + LIST_FOR_EACH_ENTRY(locale, locales, struct fallback_locale, entry) + { + if (!wcsicmp(locale->name, locale_name)) return locale; + if (!*locale->name) neutral = locale; + } + + return neutral; +} + static const struct fallback_mapping fontfallback_neutral_data[] = { #define MAPPING_RANGE(ranges, families) \ { (DWRITE_UNICODE_RANGE *)ranges, ARRAY_SIZE(ranges), \ @@ -244,6 +306,7 @@ struct fallback_data { struct fallback_mapping *mappings; size_t count; + struct list locales; }; struct dwrite_fontfallback @@ -284,6 +347,7 @@ static void release_fallback_data(struct fallback_data *data) for (i = 0; i < data->count; ++i) release_fallback_mapping(&data->mappings[i]); free(data->mappings); + fallback_locale_list_destroy(&data->locales); } struct dwrite_numbersubstitution @@ -2368,12 +2432,26 @@ static ULONG WINAPI fontfallbackbuilder_Release(IDWriteFontFallbackBuilder *ifac return refcount; } +static struct fallback_locale * fallback_builder_add_locale(struct dwrite_fontfallback_builder *builder, + const WCHAR *locale_name) +{ + struct fallback_locale *locale; + + if (!locale_name) locale_name = L""; + if ((locale = font_fallback_get_locale(&builder->data.locales, locale_name))) return locale; + if (!(locale = calloc(1, sizeof(*locale)))) return NULL; + lstrcpynW(locale->name, locale_name, ARRAY_SIZE(locale->name)); + list_add_tail(&builder->data.locales, &locale->entry); + return locale; +} + static HRESULT WINAPI fontfallbackbuilder_AddMapping(IDWriteFontFallbackBuilder *iface, const DWRITE_UNICODE_RANGE *ranges, UINT32 ranges_count, WCHAR const **families, UINT32 families_count, IDWriteFontCollection *collection, WCHAR const *locale_name, WCHAR const *base_family, float scale) { struct dwrite_fontfallback_builder *builder = impl_from_IDWriteFontFallbackBuilder(iface); struct fallback_mapping *mapping; + struct fallback_locale *locale; unsigned int i, count; TRACE("%p, %p, %u, %p, %u, %p, %s, %s, %f.\n", iface, ranges, ranges_count, families, families_count, @@ -2394,6 +2472,11 @@ static HRESULT WINAPI fontfallbackbuilder_AddMapping(IDWriteFontFallbackBuilder mapping = &builder->data.mappings[builder->data.count]; memset(mapping, 0, sizeof(*mapping)); + /* Append new mapping, link to its locale node. */ + + if (!(locale = fallback_builder_add_locale(builder, locale_name))) + return E_FAIL; + if (!(mapping->ranges = calloc(ranges_count, sizeof(*mapping->ranges)))) goto failed; @@ -2422,9 +2505,10 @@ static HRESULT WINAPI fontfallbackbuilder_AddMapping(IDWriteFontFallbackBuilder mapping->collection = collection; if (mapping->collection) IDWriteFontCollection_AddRef(mapping->collection); - mapping->locale = wcsdup(locale_name); mapping->scale = scale; + if (FAILED(fallback_locale_add_mapping(locale, builder->data.count))) goto failed; + builder->data.count++; return S_OK; @@ -2485,6 +2569,7 @@ HRESULT create_fontfallback_builder(IDWriteFactory7 *factory, IDWriteFontFallbac builder->refcount = 1; builder->factory = factory; IDWriteFactory7_AddRef(builder->factory); + list_init(&builder->data.locales); *ret = &builder->IDWriteFontFallbackBuilder_iface; return S_OK;

1 0

Nikolay Sivov : dwrite: Filter out unusable ranges on AddMapping().
by Alexandre Julliard 22 Jul '22

22 Jul '22

Module: wine Branch: master Commit: 78846236b938b1c5f2d2221ed0050656b54fb08e URL: https://gitlab.winehq.org/wine/wine/-/commit/78846236b938b1c5f2d2221ed00506… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jul 16 15:13:01 2022 +0300 dwrite: Filter out unusable ranges on AddMapping(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/analyzer.c | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 2f5f1e1d7fe..1522d7638bc 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -2374,7 +2374,7 @@ static HRESULT WINAPI fontfallbackbuilder_AddMapping(IDWriteFontFallbackBuilder { struct dwrite_fontfallback_builder *builder = impl_from_IDWriteFontFallbackBuilder(iface); struct fallback_mapping *mapping; - UINT32 i; + unsigned int i, count; TRACE("%p, %p, %u, %p, %u, %p, %s, %s, %f.\n", iface, ranges, ranges_count, families, families_count, collection, debugstr_w(locale_name), debugstr_w(base_family), scale); @@ -2397,8 +2397,22 @@ static HRESULT WINAPI fontfallbackbuilder_AddMapping(IDWriteFontFallbackBuilder if (!(mapping->ranges = calloc(ranges_count, sizeof(*mapping->ranges)))) goto failed; - mapping->ranges_count = ranges_count; - memcpy(mapping->ranges, ranges, sizeof(*mapping->ranges) * ranges_count); + /* Filter ranges that won't be usable. */ + for (i = 0, count = 0; i < ranges_count; ++i) + { + if (ranges[i].first > ranges[i].last) continue; + if (ranges[i].first > 0x10ffff) continue; + mapping->ranges[count].first = ranges[i].first; + mapping->ranges[count].last = min(ranges[i].last, 0x10ffff); + count++; + } + if (!count) + { + release_fallback_mapping(mapping); + return S_OK; + } + + mapping->ranges_count = count; if (!(mapping->families = calloc(families_count, sizeof(*mapping->families)))) goto failed;

1 0

Nikolay Sivov : dwrite: Add additional structure for mappings array.
by Alexandre Julliard 22 Jul '22

22 Jul '22

Module: wine Branch: master Commit: 1cf2ac20c8587504c32d85854737d103bc9c624a URL: https://gitlab.winehq.org/wine/wine/-/commit/1cf2ac20c8587504c32d85854737d1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jul 16 15:01:20 2022 +0300 dwrite: Add additional structure for mappings array. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/analyzer.c | 96 ++++++++++++++++++++++++++++++-------------------- 1 file changed, 58 insertions(+), 38 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index a8ab12b9430..2f5f1e1d7fe 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -240,6 +240,12 @@ static const struct fallback_mapping fontfallback_neutral_data[] = { #undef MAPPING_RANGE }; +struct fallback_data +{ + struct fallback_mapping *mappings; + size_t count; +}; + struct dwrite_fontfallback { IDWriteFontFallback1 IDWriteFontFallback1_iface; @@ -255,11 +261,31 @@ struct dwrite_fontfallback_builder IDWriteFontFallbackBuilder IDWriteFontFallbackBuilder_iface; LONG refcount; IDWriteFactory7 *factory; - struct fallback_mapping *mappings; - size_t size; - size_t count; + struct fallback_data data; + size_t mappings_size; }; +static void release_fallback_mapping(struct fallback_mapping *mapping) +{ + unsigned int i; + + free(mapping->ranges); + for (i = 0; i < mapping->families_count; ++i) + free(mapping->families[i]); + free(mapping->families); + if (mapping->collection) + IDWriteFontCollection_Release(mapping->collection); +} + +static void release_fallback_data(struct fallback_data *data) +{ + size_t i; + + for (i = 0; i < data->count; ++i) + release_fallback_mapping(&data->mappings[i]); + free(data->mappings); +} + struct dwrite_numbersubstitution { IDWriteNumberSubstitution IDWriteNumberSubstitution_iface; @@ -2327,76 +2353,70 @@ static ULONG WINAPI fontfallbackbuilder_AddRef(IDWriteFontFallbackBuilder *iface static ULONG WINAPI fontfallbackbuilder_Release(IDWriteFontFallbackBuilder *iface) { - struct dwrite_fontfallback_builder *fallbackbuilder = impl_from_IDWriteFontFallbackBuilder(iface); - ULONG refcount = InterlockedDecrement(&fallbackbuilder->refcount); - size_t i; + struct dwrite_fontfallback_builder *builder = impl_from_IDWriteFontFallbackBuilder(iface); + ULONG refcount = InterlockedDecrement(&builder->refcount); TRACE("%p, refcount %ld.\n", iface, refcount); if (!refcount) { - for (i = 0; i < fallbackbuilder->count; ++i) - { - struct fallback_mapping *mapping = &fallbackbuilder->mappings[i]; - UINT32 j; - - for (j = 0; j < mapping->families_count; j++) - free(mapping->families[j]); - free(mapping->families); - - if (mapping->collection) - IDWriteFontCollection_Release(mapping->collection); - free(mapping->ranges); - free(mapping->locale); - } - - IDWriteFactory7_Release(fallbackbuilder->factory); - free(fallbackbuilder->mappings); - free(fallbackbuilder); + IDWriteFactory7_Release(builder->factory); + release_fallback_data(&builder->data); + free(builder); } return refcount; } static HRESULT WINAPI fontfallbackbuilder_AddMapping(IDWriteFontFallbackBuilder *iface, - const DWRITE_UNICODE_RANGE *ranges, UINT32 ranges_count, WCHAR const **target_families, UINT32 families_count, - IDWriteFontCollection *collection, WCHAR const *locale, WCHAR const *base_family, FLOAT scale) + const DWRITE_UNICODE_RANGE *ranges, UINT32 ranges_count, WCHAR const **families, UINT32 families_count, + IDWriteFontCollection *collection, WCHAR const *locale_name, WCHAR const *base_family, float scale) { - struct dwrite_fontfallback_builder *fallbackbuilder = impl_from_IDWriteFontFallbackBuilder(iface); + struct dwrite_fontfallback_builder *builder = impl_from_IDWriteFontFallbackBuilder(iface); struct fallback_mapping *mapping; UINT32 i; - TRACE("%p, %p, %u, %p, %u, %p, %s, %s, %f.\n", iface, ranges, ranges_count, target_families, families_count, - collection, debugstr_w(locale), debugstr_w(base_family), scale); + TRACE("%p, %p, %u, %p, %u, %p, %s, %s, %f.\n", iface, ranges, ranges_count, families, families_count, + collection, debugstr_w(locale_name), debugstr_w(base_family), scale); - if (!ranges || ranges_count == 0 || !target_families || families_count == 0 || scale < 0.0f) + if (!ranges || !ranges_count || !families || !families_count || scale < 0.0f) return E_INVALIDARG; if (base_family) FIXME("base family ignored.\n"); - if (!dwrite_array_reserve((void **)&fallbackbuilder->mappings, &fallbackbuilder->size, fallbackbuilder->count + 1, - sizeof(*fallbackbuilder->mappings))) + if (!dwrite_array_reserve((void **)&builder->data.mappings, &builder->mappings_size, + builder->data.count + 1, sizeof(*builder->data.mappings))) { return E_OUTOFMEMORY; } - mapping = &fallbackbuilder->mappings[fallbackbuilder->count++]; + mapping = &builder->data.mappings[builder->data.count]; + memset(mapping, 0, sizeof(*mapping)); + + if (!(mapping->ranges = calloc(ranges_count, sizeof(*mapping->ranges)))) + goto failed; - mapping->ranges = calloc(ranges_count, sizeof(*mapping->ranges)); - memcpy(mapping->ranges, ranges, sizeof(*mapping->ranges) * ranges_count); mapping->ranges_count = ranges_count; - mapping->families = calloc(families_count, sizeof(*mapping->families)); + memcpy(mapping->ranges, ranges, sizeof(*mapping->ranges) * ranges_count); + + if (!(mapping->families = calloc(families_count, sizeof(*mapping->families)))) + goto failed; mapping->families_count = families_count; for (i = 0; i < families_count; i++) - mapping->families[i] = wcsdup(target_families[i]); + if (!(mapping->families[i] = wcsdup(families[i]))) goto failed; mapping->collection = collection; if (mapping->collection) IDWriteFontCollection_AddRef(mapping->collection); - mapping->locale = wcsdup(locale); + mapping->locale = wcsdup(locale_name); mapping->scale = scale; + builder->data.count++; return S_OK; + +failed: + release_fallback_mapping(mapping); + return E_OUTOFMEMORY; } static HRESULT WINAPI fontfallbackbuilder_AddMappings(IDWriteFontFallbackBuilder *iface, IDWriteFontFallback *fallback)

1 0

Nikolay Sivov : dwrite: Use older interface version for fallback system collection.
by Alexandre Julliard 22 Jul '22

22 Jul '22

Module: wine Branch: master Commit: c4af69e0b764ed3a8351c48a751ccf7f9b13289b URL: https://gitlab.winehq.org/wine/wine/-/commit/c4af69e0b764ed3a8351c48a751ccf… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jul 16 13:22:20 2022 +0300 dwrite: Use older interface version for fallback system collection. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/analyzer.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 7ffcfa8070c..a8ab12b9430 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -245,7 +245,7 @@ struct dwrite_fontfallback IDWriteFontFallback1 IDWriteFontFallback1_iface; LONG refcount; IDWriteFactory7 *factory; - IDWriteFontCollection1 *systemcollection; + IDWriteFontCollection *systemcollection; struct fallback_mapping *mappings; UINT32 mappings_count; }; @@ -2228,7 +2228,7 @@ HRESULT create_system_fontfallback(IDWriteFactory7 *factory, IDWriteFontFallback fallback->factory = factory; fallback->mappings = (struct fallback_mapping *)fontfallback_neutral_data; fallback->mappings_count = ARRAY_SIZE(fontfallback_neutral_data); - IDWriteFactory5_GetSystemFontCollection((IDWriteFactory5 *)fallback->factory, FALSE, &fallback->systemcollection, FALSE); + IDWriteFactory_GetSystemFontCollection((IDWriteFactory *)fallback->factory, &fallback->systemcollection, FALSE); *ret = &fallback->IDWriteFontFallback1_iface; @@ -2238,7 +2238,7 @@ HRESULT create_system_fontfallback(IDWriteFactory7 *factory, IDWriteFontFallback void release_system_fontfallback(IDWriteFontFallback1 *iface) { struct dwrite_fontfallback *fallback = impl_from_IDWriteFontFallback1(iface); - IDWriteFontCollection1_Release(fallback->systemcollection); + IDWriteFontCollection_Release(fallback->systemcollection); free(fallback); }

1 0

Jacek Caban : user32: Use syscall interface for NtUserCall* functions.
by Alexandre Julliard 22 Jul '22

22 Jul '22

Module: wine Branch: master Commit: ca630fb653a0bd73075caa4ddfa413a62617de60 URL: https://gitlab.winehq.org/wine/wine/-/commit/ca630fb653a0bd73075caa4ddfa413… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Jul 10 16:38:15 2022 +0200 user32: Use syscall interface for NtUserCall* functions. --- dlls/win32u/gdiobj.c | 4 ---- dlls/win32u/syscall.c | 4 ++++ dlls/win32u/win32u.spec | 8 ++++---- dlls/win32u/win32u_private.h | 4 ---- dlls/win32u/wrappers.c | 24 ------------------------ dlls/wow64win/syscall.h | 4 ++++ dlls/wow64win/user.c | 36 ++++++++++++++++++++++++++++++++++++ 7 files changed, 48 insertions(+), 36 deletions(-) diff --git a/dlls/win32u/gdiobj.c b/dlls/win32u/gdiobj.c index 18881afd27c..f6e918721a4 100644 --- a/dlls/win32u/gdiobj.c +++ b/dlls/win32u/gdiobj.c @@ -1136,10 +1136,6 @@ static struct unix_funcs unix_funcs = NtGdiUnrealizeObject, NtGdiUpdateColors, NtGdiWidenPath, - NtUserCallNextHookEx, - NtUserCallNoParam, - NtUserCallOneParam, - NtUserCallTwoParam, NtUserChangeClipboardChain, NtUserChangeDisplaySettings, NtUserClipCursor, diff --git a/dlls/win32u/syscall.c b/dlls/win32u/syscall.c index ee6b3fa31d1..ffe1703e1e7 100644 --- a/dlls/win32u/syscall.c +++ b/dlls/win32u/syscall.c @@ -109,6 +109,10 @@ static void * const syscalls[] = NtUserCallHwnd, NtUserCallHwndParam, NtUserCallMsgFilter, + NtUserCallNextHookEx, + NtUserCallNoParam, + NtUserCallOneParam, + NtUserCallTwoParam, NtUserCheckMenuItem, NtUserChildWindowFromPointEx, NtUserCloseDesktop, diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index fa4fbbcdfe9..d12b904d3bb 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -777,10 +777,10 @@ @ stub NtUserCallHwndParamLockSafe @ stub NtUserCallHwndSafe @ stdcall -syscall NtUserCallMsgFilter(ptr long) -@ stdcall NtUserCallNextHookEx(long long long long) -@ stdcall NtUserCallNoParam(long) -@ stdcall NtUserCallOneParam(long long) -@ stdcall NtUserCallTwoParam(long long long) +@ stdcall -syscall NtUserCallNextHookEx(long long long long) +@ stdcall -syscall NtUserCallNoParam(long) +@ stdcall -syscall NtUserCallOneParam(long long) +@ stdcall -syscall NtUserCallTwoParam(long long long) @ stub NtUserCanBrokerForceForeground @ stdcall NtUserChangeClipboardChain(long long) @ stdcall NtUserChangeDisplaySettings(ptr ptr long long ptr) diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index 9ef7d8906a7..4fa0b0e3493 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -186,10 +186,6 @@ struct unix_funcs BOOL (WINAPI *pNtGdiUnrealizeObject)( HGDIOBJ obj ); BOOL (WINAPI *pNtGdiUpdateColors)( HDC hdc ); BOOL (WINAPI *pNtGdiWidenPath)( HDC hdc ); - LRESULT (WINAPI *pNtUserCallNextHookEx)( HHOOK hhook, INT code, WPARAM wparam, LPARAM lparam ); - ULONG_PTR (WINAPI *pNtUserCallNoParam)( ULONG code ); - ULONG_PTR (WINAPI *pNtUserCallOneParam)( ULONG_PTR arg, ULONG code ); - ULONG_PTR (WINAPI *pNtUserCallTwoParam)( ULONG_PTR arg1, ULONG_PTR arg2, ULONG code ); BOOL (WINAPI *pNtUserChangeClipboardChain)( HWND hwnd, HWND next ); LONG (WINAPI *pNtUserChangeDisplaySettings)( UNICODE_STRING *devname, DEVMODEW *devmode, HWND hwnd, DWORD flags, void *lparam ); diff --git a/dlls/win32u/wrappers.c b/dlls/win32u/wrappers.c index 2cfc6c050db..c9cf89f5fe7 100644 --- a/dlls/win32u/wrappers.c +++ b/dlls/win32u/wrappers.c @@ -725,30 +725,6 @@ NTSTATUS WINAPI NtGdiDdDDISetVidPnSourceOwner( const D3DKMT_SETVIDPNSOURCEOWNER return unix_funcs->pNtGdiDdDDISetVidPnSourceOwner( desc ); } -LRESULT WINAPI NtUserCallNextHookEx( HHOOK hhook, INT code, WPARAM wparam, LPARAM lparam ) -{ - if (!unix_funcs) return 0; - return unix_funcs->pNtUserCallNextHookEx( hhook, code, wparam, lparam ); -} - -ULONG_PTR WINAPI NtUserCallNoParam( ULONG code ) -{ - if (!unix_funcs) return 0; - return unix_funcs->pNtUserCallNoParam( code ); -} - -ULONG_PTR WINAPI NtUserCallOneParam( ULONG_PTR arg, ULONG code ) -{ - if (!unix_funcs) return 0; - return unix_funcs->pNtUserCallOneParam( arg, code ); -} - -ULONG_PTR WINAPI NtUserCallTwoParam( ULONG_PTR arg1, ULONG_PTR arg2, ULONG code ) -{ - if (!unix_funcs) return 0; - return unix_funcs->pNtUserCallTwoParam( arg1, arg2, code ); -} - BOOL WINAPI NtUserCloseClipboard(void) { if (!unix_funcs) return FALSE; diff --git a/dlls/wow64win/syscall.h b/dlls/wow64win/syscall.h index 71f01ce6207..8ff061ec7f8 100644 --- a/dlls/wow64win/syscall.h +++ b/dlls/wow64win/syscall.h @@ -96,6 +96,10 @@ SYSCALL_ENTRY( NtUserCallHwnd ) \ SYSCALL_ENTRY( NtUserCallHwndParam ) \ SYSCALL_ENTRY( NtUserCallMsgFilter ) \ + SYSCALL_ENTRY( NtUserCallNextHookEx ) \ + SYSCALL_ENTRY( NtUserCallNoParam ) \ + SYSCALL_ENTRY( NtUserCallOneParam ) \ + SYSCALL_ENTRY( NtUserCallTwoParam ) \ SYSCALL_ENTRY( NtUserCheckMenuItem ) \ SYSCALL_ENTRY( NtUserChildWindowFromPointEx ) \ SYSCALL_ENTRY( NtUserCloseDesktop ) \ diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index 948318077f4..68d444a7c83 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -250,6 +250,42 @@ NTSTATUS WINAPI wow64_NtUserCallMsgFilter( UINT *args ) return ret; } +NTSTATUS WINAPI wow64_NtUserCallNextHookEx( UINT *args ) +{ + HHOOK hhook = get_handle( &args ); + INT code = get_ulong( &args ); + WPARAM wparam = get_ulong( &args ); + LPARAM lparam = get_ulong( &args ); + + return NtUserCallNextHookEx( hhook, code, wparam, lparam ); +} + +NTSTATUS WINAPI wow64_NtUserCallNoParam( UINT *args ) +{ + ULONG code = get_ulong( &args ); + + return NtUserCallNoParam( code ); +} + +NTSTATUS WINAPI wow64_NtUserCallOneParam( UINT *args ) +{ + ULONG_PTR arg = get_ulong( &args ); + ULONG code = get_ulong( &args ); + + FIXME( "%Ix %lu\n", arg, code ); + return 0; +} + +NTSTATUS WINAPI wow64_NtUserCallTwoParam( UINT *args ) +{ + ULONG_PTR arg1 = get_ulong( &args ); + ULONG_PTR arg2 = get_ulong( &args ); + ULONG code = get_ulong( &args ); + + FIXME( "%Ix %Ix %lu\n", arg1, arg2, code ); + return 0; +} + NTSTATUS WINAPI wow64_NtUserCheckMenuItem( UINT *args ) { HMENU handle = get_handle( &args );

1 0

Jacek Caban : win32u: Use syscall interface for NtUserCallHwnd and NtUserCallHwndParam.
by Alexandre Julliard 22 Jul '22

22 Jul '22

Module: wine Branch: master Commit: a23c1279c6403fda85bcb6c9ca0861b0e853b370 URL: https://gitlab.winehq.org/wine/wine/-/commit/a23c1279c6403fda85bcb6c9ca0861… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Jul 10 16:19:41 2022 +0200 win32u: Use syscall interface for NtUserCallHwnd and NtUserCallHwndParam. --- dlls/win32u/gdiobj.c | 2 -- dlls/win32u/syscall.c | 2 ++ dlls/win32u/win32u.spec | 4 ++-- dlls/win32u/win32u_private.h | 2 -- dlls/win32u/wrappers.c | 12 ------------ dlls/wow64win/syscall.h | 2 ++ dlls/wow64win/user.c | 18 ++++++++++++++++++ 7 files changed, 24 insertions(+), 18 deletions(-) diff --git a/dlls/win32u/gdiobj.c b/dlls/win32u/gdiobj.c index 5bb8adedf44..18881afd27c 100644 --- a/dlls/win32u/gdiobj.c +++ b/dlls/win32u/gdiobj.c @@ -1136,8 +1136,6 @@ static struct unix_funcs unix_funcs = NtGdiUnrealizeObject, NtGdiUpdateColors, NtGdiWidenPath, - NtUserCallHwnd, - NtUserCallHwndParam, NtUserCallNextHookEx, NtUserCallNoParam, NtUserCallOneParam, diff --git a/dlls/win32u/syscall.c b/dlls/win32u/syscall.c index 37d94aabcdb..ee6b3fa31d1 100644 --- a/dlls/win32u/syscall.c +++ b/dlls/win32u/syscall.c @@ -106,6 +106,8 @@ static void * const syscalls[] = NtUserAttachThreadInput, NtUserBeginPaint, NtUserBuildHwndList, + NtUserCallHwnd, + NtUserCallHwndParam, NtUserCallMsgFilter, NtUserCheckMenuItem, NtUserChildWindowFromPointEx, diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index 37d21d46a79..fa4fbbcdfe9 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -768,11 +768,11 @@ @ stub NtUserBuildPropList @ stub NtUserCalcMenuBar @ stub NtUserCalculatePopupWindowPosition -@ stdcall NtUserCallHwnd(long long) +@ stdcall -syscall NtUserCallHwnd(long long) @ stub NtUserCallHwndLock @ stub NtUserCallHwndLockSafe @ stub NtUserCallHwndOpt -@ stdcall NtUserCallHwndParam(long ptr long) +@ stdcall -syscall NtUserCallHwndParam(long ptr long) @ stub NtUserCallHwndParamLock @ stub NtUserCallHwndParamLockSafe @ stub NtUserCallHwndSafe diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index 3cb16b0d300..9ef7d8906a7 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -186,8 +186,6 @@ struct unix_funcs BOOL (WINAPI *pNtGdiUnrealizeObject)( HGDIOBJ obj ); BOOL (WINAPI *pNtGdiUpdateColors)( HDC hdc ); BOOL (WINAPI *pNtGdiWidenPath)( HDC hdc ); - ULONG_PTR (WINAPI *pNtUserCallHwnd)( HWND hwnd, DWORD code ); - ULONG_PTR (WINAPI *pNtUserCallHwndParam)( HWND hwnd, DWORD_PTR param, DWORD code ); LRESULT (WINAPI *pNtUserCallNextHookEx)( HHOOK hhook, INT code, WPARAM wparam, LPARAM lparam ); ULONG_PTR (WINAPI *pNtUserCallNoParam)( ULONG code ); ULONG_PTR (WINAPI *pNtUserCallOneParam)( ULONG_PTR arg, ULONG code ); diff --git a/dlls/win32u/wrappers.c b/dlls/win32u/wrappers.c index 6f6bad05b28..2cfc6c050db 100644 --- a/dlls/win32u/wrappers.c +++ b/dlls/win32u/wrappers.c @@ -749,18 +749,6 @@ ULONG_PTR WINAPI NtUserCallTwoParam( ULONG_PTR arg1, ULONG_PTR arg2, ULONG code return unix_funcs->pNtUserCallTwoParam( arg1, arg2, code ); } -ULONG_PTR WINAPI NtUserCallHwnd( HWND hwnd, DWORD code ) -{ - if (!unix_funcs) return 0; - return unix_funcs->pNtUserCallHwnd( hwnd, code ); -} - -ULONG_PTR WINAPI NtUserCallHwndParam( HWND hwnd, DWORD_PTR param, DWORD code ) -{ - if (!unix_funcs) return 0; - return unix_funcs->pNtUserCallHwndParam( hwnd, param, code ); -} - BOOL WINAPI NtUserCloseClipboard(void) { if (!unix_funcs) return FALSE; diff --git a/dlls/wow64win/syscall.h b/dlls/wow64win/syscall.h index aa152eeb650..71f01ce6207 100644 --- a/dlls/wow64win/syscall.h +++ b/dlls/wow64win/syscall.h @@ -93,6 +93,8 @@ SYSCALL_ENTRY( NtUserAttachThreadInput ) \ SYSCALL_ENTRY( NtUserBeginPaint ) \ SYSCALL_ENTRY( NtUserBuildHwndList ) \ + SYSCALL_ENTRY( NtUserCallHwnd ) \ + SYSCALL_ENTRY( NtUserCallHwndParam ) \ SYSCALL_ENTRY( NtUserCallMsgFilter ) \ SYSCALL_ENTRY( NtUserCheckMenuItem ) \ SYSCALL_ENTRY( NtUserChildWindowFromPointEx ) \ diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index db7d4d06556..948318077f4 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -220,6 +220,24 @@ NTSTATUS WINAPI wow64_NtUserBuildHwndList( UINT *args ) return status; } +NTSTATUS WINAPI wow64_NtUserCallHwnd( UINT *args ) +{ + HWND hwnd = get_handle( &args ); + DWORD code = get_ulong( &args ); + + return NtUserCallHwnd( hwnd, code ); +} + +NTSTATUS WINAPI wow64_NtUserCallHwndParam( UINT *args ) +{ + HWND hwnd = get_handle( &args ); + DWORD_PTR param = get_ulong( &args ); + DWORD code = get_ulong( &args ); + + FIXME( "%p %Ix %lu\n", hwnd, param, code ); + return 0; +} + NTSTATUS WINAPI wow64_NtUserCallMsgFilter( UINT *args ) { MSG32 *msg32 = get_ptr( &args );

1 0

Jacek Caban : win32u: Use syscall interface for more user painting functions.
by Alexandre Julliard 22 Jul '22

22 Jul '22

Module: wine Branch: master Commit: 47dd8a6a9b1193ec1656cdf04117b94a3cf07025 URL: https://gitlab.winehq.org/wine/wine/-/commit/47dd8a6a9b1193ec1656cdf04117b9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Jul 10 16:15:10 2022 +0200 win32u: Use syscall interface for more user painting functions. --- dlls/win32u/gdiobj.c | 8 ---- dlls/win32u/syscall.c | 8 ++++ dlls/win32u/win32u.spec | 16 ++++---- dlls/win32u/win32u_private.h | 10 ----- dlls/win32u/wrappers.c | 51 ----------------------- dlls/wow64win/syscall.h | 8 ++++ dlls/wow64win/user.c | 97 ++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 121 insertions(+), 77 deletions(-)

1 0

Jacek Caban : win32u: Use syscall interface for more input functions.
by Alexandre Julliard 22 Jul '22

22 Jul '22

Module: wine Branch: master Commit: 81df0bc7ef2790e36ee545adf3f05157811771fd URL: https://gitlab.winehq.org/wine/wine/-/commit/81df0bc7ef2790e36ee545adf3f051… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Jul 10 15:48:11 2022 +0200 win32u: Use syscall interface for more input functions. --- dlls/win32u/gdiobj.c | 13 --- dlls/win32u/syscall.c | 13 +++ dlls/win32u/win32u.spec | 28 +++--- dlls/win32u/win32u_private.h | 14 --- dlls/win32u/wrappers.c | 79 ----------------- dlls/wow64win/syscall.h | 13 +++ dlls/wow64win/user.c | 200 +++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 240 insertions(+), 120 deletions(-)

1 0

Jacek Caban : winemac: Use __wine_unix_call.
by Alexandre Julliard 22 Jul '22

22 Jul '22

Module: wine Branch: master Commit: 7df56c9b3a3f69ef4af497713a30c75bedfc50dc URL: https://gitlab.winehq.org/wine/wine/-/commit/7df56c9b3a3f69ef4af497713a30c7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 22 13:01:02 2022 +0200 winemac: Use __wine_unix_call. --- dlls/winemac.drv/dllmain.c | 7 ++----- dlls/winemac.drv/macdrv_main.c | 12 ------------ dlls/winemac.drv/unixlib.h | 6 ++---- 3 files changed, 4 insertions(+), 21 deletions(-) diff --git a/dlls/winemac.drv/dllmain.c b/dlls/winemac.drv/dllmain.c index 567485b2f03..ac03ec360ce 100644 --- a/dlls/winemac.drv/dllmain.c +++ b/dlls/winemac.drv/dllmain.c @@ -27,8 +27,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(macdrv); HMODULE macdrv_module = 0; -static unixlib_handle_t macdrv_handle; -NTSTATUS (CDECL *macdrv_unix_call)(enum macdrv_funcs code, void *params); +unixlib_handle_t macdrv_handle; struct quit_info { HWND *wins; @@ -414,12 +413,10 @@ static BOOL process_attach(void) str->len = LoadStringW(macdrv_module, str->id, (WCHAR *)&str->str, 0); params.strings = strings; - if (__wine_unix_call(macdrv_handle, unix_init, &params)) return FALSE; + if (MACDRV_CALL(init, &params)) return FALSE; callback_table = NtCurrentTeb()->Peb->KernelCallbackTable; memcpy( callback_table + NtUserDriverCallbackFirst, kernel_callbacks, sizeof(kernel_callbacks) ); - - macdrv_unix_call = params.unix_call; return TRUE; } diff --git a/dlls/winemac.drv/macdrv_main.c b/dlls/winemac.drv/macdrv_main.c index 4b79c69a6f8..7cca25cf302 100644 --- a/dlls/winemac.drv/macdrv_main.c +++ b/dlls/winemac.drv/macdrv_main.c @@ -429,9 +429,6 @@ static void load_strings(struct localized_string *str) } -static NTSTATUS CDECL unix_call( enum macdrv_funcs code, void *params ); - - /*********************************************************************** * macdrv_init */ @@ -458,8 +455,6 @@ static NTSTATUS macdrv_init(void *arg) init_user_driver(); macdrv_init_display_devices(FALSE); - - params->unix_call = unix_call; return STATUS_SUCCESS; } @@ -658,10 +653,3 @@ const unixlib_entry_t __wine_unix_call_funcs[] = }; C_ASSERT( ARRAYSIZE(__wine_unix_call_funcs) == unix_funcs_count ); - - -/* FIXME: Use __wine_unix_call instead */ -static NTSTATUS CDECL unix_call(enum macdrv_funcs code, void *params) -{ - return __wine_unix_call_funcs[code]( params ); -} diff --git a/dlls/winemac.drv/unixlib.h b/dlls/winemac.drv/unixlib.h index d162732b08e..c5e71e188fa 100644 --- a/dlls/winemac.drv/unixlib.h +++ b/dlls/winemac.drv/unixlib.h @@ -35,9 +35,8 @@ enum macdrv_funcs unix_funcs_count }; -/* FIXME: Use __wine_unix_call when the rest of the stack is ready */ -extern NTSTATUS (CDECL *macdrv_unix_call)(enum macdrv_funcs code, void *params) DECLSPEC_HIDDEN; -#define MACDRV_CALL(func, params) macdrv_unix_call(unix_ ## func, params) +extern unixlib_handle_t macdrv_handle DECLSPEC_HIDDEN; +#define MACDRV_CALL(func, params) __wine_unix_call(macdrv_handle, unix_ ## func, params) /* macdrv_dnd_get_data params */ struct dnd_get_data_params @@ -84,7 +83,6 @@ struct localized_string struct init_params { struct localized_string *strings; - NTSTATUS (CDECL *unix_call)(enum macdrv_funcs code, void *params); }; /* macdrv_notify_icon params */

1 0

← Newer
1
...
15
16
17
18
19
20
21
...
64
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2022