August 2006 - Wine-Commits - list.winehq.org

Frank Richter : user: Initialize size of nonclients struct in load_nonclient_metrics.
by Alexandre Julliard Aug. 14, 2006

Aug. 14, 2006

Module: wine Branch: master Commit: e1e02dfcc2b4f073feb8c81d3c45f6724bae7a44 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e1e02dfcc2b4f073feb8c81… Author: Frank Richter <frank.richter(a)gmail.com> Date: Mon Aug 14 20:09:50 2006 +0200 user: Initialize size of nonclients struct in load_nonclient_metrics. --- dlls/user/sysparams.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/user/sysparams.c b/dlls/user/sysparams.c index de0677f..353e5f4 100644 --- a/dlls/user/sysparams.c +++ b/dlls/user/sysparams.c @@ -1026,6 +1026,7 @@ static void load_nonclient_metrics(void) NONCLIENTMETRICSW ncm; INT r; + ncm.cbSize = sizeof (ncm); if (RegOpenKeyExW (HKEY_CURRENT_USER, METRICS_REGKEY, 0, KEY_QUERY_VALUE, &hkey) != ERROR_SUCCESS) hkey = 0;

1 0

Alexandre Julliard : libwine: Also set the current library version for MacOS.
by Alexandre Julliard Aug. 14, 2006

Aug. 14, 2006

Module: wine Branch: master Commit: 946b84d96c61b525cb92d1d0b455ec50dbf6f2dc URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=946b84d96c61b525cb92d1d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 14 20:45:32 2006 +0200 libwine: Also set the current library version for MacOS. --- configure | 2 +- configure.ac | 2 +- libs/wine/Makefile.in | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/configure b/configure index d8c326a..847cb4f 100755 --- a/configure +++ b/configure @@ -17082,7 +17082,7 @@ echo "${ECHO_T}$ac_cv_c_dll_macho" >&6; then LIBEXT="dylib" LDDLLFLAGS="-bundle -multiply_defined suppress" - LDSHARED="\$(CC) -dynamiclib -install_name @executable_path/\`\$(RELPATH) \$(bindir) \$(libdir)\`/\$(DYNAME) \$(SOVERSION:%=-compatibility_version %)" + LDSHARED="\$(CC) -dynamiclib -install_name @executable_path/\`\$(RELPATH) \$(bindir) \$(libdir)\`/\$(DYNAME)" STRIP="$STRIP -u -r" COREFOUNDATIONLIB="-framework CoreFoundation" diff --git a/configure.ac b/configure.ac index c5e6bb4..1c8477d 100644 --- a/configure.ac +++ b/configure.ac @@ -1151,7 +1151,7 @@ case $host_os in then LIBEXT="dylib" LDDLLFLAGS="-bundle -multiply_defined suppress" - LDSHARED="\$(CC) -dynamiclib -install_name @executable_path/\`\$(RELPATH) \$(bindir) \$(libdir)\`/\$(DYNAME) \$(SOVERSION:%=-compatibility_version %)" + LDSHARED="\$(CC) -dynamiclib -install_name @executable_path/\`\$(RELPATH) \$(bindir) \$(libdir)\`/\$(DYNAME)" STRIP="$STRIP -u -r" dnl declare needed frameworks AC_SUBST(COREFOUNDATIONLIB,"-framework CoreFoundation") diff --git a/libs/wine/Makefile.in b/libs/wine/Makefile.in index 5ad4bc6..c206b88 100644 --- a/libs/wine/Makefile.in +++ b/libs/wine/Makefile.in @@ -131,8 +131,10 @@ libwine.a: wine.def libwine.dll: $(OBJS) wine.def Makefile.in $(DLLWRAP) --def $(SRCDIR)/wine.def -o $@ $(OBJS) $(EXTRALIBS) +DYLIB_LDFLAGS = -compatibility_version $(SOVERSION) -current_version $(VERSION) + libwine.$(VERSION).dylib: $(OBJS) $(RELPATH) Makefile.in - $(LDSHARED) $(OBJS) $(EXTRALIBS) $(LDFLAGS) $(LIBS) -o $@ + $(LDSHARED) $(DYLIB_LDFLAGS) $(OBJS) $(EXTRALIBS) $(LDFLAGS) $(LIBS) -o $@ libwine.$(SOVERSION).dylib: libwine.$(VERSION).dylib $(RM) $@ && $(LN_S) libwine.$(VERSION).dylib $@

1 0

Alexandre Julliard : configure: Suppress multiple definitions warnings from the MacOS linker.
by Alexandre Julliard Aug. 14, 2006

Aug. 14, 2006

Module: wine Branch: master Commit: 78bd1948a640af9b90f1b32fcabc1692845ebb54 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=78bd1948a640af9b90f1b32… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 14 20:42:56 2006 +0200 configure: Suppress multiple definitions warnings from the MacOS linker. --- configure | 14 +++++++++----- configure.ac | 2 +- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/configure b/configure index f61d4d0..d8c326a 100755 --- a/configure +++ b/configure @@ -2422,7 +2422,7 @@ # So ignore a value of `no', otherwise t # in a Makefile. We should not override ac_cv_exeext if it was cached, # so that the user can short-circuit this test for compilers unknown to # Autoconf. -for ac_file in $ac_files +for ac_file in $ac_files '' do test -f "$ac_file" || continue case $ac_file in @@ -2450,6 +2450,12 @@ done test "$ac_cv_exeext" = no && ac_cv_exeext= else + ac_file='' +fi + +{ echo "$as_me:$LINENO: result: $ac_file" >&5 +echo "${ECHO_T}$ac_file" >&6; } +if test -z "$ac_file"; then echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -2461,8 +2467,6 @@ See \`config.log' for more details." >&2 fi ac_exeext=$ac_cv_exeext -{ echo "$as_me:$LINENO: result: $ac_file" >&5 -echo "${ECHO_T}$ac_file" >&6; } # Check that the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. @@ -17077,7 +17081,7 @@ echo "${ECHO_T}$ac_cv_c_dll_macho" >&6; if test "$ac_cv_c_dll_macho" = "yes" then LIBEXT="dylib" - LDDLLFLAGS="-bundle" + LDDLLFLAGS="-bundle -multiply_defined suppress" LDSHARED="\$(CC) -dynamiclib -install_name @executable_path/\`\$(RELPATH) \$(bindir) \$(libdir)\`/\$(DYNAME) \$(SOVERSION:%=-compatibility_version %)" STRIP="$STRIP -u -r" COREFOUNDATIONLIB="-framework CoreFoundation" @@ -24801,7 +24805,7 @@ current configuration. Usage: $0 [OPTIONS] [FILE]... -h, --help print this help, then exit - -V, --version print version number, then exit + -V, --version print version number and configuration settings, then exit -q, --quiet do not print progress messages -d, --debug don't remove temporary files --recheck update $as_me by reconfiguring in the same conditions diff --git a/configure.ac b/configure.ac index de11dfa..c5e6bb4 100644 --- a/configure.ac +++ b/configure.ac @@ -1150,7 +1150,7 @@ case $host_os in if test "$ac_cv_c_dll_macho" = "yes" then LIBEXT="dylib" - LDDLLFLAGS="-bundle" + LDDLLFLAGS="-bundle -multiply_defined suppress" LDSHARED="\$(CC) -dynamiclib -install_name @executable_path/\`\$(RELPATH) \$(bindir) \$(libdir)\`/\$(DYNAME) \$(SOVERSION:%=-compatibility_version %)" STRIP="$STRIP -u -r" dnl declare needed frameworks

1 0

Alexandre Julliard : server: Make sure to completely kill processes before returning from a wineserver -k .
by Alexandre Julliard Aug. 14, 2006

Aug. 14, 2006

Module: wine Branch: master Commit: 3a4c04dce412678f227c32723cd39e9163e6668b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3a4c04dce412678f227c327… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 14 20:40:31 2006 +0200 server: Make sure to completely kill processes before returning from a wineserver -k. --- server/request.c | 20 ++++++++++++++------ server/request.h | 2 +- server/signal.c | 3 ++- 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/server/request.c b/server/request.c index fd8e584..ac5a696 100644 --- a/server/request.c +++ b/server/request.c @@ -117,6 +117,7 @@ unsigned int global_error = 0; /* globa struct timeval server_start_time = { 0, 0 }; /* server startup time */ static struct master_socket *master_socket; /* the master socket object */ +static int force_shutdown; /* socket communication static structures */ static struct iovec myiovec; @@ -497,7 +498,7 @@ static void master_socket_poll_event( st { /* this is not supposed to happen */ fprintf( stderr, "wineserver: Error on master socket\n" ); - release_object( sock ); + set_fd_events( sock->fd, -1 ); } else if (event & POLLIN) { @@ -811,14 +812,14 @@ static void close_socket_timeout( void * flush_registry(); /* if a new client is waiting, we keep on running */ - if (check_fd_events( master_socket->fd, POLLIN )) return; + if (!force_shutdown && check_fd_events( master_socket->fd, POLLIN )) return; if (debug_level) fprintf( stderr, "wineserver: exiting (pid=%ld)\n", (long) getpid() ); #ifdef DEBUG_OBJECTS close_objects(); /* shut down everything properly */ #endif - exit(0); + exit( force_shutdown ); } /* close the master socket and stop waiting for new clients */ @@ -835,8 +836,15 @@ void close_master_socket(void) else close_socket_timeout( NULL ); /* close it right away */ } -/* lock/unlock the master socket to stop accepting new clients */ -void lock_master_socket( int locked ) +/* forced shutdown, used for wineserver -k */ +void shutdown_master_socket(void) { - set_fd_events( master_socket->fd, locked ? 0 : POLLIN ); + force_shutdown = 1; + master_socket_timeout = 0; + if (master_socket->timeout) + { + remove_timeout_user( master_socket->timeout ); + close_socket_timeout( NULL ); + } + set_fd_events( master_socket->fd, -1 ); /* stop waiting for new clients */ } diff --git a/server/request.h b/server/request.h index 751473f..aad0387 100644 --- a/server/request.h +++ b/server/request.h @@ -58,7 +58,7 @@ extern void write_reply( struct thread * extern unsigned int get_tick_count(void); extern void open_master_socket(void); extern void close_master_socket(void); -extern void lock_master_socket( int locked ); +extern void shutdown_master_socket(void); extern int wait_for_lock(void); extern int kill_lock_owner( int sig ); diff --git a/server/signal.c b/server/signal.c index 8f638d8..006a470 100644 --- a/server/signal.c +++ b/server/signal.c @@ -38,6 +38,7 @@ #include "file.h" #include "object.h" #include "process.h" #include "thread.h" +#include "request.h" #if defined(linux) && defined(__SIGRTMIN) /* the signal used by linuxthreads as exit signal for clone() threads */ @@ -185,7 +186,7 @@ static void sigint_callback(void) { kill_all_processes( NULL, 1 ); flush_registry(); - exit(1); + shutdown_master_socket(); } /* SIGHUP handler */

1 0

Alexandre Julliard : server: Send a SIGKILL to processes that don' t terminate properly.
by Alexandre Julliard Aug. 14, 2006

Aug. 14, 2006

Module: wine Branch: master Commit: 68e850e602975b4669e7284f4b32b2d4f33b4a32 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=68e850e602975b4669e7284… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 14 20:19:42 2006 +0200 server: Send a SIGKILL to processes that don't terminate properly. --- server/process.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++++-- server/process.h | 2 ++ server/thread.c | 3 +++ 3 files changed, 54 insertions(+), 2 deletions(-) diff --git a/server/process.c b/server/process.c index 3f933fe..733b1c5 100644 --- a/server/process.c +++ b/server/process.c @@ -217,6 +217,38 @@ static void set_process_startup_state( s } } +/* final cleanup once we are sure a process is really dead */ +static void process_died( struct process *process ) +{ + if (debug_level) fprintf( stderr, "%04x: *process killed*\n", process->id ); + release_object( process ); + if (!--running_processes) close_master_socket(); +} + +/* callback for process sigkill timeout */ +static void process_sigkill( void *private ) +{ + struct process *process = private; + + process->sigkill_timeout = NULL; + kill( process->unix_pid, SIGKILL ); + process_died( process ); +} + +/* start the sigkill timer for a process upon exit */ +static void start_sigkill_timer( struct process *process ) +{ + grab_object( process ); + if (process->unix_pid != -1 && process->msg_fd) + { + struct timeval when = current_time; + + add_timeout( &when, 1000 ); + process->sigkill_timeout = add_timeout_user( &when, process_sigkill, process ); + } + else process_died( process ); +} + /* create a new process and its main thread */ /* if the function fails the fd is closed */ struct thread *create_process( int fd, struct thread *parent_thread, int inherit_all ) @@ -234,6 +266,8 @@ struct thread *create_process( int fd, s process->debugger = NULL; process->handles = NULL; process->msg_fd = NULL; + process->sigkill_timeout = NULL; + process->unix_pid = -1; process->exit_code = STILL_ACTIVE; process->running_threads = 0; process->priority = PROCESS_PRIOCLASS_NORMAL; @@ -322,6 +356,8 @@ static void process_destroy( struct obje /* we can't have a thread remaining */ assert( list_empty( &process->thread_list )); + assert( !process->sigkill_timeout ); /* timeout should hold a reference to the process */ + set_process_startup_state( process, STARTUP_ABORTED ); if (process->console) release_object( process->console ); if (process->parent) release_object( process->parent ); @@ -362,7 +398,18 @@ static void process_poll_event( struct f struct process *process = get_fd_user( fd ); assert( process->obj.ops == &process_ops ); - if (event & (POLLERR | POLLHUP)) set_fd_events( fd, -1 ); + if (event & (POLLERR | POLLHUP)) + { + release_object( process->msg_fd ); + process->msg_fd = NULL; + if (process->sigkill_timeout) /* already waiting for it to die */ + { + remove_timeout_user( process->sigkill_timeout ); + process->sigkill_timeout = NULL; + process_died( process ); + } + else kill_process( process, NULL, 0 ); + } else if (event & POLLIN) receive_fd( process ); } @@ -528,8 +575,8 @@ static void process_killed( struct proce destroy_process_classes( process ); remove_process_locks( process ); set_process_startup_state( process, STARTUP_ABORTED ); + start_sigkill_timer( process ); wake_up( &process->obj, 0 ); - if (!--running_processes) close_master_socket(); } /* add a thread to a process running threads list */ diff --git a/server/process.h b/server/process.h index 6edb1e6..c447e2f 100644 --- a/server/process.h +++ b/server/process.h @@ -57,6 +57,8 @@ struct process struct fd *msg_fd; /* fd for sendmsg/recvmsg */ process_id_t id; /* id of the process */ process_id_t group_id; /* group id of the process */ + struct timeout_user *sigkill_timeout; /* timeout for final SIGKILL */ + int unix_pid; /* Unix pid for final SIGKILL */ int exit_code; /* process exit code */ int running_threads; /* number of threads running in this process */ struct timeval start_time; /* absolute time at process start */ diff --git a/server/thread.c b/server/thread.c index 9d9f255..36d1d79 100644 --- a/server/thread.c +++ b/server/thread.c @@ -872,12 +872,15 @@ DECL_HANDLER(init_thread) if (!process->peb) /* first thread, initialize the process too */ { + process->unix_pid = current->unix_pid; process->peb = req->peb; process->ldt_copy = req->ldt_copy; reply->info_size = init_process( current ); } else { + if (process->unix_pid != current->unix_pid) + process->unix_pid = -1; /* can happen with linuxthreads */ if (current->suspend + process->suspend > 0) stop_thread( current ); generate_debug_event( current, CREATE_THREAD_DEBUG_EVENT, req->entry ); }

1 0

Mike McCormack : ole32: Avoid a warning for VT_FILETIME in PropVariantCopy.
by Alexandre Julliard Aug. 14, 2006

Aug. 14, 2006

Module: wine Branch: master Commit: 6c8259fb317df923b9463e68be863e173600506c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6c8259fb317df923b9463e6… Author: Mike McCormack <mike(a)codeweavers.com> Date: Mon Aug 14 18:30:16 2006 +0900 ole32: Avoid a warning for VT_FILETIME in PropVariantCopy. --- dlls/ole32/ole2.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index 31bc5f4..e04095a 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -2690,6 +2690,8 @@ HRESULT WINAPI PropVariantCopy(PROPVARIA switch(pvarSrc->vt) { + case VT_FILETIME: + break; case VT_STREAM: case VT_STREAMED_OBJECT: case VT_STORAGE:

1 0

Eric Pouech : winedbg: Fixed the symbol lookup so that it can really find _foo when looking for foo .
by Alexandre Julliard Aug. 14, 2006

Aug. 14, 2006

Module: wine Branch: master Commit: bd9ba7ec37579505e29dea352e5dc1f843975bb5 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=bd9ba7ec37579505e29dea3… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Sun Aug 13 20:46:58 2006 +0200 winedbg: Fixed the symbol lookup so that it can really find _foo when looking for foo. --- programs/winedbg/symbol.c | 12 ++---------- 1 files changed, 2 insertions(+), 10 deletions(-) diff --git a/programs/winedbg/symbol.c b/programs/winedbg/symbol.c index 9e8ccf4..23f59a6 100644 --- a/programs/winedbg/symbol.c +++ b/programs/winedbg/symbol.c @@ -233,11 +233,7 @@ enum sym_get_lval symbol_get_lvalue(cons * enumeration */ SymSetOptions((opt = SymGetOptions()) | 0x40000000); - if (!SymEnumSymbols(dbg_curr_process->handle, 0, buffer, sgv_cb, (void*)&sgv)) - { - SymSetOptions(opt); - return sglv_unknown; - } + SymEnumSymbols(dbg_curr_process->handle, 0, buffer, sgv_cb, (void*)&sgv); if (!sgv.num && (name[0] != '_')) { @@ -255,11 +251,7 @@ enum sym_get_lval symbol_get_lvalue(cons buffer[2] = '_'; strcpy(&buffer[3], name); } - if (!SymEnumSymbols(dbg_curr_process->handle, 0, buffer, sgv_cb, (void*)&sgv)) - { - SymSetOptions(opt); - return sglv_unknown; - } + SymEnumSymbols(dbg_curr_process->handle, 0, buffer, sgv_cb, (void*)&sgv); } SymSetOptions(opt);

1 0

Eric Pouech : winedbg: Don' t ask for module inspection when calling SymInitialize.
by Alexandre Julliard Aug. 14, 2006

Aug. 14, 2006

Module: wine Branch: master Commit: 588589b8de17873c499dee0ce0e4332a3876d4da URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=588589b8de17873c499dee0… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Sun Aug 13 20:46:45 2006 +0200 winedbg: Don't ask for module inspection when calling SymInitialize. --- programs/winedbg/Makefile.in | 2 +- programs/winedbg/tgt_active.c | 51 +++++++++++++++++++++++++++++++++-------- 2 files changed, 42 insertions(+), 11 deletions(-) diff --git a/programs/winedbg/Makefile.in b/programs/winedbg/Makefile.in index 2dc3e45..480f025 100644 --- a/programs/winedbg/Makefile.in +++ b/programs/winedbg/Makefile.in @@ -4,7 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = winedbg.exe APPMODE = -mconsole -IMPORTS = dbghelp advapi32 kernel32 ntdll +IMPORTS = psapi dbghelp advapi32 kernel32 ntdll DELAYIMPORTS = user32 C_SRCS = \ diff --git a/programs/winedbg/tgt_active.c b/programs/winedbg/tgt_active.c index 8da61ff..3a1fb4f 100644 --- a/programs/winedbg/tgt_active.c +++ b/programs/winedbg/tgt_active.c @@ -26,6 +26,7 @@ #include <string.h> #include <stdarg.h> #include "debugger.h" +#include "psapi.h" #include "winternl.h" #include "wine/debug.h" #include "wine/exception.h" @@ -405,6 +406,34 @@ static DWORD dbg_handle_exception(const static BOOL tgt_process_active_close_process(struct dbg_process* pcs, BOOL kill); +static void fetch_module_name(void* name_addr, BOOL unicode, void* mod_addr, + char* buffer, size_t bufsz, BOOL is_pcs) +{ + memory_get_string_indirect(dbg_curr_process, name_addr, unicode, buffer, bufsz); + if (!buffer[0] && + !GetModuleFileNameExA(dbg_curr_process->handle, mod_addr, buffer, bufsz)) + { + if (is_pcs) + { + HMODULE h; + WORD (WINAPI *gpif)(HANDLE, LPSTR, DWORD); + + /* On Windows, when we get the process creation debug event for a process + * created by winedbg, the modules' list is not initialized yet. Hence, + * GetModuleFileNameExA (on the main module) will generate an error. + * Psapi (starting on XP) provides GetProcessImageFileName() which should + * give us the expected result + */ + if (!(h = GetModuleHandleA("psapi")) || + !(gpif = (void*)GetProcAddress(h, "GetProcessImageFileName")) || + !(gpif)(dbg_curr_process->handle, buffer, bufsz)) + snprintf(buffer, bufsz, "Process_%08lx", dbg_curr_pid); + } + else + snprintf(buffer, bufsz, "DLL_%p", mod_addr); + } +} + static unsigned dbg_handle_debug_event(DEBUG_EVENT* de) { char buffer[256]; @@ -456,11 +485,10 @@ static unsigned dbg_handle_debug_event(D WINE_ERR("Couldn't create process\n"); break; } - memory_get_string_indirect(dbg_curr_process, - de->u.CreateProcessInfo.lpImageName, - de->u.CreateProcessInfo.fUnicode, - buffer, sizeof(buffer)); - if (!buffer[0]) strcpy(buffer, "<Debugged Process>"); + fetch_module_name(de->u.CreateProcessInfo.lpImageName, + de->u.CreateProcessInfo.fUnicode, + de->u.CreateProcessInfo.lpBaseOfImage, + buffer, sizeof(buffer), TRUE); WINE_TRACE("%08lx:%08lx: create process '%s'/%p @%08lx (%ld<%ld>)\n", de->dwProcessId, de->dwThreadId, @@ -470,8 +498,11 @@ static unsigned dbg_handle_debug_event(D de->u.CreateProcessInfo.nDebugInfoSize); dbg_set_process_name(dbg_curr_process, buffer); - if (!SymInitialize(dbg_curr_process->handle, NULL, TRUE)) + if (!SymInitialize(dbg_curr_process->handle, NULL, FALSE)) dbg_printf("Couldn't initiate DbgHelp\n"); + if (!SymLoadModule(dbg_curr_process->handle, de->u.CreateProcessInfo.hFile, buffer, NULL, + (unsigned long)de->u.CreateProcessInfo.lpBaseOfImage, 0)) + dbg_printf("couldn't load main module (%lx)\n", GetLastError()); WINE_TRACE("%08lx:%08lx: create thread I @%08lx\n", de->dwProcessId, de->dwThreadId, @@ -550,10 +581,10 @@ static unsigned dbg_handle_debug_event(D WINE_ERR("Unknown thread\n"); break; } - memory_get_string_indirect(dbg_curr_process, - de->u.LoadDll.lpImageName, - de->u.LoadDll.fUnicode, - buffer, sizeof(buffer)); + fetch_module_name(de->u.LoadDll.lpImageName, + de->u.LoadDll.fUnicode, + de->u.LoadDll.lpBaseOfDll, + buffer, sizeof(buffer), FALSE); WINE_TRACE("%08lx:%08lx: loads DLL %s @%08lx (%ld<%ld>)\n", de->dwProcessId, de->dwThreadId,

1 0

Eric Pouech : winedbg: Native dbghelp can modify the passed debug context in StackWalk, so guard against it.
by Alexandre Julliard Aug. 14, 2006

Aug. 14, 2006

Module: wine Branch: master Commit: 84650ebbb2cc69dd657b1935674011da3ddcdfed URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=84650ebbb2cc69dd657b193… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Sun Aug 13 20:46:54 2006 +0200 winedbg: Native dbghelp can modify the passed debug context in StackWalk, so guard against it. --- programs/winedbg/stack.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/programs/winedbg/stack.c b/programs/winedbg/stack.c index 70a7a11..dd0877e 100644 --- a/programs/winedbg/stack.c +++ b/programs/winedbg/stack.c @@ -147,6 +147,10 @@ unsigned stack_fetch_frames(void) { STACKFRAME64 sf; unsigned nf = 0; + /* as native stackwalk can modify the context passed to it, simply copy + * it to avoid any damage + */ + CONTEXT ctx = dbg_context; HeapFree(GetProcessHeap(), 0, dbg_curr_thread->frames); dbg_curr_thread->frames = NULL; @@ -163,7 +167,7 @@ unsigned stack_fetch_frames(void) } while (StackWalk64(IMAGE_FILE_MACHINE_I386, dbg_curr_process->handle, - dbg_curr_thread->handle, &sf, &dbg_context, stack_read_mem, + dbg_curr_thread->handle, &sf, &ctx, stack_read_mem, SymFunctionTableAccess64, SymGetModuleBase64, NULL)) { dbg_curr_thread->frames = dbg_heap_realloc(dbg_curr_thread->frames,

1 0

Kai Blin : secur32: Clean up AcceptSecurityContext ( reduce indent and duplication).
by Alexandre Julliard Aug. 14, 2006

Aug. 14, 2006

Module: wine Branch: master Commit: 13050ac11f8c74860e32b15ca47d465661c4a60d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=13050ac11f8c74860e32b15… Author: Kai Blin <kai.blin(a)gmail.com> Date: Mon Aug 14 17:32:33 2006 +0200 secur32: Clean up AcceptSecurityContext (reduce indent and duplication). --- dlls/secur32/ntlm.c | 375 ++++++++++++++++++++++++--------------------------- 1 files changed, 176 insertions(+), 199 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=13050ac11f8c74860e3…

1 0