wine-commits January 2011

wine-commits@winehq.org

2 participants
879 discussions

Eric Pouech : dbghelp: Keep the mapping of any PDB file open until the module is unloaded.
by Alexandre Julliard 10 Jan '11

10 Jan '11

Module: wine Branch: master Commit: 5ce195ae895db9ec9d51276dab6d5c870ceaee11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ce195ae895db9ec9d51276da… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Jan 8 14:04:14 2011 +0100 dbghelp: Keep the mapping of any PDB file open until the module is unloaded. --- dlls/dbghelp/msc.c | 75 +++++++++++++++++++++++++++------------------------ 1 files changed, 40 insertions(+), 35 deletions(-) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index 74db2e9..4dcf65f 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -66,6 +66,8 @@ struct pdb_file_info { enum pdb_kind kind; DWORD age; + HANDLE hMap; + const char* image; union { struct @@ -2130,16 +2132,16 @@ static void* pdb_read_ds_file(const struct PDB_DS_HEADER* pdb, return pdb_ds_read(pdb, block_list, toc->file_size[file_nr]); } -static void* pdb_read_file(const char* image, const struct pdb_file_info* pdb_file, +static void* pdb_read_file(const struct pdb_file_info* pdb_file, DWORD file_nr) { switch (pdb_file->kind) { case PDB_JG: - return pdb_read_jg_file((const struct PDB_JG_HEADER*)image, + return pdb_read_jg_file((const struct PDB_JG_HEADER*)pdb_file->image, pdb_file->u.jg.toc, file_nr); case PDB_DS: - return pdb_read_ds_file((const struct PDB_DS_HEADER*)image, + return pdb_read_ds_file((const struct PDB_DS_HEADER*)pdb_file->image, pdb_file->u.ds.toc, file_nr); } return NULL; @@ -2180,7 +2182,13 @@ static void pdb_module_remove(struct process* pcsn, struct module_format* modfmt unsigned i; for (i = 0; i < modfmt->u.pdb_info->used_subfiles; i++) + { pdb_free_file(&modfmt->u.pdb_info->pdb_files[i]); + if (modfmt->u.pdb_info->pdb_files[i].image) + UnmapViewOfFile(modfmt->u.pdb_info->pdb_files[i].image); + if (modfmt->u.pdb_info->pdb_files[i].hMap) + CloseHandle(modfmt->u.pdb_info->pdb_files[i].hMap); + } HeapFree(GetProcessHeap(), 0, modfmt); } @@ -2259,11 +2267,11 @@ static void pdb_convert_symbol_file(const PDB_SYMBOLS* symbols, } } -static HANDLE open_pdb_file(const struct process* pcs, - const struct pdb_lookup* lookup, - struct module* module) +static HANDLE map_pdb_file(const struct process* pcs, + const struct pdb_lookup* lookup, + struct module* module) { - HANDLE h; + HANDLE hFile, hMap = NULL; char dbg_file_path[MAX_PATH]; BOOL ret = FALSE; @@ -2283,19 +2291,21 @@ static HANDLE open_pdb_file(const struct process* pcs, WARN("\tCouldn't find %s\n", lookup->filename); return NULL; } - h = CreateFileA(dbg_file_path, GENERIC_READ, FILE_SHARE_READ, NULL, - OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); - TRACE("%s: %s returns %p\n", lookup->filename, dbg_file_path, h); - return (h == INVALID_HANDLE_VALUE) ? NULL : h; + if ((hFile = CreateFileA(dbg_file_path, GENERIC_READ, FILE_SHARE_READ, NULL, + OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL)) != INVALID_HANDLE_VALUE) + { + hMap = CreateFileMappingW(hFile, NULL, PAGE_READONLY, 0, 0, NULL); + CloseHandle(hFile); + } + return hMap; } static void pdb_process_types(const struct msc_debug_info* msc_dbg, - const char* image, const struct pdb_file_info* pdb_file) { BYTE* types_image = NULL; - types_image = pdb_read_file(image, pdb_file, 2); + types_image = pdb_read_file(pdb_file, 2); if (types_image) { PDB_TYPES types; @@ -2451,7 +2461,7 @@ static BOOL pdb_init(const struct pdb_lookup* pdb_lookup, struct pdb_file_info* for (i = 1; i < num_files; i++) { - unsigned char* x = pdb_read_file(image, pdb_file, i); + unsigned char* x = pdb_read_file(pdb_file, i); FIXME("********************** [%u]: size=%08x\n", i, pdb_get_file_size(pdb_file, i)); dump(x, pdb_get_file_size(pdb_file, i)); @@ -2536,8 +2546,7 @@ static BOOL pdb_process_internal(const struct process* pcs, struct pdb_module_info* pdb_module_info, unsigned module_index) { - BOOL ret = FALSE; - HANDLE hFile, hMap = NULL; + HANDLE hMap = NULL; char* image = NULL; BYTE* symbols_image = NULL; char* files_image = NULL; @@ -2549,19 +2558,23 @@ static BOOL pdb_process_internal(const struct process* pcs, pdb_file = &pdb_module_info->pdb_files[module_index == -1 ? 0 : module_index]; /* Open and map() .PDB file */ - if ((hFile = open_pdb_file(pcs, pdb_lookup, msc_dbg->module)) == NULL || - ((hMap = CreateFileMappingW(hFile, NULL, PAGE_READONLY, 0, 0, NULL)) == NULL) || + if ((hMap = map_pdb_file(pcs, pdb_lookup, msc_dbg->module)) == NULL || ((image = MapViewOfFile(hMap, FILE_MAP_READ, 0, 0, 0)) == NULL)) { WARN("Unable to open .PDB file: %s\n", pdb_lookup->filename); - goto leave; + CloseHandle(hMap); + return FALSE; } if (!pdb_init(pdb_lookup, pdb_file, image, &matched) || matched != 2) { - goto leave; + CloseHandle(hMap); + UnmapViewOfFile(image); + return FALSE; } - symbols_image = pdb_read_file(image, pdb_file, 3); + pdb_file->hMap = hMap; + pdb_file->image = image; + symbols_image = pdb_read_file(pdb_file, 3); if (symbols_image) { PDB_SYMBOLS symbols; @@ -2583,7 +2596,7 @@ static BOOL pdb_process_internal(const struct process* pcs, symbols.version, symbols.version); } - files_image = pdb_read_file(image, pdb_file, 12); /* FIXME: really fixed ??? */ + files_image = pdb_read_file(pdb_file, 12); /* FIXME: really fixed ??? */ if (files_image) { if (*(const DWORD*)files_image == 0xeffeeffe) @@ -2600,10 +2613,10 @@ static BOOL pdb_process_internal(const struct process* pcs, pdb_process_symbol_imports(pcs, msc_dbg, &symbols, symbols_image, image, pdb_lookup, pdb_module_info, module_index); - pdb_process_types(msc_dbg, image, pdb_file); + pdb_process_types(msc_dbg, pdb_file); /* Read global symbol table */ - globalimage = pdb_read_file(image, pdb_file, symbols.gsym_file); + globalimage = pdb_read_file(pdb_file, symbols.gsym_file); if (globalimage) { codeview_snarf(msc_dbg, globalimage, 0, @@ -2621,7 +2634,7 @@ static BOOL pdb_process_internal(const struct process* pcs, HeapValidate(GetProcessHeap(), 0, NULL); pdb_convert_symbol_file(&symbols, &sfile, &size, file); - modimage = pdb_read_file(image, pdb_file, sfile.file); + modimage = pdb_read_file(pdb_file, sfile.file); if (modimage) { if (sfile.symbol_size) @@ -2655,19 +2668,11 @@ static BOOL pdb_process_internal(const struct process* pcs, else pdb_process_symbol_imports(pcs, msc_dbg, NULL, NULL, image, pdb_lookup, pdb_module_info, module_index); - ret = TRUE; - leave: - /* Cleanup */ pdb_free(symbols_image); pdb_free(files_image); - pdb_free_file(pdb_file); - if (image) UnmapViewOfFile(image); - if (hMap) CloseHandle(hMap); - if (hFile) CloseHandle(hFile); - - return ret; + return TRUE; } static BOOL pdb_process_file(const struct process* pcs, @@ -2720,7 +2725,7 @@ BOOL pdb_fetch_file_info(const struct pdb_lookup* pdb_lookup, unsigned* matched) { HANDLE hFile, hMap = NULL; char* image = NULL; - BOOL ret = TRUE; + BOOL ret; struct pdb_file_info pdb_file; if ((hFile = CreateFileA(pdb_lookup->filename, GENERIC_READ, FILE_SHARE_READ, NULL,

1 0

Eric Pouech : dbghelp: Use new file/ debug format framework to allow keeping pdb files opened.
by Alexandre Julliard 10 Jan '11

10 Jan '11

Module: wine Branch: master Commit: 0693572e4c6961a58eb5fc404636e573dcc23892 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0693572e4c6961a58eb5fc404… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Jan 8 14:04:08 2011 +0100 dbghelp: Use new file/debug format framework to allow keeping pdb files opened. --- dlls/dbghelp/dbghelp_private.h | 2 + dlls/dbghelp/msc.c | 73 +++++++++++++++++++++++++++++++--------- 2 files changed, 59 insertions(+), 16 deletions(-) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index e2d91de..88247ec 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -326,6 +326,7 @@ enum format_info DFI_PE, DFI_MACHO, DFI_DWARF, + DFI_PDB, DFI_LAST }; @@ -343,6 +344,7 @@ struct module_format struct dwarf2_module_info_s* dwarf2_info; struct pe_module_info* pe_info; struct macho_module_info* macho_info; + struct pdb_module_info* pdb_info; } u; }; diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index 1e19802..74db2e9 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -81,6 +81,14 @@ struct pdb_file_info } u; }; +/* FIXME: don't make it static */ +#define CV_MAX_MODULES 32 +struct pdb_module_info +{ + unsigned used_subfiles; + struct pdb_file_info pdb_files[CV_MAX_MODULES]; +}; + /*======================================================================== * Debug file access helper routines */ @@ -2167,6 +2175,15 @@ static void pdb_free_file(struct pdb_file_info* pdb_file) } } +static void pdb_module_remove(struct process* pcsn, struct module_format* modfmt) +{ + unsigned i; + + for (i = 0; i < modfmt->u.pdb_info->used_subfiles; i++) + pdb_free_file(&modfmt->u.pdb_info->pdb_files[i]); + HeapFree(GetProcessHeap(), 0, modfmt); +} + static void pdb_convert_types_header(PDB_TYPES* types, const BYTE* image) { memset(types, 0, sizeof(PDB_TYPES)); @@ -2447,7 +2464,7 @@ static BOOL pdb_init(const struct pdb_lookup* pdb_lookup, struct pdb_file_info* static BOOL pdb_process_internal(const struct process* pcs, const struct msc_debug_info* msc_dbg, const struct pdb_lookup* pdb_lookup, - struct pdb_file_info* pdb_file, + struct pdb_module_info* pdb_module_info, unsigned module_index); static void pdb_process_symbol_imports(const struct process* pcs, @@ -2456,6 +2473,7 @@ static void pdb_process_symbol_imports(const struct process* pcs, const void* symbols_image, const char* image, const struct pdb_lookup* pdb_lookup, + struct pdb_module_info* pdb_module_info, unsigned module_index) { if (module_index == -1 && symbols && symbols->pdbimport_size) @@ -2465,6 +2483,7 @@ static void pdb_process_symbol_imports(const struct process* pcs, const void* last; const char* ptr; int i = 0; + struct pdb_file_info sf0 = pdb_module_info->pdb_files[0]; imp = (const PDB_SYMBOL_IMPORT*)((const char*)symbols_image + sizeof(PDB_SYMBOLS) + symbols->module_size + symbols->offset_size + @@ -2479,11 +2498,11 @@ static void pdb_process_symbol_imports(const struct process* pcs, { if (module_index != -1) FIXME("Twice the entry\n"); else module_index = i; + pdb_module_info->pdb_files[i] = sf0; } else { struct pdb_lookup imp_pdb_lookup; - struct pdb_file_info pdb_file; /* FIXME: this is an import of a JG PDB file * how's a DS PDB handled ? @@ -2494,13 +2513,19 @@ static void pdb_process_symbol_imports(const struct process* pcs, imp_pdb_lookup.age = imp->Age; TRACE("got for %s: age=%u ts=%x\n", imp->filename, imp->Age, imp->TimeDateStamp); - pdb_process_internal(pcs, msc_dbg, &imp_pdb_lookup, &pdb_file, i); + pdb_process_internal(pcs, msc_dbg, &imp_pdb_lookup, pdb_module_info, i); } i++; imp = (const PDB_SYMBOL_IMPORT*)((const char*)first + ((ptr - (const char*)first + strlen(ptr) + 1 + 3) & ~3)); } + pdb_module_info->used_subfiles = i; + } + if (module_index == -1) + { + module_index = 0; + pdb_module_info->used_subfiles = 1; } - cv_current_module = &cv_zmodules[(module_index == -1) ? 0 : module_index]; + cv_current_module = &cv_zmodules[module_index]; if (cv_current_module->allowed) FIXME("Already allowed ??\n"); cv_current_module->allowed = TRUE; } @@ -2508,7 +2533,7 @@ static void pdb_process_symbol_imports(const struct process* pcs, static BOOL pdb_process_internal(const struct process* pcs, const struct msc_debug_info* msc_dbg, const struct pdb_lookup* pdb_lookup, - struct pdb_file_info* pdb_file, + struct pdb_module_info* pdb_module_info, unsigned module_index) { BOOL ret = FALSE; @@ -2518,9 +2543,11 @@ static BOOL pdb_process_internal(const struct process* pcs, char* files_image = NULL; DWORD files_size = 0; unsigned matched; + struct pdb_file_info* pdb_file; TRACE("Processing PDB file %s\n", pdb_lookup->filename); + pdb_file = &pdb_module_info->pdb_files[module_index == -1 ? 0 : module_index]; /* Open and map() .PDB file */ if ((hFile = open_pdb_file(pcs, pdb_lookup, msc_dbg->module)) == NULL || ((hMap = CreateFileMappingW(hFile, NULL, PAGE_READONLY, 0, 0, NULL)) == NULL) || @@ -2571,7 +2598,8 @@ static BOOL pdb_process_internal(const struct process* pcs, } } - pdb_process_symbol_imports(pcs, msc_dbg, &symbols, symbols_image, image, pdb_lookup, module_index); + pdb_process_symbol_imports(pcs, msc_dbg, &symbols, symbols_image, image, + pdb_lookup, pdb_module_info, module_index); pdb_process_types(msc_dbg, image, pdb_file); /* Read global symbol table */ @@ -2604,7 +2632,7 @@ static BOOL pdb_process_internal(const struct process* pcs, codeview_snarf_linetab(msc_dbg, modimage + sfile.symbol_size, sfile.lineno_size, - pdb_lookup->kind == PDB_JG); + pdb_file->kind == PDB_JG); if (files_image) codeview_snarf_linetab2(msc_dbg, modimage + sfile.symbol_size + sfile.lineno_size, pdb_get_file_size(pdb_file, sfile.file) - sfile.symbol_size - sfile.lineno_size, @@ -2621,13 +2649,12 @@ static BOOL pdb_process_internal(const struct process* pcs, { codeview_snarf_public(msc_dbg, globalimage, 0, pdb_get_file_size(pdb_file, symbols.gsym_file)); - pdb_free(globalimage); } } else - pdb_process_symbol_imports(pcs, msc_dbg, NULL, NULL, image, pdb_lookup, - module_index); + pdb_process_symbol_imports(pcs, msc_dbg, NULL, NULL, image, + pdb_lookup, pdb_module_info, module_index); ret = TRUE; leave: @@ -2648,20 +2675,34 @@ static BOOL pdb_process_file(const struct process* pcs, struct pdb_lookup* pdb_lookup) { BOOL ret; - struct pdb_file_info pdb_file; + struct module_format* modfmt; + struct pdb_module_info* pdb_module_info; + + modfmt = HeapAlloc(GetProcessHeap(), 0, + sizeof(struct module_format) + sizeof(struct pdb_module_info)); + if (!modfmt) return FALSE; + + pdb_module_info = (void*)(modfmt + 1); + msc_dbg->module->format_info[DFI_PDB] = modfmt; + modfmt->module = msc_dbg->module; + modfmt->remove = pdb_module_remove; + modfmt->loc_compute = NULL; + modfmt->u.pdb_info = pdb_module_info; memset(cv_zmodules, 0, sizeof(cv_zmodules)); codeview_init_basic_types(msc_dbg->module); - ret = pdb_process_internal(pcs, msc_dbg, pdb_lookup, &pdb_file, -1); + ret = pdb_process_internal(pcs, msc_dbg, pdb_lookup, + msc_dbg->module->format_info[DFI_PDB]->u.pdb_info, -1); codeview_clear_type_table(); if (ret) { + struct pdb_module_info* pdb_info = msc_dbg->module->format_info[DFI_PDB]->u.pdb_info; msc_dbg->module->module.SymType = SymCv; - if (pdb_lookup->kind == PDB_JG) - msc_dbg->module->module.PdbSig = pdb_file.u.jg.timestamp; + if (pdb_info->pdb_files[0].kind == PDB_JG) + msc_dbg->module->module.PdbSig = pdb_info->pdb_files[0].u.jg.timestamp; else - msc_dbg->module->module.PdbSig70 = pdb_file.u.ds.guid; - msc_dbg->module->module.PdbAge = pdb_file.age; + msc_dbg->module->module.PdbSig70 = pdb_info->pdb_files[0].u.ds.guid; + msc_dbg->module->module.PdbAge = pdb_info->pdb_files[0].age; MultiByteToWideChar(CP_ACP, 0, pdb_lookup->filename, -1, msc_dbg->module->module.LoadedPdbName, sizeof(msc_dbg->module->module.LoadedPdbName) / sizeof(WCHAR));

1 0

Eric Pouech : dbghelp: Restructure internal PDB information.
by Alexandre Julliard 10 Jan '11

10 Jan '11

Module: wine Branch: master Commit: 1acbb1c0eded796737fc4234456ccb3abbdaeed6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1acbb1c0eded796737fc42344… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Jan 8 14:04:01 2011 +0100 dbghelp: Restructure internal PDB information. --- dlls/dbghelp/dbghelp_private.h | 19 +--- dlls/dbghelp/msc.c | 201 +++++++++++++++++++++++----------------- dlls/dbghelp/path.c | 45 +++------- 3 files changed, 134 insertions(+), 131 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1acbb1c0eded796737fc4…

1 0

Eric Pouech : winedump: Added support for dumping FPO streams.
by Alexandre Julliard 10 Jan '11

10 Jan '11

Module: wine Branch: master Commit: 982775ddae84dcb6fa92683703dca23664eb4722 URL: http://source.winehq.org/git/wine.git/?a=commit;h=982775ddae84dcb6fa9268370… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Jan 8 14:03:52 2011 +0100 winedump: Added support for dumping FPO streams. --- include/wine/mscvpdb.h | 16 +++++++++++ tools/winedump/pdb.c | 66 +++++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 78 insertions(+), 4 deletions(-) diff --git a/include/wine/mscvpdb.h b/include/wine/mscvpdb.h index 2d5b9c9..59ce8a5 100644 --- a/include/wine/mscvpdb.h +++ b/include/wine/mscvpdb.h @@ -1917,6 +1917,22 @@ typedef struct _PDB_SYMBOLS DWORD resvd[5]; } PDB_SYMBOLS, *PPDB_SYMBOLS; +typedef struct _PDB_FPO_DATA +{ + DWORD start; + DWORD func_size; + DWORD locals_size; + DWORD params_size; + DWORD maxstack_size; + DWORD str_offset; + WORD prolog_size; + WORD savedregs_size; +#define PDB_FPO_DFL_SEH 0x00000001 +#define PDB_FPO_DFL_EH 0x00000002 +#define PDB_FPO_DFL_IN_BLOCK 0x00000004 + DWORD flags; +} PDB_FPO_DATA; + #include "poppack.h" /* ---------------------------------------------- diff --git a/tools/winedump/pdb.c b/tools/winedump/pdb.c index 5098d85..89146d5 100644 --- a/tools/winedump/pdb.c +++ b/tools/winedump/pdb.c @@ -508,6 +508,59 @@ static void pdb_dump_types(struct pdb_reader* reader) free(types); } +static void pdb_dump_fpo(struct pdb_reader* reader) +{ + FPO_DATA* fpo; + PDB_FPO_DATA* fpoext; + unsigned i, size, strsize; + char* strbase; + const char* frame_type[4] = {"Fpo", "Trap", "Tss", "NonFpo"}; + + fpo = reader->read_file(reader, 5); + size = pdb_get_file_size(reader, 5); + if (fpo && (size % sizeof(*fpo)) == 0) + { + size /= sizeof(*fpo); + printf("FPO data:\n\t Start Length #loc #pmt #prolog #reg frame SEH /BP\n"); + for (i = 0; i < size; i++) + { + printf("\t%08x %08x %4d %4d %7d %4d %6s %c %c\n", + fpo[i].ulOffStart, fpo[i].cbProcSize, fpo[i].cdwLocals, fpo[i].cdwParams, + fpo[i].cbProlog, fpo[i].cbRegs, frame_type[fpo[i].cbFrame], + fpo[i].fHasSEH ? 'Y' : 'N', fpo[i].fUseBP ? 'Y' : 'N'); + } + } + free(fpo); + + strbase = reader->read_file(reader, 12); /* FIXME: really fixed ??? */ + if (!strbase) return; + + if (*(const DWORD*)strbase != 0xeffeeffe) + { + printf("wrong header %x expecting 0xeffeeffe\n", *(const DWORD*)strbase); + free(strbase); + return; + } + strsize = *(const DWORD*)(strbase + 8); + fpoext = reader->read_file(reader, 10); + size = pdb_get_file_size(reader, 10); + if (fpoext && (size % sizeof(*fpoext)) == 0) + { + size /= sizeof(*fpoext); + printf("FPO data (extended):\n" + "\t Start Length Locals Params MaxStack Prolog #SavedRegs Flags Command\n"); + for (i = 0; i < size; i++) + { + 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>"); + } + } + free(fpoext); + free(strbase); +} + static const char pdb2[] = "Microsoft C/C++ program database 2.00"; static void pdb_jg_dump(void) @@ -662,10 +715,14 @@ static void pdb_ds_dump(void) reader.u.ds.header->toc_page); /* files: - * 0: JG says old toc pages, I'd say free pages (tbc, low prio) - * 1: root structure - * 2: types - * 3: modules + * 0: JG says old toc pages, I'd say free pages (tbc, low prio) + * 1: root structure + * 2: types + * 3: modules + * 5: FPO data + * 8: segments + * 10: extended FPO data + * 12: string table (FPO unwinder, files for linetab2...) */ root = reader.read_file(&reader, 1); if (root) @@ -692,6 +749,7 @@ static void pdb_ds_dump(void) pdb_dump_types(&reader); pdb_dump_symbols(&reader); + pdb_dump_fpo(&reader); pdb_exit(&reader); }

1 0

Alexandre Julliard : comctl32/imagelist: Don' t change destination size in ImageList_Duplicate without corresponding allocation .
by Alexandre Julliard 10 Jan '11

10 Jan '11

Module: wine Branch: master Commit: cca319d5943ca01a564335473a9ac3ee949d342d URL: http://source.winehq.org/git/wine.git/?a=commit;h=cca319d5943ca01a564335473… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 10 11:16:23 2011 +0100 comctl32/imagelist: Don't change destination size in ImageList_Duplicate without corresponding allocation. --- dlls/comctl32/imagelist.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index 2e1581e..ed92a52 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -1521,7 +1521,6 @@ ImageList_Duplicate (HIMAGELIST himlSrc) himlSrc->hdcMask, 0, 0, SRCCOPY); himlDst->cCurImage = himlSrc->cCurImage; - himlDst->cMaxImage = himlSrc->cMaxImage; if (himlSrc->has_alpha && himlDst->has_alpha) memcpy( himlDst->has_alpha, himlSrc->has_alpha, himlDst->cCurImage ); }

1 0

Joel Holdsworth : comctl32/rebar: Implemented dragging between rows.
by Alexandre Julliard 10 Jan '11

10 Jan '11

Module: wine Branch: master Commit: 90a8e3f37f1ca1778cdb415d5809c0ccc3f76993 URL: http://source.winehq.org/git/wine.git/?a=commit;h=90a8e3f37f1ca1778cdb415d5… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Sun Jan 9 09:40:23 2011 +0000 comctl32/rebar: Implemented dragging between rows. --- dlls/comctl32/rebar.c | 96 ++++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 87 insertions(+), 9 deletions(-) diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c index 6549638..8e9c38b 100644 --- a/dlls/comctl32/rebar.c +++ b/dlls/comctl32/rebar.c @@ -1264,18 +1264,33 @@ static int REBAR_ShrinkBandsLTR(const REBAR_INFO *infoPtr, INT iBeginBand, INT i /* Tries to move a band to a given offset within a row. */ static int REBAR_MoveBandToRowOffset(REBAR_INFO *infoPtr, INT iBand, INT iFirstBand, - INT iLastBand, INT xOff) + INT iLastBand, INT xOff, BOOL reorder) { REBAR_BAND *insertBand = REBAR_GetBand(infoPtr, iBand); int xPos = 0, i; const BOOL setBreak = REBAR_GetBand(infoPtr, iFirstBand)->fStyle & RBBS_BREAK; /* Find the band's new position */ - for (i = iFirstBand; i < iLastBand; i = next_visible(infoPtr, i)) + if(reorder) { - if(xPos > xOff) - break; - xPos += REBAR_GetBand(infoPtr, i)->cxEffective + SEP_WIDTH; + /* Used during an LR band reorder drag */ + for (i = iFirstBand; i < iLastBand; i = next_visible(infoPtr, i)) + { + if(xPos > xOff) + break; + xPos += REBAR_GetBand(infoPtr, i)->cxEffective + SEP_WIDTH; + } + } + else + { + /* Used during a UD band insertion drag */ + for (i = iFirstBand; i < iLastBand; i = next_visible(infoPtr, i)) + { + const REBAR_BAND *band = REBAR_GetBand(infoPtr, i); + if(xPos + band->cxMinBand / 2 > xOff) + break; + xPos += band->cxEffective + SEP_WIDTH; + } } /* Move the band to its new position */ @@ -2036,8 +2051,6 @@ REBAR_HandleLRDrag (REBAR_INFO *infoPtr, const POINT *ptsmove) /* Gripper drag within a row. It will not implement "out- */ /* of-row" drags. (They are detected and handled in */ /* REBAR_MouseMove.) */ - /* **** FIXME Switching order of bands in a row not **** */ - /* **** yet implemented. **** */ { REBAR_BAND *hitBand; INT iHitBand, iRowBegin, iRowEnd; @@ -2088,7 +2101,7 @@ REBAR_HandleLRDrag (REBAR_INFO *infoPtr, const POINT *ptsmove) /* It was not possible to move the band by shrinking bands. * Try relocating the band instead. */ REBAR_MoveBandToRowOffset(infoPtr, iHitBand, iRowBegin, - iRowEnd, xBand + movement); + iRowEnd, xBand + movement, TRUE); } REBAR_SetRowRectsX(infoPtr, iRowBegin, iRowEnd); @@ -2099,6 +2112,71 @@ REBAR_HandleLRDrag (REBAR_INFO *infoPtr, const POINT *ptsmove) REBAR_MoveChildWindows(infoPtr, iRowBegin, iRowEnd); } +static void +REBAR_HandleUDDrag (REBAR_INFO *infoPtr, const POINT *ptsmove) +{ + INT yOff = (infoPtr->dwStyle & CCS_VERT) ? ptsmove->x : ptsmove->y; + INT iHitBand, iRowBegin, iNextRowBegin; + REBAR_BAND *hitBand, *rowBeginBand; + + if(infoPtr->uNumBands <= 0) + ERR("There are no bands in this rebar"); + + /* Up/down dragging can only occur when there is more than one + * band in the rebar */ + if(infoPtr->uNumBands <= 1) + return; + + iHitBand = infoPtr->iGrabbedBand; + hitBand = REBAR_GetBand(infoPtr, iHitBand); + + /* If we're taking a band that has the RBBS_BREAK style set, this + * style needs to be reapplied to the band that is going to become + * the new start of the row. */ + if((hitBand->fStyle & RBBS_BREAK) && + (iHitBand < infoPtr->uNumBands - 1)) + REBAR_GetBand(infoPtr, iHitBand + 1)->fStyle |= RBBS_BREAK; + + if(yOff < 0) + { + /* Place the band above the current top row */ + DPA_DeletePtr(infoPtr->bands, iHitBand); + hitBand->fStyle &= RBBS_BREAK; + REBAR_GetBand(infoPtr, 0)->fStyle |= RBBS_BREAK; + infoPtr->iGrabbedBand = DPA_InsertPtr( + infoPtr->bands, 0, hitBand); + } + else if(yOff > REBAR_GetBand(infoPtr, infoPtr->uNumBands - 1)->rcBand.bottom) + { + /* Place the band below the current bottom row */ + DPA_DeletePtr(infoPtr->bands, iHitBand); + hitBand->fStyle |= RBBS_BREAK; + infoPtr->iGrabbedBand = DPA_InsertPtr( + infoPtr->bands, infoPtr->uNumBands - 1, hitBand); + } + else + { + /* Place the band in the prexisting row the mouse is hovering over */ + iRowBegin = first_visible(infoPtr); + while(iRowBegin < infoPtr->uNumBands) + { + iNextRowBegin = get_row_end_for_band(infoPtr, iRowBegin); + rowBeginBand = REBAR_GetBand(infoPtr, iRowBegin); + if(rowBeginBand->rcBand.bottom > yOff) + { + REBAR_MoveBandToRowOffset( + infoPtr, iHitBand, iRowBegin, iNextRowBegin, + ((infoPtr->dwStyle & CCS_VERT) ? ptsmove->y : ptsmove->x) + - REBAR_PRE_GRIPPER - infoPtr->ihitoffset, FALSE); + break; + } + + iRowBegin = iNextRowBegin; + } + } + + REBAR_Layout(infoPtr); +} /* << REBAR_BeginDrag >> */ @@ -3098,7 +3176,7 @@ REBAR_MouseMove (REBAR_INFO *infoPtr, LPARAM lParam) /* Test for valid drag case - must not be first band in row */ if ((yPtMove < band->rcBand.top) || (yPtMove > band->rcBand.bottom)) { - FIXME("Cannot drag to other rows yet!!\n"); + REBAR_HandleUDDrag (infoPtr, &ptMove); } else { REBAR_HandleLRDrag (infoPtr, &ptMove);

1 0

Joel Holdsworth : comctl32/rebar: Moved drag notify code into REBAR_MouseMove.
by Alexandre Julliard 10 Jan '11

10 Jan '11

Module: wine Branch: master Commit: 53284d2a18e49d9fea9e6db47378918498155e30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53284d2a18e49d9fea9e6db47… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Sun Jan 9 09:40:15 2011 +0000 comctl32/rebar: Moved drag notify code into REBAR_MouseMove. --- dlls/comctl32/rebar.c | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c index 5ab55d4..6549638 100644 --- a/dlls/comctl32/rebar.c +++ b/dlls/comctl32/rebar.c @@ -2044,20 +2044,6 @@ REBAR_HandleLRDrag (REBAR_INFO *infoPtr, const POINT *ptsmove) INT movement, xBand, cxLeft = 0; BOOL shrunkBands = FALSE; - /* on first significant mouse movement, issue notify */ - if (!(infoPtr->fStatus & BEGIN_DRAG_ISSUED)) { - if (REBAR_Notify_NMREBAR (infoPtr, -1, RBN_BEGINDRAG)) { - /* Notify returned TRUE - abort drag */ - infoPtr->dragStart.x = 0; - infoPtr->dragStart.y = 0; - infoPtr->dragNow = infoPtr->dragStart; - infoPtr->iGrabbedBand = -1; - ReleaseCapture (); - return ; - } - infoPtr->fStatus |= BEGIN_DRAG_ISSUED; - } - iHitBand = infoPtr->iGrabbedBand; iRowBegin = get_row_begin_for_band(infoPtr, iHitBand); iRowEnd = get_row_end_for_band(infoPtr, iHitBand); @@ -3095,6 +3081,20 @@ REBAR_MouseMove (REBAR_INFO *infoPtr, LPARAM lParam) if ((abs(ptMove.x - infoPtr->dragNow.x) <= mindragx) && (abs(ptMove.y - infoPtr->dragNow.y) <= mindragy)) return 0; + /* on first significant mouse movement, issue notify */ + if (!(infoPtr->fStatus & BEGIN_DRAG_ISSUED)) { + if (REBAR_Notify_NMREBAR (infoPtr, -1, RBN_BEGINDRAG)) { + /* Notify returned TRUE - abort drag */ + infoPtr->dragStart.x = 0; + infoPtr->dragStart.y = 0; + infoPtr->dragNow = infoPtr->dragStart; + infoPtr->iGrabbedBand = -1; + ReleaseCapture (); + return 0; + } + infoPtr->fStatus |= BEGIN_DRAG_ISSUED; + } + /* Test for valid drag case - must not be first band in row */ if ((yPtMove < band->rcBand.top) || (yPtMove > band->rcBand.bottom)) {

1 0

Joel Holdsworth : comctl32/rebar: Implemented band reordering within rows.
by Alexandre Julliard 10 Jan '11

10 Jan '11

Module: wine Branch: master Commit: ebadd4ec46c9f8d725468c9858ed03bcc6c70e90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebadd4ec46c9f8d725468c985… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Sun Jan 9 09:40:10 2011 +0000 comctl32/rebar: Implemented band reordering within rows. --- dlls/comctl32/rebar.c | 97 +++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 77 insertions(+), 20 deletions(-) diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c index 552c83c..5ab55d4 100644 --- a/dlls/comctl32/rebar.c +++ b/dlls/comctl32/rebar.c @@ -1262,6 +1262,42 @@ static int REBAR_ShrinkBandsLTR(const REBAR_INFO *infoPtr, INT iBeginBand, INT i return cxShrink; } +/* Tries to move a band to a given offset within a row. */ +static int REBAR_MoveBandToRowOffset(REBAR_INFO *infoPtr, INT iBand, INT iFirstBand, + INT iLastBand, INT xOff) +{ + REBAR_BAND *insertBand = REBAR_GetBand(infoPtr, iBand); + int xPos = 0, i; + const BOOL setBreak = REBAR_GetBand(infoPtr, iFirstBand)->fStyle & RBBS_BREAK; + + /* Find the band's new position */ + for (i = iFirstBand; i < iLastBand; i = next_visible(infoPtr, i)) + { + if(xPos > xOff) + break; + xPos += REBAR_GetBand(infoPtr, i)->cxEffective + SEP_WIDTH; + } + + /* Move the band to its new position */ + DPA_DeletePtr(infoPtr->bands, iBand); + if(i > iBand) + i--; + DPA_InsertPtr(infoPtr->bands, i, insertBand); + + /* Ensure only the last band has the RBBS_BREAK flag set */ + insertBand->fStyle &= ~RBBS_BREAK; + if(setBreak) + REBAR_GetBand(infoPtr, iFirstBand)->fStyle |= RBBS_BREAK; + + /* Return the currently grabbed band */ + if(infoPtr->iGrabbedBand == iBand) + { + infoPtr->iGrabbedBand = i; + return i; + } + else return -1; +} + /* Set the heights of the visible bands in [iBeginBand; iEndBand) to the max height. iBeginBand must be visible */ static int REBAR_SetBandsHeight(const REBAR_INFO *infoPtr, INT iBeginBand, INT iEndBand, INT yStart) { @@ -2005,7 +2041,8 @@ REBAR_HandleLRDrag (REBAR_INFO *infoPtr, const POINT *ptsmove) { REBAR_BAND *hitBand; INT iHitBand, iRowBegin, iRowEnd; - INT movement, xBand; + INT movement, xBand, cxLeft = 0; + BOOL shrunkBands = FALSE; /* on first significant mouse movement, issue notify */ if (!(infoPtr->fStatus & BEGIN_DRAG_ISSUED)) { @@ -2030,21 +2067,44 @@ REBAR_HandleLRDrag (REBAR_INFO *infoPtr, const POINT *ptsmove) movement = (infoPtr->dwStyle&CCS_VERT ? ptsmove->y : ptsmove->x) - (xBand + REBAR_PRE_GRIPPER - infoPtr->ihitoffset); - if (movement < 0) { - INT cxLeft = REBAR_ShrinkBandsRTL(infoPtr, iRowBegin, iHitBand, -movement, TRUE); - hitBand->cxEffective += -movement - cxLeft; - hitBand->cx = hitBand->cxEffective; - } else if (movement > 0) { - INT prev; - - if ((prev = prev_visible(infoPtr, iHitBand)) >= 0) { - INT cxLeft = REBAR_ShrinkBandsLTR(infoPtr, iHitBand, iRowEnd, movement, TRUE); - REBAR_BAND *lpPrev = REBAR_GetBand(infoPtr, prev_visible(infoPtr, iHitBand)); - lpPrev->cxEffective += movement - cxLeft; - lpPrev->cx = lpPrev->cxEffective; + /* Dragging the first band in a row cannot cause shrinking */ + if(iHitBand != iRowBegin) + { + if (movement < 0) { + cxLeft = REBAR_ShrinkBandsRTL(infoPtr, iRowBegin, iHitBand, -movement, TRUE); + + if(cxLeft < -movement) + { + hitBand->cxEffective += -movement - cxLeft; + hitBand->cx = hitBand->cxEffective; + shrunkBands = TRUE; + } + + } else if (movement > 0) { + + cxLeft = movement; + if (prev_visible(infoPtr, iHitBand) >= 0) + cxLeft = REBAR_ShrinkBandsLTR(infoPtr, iHitBand, iRowEnd, movement, TRUE); + + if(cxLeft < movement) + { + REBAR_BAND *lpPrev = REBAR_GetBand(infoPtr, prev_visible(infoPtr, iHitBand)); + lpPrev->cxEffective += movement - cxLeft; + lpPrev->cx = hitBand->cxEffective; + shrunkBands = TRUE; + } + } } + if(!shrunkBands) + { + /* It was not possible to move the band by shrinking bands. + * Try relocating the band instead. */ + REBAR_MoveBandToRowOffset(infoPtr, iHitBand, iRowBegin, + iRowEnd, xBand + movement); + } + REBAR_SetRowRectsX(infoPtr, iRowBegin, iRowEnd); if (infoPtr->dwStyle & CCS_VERT) REBAR_CalcVertBand(infoPtr, 0, infoPtr->uNumBands); @@ -3023,24 +3083,21 @@ REBAR_MouseMove (REBAR_INFO *infoPtr, LPARAM lParam) /* if we are currently dragging a band */ if (infoPtr->iGrabbedBand >= 0) { - REBAR_BAND *band1 = NULL, *band2; + REBAR_BAND *band; int yPtMove = (infoPtr->dwStyle & CCS_VERT ? ptMove.x : ptMove.y); if (GetCapture() != infoPtr->hwndSelf) ERR("We are dragging but haven't got capture?!?\n"); - if (infoPtr->iGrabbedBand > 0) - band1 = REBAR_GetBand(infoPtr, infoPtr->iGrabbedBand - 1); - band2 = REBAR_GetBand(infoPtr, infoPtr->iGrabbedBand); + band = REBAR_GetBand(infoPtr, infoPtr->iGrabbedBand); /* if mouse did not move much, exit */ if ((abs(ptMove.x - infoPtr->dragNow.x) <= mindragx) && (abs(ptMove.y - infoPtr->dragNow.y) <= mindragy)) return 0; /* Test for valid drag case - must not be first band in row */ - if ((yPtMove < band2->rcBand.top) || - (yPtMove > band2->rcBand.bottom) || - ((infoPtr->iGrabbedBand > 0) && (band1->iRow != band2->iRow))) { + if ((yPtMove < band->rcBand.top) || + (yPtMove > band->rcBand.bottom)) { FIXME("Cannot drag to other rows yet!!\n"); } else {

1 0

Joel Holdsworth : comctl32/rebar: Removed a redundant call.
by Alexandre Julliard 10 Jan '11

10 Jan '11

Module: wine Branch: master Commit: 1e644a7db722c3f6a5971ba73898a79d4796cef9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e644a7db722c3f6a5971ba73… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Sun Jan 9 09:40:08 2011 +0000 comctl32/rebar: Removed a redundant call. --- dlls/comctl32/rebar.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c index 8ecfee3..552c83c 100644 --- a/dlls/comctl32/rebar.c +++ b/dlls/comctl32/rebar.c @@ -1180,8 +1180,6 @@ static void REBAR_SetRowRectsX(const REBAR_INFO *infoPtr, INT iBeginBand, INT iE for (i = iBeginBand; i < iEndBand; i = next_visible(infoPtr, i)) { REBAR_BAND *lpBand = REBAR_GetBand(infoPtr, i); - - lpBand = REBAR_GetBand(infoPtr, i); if (lpBand->rcBand.left != xPos || lpBand->rcBand.right != xPos + lpBand->cxEffective) { lpBand->fDraw |= NTF_INVALIDATE; TRACE("Setting rect %d to %d,%d\n", i, xPos, xPos + lpBand->cxEffective);

1 0

Hwang YunSong : wordpad: Update Korean resource.
by Alexandre Julliard 10 Jan '11

10 Jan '11

Module: wine Branch: master Commit: 302415c3db8f03db0abcd6c44dc4bd2146e6da78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=302415c3db8f03db0abcd6c44… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Sat Jan 8 10:43:18 2011 +0900 wordpad: Update Korean resource. --- programs/wordpad/Ko.rc | 284 ++++++++++++++++++++++++------------------------ 1 files changed, 143 insertions(+), 141 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=302415c3db8f03db0abcd…

1 0

← Newer
1
...
59
60
61
62
63
64
65
...
88
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 January 2011