September 2022 - Wine-Commits

Rémi Bernon : winegstreamer: Wrap async reader op new_context in a union.
by Alexandre Julliard Sept. 13, 2022

Sept. 13, 2022

Module: wine Branch: master Commit: 9808fd97893b0913633c4d27d7b56ac41975fe08 URL: https://gitlab.winehq.org/wine/wine/-/commit/9808fd97893b0913633c4d27d7b56a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Aug 26 19:07:22 2022 +0200 winegstreamer: Wrap async reader op new_context in a union. --- dlls/winegstreamer/wm_asyncreader.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/dlls/winegstreamer/wm_asyncreader.c b/dlls/winegstreamer/wm_asyncreader.c index f3e2209881a..c280828b616 100644 --- a/dlls/winegstreamer/wm_asyncreader.c +++ b/dlls/winegstreamer/wm_asyncreader.c @@ -22,6 +22,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(wmvcore); +union async_op_data +{ + struct + { + void *context; + } start; +}; + struct async_op { enum async_op_type @@ -30,7 +38,7 @@ struct async_op ASYNC_OP_STOP, ASYNC_OP_CLOSE, } type; - void *new_context; + union async_op_data u; struct list entry; }; @@ -191,8 +199,8 @@ static DWORD WINAPI async_reader_callback_thread(void *arg) struct async_op *op = LIST_ENTRY(entry, struct async_op, entry); list_remove(&op->entry); - if (op->new_context) - reader->context = op->new_context; + if (op->u.start.context) + reader->context = op->u.start.context; hr = list_empty(&reader->async_ops) ? S_OK : E_ABORT; switch (op->type) { @@ -291,14 +299,15 @@ error: return hr; } -static HRESULT async_reader_queue_op(struct async_reader *reader, enum async_op_type type, void *context) +static HRESULT async_reader_queue_op(struct async_reader *reader, enum async_op_type type, union async_op_data *data) { struct async_op *op; if (!(op = calloc(1, sizeof(*op)))) return E_OUTOFMEMORY; op->type = type; - op->new_context = context; + if (data) + op->u = *data; EnterCriticalSection(&reader->callback_cs); list_add_tail(&reader->async_ops, &op->entry); @@ -432,6 +441,7 @@ static HRESULT WINAPI WMReader_GetOutputFormat(IWMReader *iface, DWORD output, static HRESULT WINAPI WMReader_Start(IWMReader *iface, QWORD start, QWORD duration, float rate, void *context) { + union async_op_data data = {.start = {.context = context}}; struct async_reader *reader = impl_from_IWMReader(iface); HRESULT hr; @@ -448,7 +458,7 @@ static HRESULT WINAPI WMReader_Start(IWMReader *iface, else { wm_reader_seek(&reader->reader, start, duration); - hr = async_reader_queue_op(reader, ASYNC_OP_START, context); + hr = async_reader_queue_op(reader, ASYNC_OP_START, &data); } LeaveCriticalSection(&reader->reader.cs);

1 0

Nikolay Sivov : dwrite/layout: Use same logic for mapping both non-visual and visual runs.
by Alexandre Julliard Sept. 12, 2022

Sept. 12, 2022

Module: wine Branch: master Commit: a10ae492928734f025f483455fcdb6afd0934764 URL: https://gitlab.winehq.org/wine/wine/-/commit/a10ae492928734f025f483455fcdb6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Sep 10 09:14:59 2022 +0300 dwrite/layout: Use same logic for mapping both non-visual and visual runs. Both non-visual and visual runs go through fallback mapping process, and could end up with hard coded default at the end if fallback was insufficient. Visual runs are using custom fallback and then the system one, non-visual ones are using only system fallback. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/layout.c | 248 +++++++++++++++++++++++++++++---------------------- 1 file changed, 141 insertions(+), 107 deletions(-)

1 0

Gijs Vermeulen : dbghelp: Add SymSrvGetFileIndexInfo stub.
by Alexandre Julliard Sept. 12, 2022

Sept. 12, 2022

Module: wine Branch: master Commit: 4f90e88d0b4316630e9b33e0e0813c1c079deb5c URL: https://gitlab.winehq.org/wine/wine/-/commit/4f90e88d0b4316630e9b33e0e0813c… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Sun Sep 11 19:24:45 2022 +0200 dbghelp: Add SymSrvGetFileIndexInfo stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48600 --- dlls/dbghelp/dbghelp.spec | 2 +- dlls/dbghelp/symbol.c | 11 +++++++++++ include/dbghelp.h | 28 ++++++++++++++++++++++++++++ 3 files changed, 40 insertions(+), 1 deletion(-) diff --git a/dlls/dbghelp/dbghelp.spec b/dlls/dbghelp/dbghelp.spec index 87861cd87ce..754fb456611 100644 --- a/dlls/dbghelp/dbghelp.spec +++ b/dlls/dbghelp/dbghelp.spec @@ -175,7 +175,7 @@ @ stdcall SymSetSearchPathW(long wstr) @ stub SymSrvDeltaName @ stub SymSrvDeltaNameW -@ stub SymSrvGetFileIndexInfo +@ stdcall SymSrvGetFileIndexInfo(str ptr long) @ stub SymSrvGetFileIndexInfoW @ stub SymSrvGetFileIndexString @ stub SymSrvGetFileIndexStringW diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index d019eec4e3a..8e432e4be08 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -2778,3 +2778,14 @@ BOOL WINAPI SymGetLineFromInlineContextW(HANDLE hProcess, DWORD64 addr, ULONG in if (!get_line_from_inline_context(hProcess, addr, inline_ctx, mod_addr, disp, &intl)) return FALSE; return internal_line_copy_toW64(&intl, line); } + +/****************************************************************** + * SymSrvGetFileIndexInfo (DBGHELP.@) + * + */ +BOOL WINAPI SymSrvGetFileIndexInfo(const char *file, SYMSRV_INDEX_INFO* info, DWORD flags) +{ + FIXME("(%s, %p, 0x%08lx): stub!\n", debugstr_a(file), info, flags); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} diff --git a/include/dbghelp.h b/include/dbghelp.h index b34ebd2edab..e56d8de0d5d 100644 --- a/include/dbghelp.h +++ b/include/dbghelp.h @@ -598,6 +598,34 @@ typedef struct _SYMBOL_INFO_PACKAGEW WCHAR name[MAX_SYM_NAME+1]; } SYMBOL_INFO_PACKAGEW, *PSYMBOL_INFO_PACKAGEW; +typedef struct _SYMSRV_INDEX_INFO +{ + DWORD sizeofstruct; + CHAR file[MAX_PATH + 1]; + BOOL stripped; + DWORD timestamp; + DWORD size; + CHAR dbgfile[MAX_PATH + 1]; + CHAR pdbfile[MAX_PATH + 1]; + GUID guid; + DWORD sig; + DWORD age; +} SYMSRV_INDEX_INFO, *PSYMSRV_INDEX_INFO; + +typedef struct +{ + DWORD sizeofstruct; + WCHAR file[MAX_PATH + 1]; + BOOL stripped; + DWORD timestamp; + DWORD size; + WCHAR dbgfile[MAX_PATH + 1]; + WCHAR pdbfile[MAX_PATH + 1]; + GUID guid; + DWORD sig; + DWORD age; +} SYMSRV_INDEX_INFOW, *PSYMSRV_INDEX_INFOW; + typedef enum _IMAGEHLP_SYMBOL_TYPE_INFO { TI_GET_SYMTAG,

1 0

Eric Pouech : dbghelp: Correctly handle the absence of IPI stream.
by Alexandre Julliard Sept. 12, 2022

Sept. 12, 2022

Module: wine Branch: master Commit: 12f2a1768cff030619eecd9c0bf6b90583ee6177 URL: https://gitlab.winehq.org/wine/wine/-/commit/12f2a1768cff030619eecd9c0bf6b9… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Sep 9 17:06:04 2022 +0200 dbghelp: Correctly handle the absence of IPI stream. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/msc.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index 10fcf398140..811c8ffa165 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -3119,15 +3119,15 @@ static void pdb_module_remove(struct process* pcsn, struct module_format* modfmt HeapFree(GetProcessHeap(), 0, modfmt); } -static void pdb_convert_types_header(PDB_TYPES* types, const BYTE* image) +static BOOL pdb_convert_types_header(PDB_TYPES* types, const BYTE* image) { - memset(types, 0, sizeof(PDB_TYPES)); - if (!image) return; + if (!image) return FALSE; if (*(const DWORD*)image < 19960000) /* FIXME: correct version? */ { /* Old version of the types record header */ const PDB_TYPES_OLD* old = (const PDB_TYPES_OLD*)image; + memset(types, 0, sizeof(PDB_TYPES)); types->version = old->version; types->type_offset = sizeof(PDB_TYPES_OLD); types->type_size = old->type_size; @@ -3140,6 +3140,7 @@ static void pdb_convert_types_header(PDB_TYPES* types, const BYTE* image) /* New version of the types record header */ *types = *(const PDB_TYPES*)image; } + return TRUE; } static void pdb_convert_symbols_header(PDB_SYMBOLS* symbols, @@ -3255,7 +3256,8 @@ static BOOL pdb_init_type_parse(const struct msc_debug_info* msc_dbg, ctp->offset = NULL; ctp->hash = NULL; ctp->alloc_hash = NULL; - pdb_convert_types_header(&ctp->header, image); + if (!pdb_convert_types_header(&ctp->header, image)) + return FALSE; /* Check for unknown versions */ switch (ctp->header.version)

1 0

Eric Pouech : dbghelp: Displacements are optional.
by Alexandre Julliard Sept. 12, 2022

Sept. 12, 2022

Module: wine Branch: master Commit: 553798224de11f3c3fcc1571340114d18c56f9de URL: https://gitlab.winehq.org/wine/wine/-/commit/553798224de11f3c3fcc1571340114… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Sep 9 17:06:04 2022 +0200 dbghelp: Displacements are optional. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/symbol.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index abf6054d0ee..d019eec4e3a 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -1897,7 +1897,7 @@ static BOOL get_line_from_function(struct module_pair* pair, struct symt_functio ret = internal_line_set_nameW(pair->pcs, intl, dospath, TRUE); HeapFree( GetProcessHeap(), 0, dospath ); } - if (ret) *pdwDisplacement = addr - found_dli->u.address; + if (ret && pdwDisplacement) *pdwDisplacement = addr - found_dli->u.address; return ret; } } @@ -2684,7 +2684,7 @@ BOOL WINAPI SymFromInlineContext(HANDLE hProcess, DWORD64 addr, ULONG inline_ctx if (inlined) { symt_fill_sym_info(&pair, NULL, &inlined->func.symt, si); - *disp = addr - inlined->func.address; + if (disp) *disp = addr - inlined->func.address; return TRUE; } /* fall through */

1 0

Eric Pouech : dbghelp: Support SymGetTypeInfo/TI_GET_LENGTH for variables.
by Alexandre Julliard Sept. 12, 2022

Sept. 12, 2022

Module: wine Branch: master Commit: d1f7bc7c05393c1dde4c036b33a2edb6daeeeb6a URL: https://gitlab.winehq.org/wine/wine/-/commit/d1f7bc7c05393c1dde4c036b33a2ed… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Sep 9 17:06:04 2022 +0200 dbghelp: Support SymGetTypeInfo/TI_GET_LENGTH for variables. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/type.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/dbghelp/type.c b/dlls/dbghelp/type.c index 3a5d3caf09f..9d39d490965 100644 --- a/dlls/dbghelp/type.c +++ b/dlls/dbghelp/type.c @@ -833,10 +833,17 @@ BOOL symt_get_info(struct module* module, const struct symt* type, return FALSE; break; case SymTagData: - if (((const struct symt_data*)type)->kind != DataIsMember || - !((const struct symt_data*)type)->u.member.bit_length) - return FALSE; - X(DWORD64) = ((const struct symt_data*)type)->u.member.bit_length; + switch (((const struct symt_data*)type)->kind) + { + case DataIsMember: + if (!((const struct symt_data*)type)->u.member.bit_length) + return FALSE; + X(DWORD64) = ((const struct symt_data*)type)->u.member.bit_length; + break; + default: + if (!symt_get_info(module, ((const struct symt_data*)type)->type, TI_GET_LENGTH, pInfo)) + return FALSE; + } break; case SymTagArrayType: if (!symt_get_info(module, ((const struct symt_array*)type)->base_type,

1 0

Eric Pouech : dbghelp: Harden reading strings from string table.
by Alexandre Julliard Sept. 12, 2022

Sept. 12, 2022

Module: wine Branch: master Commit: 1c5491555b840ee1727a3f4328fb6694f38e40aa URL: https://gitlab.winehq.org/wine/wine/-/commit/1c5491555b840ee1727a3f4328fb66… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Sep 9 17:06:04 2022 +0200 dbghelp: Harden reading strings from string table. Making use of PDB_STRING_TABLE. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/msc.c | 61 +++++++++++++++++++++++++++--------------------------- 1 file changed, 30 insertions(+), 31 deletions(-) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index a51f482cc6f..10fcf398140 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -95,8 +95,7 @@ struct cv_module_snarf const struct codeview_type_parse* ipi_ctp; const struct CV_DebugSSubsectionHeader_t* dbgsubsect; unsigned dbgsubsect_size; - const char* strimage; - unsigned strsize; + const PDB_STRING_TABLE* strimage; }; /*======================================================================== @@ -1633,6 +1632,8 @@ static void codeview_snarf_linetab(const struct msc_debug_info* msc_dbg, const B } } +static const char* pdb_get_string_table_entry(const PDB_STRING_TABLE* table, unsigned offset); + static void codeview_snarf_linetab2(const struct msc_debug_info* msc_dbg, const struct cv_module_snarf* cvmod) { unsigned i; @@ -1684,8 +1685,7 @@ static void codeview_snarf_linetab2(const struct msc_debug_info* msc_dbg, const WARN("Corrupt PDB file: offset in CHKSMS subsection is invalid\n"); break; } - source = source_new(msc_dbg->module, NULL, - (chksms->strOffset < cvmod->strsize) ? cvmod->strimage + chksms->strOffset : "<<stroutofbounds>>"); + source = source_new(msc_dbg->module, NULL, pdb_get_string_table_entry(cvmod->strimage, chksms->strOffset)); lineblk_base = codeview_get_address(msc_dbg, lines_hdr->segCon, lines_hdr->offCon); lines = CV_RECORD_AFTER(files_hdr); for (i = 0; i < files_hdr->nLines; i++) @@ -2013,8 +2013,7 @@ static BOOL cv_dbgsubsect_find_inlinee(const struct msc_debug_info* msc_dbg, { chksms = CV_RECORD_GAP(hdr_files, inlsrc->fileId); if (!CV_IS_INSIDE(chksms, CV_RECORD_GAP(hdr_files, hdr_files->cbLen))) return FALSE; - *srcfile = source_new(msc_dbg->module, NULL, - (chksms->strOffset < cvmod->strsize) ? cvmod->strimage + chksms->strOffset : "<<str-out-of-bounds>>"); + *srcfile = source_new(msc_dbg->module, NULL, pdb_get_string_table_entry(cvmod->strimage, chksms->strOffset)); *srcline = inlsrc->sourceLineNum; return TRUE; } @@ -2029,8 +2028,7 @@ static BOOL cv_dbgsubsect_find_inlinee(const struct msc_debug_info* msc_dbg, { chksms = CV_RECORD_GAP(hdr_files, inlsrcex->fileId); if (!CV_IS_INSIDE(chksms, CV_RECORD_GAP(hdr_files, hdr_files->cbLen))) return FALSE; - *srcfile = source_new(msc_dbg->module, NULL, - (chksms->strOffset < cvmod->strsize) ? cvmod->strimage + chksms->strOffset : "<<str-out-of-bounds>>"); + *srcfile = source_new(msc_dbg->module, NULL, pdb_get_string_table_entry(cvmod->strimage, chksms->strOffset)); *srcline = inlsrcex->sourceLineNum; return TRUE; } @@ -2150,8 +2148,7 @@ static struct symt_inlinesite* codeview_create_inline_site(const struct msc_debu case BA_OP_ChangeFile: chksms = CV_RECORD_GAP(hdr_files, cvba.arg1); if (CV_IS_INSIDE(chksms, CV_RECORD_GAP(hdr_files, hdr_files->cbLen))) - srcfile = source_new(msc_dbg->module, NULL, - (chksms->strOffset < cvmod->strsize) ? cvmod->strimage + chksms->strOffset : "<<str-out-of-bounds>>"); + srcfile = source_new(msc_dbg->module, NULL, pdb_get_string_table_entry(cvmod->strimage, chksms->strOffset)); break; case BA_OP_ChangeLineOffset: line += binannot_getsigned(cvba.arg1); @@ -3085,22 +3082,28 @@ static unsigned pdb_get_stream_by_name(const struct pdb_file_info* pdb_file, con return -1; } -static void* pdb_read_strings(const struct pdb_file_info* pdb_file) +static PDB_STRING_TABLE* pdb_read_strings(const struct pdb_file_info* pdb_file) { unsigned idx; - void *ret; + PDB_STRING_TABLE *ret; idx = pdb_get_stream_by_name(pdb_file, "/names"); if (idx != -1) { ret = pdb_read_file( pdb_file, idx ); - if (ret && *(const DWORD *)ret == 0xeffeeffe) return ret; + if (ret && ret->magic == 0xeffeeffe && + sizeof(*ret) + ret->length <= pdb_get_file_size(pdb_file, idx)) return ret; pdb_free( ret ); } WARN("string table not found\n"); return NULL; } +static const char* pdb_get_string_table_entry(const PDB_STRING_TABLE* table, unsigned offset) +{ + return (!table || offset >= table->length) ? NULL : (const char*)(table + 1) + offset; +} + static void pdb_module_remove(struct process* pcsn, struct module_format* modfmt) { unsigned i; @@ -3564,13 +3567,12 @@ static BOOL pdb_process_internal(const struct process* pcs, struct pdb_module_info* pdb_module_info, unsigned module_index) { - HANDLE hMap = NULL; - char* image = NULL; - BYTE* symbols_image = NULL; - char* files_image = NULL; - DWORD files_size = 0; - unsigned matched; - struct pdb_file_info* pdb_file; + HANDLE hMap = NULL; + char* image = NULL; + BYTE* symbols_image = NULL; + PDB_STRING_TABLE* files_image = NULL; + unsigned matched; + struct pdb_file_info* pdb_file; TRACE("Processing PDB file %s\n", pdb_lookup->filename); @@ -3637,7 +3639,6 @@ static BOOL pdb_process_internal(const struct process* pcs, return FALSE; } files_image = pdb_read_strings(pdb_file); - if (files_image) files_size = *(const DWORD*)(files_image + 8); pdb_process_symbol_imports(pcs, msc_dbg, &symbols, symbols_image, image, pdb_lookup, pdb_module_info, module_index); @@ -3669,7 +3670,7 @@ static BOOL pdb_process_internal(const struct process* pcs, if (modimage) { struct cv_module_snarf cvmod = {ipi_ok ? &ipi_ctp : NULL, (const void*)(modimage + sfile.symbol_size), sfile.lineno2_size, - files_image + 12, files_size}; + files_image}; codeview_snarf(msc_dbg, modimage, sizeof(DWORD), sfile.symbol_size, &cvmod, TRUE); @@ -4001,6 +4002,7 @@ static BOOL pdb_parse_cmd_string(struct cpu_stack_walk* csw, PDB_FPO_DATA* fpoe BOOL over = FALSE; struct pevaluator pev; + if (!cmd) return FALSE; pev_init(&pev, csw, fpoext, cpair); for (ptr = cmd; !over; ptr++) { @@ -4051,8 +4053,8 @@ BOOL pdb_virtual_unwind(struct cpu_stack_walk *csw, DWORD_PTR ip, struct module_pair pair; struct pdb_module_info* pdb_info; PDB_FPO_DATA* fpoext; - unsigned i, size, strsize; - char* strbase; + unsigned i, size; + PDB_STRING_TABLE* strbase; BOOL ret = TRUE; if (!module_init_pair(&pair, csw->hProcess, ip)) return FALSE; @@ -4063,7 +4065,6 @@ BOOL pdb_virtual_unwind(struct cpu_stack_walk *csw, DWORD_PTR ip, strbase = pdb_read_strings(&pdb_info->pdb_files[0]); if (!strbase) return FALSE; - strsize = *(const DWORD*)(strbase + 8); fpoext = pdb_read_file(&pdb_info->pdb_files[0], pdb_info->pdb_files[0].fpoext_stream); size = pdb_get_file_size(&pdb_info->pdb_files[0], pdb_info->pdb_files[0].fpoext_stream); if (fpoext && (size % sizeof(*fpoext)) == 0) @@ -4077,12 +4078,10 @@ BOOL pdb_virtual_unwind(struct cpu_stack_walk *csw, DWORD_PTR ip, fpoext[i].start, fpoext[i].func_size, fpoext[i].locals_size, fpoext[i].params_size, fpoext[i].maxstack_size, fpoext[i].prolog_size, fpoext[i].savedregs_size, fpoext[i].flags, - fpoext[i].str_offset < strsize ? - wine_dbgstr_a(strbase + 12 + fpoext[i].str_offset) : "<out of bounds>"); - if (fpoext[i].str_offset < strsize) - ret = pdb_parse_cmd_string(csw, &fpoext[i], strbase + 12 + fpoext[i].str_offset, cpair); - else - ret = FALSE; + wine_dbgstr_a(pdb_get_string_table_entry(strbase, fpoext[i].str_offset))); + ret = pdb_parse_cmd_string(csw, &fpoext[i], + pdb_get_string_table_entry(strbase, fpoext[i].str_offset), + cpair); break; } }

1 0

Eric Pouech : winedump: Harden reading PDB string table stream.
by Alexandre Julliard Sept. 12, 2022

Sept. 12, 2022

Module: wine Branch: master Commit: 26f2b48a473bf3b9939996b43e1f0915ee2b341f URL: https://gitlab.winehq.org/wine/wine/-/commit/26f2b48a473bf3b9939996b43e1f09… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Sep 9 17:06:04 2022 +0200 winedump: Harden reading PDB string table stream. Introduce struct PDB_STRING_TABLE to describe string table's header. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- include/wine/mscvpdb.h | 12 ++++++++++++ tools/winedump/debug.c | 1 - tools/winedump/msc.c | 5 ++--- tools/winedump/pdb.c | 47 +++++++++++++++++++++++++++-------------------- tools/winedump/winedump.h | 4 +++- 5 files changed, 44 insertions(+), 25 deletions(-) diff --git a/include/wine/mscvpdb.h b/include/wine/mscvpdb.h index 69dd42f0c09..5e30a6c2beb 100644 --- a/include/wine/mscvpdb.h +++ b/include/wine/mscvpdb.h @@ -2610,6 +2610,18 @@ typedef struct _PDB_FPO_DATA unsigned int flags; } PDB_FPO_DATA; +typedef struct _PDB_STRING_TABLE +{ + unsigned int magic; + unsigned int hash_version; + unsigned int length; +} +PDB_STRING_TABLE; +/* This header is followed by: + * - a series (of bytes hdr.length) of 0-terminated strings + * - a serialized hash table + */ + #include "poppack.h" /* =================================================== diff --git a/tools/winedump/debug.c b/tools/winedump/debug.c index 9cc17f62e2b..e62e4436e4d 100644 --- a/tools/winedump/debug.c +++ b/tools/winedump/debug.c @@ -31,7 +31,6 @@ #include "windef.h" #include "winbase.h" #include "winedump.h" -#include "wine/mscvpdb.h" /* * .DBG File Layout: diff --git a/tools/winedump/msc.c b/tools/winedump/msc.c index 85bbdfc3487..b5708017651 100644 --- a/tools/winedump/msc.c +++ b/tools/winedump/msc.c @@ -30,7 +30,6 @@ #include "winbase.h" #include "winedump.h" #include "cvconst.h" -#include "wine/mscvpdb.h" #define PSTRING(adr, ofs) \ ((const struct p_string*)((const char*)(adr) + (ofs))) @@ -2017,7 +2016,7 @@ void codeview_dump_linetab(const char* linetab, BOOL pascal_str, const char* pfx } } -void codeview_dump_linetab2(const char* linetab, DWORD size, const char* strimage, DWORD strsize, const char* pfx) +void codeview_dump_linetab2(const char* linetab, DWORD size, const PDB_STRING_TABLE* strimage, const char* pfx) { unsigned i; const struct CV_DebugSSubsectionHeader_t* hdr; @@ -2094,7 +2093,7 @@ void codeview_dump_linetab2(const char* linetab, DWORD size, const char* strimag const char* meth[] = {"None", "MD5", "SHA1", "SHA256"}; printf("%s %d] name=%s size=%u method=%s checksum=[", pfx, (unsigned)((const char*)chksms - (const char*)(hdr + 1)), - strimage ? strimage + chksms->strOffset : "--none--", + pdb_get_string_table_entry(strimage, chksms->strOffset), chksms->size, chksms->method < ARRAY_SIZE(meth) ? meth[chksms->method] : "<<unknown>>"); for (i = 0; i < chksms->size; ++i) printf("%02x", chksms->checksum[i]); printf("]\n"); diff --git a/tools/winedump/pdb.c b/tools/winedump/pdb.c index 6774cd11876..9fe358aa86a 100644 --- a/tools/winedump/pdb.c +++ b/tools/winedump/pdb.c @@ -29,7 +29,6 @@ #include "windef.h" #include "winbase.h" #include "winedump.h" -#include "wine/mscvpdb.h" struct pdb_reader { @@ -206,21 +205,32 @@ static unsigned get_stream_by_name(struct pdb_reader* reader, const char* name) return -1; } -static void *read_string_table(struct pdb_reader* reader) +static PDB_STRING_TABLE* read_string_table(struct pdb_reader* reader) { - unsigned stream_idx; - void* ret; + unsigned stream_idx; + PDB_STRING_TABLE* ret; + unsigned stream_size; stream_idx = get_stream_by_name(reader, "/names"); if (stream_idx == -1) return NULL; ret = reader->read_file(reader, stream_idx); if (!ret) return NULL; - if(*(const UINT *)ret == 0xeffeeffe) return ret; - printf("wrong header %x expecting 0xeffeeffe\n", *(const UINT *)ret); + stream_size = pdb_get_file_size(reader, stream_idx); + if (ret->magic == 0xeffeeffe && sizeof(*ret) + ret->length < stream_size) return ret; + printf("Improper string table header (magic=%x)\n", ret->magic); + dump_data((const unsigned char*)ret, stream_size, " "); free( ret ); return NULL; } +const char* pdb_get_string_table_entry(const PDB_STRING_TABLE* table, unsigned ofs) +{ + if (!table) return "<<no string table>>"; + if (ofs >= table->length) return "<<invalid string table offset>>"; + /* strings start after header */ + return (char*)(table + 1) + ofs; +} + static void dump_global_symbol(struct pdb_reader* reader, unsigned file) { void* global = NULL; @@ -253,12 +263,11 @@ static void dump_public_symbol(struct pdb_reader* reader, unsigned file) static void pdb_dump_symbols(struct pdb_reader* reader, PDB_STREAM_INDEXES* sidx) { - PDB_SYMBOLS* symbols; - unsigned char* modimage; - const char* file; - char* filesimage; - DWORD filessize = 0; - char tcver[32]; + PDB_SYMBOLS* symbols; + unsigned char* modimage; + const char* file; + PDB_STRING_TABLE* filesimage; + char tcver[32]; sidx->FPO = sidx->unk0 = sidx->unk1 = sidx->unk2 = sidx->unk3 = sidx->segments = sidx->unk4 = sidx->unk5 = sidx->unk6 = sidx->FPO_EXT = sidx->unk7 = -1; @@ -332,7 +341,6 @@ static void pdb_dump_symbols(struct pdb_reader* reader, PDB_STREAM_INDEXES* sidx } if (!(filesimage = read_string_table(reader))) printf("string table not found\n"); - else filessize = *(const DWORD*)(filesimage + 8); if (symbols->srcmodule_size) { @@ -592,7 +600,7 @@ static void pdb_dump_symbols(struct pdb_reader* reader, PDB_STREAM_INDEXES* sidx codeview_dump_linetab((const char*)modimage + symbol_size, TRUE, " "); else if (lineno2_size) /* actually, only one of the 2 lineno should be present */ codeview_dump_linetab2((const char*)modimage + symbol_size, lineno2_size, - filesimage ? filesimage + 12 : NULL, filessize, " "); + filesimage, " "); /* what's that part ??? */ if (0) dump_data(modimage + symbol_size + lineno_size + lineno2_size, @@ -644,7 +652,7 @@ static void pdb_dump_types_hash(struct pdb_reader* reader, const PDB_TYPES* type void* hash = NULL; unsigned i, strmsize; const unsigned* table; - char* strbase; + PDB_STRING_TABLE* strbase; unsigned *collision; hash = reader->read_file(reader, types->hash_file); if (!hash) return; @@ -746,7 +754,7 @@ static void pdb_dump_types_hash(struct pdb_reader* reader, const PDB_TYPES* type is_bit_set(deleted_bitset, count_deleted, i) ? 'D' : '_'); if (is_bit_set(present_bitset, count_present, i)) { - printf(" %s => ", strbase + 12 + *table++); + printf(" %s => ", pdb_get_string_table_entry(strbase, *table++)); pdb_dump_hash_value((const BYTE*)table, types->hash_size); table = (const unsigned*)((const BYTE*)table + types->hash_size); } @@ -855,14 +863,13 @@ static void pdb_dump_fpo(struct pdb_reader* reader, unsigned stream_idx) static void pdb_dump_fpo_ext(struct pdb_reader* reader, unsigned stream_idx) { PDB_FPO_DATA* fpoext; - unsigned i, size, strsize; - char* strbase; + unsigned i, size; + PDB_STRING_TABLE* strbase; if (stream_idx == (WORD)-1) return; strbase = read_string_table(reader); if (!strbase) return; - strsize = *(const DWORD*)(strbase + 8); fpoext = reader->read_file(reader, stream_idx); size = pdb_get_file_size(reader, stream_idx); if (fpoext && (size % sizeof(*fpoext)) == 0) @@ -875,7 +882,7 @@ static void pdb_dump_fpo_ext(struct pdb_reader* reader, unsigned stream_idx) printf("\t%08x %08x %8x %8x %8x %6x %8x %08x %s\n", fpoext[i].start, fpoext[i].func_size, fpoext[i].locals_size, fpoext[i].params_size, fpoext[i].maxstack_size, fpoext[i].prolog_size, fpoext[i].savedregs_size, fpoext[i].flags, - fpoext[i].str_offset < strsize ? strbase + 12 + fpoext[i].str_offset : "<out of bounds>"); + pdb_get_string_table_entry(strbase, fpoext[i].str_offset)); } } free(fpoext); diff --git a/tools/winedump/winedump.h b/tools/winedump/winedump.h index c84a98946b3..361f44b62b0 100644 --- a/tools/winedump/winedump.h +++ b/tools/winedump/winedump.h @@ -45,6 +45,7 @@ #include "../tools.h" #include "windef.h" #include "winbase.h" +#include "wine/mscvpdb.h" /* Argument type constants */ #define MAX_FUNCTION_ARGS 32 @@ -263,7 +264,8 @@ BOOL codeview_dump_symbols(const void* root, unsigned long start, uns BOOL codeview_dump_types_from_offsets(const void* table, const DWORD* offsets, unsigned num_types); BOOL codeview_dump_types_from_block(const void* table, unsigned long len); void codeview_dump_linetab(const char* linetab, BOOL pascal_str, const char* pfx); -void codeview_dump_linetab2(const char* linetab, DWORD size, const char* strimage, DWORD strsize, const char* pfx); +void codeview_dump_linetab2(const char* linetab, DWORD size, const PDB_STRING_TABLE*, const char* pfx); +const char* pdb_get_string_table_entry(const PDB_STRING_TABLE* table, unsigned ofs); void dump_stabs(const void* pv_stabs, unsigned szstabs, const char* stabstr, unsigned szstr); void dump_codeview(unsigned long ptr, unsigned long len);

1 0

Hans Leidekker : bcrypt: Support setting BCRYPT_CHAIN_MODE_CFB on keys.
by Alexandre Julliard Sept. 12, 2022

Sept. 12, 2022

Module: wine Branch: master Commit: 069a7c6ac66c37ddfe55927185c64ea6e5dcf1be URL: https://gitlab.winehq.org/wine/wine/-/commit/069a7c6ac66c37ddfe55927185c64e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Aug 11 09:37:19 2022 +0200 bcrypt: Support setting BCRYPT_CHAIN_MODE_CFB on keys. --- dlls/bcrypt/bcrypt_main.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index adf6ce144af..fde09904963 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -714,6 +714,11 @@ static NTSTATUS set_key_property( struct key *key, const WCHAR *prop, UCHAR *val key->u.s.mode = MODE_ID_GCM; return STATUS_SUCCESS; } + else if (!wcscmp( (WCHAR *)value, BCRYPT_CHAIN_MODE_CFB )) + { + key->u.s.mode = MODE_ID_CFB; + return STATUS_SUCCESS; + } else { FIXME( "unsupported mode %s\n", debugstr_w((WCHAR *)value) );

1 0

Alexandre Julliard : d2d1/tests: Adjust geometry to make tests pass on all devices.
by Alexandre Julliard Sept. 12, 2022

Sept. 12, 2022

Module: wine Branch: master Commit: ff558c63ff9abb3d52888258fe8b57e87117d1fc URL: https://gitlab.winehq.org/wine/wine/-/commit/ff558c63ff9abb3d52888258fe8b57… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 8 17:58:39 2022 +0200 d2d1/tests: Adjust geometry to make tests pass on all devices. Fix suggested by Zebediah Figura. --- dlls/d2d1/tests/d2d1.c | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 665c3200e21..5043b8b02b3 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -7154,36 +7154,36 @@ static void test_draw_geometry(BOOL d3d11) hr = ID2D1PathGeometry_Open(geometry, &sink); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); - set_point(&point, 20.0f, 80.0f); + set_point(&point, 20.0f, 79.5f); ID2D1GeometrySink_BeginFigure(sink, point, D2D1_FIGURE_BEGIN_HOLLOW); - quadratic_to(sink, 40.0f, 80.0f, 60.0f, 80.0f); - quadratic_to(sink, 60.0f, 160.0f, 60.0f, 240.0f); - quadratic_to(sink, 40.0f, 240.0f, 20.0f, 240.0f); - quadratic_to(sink, 20.0f, 160.0f, 20.0f, 80.0f); + quadratic_to(sink, 40.0f, 79.5f, 60.0f, 79.5f); + quadratic_to(sink, 60.0f, 159.5f, 60.0f, 239.5f); + quadratic_to(sink, 40.0f, 239.5f, 20.0f, 239.5f); + quadratic_to(sink, 20.0f, 159.5f, 20.0f, 79.5f); ID2D1GeometrySink_EndFigure(sink, D2D1_FIGURE_END_CLOSED); - set_point(&point, 100.0f, 80.0f); + set_point(&point, 100.0f, 79.5f); ID2D1GeometrySink_BeginFigure(sink, point, D2D1_FIGURE_BEGIN_HOLLOW); - quadratic_to(sink, 105.0f, 80.0f, 140.0f, 80.0f); - quadratic_to(sink, 140.0f, 100.0f, 140.0f, 240.0f); - quadratic_to(sink, 135.0f, 240.0f, 100.0f, 240.0f); - quadratic_to(sink, 100.0f, 220.0f, 100.0f, 80.0f); + quadratic_to(sink, 105.0f, 79.5f, 140.0f, 79.5f); + quadratic_to(sink, 140.0f, 99.5f, 140.0f, 239.5f); + quadratic_to(sink, 135.0f, 239.5f, 100.0f, 239.5f); + quadratic_to(sink, 100.0f, 219.5f, 100.0f, 79.5f); ID2D1GeometrySink_EndFigure(sink, D2D1_FIGURE_END_CLOSED); - set_point(&point, 180.0f, 80.0f); + set_point(&point, 180.0f, 79.5f); ID2D1GeometrySink_BeginFigure(sink, point, D2D1_FIGURE_BEGIN_HOLLOW); - quadratic_to(sink, 215.0f, 80.0f, 220.0f, 80.0f); - quadratic_to(sink, 220.0f, 220.0f, 220.0f, 240.0f); - quadratic_to(sink, 185.0f, 240.0f, 180.0f, 240.0f); - quadratic_to(sink, 180.0f, 100.0f, 180.0f, 80.0f); + quadratic_to(sink, 215.0f, 79.5f, 220.0f, 79.5f); + quadratic_to(sink, 220.0f, 219.5f, 220.0f, 239.5f); + quadratic_to(sink, 185.0f, 239.5f, 180.0f, 239.5f); + quadratic_to(sink, 180.0f, 99.5f, 180.0f, 79.5f); ID2D1GeometrySink_EndFigure(sink, D2D1_FIGURE_END_CLOSED); - set_point(&point, 260.0f, 80.0f); + set_point(&point, 260.0f, 79.5f); ID2D1GeometrySink_BeginFigure(sink, point, D2D1_FIGURE_BEGIN_HOLLOW); - quadratic_to(sink, 280.0f, 80.0f, 300.0f, 80.0f); - quadratic_to(sink, 300.0f, 160.0f, 300.0f, 240.0f); - quadratic_to(sink, 280.0f, 240.0f, 260.0f, 240.0f); - quadratic_to(sink, 260.0f, 160.0f, 260.0f, 80.0f); + quadratic_to(sink, 280.0f, 79.5f, 300.0f, 79.5f); + quadratic_to(sink, 300.0f, 159.5f, 300.0f, 239.5f); + quadratic_to(sink, 280.0f, 239.5f, 260.0f, 239.5f); + quadratic_to(sink, 260.0f, 159.5f, 260.0f, 79.5f); ID2D1GeometrySink_EndFigure(sink, D2D1_FIGURE_END_OPEN); set_point(&point, 20.0f, 400.0f);

1 0