December 2006 - Wine-commits

Peter Beutner : ntdll: Simplify exception tests.
by Alexandre Julliard 01 Dec '06

01 Dec '06

Module: wine Branch: master Commit: 94b548fd6286791e6b818f9b104f18975a6eda34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94b548fd6286791e6b818f9b1… Author: Peter Beutner <p.beutner(a)gmx.net> Date: Thu Nov 30 17:52:50 2006 +0100 ntdll: Simplify exception tests. - create helper function to setup exception frame and run the test - lookup function ptr only once - make "code data" const - reuse global exception counter - change alignment test to use stack address to generate an alignment exception. This avoids the need to pass an argument, so it can use the created helper function. (as the stack is (at least) 4 byte aligned, this works equally well) --- dlls/ntdll/tests/exception.c | 161 +++++++++++++++-------------------------- 1 files changed, 59 insertions(+), 102 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index a87cadf..099adf0 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -162,6 +162,23 @@ static const struct exception static int got_exception; +static void run_exception_test(const void *handler, const void* context, const void *code) +{ + struct { + EXCEPTION_REGISTRATION_RECORD frame; + const void *context; + } exc_frame; + void (*func)(void) = code; + + exc_frame.frame.Handler = handler; + exc_frame.frame.Prev = pNtCurrentTeb()->Tib.ExceptionList; + exc_frame.context = context; + + pNtCurrentTeb()->Tib.ExceptionList = &exc_frame.frame; + func(); + pNtCurrentTeb()->Tib.ExceptionList = exc_frame.frame.Prev; +} + static DWORD handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_RECORD *frame, CONTEXT *context, EXCEPTION_REGISTRATION_RECORD **dispatcher ) { @@ -195,28 +212,11 @@ static DWORD handler( EXCEPTION_RECORD * static void test_prot_fault(void) { unsigned int i; - struct - { - EXCEPTION_REGISTRATION_RECORD frame; - const struct exception *except; - } exc_frame; - pNtCurrentTeb = (void *)GetProcAddress( GetModuleHandleA("ntdll.dll"), "NtCurrentTeb" ); - if (!pNtCurrentTeb) - { - trace( "NtCurrentTeb not found, skipping tests\n" ); - return; - } - - exc_frame.frame.Handler = handler; - exc_frame.frame.Prev = pNtCurrentTeb()->Tib.ExceptionList; - pNtCurrentTeb()->Tib.ExceptionList = &exc_frame.frame; for (i = 0; i < sizeof(exceptions)/sizeof(exceptions[0]); i++) { - void (*func)(void) = (void *)exceptions[i].code; - exc_frame.except = &exceptions[i]; got_exception = 0; - func(); + run_exception_test(handler, &exceptions[i], &exceptions[i].code); if (!i && !got_exception) { trace( "No exception, assuming win9x, no point in testing further\n" ); @@ -225,9 +225,9 @@ static void test_prot_fault(void) ok( got_exception == (exceptions[i].status != 0), "%u: bad exception count %d\n", i, got_exception ); } - pNtCurrentTeb()->Tib.ExceptionList = exc_frame.frame.Prev; } +/* test handling of debug registers */ static DWORD dreg_handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_RECORD *frame, CONTEXT *context, EXCEPTION_REGISTRATION_RECORD **dispatcher ) { @@ -241,58 +241,22 @@ static DWORD dreg_handler( EXCEPTION_REC return ExceptionContinueExecution; } -static BYTE code[5] = { +static const BYTE segfault_code[5] = { 0x31, 0xc0, /* xor %eax,%eax */ 0x8f, 0x00, /* popl (%eax) - cause exception */ 0xc3 /* ret */ }; -static void test_debug_regs(void) -{ - CONTEXT ctx; - NTSTATUS res; - struct - { - EXCEPTION_REGISTRATION_RECORD frame; - } exc_frame; - void (*func)(void) = (void*)code; - - pNtCurrentTeb = (void *)GetProcAddress( GetModuleHandleA("ntdll.dll"), "NtCurrentTeb" ); - if (!pNtCurrentTeb) - { - trace( "NtCurrentTeb not found, skipping tests\n" ); - return; - } - pNtGetContextThread = (void *)GetProcAddress( GetModuleHandleA("ntdll.dll"), "NtGetContextThread" ); - if (!pNtGetContextThread) - { - trace( "NtGetContextThread not found, skipping tests\n" ); - return; - } - - exc_frame.frame.Handler = dreg_handler; - exc_frame.frame.Prev = pNtCurrentTeb()->Tib.ExceptionList; - pNtCurrentTeb()->Tib.ExceptionList = &exc_frame.frame; - func(); - pNtCurrentTeb()->Tib.ExceptionList = exc_frame.frame.Prev; - ctx.ContextFlags = CONTEXT_DEBUG_REGISTERS; - res = pNtGetContextThread(GetCurrentThread(), &ctx); - ok (res == STATUS_SUCCESS,"NtGetContextThread failed with %x\n", res); - ok(ctx.Dr0 == 0x42424242,"failed to set debugregister 0 to 0x42424242, got %x\n", ctx.Dr0); - ok(ctx.Dr7 == 0x155,"failed to set debugregister 7 to 0x155, got %x\n", ctx.Dr7); -} - /* test the single step exception behaviour */ -static int gotsinglesteps = 0; static DWORD single_step_handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_RECORD *frame, CONTEXT *context, EXCEPTION_REGISTRATION_RECORD **dispatcher ) { - gotsinglesteps++; + got_exception++; ok (!(context->EFlags & 0x100), "eflags has single stepping bit set\n"); return ExceptionContinueExecution; } -static BYTE single_stepcode[] = { +static const BYTE single_stepcode[] = { 0x9c, /* pushf */ 0x58, /* pop %eax */ 0x0d,0,1,0,0, /* or $0x100,%eax */ @@ -304,28 +268,8 @@ static BYTE single_stepcode[] = { 0xc3 }; -static void test_single_step(void) -{ - struct { - EXCEPTION_REGISTRATION_RECORD frame; - } exc_frame; - void (*func)(void) = (void *)single_stepcode; - - pNtCurrentTeb = (void *)GetProcAddress( GetModuleHandleA("ntdll.dll"), "NtCurrentTeb" ); - if (!pNtCurrentTeb) { - trace( "NtCurrentTeb not found, skipping tests\n" ); - return; - } - exc_frame.frame.Handler = single_step_handler; - exc_frame.frame.Prev = pNtCurrentTeb()->Tib.ExceptionList; - pNtCurrentTeb()->Tib.ExceptionList = &exc_frame.frame; - func(); - ok(gotsinglesteps == 1, "expected 1 single step exceptions, got %d\n", gotsinglesteps); - pNtCurrentTeb()->Tib.ExceptionList = exc_frame.frame.Prev; -} - /* Test the alignment check (AC) flag handling. */ -static BYTE align_check_code[] = { +static const BYTE align_check_code[] = { 0x55, /* push %ebp */ 0x89,0xe5, /* mov %esp,%ebp */ 0x9c, /* pushf */ @@ -333,8 +277,8 @@ static BYTE align_check_code[] = { 0x0d,0,0,4,0, /* or $0x40000,%eax */ 0x50, /* push %eax */ 0x9d, /* popf */ - 0x8b,0x45,8, /* mov 0x8(%ebp),%eax */ - 0xc7,0x40,1,42,0,0,0, /* movl $42,0x1(%eax) */ + 0x89,0xe0, /* mov %esp, %eax */ + 0x8b,0x40,0x1, /* mov 0x1(%eax), %eax - cause exception */ 0x9c, /* pushf */ 0x58, /* pop %eax */ 0x35,0,0,4,0, /* xor $0x40000,%eax */ @@ -344,36 +288,44 @@ static BYTE align_check_code[] = { 0xc3, /* ret */ }; -static int gotalignfaults = 0; static DWORD align_check_handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_RECORD *frame, CONTEXT *context, EXCEPTION_REGISTRATION_RECORD **dispatcher ) { ok (!(context->EFlags & 0x40000), "eflags has AC bit set\n"); - gotalignfaults++; + got_exception++; return ExceptionContinueExecution; } -static void test_align_faults(void) +static void test_exceptions(void) { - int twoints[2]; - struct { - EXCEPTION_REGISTRATION_RECORD frame; - } exc_frame; - void (*func1)(int*) = (void *)align_check_code; + CONTEXT ctx; + NTSTATUS res; - pNtCurrentTeb = (void *)GetProcAddress( GetModuleHandleA("ntdll.dll"), "NtCurrentTeb" ); - if (!pNtCurrentTeb) { - trace( "NtCurrentTeb not found, skipping tests\n" ); + pNtGetContextThread = (void *)GetProcAddress( GetModuleHandleA("ntdll.dll"), "NtGetContextThread" ); + if (!pNtGetContextThread) + { + trace( "NtGetContextThread not found, skipping tests\n" ); return; } - exc_frame.frame.Handler = align_check_handler; - exc_frame.frame.Prev = pNtCurrentTeb()->Tib.ExceptionList; - pNtCurrentTeb()->Tib.ExceptionList = &exc_frame.frame; - gotalignfaults=0; - func1(twoints); - ok(gotalignfaults == 0, "got %d alignment faults, expected 0\n", gotalignfaults); - pNtCurrentTeb()->Tib.ExceptionList = exc_frame.frame.Prev; + /* test handling of debug registers */ + run_exception_test(dreg_handler, NULL, &segfault_code); + + ctx.ContextFlags = CONTEXT_DEBUG_REGISTERS; + res = pNtGetContextThread(GetCurrentThread(), &ctx); + ok (res == STATUS_SUCCESS,"NtGetContextThread failed with %x\n", res); + ok(ctx.Dr0 == 0x42424242,"failed to set debugregister 0 to 0x42424242, got %x\n", ctx.Dr0); + ok(ctx.Dr7 == 0x155,"failed to set debugregister 7 to 0x155, got %x\n", ctx.Dr7); + + /* test single stepping behavior */ + got_exception = 0; + run_exception_test(single_step_handler, NULL, &single_stepcode); + ok(got_exception == 1, "expected 1 single step exceptions, got %d\n", got_exception); + + /* test alignment exceptions */ + got_exception = 0; + run_exception_test(align_check_handler, NULL, align_check_code); + ok(got_exception == 0, "got %d alignment faults, expected 0\n", got_exception); } #endif /* __i386__ */ @@ -381,9 +333,14 @@ static void test_align_faults(void) START_TEST(exception) { #ifdef __i386__ + pNtCurrentTeb = (void *)GetProcAddress( GetModuleHandleA("ntdll.dll"), "NtCurrentTeb" ); + if (!pNtCurrentTeb) + { + trace( "NtCurrentTeb not found, skipping tests\n" ); + return; + } + test_prot_fault(); - test_debug_regs(); - test_single_step(); - test_align_faults(); + test_exceptions(); #endif }

1 0

Markus Amsler : d3d8: Use correct COM macros.
by Alexandre Julliard 01 Dec '06

01 Dec '06

Module: wine Branch: master Commit: 44e6c6b67aede6d5a52c7cc537e3afe426e32f09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44e6c6b67aede6d5a52c7cc53… Author: Markus Amsler <markus.amsler(a)oribi.org> Date: Fri Dec 1 00:15:42 2006 +0100 d3d8: Use correct COM macros. --- dlls/d3d8/device.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 68b0dff..51679cc 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -138,8 +138,8 @@ static HRESULT WINAPI IDirect3DDevice8Im hr = IWineD3DDevice_GetDirect3D(This->WineD3DDevice, &pWineD3D); if (hr == D3D_OK && pWineD3D != NULL) { - IWineD3DResource_GetParent((IWineD3DResource *)pWineD3D,(IUnknown **)ppD3D8); - IWineD3DResource_Release((IWineD3DResource *)pWineD3D); + IWineD3D_GetParent(pWineD3D,(IUnknown **)ppD3D8); + IWineD3D_Release(pWineD3D); } else { FIXME("Call to IWineD3DDevice_GetDirect3D failed\n"); *ppD3D8 = NULL; @@ -678,8 +678,8 @@ static HRESULT WINAPI IDirect3DDevice8 hr = IWineD3DDevice_GetRenderTarget(This->WineD3DDevice, 0, &pRenderTarget); if (hr == D3D_OK && pRenderTarget != NULL) { - IWineD3DResource_GetParent((IWineD3DResource *)pRenderTarget,(IUnknown**)ppRenderTarget); - IWineD3DResource_Release((IWineD3DResource *)pRenderTarget); + IWineD3DSurface_GetParent(pRenderTarget,(IUnknown**)ppRenderTarget); + IWineD3DSurface_Release(pRenderTarget); } else { FIXME("Call to IWineD3DDevice_GetRenderTarget failed\n"); *ppRenderTarget = NULL; @@ -700,8 +700,8 @@ static HRESULT WINAPI IDirect3DDevice8 hr=IWineD3DDevice_GetDepthStencilSurface(This->WineD3DDevice,&pZStencilSurface); if(hr == D3D_OK && pZStencilSurface != NULL){ - IWineD3DResource_GetParent((IWineD3DResource *)pZStencilSurface,(IUnknown**)ppZStencilSurface); - IWineD3DResource_Release((IWineD3DResource *)pZStencilSurface); + IWineD3DSurface_GetParent(pZStencilSurface,(IUnknown**)ppZStencilSurface); + IWineD3DSurface_Release(pZStencilSurface); }else{ FIXME("Call to IWineD3DDevice_GetDepthStencilSurface failed\n"); *ppZStencilSurface = NULL; @@ -1315,8 +1315,8 @@ static HRESULT WINAPI IDirect3DDevice8Im rc = IWineD3DDevice_GetIndices(This->WineD3DDevice, &retIndexData, &tmp); if (D3D_OK == rc && NULL != retIndexData) { - IWineD3DVertexBuffer_GetParent(retIndexData, (IUnknown **)ppIndexData); - IWineD3DVertexBuffer_Release(retIndexData); + IWineD3DIndexBuffer_GetParent(retIndexData, (IUnknown **)ppIndexData); + IWineD3DIndexBuffer_Release(retIndexData); } else { if(rc != D3D_OK) FIXME("Call to GetIndices failed\n"); *ppIndexData = NULL;

1 0

Markus Amsler : d3d9: Use correct COM macros.
by Alexandre Julliard 01 Dec '06

01 Dec '06

Module: wine Branch: master Commit: 61087377a0eed2b5d512a64791330519205b6236 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61087377a0eed2b5d512a6479… Author: Markus Amsler <markus.amsler(a)oribi.org> Date: Fri Dec 1 00:16:10 2006 +0100 d3d9: Use correct COM macros. --- dlls/d3d9/device.c | 16 ++++++++-------- dlls/d3d9/vertexdeclaration.c | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 349356b..094f79f 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -100,8 +100,8 @@ HRESULT WINAPI IDirect3DDevice9Impl_Ge hr = IWineD3DDevice_GetDirect3D(This->WineD3DDevice, &pWineD3D); if (hr == D3D_OK && pWineD3D != NULL) { - IWineD3DResource_GetParent((IWineD3DResource *)pWineD3D,(IUnknown **)ppD3D9); - IWineD3DResource_Release((IWineD3DResource *)pWineD3D); + IWineD3D_GetParent(pWineD3D,(IUnknown **)ppD3D9); + IWineD3D_Release(pWineD3D); } else { FIXME("Call to IWineD3DDevice_GetDirect3D failed\n"); *ppD3D9 = NULL; @@ -404,8 +404,8 @@ static HRESULT WINAPI IDirect3DDevice9 hr=IWineD3DDevice_GetRenderTarget(This->WineD3DDevice,RenderTargetIndex,&pRenderTarget); if (hr == D3D_OK && pRenderTarget != NULL) { - IWineD3DResource_GetParent((IWineD3DResource *)pRenderTarget,(IUnknown**)ppRenderTarget); - IWineD3DResource_Release((IWineD3DResource *)pRenderTarget); + IWineD3DSurface_GetParent(pRenderTarget,(IUnknown**)ppRenderTarget); + IWineD3DSurface_Release(pRenderTarget); } else { FIXME("Call to IWineD3DDevice_GetRenderTarget failed\n"); *ppRenderTarget = NULL; @@ -435,8 +435,8 @@ static HRESULT WINAPI IDirect3DDevice9 hr=IWineD3DDevice_GetDepthStencilSurface(This->WineD3DDevice,&pZStencilSurface); if(hr == D3D_OK && pZStencilSurface != NULL){ - IWineD3DResource_GetParent((IWineD3DResource *)pZStencilSurface,(IUnknown**)ppZStencilSurface); - IWineD3DResource_Release((IWineD3DResource *)pZStencilSurface); + IWineD3DSurface_GetParent(pZStencilSurface,(IUnknown**)ppZStencilSurface); + IWineD3DSurface_Release(pZStencilSurface); }else{ FIXME("Call to IWineD3DDevice_GetRenderTarget failed\n"); *ppZStencilSurface = NULL; @@ -838,8 +838,8 @@ static HRESULT WINAPI IDirect3DDevice9 rc = IWineD3DDevice_GetIndices(This->WineD3DDevice, &retIndexData, &tmp); if (rc == D3D_OK && NULL != retIndexData) { - IWineD3DVertexBuffer_GetParent(retIndexData, (IUnknown **)ppIndexData); - IWineD3DVertexBuffer_Release(retIndexData); + IWineD3DIndexBuffer_GetParent(retIndexData, (IUnknown **)ppIndexData); + IWineD3DIndexBuffer_Release(retIndexData); }else{ if(rc != D3D_OK) FIXME("Call to GetIndices failed\n"); *ppIndexData = NULL; diff --git a/dlls/d3d9/vertexdeclaration.c b/dlls/d3d9/vertexdeclaration.c index 5572552..e8dfe0c 100644 --- a/dlls/d3d9/vertexdeclaration.c +++ b/dlls/d3d9/vertexdeclaration.c @@ -321,8 +321,8 @@ HRESULT WINAPI IDirect3DDevice9Impl_Ge *ppDecl = NULL; hr = IWineD3DDevice_GetVertexDeclaration(This->WineD3DDevice, &pTest); if (hr == D3D_OK && NULL != pTest) { - IWineD3DResource_GetParent(pTest, (IUnknown **)ppDecl); - IWineD3DResource_Release(pTest); + IWineD3DVertexDeclaration_GetParent(pTest, (IUnknown **)ppDecl); + IWineD3DVertexDeclaration_Release(pTest); } else { *ppDecl = NULL; }

1 0

Markus Amsler : wined3d: Remove duplicated code.
by Alexandre Julliard 01 Dec '06

01 Dec '06

Module: wine Branch: master Commit: 3127eac2bdcde356f318fd8680d402d2a99a867b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3127eac2bdcde356f318fd868… Author: Markus Amsler <markus.amsler(a)oribi.org> Date: Fri Dec 1 00:10:16 2006 +0100 wined3d: Remove duplicated code. --- dlls/wined3d/directx.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 5fc22d6..c46af63 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2486,10 +2486,6 @@ create_device_error: IWineD3DSurface_Release(object->stencilBufferTarget); object->stencilBufferTarget = NULL; } - if (object->stencilBufferTarget != NULL) { - IWineD3DSurface_Release(object->stencilBufferTarget); - object->stencilBufferTarget = NULL; - } HeapFree(GetProcessHeap(), 0, object); *ppReturnedDeviceInterface = NULL; return WINED3DERR_INVALIDCALL;

1 0

Markus Amsler : ddraw: Call wined3d' s SetTextureStageState not the one of d3d7.
by Alexandre Julliard 01 Dec '06

01 Dec '06

Module: wine Branch: master Commit: e2881758a1e59f4f79deb90a0a04e847d6fcf1e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2881758a1e59f4f79deb90a0… Author: Markus Amsler <markus.amsler(a)oribi.org> Date: Fri Dec 1 00:15:18 2006 +0100 ddraw: Call wined3d's SetTextureStageState not the one of d3d7. --- dlls/ddraw/device.c | 40 ++++++++++++++++++++-------------------- 1 files changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index cfbbba9..c05089f 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -2366,35 +2366,35 @@ IDirect3DDeviceImpl_7_SetRenderState(IDi switch ( (D3DTEXTUREBLEND) Value) { case D3DTBLEND_MODULATE: - IWineD3DDevice_SetTextureStageState(iface, 0, WINED3DTSS_COLORARG1, WINED3DTA_TEXTURE); - IWineD3DDevice_SetTextureStageState(iface, 0, WINED3DTSS_ALPHAARG1, WINED3DTA_TEXTURE); - IWineD3DDevice_SetTextureStageState(iface, 0, WINED3DTSS_COLORARG2, WINED3DTA_CURRENT); - IWineD3DDevice_SetTextureStageState(iface, 0, WINED3DTSS_COLOROP, WINED3DTOP_MODULATE); - IWineD3DDevice_SetTextureStageState(iface, 0, WINED3DTSS_ALPHAOP, WINED3DTOP_SELECTARG1); + IWineD3DDevice_SetTextureStageState(This->wineD3DDevice, 0, WINED3DTSS_COLORARG1, WINED3DTA_TEXTURE); + IWineD3DDevice_SetTextureStageState(This->wineD3DDevice, 0, WINED3DTSS_ALPHAARG1, WINED3DTA_TEXTURE); + IWineD3DDevice_SetTextureStageState(This->wineD3DDevice, 0, WINED3DTSS_COLORARG2, WINED3DTA_CURRENT); + IWineD3DDevice_SetTextureStageState(This->wineD3DDevice, 0, WINED3DTSS_COLOROP, WINED3DTOP_MODULATE); + IWineD3DDevice_SetTextureStageState(This->wineD3DDevice, 0, WINED3DTSS_ALPHAOP, WINED3DTOP_SELECTARG1); break; case D3DTBLEND_MODULATEALPHA: - IWineD3DDevice_SetTextureStageState(iface, 0, WINED3DTSS_COLORARG1, WINED3DTA_TEXTURE); - IWineD3DDevice_SetTextureStageState(iface, 0, WINED3DTSS_ALPHAARG1, WINED3DTA_TEXTURE); - IWineD3DDevice_SetTextureStageState(iface, 0, WINED3DTSS_COLORARG2, WINED3DTA_CURRENT); - IWineD3DDevice_SetTextureStageState(iface, 0, WINED3DTSS_ALPHAARG2, WINED3DTA_CURRENT); - IWineD3DDevice_SetTextureStageState(iface, 0, WINED3DTSS_COLOROP, WINED3DTOP_MODULATE); - IWineD3DDevice_SetTextureStageState(iface, 0, WINED3DTSS_ALPHAOP, WINED3DTOP_MODULATE); + IWineD3DDevice_SetTextureStageState(This->wineD3DDevice, 0, WINED3DTSS_COLORARG1, WINED3DTA_TEXTURE); + IWineD3DDevice_SetTextureStageState(This->wineD3DDevice, 0, WINED3DTSS_ALPHAARG1, WINED3DTA_TEXTURE); + IWineD3DDevice_SetTextureStageState(This->wineD3DDevice, 0, WINED3DTSS_COLORARG2, WINED3DTA_CURRENT); + IWineD3DDevice_SetTextureStageState(This->wineD3DDevice, 0, WINED3DTSS_ALPHAARG2, WINED3DTA_CURRENT); + IWineD3DDevice_SetTextureStageState(This->wineD3DDevice, 0, WINED3DTSS_COLOROP, WINED3DTOP_MODULATE); + IWineD3DDevice_SetTextureStageState(This->wineD3DDevice, 0, WINED3DTSS_ALPHAOP, WINED3DTOP_MODULATE); break; case D3DTBLEND_DECAL: - IWineD3DDevice_SetTextureStageState(iface, 0, WINED3DTSS_COLORARG1, WINED3DTA_TEXTURE); - IWineD3DDevice_SetTextureStageState(iface, 0, WINED3DTSS_ALPHAARG1, WINED3DTA_TEXTURE); - IWineD3DDevice_SetTextureStageState(iface, 0, WINED3DTSS_COLOROP, WINED3DTOP_SELECTARG1); - IWineD3DDevice_SetTextureStageState(iface, 0, WINED3DTSS_ALPHAOP, WINED3DTOP_SELECTARG1); + IWineD3DDevice_SetTextureStageState(This->wineD3DDevice, 0, WINED3DTSS_COLORARG1, WINED3DTA_TEXTURE); + IWineD3DDevice_SetTextureStageState(This->wineD3DDevice, 0, WINED3DTSS_ALPHAARG1, WINED3DTA_TEXTURE); + IWineD3DDevice_SetTextureStageState(This->wineD3DDevice, 0, WINED3DTSS_COLOROP, WINED3DTOP_SELECTARG1); + IWineD3DDevice_SetTextureStageState(This->wineD3DDevice, 0, WINED3DTSS_ALPHAOP, WINED3DTOP_SELECTARG1); break; case D3DTBLEND_DECALALPHA: - IWineD3DDevice_SetTextureStageState(iface, 0, WINED3DTSS_COLORARG1, WINED3DTA_TEXTURE); - IWineD3DDevice_SetTextureStageState(iface, 0, WINED3DTSS_ALPHAARG1, WINED3DTA_TEXTURE); - IWineD3DDevice_SetTextureStageState(iface, 0, WINED3DTSS_ALPHAARG2, WINED3DTA_CURRENT); - IWineD3DDevice_SetTextureStageState(iface, 0, WINED3DTSS_COLOROP, WINED3DTOP_SELECTARG1); - IWineD3DDevice_SetTextureStageState(iface, 0, WINED3DTSS_ALPHAOP, WINED3DTOP_MODULATE); + IWineD3DDevice_SetTextureStageState(This->wineD3DDevice, 0, WINED3DTSS_COLORARG1, WINED3DTA_TEXTURE); + IWineD3DDevice_SetTextureStageState(This->wineD3DDevice, 0, WINED3DTSS_ALPHAARG1, WINED3DTA_TEXTURE); + IWineD3DDevice_SetTextureStageState(This->wineD3DDevice, 0, WINED3DTSS_ALPHAARG2, WINED3DTA_CURRENT); + IWineD3DDevice_SetTextureStageState(This->wineD3DDevice, 0, WINED3DTSS_COLOROP, WINED3DTOP_SELECTARG1); + IWineD3DDevice_SetTextureStageState(This->wineD3DDevice, 0, WINED3DTSS_ALPHAOP, WINED3DTOP_MODULATE); break; default:

1 0

Roderick Colenbrander : wgl: Relax the pixel format attribute conversion code a bit.
by Alexandre Julliard 01 Dec '06

01 Dec '06

Module: wine Branch: master Commit: eb0350bb1bef70395c482bc718af45c0f7ca3b23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb0350bb1bef70395c482bc71… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Thu Nov 30 23:55:08 2006 +0100 wgl: Relax the pixel format attribute conversion code a bit. --- dlls/winex11.drv/opengl.c | 24 +++++++++++++++--------- 1 files changed, 15 insertions(+), 9 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 146a668..94739bb 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -667,14 +667,18 @@ static int ConvertAttribWGLtoGLX(const i case WGL_SUPPORT_GDI_ARB: pop = iWGLAttr[++cur]; - PUSH2(oGLXAttr, GLX_X_RENDERABLE, pop); - TRACE("pAttr[%d] = GLX_RENDERABLE: %d\n", cur, pop); + /* We only support a limited number of formats which are all renderable by X (similar to GDI). + * Ignore this attribute to prevent us from not finding a match due to the limited + * amount of formats supported right now. This option could be matched to GLX_X_RENDERABLE + * but the issue is that when a program asks for no GDI support, there's no format we can return + * as all our supported formats are renderable by X. + */ + TRACE("pAttr[%d] = WGL_SUPPORT_GDI_ARB: %d\n", cur, pop); break; case WGL_DRAW_TO_BITMAP_ARB: pop = iWGLAttr[++cur]; - PUSH2(oGLXAttr, GLX_X_RENDERABLE, pop); - TRACE("pAttr[%d] = GLX_RENDERABLE: %d\n", cur, pop); + TRACE("pAttr[%d] = WGL_DRAW_TO_BITMAP_ARB: %d\n", cur, pop); if (pop) { PUSH2(oGLXAttr, GLX_DRAWABLE_TYPE, GLX_PIXMAP_BIT); TRACE("pAttr[%d] = GLX_DRAWABLE_TYPE: GLX_PIXMAP_BIT\n", cur); @@ -691,8 +695,6 @@ static int ConvertAttribWGLtoGLX(const i case WGL_DRAW_TO_PBUFFER_ARB: pop = iWGLAttr[++cur]; - PUSH2(oGLXAttr, GLX_X_RENDERABLE, pop); - TRACE("pAttr[%d] = GLX_RENDERABLE: %d\n", cur, pop); if (pop) { PUSH2(oGLXAttr, GLX_DRAWABLE_TYPE, GLX_PBUFFER_BIT); TRACE("pAttr[%d] = GLX_DRAWABLE_TYPE: GLX_PBUFFER_BIT\n", cur); @@ -2399,13 +2401,17 @@ static GLboolean WINAPI X11DRV_wglGetPix case WGL_AUX_BUFFERS_ARB: curGLXAttr = GLX_AUX_BUFFERS; break; - case WGL_SUPPORT_GDI_ARB: case WGL_DRAW_TO_WINDOW_ARB: case WGL_DRAW_TO_BITMAP_ARB: + /* We only supported a limited number of formats right now which are all renderable by X 'GLX_X_RENDERABLE' */ + piValues[i] = GL_TRUE; + continue; case WGL_DRAW_TO_PBUFFER_ARB: - curGLXAttr = GLX_X_RENDERABLE; - break; + hTest = pglXGetFBConfigAttrib(gdi_display, curCfg, GLX_DRAWABLE_TYPE, &tmp); + if (hTest) goto get_error; + piValues[i] = (tmp & GLX_PBUFFER_BIT) ? GL_TRUE : GL_FALSE; + continue; case WGL_PBUFFER_LARGEST_ARB: curGLXAttr = GLX_LARGEST_PBUFFER;

1 0

Jacek Caban : mshtml: Added handling of right and left arrow keys in editing mode.
by Alexandre Julliard 01 Dec '06

01 Dec '06

Module: wine Branch: master Commit: bc716856763fb9fa623bf614f60db7a225c49d18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc716856763fb9fa623bf614f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 30 23:32:05 2006 +0100 mshtml: Added handling of right and left arrow keys in editing mode. --- dlls/mshtml/editor.c | 204 ++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 4 + dlls/mshtml/nsembed.c | 70 ++++++++++++++- dlls/mshtml/nsiface.idl | 40 ++++++++- 4 files changed, 316 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bc716856763fb9fa623bf…

1 0

Paul Vriens : user32: W2K3 returns ERROR_INVALID_PARAMETER.
by Alexandre Julliard 01 Dec '06

01 Dec '06

Module: wine Branch: master Commit: 93c909a3ad9a2b86ee26e645150accc3c339ecbf URL: http://source.winehq.org/git/wine.git/?a=commit;h=93c909a3ad9a2b86ee26e6451… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Thu Nov 30 22:19:54 2006 +0100 user32: W2K3 returns ERROR_INVALID_PARAMETER. --- dlls/user32/tests/class.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/user32/tests/class.c b/dlls/user32/tests/class.c index d3c173a..a847529 100644 --- a/dlls/user32/tests/class.c +++ b/dlls/user32/tests/class.c @@ -542,7 +542,9 @@ static void test_instances(void) ok( !UnregisterClass( "BUTTON", (HINSTANCE)0x87654321 ), "Unregistered button a second time\n" ); ok( GetLastError() == ERROR_CLASS_DOES_NOT_EXIST, "Wrong error code %d\n", GetLastError() ); ok( !GetClassInfo( 0, "BUTTON", &wc ), "Button still exists\n" ); - ok( GetLastError() == ERROR_CLASS_DOES_NOT_EXIST, "Wrong error code %d\n", GetLastError() ); + ok( GetLastError() == ERROR_CLASS_DOES_NOT_EXIST || + GetLastError() == ERROR_INVALID_PARAMETER /* W2K3 */, + "Wrong error code %d\n", GetLastError() ); /* we can change the instance of a system class */ check_instance( "EDIT", (HINSTANCE)0xdeadbeef, (HINSTANCE)0xdeadbeef, user32 );

1 0

Alexandre Julliard : ntdll: Don' t free the DOS area when a broken app passes a NULL pointer to NtFreeVirtualMemory .
by Alexandre Julliard 01 Dec '06

01 Dec '06

Module: wine Branch: master Commit: 8385f137b50242c632bd8f91a495a2b7e5adfee4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8385f137b50242c632bd8f91a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 1 11:38:52 2006 +0100 ntdll: Don't free the DOS area when a broken app passes a NULL pointer to NtFreeVirtualMemory. --- dlls/ntdll/virtual.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index c62390a..573072e 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1430,6 +1430,9 @@ NTSTATUS WINAPI NtFreeVirtualMemory( HAN size = ROUND_SIZE( addr, size ); base = ROUND_ADDR( addr, page_mask ); + /* avoid freeing the DOS area when a broken app passes a NULL pointer */ + if (!base && !(type & MEM_SYSTEM)) return STATUS_INVALID_PARAMETER; + RtlEnterCriticalSection(&csVirtual); if (!(view = VIRTUAL_FindView( base )) ||

1 0

appdb/include version.php
by WineHQ 01 Dec '06

01 Dec '06

ChangeSet ID: 30209 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/11/30 20:55:09 Modified files: include : version.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Quote output parameters used in <input> tags, otherwise empty variables will end up incorrectly pulling in the / from the end of a <input /> tag Patch: http://cvs.winehq.org/patch.py?id=30209 Old revision New revision Changes Path 1.84 1.85 +4 -4 appdb/include/version.php Index: appdb/include/version.php diff -u -p appdb/include/version.php:1.84 appdb/include/version.php:1.85 --- appdb/include/version.php:1.84 1 Dec 2006 2:55: 9 -0000 +++ appdb/include/version.php 1 Dec 2006 2:55: 9 -0000 @@ -540,7 +540,7 @@ class Version { echo html_frame_start("Version Form", "90%", "", 0); echo "<table width='100%' border=0 cellpadding=2 cellspacing=0>\n"; - echo '<input type="hidden" name="iVersionId" value='.$this->iVersionId.' />'; + echo '<input type="hidden" name="iVersionId" value="'.$this->iVersionId.'" />'; if($editParentApplication) { @@ -552,7 +552,7 @@ class Version { echo '</td></tr>',"\n"; } else { - echo '<input type="hidden" name="iAppId" value='.$this->iAppId.' />'; + echo '<input type="hidden" name="iAppId" value="'.$this->iAppId.'" />'; } // version name @@ -583,8 +583,8 @@ class Version { echo html_frame_end(); } else { - echo '<input type="hidden" name="sMaintainerRating" value='.$this->sTestedRating.' />'; - echo '<input type="hidden" name="sMaintainerRelease" value='.$this->sTestedRelease.' />'; + echo '<input type="hidden" name="sMaintainerRating" value="'.$this->sTestedRating.'" />'; + echo '<input type="hidden" name="sMaintainerRelease" value="'.$this->sTestedRelease.'" />'; } }

1 0