February 2006 - Wine-Commits

Vitaly Budovski : dinput: Return an error if both DISCL_EXCLUSIVE and DISCL_BACKGROUND are set.
by Alexandre Julliard Feb. 28, 2006

Feb. 28, 2006

Module: wine Branch: refs/heads/master Commit: 6a0e711681b6f516fab5464483bf73eef79adb9c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6a0e711681b6f516fab5464… Author: Vitaly Budovski <vbudovsk(a)cs.rmit.edu.au> Date: Tue Feb 21 22:00:00 2006 +1100 dinput: Return an error if both DISCL_EXCLUSIVE and DISCL_BACKGROUND are set. --- dlls/dinput/mouse.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index 6570d1f..9b06b57 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -368,6 +368,10 @@ static HRESULT WINAPI SysMouseAImpl_SetC _dump_cooperativelevel_DI(dwflags); } + if (dwflags & DISCL_EXCLUSIVE && dwflags & DISCL_BACKGROUND) { + return DIERR_UNSUPPORTED; + } + /* Store the window which asks for the mouse */ if (!hwnd) hwnd = GetDesktopWindow();

1 0

Vitaly Budovski : wined3d: Implemented WINED3DRS_CCW_STENCIL* render states .
by Alexandre Julliard Feb. 28, 2006

Feb. 28, 2006

Module: wine Branch: refs/heads/master Commit: 63585380a9a8caf4379d70b4759c7054200c983c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=63585380a9a8caf4379d70b… Author: Vitaly Budovski <vbudovsk(a)cs.rmit.edu.au> Date: Sun Feb 26 01:53:48 2006 +1100 wined3d: Implemented WINED3DRS_CCW_STENCIL* render states. --- dlls/wined3d/device.c | 70 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 70 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 7130c55..dd72818 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3729,11 +3729,81 @@ HRESULT WINAPI IWineD3DDeviceImpl_SetRen case WINED3DRS_ADAPTIVETESS_Z : case WINED3DRS_ADAPTIVETESS_W : case WINED3DRS_ENABLEADAPTIVETESSELLATION : + { + FIXME("(%p)->(%d,%ld) not handled yet\n", This, State, Value); + break; + } case WINED3DRS_TWOSIDEDSTENCILMODE : + { + if(Value) { + TRACE("Two-sided stencil mode enabled\n"); + } else { + TRACE("Two-sided stencil mode disabled\n"); + } + break; + } case WINED3DRS_CCW_STENCILFAIL : case WINED3DRS_CCW_STENCILZFAIL : case WINED3DRS_CCW_STENCILPASS : + { + GLint stencilFail; + GLint depthFail; + GLint stencilPass; + + GLint action = StencilOp(Value); + + glGetIntegerv(GL_STENCIL_FAIL, &stencilFail); + glGetIntegerv(GL_STENCIL_PASS_DEPTH_FAIL, &depthFail); + glGetIntegerv(GL_STENCIL_PASS_DEPTH_PASS, &stencilPass); + + if(WINED3DRS_CCW_STENCILFAIL == State) { + stencilFail = action; + } + else if(WINED3DRS_CCW_STENCILZFAIL == State) { + depthFail = action; + } + else if(WINED3DRS_CCW_STENCILPASS == State) { + stencilPass = action; + } + + if(!This->stateBlock->renderState[WINED3DRS_TWOSIDEDSTENCILMODE]) { + glStencilOpSeparate(GL_BACK, stencilFail, depthFail, stencilPass); + checkGLcall("glStencilOpSeparate(GL_BACK,...)"); + } else { + glStencilOp(stencilFail, depthFail, stencilPass); + checkGLcall("glStencilOp(...)"); + } + break; + } case WINED3DRS_CCW_STENCILFUNC : + { + GLint func; + GLint ref = This->stateBlock->renderState[WINED3DRS_STENCILREF]; + GLuint mask = This->stateBlock->renderState[WINED3DRS_STENCILMASK]; + + func = GL_ALWAYS; + switch ((D3DCMPFUNC)Value) { + case D3DCMP_NEVER: func = GL_NEVER; break; + case D3DCMP_LESS: func = GL_LESS; break; + case D3DCMP_EQUAL: func = GL_EQUAL; break; + case D3DCMP_LESSEQUAL: func = GL_LEQUAL; break; + case D3DCMP_GREATER: func = GL_GREATER; break; + case D3DCMP_NOTEQUAL: func = GL_NOTEQUAL; break; + case D3DCMP_GREATEREQUAL: func = GL_GEQUAL; break; + case D3DCMP_ALWAYS: func = GL_ALWAYS; break; + default: + FIXME("Unrecognized/Unhandled D3DCMPFUNC value %ld\n", Value); + } + This->stencilfunc = func; + if(!This->stateBlock->renderState[WINED3DRS_TWOSIDEDSTENCILMODE]) { + glStencilFuncSeparate(GL_BACK, func, ref, mask); + checkGLcall("glStencilFuncSeparate(GL_BACK,...)"); + } else { + glStencilFunc(func, ref, mask); + checkGLcall("glStencilFunc(...)"); + } + break; + } case WINED3DRS_COLORWRITEENABLE1 : case WINED3DRS_COLORWRITEENABLE2 : case WINED3DRS_COLORWRITEENABLE3 :

1 0

Vitaly Budovski : wined3d: Implemented WINED3DRS_SCISSORTESTENABLE.
by Alexandre Julliard Feb. 28, 2006

Feb. 28, 2006

Module: wine Branch: refs/heads/master Commit: 5c8c0059abe7715853d9a9ef28eb5a3cc75e988f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5c8c0059abe7715853d9a9e… Author: Vitaly Budovski <vbudovsk(a)cs.rmit.edu.au> Date: Sat Feb 25 20:57:31 2006 +1100 wined3d: Implemented WINED3DRS_SCISSORTESTENABLE. --- dlls/wined3d/device.c | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 4bd1949..7130c55 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3674,6 +3674,17 @@ HRESULT WINAPI IWineD3DDeviceImpl_SetRen } break; } + case WINED3DRS_SCISSORTESTENABLE : + { + if(Value) { + glEnable(GL_SCISSOR_TEST); + checkGLcall("glEnable(GL_SCISSOR_TEST)"); + } else { + glDisable(GL_SCISSOR_TEST); + checkGLcall("glDisable(GL_SCISSOR_TEST)"); + } + break; + } case WINED3DRS_SLOPESCALEDEPTHBIAS : { if(Value) { @@ -3711,7 +3722,6 @@ HRESULT WINAPI IWineD3DDeviceImpl_SetRen case WINED3DRS_POSITIONORDER : case WINED3DRS_NORMALORDER : /* Direct3D9 render states */ - case WINED3DRS_SCISSORTESTENABLE : case WINED3DRS_MINTESSELLATIONLEVEL : case WINED3DRS_MAXTESSELLATIONLEVEL : case WINED3DRS_ADAPTIVETESS_X :

1 0

Vitaly Budovski : wined3d: Implemented WINED3DRS_SLOPESCALEDEPTHBIAS.
by Alexandre Julliard Feb. 28, 2006

Feb. 28, 2006

Module: wine Branch: refs/heads/master Commit: 4b10288b5b040ee96e0952c16d5ba4e3915830d6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4b10288b5b040ee96e0952c… Author: Vitaly Budovski <vbudovsk(a)cs.rmit.edu.au> Date: Sat Feb 25 21:00:52 2006 +1100 wined3d: Implemented WINED3DRS_SLOPESCALEDEPTHBIAS. --- dlls/wined3d/device.c | 15 ++++++++++++++- 1 files changed, 14 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 7db6021..4bd1949 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3674,6 +3674,20 @@ HRESULT WINAPI IWineD3DDeviceImpl_SetRen } break; } + case WINED3DRS_SLOPESCALEDEPTHBIAS : + { + if(Value) { + tmpvalue.d = Value; + glEnable(GL_POLYGON_OFFSET_FILL); + checkGLcall("glEnable(GL_POLYGON_OFFSET_FILL)"); + glPolygonOffset(tmpvalue.f, *((float*)&This->stateBlock->renderState[WINED3DRS_DEPTHBIAS])); + checkGLcall("glPolygonOffset(...)"); + } else { + glDisable(GL_POLYGON_OFFSET_FILL); + checkGLcall("glDisable(GL_POLYGON_OFFSET_FILL)"); + } + break; + } case WINED3DRS_ANTIALIASEDLINEENABLE : { if(Value) { @@ -3698,7 +3712,6 @@ HRESULT WINAPI IWineD3DDeviceImpl_SetRen case WINED3DRS_NORMALORDER : /* Direct3D9 render states */ case WINED3DRS_SCISSORTESTENABLE : - case WINED3DRS_SLOPESCALEDEPTHBIAS : case WINED3DRS_MINTESSELLATIONLEVEL : case WINED3DRS_MAXTESSELLATIONLEVEL : case WINED3DRS_ADAPTIVETESS_X :

1 0

Vitaly Budovski : wined3d: Implemented WINED3DRS_ANTIALIASEDLINEENABLE.
by Alexandre Julliard Feb. 28, 2006

Feb. 28, 2006

Module: wine Branch: refs/heads/master Commit: c9a1134ce3029e9a88ecc76f528b22a904b4a913 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c9a1134ce3029e9a88ecc76… Author: Vitaly Budovski <vbudovsk(a)cs.rmit.edu.au> Date: Sat Feb 25 20:54:31 2006 +1100 wined3d: Implemented WINED3DRS_ANTIALIASEDLINEENABLE. --- dlls/wined3d/device.c | 17 ++++++++++++++++- 1 files changed, 16 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 7a3edbf..7db6021 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3674,6 +3674,22 @@ HRESULT WINAPI IWineD3DDeviceImpl_SetRen } break; } + case WINED3DRS_ANTIALIASEDLINEENABLE : + { + if(Value) { + glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); + glEnable(GL_BLEND); + checkGLcall("glEnable(GL_BLEND)"); + glEnable(GL_LINE_SMOOTH); + checkGLcall("glEnable(GL_LINE_SMOOTH)"); + } else { + glDisable(GL_BLEND); + checkGLcall("glDisable(GL_BLEND)"); + glDisable(GL_LINE_SMOOTH); + checkGLcall("glDisable(GL_LINE_SMOOTH)"); + } + break; + } case WINED3DRS_MULTISAMPLEMASK : case WINED3DRS_PATCHEDGESTYLE : case WINED3DRS_PATCHSEGMENTS : @@ -3683,7 +3699,6 @@ HRESULT WINAPI IWineD3DDeviceImpl_SetRen /* Direct3D9 render states */ case WINED3DRS_SCISSORTESTENABLE : case WINED3DRS_SLOPESCALEDEPTHBIAS : - case WINED3DRS_ANTIALIASEDLINEENABLE : case WINED3DRS_MINTESSELLATIONLEVEL : case WINED3DRS_MAXTESSELLATIONLEVEL : case WINED3DRS_ADAPTIVETESS_X :

1 0

Vitaly Budovski : wined3d: Added D3D9 render states.
by Alexandre Julliard Feb. 28, 2006

Feb. 28, 2006

Module: wine Branch: refs/heads/master Commit: 64ccecfbab4fe20fcfbc8244bb0ef47353ece419 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=64ccecfbab4fe20fcfbc824… Author: Vitaly Budovski <vbudovsk(a)cs.rmit.edu.au> Date: Sat Feb 25 20:52:44 2006 +1100 wined3d: Added D3D9 render states. --- dlls/wined3d/device.c | 34 ++++++++++++++++++++++++++++++++++ 1 files changed, 34 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 0518c37..7a3edbf 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3680,6 +3680,40 @@ HRESULT WINAPI IWineD3DDeviceImpl_SetRen case WINED3DRS_DEBUGMONITORTOKEN : case WINED3DRS_POSITIONORDER : case WINED3DRS_NORMALORDER : + /* Direct3D9 render states */ + case WINED3DRS_SCISSORTESTENABLE : + case WINED3DRS_SLOPESCALEDEPTHBIAS : + case WINED3DRS_ANTIALIASEDLINEENABLE : + case WINED3DRS_MINTESSELLATIONLEVEL : + case WINED3DRS_MAXTESSELLATIONLEVEL : + case WINED3DRS_ADAPTIVETESS_X : + case WINED3DRS_ADAPTIVETESS_Y : + case WINED3DRS_ADAPTIVETESS_Z : + case WINED3DRS_ADAPTIVETESS_W : + case WINED3DRS_ENABLEADAPTIVETESSELLATION : + case WINED3DRS_TWOSIDEDSTENCILMODE : + case WINED3DRS_CCW_STENCILFAIL : + case WINED3DRS_CCW_STENCILZFAIL : + case WINED3DRS_CCW_STENCILPASS : + case WINED3DRS_CCW_STENCILFUNC : + case WINED3DRS_COLORWRITEENABLE1 : + case WINED3DRS_COLORWRITEENABLE2 : + case WINED3DRS_COLORWRITEENABLE3 : + case WINED3DRS_BLENDFACTOR : + case WINED3DRS_SRGBWRITEENABLE : + case WINED3DRS_DEPTHBIAS : + case WINED3DRS_WRAP8 : + case WINED3DRS_WRAP9 : + case WINED3DRS_WRAP10 : + case WINED3DRS_WRAP11 : + case WINED3DRS_WRAP12 : + case WINED3DRS_WRAP13 : + case WINED3DRS_WRAP14 : + case WINED3DRS_WRAP15 : + case WINED3DRS_SEPARATEALPHABLENDENABLE : + case WINED3DRS_SRCBLENDALPHA : + case WINED3DRS_DESTBLENDALPHA : + case WINED3DRS_BLENDOPALPHA : /*Put back later: FIXME("(%p)->(%d,%ld) not handled yet\n", This, State, Value); */ FIXME("(%p)->(%d,%ld) not handled yet\n", This, State, Value); break;

1 0

Vitaly Budovski : wined3d: Fixed some typos and prevented divide by 0.
by Alexandre Julliard Feb. 28, 2006

Feb. 28, 2006

Module: wine Branch: refs/heads/master Commit: c8480e25e723a81647c5766c11a8863d448902e5 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c8480e25e723a81647c5766… Author: Vitaly Budovski <vbudovsk(a)cs.rmit.edu.au> Date: Sat Feb 25 20:50:27 2006 +1100 wined3d: Fixed some typos and prevented divide by 0. --- dlls/wined3d/device.c | 39 +++++++++++++++++++++------------------ 1 files changed, 21 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index e458fa3..0518c37 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3502,7 +3502,7 @@ HRESULT WINAPI IWineD3DDeviceImpl_SetRen { /* * POINTSCALEENABLE controls how point size value is treated. If set to - * true, the point size is scaled with repsect to height of viewport. + * true, the point size is scaled with respect to height of viewport. * When set to false point size is in pixels. * * http://msdn.microsoft.com/library/en-us/directx9_c/point_sprites.asp @@ -3510,28 +3510,31 @@ HRESULT WINAPI IWineD3DDeviceImpl_SetRen /* Default values */ GLfloat att[3] = {1.0f, 0.0f, 0.0f}; - + /* - * Minium valid point size for OpenGL is 1.0f. For Direct3D it is 0.0f. + * Minimum valid point size for OpenGL is 1.0f. For Direct3D it is 0.0f. * This means that OpenGL will clamp really small point sizes to 1.0f. * To correct for this we need to multiply by the scale factor when sizes * are less than 1.0f. scale_factor = 1.0f / point_size. */ - GLfloat pointSize = *((float*)&This->stateBlock->renderState[D3DRS_POINTSIZE]); - GLfloat scaleFactor; - if(pointSize < 1.0f) { - scaleFactor = pointSize * pointSize; - } else { - scaleFactor = 1.0f; - } - - if(This->stateBlock->renderState[WINED3DRS_POINTSCALEENABLE]) { - att[0] = *((float*)&This->stateBlock->renderState[WINED3DRS_POINTSCALE_A]) / - (This->stateBlock->viewport.Height * This->stateBlock->viewport.Height * scaleFactor); - att[1] = *((float*)&This->stateBlock->renderState[WINED3DRS_POINTSCALE_B]) / - (This->stateBlock->viewport.Height * This->stateBlock->viewport.Height * scaleFactor); - att[2] = *((float*)&This->stateBlock->renderState[WINED3DRS_POINTSCALE_C]) / - (This->stateBlock->viewport.Height * This->stateBlock->viewport.Height * scaleFactor); + GLfloat pointSize = *((float*)&This->stateBlock->renderState[WINED3DRS_POINTSIZE]); + if(pointSize > 0.0f) { + GLfloat scaleFactor; + + if(pointSize < 1.0f) { + scaleFactor = pointSize * pointSize; + } else { + scaleFactor = 1.0f; + } + + if(This->stateBlock->renderState[WINED3DRS_POINTSCALEENABLE]) { + att[0] = *((float*)&This->stateBlock->renderState[WINED3DRS_POINTSCALE_A]) / + (This->stateBlock->viewport.Height * This->stateBlock->viewport.Height * scaleFactor); + att[1] = *((float*)&This->stateBlock->renderState[WINED3DRS_POINTSCALE_B]) / + (This->stateBlock->viewport.Height * This->stateBlock->viewport.Height * scaleFactor); + att[2] = *((float*)&This->stateBlock->renderState[WINED3DRS_POINTSCALE_C]) / + (This->stateBlock->viewport.Height * This->stateBlock->viewport.Height * scaleFactor); + } } if(GL_SUPPORT(ARB_POINT_PARAMETERS)) {

1 0

Eric Pouech : crypt32: Don't access a blob after freeing it.
by Alexandre Julliard Feb. 28, 2006

Feb. 28, 2006

Module: wine Branch: refs/heads/master Commit: d6201e23750c49e90791a62667d64ccafd4da5dd URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d6201e23750c49e90791a62… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Mon Feb 27 22:24:59 2006 +0100 crypt32: Don't access a blob after freeing it. --- dlls/crypt32/oid.c | 2 +- dlls/crypt32/store.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/oid.c b/dlls/crypt32/oid.c index d823649..1555bb2 100644 --- a/dlls/crypt32/oid.c +++ b/dlls/crypt32/oid.c @@ -85,7 +85,6 @@ static void free_function_sets(void) list_remove(&setCursor->next); CryptMemFree(setCursor->name); - CryptMemFree(setCursor); LIST_FOR_EACH_ENTRY_SAFE(functionCursor, funcNext, &setCursor->functions, struct OIDFunction, next) { @@ -93,6 +92,7 @@ static void free_function_sets(void) CryptMemFree(functionCursor); } DeleteCriticalSection(&setCursor->cs); + CryptMemFree(setCursor); } DeleteCriticalSection(&funcSetCS); } diff --git a/dlls/crypt32/store.c b/dlls/crypt32/store.c index 348bca8..444d9c3 100644 --- a/dlls/crypt32/store.c +++ b/dlls/crypt32/store.c @@ -534,8 +534,8 @@ static BOOL WINAPI CRYPT_MemDeleteCert(H * protected. */ list_remove(&cert->entry); - ret = CertFreeCertificateContext((PCCERT_CONTEXT)cert); cert->entry.prev = cert->entry.next = &store->certs; + ret = CertFreeCertificateContext((PCCERT_CONTEXT)cert); break; } }

1 0

Eric Pouech : winedbg: Added a close_process method to process_io.
by Alexandre Julliard Feb. 28, 2006

Feb. 28, 2006

Module: wine Branch: refs/heads/master Commit: 5ca519705d889e2e8ccd70619ecfe52cb1b4f05d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5ca519705d889e2e8ccd706… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Mon Feb 27 21:50:43 2006 +0100 winedbg: Added a close_process method to process_io. - added a close_process method to process_io - made use of it to get rid of dbg_detach --- programs/winedbg/dbg.y | 2 + programs/winedbg/debugger.h | 2 + programs/winedbg/stack.c | 4 +- programs/winedbg/tgt_active.c | 67 +++++++++++++++++++++-------------------- programs/winedbg/winedbg.c | 3 ++ 5 files changed, 41 insertions(+), 37 deletions(-) diff --git a/programs/winedbg/dbg.y b/programs/winedbg/dbg.y index abb4704..66145ee 100644 --- a/programs/winedbg/dbg.y +++ b/programs/winedbg/dbg.y @@ -139,7 +139,7 @@ command: | tSYMBOLFILE pathname expr_rvalue { symbol_read_symtable($2, $3); } | tWHATIS expr_lvalue { dbg_printf("type = "); types_print_type(&$2.type, FALSE); dbg_printf("\n"); } | tATTACH tNUM { dbg_attach_debuggee($2, FALSE, TRUE); } - | tDETACH { dbg_detach_debuggee(); } + | tDETACH { dbg_curr_process->process_io->close_process(dbg_curr_process, FALSE); } | tMINIDUMP pathname { minidump_write($2, (dbg_curr_thread && dbg_curr_thread->in_exception) ? &dbg_curr_thread->excpt_record : NULL);} | tECHO tSTRING { dbg_printf("%s\n", $2); } | run_command diff --git a/programs/winedbg/debugger.h b/programs/winedbg/debugger.h index ecfe2f4..73e53a2 100644 --- a/programs/winedbg/debugger.h +++ b/programs/winedbg/debugger.h @@ -216,6 +216,7 @@ struct dbg_process /* describes the way the debugger interacts with a given process */ struct be_process_io { + BOOL (*close_process)(struct dbg_process*, BOOL); BOOL (WINAPI *read)(HANDLE, const void*, void*, DWORD, DWORD*); BOOL (WINAPI *write)(HANDLE, void*, const void*, DWORD, DWORD*); }; @@ -403,7 +404,6 @@ extern int dbg_printf(const char #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_detach_debuggee(void); extern BOOL dbg_interrupt_debuggee(void); extern struct dbg_process* dbg_add_process(DWORD pid, HANDLE h); extern void dbg_set_process_name(struct dbg_process* p, const char* name); diff --git a/programs/winedbg/stack.c b/programs/winedbg/stack.c index 675427b..bc996c0 100644 --- a/programs/winedbg/stack.c +++ b/programs/winedbg/stack.c @@ -338,7 +338,7 @@ static void backtrace_all(void) { if (entry.th32OwnerProcessID == GetCurrentProcessId()) continue; if (dbg_curr_process && dbg_curr_pid != entry.th32OwnerProcessID) - dbg_detach_debuggee(); + dbg_curr_process->process_io->close_process(dbg_curr_process, FALSE); if (entry.th32OwnerProcessID != dbg_curr_pid) { @@ -358,7 +358,7 @@ static void backtrace_all(void) while (Thread32Next(snapshot, &entry)); if (dbg_curr_process) - dbg_detach_debuggee(); + dbg_curr_process->process_io->close_process(dbg_curr_process, FALSE); } CloseHandle(snapshot); } diff --git a/programs/winedbg/tgt_active.c b/programs/winedbg/tgt_active.c index 406c551..e778c3d 100644 --- a/programs/winedbg/tgt_active.c +++ b/programs/winedbg/tgt_active.c @@ -34,12 +34,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(winedbg); static char* dbg_last_cmd_line; -struct be_process_io be_process_active_io = -{ - ReadProcessMemory, - WriteProcessMemory, -}; - static void dbg_init_current_process(void) { } @@ -100,23 +94,6 @@ BOOL dbg_attach_debuggee(DWORD pid, BOOL return TRUE; } -BOOL dbg_detach_debuggee(void) -{ - /* remove all set breakpoints in debuggee code */ - break_set_xpoints(FALSE); - /* needed for single stepping (ugly). - * should this be handled inside the server ??? - */ - be_cpu->single_step(&dbg_context, FALSE); - SetThreadContext(dbg_curr_thread->handle, &dbg_context); - if (dbg_curr_thread->in_exception) - ContinueDebugEvent(dbg_curr_pid, dbg_curr_tid, DBG_CONTINUE); - if (!DebugActiveProcessStop(dbg_curr_pid)) return FALSE; - dbg_del_process(dbg_curr_process); - - return TRUE; -} - static unsigned dbg_fetch_context(void) { dbg_context.ContextFlags = CONTEXT_CONTROL @@ -413,6 +390,8 @@ static DWORD dbg_handle_exception(const return DBG_CONTINUE; } +static BOOL tgt_process_active_close_process(struct dbg_process* pcs, BOOL kill); + static unsigned dbg_handle_debug_event(DEBUG_EVENT* de) { char buffer[256]; @@ -507,15 +486,7 @@ static unsigned dbg_handle_debug_event(D WINE_ERR("Unknown process\n"); break; } - if (!SymCleanup(dbg_curr_process->handle)) - dbg_printf("Couldn't initiate DbgHelp\n"); - /* just in case */ - break_set_xpoints(FALSE); - /* kill last thread */ - dbg_del_thread(dbg_curr_process->threads); - dbg_del_process(dbg_curr_process); - - dbg_printf("Process of pid=0x%08lx has terminated\n", dbg_curr_pid); + tgt_process_active_close_process(dbg_curr_process, FALSE); break; case CREATE_THREAD_DEBUG_EVENT: @@ -687,7 +658,6 @@ void dbg_wait_next_exception(DWORD cont, } dbg_interactiveP = TRUE; parser_handle(hFile); - dbg_printf("WineDbg terminated on pid 0x%lx\n", dbg_curr_pid); return 0; } @@ -928,3 +898,34 @@ enum dbg_start dbg_active_auto(int argc, dbg_main_loop(hFile); return start_ok; } + +static BOOL tgt_process_active_close_process(struct dbg_process* pcs, BOOL kill) +{ + if (pcs == dbg_curr_process) + { + /* remove all set breakpoints in debuggee code */ + break_set_xpoints(FALSE); + /* needed for single stepping (ugly). + * should this be handled inside the server ??? + */ + be_cpu->single_step(&dbg_context, FALSE); + if (dbg_curr_thread->in_exception) + { + SetThreadContext(dbg_curr_thread->handle, &dbg_context); + ContinueDebugEvent(dbg_curr_pid, dbg_curr_tid, DBG_CONTINUE); + } + if (!kill && !DebugActiveProcessStop(dbg_curr_pid)) return FALSE; + } + SymCleanup(pcs->handle); + dbg_printf("Process of pid=0x%08lx has terminated\n", pcs->pid); + dbg_del_process(pcs); + + return TRUE; +} + +struct be_process_io be_process_active_io = +{ + tgt_process_active_close_process, + ReadProcessMemory, + WriteProcessMemory, +}; diff --git a/programs/winedbg/winedbg.c b/programs/winedbg/winedbg.c index 7cd7695..cd40734 100644 --- a/programs/winedbg/winedbg.c +++ b/programs/winedbg/winedbg.c @@ -551,6 +551,9 @@ int main(int argc, char** argv) } retv = dbg_main_loop(hFile); + while (dbg_process_list) + dbg_process_list->process_io->close_process(dbg_process_list, TRUE); + dbg_save_internal_vars(); return retv;

1 0

Eric Pouech : winedbg: Extend auto mode with minidump.
by Alexandre Julliard Feb. 28, 2006

Feb. 28, 2006

Module: wine Branch: refs/heads/master Commit: 4202c752d30dbca633839a59ad40cdfaf69276af URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4202c752d30dbca633839a5… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Mon Feb 27 21:50:39 2006 +0100 winedbg: Extend auto mode with minidump. - added -minidump and -minidump <file> options to command line Those options are to be used in remplacement of --auto to create a minidump In the form --minidump <file>, the minidump will be created in <file>, otherwise the filename will be automatically generated. --- programs/winedbg/tgt_active.c | 68 +++++++++++++++++++++++++++++++++++++---- programs/winedbg/winedbg.c | 4 +- 2 files changed, 62 insertions(+), 10 deletions(-) diff --git a/programs/winedbg/tgt_active.c b/programs/winedbg/tgt_active.c index ac2faaa..406c551 100644 --- a/programs/winedbg/tgt_active.c +++ b/programs/winedbg/tgt_active.c @@ -864,13 +864,67 @@ enum dbg_start dbg_active_auto(int argc, HANDLE hFile; enum dbg_start ds = start_error_parse; - argc--; argv++; - hFile = parser_generate_command_file("echo Modules:", "info share", - "echo Threads:", "info threads", - NULL); - if (hFile == INVALID_HANDLE_VALUE || - (ds = dbg_active_attach(argc, argv)) != start_ok) - return ds; + if (!strcmp(argv[0], "--auto")) + { + /* auto mode */ + argc--; argv++; + ds = dbg_active_attach(argc, argv); + if (ds != start_ok) return ds; + hFile = parser_generate_command_file("echo Modules:", "info share", + "echo Threads:", "info threads", + NULL); + } + else if (!strcmp(argv[0], "--minidump")) + { + const char* file = NULL; + char tmp[8 + 1 + MAX_PATH]; /* minidump <file> */ + + argc--; argv++; + /* hard stuff now ; we can get things like: + * --minidump <pid> 1 arg + * --minidump <pid> <evt> 2 args + * --minidump <file> <pid> 2 args + * --minidump <file> <pid> <evt> 3 args + */ + switch (argc) + { + case 1: + ds = dbg_active_attach(argc, argv); + break; + case 2: + if ((ds = dbg_active_attach(argc, argv)) != start_ok) + { + file = argv[0]; + ds = dbg_active_attach(argc - 1, argv + 1); + } + break; + case 3: + file = argv[0]; + ds = dbg_active_attach(argc - 1, argv + 1); + break; + default: + return start_error_parse; + } + if (ds != start_ok) return ds; + memcpy(tmp, "minidump \"", 10); + if (!file) + { + char path[MAX_PATH]; + + GetTempPath(sizeof(path), path); + GetTempFileName(path, "WD", 0, tmp + 10); + } + else strcpy(tmp + 10, file); + strcat(tmp, "\""); + if (!file) + { + /* FIXME: should generate unix name as well */ + dbg_printf("Capturing program state in %s\n", tmp + 9); + } + hFile = parser_generate_command_file(tmp, NULL); + } + else return start_error_parse; + if (hFile == INVALID_HANDLE_VALUE) return start_error_parse; dbg_main_loop(hFile); return start_ok; } diff --git a/programs/winedbg/winedbg.c b/programs/winedbg/winedbg.c index 40eee6c..7cd7695 100644 --- a/programs/winedbg/winedbg.c +++ b/programs/winedbg/winedbg.c @@ -34,8 +34,6 @@ /* TODO list: * * - minidump - * + allow winedbg in automatic mode to create a minidump (or add another option - * for that) * + set a mode where winedbg would start (postmortem debugging) from a minidump * - CPU adherence * + we always assume the stack grows as on i386 (ie downwards) @@ -495,7 +493,7 @@ int main(int argc, char** argv) SymSetOptions((SymGetOptions() & ~(SYMOPT_UNDNAME)) | SYMOPT_LOAD_LINES | SYMOPT_DEFERRED_LOADS | SYMOPT_AUTO_PUBLICS); - if (argc && !strcmp(argv[0], "--auto")) + if (argc && (!strcmp(argv[0], "--auto") || !strcmp(argv[0], "--minidump"))) { /* force some internal variables */ DBG_IVAR(BreakOnDllLoad) = 0;

1 0