wine-commits November 2021

wine-commits@winehq.org

2 participants
951 discussions

Eric Pouech : dbghelp/pdb: Handle S_LOCAL codeview entries.
by Alexandre Julliard 08 Nov '21

08 Nov '21

Module: wine Branch: master Commit: 7ad847bc34e5619a9ff0b282aad2d73102d29268 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7ad847bc34e5619a9ff0b282… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Nov 8 14:58:39 2021 +0100 dbghelp/pdb: Handle S_LOCAL codeview entries. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/msc.c | 180 ++++++++++++++++++++++++++++++++++++++++++++++++- include/wine/mscvpdb.h | 6 +- 2 files changed, 181 insertions(+), 5 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7ad847bc34e5619a9ff0…

1 0

Eric Pouech : dbghelp/pdb: Add new basic type to represent char8_t introduced in C++20.
by Alexandre Julliard 08 Nov '21

08 Nov '21

Module: wine Branch: master Commit: de5fe8935798651bdcb486dc7526274052f5d496 URL: https://source.winehq.org/git/wine.git/?a=commit;h=de5fe8935798651bdcb486dc… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Nov 8 14:58:26 2021 +0100 dbghelp/pdb: Add new basic type to represent char8_t introduced in C++20. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/msc.c | 4 ++++ include/cvconst.h | 3 ++- include/wine/mscvpdb.h | 7 +++++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index a2d9f0bb368..3a62736e7ed 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -166,6 +166,7 @@ static void codeview_init_basic_types(struct module* module) cv_basic_types[T_WCHAR] = &symt_new_basic(module, btWChar, "wchar_t", 2)->symt; cv_basic_types[T_CHAR16] = &symt_new_basic(module, btChar16,"char16_t", 2)->symt; cv_basic_types[T_CHAR32] = &symt_new_basic(module, btChar32,"char32_t", 4)->symt; + cv_basic_types[T_CHAR8] = &symt_new_basic(module, btChar8, "char8_t", 1)->symt; cv_basic_types[T_INT2] = &symt_new_basic(module, btInt, "INT2", 2)->symt; cv_basic_types[T_UINT2] = &symt_new_basic(module, btUInt, "UINT2", 2)->symt; cv_basic_types[T_INT4] = &symt_new_basic(module, btInt, "INT4", 4)->symt; @@ -194,6 +195,7 @@ static void codeview_init_basic_types(struct module* module) cv_basic_types[T_32PWCHAR] = &symt_new_pointer(module, cv_basic_types[T_WCHAR], 4)->symt; cv_basic_types[T_32PCHAR16] = &symt_new_pointer(module, cv_basic_types[T_CHAR16], 4)->symt; cv_basic_types[T_32PCHAR32] = &symt_new_pointer(module, cv_basic_types[T_CHAR32], 4)->symt; + cv_basic_types[T_32PCHAR8] = &symt_new_pointer(module, cv_basic_types[T_CHAR8], 4)->symt; cv_basic_types[T_32PINT2] = &symt_new_pointer(module, cv_basic_types[T_INT2], 4)->symt; cv_basic_types[T_32PUINT2] = &symt_new_pointer(module, cv_basic_types[T_UINT2], 4)->symt; cv_basic_types[T_32PINT4] = &symt_new_pointer(module, cv_basic_types[T_INT4], 4)->symt; @@ -222,6 +224,7 @@ static void codeview_init_basic_types(struct module* module) cv_basic_types[T_64PWCHAR] = &symt_new_pointer(module, cv_basic_types[T_WCHAR], 8)->symt; cv_basic_types[T_64PCHAR16] = &symt_new_pointer(module, cv_basic_types[T_CHAR16], 8)->symt; cv_basic_types[T_64PCHAR32] = &symt_new_pointer(module, cv_basic_types[T_CHAR32], 8)->symt; + cv_basic_types[T_64PCHAR8] = &symt_new_pointer(module, cv_basic_types[T_CHAR8], 8)->symt; cv_basic_types[T_64PINT2] = &symt_new_pointer(module, cv_basic_types[T_INT2], 8)->symt; cv_basic_types[T_64PUINT2] = &symt_new_pointer(module, cv_basic_types[T_UINT2], 8)->symt; cv_basic_types[T_64PINT4] = &symt_new_pointer(module, cv_basic_types[T_INT4], 8)->symt; @@ -250,6 +253,7 @@ static void codeview_init_basic_types(struct module* module) cv_basic_types[T_PWCHAR] = &symt_new_pointer(module, cv_basic_types[T_WCHAR], ptrsz)->symt; cv_basic_types[T_PCHAR16] = &symt_new_pointer(module, cv_basic_types[T_CHAR16], ptrsz)->symt; cv_basic_types[T_PCHAR32] = &symt_new_pointer(module, cv_basic_types[T_CHAR32], ptrsz)->symt; + cv_basic_types[T_PCHAR8] = &symt_new_pointer(module, cv_basic_types[T_CHAR8], ptrsz)->symt; cv_basic_types[T_PINT2] = &symt_new_pointer(module, cv_basic_types[T_INT2], ptrsz)->symt; cv_basic_types[T_PUINT2] = &symt_new_pointer(module, cv_basic_types[T_UINT2], ptrsz)->symt; cv_basic_types[T_PINT4] = &symt_new_pointer(module, cv_basic_types[T_INT4], ptrsz)->symt; diff --git a/include/cvconst.h b/include/cvconst.h index 82929dda772..9536ee8202d 100644 --- a/include/cvconst.h +++ b/include/cvconst.h @@ -91,7 +91,8 @@ enum BasicType btBSTR = 30, btHresult = 31, btChar16 = 32, - btChar32 = 33 + btChar32 = 33, + btChar8 = 34, }; /* kind of UDT */ diff --git a/include/wine/mscvpdb.h b/include/wine/mscvpdb.h index e199aff785f..1a173c097d7 100644 --- a/include/wine/mscvpdb.h +++ b/include/wine/mscvpdb.h @@ -945,6 +945,7 @@ union codeview_fieldtype #define T_UINT8 0x0077 /* 64-bit unsigned int */ #define T_CHAR16 0x007a /* 16-bit unicode char */ #define T_CHAR32 0x007b /* 32-bit unicode char */ +#define T_CHAR8 0x007c /* 8-bit unicode char (C++ 20) */ /* near pointers to basic types */ #define T_PVOID 0x0103 /* near pointer to void */ @@ -979,6 +980,7 @@ union codeview_fieldtype #define T_PUINT8 0x0177 /* Near pointer to 64-bit unsigned int */ #define T_PCHAR16 0x017a /* Near pointer to 16-bit unicode char */ #define T_PCHAR32 0x017b /* Near pointer to 32-bit unicode char */ +#define T_PCHAR8 0x017c /* Near pointer to 8-bit unicode char */ /* far pointers to basic types */ #define T_PFVOID 0x0203 /* Far pointer to void */ @@ -1013,6 +1015,7 @@ union codeview_fieldtype #define T_PFUINT8 0x0277 /* Far pointer to 64-bit unsigned int */ #define T_PFCHAR16 0x027a /* Far pointer to 16-bit unicode char */ #define T_PFCHAR32 0x027b /* Far pointer to 32-bit unicode char */ +#define T_PFCHAR8 0x027c /* Far pointer to 8-bit unicode char */ /* huge pointers to basic types */ #define T_PHVOID 0x0303 /* Huge pointer to void */ @@ -1047,6 +1050,7 @@ union codeview_fieldtype #define T_PHUINT8 0x0377 /* Huge pointer to 64-bit unsigned int */ #define T_PHCHAR16 0x037a /* Huge pointer to 16-bit unicode char */ #define T_PHCHAR32 0x037b /* Huge pointer to 32-bit unicode char */ +#define T_PHCHAR8 0x037c /* Huge pointer to 8-bit unicode char */ /* 32-bit near pointers to basic types */ #define T_32PVOID 0x0403 /* 32-bit near pointer to void */ @@ -1082,6 +1086,7 @@ union codeview_fieldtype #define T_32PUINT8 0x0477 /* 16:32 near pointer to 64-bit unsigned int */ #define T_32PCHAR16 0x047a /* 16:32 near pointer to 16-bit unicode char */ #define T_32PCHAR32 0x047b /* 16:32 near pointer to 32-bit unicode char */ +#define T_32PCHAR8 0x047c /* 16:32 near pointer to 8-bit unicode char */ /* 32-bit far pointers to basic types */ #define T_32PFVOID 0x0503 /* 32-bit far pointer to void */ @@ -1117,6 +1122,7 @@ union codeview_fieldtype #define T_32PFUINT8 0x0577 /* 16:32 far pointer to 64-bit unsigned int */ #define T_32PFCHAR16 0x057a /* 16:32 far pointer to 16-bit unicode char */ #define T_32PFCHAR32 0x057b /* 16:32 far pointer to 32-bit unicode char */ +#define T_32PFCHAR8 0x057c /* 16:32 far pointer to 8-bit unicode char */ /* 64-bit near pointers to basic types */ #define T_64PVOID 0x0603 /* 64-bit near pointer to void */ @@ -1152,6 +1158,7 @@ union codeview_fieldtype #define T_64PUINT8 0x0677 /* 64 near pointer to 64-bit unsigned int */ #define T_64PCHAR16 0x067a /* 64 near pointer to 16-bit unicode char */ #define T_64PCHAR32 0x067b /* 64 near pointer to 32-bit unicode char */ +#define T_64PCHAR8 0x067c /* 64 near pointer to 8-bit unicode char */ /* counts, bit masks, and shift values needed to access various parts of the built-in type numbers */ #define T_MAXPREDEFINEDTYPE 0x0580 /* maximum type index for all built-in types */

1 0

Eric Pouech : dbghelp: Use cpu from debuggee's modules rather than debugger's.
by Alexandre Julliard 08 Nov '21

08 Nov '21

Module: wine Branch: master Commit: 9f3e8a515f4f9359355ecd49eb0bbbb958e9ad0e URL: https://source.winehq.org/git/wine.git/?a=commit;h=9f3e8a515f4f9359355ecd49… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Nov 8 14:58:13 2021 +0100 dbghelp: Use cpu from debuggee's modules rather than debugger's. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dwarf.c | 50 ++++++++++++++++++++++++++++---------------------- dlls/dbghelp/module.c | 6 +++--- dlls/dbghelp/stabs.c | 4 ++-- 3 files changed, 33 insertions(+), 27 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9f3e8a515f4f9359355e…

1 0

Eric Pouech : dbghelp: Use module's cpu word size instead of sizeof(void*) or sizeof(DWORD_PTR).
by Alexandre Julliard 08 Nov '21

08 Nov '21

Module: wine Branch: master Commit: e8b195329e4c4c9d07dbb5aed79cb1dbb99e3513 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e8b195329e4c4c9d07dbb5ae… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Nov 8 14:57:59 2021 +0100 dbghelp: Use module's cpu word size instead of sizeof(void*) or sizeof(DWORD_PTR). This fixes a couple of wrong pointer size computation when debugging a WoW64 process from a 64 bit debugger. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dwarf.c | 7 ++++--- dlls/dbghelp/msc.c | 56 +++++++++++++++++++++++++++------------------------- dlls/dbghelp/stabs.c | 2 +- 3 files changed, 34 insertions(+), 31 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index d812e03f833..7ecd04d216e 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -1488,7 +1488,7 @@ static struct symt* dwarf2_parse_pointer_type(dwarf2_debug_info_t* di) TRACE("%s\n", dwarf2_debug_di(di)); - if (!dwarf2_find_attribute(di, DW_AT_byte_size, &size)) size.u.uvalue = sizeof(void *); + if (!dwarf2_find_attribute(di, DW_AT_byte_size, &size)) size.u.uvalue = di->unit_ctx->module_ctx->module->cpu->word_size; ref_type = dwarf2_lookup_type(di); di->symt = &symt_new_pointer(di->unit_ctx->module_ctx->module, ref_type, size.u.uvalue)->symt; if (dwarf2_get_di_children(di)) FIXME("Unsupported children\n"); @@ -1645,7 +1645,7 @@ static struct symt* dwarf2_parse_unspecified_type(dwarf2_debug_info_t* di) if (!dwarf2_find_attribute(di, DW_AT_name, &name)) name.u.string = "void"; - size.u.uvalue = sizeof(void *); + size.u.uvalue = di->unit_ctx->module_ctx->module->cpu->word_size; basic = symt_new_basic(di->unit_ctx->module_ctx->module, btVoid, name.u.string, size.u.uvalue); di->symt = &basic->symt; @@ -1664,7 +1664,8 @@ static struct symt* dwarf2_parse_reference_type(dwarf2_debug_info_t* di) ref_type = dwarf2_lookup_type(di); /* FIXME: for now, we hard-wire C++ references to pointers */ - di->symt = &symt_new_pointer(di->unit_ctx->module_ctx->module, ref_type, sizeof(void *))->symt; + di->symt = &symt_new_pointer(di->unit_ctx->module_ctx->module, ref_type, + di->unit_ctx->module_ctx->module->cpu->word_size)->symt; if (dwarf2_get_di_children(di)) FIXME("Unsupported children\n"); diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index 97991be057f..a2d9f0bb368 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -139,6 +139,8 @@ static struct cv_defined_module*cv_current_module; static void codeview_init_basic_types(struct module* module) { + unsigned ptrsz = module->cpu->word_size; + /* * These are the common builtin types that are used by VC++. */ @@ -228,32 +230,32 @@ static void codeview_init_basic_types(struct module* module) cv_basic_types[T_64PUINT8] = &symt_new_pointer(module, cv_basic_types[T_UINT8], 8)->symt; cv_basic_types[T_64PHRESULT]= &symt_new_pointer(module, cv_basic_types[T_HRESULT], 8)->symt; - cv_basic_types[T_PVOID] = &symt_new_pointer(module, cv_basic_types[T_VOID], sizeof(void*))->symt; - cv_basic_types[T_PCHAR] = &symt_new_pointer(module, cv_basic_types[T_CHAR], sizeof(void*))->symt; - cv_basic_types[T_PSHORT] = &symt_new_pointer(module, cv_basic_types[T_SHORT], sizeof(void*))->symt; - cv_basic_types[T_PLONG] = &symt_new_pointer(module, cv_basic_types[T_LONG], sizeof(void*))->symt; - cv_basic_types[T_PQUAD] = &symt_new_pointer(module, cv_basic_types[T_QUAD], sizeof(void*))->symt; - cv_basic_types[T_PUCHAR] = &symt_new_pointer(module, cv_basic_types[T_UCHAR], sizeof(void*))->symt; - cv_basic_types[T_PUSHORT] = &symt_new_pointer(module, cv_basic_types[T_USHORT], sizeof(void*))->symt; - cv_basic_types[T_PULONG] = &symt_new_pointer(module, cv_basic_types[T_ULONG], sizeof(void*))->symt; - cv_basic_types[T_PUQUAD] = &symt_new_pointer(module, cv_basic_types[T_UQUAD], sizeof(void*))->symt; - cv_basic_types[T_PBOOL08] = &symt_new_pointer(module, cv_basic_types[T_BOOL08], sizeof(void*))->symt; - cv_basic_types[T_PBOOL16] = &symt_new_pointer(module, cv_basic_types[T_BOOL16], sizeof(void*))->symt; - cv_basic_types[T_PBOOL32] = &symt_new_pointer(module, cv_basic_types[T_BOOL32], sizeof(void*))->symt; - cv_basic_types[T_PBOOL64] = &symt_new_pointer(module, cv_basic_types[T_BOOL64], sizeof(void*))->symt; - cv_basic_types[T_PREAL32] = &symt_new_pointer(module, cv_basic_types[T_REAL32], sizeof(void*))->symt; - cv_basic_types[T_PREAL64] = &symt_new_pointer(module, cv_basic_types[T_REAL64], sizeof(void*))->symt; - cv_basic_types[T_PREAL80] = &symt_new_pointer(module, cv_basic_types[T_REAL80], sizeof(void*))->symt; - cv_basic_types[T_PRCHAR] = &symt_new_pointer(module, cv_basic_types[T_RCHAR], sizeof(void*))->symt; - cv_basic_types[T_PWCHAR] = &symt_new_pointer(module, cv_basic_types[T_WCHAR], sizeof(void*))->symt; - cv_basic_types[T_PCHAR16] = &symt_new_pointer(module, cv_basic_types[T_CHAR16], sizeof(void*))->symt; - cv_basic_types[T_PCHAR32] = &symt_new_pointer(module, cv_basic_types[T_CHAR32], sizeof(void*))->symt; - cv_basic_types[T_PINT2] = &symt_new_pointer(module, cv_basic_types[T_INT2], sizeof(void*))->symt; - cv_basic_types[T_PUINT2] = &symt_new_pointer(module, cv_basic_types[T_UINT2], sizeof(void*))->symt; - cv_basic_types[T_PINT4] = &symt_new_pointer(module, cv_basic_types[T_INT4], sizeof(void*))->symt; - cv_basic_types[T_PUINT4] = &symt_new_pointer(module, cv_basic_types[T_UINT4], sizeof(void*))->symt; - cv_basic_types[T_PINT8] = &symt_new_pointer(module, cv_basic_types[T_INT8], sizeof(void*))->symt; - cv_basic_types[T_PUINT8] = &symt_new_pointer(module, cv_basic_types[T_UINT8], sizeof(void*))->symt; + cv_basic_types[T_PVOID] = &symt_new_pointer(module, cv_basic_types[T_VOID], ptrsz)->symt; + cv_basic_types[T_PCHAR] = &symt_new_pointer(module, cv_basic_types[T_CHAR], ptrsz)->symt; + cv_basic_types[T_PSHORT] = &symt_new_pointer(module, cv_basic_types[T_SHORT], ptrsz)->symt; + cv_basic_types[T_PLONG] = &symt_new_pointer(module, cv_basic_types[T_LONG], ptrsz)->symt; + cv_basic_types[T_PQUAD] = &symt_new_pointer(module, cv_basic_types[T_QUAD], ptrsz)->symt; + cv_basic_types[T_PUCHAR] = &symt_new_pointer(module, cv_basic_types[T_UCHAR], ptrsz)->symt; + cv_basic_types[T_PUSHORT] = &symt_new_pointer(module, cv_basic_types[T_USHORT], ptrsz)->symt; + cv_basic_types[T_PULONG] = &symt_new_pointer(module, cv_basic_types[T_ULONG], ptrsz)->symt; + cv_basic_types[T_PUQUAD] = &symt_new_pointer(module, cv_basic_types[T_UQUAD], ptrsz)->symt; + cv_basic_types[T_PBOOL08] = &symt_new_pointer(module, cv_basic_types[T_BOOL08], ptrsz)->symt; + cv_basic_types[T_PBOOL16] = &symt_new_pointer(module, cv_basic_types[T_BOOL16], ptrsz)->symt; + cv_basic_types[T_PBOOL32] = &symt_new_pointer(module, cv_basic_types[T_BOOL32], ptrsz)->symt; + cv_basic_types[T_PBOOL64] = &symt_new_pointer(module, cv_basic_types[T_BOOL64], ptrsz)->symt; + cv_basic_types[T_PREAL32] = &symt_new_pointer(module, cv_basic_types[T_REAL32], ptrsz)->symt; + cv_basic_types[T_PREAL64] = &symt_new_pointer(module, cv_basic_types[T_REAL64], ptrsz)->symt; + cv_basic_types[T_PREAL80] = &symt_new_pointer(module, cv_basic_types[T_REAL80], ptrsz)->symt; + cv_basic_types[T_PRCHAR] = &symt_new_pointer(module, cv_basic_types[T_RCHAR], ptrsz)->symt; + cv_basic_types[T_PWCHAR] = &symt_new_pointer(module, cv_basic_types[T_WCHAR], ptrsz)->symt; + cv_basic_types[T_PCHAR16] = &symt_new_pointer(module, cv_basic_types[T_CHAR16], ptrsz)->symt; + cv_basic_types[T_PCHAR32] = &symt_new_pointer(module, cv_basic_types[T_CHAR32], ptrsz)->symt; + cv_basic_types[T_PINT2] = &symt_new_pointer(module, cv_basic_types[T_INT2], ptrsz)->symt; + cv_basic_types[T_PUINT2] = &symt_new_pointer(module, cv_basic_types[T_UINT2], ptrsz)->symt; + cv_basic_types[T_PINT4] = &symt_new_pointer(module, cv_basic_types[T_INT4], ptrsz)->symt; + cv_basic_types[T_PUINT4] = &symt_new_pointer(module, cv_basic_types[T_UINT4], ptrsz)->symt; + cv_basic_types[T_PINT8] = &symt_new_pointer(module, cv_basic_types[T_INT8], ptrsz)->symt; + cv_basic_types[T_PUINT8] = &symt_new_pointer(module, cv_basic_types[T_UINT8], ptrsz)->symt; } static int leaf_as_variant(VARIANT* v, const unsigned short int* leaf) @@ -659,7 +661,7 @@ static struct symt* codeview_add_type_pointer(struct codeview_type_parse* ctp, return existing; } pointee = codeview_fetch_type(ctp, pointee_type, FALSE); - return &symt_new_pointer(ctp->module, pointee, sizeof(void *))->symt; + return &symt_new_pointer(ctp->module, pointee, ctp->module->cpu->word_size)->symt; } static struct symt* codeview_add_type_array(struct codeview_type_parse* ctp, diff --git a/dlls/dbghelp/stabs.c b/dlls/dbghelp/stabs.c index 647a71ec258..f2b3e6d5c7d 100644 --- a/dlls/dbghelp/stabs.c +++ b/dlls/dbghelp/stabs.c @@ -804,7 +804,7 @@ static int stabs_pts_read_type_def(struct ParseTypedefData* ptd, const char* typ case '*': case '&': PTS_ABORTIF(ptd, stabs_pts_read_type_def(ptd, NULL, &ref_dt) == -1); - new_dt = &symt_new_pointer(ptd->module, ref_dt, sizeof(void*))->symt; + new_dt = &symt_new_pointer(ptd->module, ref_dt, ptd->module->cpu->word_size)->symt; break; case 'k': /* 'const' modifier */ case 'B': /* 'volatile' modifier */

1 0

Eric Pouech : dbghelp: Attach a struct cpu* to every module.
by Alexandre Julliard 08 Nov '21

08 Nov '21

Module: wine Branch: master Commit: d72e6ac772ed7ae5160328992620944a38a145da URL: https://source.winehq.org/git/wine.git/?a=commit;h=d72e6ac772ed7ae516032899… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Nov 8 14:57:46 2021 +0100 dbghelp: Attach a struct cpu* to every module. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dbghelp_private.h | 3 +++ dlls/dbghelp/module.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index 61173b34b5a..1e77ed49225 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -430,6 +430,8 @@ struct module_format } u; }; +struct cpu; + struct module { struct process* process; @@ -438,6 +440,7 @@ struct module struct module* next; enum module_type type : 16; unsigned short is_virtual : 1; + struct cpu* cpu; DWORD64 reloc_delta; WCHAR* real_path; diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index 8168e727c52..65bdbb38fda 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -230,6 +230,9 @@ struct module* module_new(struct process* pcs, const WCHAR* name, module->addr_sorttab = NULL; module->num_sorttab = 0; module->num_symbols = 0; + module->cpu = cpu_find(machine); + if (!module->cpu) + module->cpu = dbghelp_current_cpu; vector_init(&module->vsymt, sizeof(struct symt*), 128); vector_init(&module->vcustom_symt, sizeof(struct symt*), 16);

1 0

Eric Pouech : dbghelp: Check that we don't add same line number twice.
by Alexandre Julliard 08 Nov '21

08 Nov '21

Module: wine Branch: master Commit: e105e9d35ee9f28f5a1615cd8f2b582ae8d82041 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e105e9d35ee9f28f5a1615cd… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Nov 8 14:57:32 2021 +0100 dbghelp: Check that we don't add same line number twice. This happens (at least) in dwarf debug info where there could be two entries with same source file and line number, but different column numbers (and we don't store columns). Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/symbol.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index 7747aaae2ae..435d94bc8eb 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -418,6 +418,11 @@ void symt_add_func_line(struct module* module, struct symt_function* func, } vlen = vector_length(&func->vlines); prev = vlen ? vector_at(&func->vlines, vlen - 1) : NULL; + if (last_matches && prev && addr == prev->u.address) + { + WARN("Duplicate addition of line number in %s\n", func->hash_elt.name); + return; + } if (!last_matches) { /* we shouldn't have line changes on first line of function */

1 0

Eric Pouech : winedump: Fix computation of signed integers in codeview symbol's annotations.
by Alexandre Julliard 08 Nov '21

08 Nov '21

Module: wine Branch: master Commit: 27b7a96d9b0b4a30345ce82171439f3c5fe6cd59 URL: https://source.winehq.org/git/wine.git/?a=commit;h=27b7a96d9b0b4a30345ce821… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Nov 8 14:57:18 2021 +0100 winedump: Fix computation of signed integers in codeview symbol's annotations. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winedump/msc.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/tools/winedump/msc.c b/tools/winedump/msc.c index 79dd022a088..40daf4d50d5 100644 --- a/tools/winedump/msc.c +++ b/tools/winedump/msc.c @@ -1221,6 +1221,11 @@ static unsigned binannot_uncompress(const unsigned char** pptr) return res; } +static inline int binannot_getsigned(unsigned i) +{ + return (i & 1) ? -(int)(i >> 1) : (i >> 1); +} + static void dump_binannot(const unsigned char* ba, const char* last, const char* pfx) { while (ba < (const unsigned char*)last) @@ -1248,7 +1253,7 @@ static void dump_binannot(const unsigned char* ba, const char* last, const char* printf("%sChangeFile %u\n", pfx, binannot_uncompress(&ba)); break; case BA_OP_ChangeLineOffset: - printf("%sChangeLineOffset %d\n", pfx, binannot_uncompress(&ba)); + printf("%sChangeLineOffset %d\n", pfx, binannot_getsigned(binannot_uncompress(&ba))); break; case BA_OP_ChangeLineEndDelta: printf("%sChangeLineEndDelta %u\n", pfx, binannot_uncompress(&ba)); @@ -1265,7 +1270,7 @@ static void dump_binannot(const unsigned char* ba, const char* last, const char* case BA_OP_ChangeCodeOffsetAndLineOffset: { unsigned p1 = binannot_uncompress(&ba); - printf("%sChangeCodeOffsetAndLineOffset %u %u (0x%x)\n", pfx, p1 & 0xf, p1 >> 4, p1); + printf("%sChangeCodeOffsetAndLineOffset %u %u (0x%x)\n", pfx, p1 & 0xf, binannot_getsigned(p1 >> 4), p1); } break; case BA_OP_ChangeCodeLengthAndCodeOffset:

1 0

Alexandre Julliard : sane.ds: Implement Wow64 entry points in the Unix library.
by Alexandre Julliard 08 Nov '21

08 Nov '21

Module: wine Branch: master Commit: 7ec312902b461835839f309c84f95fbad760eb5a URL: https://source.winehq.org/git/wine.git/?a=commit;h=7ec312902b461835839f309c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 8 20:54:47 2021 +0100 sane.ds: Implement Wow64 entry points in the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/sane.ds/sane_main.c | 7 +-- dlls/sane.ds/unixlib.c | 114 +++++++++++++++++++++++++++++++++++++++++++---- dlls/sane.ds/unixlib.h | 10 ----- 3 files changed, 107 insertions(+), 24 deletions(-) diff --git a/dlls/sane.ds/sane_main.c b/dlls/sane.ds/sane_main.c index c67ad8e5f8b..48972bd4b8c 100644 --- a/dlls/sane.ds/sane_main.c +++ b/dlls/sane.ds/sane_main.c @@ -57,8 +57,6 @@ BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) static TW_UINT16 SANE_OpenDS( pTW_IDENTITY pOrigin, pTW_IDENTITY self) { - struct open_ds_params params = { self }; - if (SANE_dsmentry == NULL) { HMODULE moddsm = GetModuleHandleW(L"twain_32"); @@ -73,7 +71,7 @@ static TW_UINT16 SANE_OpenDS( pTW_IDENTITY pOrigin, pTW_IDENTITY self) } } - if (SANE_CALL( open_ds, &params )) return TWRC_FAILURE; + if (SANE_CALL( open_ds, self )) return TWRC_FAILURE; activeDS.twCC = SANE_SaneSetDefaults(); if (activeDS.twCC == TWCC_SUCCESS) @@ -110,8 +108,7 @@ static TW_UINT16 SANE_SourceControlHandler ( break; case MSG_GET: { - struct get_identity_params params = { pData }; - if (SANE_CALL( get_identity, &params )) + if (SANE_CALL( get_identity, pData )) { activeDS.twCC = TWCC_CAPUNSUPPORTED; twRC = TWRC_FAILURE; diff --git a/dlls/sane.ds/unixlib.c b/dlls/sane.ds/unixlib.c index f31ad094d56..897aa09e5ef 100644 --- a/dlls/sane.ds/unixlib.c +++ b/dlls/sane.ds/unixlib.c @@ -208,8 +208,7 @@ static NTSTATUS process_detach( void *args ) static NTSTATUS get_identity( void *args ) { - struct get_identity_params *params = args; - TW_IDENTITY *id = params->id; + TW_IDENTITY *id = args; static int cur_dev; detect_sane_devices(); @@ -232,8 +231,7 @@ static NTSTATUS get_identity( void *args ) static NTSTATUS open_ds( void *args ) { - struct open_ds_params *params = args; - TW_IDENTITY *id = params->id; + TW_IDENTITY *id = args; SANE_Status status; int i; @@ -303,7 +301,7 @@ static NTSTATUS cancel_device( void *args ) static NTSTATUS read_data( void *args ) { - struct read_data_params *params = args; + const struct read_data_params *params = args; unsigned char *buffer = params->buffer; int read_len, remaining = params->len; SANE_Status status; @@ -351,14 +349,14 @@ static NTSTATUS get_params( void *args ) static NTSTATUS option_get_value( void *args ) { - struct option_get_value_params *params = args; + const struct option_get_value_params *params = args; return sane_status_to_twcc( sane_control_option( device_handle, params->optno, SANE_ACTION_GET_VALUE, params->val, NULL )); } static NTSTATUS option_set_value( void *args ) { - struct option_set_value_params *params = args; + const struct option_set_value_params *params = args; int status = 0; TW_UINT16 rc = sane_status_to_twcc( sane_control_option( device_handle, params->optno, SANE_ACTION_SET_VALUE, params->val, &status )); @@ -379,7 +377,7 @@ static NTSTATUS option_get_descriptor( void *args ) static NTSTATUS option_find_descriptor( void *args ) { - struct option_find_descriptor_params *params = args; + const struct option_find_descriptor_params *params = args; struct option_descriptor *descr = params->descr; const SANE_Option_Descriptor *opt; int i; @@ -395,7 +393,7 @@ static NTSTATUS option_find_descriptor( void *args ) return STATUS_NO_MORE_ENTRIES; } -unixlib_entry_t __wine_unix_call_funcs[] = +const unixlib_entry_t __wine_unix_call_funcs[] = { process_attach, process_detach, @@ -411,3 +409,101 @@ unixlib_entry_t __wine_unix_call_funcs[] = option_get_descriptor, option_find_descriptor, }; + +#ifdef _WIN64 + +typedef ULONG PTR32; + +static NTSTATUS wow64_read_data( void *args ) +{ + struct + { + PTR32 buffer; + int len; + PTR32 retlen; + } const *params32 = args; + + struct read_data_params params = + { + ULongToPtr(params32->buffer), + params32->len, + ULongToPtr(params32->retlen) + }; + + return read_data( &params ); +} + +static NTSTATUS wow64_option_get_value( void *args ) +{ + struct + { + int optno; + PTR32 val; + } const *params32 = args; + + struct option_get_value_params params = + { + params32->optno, + ULongToPtr(params32->val) + }; + + return option_get_value( &params ); +} + +static NTSTATUS wow64_option_set_value( void *args ) +{ + struct + { + int optno; + PTR32 val; + PTR32 reload; + } const *params32 = args; + + struct option_set_value_params params = + { + params32->optno, + ULongToPtr(params32->val), + ULongToPtr(params32->reload) + }; + + return option_set_value( &params ); +} + + +static NTSTATUS wow64_option_find_descriptor( void *args ) +{ + struct + { + PTR32 name; + int type; + PTR32 descr; + } const *params32 = args; + + struct option_find_descriptor_params params = + { + ULongToPtr(params32->name), + params32->type, + ULongToPtr(params32->descr) + }; + + return option_find_descriptor( &params ); +} + +const unixlib_entry_t __wine_unix_call_wow64_funcs[] = +{ + process_attach, + process_detach, + get_identity, + open_ds, + close_ds, + start_device, + cancel_device, + wow64_read_data, + get_params, + wow64_option_get_value, + wow64_option_set_value, + option_get_descriptor, + wow64_option_find_descriptor, +}; + +#endif /* _WIN64 */ diff --git a/dlls/sane.ds/unixlib.h b/dlls/sane.ds/unixlib.h index d07812fb175..6e38936ae90 100644 --- a/dlls/sane.ds/unixlib.h +++ b/dlls/sane.ds/unixlib.h @@ -53,16 +53,6 @@ struct option_descriptor } constraint; }; -struct get_identity_params -{ - TW_IDENTITY *id; -}; - -struct open_ds_params -{ - TW_IDENTITY *id; -}; - struct read_data_params { void *buffer;

1 0

Alexandre Julliard : netapi32: Implement Wow64 entry points in the Unix library.
by Alexandre Julliard 08 Nov '21

08 Nov '21

Module: wine Branch: master Commit: 7693fb80912ad53128200515e236b71398a8e61f URL: https://source.winehq.org/git/wine.git/?a=commit;h=7693fb80912ad53128200515… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 8 20:54:32 2021 +0100 netapi32: Implement Wow64 entry points in the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/netapi32/unixlib.c | 129 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 124 insertions(+), 5 deletions(-) diff --git a/dlls/netapi32/unixlib.c b/dlls/netapi32/unixlib.c index 4e77808cb86..8d61774b7d7 100644 --- a/dlls/netapi32/unixlib.c +++ b/dlls/netapi32/unixlib.c @@ -146,7 +146,7 @@ static NET_API_STATUS server_info_from_samba( DWORD level, const unsigned char * static NTSTATUS server_getinfo( void *args ) { - struct server_getinfo_params *params = args; + const struct server_getinfo_params *params = args; NET_API_STATUS status; char *samba_server = NULL; unsigned char *samba_buffer = NULL; @@ -707,7 +707,7 @@ static NET_API_STATUS share_info_to_samba( DWORD level, const BYTE *buf, unsigne static NTSTATUS share_add( void *args ) { - struct share_add_params *params = args; + const struct share_add_params *params = args; char *samba_server = NULL; unsigned char *samba_info; NET_API_STATUS status; @@ -730,7 +730,7 @@ static NTSTATUS share_add( void *args ) static NTSTATUS share_del( void *args ) { - struct share_del_params *params = args; + const struct share_del_params *params = args; char *samba_server = NULL, *samba_share; NET_API_STATUS status; @@ -807,7 +807,7 @@ static NET_API_STATUS wksta_info_from_samba( DWORD level, const unsigned char *b static NTSTATUS wksta_getinfo( void *args ) { - struct wksta_getinfo_params *params = args; + const struct wksta_getinfo_params *params = args; unsigned char *samba_buffer = NULL; char *samba_server = NULL; NET_API_STATUS status; @@ -888,7 +888,7 @@ static NTSTATUS netapi_init( void *args ) static NTSTATUS change_password( void *args ) { - struct change_password_params *params = args; + const struct change_password_params *params = args; NET_API_STATUS ret = NERR_Success; static char option_silent[] = "-s"; static char option_user[] = "-U"; @@ -986,4 +986,123 @@ const unixlib_entry_t __wine_unix_call_funcs[] = change_password, }; +#ifdef _WIN64 + +typedef ULONG PTR32; + +static NTSTATUS wow64_server_getinfo( void *args ) +{ + struct + { + PTR32 server; + DWORD level; + PTR32 buffer; + PTR32 size; + } const *params32 = args; + + struct server_getinfo_params params = + { + ULongToPtr(params32->server), + params32->level, + ULongToPtr(params32->buffer), + ULongToPtr(params32->size) + }; + + return server_getinfo( &params ); +} + +static NTSTATUS wow64_share_add( void *args ) +{ + struct + { + PTR32 server; + DWORD level; + PTR32 info; + PTR32 err; + } const *params32 = args; + + struct share_add_params params = + { + ULongToPtr(params32->server), + params32->level, + ULongToPtr(params32->info), + ULongToPtr(params32->err) + }; + + return share_add( &params ); +} + +static NTSTATUS wow64_share_del( void *args ) +{ + struct + { + PTR32 server; + PTR32 share; + DWORD reserved; + } const *params32 = args; + + struct share_del_params params = + { + ULongToPtr(params32->server), + ULongToPtr(params32->share), + params32->reserved + }; + + return share_del( &params ); +} + +static NTSTATUS wow64_wksta_getinfo( void *args ) +{ + struct + { + PTR32 server; + DWORD level; + PTR32 buffer; + PTR32 size; + } const *params32 = args; + + struct wksta_getinfo_params params = + { + ULongToPtr(params32->server), + params32->level, + ULongToPtr(params32->buffer), + ULongToPtr(params32->size) + }; + + return wksta_getinfo( &params ); +} + +static NTSTATUS wow64_change_password( void *args ) +{ + struct + { + PTR32 domain; + PTR32 user; + PTR32 old; + PTR32 new; + } const *params32 = args; + + struct change_password_params params = + { + ULongToPtr(params32->domain), + ULongToPtr(params32->user), + ULongToPtr(params32->old), + ULongToPtr(params32->new) + }; + + return change_password( &params ); +} + +const unixlib_entry_t __wine_unix_call_wow64_funcs[] = +{ + netapi_init, + wow64_server_getinfo, + wow64_share_add, + wow64_share_del, + wow64_wksta_getinfo, + wow64_change_password, +}; + +#endif /* _WIN64 */ + #endif /* SONAME_LIBNETAPI */

1 0

Alexandre Julliard : gphoto2.ds: Implement Wow64 entry points in the Unix library.
by Alexandre Julliard 08 Nov '21

08 Nov '21

Module: wine Branch: master Commit: 8a4b818a2dbfc1c732d428c703e046fcd33e14f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8a4b818a2dbfc1c732d428c7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 8 20:54:25 2021 +0100 gphoto2.ds: Implement Wow64 entry points in the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gphoto2.ds/ds_image.c | 6 +- dlls/gphoto2.ds/gphoto2_i.h | 2 +- dlls/gphoto2.ds/gphoto2_main.c | 14 ++-- dlls/gphoto2.ds/unixlib.c | 141 +++++++++++++++++++++++++++++++++++------ dlls/gphoto2.ds/unixlib.h | 17 +---- 5 files changed, 133 insertions(+), 47 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8a4b818a2dbfc1c732d4…

1 0

← Newer
1
...
66
67
68
69
70
71
72
...
96
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 November 2021