wine-commits November 2007

wine-commits@winehq.org

3 participants
757 discussions

Paul Vriens : dsound/tests: Fix test failures on WinXP.
by Alexandre Julliard 13 Nov '07

13 Nov '07

Module: wine Branch: master Commit: 65d3682c22793c197ced98a54a04d0590ddcc828 URL: http://source.winehq.org/git/wine.git/?a=commit;h=65d3682c22793c197ced98a54… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Mon Nov 12 16:56:49 2007 +0100 dsound/tests: Fix test failures on WinXP. --- dlls/dsound/tests/ds3d8.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/dsound/tests/ds3d8.c b/dlls/dsound/tests/ds3d8.c index 359eafd..b072068 100644 --- a/dlls/dsound/tests/ds3d8.c +++ b/dlls/dsound/tests/ds3d8.c @@ -211,18 +211,20 @@ void test_buffer8(LPDIRECTSOUND8 dso, LPDIRECTSOUNDBUFFER * dsbo, dsbcaps.dwBufferBytes); } - /* Query the format size. Note that it may not match sizeof(wfx) */ + /* Query the format size. */ size=0; rc=IDirectSoundBuffer_GetFormat(*dsbo,NULL,0,&size); ok(rc==DS_OK && size!=0,"IDirectSoundBuffer_GetFormat() should have " "returned the needed size: rc=%s size=%d\n",DXGetErrorString8(rc),size); - rc=IDirectSoundBuffer_GetFormat(*dsbo,&wfx,sizeof(wfx),NULL); - if (wfx.wFormatTag == WAVE_FORMAT_EXTENSIBLE) - { + ok(size == sizeof(WAVEFORMATEX) || size == sizeof(WAVEFORMATEXTENSIBLE), + "Expected a correct structure size, got %d\n", size); + + if (size == sizeof(WAVEFORMATEX)) { + rc=IDirectSoundBuffer_GetFormat(*dsbo,&wfx,size,NULL); + } else if (size == sizeof(WAVEFORMATEXTENSIBLE)) { WAVEFORMATEXTENSIBLE wfxe; - ok(rc == DSERR_INVALIDPARAM, "IDirectSoundBuffer_GetFormat returned: %s\n", DXGetErrorString8(rc)); - rc=IDirectSoundBuffer_GetFormat(*dsbo,(WAVEFORMATEX*)&wfxe,sizeof(wfxe),NULL); + rc=IDirectSoundBuffer_GetFormat(*dsbo,(WAVEFORMATEX*)&wfxe,size,NULL); wfx = wfxe.Format; } ok(rc==DS_OK,"IDirectSoundBuffer_GetFormat() failed: %s\n",

1 0

Stefan Dösinger : wined3d: Load GL_EXT_texture3D from gl 1.2 if the extension is not there.
by Alexandre Julliard 13 Nov '07

13 Nov '07

Module: wine Branch: master Commit: 894a705cc74e9cee1349c72290fd77da2b39e60b URL: http://source.winehq.org/git/wine.git/?a=commit;h=894a705cc74e9cee1349c7229… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Nov 6 13:07:33 2007 +0100 wined3d: Load GL_EXT_texture3D from gl 1.2 if the extension is not there. --- dlls/wined3d/directx.c | 2 +- include/wine/wined3d_gl.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 62db2bd..f62480e 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -91,7 +91,7 @@ static const struct { {"GL_EXT_secondary_color", EXT_SECONDARY_COLOR, 0 }, {"GL_EXT_stencil_two_side", EXT_STENCIL_TWO_SIDE, 0 }, {"GL_EXT_stencil_wrap", EXT_STENCIL_WRAP, 0 }, - {"GL_EXT_texture3D", EXT_TEXTURE3D, 0 }, + {"GL_EXT_texture3D", EXT_TEXTURE3D, MAKEDWORD_VERSION(1, 2) }, {"GL_EXT_texture_compression_s3tc", EXT_TEXTURE_COMPRESSION_S3TC, 0 }, {"GL_EXT_texture_env_add", EXT_TEXTURE_ENV_ADD, 0 }, {"GL_EXT_texture_env_combine", EXT_TEXTURE_ENV_COMBINE, 0 }, diff --git a/include/wine/wined3d_gl.h b/include/wine/wined3d_gl.h index 3fbfea6..b346064 100644 --- a/include/wine/wined3d_gl.h +++ b/include/wine/wined3d_gl.h @@ -3328,8 +3328,8 @@ typedef enum _GL_SupportedExt { USE_GL_FUNC(PGLFNGLSECONDARYCOLOR3FVEXTPROC, glSecondaryColor3fvEXT, EXT_SECONDARY_COLOR, NULL );\ USE_GL_FUNC(PGLFNGLSECONDARYCOLORPOINTEREXTPROC, glSecondaryColorPointerEXT, EXT_SECONDARY_COLOR, NULL );\ /* GL_EXT_texture3D */ \ - USE_GL_FUNC(PGLFNGLTEXIMAGE3DEXTPROC, glTexImage3DEXT, EXT_TEXTURE3D, NULL );\ - USE_GL_FUNC(PGLFNGLTEXSUBIMAGE3DEXTPROC, glTexSubImage3DEXT, EXT_TEXTURE3D, NULL );\ + USE_GL_FUNC(PGLFNGLTEXIMAGE3DEXTPROC, glTexImage3DEXT, EXT_TEXTURE3D, glTexImage3D);\ + USE_GL_FUNC(PGLFNGLTEXSUBIMAGE3DEXTPROC, glTexSubImage3DEXT, EXT_TEXTURE3D, glTexSubImage3D);\ /* GL_ARB_vertex_program */ \ USE_GL_FUNC(PGLFNGENPROGRAMSARBPROC, glGenProgramsARB, ARB_VERTEX_PROGRAM, NULL );\ USE_GL_FUNC(PGLFNBINDPROGRAMARBPROC, glBindProgramARB, ARB_VERTEX_PROGRAM, NULL );\

1 0

Stefan Dösinger : wined3d: Mark extensions supported which are included in the gl core.
by Alexandre Julliard 13 Nov '07

13 Nov '07

Module: wine Branch: master Commit: c25a792902f71c16c7bd4e09662319f7172d1df9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c25a792902f71c16c7bd4e096… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Nov 6 13:20:27 2007 +0100 wined3d: Mark extensions supported which are included in the gl core. --- dlls/wined3d/directx.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index b1c319c..62db2bd 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -706,6 +706,18 @@ BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info) { WGL_EXT_FUNCS_GEN; #undef USE_GL_FUNC + /* Now mark all the extensions supported which are included in the opengl core version. Do this *after* + * loading the functions, otherwise the code above will load the extension entry points instead of the + * core functions, which may not work + */ + for (i = 0; i < (sizeof(EXTENSION_MAP) / sizeof(*EXTENSION_MAP)); ++i) { + if (gl_info->supported[EXTENSION_MAP[i].extension] == FALSE && + EXTENSION_MAP[i].version <= gl_info->gl_driver_version && EXTENSION_MAP[i].version) { + TRACE_(d3d_caps)(" GL CORE: %s support\n", EXTENSION_MAP[i].extension_string); + gl_info->supported[EXTENSION_MAP[i].extension] = TRUE; + } + } + if (gl_info->supported[APPLE_FENCE]) { /* GL_NV_fence and GL_APPLE_fence provide the same functionality basically. * The apple extension interacts with some other apple exts. Disable the NV

1 0

Stefan Dösinger : wined3d: Load GL functions from core if needed.
by Alexandre Julliard 13 Nov '07

13 Nov '07

Module: wine Branch: master Commit: 0587060a08c35eeb6cba118aee3024a44fcf6cf2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0587060a08c35eeb6cba118ae… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Nov 11 13:59:49 2007 +0100 wined3d: Load GL functions from core if needed. --- dlls/wined3d/directx.c | 165 +++++++++++++++++++++++++++--------------------- 1 files changed, 93 insertions(+), 72 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0587060a08c35eeb6cba1…

1 0

Stefan Dösinger : wined3d: Extend the gl extension function loading table with ext info.
by Alexandre Julliard 13 Nov '07

13 Nov '07

Module: wine Branch: master Commit: 07bbf1899d55a224e5fa9dae40d314ac323f5c31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=07bbf1899d55a224e5fa9dae4… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Nov 6 12:52:47 2007 +0100 wined3d: Extend the gl extension function loading table with ext info. --- dlls/wined3d/directx.c | 2 +- include/wine/wined3d_gl.h | 606 +++++++++++++++++++-------------------------- 2 files changed, 255 insertions(+), 353 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=07bbf1899d55a224e5fa9…

1 0

Stefan Dösinger : wined3d: Load extension functions after finding the supported extensions.
by Alexandre Julliard 13 Nov '07

13 Nov '07

Module: wine Branch: master Commit: 1978ef9a752dc56b9c7b2df88b8c139b3b20cfe6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1978ef9a752dc56b9c7b2df88… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Nov 6 01:25:30 2007 +0100 wined3d: Load extension functions after finding the supported extensions. --- dlls/wined3d/directx.c | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 5401ff5..9d47292 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -623,12 +623,6 @@ BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info) { gl_info->vs_arb_constantsF = 0; gl_info->ps_arb_constantsF = 0; -/* Now work out what GL support this card really has */ -#define USE_GL_FUNC(type, pfn) gl_info->pfn = (type) pwglGetProcAddress(#pfn); - GL_EXT_FUNCS_GEN; - WGL_EXT_FUNCS_GEN; -#undef USE_GL_FUNC - /* Retrieve opengl defaults */ glGetIntegerv(GL_MAX_CLIP_PLANES, &gl_max); gl_info->max_clipplanes = min(WINED3DMAXUSERCLIPPLANES, gl_max); @@ -685,6 +679,11 @@ BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info) { } } } + /* Now work out what GL support this card really has */ +#define USE_GL_FUNC(type, pfn) gl_info->pfn = (type) pwglGetProcAddress(#pfn); + GL_EXT_FUNCS_GEN; + WGL_EXT_FUNCS_GEN; +#undef USE_GL_FUNC if (gl_info->supported[APPLE_FENCE]) { /* GL_NV_fence and GL_APPLE_fence provide the same functionality basically.

1 0

Stefan Dösinger : wined3d: Align the gl function table .
by Alexandre Julliard 13 Nov '07

13 Nov '07

Module: wine Branch: master Commit: 44a592bc74d06f124efed1763fcb09a550e51049 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44a592bc74d06f124efed1763… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Nov 6 01:24:20 2007 +0100 wined3d: Align the gl function table. --- include/wine/wined3d_gl.h | 482 ++++++++++++++++++++++---------------------- 1 files changed, 241 insertions(+), 241 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=44a592bc74d06f124efed…

1 0

Roderick Colenbrander : wgl: Add wglCopyContext support.
by Alexandre Julliard 13 Nov '07

13 Nov '07

Module: wine Branch: master Commit: 8295c547f3f692c6a235c5ce5d83501252348fdd URL: http://source.winehq.org/git/wine.git/?a=commit;h=8295c547f3f692c6a235c5ce5… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Sun Nov 11 21:32:12 2007 +0100 wgl: Add wglCopyContext support. --- dlls/gdi32/gdi32.spec | 1 + dlls/gdi32/gdi_private.h | 1 + dlls/gdi32/opengl.c | 25 +++++++++++++++++++++ dlls/opengl32/make_opengl | 2 +- dlls/opengl32/opengl32.spec | 2 +- dlls/opengl32/wgl.c | 11 --------- dlls/winex11.drv/opengl.c | 44 +++++++++++++++++++++++++++++++++++++ dlls/winex11.drv/winex11.drv.spec | 1 + 8 files changed, 74 insertions(+), 13 deletions(-) diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index b0c8e12..025dd25 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -498,6 +498,7 @@ ################################################################ # Wine extensions: OpenGL support # +@ stdcall wglCopyContext(long long long) @ stdcall wglCreateContext(long) @ stdcall wglDeleteContext(long) @ stdcall wglGetCurrentContext() diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 3bba769..3e49642 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -223,6 +223,7 @@ typedef struct tagDC_FUNCS BOOL (*pWidenPath)(PHYSDEV); /* OpenGL32 */ + BOOL (*pwglCopyContext)(HGLRC, HGLRC, UINT); HGLRC (*pwglCreateContext)(PHYSDEV); BOOL (*pwglDeleteContext)(HGLRC); PROC (*pwglGetProcAddress)(LPCSTR); diff --git a/dlls/gdi32/opengl.c b/dlls/gdi32/opengl.c index aebf17a..f948cda 100644 --- a/dlls/gdi32/opengl.c +++ b/dlls/gdi32/opengl.c @@ -60,6 +60,31 @@ static DC* OPENGL_GetDefaultDC(void) } /*********************************************************************** + * wglCopyContext (OPENGL32.@) + */ +BOOL WINAPI wglCopyContext(HGLRC hglrcSrc, HGLRC hglrcDst, UINT mask) +{ + DC *dc; + BOOL ret = FALSE; + OPENGL_Context ctx = (OPENGL_Context)hglrcSrc; + + TRACE("hglrcSrc: (%p), hglrcDst: (%p), mask: %#x\n", hglrcSrc, hglrcDst, mask); + /* If no context is set, this call doesn't have a purpose */ + if(!hglrcSrc || !hglrcDst) + return FALSE; + + /* Retrieve the HDC associated with the context to access the display driver */ + dc = get_dc_ptr(ctx->hdc); + if (!dc) return FALSE; + + if (!dc->funcs->pwglCopyContext) FIXME(" :stub\n"); + else ret = dc->funcs->pwglCopyContext(hglrcSrc, hglrcDst, mask); + + release_dc_ptr( dc ); + return ret; +} + +/*********************************************************************** * wglCreateContext (OPENGL32.@) */ HGLRC WINAPI wglCreateContext(HDC hdc) diff --git a/dlls/opengl32/make_opengl b/dlls/opengl32/make_opengl index f473cf7..824dd1c 100755 --- a/dlls/opengl32/make_opengl +++ b/dlls/opengl32/make_opengl @@ -616,7 +616,7 @@ foreach (sort keys %norm_functions) { print SPEC "@ stub glGetLevelParameterfv @ stub glGetLevelParameteriv @ stdcall wglChoosePixelFormat(long ptr) gdi32.ChoosePixelFormat -@ stdcall wglCopyContext(long long long) +@ stdcall wglCopyContext(long long long) gdi32.wglCopyContext @ stdcall wglCreateContext(long) gdi32.wglCreateContext @ stdcall wglCreateLayerContext(long long) @ stdcall wglDeleteContext(long) gdi32.wglDeleteContext diff --git a/dlls/opengl32/opengl32.spec b/dlls/opengl32/opengl32.spec index 8b7b28a..762fb5e 100644 --- a/dlls/opengl32/opengl32.spec +++ b/dlls/opengl32/opengl32.spec @@ -375,7 +375,7 @@ @ stdcall glVertexPointer( long long long ptr ) wine_glVertexPointer @ stdcall glViewport( long long long long ) wine_glViewport @ stdcall wglChoosePixelFormat(long ptr) gdi32.ChoosePixelFormat -@ stdcall wglCopyContext(long long long) +@ stdcall wglCopyContext(long long long) gdi32.wglCopyContext @ stdcall wglCreateContext(long) gdi32.wglCreateContext @ stdcall wglCreateLayerContext(long long) @ stdcall wglDeleteContext(long) gdi32.wglDeleteContext diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index ec91cfe..d157488 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -121,17 +121,6 @@ HGLRC WINAPI wglCreateLayerContext(HDC hdc, } /*********************************************************************** - * wglCopyContext (OPENGL32.@) - */ -BOOL WINAPI wglCopyContext(HGLRC hglrcSrc, - HGLRC hglrcDst, - UINT mask) { - FIXME("(%p,%p,%d)\n", hglrcSrc, hglrcDst, mask); - - return FALSE; -} - -/*********************************************************************** * wglDescribeLayerPlane (OPENGL32.@) */ BOOL WINAPI wglDescribeLayerPlane(HDC hdc, diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index c510a3b..ed085ba 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -211,6 +211,7 @@ static void dump_PIXELFORMATDESCRIPTOR(const PIXELFORMATDESCRIPTOR *ppfd) { #define MAKE_FUNCPTR(f) static typeof(f) * p##f; /* GLX 1.0 */ MAKE_FUNCPTR(glXChooseVisual) +MAKE_FUNCPTR(glXCopyContext) MAKE_FUNCPTR(glXCreateContext) MAKE_FUNCPTR(glXCreateGLXPixmap) MAKE_FUNCPTR(glXGetCurrentContext) @@ -379,6 +380,7 @@ static BOOL has_opengl(void) #define LOAD_FUNCPTR(f) if((p##f = (void*)pglXGetProcAddressARB((const unsigned char*)#f)) == NULL) goto sym_not_found; /* GLX 1.0 */ LOAD_FUNCPTR(glXChooseVisual) +LOAD_FUNCPTR(glXCopyContext) LOAD_FUNCPTR(glXCreateContext) LOAD_FUNCPTR(glXCreateGLXPixmap) LOAD_FUNCPTR(glXGetCurrentContext) @@ -1508,6 +1510,38 @@ BOOL X11DRV_SetPixelFormat(X11DRV_PDEVICE *physDev, } /** + * X11DRV_wglCopyContext + * + * For OpenGL32 wglCopyContext. + */ +BOOL X11DRV_wglCopyContext(HGLRC hglrcSrc, HGLRC hglrcDst, UINT mask) { + Wine_GLContext *src = (Wine_GLContext*)hglrcSrc; + Wine_GLContext *dst = (Wine_GLContext*)hglrcDst; + + TRACE("hglrcSrc: (%p), hglrcDst: (%p), mask: %#x\n", hglrcSrc, hglrcDst, mask); + + /* There is a slight difference in the way GL contexts share display lists in WGL and GLX. + * In case of GLX you need to specify this at context creation time but in case of WGL you + * do this using wglShareLists which you can call after creating the context. + * To emulate WGL we try to delay the creation of the context until wglShareLists or wglMakeCurrent. + * Upto now that works fine. + * + * The delayed GLX context creation could cause issues for wglCopyContext as it might get called + * when there is no GLX context yet. Warn the user about it and let him report a bug report. + * The chance this will cause problems is small as at the time of writing Wine has had OpenGL support + * for more than 7 years and this function has remained a stub ever since then. + */ + if(!src->ctx || !dst->ctx) { + FIXME("No source or destination context available! This could indicate a Wine bug."); + return FALSE; + } + pglXCopyContext(gdi_display, src->ctx, dst->ctx, mask); + + /* As opposed to wglCopyContext, glXCopyContext doesn't return anything, so hopefully we passed */ + return TRUE; +} + +/** * X11DRV_wglCreateContext * * For OpenGL32 wglCreateContext. @@ -3457,6 +3491,16 @@ BOOL X11DRV_SwapBuffers(X11DRV_PDEVICE *physDev) { } /** + * X11DRV_wglCopyContext + * + * For OpenGL32 wglCopyContext. + */ +BOOL X11DRV_wglCopyContext(HGLRC hglrcSrc, HGLRC hglrcDst, UINT mask) { + ERR_(opengl)("No OpenGL support compiled in.\n"); + return FALSE; +} + +/** * X11DRV_wglCreateContext * * For OpenGL32 wglCreateContext. diff --git a/dlls/winex11.drv/winex11.drv.spec b/dlls/winex11.drv/winex11.drv.spec index 05c7f72..87db841 100644 --- a/dlls/winex11.drv/winex11.drv.spec +++ b/dlls/winex11.drv/winex11.drv.spec @@ -132,6 +132,7 @@ @ cdecl ForceXIMReset(long) X11DRV_ForceXIMReset # OpenGL +@ cdecl wglCopyContext(long long long) X11DRV_wglCopyContext @ cdecl wglCreateContext(ptr) X11DRV_wglCreateContext @ cdecl wglDeleteContext(long) X11DRV_wglDeleteContext @ cdecl wglGetProcAddress(str) X11DRV_wglGetProcAddress

1 0

Peter Beutner : ntdll: Better trap exception handling.
by Alexandre Julliard 13 Nov '07

13 Nov '07

Module: wine Branch: master Commit: db28edc790ccabdab20dfe31e3e06fe7e3e1e8b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db28edc790ccabdab20dfe31e… Author: Peter Beutner <p.beutner(a)gmx.net> Date: Fri Nov 9 17:49:06 2007 +0100 ntdll: Better trap exception handling. --- dlls/ntdll/signal_i386.c | 15 ++++++++++----- dlls/ntdll/tests/exception.c | 6 +++--- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 793b22e..df62a30 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -1040,16 +1040,21 @@ static void WINAPI raise_trap_exception( EXCEPTION_RECORD *rec, CONTEXT *context { if (rec->ExceptionCode == EXCEPTION_SINGLE_STEP) { - if (context->EFlags & 0x100) - { - context->EFlags &= ~0x100; /* clear single-step flag */ - } - else /* hardware breakpoint, fetch the debug registers */ + struct ntdll_thread_regs * const regs = ntdll_get_thread_regs(); + + /* when single stepping can't tell whether this is a hw bp or a + * single step interrupt. try to avoid as much overhead as possible + * and only do a server call if there is any hw bp enabled. */ + + if( !(context->EFlags & 0x100) || (regs->dr7 & 0xff) ) { + /* (possible) hardware breakpoint, fetch the debug registers */ context->ContextFlags = CONTEXT_DEBUG_REGISTERS; NtGetContextThread(GetCurrentThread(), context); context->ContextFlags |= CONTEXT_FULL; /* restore flags */ } + + context->EFlags &= ~0x100; /* clear single-step flag */ } __regs_RtlRaiseException( rec, context ); diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index ce5d31b..9bd5678 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -489,7 +489,7 @@ static DWORD bpx_handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_RECORD * /* single step exception on second nop */ ok( context->Eip == (DWORD)code_mem + 1, "eip is wrong: %x instead of %x\n", context->Eip, (DWORD)code_mem + 1); - todo_wine{ ok( (context->Dr6 & 0x4000), "BS flag is not set in Dr6\n"); }; + ok( (context->Dr6 & 0x4000), "BS flag is not set in Dr6\n"); /* depending on the win version the B0 bit is already set here as well ok( (context->Dr6 & 0xf) == 0, "B0...3 flags in Dr6 shouldn't be set\n"); */ context->EFlags |= 0x100; @@ -497,7 +497,7 @@ static DWORD bpx_handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_RECORD * /* hw bp exception on second nop */ ok( context->Eip == (DWORD)code_mem + 1, "eip is wrong: %x instead of %x\n", context->Eip, (DWORD)code_mem + 1); - todo_wine{ ok( (context->Dr6 & 0xf) == 1, "B0 flag is not set in Dr6\n"); }; + ok( (context->Dr6 & 0xf) == 1, "B0 flag is not set in Dr6\n"); ok( !(context->Dr6 & 0x4000), "BS flag is set in Dr6\n"); context->Dr0 = 0; /* clear breakpoint */ context->EFlags |= 0x100; @@ -506,7 +506,7 @@ static DWORD bpx_handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_RECORD * ok( context->Eip == (DWORD)code_mem + 2, "eip is wrong: %x instead of %x\n", context->Eip, (DWORD)code_mem + 2); ok( (context->Dr6 & 0xf) == 0, "B0...3 flags in Dr6 shouldn't be set\n"); - todo_wine{ ok( (context->Dr6 & 0x4000), "BS flag is not set in Dr6\n"); }; + ok( (context->Dr6 & 0x4000), "BS flag is not set in Dr6\n"); } context->Dr6 = 0; /* clear status register */

1 0

Peter Beutner : ntdll: Don't try to handle kill(SIGTRAP).
by Alexandre Julliard 13 Nov '07

13 Nov '07

Module: wine Branch: master Commit: fc5316760b98abacd680b98b6633b20ce0ed0260 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc5316760b98abacd680b98b6… Author: Peter Beutner <p.beutner(a)gmx.net> Date: Fri Nov 9 17:47:01 2007 +0100 ntdll: Don't try to handle kill(SIGTRAP). --- dlls/ntdll/signal_i386.c | 9 --------- 1 files changed, 0 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index a6f6ed5..793b22e 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -1048,15 +1048,6 @@ static void WINAPI raise_trap_exception( EXCEPTION_RECORD *rec, CONTEXT *context { context->ContextFlags = CONTEXT_DEBUG_REGISTERS; NtGetContextThread(GetCurrentThread(), context); - /* we have either: - * - a bp from a debug register - * - a single step interrupt at popf instruction, which just has - * removed the TF. - * - someone did a kill(SIGTRAP) on us, and we shall return - * a breakpoint, not a single step exception - */ - if ( !(context->Dr6 & 0xf) && !(context->Dr6 & 0x4000) ) - rec->ExceptionCode = EXCEPTION_BREAKPOINT; context->ContextFlags |= CONTEXT_FULL; /* restore flags */ } }

1 0

← Newer
1
...
39
40
41
42
43
44
45
...
76
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2007