May 2022 - Wine-Commits - list.winehq.org

Dmitry Timoshkov : d2d1: Implement ID2D1DeviceContext::CreateImageBrush().
by Alexandre Julliard May 16, 2022

May 16, 2022

Module: wine Branch: master Commit: 73ca65b0b23ac832065038352d53d2d0d654344e URL: https://source.winehq.org/git/wine.git/?a=commit;h=73ca65b0b23ac83206503835… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon May 16 08:22:12 2022 +0300 d2d1: Implement ID2D1DeviceContext::CreateImageBrush(). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/brush.c | 243 ++++++++++++++++++++++++++++++++++++++++++++++- dlls/d2d1/d2d1_private.h | 12 +++ dlls/d2d1/device.c | 14 ++- 3 files changed, 265 insertions(+), 4 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=73ca65b0b23ac8320650…

1 0

Eric Pouech : dbghelp: Set correct basic types definition.
by Alexandre Julliard May 13, 2022

May 13, 2022

Module: wine Branch: master Commit: 5aa9340c3d12ebf42cf4b9f8a170c55e00c48338 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5aa9340c3d12ebf42cf4b9f8… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue May 10 17:11:08 2022 +0200 dbghelp: Set correct basic types definition. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/msc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index 64d520c2b37..5b45c474160 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -158,13 +158,13 @@ static void codeview_init_basic_types(struct module* module) cv_basic_types[T_NOTYPE] = NULL; cv_basic_types[T_ABS] = NULL; cv_basic_types[T_VOID] = &symt_get_basic(btVoid, 0)->symt; /* void */ - cv_basic_types[T_CHAR] = &symt_get_basic(btChar, 1)->symt; /* char */ + cv_basic_types[T_CHAR] = &symt_get_basic(btInt, 1)->symt; /* signed char (and char in C) */ cv_basic_types[T_SHORT] = &symt_get_basic(btInt, 2)->symt; /* short int */ - cv_basic_types[T_LONG] = &symt_get_basic(btInt, 4)->symt; /* long int */ + cv_basic_types[T_LONG] = &symt_get_basic(btLong, 4)->symt; /* long int */ cv_basic_types[T_QUAD] = &symt_get_basic(btInt, 8)->symt; /* long long int */ cv_basic_types[T_UCHAR] = &symt_get_basic(btUInt, 1)->symt; /* unsigned char */ cv_basic_types[T_USHORT] = &symt_get_basic(btUInt, 2)->symt; /* unsigned short */ - cv_basic_types[T_ULONG] = &symt_get_basic(btUInt, 4)->symt; /* unsigned long */ + cv_basic_types[T_ULONG] = &symt_get_basic(btULong, 4)->symt; /* unsigned long */ cv_basic_types[T_UQUAD] = &symt_get_basic(btUInt, 8)->symt; /* unsigned long long */ cv_basic_types[T_BOOL08] = &symt_get_basic(btBool, 1)->symt; /* BOOL08 */ cv_basic_types[T_BOOL16] = &symt_get_basic(btBool, 2)->symt; /* BOOL16 */ @@ -173,7 +173,7 @@ static void codeview_init_basic_types(struct module* module) cv_basic_types[T_REAL32] = &symt_get_basic(btFloat, 4)->symt; /* float */ cv_basic_types[T_REAL64] = &symt_get_basic(btFloat, 8)->symt; /* double */ cv_basic_types[T_REAL80] = &symt_get_basic(btFloat, 10)->symt; /* long double */ - cv_basic_types[T_RCHAR] = &symt_get_basic(btInt, 1)->symt; /* signed char */ + cv_basic_types[T_RCHAR] = &symt_get_basic(btChar, 1)->symt; /* "real" char (char in C++) */ cv_basic_types[T_WCHAR] = &symt_get_basic(btWChar, 2)->symt; /* char8_t */ cv_basic_types[T_CHAR16] = &symt_get_basic(btChar16, 2)->symt; /* char16_t */ cv_basic_types[T_CHAR32] = &symt_get_basic(btChar32, 4)->symt; /* char32_t */

1 0

Eric Pouech : winedbg: Add 'set' command to change data model.
by Alexandre Julliard May 13, 2022

May 13, 2022

Module: wine Branch: master Commit: 6eb18ae6920da897af7e22f43347b3044f172e3c URL: https://source.winehq.org/git/wine.git/?a=commit;h=6eb18ae6920da897af7e22f4… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue May 10 17:11:08 2022 +0200 winedbg: Add 'set' command to change data model. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/debugger.h | 4 ++++ programs/winedbg/types.c | 10 ++++++---- programs/winedbg/winedbg.c | 24 ++++++++++++++++++++++++ 3 files changed, 34 insertions(+), 4 deletions(-) diff --git a/programs/winedbg/debugger.h b/programs/winedbg/debugger.h index de6c8b3e438..ac13a28e3ca 100644 --- a/programs/winedbg/debugger.h +++ b/programs/winedbg/debugger.h @@ -265,6 +265,7 @@ struct dbg_process char source_current_file[MAX_PATH]; int source_start_line; int source_end_line; + const struct data_model* data_model; }; /* describes the way the debugger interacts with a given process */ @@ -550,6 +551,9 @@ struct data_model unsigned size; const WCHAR* name; }; +extern const struct data_model ilp32_data_model[]; +extern const struct data_model lp64_data_model[]; +extern const struct data_model llp64_data_model[]; extern struct dbg_internal_var dbg_internal_vars[]; diff --git a/programs/winedbg/types.c b/programs/winedbg/types.c index f4ee5a011d5..899e7f472b2 100644 --- a/programs/winedbg/types.c +++ b/programs/winedbg/types.c @@ -714,7 +714,7 @@ BOOL types_print_type(const struct dbg_type* type, BOOL details) return TRUE; } -static const struct data_model ilp32_data_model[] = { +const struct data_model ilp32_data_model[] = { {btVoid, 0, L"void"}, {btChar, 1, L"char"}, {btWChar, 2, L"wchar_t"}, @@ -741,7 +741,7 @@ static const struct data_model ilp32_data_model[] = { {0, 0, NULL} }; -static const struct data_model llp64_data_model[] = { +const struct data_model llp64_data_model[] = { {btVoid, 0, L"void"}, {btChar, 1, L"char"}, {btWChar, 2, L"wchar_t"}, @@ -770,7 +770,7 @@ static const struct data_model llp64_data_model[] = { {0, 0, NULL} }; -static const struct data_model lp64_data_model[] = { +const struct data_model lp64_data_model[] = { {btVoid, 0, L"void"}, {btChar, 1, L"char"}, {btWChar, 2, L"wchar_t"}, @@ -803,7 +803,9 @@ static const struct data_model* get_data_model(DWORD modaddr) { const struct data_model *model; - if (ADDRSIZE == 4) model = ilp32_data_model; + if (dbg_curr_process->data_model) + model = dbg_curr_process->data_model; + else if (ADDRSIZE == 4) model = ilp32_data_model; else { IMAGEHLP_MODULEW64 mi; diff --git a/programs/winedbg/winedbg.c b/programs/winedbg/winedbg.c index d11b68ec432..8a5c9bc69ed 100644 --- a/programs/winedbg/winedbg.c +++ b/programs/winedbg/winedbg.c @@ -284,6 +284,7 @@ struct dbg_process* dbg_add_process(const struct be_process_io* pio, DWORD pid, p->source_current_file[0] = '\0'; p->source_start_line = -1; p->source_end_line = -1; + p->data_model = NULL; list_add_head(&dbg_process_list, &p->entry); @@ -467,6 +468,29 @@ void dbg_set_option(const char* option, const char* val) return; } } + else if (!strcasecmp(option, "data_model")) + { + if (!dbg_curr_process) + { + dbg_printf("Not attached to a process\n"); + return; + } + if (!val) + { + const char* model = ""; + if (dbg_curr_process->data_model == NULL) model = "auto"; + else if (dbg_curr_process->data_model == ilp32_data_model) model = "ilp32"; + else if (dbg_curr_process->data_model == llp64_data_model) model = "llp64"; + else if (dbg_curr_process->data_model == lp64_data_model) model = "lp64"; + dbg_printf("Option: data_model %s\n", model); + } + else if (!strcasecmp(val, "auto")) dbg_curr_process->data_model = NULL; + else if (!strcasecmp(val, "ilp32")) dbg_curr_process->data_model = ilp32_data_model; + else if (!strcasecmp(val, "llp64")) dbg_curr_process->data_model = llp64_data_model; + else if (!strcasecmp(val, "lp64")) dbg_curr_process->data_model = lp64_data_model; + else + dbg_printf("Unknown data model %s\n", val); + } else dbg_printf("Unknown option '%s'\n", option); }

1 0

Eric Pouech : winedbg: Introduce struct data_model to describe the various models for base types.
by Alexandre Julliard May 13, 2022

May 13, 2022

Module: wine Branch: master Commit: 96ecee3211d606eff2585073eb5854aae4142911 URL: https://source.winehq.org/git/wine.git/?a=commit;h=96ecee3211d606eff2585073… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue May 10 17:11:08 2022 +0200 winedbg: Introduce struct data_model to describe the various models for base types. Detect data model to be used with current debuggee PE & ELF 32 bit => ILP32 PE 64 bit => LP64 ELF 64 bit => LLP64 Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/debugger.h | 7 ++ programs/winedbg/types.c | 176 +++++++++++++++++++++++++++++++++++--------- 2 files changed, 150 insertions(+), 33 deletions(-) diff --git a/programs/winedbg/debugger.h b/programs/winedbg/debugger.h index 293de4c0aa5..de6c8b3e438 100644 --- a/programs/winedbg/debugger.h +++ b/programs/winedbg/debugger.h @@ -544,6 +544,13 @@ static inline void* dbg_heap_realloc(void* buffer, size_t size) HeapAlloc(GetProcessHeap(), 0, size); } +struct data_model +{ + unsigned base_type; + unsigned size; + const WCHAR* name; +}; + extern struct dbg_internal_var dbg_internal_vars[]; #define DBG_IVARNAME(_var) dbg_internal_var_##_var diff --git a/programs/winedbg/types.c b/programs/winedbg/types.c index 50d1f1b8353..f4ee5a011d5 100644 --- a/programs/winedbg/types.c +++ b/programs/winedbg/types.c @@ -714,47 +714,157 @@ BOOL types_print_type(const struct dbg_type* type, BOOL details) return TRUE; } +static const struct data_model ilp32_data_model[] = { + {btVoid, 0, L"void"}, + {btChar, 1, L"char"}, + {btWChar, 2, L"wchar_t"}, + {btInt, 1, L"signed char"}, + {btInt, 2, L"short int"}, + {btInt, 4, L"int"}, + {btInt, 8, L"__int64"}, + {btUInt, 1, L"unsigned char"}, + {btUInt, 2, L"unsigned short int"}, + {btUInt, 4, L"unsigned int"}, + {btUInt, 8, L"unsigned __int64"}, + {btFloat, 4, L"float"}, + {btFloat, 8, L"double"}, + {btFloat, 10, L"long double"}, + {btBool, 1, L"bool"}, + {btLong, 4, L"long"}, + {btLong, 8, L"long long"}, + {btULong, 4, L"unsigned long"}, + {btULong, 8, L"unsigned long long"}, + {btHresult, 4, L"char32_t"}, + {btChar16, 2, L"char16_t"}, + {btChar32, 4, L"char32_t"}, + {btChar8, 1, L"char8_t"}, + {0, 0, NULL} +}; + +static const struct data_model llp64_data_model[] = { + {btVoid, 0, L"void"}, + {btChar, 1, L"char"}, + {btWChar, 2, L"wchar_t"}, + {btInt, 1, L"signed char"}, + {btInt, 2, L"short int"}, + {btInt, 4, L"int"}, + {btInt, 8, L"__int64"}, + {btInt, 16, L"__int128"}, + {btUInt, 1, L"unsigned char"}, + {btUInt, 2, L"unsigned short int"}, + {btUInt, 4, L"unsigned int"}, + {btUInt, 8, L"unsigned __int64"}, + {btUInt, 16, L"unsigned __int128"}, + {btFloat, 4, L"float"}, + {btFloat, 8, L"double"}, + {btFloat, 10, L"long double"}, + {btBool, 1, L"bool"}, + {btLong, 4, L"long"}, + {btLong, 8, L"long long"}, + {btULong, 4, L"unsigned long"}, + {btULong, 8, L"unsigned long long"}, + {btHresult, 4, L"char32_t"}, + {btChar16, 2, L"char16_t"}, + {btChar32, 4, L"char32_t"}, + {btChar8, 1, L"char8_t"}, + {0, 0, NULL} +}; + +static const struct data_model lp64_data_model[] = { + {btVoid, 0, L"void"}, + {btChar, 1, L"char"}, + {btWChar, 2, L"wchar_t"}, + {btInt, 1, L"signed char"}, + {btInt, 2, L"short int"}, + {btInt, 4, L"int"}, + {btInt, 8, L"__int64"}, + {btInt, 16, L"__int128"}, + {btUInt, 1, L"unsigned char"}, + {btUInt, 2, L"unsigned short int"}, + {btUInt, 4, L"unsigned int"}, + {btUInt, 8, L"unsigned __int64"}, + {btUInt, 16, L"unsigned __int128"}, + {btFloat, 4, L"float"}, + {btFloat, 8, L"double"}, + {btFloat, 10, L"long double"}, + {btBool, 1, L"bool"}, + {btLong, 4, L"int"}, /* to print at least for such a regular Windows' type */ + {btLong, 8, L"long"}, /* we can't discriminate 'long' from 'long long' */ + {btULong, 4, L"unsigned int"}, /* to print at least for such a regular Windows' type */ + {btULong, 8, L"unsigned long"}, /* we can't discriminate 'unsigned long' from 'unsigned long long' */ + {btHresult, 4, L"char32_t"}, + {btChar16, 2, L"char16_t"}, + {btChar32, 4, L"char32_t"}, + {btChar8, 1, L"char8_t"}, + {0, 0, NULL} +}; + +static const struct data_model* get_data_model(DWORD modaddr) +{ + const struct data_model *model; + + if (ADDRSIZE == 4) model = ilp32_data_model; + else + { + IMAGEHLP_MODULEW64 mi; + DWORD opt = SymSetExtendedOption(SYMOPT_EX_WINE_NATIVE_MODULES, TRUE); + + mi.SizeOfStruct = sizeof(mi); + if (SymGetModuleInfoW64(dbg_curr_process->handle, modaddr, &mi) && + (wcsstr(mi.ModuleName, L".so") || wcsstr(mi.ModuleName, L"<"))) + model = lp64_data_model; + else + model = llp64_data_model; + SymSetExtendedOption(SYMOPT_EX_WINE_NATIVE_MODULES, opt); + } + return model; +} + /* helper to typecast pInfo to its expected type (_t) */ #define X(_t) (*((_t*)pInfo)) -BOOL types_get_info(const struct dbg_type* type, IMAGEHLP_SYMBOL_TYPE_INFO ti, void* pInfo) +static BOOL lookup_base_type_in_data_model(const struct dbg_type* type, IMAGEHLP_SYMBOL_TYPE_INFO ti, void* pInfo) { - if (type->id == dbg_itype_none) return FALSE; - if (type->module != 0) + DWORD tag, bt; + DWORD64 len; + const WCHAR* name = NULL; + WCHAR tmp[64]; + const struct data_model* model; + + if (ti != TI_GET_SYMNAME || + !SymGetTypeInfo(dbg_curr_process->handle, type->module, type->id, TI_GET_SYMTAG, &tag) || + tag != SymTagBaseType || + !SymGetTypeInfo(dbg_curr_process->handle, type->module, type->id, TI_GET_BASETYPE, &bt) || + !SymGetTypeInfo(dbg_curr_process->handle, type->module, type->id, TI_GET_LENGTH, &len) || + len != (DWORD)len) return FALSE; + + model = get_data_model(type->module); + for (; model->name; model++) { - DWORD ret, tag, bt; - ret = SymGetTypeInfo(dbg_curr_process->handle, type->module, type->id, ti, pInfo); - if (!ret && - ti == TI_GET_SYMNAME && - SymGetTypeInfo(dbg_curr_process->handle, type->module, type->id, TI_GET_SYMTAG, &tag) && - tag == SymTagBaseType && - SymGetTypeInfo(dbg_curr_process->handle, type->module, type->id, TI_GET_BASETYPE, &bt)) + if (bt == model->base_type && model->size == len) { - const WCHAR* name = NULL; - - switch (bt) - { - case btVoid: name = L"void"; break; - case btChar: name = L"char"; break; - case btWChar: name = L"WCHAR"; break; - case btInt: name = L"int"; break; - case btUInt: name = L"unsigned int"; break; - case btFloat: name = L"float"; break; - case btBool: name = L"bool"; break; - case btLong: name = L"long int"; break; - case btULong: name = L"unsigned long int"; break; - case btComplex: name = L"complex"; break; - default: WINE_FIXME("Unsupported basic type %lu\n", bt); return FALSE; - } - X(WCHAR*) = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(name) + 1) * sizeof(WCHAR)); - if (X(WCHAR*)) - { - lstrcpyW(X(WCHAR*), name); - ret = TRUE; - } + name = model->name; + break; } - return ret; } + if (!name) /* synthetize name */ + { + WINE_FIXME("Unsupported basic type %lu %I64u\n", bt, len); + swprintf(tmp, ARRAY_SIZE(tmp), L"bt[%lu,%u]", bt, len); + name = tmp; + } + X(WCHAR*) = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(name) + 1) * sizeof(WCHAR)); + if (X(WCHAR*)) + lstrcpyW(X(WCHAR*), name); + return TRUE; +} + +BOOL types_get_info(const struct dbg_type* type, IMAGEHLP_SYMBOL_TYPE_INFO ti, void* pInfo) +{ + if (type->id == dbg_itype_none) return FALSE; + if (type->module != 0) + return lookup_base_type_in_data_model(type, ti, pInfo) || + SymGetTypeInfo(dbg_curr_process->handle, type->module, type->id, ti, pInfo); assert(type->id >= dbg_itype_first);

1 0

Rémi Bernon : ntdll: Use block size helpers in heap_size.
by Alexandre Julliard May 13, 2022

May 13, 2022

Module: wine Branch: master Commit: accaf8f29a372f6a210933ffac3e548c3194e391 URL: https://source.winehq.org/git/wine.git/?a=commit;h=accaf8f29a372f6a210933ff… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue May 3 22:59:54 2022 +0200 ntdll: Use block size helpers in heap_size. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/heap.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 424f060b719..68f7e6edcc0 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -2054,10 +2054,7 @@ static NTSTATUS heap_size( HEAP *heap, const void *ptr, SIZE_T *size ) const ARENA_LARGE *large_arena = (const ARENA_LARGE *)ptr - 1; *size = large_arena->data_size; } - else - { - *size = (block->size & ARENA_SIZE_MASK) - block->unused_bytes; - } + else *size = block_get_size( block ) - block_get_overhead( block ); return STATUS_SUCCESS; }

1 0

Eric Pouech : dbghelp: Let symt_basic be trans-module and nameless.
by Alexandre Julliard May 13, 2022

May 13, 2022

Module: wine Branch: master Commit: 14462bbeab6c916f2aa01a615b1eb4d8005277e5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=14462bbeab6c916f2aa01a61… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue May 10 17:11:08 2022 +0200 dbghelp: Let symt_basic be trans-module and nameless. Rationale: - native doesn't report names for SymTagBaseType objects => so remove typename for sym_basic - since symt_basic becomes pretty simple, it's possible to share the object across all modules loaded in dbghelp (simplicity, memory usage reduction) - removed dwarf basic types cache in dwarf.c as we now have a generic one Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dbghelp_private.h | 4 +-- dlls/dbghelp/dwarf.c | 46 ++++++++++++++-------------------- dlls/dbghelp/msc.c | 56 +++++++++++++++++++++--------------------- dlls/dbghelp/stabs.c | 48 ++++++++++++++++++------------------ dlls/dbghelp/type.c | 37 ++++++++++++---------------- 5 files changed, 87 insertions(+), 104 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=14462bbeab6c916f2aa0…

1 0

Rémi Bernon : ntdll: Rewrite RtlWalkHeap and enumerate large blocks.
by Alexandre Julliard May 13, 2022

May 13, 2022

Module: wine Branch: master Commit: 074177b8b0356df2e3ddfb8534e2ee1257b37a71 URL: https://source.winehq.org/git/wine.git/?a=commit;h=074177b8b0356df2e3ddfb85… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu May 5 00:49:25 2022 +0200 ntdll: Rewrite RtlWalkHeap and enumerate large blocks. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/heap.c | 92 +-------------- dlls/kernelbase/memory.c | 57 +++++++++- dlls/ntdll/heap.c | 276 ++++++++++++++++++++++----------------------- 3 files changed, 191 insertions(+), 234 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=074177b8b0356df2e3dd…

1 0

Rémi Bernon : ntdll: Cleanup HEAP_FindSubHeap and rename it to find_subheap.
by Alexandre Julliard May 13, 2022

May 13, 2022

Module: wine Branch: master Commit: 4d2dedb22b8c61918727f0d52580431275f49933 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4d2dedb22b8c61918727f0d5… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri May 13 10:10:13 2022 +0200 ntdll: Cleanup HEAP_FindSubHeap and rename it to find_subheap. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/heap.c | 37 +++++++++++++++---------------------- 1 file changed, 15 insertions(+), 22 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 68f7e6edcc0..ab9985a1016 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -608,23 +608,16 @@ static inline void HEAP_InsertFreeBlock( HEAP *heap, ARENA_FREE *pArena, BOOL la } -/*********************************************************************** - * HEAP_FindSubHeap - * Find the sub-heap containing a given address. - * - * RETURNS - * Pointer: Success - * NULL: Failure - */ -static SUBHEAP *HEAP_FindSubHeap( - const HEAP *heap, /* [in] Heap pointer */ - LPCVOID ptr ) /* [in] Address */ -{ - SUBHEAP *sub; - LIST_FOR_EACH_ENTRY( sub, &heap->subheap_list, SUBHEAP, entry ) - if ((ptr >= sub->base) && - ((const char *)ptr < (const char *)sub->base + sub->size - sizeof(ARENA_INUSE))) - return sub; +static SUBHEAP *find_subheap( const HEAP *heap, const void *ptr ) +{ + SUBHEAP *subheap; + + LIST_FOR_EACH_ENTRY( subheap, &heap->subheap_list, SUBHEAP, entry ) + { + if (contains( subheap_base( subheap ), subheap_size( subheap ), ptr, sizeof(struct block) )) + return subheap; + } + return NULL; } @@ -760,7 +753,7 @@ static void HEAP_MakeInUseBlockFree( SUBHEAP *subheap, ARENA_INUSE *pArena ) mark_block_free( pArena + 1, pArena->size & ARENA_SIZE_MASK, heap->flags ); if (!prev) return; pArena = prev; - subheap = HEAP_FindSubHeap( heap, pArena ); + subheap = find_subheap( heap, pArena ); } /* Check if we can merge with previous block */ @@ -1132,7 +1125,7 @@ static ARENA_FREE *HEAP_FindFreeBlock( HEAP *heap, SIZE_T size, sizeof(ARENA_FREE) - sizeof(ARENA_INUSE); if (arena_size >= size) { - subheap = HEAP_FindSubHeap( heap, pArena ); + subheap = find_subheap( heap, pArena ); if (!HEAP_Commit( subheap, (ARENA_INUSE *)pArena, size )) return NULL; *ppSubHeap = subheap; return pArena; @@ -1183,7 +1176,7 @@ static ARENA_FREE *HEAP_FindFreeBlock( HEAP *heap, SIZE_T size, static BOOL HEAP_IsValidArenaPtr( const HEAP *heap, const ARENA_FREE *ptr ) { unsigned int i; - const SUBHEAP *subheap = HEAP_FindSubHeap( heap, ptr ); + const SUBHEAP *subheap = find_subheap( heap, ptr ); if (!subheap) return FALSE; if ((const char *)ptr >= (const char *)subheap->base + subheap->headerSize) return TRUE; if (subheap != &heap->subheap) return FALSE; @@ -1440,7 +1433,7 @@ static BOOL heap_validate_ptr( HEAP *heap, const void *ptr ) const ARENA_LARGE *large_arena; SUBHEAP *subheap; - if (!(subheap = HEAP_FindSubHeap( heap, arena )) || + if (!(subheap = find_subheap( heap, arena )) || ((const char *)arena < (char *)subheap->base + subheap->headerSize)) { if (!(large_arena = find_large_block( heap, ptr ))) @@ -1495,7 +1488,7 @@ static BOOL validate_block_pointer( HEAP *heap, SUBHEAP **ret_subheap, const ARE SUBHEAP *subheap; BOOL ret = FALSE; - if (!(*ret_subheap = subheap = HEAP_FindSubHeap( heap, arena ))) + if (!(*ret_subheap = subheap = find_subheap( heap, arena ))) { ARENA_LARGE *large_arena = find_large_block( heap, arena + 1 );

1 0

Rémi Bernon : ntdll: Introduce new block metadata access helpers.
by Alexandre Julliard May 13, 2022

May 13, 2022

Module: wine Branch: master Commit: adad22d1c251751dd9948fed33ad57a0fb8bef4c URL: https://source.winehq.org/git/wine.git/?a=commit;h=adad22d1c251751dd9948fed… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue May 3 14:54:42 2022 +0200 ntdll: Introduce new block metadata access helpers. And use them to cleanup HEAP_Dump, renaming it to heap_dump. They will be used to cleanup and simplify the heap implementation. They will make changing the block and subheap layouts easier later. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/heap.c | 216 +++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 150 insertions(+), 66 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=adad22d1c251751dd994…

1 0

Eric Pouech : winevulkan: Enable compilation with long types.
by Alexandre Julliard May 13, 2022

May 13, 2022

Module: wine Branch: master Commit: 6ecf96d1a8e0f2223643eb2b2c99109524097459 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6ecf96d1a8e0f2223643eb2b… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri May 13 09:41:00 2022 +0200 winevulkan: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/Makefile.in | 1 - dlls/winevulkan/loader.c | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/winevulkan/Makefile.in b/dlls/winevulkan/Makefile.in index a6df9d52c1f..38809211308 100644 --- a/dlls/winevulkan/Makefile.in +++ b/dlls/winevulkan/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = winevulkan.dll UNIXLIB = winevulkan.so IMPORTLIB = winevulkan diff --git a/dlls/winevulkan/loader.c b/dlls/winevulkan/loader.c index 3fa334d2a3e..61c583d5c13 100644 --- a/dlls/winevulkan/loader.c +++ b/dlls/winevulkan/loader.c @@ -363,7 +363,7 @@ static void fill_luid_property(VkPhysicalDeviceProperties2 *properties2) SetupDiDestroyDeviceInfoList(devinfo); release_display_device_init_mutex(mutex); - TRACE("deviceName:%s deviceLUIDValid:%d LUID:%08x:%08x deviceNodeMask:%#x.\n", + TRACE("deviceName:%s deviceLUIDValid:%d LUID:%08lx:%08lx deviceNodeMask:%#x.\n", properties2->properties.deviceName, id->deviceLUIDValid, luid.HighPart, luid.LowPart, id->deviceNodeMask); } @@ -409,7 +409,7 @@ BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, void *reserved) { void **kernel_callback_table; - TRACE("%p, %u, %p\n", hinst, reason, reserved); + TRACE("%p, %lu, %p\n", hinst, reason, reserved); switch (reason) {

1 0