March 2007 - Wine-Commits - list.winehq.org

Jason Edmeades : cmd.exe: PROMPT option to show pushd levels.
by Alexandre Julliard March 5, 2007

March 5, 2007

Module: wine Branch: master Commit: 8049ae1af8e431a8b54c34107c31cf85547972a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8049ae1af8e431a8b54c34107… Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Sun Mar 4 22:34:20 2007 +0000 cmd.exe: PROMPT option to show pushd levels. --- programs/cmd/builtins.c | 11 +++++------ programs/cmd/wcmd.h | 9 +++++++++ programs/cmd/wcmdmain.c | 9 ++++++++- 3 files changed, 22 insertions(+), 7 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 3aeac71..8418ab4 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -42,12 +42,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(cmd); void WCMD_execute (char *orig_command, char *parameter, char *substitution); -struct env_stack -{ - struct env_stack *next; - WCHAR *strings; -}; - struct env_stack *saved_environment; struct env_stack *pushd_directories; @@ -612,6 +606,11 @@ void WCMD_pushd (void) { } else { curdir -> next = pushd_directories; curdir -> strings = thisdir; + if (pushd_directories == NULL) { + curdir -> stackdepth = 1; + } else { + curdir -> stackdepth = pushd_directories -> stackdepth + 1; + } pushd_directories = curdir; } } diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index 61e3044..49307c7 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -94,6 +94,15 @@ typedef struct { BOOL skip_rest; /* Skip the rest of the batch program and exit */ } BATCH_CONTEXT; +/* Data structure to save setlocal and pushd information */ + +struct env_stack +{ + struct env_stack *next; + int stackdepth; /* Only used for pushd and popd */ + WCHAR *strings; +}; + #endif /* !RC_INVOKED */ /* diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 4253f31..a1f426c 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -45,6 +45,7 @@ const char anykey[] = "Press Return key to continue: "; char quals[MAX_PATH], param1[MAX_PATH], param2[MAX_PATH]; BATCH_CONTEXT *context = NULL; static HANDLE old_stdin = INVALID_HANDLE_VALUE, old_stdout = INVALID_HANDLE_VALUE; +extern struct env_stack *pushd_directories; static char *WCMD_expand_envvar(char *start); @@ -932,10 +933,16 @@ void WCMD_show_prompt (void) { case 'V': lstrcat (q, version_string); while (*q) q++; - break; + break; case '_': *q++ = '\n'; break; + case '+': + if (pushd_directories) { + memset(q, '+', pushd_directories->stackdepth); + q = q + pushd_directories->stackdepth; + } + break; } p++; *q = '\0';

1 0

Jason Edmeades : cmd.exe: Support rd dir1 dir2.
by Alexandre Julliard March 5, 2007

March 5, 2007

Module: wine Branch: master Commit: 0efa91de15c393dc403994049292c1fa9313146f URL: http://source.winehq.org/git/wine.git/?a=commit;h=0efa91de15c393dc403994049… Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Sun Mar 4 22:33:27 2007 +0000 cmd.exe: Support rd dir1 dir2. --- programs/cmd/builtins.c | 74 +++++++++++++++++++++++++++++------------------ programs/cmd/wcmd.h | 2 +- programs/cmd/wcmdmain.c | 2 +- 3 files changed, 48 insertions(+), 30 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 243a589..3aeac71 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -36,6 +36,9 @@ #include "wcmd.h" #include <shellapi.h> +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(cmd); void WCMD_execute (char *orig_command, char *parameter, char *substitution); @@ -752,44 +755,59 @@ void WCMD_pause (void) { * Delete a directory. */ -void WCMD_remove_dir (void) { +void WCMD_remove_dir (char *command) { - if (param1[0] == 0x00) { - WCMD_output ("Argument missing\n"); - return; - } + int argno = 0; + int argsProcessed = 0; + char *argN = command; - /* If subdirectory search not supplied, just try to remove - and report error if it fails (eg if it contains a file) */ - if (strstr (quals, "/S") == NULL) { - if (!RemoveDirectory (param1)) WCMD_print_error (); + /* Loop through all args */ + while (argN) { + char *thisArg = WCMD_parameter (command, argno++, &argN); + if (argN && argN[0] != '/') { + WINE_TRACE("rd: Processing arg %s (quals:%s)\n", thisArg, quals); + argsProcessed++; - /* Otherwise use ShFileOp to recursively remove a directory */ - } else { + /* If subdirectory search not supplied, just try to remove + and report error if it fails (eg if it contains a file) */ + if (strstr (quals, "/S") == NULL) { + if (!RemoveDirectory (thisArg)) WCMD_print_error (); - SHFILEOPSTRUCT lpDir; + /* Otherwise use ShFileOp to recursively remove a directory */ + } else { - /* Ask first */ - if (strstr (quals, "/Q") == NULL) { - BOOL ok; - char question[MAXSTRING]; + SHFILEOPSTRUCT lpDir; - /* Ask for confirmation */ - sprintf(question, "%s, ", param1); - ok = WCMD_ask_confirm(question, TRUE); + /* Ask first */ + if (strstr (quals, "/Q") == NULL) { + BOOL ok; + char question[MAXSTRING]; - /* Abort if answer is 'N' */ - if (!ok) return; + /* Ask for confirmation */ + sprintf(question, "%s, ", thisArg); + ok = WCMD_ask_confirm(question, TRUE); + + /* Abort if answer is 'N' */ + if (!ok) return; + } + + /* Do the delete */ + lpDir.hwnd = NULL; + lpDir.pTo = NULL; + lpDir.pFrom = thisArg; + lpDir.fFlags = FOF_SILENT | FOF_NOCONFIRMATION | FOF_NOERRORUI; + lpDir.wFunc = FO_DELETE; + if (SHFileOperationA(&lpDir)) WCMD_print_error (); + } } + } - /* Do the delete */ - lpDir.hwnd = NULL; - lpDir.pTo = NULL; - lpDir.pFrom = param1; - lpDir.fFlags = FOF_SILENT | FOF_NOCONFIRMATION | FOF_NOERRORUI; - lpDir.wFunc = FO_DELETE; - if (SHFileOperationA(&lpDir)) WCMD_print_error (); + /* Handle no valid args */ + if (argsProcessed == 0) { + WCMD_output ("Argument missing\n"); + return; } + } /**************************************************************************** diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index d6357f0..61e3044 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -55,7 +55,7 @@ void WCMD_print_error (void); void WCMD_process_command (char *command); void WCMD_pushd (void); int WCMD_read_console (char *string, int str_len); -void WCMD_remove_dir (void); +void WCMD_remove_dir (char *command); void WCMD_rename (void); void WCMD_run_program (char *command, int called); void WCMD_setlocal (const char *command); diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 40dad28..f0331c5 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -530,7 +530,7 @@ void WCMD_process_command (char *command) break; case WCMD_RD: case WCMD_RMDIR: - WCMD_remove_dir (); + WCMD_remove_dir (p); break; case WCMD_SETLOCAL: WCMD_setlocal(p);

1 0

Jason Edmeades : cmd.exe: Additional PROMPT options.
by Alexandre Julliard March 5, 2007

March 5, 2007

Module: wine Branch: master Commit: 00ba810dbf30265bca5fbd4e158314108cef0f27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00ba810dbf30265bca5fbd4e1… Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Sun Mar 4 22:33:51 2007 +0000 cmd.exe: Additional PROMPT options. --- programs/cmd/wcmdmain.c | 21 ++++++++++++++++++--- 1 files changed, 18 insertions(+), 3 deletions(-) diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index f0331c5..4253f31 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -878,9 +878,15 @@ void WCMD_show_prompt (void) { case '$': *q++ = '$'; break; + case 'A': + *q++ = '&'; + break; case 'B': *q++ = '|'; break; + case 'C': + *q++ = '('; + break; case 'D': GetDateFormat (LOCALE_USER_DEFAULT, DATE_SHORTDATE, NULL, NULL, q, MAX_PATH); while (*q) q++; @@ -888,9 +894,15 @@ void WCMD_show_prompt (void) { case 'E': *q++ = '\E'; break; + case 'F': + *q++ = ')'; + break; case 'G': *q++ = '>'; break; + case 'H': + *q++ = '\b'; + break; case 'L': *q++ = '<'; break; @@ -910,13 +922,16 @@ void WCMD_show_prompt (void) { case 'Q': *q++ = '='; break; + case 'S': + *q++ = ' '; + break; case 'T': GetTimeFormat (LOCALE_USER_DEFAULT, 0, NULL, NULL, q, MAX_PATH); while (*q) q++; break; - case 'V': - lstrcat (q, version_string); - while (*q) q++; + case 'V': + lstrcat (q, version_string); + while (*q) q++; break; case '_': *q++ = '\n';

1 0

Eric Pouech : dbghelp: module target: Better error handling when init fails and creates a dummy thread.
by Alexandre Julliard March 5, 2007

March 5, 2007

Module: wine Branch: master Commit: cc3dd00c0458c5eef13a3b7f7efff531c7dbd1e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc3dd00c0458c5eef13a3b7f7… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Sun Mar 4 17:02:31 2007 +0100 dbghelp: module target: Better error handling when init fails and creates a dummy thread. --- programs/winedbg/tgt_module.c | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) diff --git a/programs/winedbg/tgt_module.c b/programs/winedbg/tgt_module.c index 0f72510..043d051 100644 --- a/programs/winedbg/tgt_module.c +++ b/programs/winedbg/tgt_module.c @@ -51,11 +51,17 @@ enum dbg_start tgt_module_load(const char* name, BOOL keep) { DWORD opts = SymGetOptions(); HANDLE hDummy = (HANDLE)0x87654321; + enum dbg_start ret = start_ok; SymSetOptions((opts & ~(SYMOPT_UNDNAME|SYMOPT_DEFERRED_LOADS)) | SYMOPT_LOAD_LINES | SYMOPT_AUTO_PUBLICS | 0x40000000); - SymInitialize(hDummy, NULL, FALSE); - SymLoadModule(hDummy, NULL, name, NULL, 0, 0); + if (!SymInitialize(hDummy, NULL, FALSE)) + return start_error_init; + if (!SymLoadModule(hDummy, NULL, name, NULL, 0, 0)) + { + ret = start_error_init; + keep = FALSE; + } if (keep) { @@ -64,6 +70,8 @@ enum dbg_start tgt_module_load(const char* name, BOOL keep) SymSetOptions(SymGetOptions() | 0x40000000); dbg_curr_process = dbg_add_process(&be_process_module_io, 1, hDummy); dbg_curr_pid = 1; + dbg_curr_thread = dbg_add_thread(dbg_curr_process, 2, NULL, NULL); + /* FIXME: missing thread creation, fetching frames, restoring dbghelp's options... */ } else @@ -72,7 +80,7 @@ enum dbg_start tgt_module_load(const char* name, BOOL keep) SymSetOptions(opts); } - return start_ok; + return ret; } static BOOL tgt_process_module_close_process(struct dbg_process* pcs, BOOL kill)

1 0

Eric Pouech : dbghelp: Fixes for loading circular references on function signature.
by Alexandre Julliard March 5, 2007

March 5, 2007

Module: wine Branch: master Commit: f4e129ab8163312ab7f0f000fcf759cb2878aa10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4e129ab8163312ab7f0f000f… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Sun Mar 4 17:04:07 2007 +0100 dbghelp: Fixes for loading circular references on function signature. --- dlls/dbghelp/msc.c | 73 +++++++++++++++++++++++++++++++++++----------------- 1 files changed, 49 insertions(+), 24 deletions(-) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index 032f785..febebd4 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -755,12 +755,9 @@ static struct symt* codeview_add_type_struct(struct codeview_type_parse* ctp, static struct symt* codeview_new_func_signature(struct codeview_type_parse* ctp, struct symt* existing, - unsigned ret_type, - unsigned args_list, enum CV_call_e call_conv) { struct symt_function_signature* sym; - const union codeview_reftype* reftype; if (existing) { @@ -769,10 +766,19 @@ static struct symt* codeview_new_func_signature(struct codeview_type_parse* ctp, } else { - sym = symt_new_function_signature(ctp->module, - codeview_fetch_type(ctp, ret_type), - call_conv); + sym = symt_new_function_signature(ctp->module, NULL, call_conv); } + return &sym->symt; +} + +static void codeview_add_func_signature_args(struct codeview_type_parse* ctp, + struct symt_function_signature* sym, + unsigned ret_type, + unsigned args_list) +{ + const union codeview_reftype* reftype; + + sym->rettype = codeview_fetch_type(ctp, ret_type); if (args_list && (reftype = codeview_jump_to_type(ctp, args_list))) { int i; @@ -792,8 +798,6 @@ static struct symt* codeview_new_func_signature(struct codeview_type_parse* ctp, FIXME("Unexpected leaf %x for signature's pmt\n", reftype->generic.id); } } - - return &sym->symt; } static struct symt* codeview_parse_one_type(struct codeview_type_parse* ctp, @@ -979,34 +983,55 @@ static struct symt* codeview_parse_one_type(struct codeview_type_parse* ctp, break; case LF_PROCEDURE_V1: - symt = codeview_new_func_signature(ctp, existing, - type->procedure_v1.rvtype, - details ? type->procedure_v1.arglist : 0, - type->procedure_v1.call); + symt = codeview_new_func_signature(ctp, existing, type->procedure_v1.call); + if (details) + { + codeview_add_type(curr_type, symt); + codeview_add_func_signature_args(ctp, + (struct symt_function_signature*)symt, + type->procedure_v1.rvtype, + type->procedure_v1.arglist); + } break; case LF_PROCEDURE_V2: - symt = codeview_new_func_signature(ctp, existing, - type->procedure_v2.rvtype, - details ? type->procedure_v2.arglist : 0, - type->procedure_v2.call); + symt = codeview_new_func_signature(ctp, existing,type->procedure_v2.call); + if (details) + { + codeview_add_type(curr_type, symt); + codeview_add_func_signature_args(ctp, + (struct symt_function_signature*)symt, + type->procedure_v2.rvtype, + type->procedure_v2.arglist); + } break; + case LF_MFUNCTION_V1: /* FIXME: for C++, this is plain wrong, but as we don't use arg types * nor class information, this would just do for now */ - symt = codeview_new_func_signature(ctp, existing, - type->mfunction_v1.rvtype, - details ? type->mfunction_v1.arglist : 0, - type->mfunction_v1.call); + symt = codeview_new_func_signature(ctp, existing, type->mfunction_v1.call); + if (details) + { + codeview_add_type(curr_type, symt); + codeview_add_func_signature_args(ctp, + (struct symt_function_signature*)symt, + type->mfunction_v1.rvtype, + type->mfunction_v1.arglist); + } break; case LF_MFUNCTION_V2: /* FIXME: for C++, this is plain wrong, but as we don't use arg types * nor class information, this would just do for now */ - symt = codeview_new_func_signature(ctp, existing, - type->mfunction_v2.rvtype, - details ? type->mfunction_v2.arglist : 0, - type->mfunction_v2.call); + symt = codeview_new_func_signature(ctp, existing, type->mfunction_v2.call); + if (details) + { + codeview_add_type(curr_type, symt); + codeview_add_func_signature_args(ctp, + (struct symt_function_signature*)symt, + type->mfunction_v2.rvtype, + type->mfunction_v2.arglist); + } break; case LF_VTSHAPE_V1:

1 0

Eric Pouech : dbghelp: Implemented SymEnumTypesW.
by Alexandre Julliard March 5, 2007

March 5, 2007

Module: wine Branch: master Commit: ccf0be8e5755da10d77a265bcfa79680f5a15712 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ccf0be8e5755da10d77a265bc… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Sun Mar 4 17:00:50 2007 +0100 dbghelp: Implemented SymEnumTypesW. --- dlls/dbghelp/dbghelp.spec | 2 +- dlls/dbghelp/dbghelp_private.h | 1 + dlls/dbghelp/symbol.c | 2 +- dlls/dbghelp/type.c | 32 ++++++++++++++++++++++++++++++++ include/dbghelp.h | 1 + 5 files changed, 36 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/dbghelp.spec b/dlls/dbghelp/dbghelp.spec index ffb51bb..63bb5af 100644 --- a/dlls/dbghelp/dbghelp.spec +++ b/dlls/dbghelp/dbghelp.spec @@ -43,7 +43,7 @@ @ stub SymEnumSymbolsForAddr @ stub SymEnumSymbolsForAddrW @ stdcall SymEnumTypes(ptr double ptr ptr) -@ stub SymEnumTypesW +@ stdcall SymEnumTypesW(ptr double ptr ptr) @ stdcall SymEnumerateModules(long ptr ptr) @ stdcall SymEnumerateModules64(long ptr ptr) @ stub SymEnumerateModulesW64 diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index d450f8d..198c4da 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -503,6 +503,7 @@ extern BOOL dwarf2_parse(struct module* module, unsigned long load_offse /* symbol.c */ extern const char* symt_get_name(const struct symt* sym); extern int symt_cmp_addr(const void* p1, const void* p2); +extern void copy_symbolW(SYMBOL_INFOW* siw, const SYMBOL_INFO* si); extern struct symt_ht* symt_find_nearest(struct module* module, DWORD addr); extern struct symt_compiland* diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index cf8abf3..06240d4 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -828,7 +828,7 @@ static BOOL symt_enum_locals(struct process* pcs, const char* mask, * Helper for transforming an ANSI symbol info into an UNICODE one. * Assume that MaxNameLen is the same for both version (A & W). */ -static void copy_symbolW(SYMBOL_INFOW* siw, const SYMBOL_INFO* si) +void copy_symbolW(SYMBOL_INFOW* siw, const SYMBOL_INFO* si) { siw->SizeOfStruct = si->SizeOfStruct; siw->TypeIndex = si->TypeIndex; diff --git a/dlls/dbghelp/type.c b/dlls/dbghelp/type.c index 3a36aba..4a340ad 100644 --- a/dlls/dbghelp/type.c +++ b/dlls/dbghelp/type.c @@ -421,6 +421,38 @@ BOOL WINAPI SymEnumTypes(HANDLE hProcess, ULONG64 BaseOfDll, return TRUE; } +struct enum_types_AtoW +{ + char buffer[sizeof(SYMBOL_INFOW) + 256 * sizeof(WCHAR)]; + void* user; + PSYM_ENUMERATESYMBOLS_CALLBACKW callback; +}; + +BOOL CALLBACK enum_types_AtoW(PSYMBOL_INFO si, ULONG addr, PVOID _et) +{ + struct enum_types_AtoW* et = _et; + SYMBOL_INFOW* siW = (SYMBOL_INFOW*)et->buffer; + + copy_symbolW(siW, si); + return et->callback(siW, addr, et->user); +} + +/****************************************************************** + * SymEnumTypesW (DBGHELP.@) + * + */ +BOOL WINAPI SymEnumTypesW(HANDLE hProcess, ULONG64 BaseOfDll, + PSYM_ENUMERATESYMBOLS_CALLBACKW EnumSymbolsCallback, + PVOID UserContext) +{ + struct enum_types_AtoW et; + + et.callback = EnumSymbolsCallback; + et.user = UserContext; + + return SymEnumTypes(hProcess, BaseOfDll, enum_types_AtoW, &et); +} + /****************************************************************** * symt_get_info * diff --git a/include/dbghelp.h b/include/dbghelp.h index b777224..eb2442a 100644 --- a/include/dbghelp.h +++ b/include/dbghelp.h @@ -911,6 +911,7 @@ BOOL WINAPI SymGetTypeInfo(HANDLE, DWORD64, ULONG, IMAGEHLP_SYMBOL_TYPE_INFO, PV typedef BOOL (CALLBACK *PSYM_ENUMERATESYMBOLS_CALLBACK)(PSYMBOL_INFO, ULONG, PVOID); typedef BOOL (CALLBACK *PSYM_ENUMERATESYMBOLS_CALLBACKW)(PSYMBOL_INFOW, ULONG, PVOID); BOOL WINAPI SymEnumTypes(HANDLE, ULONG64, PSYM_ENUMERATESYMBOLS_CALLBACK, PVOID); +BOOL WINAPI SymEnumTypesW(HANDLE, ULONG64, PSYM_ENUMERATESYMBOLS_CALLBACKW, PVOID); BOOL WINAPI SymFromAddr(HANDLE, DWORD64, DWORD64*, SYMBOL_INFO*); BOOL WINAPI SymFromAddrW(HANDLE, DWORD64, DWORD64*, SYMBOL_INFOW*); BOOL WINAPI SymFromToken(HANDLE, DWORD64, DWORD, PSYMBOL_INFO);

1 0

Eric Pouech : winedbg: When reloading a minidump, recreate all threads from the thread record (and not just the first one).
by Alexandre Julliard March 5, 2007

March 5, 2007

Module: wine Branch: master Commit: 90167f26d31f1921bda27bdd234b5cc21d5d72dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=90167f26d31f1921bda27bdd2… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Sun Mar 4 20:10:41 2007 +0100 winedbg: When reloading a minidump, recreate all threads from the thread record (and not just the first one). --- programs/winedbg/tgt_minidump.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/programs/winedbg/tgt_minidump.c b/programs/winedbg/tgt_minidump.c index 34e5b17..5df7c99 100644 --- a/programs/winedbg/tgt_minidump.c +++ b/programs/winedbg/tgt_minidump.c @@ -283,11 +283,14 @@ static enum dbg_start minidump_do_reload(struct tgt_process_minidump_data* data) if (MiniDumpReadDumpStream(data->mapping, ThreadListStream, &dir, &stream, &size)) { - MINIDUMP_THREAD_LIST* mtl = (MINIDUMP_THREAD_LIST*)stream; - MINIDUMP_THREAD* mt = &mtl->Threads[0]; + MINIDUMP_THREAD_LIST* mtl = (MINIDUMP_THREAD_LIST*)stream; + ULONG i; - dbg_add_thread(dbg_curr_process, mt->ThreadId, NULL, - (void*)(DWORD_PTR)mt->Teb); + for (i = 0; i < mtl->NumberOfThreads; i++) + { + dbg_add_thread(dbg_curr_process, mtl->Threads[i].ThreadId, NULL, + (void*)(DWORD_PTR)mtl->Threads[i].Teb); + } } /* first load ELF modules, then do the PE ones */ if (MiniDumpReadDumpStream(data->mapping, Wine_ElfModuleListStream, &dir,

1 0

Eric Pouech : winedbg: Fix printing function signature type for circular references on return type .
by Alexandre Julliard March 5, 2007

March 5, 2007

Module: wine Branch: master Commit: dbe0610bb4d0720677a0e83f0735c5f87c05604f URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbe0610bb4d0720677a0e83f0… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Sun Mar 4 17:04:13 2007 +0100 winedbg: Fix printing function signature type for circular references on return type. --- programs/winedbg/types.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/programs/winedbg/types.c b/programs/winedbg/types.c index 939e5df..bc3373b 100644 --- a/programs/winedbg/types.c +++ b/programs/winedbg/types.c @@ -676,8 +676,16 @@ int types_print_type(const struct dbg_type* type, BOOL details) break; case SymTagFunctionType: types_get_info(type, TI_GET_TYPE, &subtype.id); - subtype.module = type->module; - types_print_type(&subtype, FALSE); + /* is the returned type the same object as function sig itself ? */ + if (subtype.id != type->id) + { + subtype.module = type->module; + types_print_type(&subtype, FALSE); + } + else + { + dbg_printf("<ret_type=self>"); + } dbg_printf(" (*%s)(", name); if (types_get_info(type, TI_GET_CHILDRENCOUNT, &count)) {

1 0

Eric Pouech : winedbg: Fix maint type when no process is active.
by Alexandre Julliard March 5, 2007

March 5, 2007

Module: wine Branch: master Commit: 51a9b2273b25b5bb19d016dc33262f8dc5c8059f URL: http://source.winehq.org/git/wine.git/?a=commit;h=51a9b2273b25b5bb19d016dc3… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Sun Mar 4 17:04:18 2007 +0100 winedbg: Fix maint type when no process is active. --- programs/winedbg/types.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/programs/winedbg/types.c b/programs/winedbg/types.c index 0208ec5..939e5df 100644 --- a/programs/winedbg/types.c +++ b/programs/winedbg/types.c @@ -573,6 +573,11 @@ static BOOL CALLBACK print_types_mod_cb(PSTR mod_name, DWORD base, void* ctx) int print_types(void) { + if (!dbg_curr_process) + { + dbg_printf("No known process, cannot print types\n"); + return 0; + } SymEnumerateModules(dbg_curr_process->handle, print_types_mod_cb, NULL); return 0; }

1 0

Chris Robinson : quartz: Use the right vtable offset for the IMediaFilter functions.
by Alexandre Julliard March 5, 2007

March 5, 2007

Module: wine Branch: master Commit: 5a19e3b7bcf874fb256ba464660b15f235d64d42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a19e3b7bcf874fb256ba4646… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Sat Mar 3 23:16:44 2007 -0800 quartz: Use the right vtable offset for the IMediaFilter functions. --- dlls/quartz/filtergraph.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index db8f5c3..3a4db4f 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -4167,21 +4167,21 @@ static const IMediaEventExVtbl IMediaEventEx_VTable = static HRESULT WINAPI MediaFilter_QueryInterface(IMediaFilter *iface, REFIID riid, LPVOID *ppv) { - ICOM_THIS_MULTI(IFilterGraphImpl, IMediaEventEx_vtbl, iface); + ICOM_THIS_MULTI(IFilterGraphImpl, IMediaFilter_vtbl, iface); return Filtergraph_QueryInterface(This, riid, ppv); } static ULONG WINAPI MediaFilter_AddRef(IMediaFilter *iface) { - ICOM_THIS_MULTI(IFilterGraphImpl, IMediaEventEx_vtbl, iface); + ICOM_THIS_MULTI(IFilterGraphImpl, IMediaFilter_vtbl, iface); return Filtergraph_AddRef(This); } static ULONG WINAPI MediaFilter_Release(IMediaFilter *iface) { - ICOM_THIS_MULTI(IFilterGraphImpl, IMediaEventEx_vtbl, iface); + ICOM_THIS_MULTI(IFilterGraphImpl, IMediaFilter_vtbl, iface); return Filtergraph_Release(This); }

1 0