March 2006 - Wine-commits - list.winehq.org

Tag wine-0.9.9 : Alexandre Julliard : Release 0.9.9
by Alexandre Julliard 02 Mar '06

02 Mar '06

Module: wine Branch: refs/tags/wine-0.9.9 Tag: af1714c70a8e138c4200c7840bdc4913c97b7767 URL: http://source.winehq.org/git/?p=wine.git;a=tag;h=af1714c70a8e138c4200c7840b… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 2 18:16:28 2006 +0100 Release 0.9.9

1 0

Alexandre Julliard : dlls: Remove 16-bit files on make clean.
by Alexandre Julliard 02 Mar '06

02 Mar '06

Module: wine Branch: refs/heads/master Commit: ca21f1541f2df7b7e69f6c19c6b4756c62e6551a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ca21f1541f2df7b7e69f6c1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 2 16:16:31 2006 +0100 dlls: Remove 16-bit files on make clean. --- dlls/Makefile.in | 2 +- dlls/make_dlls | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/Makefile.in b/dlls/Makefile.in index 0e7c6ad..3dafd6c 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -1766,7 +1766,7 @@ uninstall:: -rmdir $(DESTDIR)$(dlldir) clean:: - $(RM) $(IMPORT_SYMLINKS) + $(RM) $(IMPORT_SYMLINKS) $(WIN16_FILES) check test:: $(BUILDSUBDIRS:%=%/__test__) diff --git a/dlls/make_dlls b/dlls/make_dlls index 0f2bc5b..0a9012b 100755 --- a/dlls/make_dlls +++ b/dlls/make_dlls @@ -351,7 +351,7 @@ uninstall:: -rmdir \$(DESTDIR)\$(dlldir) clean:: - \$(RM) \$(IMPORT_SYMLINKS) + \$(RM) \$(IMPORT_SYMLINKS) \$(WIN16_FILES) check test:: \$(BUILDSUBDIRS:%=%/__test__)

1 0

Alexandre Julliard : Fixed some compiler warnings on old gcc versions.
by Alexandre Julliard 02 Mar '06

02 Mar '06

Module: wine Branch: refs/heads/master Commit: c9cc7e33ffaaf9b359d6bccf778e34d1b955a517 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c9cc7e33ffaaf9b359d6bcc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 2 18:03:32 2006 +0100 Fixed some compiler warnings on old gcc versions. --- dlls/dxdiagn/container.c | 2 +- dlls/ole32/ole2.c | 2 +- dlls/ole32/oleobj.c | 2 +- dlls/riched20/editor.c | 2 +- dlls/riched20/tests/editor.c | 12 +++--------- dlls/shell32/tests/shlfolder.c | 2 +- include/ddk/wdm.h | 2 +- server/change.c | 2 +- 8 files changed, 10 insertions(+), 16 deletions(-) diff --git a/dlls/dxdiagn/container.c b/dlls/dxdiagn/container.c index aa15d10..1810269 100644 --- a/dlls/dxdiagn/container.c +++ b/dlls/dxdiagn/container.c @@ -150,7 +150,7 @@ HRESULT WINAPI IDxDiagContainerImpl_GetC hr = IDxDiagContainerImpl_GetChildContainerInternal(pContainer, tmp, &pContainer); if (!SUCCEEDED(hr) || NULL == pContainer) goto on_error; - *cur++; /* go after '.' (just replaced by \0) */ + cur++; /* go after '.' (just replaced by \0) */ tmp = cur; cur = strchrW(tmp, '.'); } diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index beb485e..1c61ff9 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -801,7 +801,7 @@ static HRESULT WINAPI EnumOLEVERB_Next( rgelt->grfAttribs = atolW(pwszAttribs); if (pceltFetched) - *pceltFetched++; + (*pceltFetched)++; This->index++; } return hr; diff --git a/dlls/ole32/oleobj.c b/dlls/ole32/oleobj.c index 78e1ebc..68cc8b8 100644 --- a/dlls/ole32/oleobj.c +++ b/dlls/ole32/oleobj.c @@ -129,7 +129,7 @@ static HRESULT WINAPI EnumOleSTATDATA_Ne rgelt->dwConnection = This->index; if (pceltFetched) - *pceltFetched++; + (*pceltFetched)++; This->index++; } return hr; diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index a07f086..506c706 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2552,7 +2552,7 @@ int ME_AutoURLDetect(ME_TextEditor *edit int sel_min, sel_max; int car_pos = 0; int text_pos=-1; - int URLmin, URLmax; + int URLmin, URLmax = 0; CHARRANGE url; FINDTEXTA ft; CHARFORMAT2W cur_format; diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 8835f08..95cf705 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -621,15 +621,9 @@ static void test_EM_SCROLL() SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM) "a");/* one line of text */ expr = 0x00010000; for (i = 0; i < 4; i++) { - int cmd; - switch (i) { - case 0: cmd = SB_PAGEDOWN; break; - case 1: cmd = SB_PAGEUP; break; - case 2: cmd = SB_LINEDOWN; break; - case 3: cmd = SB_LINEUP; break; - } - - r = SendMessage(hwndRichEdit, EM_SCROLL, cmd, 0); + static const int cmd[4] = { SB_PAGEDOWN, SB_PAGEUP, SB_LINEDOWN, SB_LINEUP }; + + r = SendMessage(hwndRichEdit, EM_SCROLL, cmd[i], 0); y_after = SendMessage(hwndRichEdit, EM_GETFIRSTVISIBLELINE, 0, 0); ok(expr == r, "EM_SCROLL improper return value returned (i == %d). " "Got 0x%08x, expected 0x%08x\n", i, r, expr); diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index ce638e0..25bac9d 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -858,7 +858,7 @@ static void test_SHGetPathFromIDList(voi /* Test if we can get the path from the start menu "program files" PIDL. */ hShell32 = GetModuleHandleA("shell32"); - pSHGetSpecialFolderLocation = (HRESULT(WINAPI*)(HWND,int,LPITEMIDLIST*))GetProcAddress(hShell32, "SHGetSpecialFolderLocation"); + pSHGetSpecialFolderLocation = (void *)GetProcAddress(hShell32, "SHGetSpecialFolderLocation"); hr = pSHGetSpecialFolderLocation(NULL, CSIDL_PROGRAM_FILES, &pidlPrograms); ok(SUCCEEDED(hr), "SHGetFolderLocation failed: 0x%08lx\n", hr); diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index b10a6f1..7c5160c 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -833,7 +833,7 @@ typedef struct _KUSER_SHARED_DATA { union { volatile KSYSTEM_TIME TickCount; volatile ULONG64 TickCountQuad; - }; + } DUMMYUNIONNAME; } KSHARED_USER_DATA, *PKSHARED_USER_DATA; NTSTATUS WINAPI ObCloseHandle(IN HANDLE handle); diff --git a/server/change.c b/server/change.c index cef1c3e..4349d7e 100644 --- a/server/change.c +++ b/server/change.c @@ -942,7 +942,7 @@ static char *get_basename( const char *l while (1) { buffer = malloc( n ); - if (!buffer) break; + if (!buffer) return NULL; r = readlink( link, buffer, n ); if (r < 0)

1 0

Vitaly Lipatov : user: Fix uninitialized rectangle in menu arrow painting.
by Alexandre Julliard 02 Mar '06

02 Mar '06

Module: wine Branch: refs/heads/master Commit: e96f03a1d7780985aa7ad27e4b00ce60643c9ba3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e96f03a1d7780985aa7ad27… Author: Vitaly Lipatov <lav(a)etersoft.ru> Date: Wed Mar 1 20:56:47 2006 +0300 user: Fix uninitialized rectangle in menu arrow painting. --- dlls/user/menu.c | 12 +++++------- 1 files changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/user/menu.c b/dlls/user/menu.c index 673fcc4..a1a1c04 100644 --- a/dlls/user/menu.c +++ b/dlls/user/menu.c @@ -1375,6 +1375,10 @@ static void MENU_DrawMenuItem( HWND hwnd SetBkColor( hdc, GetSysColor( bkgnd ) ); } + TRACE("rect=%s\n", wine_dbgstr_rect( &lpitem->rect)); + rect = lpitem->rect; + MENU_AdjustMenuItemRect(MENU_GetMenu(hmenu), &rect); + if (lpitem->fType & MF_OWNERDRAW) { /* @@ -1399,8 +1403,7 @@ static void MENU_DrawMenuItem( HWND hwnd dis.itemAction = odaction; /* ODA_DRAWENTIRE | ODA_SELECT | ODA_FOCUS; */ dis.hwndItem = (HWND)hmenu; dis.hDC = hdc; - dis.rcItem = lpitem->rect; - MENU_AdjustMenuItemRect(MENU_GetMenu(hmenu), &dis.rcItem); + dis.rcItem = rect; TRACE("Ownerdraw: owner=%p itemID=%d, itemState=%d, itemAction=%d, " "hwndItem=%p, hdc=%p, rcItem=%s\n", hwndOwner, dis.itemID, dis.itemState, dis.itemAction, dis.hwndItem, @@ -1413,13 +1416,8 @@ static void MENU_DrawMenuItem( HWND hwnd return; } - TRACE("rect=%s\n", wine_dbgstr_rect( &lpitem->rect)); - if (menuBar && (lpitem->fType & MF_SEPARATOR)) return; - rect = lpitem->rect; - MENU_AdjustMenuItemRect(MENU_GetMenu(hmenu), &rect); - if (lpitem->fState & MF_HILITE) { if (flat_menu)

1 0

Roderick Colenbrander : wined3d: Opengl 2.x compile fix.
by Alexandre Julliard 02 Mar '06

02 Mar '06

Module: wine Branch: refs/heads/master Commit: f8ed06ea3dbdf0e45786712de0bfc65ef215e364 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f8ed06ea3dbdf0e45786712… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Thu Mar 2 13:27:13 2006 +0100 wined3d: Opengl 2.x compile fix. --- dlls/wined3d/device.c | 15 +++++++++++---- include/wine/wined3d_gl.h | 7 ++++++- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index dd72818..7d8e4f2 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3767,8 +3767,12 @@ HRESULT WINAPI IWineD3DDeviceImpl_SetRen } if(!This->stateBlock->renderState[WINED3DRS_TWOSIDEDSTENCILMODE]) { - glStencilOpSeparate(GL_BACK, stencilFail, depthFail, stencilPass); - checkGLcall("glStencilOpSeparate(GL_BACK,...)"); + if(GL_EXTCALL(glStencilOpSeparate)) { + GL_EXTCALL(glStencilOpSeparate(GL_BACK, stencilFail, depthFail, stencilPass)); + checkGLcall("glStencilOpSeparate(GL_BACK,...)"); + } else { + WARN("Unsupported in local OpenGL implementation: glStencilOpSeparate\n"); + } } else { glStencilOp(stencilFail, depthFail, stencilPass); checkGLcall("glStencilOp(...)"); @@ -3796,8 +3800,11 @@ HRESULT WINAPI IWineD3DDeviceImpl_SetRen } This->stencilfunc = func; if(!This->stateBlock->renderState[WINED3DRS_TWOSIDEDSTENCILMODE]) { - glStencilFuncSeparate(GL_BACK, func, ref, mask); - checkGLcall("glStencilFuncSeparate(GL_BACK,...)"); + if(GL_EXTCALL(glStencilFuncSeparate)) { + GL_EXTCALL(glStencilFuncSeparate(GL_BACK, func, ref, mask)); + checkGLcall("glStencilOpSeparate(GL_BACK,...)"); + } else + WARN("Unsupported in local OpenGL implementation: glStencilFuncSeparate\n"); } else { glStencilFunc(func, ref, mask); checkGLcall("glStencilFunc(...)"); diff --git a/include/wine/wined3d_gl.h b/include/wine/wined3d_gl.h index 200bba1..fa391ba 100644 --- a/include/wine/wined3d_gl.h +++ b/include/wine/wined3d_gl.h @@ -803,7 +803,9 @@ typedef void (APIENTRY * PGLFNBEGINOCCLU typedef void (APIENTRY * PGLFNENDOCCLUSIONQUERYNVPROC) (void); typedef void (APIENTRY * PGLFNGETOCCLUSIONQUERYIVNVPROC) (GLuint id, GLenum pname, GLint *params); typedef void (APIENTRY * PGLFNGETOCCLUSIONQUERYUIVNVPROC) (GLuint id, GLenum pname, GLuint *params); - +/* OpenGL 2.0 */ +typedef void (APIENTRY * PGLFNSTENCILOPSEPARATEPROC) (GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass); +typedef void (APIENTRY * PGLFNSTENCILFUNCSEPARATEPROC) (GLenum face, GLenum func, GLint ref, GLuint mask); /**************************************************** * OpenGL Official Version @@ -1032,6 +1034,9 @@ typedef enum _GL_SupportedExt { USE_GL_FUNC(PGLFNVERTEXATTRIBPOINTERARBPROC, glVertexAttribPointerARB); \ USE_GL_FUNC(PGLFNENABLEVERTEXATTRIBARRAYARBPROC, glEnableVertexAttribArrayARB); \ USE_GL_FUNC(PGLFNDISABLEVERTEXATTRIBARRAYARBPROC, glDisableVertexAttribArrayARB); \ + /* OpenGL 2.0 */ \ + USE_GL_FUNC(PGLFNSTENCILOPSEPARATEPROC, glStencilOpSeparate); \ + USE_GL_FUNC(PGLFNSTENCILFUNCSEPARATEPROC, glStencilFuncSeparate); \ #define GLX_EXT_FUNCS_GEN \ /** GLX_VERSION_1_3 **/ \

1 0

Eric Pouech : winedbg: Bring usage() and .man up to date.
by Alexandre Julliard 02 Mar '06

02 Mar '06

Module: wine Branch: refs/heads/master Commit: 81198f3971ffc60a5742705330daf89ce72b26cb URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=81198f3971ffc60a5742705… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Wed Mar 1 21:05:39 2006 +0100 winedbg: Bring usage() and .man up to date. --- programs/winedbg/winedbg.c | 31 +++++++++++++--- programs/winedbg/winedbg.man.in | 75 ++++++++++++++++++++++++++++----------- 2 files changed, 79 insertions(+), 27 deletions(-) diff --git a/programs/winedbg/winedbg.c b/programs/winedbg/winedbg.c index 99f04ef..6f2fdea 100644 --- a/programs/winedbg/winedbg.c +++ b/programs/winedbg/winedbg.c @@ -450,9 +450,25 @@ static void dbg_init_console(void) SetConsoleTitle("Wine Debugger"); } -static int dbg_winedbg_usage(void) +static int dbg_winedbg_usage(BOOL advanced) { - dbg_printf("Usage: winedbg [--command cmd|--file file|--auto] [--gdb [--no-start] [--with-xterm]] cmdline\n"); + if (advanced) + { + dbg_printf("Usage:\n" + " winedbg cmdline launch process 'cmdline' (as if you were starting\n" + " it with wine) and run WineDbg on it\n" + " winedbg <num> attach to running process of pid <num> and run\n" + " WineDbg on it\n" + " winedbg --gdb cmdline launch process 'cmdline' (as if you were starting\n" + " wine) and run gdb (proxied) on it\n" + " winedbg --gdb <num> attach to running process of pid <num> and run\n" + " gdb (proxied) on it\n" + " winedbg file.mdmp reload the minidump file.mdmp into memory and run\n" + " WineDbg on it\n" + " winedbg --help prints advanced options\n"); + } + else + dbg_printf("Usage:\n\twinedbg [ [ --gdb ] [ prog-name [ prog-args ] | <num> | file.mdmp | --help ]\n"); return -1; } @@ -491,10 +507,13 @@ int main(int argc, char** argv) /* as we don't care about exec name */ argc--; argv++; + if (argc && !strcmp(argv[0], "--help")) + return dbg_winedbg_usage(TRUE); + if (argc && !strcmp(argv[0], "--gdb")) { retv = gdb_main(argc, argv); - if (retv == -1) dbg_winedbg_usage(); + if (retv == -1) dbg_winedbg_usage(FALSE); return retv; } dbg_init_console(); @@ -510,7 +529,7 @@ int main(int argc, char** argv) switch (dbg_active_auto(argc, argv)) { case start_ok: return 0; - case start_error_parse: return dbg_winedbg_usage(); + case start_error_parse: return dbg_winedbg_usage(FALSE); case start_error_init: return -1; } } @@ -547,7 +566,7 @@ int main(int argc, char** argv) argc--; argv++; break; } - return dbg_winedbg_usage(); + return dbg_winedbg_usage(FALSE); } if (!argc) ds = start_ok; else if ((ds = dbg_active_attach(argc, argv)) == start_error_parse && @@ -556,7 +575,7 @@ int main(int argc, char** argv) switch (ds) { case start_ok: break; - case start_error_parse: return dbg_winedbg_usage(); + case start_error_parse: return dbg_winedbg_usage(FALSE); case start_error_init: return -1; } diff --git a/programs/winedbg/winedbg.man.in b/programs/winedbg/winedbg.man.in index 9934547..a064b5c 100644 --- a/programs/winedbg/winedbg.man.in +++ b/programs/winedbg/winedbg.man.in @@ -3,17 +3,32 @@ .SH NAME winedbg \- Wine's debugger .SH SYNOPSIS -.BR "winedbg [" -.RI "[ " " options " "]" -.BR "| --auto |" +.BR "winedbg " +.RI "[" " options " "] [" +.BI "program name" +.RI "[ program arguments ] |" +.BI "pid" +.RI "]" +.PP +.BR "winedbg " .BI "--gdb" -.RI "[" " options " "] ] [" +.RI "[" " options " "] [" .BI "program name" -.RI "[" -.BI "program arguments" -.RI "] |" +.RI "[ program arguments ] |" .BI "pid" .RI "]" +.PP +.BR "winedbg " +.BI "--auto " +.BI "pid" +.PP +.BR "winedbg " +.BI "--minidump " +.RI "[ file.mdmp ]" +.BI "pid" +.PP +.BR "winedbg" +.BI "file.mdmp" .SH DESCRIPTION .B winedbg is a debugger for Wine. It allows: @@ -27,21 +42,32 @@ is a debugger for Wine. It allows: .PP .SH MODES -\fBwinedbg\fR can be used in three modes. The first argument to the +\fBwinedbg\fR can be used in five modes. The first argument to the program determines the mode winedbg will run in. .IP \fBdefault\fR Without any explicit mode, this is standard \fBwinedbg\fR operating mode. \fBwinedbg\fR will act as the front end for the user. +.IP \fB--gdb\fR +\fBwinedbg\fR will be used as a proxy for \fBgdb\fR. \fBgdb\fR will be +the front end for command handling, and \fBwinedbg\fR will proxy all +debugging requests from \fBgdb\fR to the Win32 APIs. .IP \fB--auto\fR -This mode is used when \fBwinedbg\fR is setup in \fIAeDebug\fR +This mode is used when \fBwinedbg\fR is set up in \fIAeDebug\fR registry entry as the default debugger. \fBwinedbg\fR will then display basic information about a crash. This is useful for users who don't want to debug a crash, but rather gather relevant information about the crash to be sent to developers. -.IP \fB--gdb\fR -\fBwinedbg\fR will be used as a proxy for \fBgdb\fR. \fBgdb\fR will be -the front end for command handling, and \fBwinedbg\fR will proxy all -debugging requests from \fBgdb\fR to the Win32 APIs. +.IP \fB--minidump\fR +This mode is similar to the \fB--auto\fR one, except that instead of +printing the information on the screen (as \fB--auto\fR does), it's +saved into a minidump file. The name of the file is either passed on +the command line, or generated by \fBWineDbg\fR when none is given. +This file could later on be reloaded into \fBwinedbg\fR for further +examination. +.IP \fBfile.mdmp\fR +This mode allows to reload into \fBwinedbg\fR the state of a debuggee +which has been saved into a minidump file. See either the \fBminidump\fR +command below, or the \fB--minidump mode\fR. .SH OPTIONS When in \fBdefault\fR mode, the following options are available: @@ -58,7 +84,8 @@ will exit. When in \fBgdb\fR proxy mode, the following options are available: .PP -.IP \fI--no-start\fR \fBgdb\fR will not be automatically +.IP \fI--no-start\fR +\fBgdb\fR will not be automatically started. Relevant information for starting \fBgdb\fR are printed on screen. This is somehow useful when not directly using \fBgdb\fR but some graphical front-ends, like \fBddd\fR or \fBkgbd\fR. @@ -82,7 +109,7 @@ If nothing is specified, you will enter nor attached process. You'll have to do the job yourself. .SH COMMANDS -.SS Default mode: +.SS Default mode, and while reloading a minidump file: .PP Most of commands used in \fBwinedbg\fR are similar to the ones from \fBgdb\fR. Please refer to the \fBgdb\fR documentations for some more @@ -147,7 +174,7 @@ breakpoint isn't triggered. Adds a breakpoint at address \fBN\fR .IP \fBbreak\ <id>\fR Adds a breakpoint at the address of symbol \fB<id>\fR -.IP \fBbreak <id> N\fR +.IP \fBbreak\ <id>\ N\fR Adds a breakpoint at the line \fBN\fR inside symbol \fB<id>\fR. .IP \fBbreak\ N\fR Adds a breakpoint at line \fBN\fR of current source file. @@ -183,7 +210,7 @@ Goes up \fBN\fR frames in current thread Goes down one frame in current thread's stack .IP \fBdn\ N\fR Goes down \fBN\fR frames in current thread's stack -.IP \fBframe N\fR +.IP \fBframe\ N\fR Sets \fBN\fR as the current frame for current thread's stack. .IP \fBinfo\ locals\fR Prints information on local variables for current function frame. @@ -303,6 +330,12 @@ When specifying an identifier \fB<id>\fR this name exist, the debugger will prompt for the symbol you want to use. Pick up the one you want from its number. .PP +\fIMisc.\fR +.PP +.IP \fBminidump\ file.mdmp\fR +saves the debugging context of the debuggee into a minidump file called +file.mdmp +.PP \fIInformation on Wine's internals\fR .IP \fBinfo\ class\fR Lists all Windows' class registered in Wine @@ -317,7 +350,7 @@ Prints information on module at address Prints the value of the CPU registers .IP \fBinfo\ segment\fR Lists all allocated segments (i386 only) -.IP \fBinfo\ segment N\fR +.IP \fBinfo\ segment\ N\fR Prints information on segment \fBN\fR (i386 only) .IP \fBinfo\ stack\fR Prints the values on top of the stack @@ -355,12 +388,12 @@ However, a few Wine's extension are avai \fBmonitor\fR command: .IP \fBmonitor\ wnd\fR Lists all window in the Wine session -.IP \fBmonitor proc\fR +.IP \fBmonitor\ proc\fR Lists all processes in the Wine session -.IP \fBmonitor mem \fR +.IP \fBmonitor\ mem\fR Displays memory mapping of debugged process .PP -.SS Auto mode: +.SS Auto and minidump modes: .PP Since no user input is possible, no commands are available.

1 0

Mike McCormack : wine.inf: Add a default RelayExclude.
by Alexandre Julliard 02 Mar '06

02 Mar '06

Module: wine Branch: refs/heads/master Commit: af9288d5917f745e7294e42c2f6a6bec8dccdab1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=af9288d5917f745e7294e42… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed Mar 1 00:21:52 2006 +0900 wine.inf: Add a default RelayExclude. --- tools/wine.inf | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf b/tools/wine.inf index b94a3a5..a86ab58 100644 --- a/tools/wine.inf +++ b/tools/wine.inf @@ -152,6 +152,7 @@ HKLM,Software\Microsoft\Windows NT\Curre [Debugger] HKLM,Software\Microsoft\Windows NT\CurrentVersion\AeDebug,"Debugger",2,"winedbg --auto %ld %ld" HKLM,Software\Microsoft\Windows NT\CurrentVersion\AeDebug,"Auto",2,"1" +HKCU,Software\Wine\Debug,"RelayExclude",2,"ntdll.RtlEnterCriticalSection;ntdll.RtlLeaveCriticalSection;kernel32.97;kernel32.98" [Desktop] HKCU,%Desktop%,"FontSmoothing",2,"0"

1 0

Eric Pouech : winedbg: Add ability to reload a minidump.
by Alexandre Julliard 02 Mar '06

02 Mar '06

Module: wine Branch: refs/heads/master Commit: 348067a9bf2e7b2fe1bfceddf0302da8e3c1c041 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=348067a9bf2e7b2fe1bfced… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Wed Mar 1 21:05:35 2006 +0100 winedbg: Add ability to reload a minidump. - now recognize winedbg foo.mdmp on command line - fleshed out tgt_minidump to reload information from minidump --- programs/winedbg/debugger.h | 3 programs/winedbg/stack.c | 11 + programs/winedbg/tgt_minidump.c | 358 +++++++++++++++++++++++++++++++++++++++ programs/winedbg/winedbg.c | 16 ++ 4 files changed, 385 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=348067a9bf2e7b2fe1b…

1 0

Eric Pouech : winedbg: process_io
by Alexandre Julliard 02 Mar '06

02 Mar '06

Module: wine Branch: refs/heads/master Commit: c918e80ed2fded210cdc2766058067e452ee3341 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c918e80ed2fded210cdc276… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Wed Mar 1 21:05:31 2006 +0100 winedbg: process_io - added ability to specify process_io at process creation/attachment time - created a process_io structure for gdbproxy --- programs/winedbg/debugger.h | 4 ++-- programs/winedbg/gdbproxy.c | 11 ++++++++++- programs/winedbg/tgt_active.c | 9 +++++---- programs/winedbg/winedbg.c | 8 +++----- 4 files changed, 20 insertions(+), 12 deletions(-) diff --git a/programs/winedbg/debugger.h b/programs/winedbg/debugger.h index 68cf2a6..5114138 100644 --- a/programs/winedbg/debugger.h +++ b/programs/winedbg/debugger.h @@ -375,6 +375,7 @@ extern void dbg_wait_next_ex extern enum dbg_start dbg_active_attach(int argc, char* argv[]); extern enum dbg_start dbg_active_launch(int argc, char* argv[]); extern enum dbg_start dbg_active_auto(int argc, char* argv[]); +extern BOOL dbg_attach_debuggee(DWORD pid, BOOL cofe, BOOL wfe); /* tgt_minidump.c */ extern void minidump_write(const char*, const EXCEPTION_RECORD*); @@ -401,9 +402,8 @@ extern int dbg_printf(const char extern int dbg_printf(const char* format, ...); #endif extern const struct dbg_internal_var* dbg_get_internal_var(const char*); -extern BOOL dbg_attach_debuggee(DWORD pid, BOOL cofe, BOOL wfe); extern BOOL dbg_interrupt_debuggee(void); -extern struct dbg_process* dbg_add_process(DWORD pid, HANDLE h); +extern struct dbg_process* dbg_add_process(const struct be_process_io* pio, DWORD pid, HANDLE h); extern void dbg_set_process_name(struct dbg_process* p, const char* name); extern struct dbg_process* dbg_get_process(DWORD pid); extern void dbg_del_process(struct dbg_process* p); diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index ade801c..76496ca 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -102,6 +102,8 @@ struct gdb_context unsigned long wine_segs[3]; /* load addresses of the ELF wine exec segments (text, bss and data) */ }; +static struct be_process_io be_process_gdbproxy_io; + /* =============================================== * * B A S I C M A N I P U L A T I O N S * * =============================================== * @@ -444,7 +446,7 @@ static void handle_debug_event(struct gd switch (de->dwDebugEventCode) { case CREATE_PROCESS_DEBUG_EVENT: - gdbctx->process = dbg_add_process(de->dwProcessId, + gdbctx->process = dbg_add_process(&be_process_gdbproxy_io, de->dwProcessId, de->u.CreateProcessInfo.hProcess); if (!gdbctx->process) break; memory_get_string_indirect(gdbctx->process, @@ -2278,3 +2280,10 @@ int gdb_main(int argc, char* argv[]) return gdb_remote(gdb_flags); return -1; } + +static struct be_process_io be_process_gdbproxy_io = +{ + NULL, /* we shouldn't use close_process() in gdbproxy */ + ReadProcessMemory, + WriteProcessMemory +}; diff --git a/programs/winedbg/tgt_active.c b/programs/winedbg/tgt_active.c index a52d902..d4eaade 100644 --- a/programs/winedbg/tgt_active.c +++ b/programs/winedbg/tgt_active.c @@ -33,6 +33,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(winedbg); static char* dbg_last_cmd_line; +static struct be_process_io be_process_active_io; static void dbg_init_current_process(void) { @@ -72,7 +73,7 @@ BOOL dbg_attach_debuggee(DWORD pid, BOOL { DEBUG_EVENT de; - if (!(dbg_curr_process = dbg_add_process(pid, 0))) return FALSE; + if (!(dbg_curr_process = dbg_add_process(&be_process_active_io, pid, 0))) return FALSE; if (!DebugActiveProcess(pid)) { @@ -436,7 +437,7 @@ static unsigned dbg_handle_debug_event(D break; case CREATE_PROCESS_DEBUG_EVENT: - dbg_curr_process = dbg_add_process(de->dwProcessId, + dbg_curr_process = dbg_add_process(&be_process_active_io, de->dwProcessId, de->u.CreateProcessInfo.hProcess); if (dbg_curr_process == NULL) { @@ -698,7 +699,7 @@ static unsigned dbg_start_debuggee(LPSTR return TRUE; } dbg_curr_pid = info.dwProcessId; - if (!(dbg_curr_process = dbg_add_process(dbg_curr_pid, 0))) return FALSE; + if (!(dbg_curr_process = dbg_add_process(&be_process_active_io, dbg_curr_pid, 0))) return FALSE; dbg_wait_for_first_exception(); return TRUE; @@ -920,7 +921,7 @@ static BOOL tgt_process_active_close_pro return TRUE; } -struct be_process_io be_process_active_io = +static struct be_process_io be_process_active_io = { tgt_process_active_close_process, ReadProcessMemory, diff --git a/programs/winedbg/winedbg.c b/programs/winedbg/winedbg.c index 472d365..4c2ae00 100644 --- a/programs/winedbg/winedbg.c +++ b/programs/winedbg/winedbg.c @@ -250,11 +250,8 @@ struct dbg_process* dbg_get_process( return p; } -struct dbg_process* dbg_add_process(DWORD pid, HANDLE h) +struct dbg_process* dbg_add_process(const struct be_process_io* pio, DWORD pid, HANDLE h) { - /* FIXME: temporary */ - extern struct be_process_io be_process_active_io; - struct dbg_process* p; if ((p = dbg_get_process(pid))) @@ -266,6 +263,7 @@ struct dbg_process* dbg_add_process(DWOR else { p->handle = h; + p->process_io = pio; p->imageName = NULL; } return p; @@ -274,7 +272,7 @@ struct dbg_process* dbg_add_process(DWOR if (!(p = HeapAlloc(GetProcessHeap(), 0, sizeof(struct dbg_process)))) return NULL; p->handle = h; p->pid = pid; - p->process_io = &be_process_active_io; + p->process_io = pio; p->imageName = NULL; p->threads = NULL; p->continue_on_first_exception = FALSE;

1 0

Eric Pouech : winedbg: main_loop.
by Alexandre Julliard 02 Mar '06

02 Mar '06

Module: wine Branch: refs/heads/master Commit: f29d084c37bb812ffd07e6792a142e792a0a4bfe URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f29d084c37bb812ffd07e67… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Wed Mar 1 21:05:28 2006 +0100 winedbg: main_loop. - split dbg_main_loop in two parts (one for finishing the debuggee attachment, the second one really for handling the main loop) - removed now longer needed dbg_main_loop --- programs/winedbg/debugger.h | 2 -- programs/winedbg/tgt_active.c | 33 +++++++++++++++------------------ programs/winedbg/winedbg.c | 6 ++++-- 3 files changed, 19 insertions(+), 22 deletions(-) diff --git a/programs/winedbg/debugger.h b/programs/winedbg/debugger.h index 73e53a2..68cf2a6 100644 --- a/programs/winedbg/debugger.h +++ b/programs/winedbg/debugger.h @@ -375,8 +375,6 @@ extern void dbg_wait_next_ex extern enum dbg_start dbg_active_attach(int argc, char* argv[]); extern enum dbg_start dbg_active_launch(int argc, char* argv[]); extern enum dbg_start dbg_active_auto(int argc, char* argv[]); - /* temporary for tgt_active.c */ -extern unsigned dbg_main_loop(HANDLE); /* tgt_minidump.c */ extern void minidump_write(const char*, const EXCEPTION_RECORD*); diff --git a/programs/winedbg/tgt_active.c b/programs/winedbg/tgt_active.c index e778c3d..a52d902 100644 --- a/programs/winedbg/tgt_active.c +++ b/programs/winedbg/tgt_active.c @@ -644,7 +644,7 @@ void dbg_wait_next_exception(DWORD cont, dbg_curr_thread->exec_count); } -/*static*/ unsigned dbg_main_loop(HANDLE hFile) +static void dbg_wait_for_first_exception(void) { DEBUG_EVENT de; @@ -656,10 +656,6 @@ void dbg_wait_next_exception(DWORD cont, { if (dbg_handle_debug_event(&de)) break; } - dbg_interactiveP = TRUE; - parser_handle(hFile); - - return 0; } static unsigned dbg_start_debuggee(LPSTR cmdLine) @@ -703,6 +699,7 @@ static unsigned dbg_start_debuggee(LPSTR } dbg_curr_pid = info.dwProcessId; if (!(dbg_curr_process = dbg_add_process(dbg_curr_pid, 0))) return FALSE; + dbg_wait_for_first_exception(); return TRUE; } @@ -754,17 +751,12 @@ enum dbg_start dbg_active_attach(int ar /* try the form <myself> pid */ if (argc == 1 && str2int(argv[0], &pid) && pid != 0) { - if (dbg_attach_debuggee(pid, FALSE, FALSE)) - { - dbg_curr_pid = pid; - return start_ok; - } - return start_error_init; + if (!dbg_attach_debuggee(pid, FALSE, FALSE)) + return start_error_init; } - /* try the form <myself> pid evt (Win32 JIT debugger) */ - if (argc == 2 && str2int(argv[0], &pid) && pid != 0 && - str2int(argv[1], &evt) && evt != 0) + else if (argc == 2 && str2int(argv[0], &pid) && pid != 0 && + str2int(argv[1], &evt) && evt != 0) { if (!dbg_attach_debuggee(pid, TRUE, FALSE)) { @@ -778,10 +770,12 @@ enum dbg_start dbg_active_attach(int ar return start_error_init; } CloseHandle((HANDLE)evt); - dbg_curr_pid = pid; - return start_ok; } - return start_error_parse; + else return start_error_parse; + + dbg_curr_pid = pid; + dbg_wait_for_first_exception(); + return start_ok; } /****************************************************************** @@ -895,7 +889,10 @@ enum dbg_start dbg_active_auto(int argc, } else return start_error_parse; if (hFile == INVALID_HANDLE_VALUE) return start_error_parse; - dbg_main_loop(hFile); + + dbg_interactiveP = TRUE; + parser_handle(hFile); + return start_ok; } diff --git a/programs/winedbg/winedbg.c b/programs/winedbg/winedbg.c index cd40734..472d365 100644 --- a/programs/winedbg/winedbg.c +++ b/programs/winedbg/winedbg.c @@ -550,11 +550,13 @@ int main(int argc, char** argv) case start_error_init: return -1; } - retv = dbg_main_loop(hFile); + dbg_interactiveP = TRUE; + parser_handle(hFile); + while (dbg_process_list) dbg_process_list->process_io->close_process(dbg_process_list, TRUE); dbg_save_internal_vars(); - return retv; + return 0; }

1 0