August 2021 - Wine-Commits - list.winehq.org

Francois Gouget : kerberos: Make accept_context() static.
by Alexandre Julliard Aug. 30, 2021

Aug. 30, 2021

Module: wine Branch: master Commit: efe44b5702bb2dbc7ea56e8d50037f7e1d76a2f7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=efe44b5702bb2dbc7ea56e8d… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Aug 30 17:24:20 2021 +0200 kerberos: Make accept_context() static. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kerberos/unixlib.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kerberos/unixlib.c b/dlls/kerberos/unixlib.c index 6f53609e2ed..cceb99b2b36 100644 --- a/dlls/kerberos/unixlib.c +++ b/dlls/kerberos/unixlib.c @@ -493,7 +493,7 @@ static ULONG flags_gss_to_asc_ret( ULONG flags ) return ret; } -NTSTATUS CDECL accept_context( LSA_SEC_HANDLE credential, LSA_SEC_HANDLE context, SecBufferDesc *input, +static NTSTATUS CDECL accept_context( LSA_SEC_HANDLE credential, LSA_SEC_HANDLE context, SecBufferDesc *input, LSA_SEC_HANDLE *new_context, SecBufferDesc *output, ULONG *context_attr, TimeStamp *expiry ) {

1 0

Jacek Caban : gdi32: Use ntgdi names for a few more font functions.
by Alexandre Julliard Aug. 30, 2021

Aug. 30, 2021

Module: wine Branch: master Commit: e7814627be0faeff062d78112fca5b7068a873a9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e7814627be0faeff062d7811… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 30 13:54:30 2021 +0200 gdi32: Use ntgdi names for a few more font functions. 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 | 43 +++++++++++++++++-------------------------- dlls/gdi32/gdi32.spec | 12 ++++++------ dlls/gdi32/ntgdi_private.h | 20 -------------------- include/ntgdi.h | 34 ++++++++++++++++++++++++++++++++++ 4 files changed, 57 insertions(+), 52 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e7814627be0faeff062d…

1 0

Eric Pouech : dbghelp: Return the correct length for an enumeration.
by Alexandre Julliard Aug. 30, 2021

Aug. 30, 2021

Module: wine Branch: master Commit: 62c06fc31c018880fc426d2c6a39b8390c2d79b6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=62c06fc31c018880fc426d2c… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Aug 30 09:24:54 2021 +0200 dbghelp: Return the correct length for an enumeration. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/type.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/dbghelp/type.c b/dlls/dbghelp/type.c index da4fc1a0a9d..08fa8bad95e 100644 --- a/dlls/dbghelp/type.c +++ b/dlls/dbghelp/type.c @@ -663,7 +663,8 @@ BOOL symt_get_info(struct module* module, const struct symt* type, X(DWORD64) = ((const struct symt_udt*)type)->size; break; case SymTagEnum: - X(DWORD64) = sizeof(int); /* FIXME: should be size of base-type of enum !!! */ + if (!symt_get_info(module, ((const struct symt_enum*)type)->base_type, TI_GET_LENGTH, pInfo)) + return FALSE; break; case SymTagData: if (((const struct symt_data*)type)->kind != DataIsMember ||

1 0

Eric Pouech : dbghelp: Enums should be found by name (as UDTs are).
by Alexandre Julliard Aug. 30, 2021

Aug. 30, 2021

Module: wine Branch: master Commit: 46c12b2971a9514ec80ca48017c7fce1bc91f6fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=46c12b2971a9514ec80ca480… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Aug 30 09:24:48 2021 +0200 dbghelp: Enums should be found by name (as UDTs are). Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dbghelp_private.h | 2 +- dlls/dbghelp/type.c | 11 +++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index 0e5c1826108..2906a5df6c3 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -270,8 +270,8 @@ struct symt_basic struct symt_enum { struct symt symt; + struct hash_table_elt hash_elt; struct symt* base_type; - const char* name; struct vector vchildren; }; diff --git a/dlls/dbghelp/type.c b/dlls/dbghelp/type.c index 56673a7e4c4..da4fc1a0a9d 100644 --- a/dlls/dbghelp/type.c +++ b/dlls/dbghelp/type.c @@ -88,7 +88,7 @@ const char* symt_get_name(const struct symt* sym) case SymTagLabel: return ((const struct symt_hierarchy_point*)sym)->hash_elt.name; case SymTagThunk: return ((const struct symt_thunk*)sym)->hash_elt.name; /* hierarchy tree */ - case SymTagEnum: return ((const struct symt_enum*)sym)->name; + case SymTagEnum: return ((const struct symt_enum*)sym)->hash_elt.name; case SymTagTypedef: return ((const struct symt_typedef*)sym)->hash_elt.name; case SymTagUDT: return ((const struct symt_udt*)sym)->hash_elt.name; case SymTagCompiland: return source_get(((const struct symt_compiland*)sym)->container->module, @@ -307,12 +307,19 @@ struct symt_enum* symt_new_enum(struct module* module, const char* typename, { struct symt_enum* sym; + TRACE_(dbghelp_symt)("Adding enum %s:%s\n", + debugstr_w(module->module.ModuleName), typename); if ((sym = pool_alloc(&module->pool, sizeof(*sym)))) { sym->symt.tag = SymTagEnum; - sym->name = (typename) ? pool_strdup(&module->pool, typename) : NULL; + if (typename) + { + sym->hash_elt.name = pool_strdup(&module->pool, typename); + hash_table_add(&module->ht_types, &sym->hash_elt); + } else sym->hash_elt.name = NULL; sym->base_type = basetype; vector_init(&sym->vchildren, sizeof(struct symt*), 8); + symt_add_type(module, &sym->symt); } return sym; }

1 0

Eric Pouech : dbghelp: Return the stored name for a compiland.
by Alexandre Julliard Aug. 30, 2021

Aug. 30, 2021

Module: wine Branch: master Commit: 2325962e74c6afd537cb4dcd933f6420078dcec2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2325962e74c6afd537cb4dcd… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Aug 30 09:24:35 2021 +0200 dbghelp: Return the stored name for a compiland. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dbghelp_private.h | 1 + dlls/dbghelp/symbol.c | 7 ++++--- dlls/dbghelp/type.c | 2 ++ 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index 763d04a16a3..0e5c1826108 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -170,6 +170,7 @@ struct symt_module /* in fact any of .exe, .dll... */ struct symt_compiland { struct symt symt; + struct symt_module* container; /* symt_module */ ULONG_PTR address; unsigned source; struct vector vchildren; /* global variables & functions */ diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index 286dc17310c..9863a736299 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -205,9 +205,10 @@ struct symt_compiland* symt_new_compiland(struct module* module, debugstr_w(module->module.ModuleName), source_get(module, src_idx)); if ((sym = pool_alloc(&module->pool, sizeof(*sym)))) { - sym->symt.tag = SymTagCompiland; - sym->address = address; - sym->source = src_idx; + sym->symt.tag = SymTagCompiland; + sym->container = module->top; + sym->address = address; + sym->source = src_idx; vector_init(&sym->vchildren, sizeof(struct symt*), 32); } return sym; diff --git a/dlls/dbghelp/type.c b/dlls/dbghelp/type.c index 10a2ff7a718..ad88ac629df 100644 --- a/dlls/dbghelp/type.c +++ b/dlls/dbghelp/type.c @@ -91,6 +91,8 @@ const char* symt_get_name(const struct symt* sym) case SymTagEnum: return ((const struct symt_enum*)sym)->name; case SymTagTypedef: return ((const struct symt_typedef*)sym)->hash_elt.name; case SymTagUDT: return ((const struct symt_udt*)sym)->hash_elt.name; + case SymTagCompiland: return source_get(((const struct symt_compiland*)sym)->container->module, + ((const struct symt_compiland*)sym)->source); default: FIXME("Unsupported sym-tag %s\n", symt_get_tag_str(sym->tag)); /* fall through */

1 0

Alexandre Julliard : ntdll: Don't use winebuild for the Unix part.
by Alexandre Julliard Aug. 30, 2021

Aug. 30, 2021

Module: wine Branch: master Commit: 5a7505e839e31e6703a8d8e53885b0c797123ccb URL: https://source.winehq.org/git/wine.git/?a=commit;h=5a7505e839e31e6703a8d8e5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 30 12:39:35 2021 +0200 ntdll: Don't use winebuild for the Unix part. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/Makefile.in b/dlls/ntdll/Makefile.in index da849d55b4d..4562c21fd20 100644 --- a/dlls/ntdll/Makefile.in +++ b/dlls/ntdll/Makefile.in @@ -3,7 +3,7 @@ MODULE = ntdll.dll IMPORTLIB = ntdll IMPORTS = winecrt0 EXTRAINCL = $(UNWIND_CFLAGS) -EXTRALIBS = $(IOKIT_LIBS) $(COREFOUNDATION_LIBS) $(CORESERVICES_LIBS) $(RT_LIBS) $(PTHREAD_LIBS) $(UNWIND_LIBS) $(I386_LIBS) $(PROCSTAT_LIBS) +EXTRALIBS = -lwinecrt0 -Wl,--subsystem,unixlib $(IOKIT_LIBS) $(COREFOUNDATION_LIBS) $(CORESERVICES_LIBS) $(RT_LIBS) $(PTHREAD_LIBS) $(UNWIND_LIBS) $(I386_LIBS) $(PROCSTAT_LIBS) EXTRADLLFLAGS = -mno-cygwin -nodefaultlibs -Wl,--image-base,0x7bc00000 C_SRCS = \

1 0

Eric Pouech : dbghelp: Return the symt_module when requesting lexical parent of a UDT.
by Alexandre Julliard Aug. 30, 2021

Aug. 30, 2021

Module: wine Branch: master Commit: 5c8c999b5a3cde715075cabd086d9854dd759486 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5c8c999b5a3cde715075cabd… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Aug 30 09:24:41 2021 +0200 dbghelp: Return the symt_module when requesting lexical parent of a UDT. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/type.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/dbghelp/type.c b/dlls/dbghelp/type.c index ad88ac629df..56673a7e4c4 100644 --- a/dlls/dbghelp/type.c +++ b/dlls/dbghelp/type.c @@ -708,6 +708,9 @@ BOOL symt_get_info(struct module* module, const struct symt* type, case SymTagFunctionArgType: X(DWORD) = symt_ptr2index(module, ((const struct symt_function_arg_type*)type)->container); break; + case SymTagUDT: + X(DWORD) = symt_ptr2index(module, &module->top->symt); + break; default: FIXME("Unsupported sym-tag %s for get-lexical-parent\n", symt_get_tag_str(type->tag));

1 0

Alexandre Julliard : ntdll/tests: Fix a size check for older Windows versions.
by Alexandre Julliard Aug. 30, 2021

Aug. 30, 2021

Module: wine Branch: master Commit: 411a8858acb35459a68a6b5a0ab26aad364a16e7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=411a8858acb35459a68a6b5a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 30 10:51:12 2021 +0200 ntdll/tests: Fix a size check for older Windows versions. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51693 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/info.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index e642427bffb..7b6f947569a 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -883,7 +883,7 @@ static void test_query_cache(void) status = pNtQuerySystemInformation(SystemFileCacheInformation, sci, i, &ReturnLength); if (!status) { - expected = offsetof(SYSTEM_CACHE_INFORMATION, MinimumWorkingSet); + expected = 3 * sizeof(ULONG); for (; i>= expected; i--) { ReturnLength = 0xdeadbeef;

1 0

Eric Pouech : dbghelp: Fill more fields in SYMBOL_INFO in SymGetTypeFromName.
by Alexandre Julliard Aug. 30, 2021

Aug. 30, 2021

Module: wine Branch: master Commit: 5c271afc99e9cdf7545945d70a4b733bf02b6a1e URL: https://source.winehq.org/git/wine.git/?a=commit;h=5c271afc99e9cdf7545945d7… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Aug 30 09:24:10 2021 +0200 dbghelp: Fill more fields in SYMBOL_INFO in SymGetTypeFromName. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/type.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/dbghelp/type.c b/dlls/dbghelp/type.c index 1a76ec70bbb..4621c3f3638 100644 --- a/dlls/dbghelp/type.c +++ b/dlls/dbghelp/type.c @@ -914,6 +914,7 @@ BOOL WINAPI SymGetTypeFromName(HANDLE hProcess, ULONG64 BaseOfDll, { struct module_pair pair; struct symt* type; + DWORD64 size; pair.pcs = process_find_by_handle(hProcess); if (!pair.pcs) return FALSE; @@ -921,7 +922,12 @@ BOOL WINAPI SymGetTypeFromName(HANDLE hProcess, ULONG64 BaseOfDll, if (!module_get_debug(&pair)) return FALSE; type = symt_find_type_by_name(pair.effective, SymTagNull, Name); if (!type) return FALSE; - Symbol->TypeIndex = symt_ptr2index(pair.effective, type); + Symbol->Index = Symbol->TypeIndex = symt_ptr2index(pair.effective, type); + symbol_setname(Symbol, symt_get_name(type)); + symt_get_info(pair.effective, type, TI_GET_LENGTH, &size); + Symbol->Size = size; + Symbol->ModBase = pair.requested->module.BaseOfImage; + Symbol->Tag = type->tag; return TRUE; }

1 0

Jacek Caban : gdi32: Use NtGdiGetGlyphIndicesW for GetGlyphIndicesW.
by Alexandre Julliard Aug. 30, 2021

Aug. 30, 2021

Module: wine Branch: master Commit: f801e27d32bcdea6badde1265fcce2f960e86693 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f801e27d32bcdea6badde126… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 30 13:52:36 2021 +0200 gdi32: Use NtGdiGetGlyphIndicesW for GetGlyphIndicesW. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 61 ++++------------------------------------- dlls/gdi32/gdi32.spec | 2 +- dlls/gdi32/text.c | 19 ++++++++++++- dlls/gdi32/uniscribe/opentype.c | 2 +- dlls/gdi32/uniscribe/shape.c | 30 ++++++++++---------- dlls/gdi32/uniscribe/usp10.c | 5 ++-- include/ntgdi.h | 2 ++ 7 files changed, 46 insertions(+), 75 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f801e27d32bcdea6badd…

1 0