wine-commits August 2008

wine-commits@winehq.org

2 participants
839 discussions

H. Verbeet : wined3d: Handle CTXUSAGE_BLIT with offscreen targets and FBO ORM.
by Alexandre Julliard 05 Aug '08

05 Aug '08

Module: wine Branch: master Commit: 2d6d8795624b95e654d712e1958dd631df46dcfc URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d6d8795624b95e654d712e19… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Mon Aug 4 19:28:42 2008 +0200 wined3d: Handle CTXUSAGE_BLIT with offscreen targets and FBO ORM. This is mostly for correctness, in practice we should always be able to avoid using CTXUSAGE_BLIT for offscreen targets when FBO ORM is used. --- dlls/wined3d/context.c | 33 ++++++++++++++++++++++++--------- dlls/wined3d/device.c | 2 +- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 26 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 56111ef..4440848 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1065,16 +1065,22 @@ static void apply_draw_buffer(IWineD3DDeviceImpl *This, IWineD3DSurface *target, } else { - if (!blit && wined3d_settings.offscreen_rendering_mode == ORM_FBO) + if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) { - if (GL_SUPPORT(ARB_DRAW_BUFFERS)) + if (!blit) { - GL_EXTCALL(glDrawBuffersARB(GL_LIMITS(buffers), This->draw_buffers)); - checkGLcall("glDrawBuffers()"); - } - else - { - glDrawBuffer(This->draw_buffers[0]); + if (GL_SUPPORT(ARB_DRAW_BUFFERS)) + { + GL_EXTCALL(glDrawBuffersARB(GL_LIMITS(buffers), This->draw_buffers)); + checkGLcall("glDrawBuffers()"); + } + else + { + glDrawBuffer(This->draw_buffers[0]); + checkGLcall("glDrawBuffer()"); + } + } else { + glDrawBuffer(GL_COLOR_ATTACHMENT0_EXT); checkGLcall("glDrawBuffer()"); } } @@ -1165,7 +1171,16 @@ void ActivateContext(IWineD3DDeviceImpl *This, IWineD3DSurface *target, ContextU case CTXUSAGE_BLIT: if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) { - GL_EXTCALL(glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0)); + if (This->render_offscreen) { + FIXME("Activating for CTXUSAGE_BLIT for an offscreen target with ORM_FBO. This should be avoided.\n"); + bind_fbo((IWineD3DDevice *)This, GL_FRAMEBUFFER_EXT, &This->dst_fbo); + attach_surface_fbo(This, GL_FRAMEBUFFER_EXT, 0, target); + GL_EXTCALL(glFramebufferRenderbufferEXT(GL_FRAMEBUFFER_EXT, GL_DEPTH_ATTACHMENT_EXT, GL_RENDERBUFFER_EXT, 0)); + checkGLcall("glFramebufferRenderbufferEXT"); + } else { + GL_EXTCALL(glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0)); + checkGLcall("glFramebufferRenderbufferEXT"); + } context->draw_buffer_dirty = TRUE; } if (context->draw_buffer_dirty) { diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 7867517..9e97d3b 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -6127,7 +6127,7 @@ void attach_depth_stencil_fbo(IWineD3DDeviceImpl *This, GLenum fbo_target, IWine } } -static void attach_surface_fbo(IWineD3DDeviceImpl *This, GLenum fbo_target, DWORD idx, IWineD3DSurface *surface) { +void attach_surface_fbo(IWineD3DDeviceImpl *This, GLenum fbo_target, DWORD idx, IWineD3DSurface *surface) { const IWineD3DSurfaceImpl *surface_impl = (IWineD3DSurfaceImpl *)surface; IWineD3DBaseTextureImpl *texture_impl; GLenum texttarget, target; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 33b48df..c1432ec 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2469,6 +2469,7 @@ void stretch_rect_fbo(IWineD3DDevice *iface, IWineD3DSurface *src_surface, WINED IWineD3DSurface *dst_surface, WINED3DRECT *dst_rect, const WINED3DTEXTUREFILTERTYPE filter, BOOL flip); void bind_fbo(IWineD3DDevice *iface, GLenum target, GLuint *fbo); void attach_depth_stencil_fbo(IWineD3DDeviceImpl *This, GLenum fbo_target, IWineD3DSurface *depth_stencil, BOOL use_render_buffer); +void attach_surface_fbo(IWineD3DDeviceImpl *This, GLenum fbo_target, DWORD idx, IWineD3DSurface *surface); void depth_blt(IWineD3DDevice *iface, GLuint texture); #endif

1 0

H. Verbeet : wined3d: Apply FBO state in ActivateContext().
by Alexandre Julliard 05 Aug '08

05 Aug '08

Module: wine Branch: master Commit: b685b84e667dd8c32fa4a9e76c2c428d8f48d306 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b685b84e667dd8c32fa4a9e76… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Mon Aug 4 19:28:37 2008 +0200 wined3d: Apply FBO state in ActivateContext(). Fixes some GL errors due to calling glDrawBuffer(GL_BACK) when an FBO is still active. --- dlls/wined3d/context.c | 52 +++++++++++++++++++++++++++++++++++++++++----- dlls/wined3d/device.c | 12 ---------- dlls/wined3d/drawprim.c | 6 ----- 3 files changed, 46 insertions(+), 24 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 3556714..56111ef 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1051,7 +1051,7 @@ static inline WineD3DContext *FindContext(IWineD3DDeviceImpl *This, IWineD3DSurf return context; } -static void apply_draw_buffer(IWineD3DDeviceImpl *This, IWineD3DSurface *target) +static void apply_draw_buffer(IWineD3DDeviceImpl *This, IWineD3DSurface *target, BOOL blit) { HRESULT hr; IWineD3DSwapChain *swapchain; @@ -1065,8 +1065,24 @@ static void apply_draw_buffer(IWineD3DDeviceImpl *This, IWineD3DSurface *target) } else { - glDrawBuffer(This->offscreenBuffer); - checkGLcall("glDrawBuffer()"); + if (!blit && wined3d_settings.offscreen_rendering_mode == ORM_FBO) + { + if (GL_SUPPORT(ARB_DRAW_BUFFERS)) + { + GL_EXTCALL(glDrawBuffersARB(GL_LIMITS(buffers), This->draw_buffers)); + checkGLcall("glDrawBuffers()"); + } + else + { + glDrawBuffer(This->draw_buffers[0]); + checkGLcall("glDrawBuffer()"); + } + } + else + { + glDrawBuffer(This->offscreenBuffer); + checkGLcall("glDrawBuffer()"); + } } } @@ -1135,9 +1151,33 @@ void ActivateContext(IWineD3DDeviceImpl *This, IWineD3DSurface *target, ContextU /* We only need ENTER_GL for the gl calls made below and for the helper functions which make GL calls */ ENTER_GL(); - if (context->draw_buffer_dirty) { - apply_draw_buffer(This, target); - context->draw_buffer_dirty = FALSE; + switch (usage) { + case CTXUSAGE_CLEAR: + case CTXUSAGE_DRAWPRIM: + if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) { + apply_fbo_state((IWineD3DDevice *)This); + } + if (context->draw_buffer_dirty) { + apply_draw_buffer(This, target, FALSE); + context->draw_buffer_dirty = FALSE; + } + break; + + case CTXUSAGE_BLIT: + if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) { + GL_EXTCALL(glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0)); + context->draw_buffer_dirty = TRUE; + } + if (context->draw_buffer_dirty) { + apply_draw_buffer(This, target, TRUE); + if (wined3d_settings.offscreen_rendering_mode != ORM_FBO) { + context->draw_buffer_dirty = FALSE; + } + } + break; + + default: + break; } switch(usage) { diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 55c1f46..7867517 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5026,10 +5026,6 @@ HRESULT IWineD3DDeviceImpl_ClearSurface(IWineD3DDeviceImpl *This, IWineD3DSurfa ActivateContext(This, (IWineD3DSurface *) target, CTXUSAGE_CLEAR); ENTER_GL(); - if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) { - apply_fbo_state((IWineD3DDevice *) This); - } - /* Only set the values up once, as they are not changing */ if (Flags & WINED3DCLEAR_STENCIL) { glClearStencil(Stencil); @@ -6590,14 +6586,6 @@ void apply_fbo_state(IWineD3DDevice *iface) { set_depth_stencil_fbo(iface, This->stencilBufferTarget); This->fbo_depth_attachment = This->stencilBufferTarget; } - - if (GL_SUPPORT(ARB_DRAW_BUFFERS)) { - GL_EXTCALL(glDrawBuffersARB(GL_LIMITS(buffers), This->draw_buffers)); - checkGLcall("glDrawBuffers()"); - } else { - glDrawBuffer(This->draw_buffers[0]); - checkGLcall("glDrawBuffer()"); - } } else { GL_EXTCALL(glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0)); } diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index fd96ea2..59e1f64 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -941,12 +941,6 @@ void drawPrimitive(IWineD3DDevice *iface, /* Ok, we will be updating the screen from here onwards so grab the lock */ - if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) { - ENTER_GL(); - apply_fbo_state(iface); - LEAVE_GL(); - } - ActivateContext(This, This->render_targets[0], CTXUSAGE_DRAWPRIM); ENTER_GL();

1 0

H. Verbeet : wined3d: Mark STATE_SCISSORRECT dirty in color_fill_fbo().
by Alexandre Julliard 05 Aug '08

05 Aug '08

Module: wine Branch: master Commit: 9a9414dfe299d3cb2ef7b2a07aac1d042f7f3c27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a9414dfe299d3cb2ef7b2a07… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Mon Aug 4 19:28:32 2008 +0200 wined3d: Mark STATE_SCISSORRECT dirty in color_fill_fbo(). As pointed out by Alexander Dorofeyev. --- dlls/wined3d/device.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index cc1b448..55c1f46 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -6208,6 +6208,7 @@ static void color_fill_fbo(IWineD3DDevice *iface, IWineD3DSurface *surface, CONS rect->x2 - rect->x1, rect->y2 - rect->y1); } checkGLcall("glScissor"); + IWineD3DDeviceImpl_MarkStateDirty(This, STATE_SCISSORRECT); } else { glDisable(GL_SCISSOR_TEST); }

1 0

James Hawkins : winex11: Reduce console spam for AlphaBlend deficiencies.
by Alexandre Julliard 05 Aug '08

05 Aug '08

Module: wine Branch: master Commit: 30b6954c3d2e6dc36b908fafbabbf1e14db46163 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30b6954c3d2e6dc36b908fafb… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Mon Aug 4 11:52:54 2008 -0500 winex11: Reduce console spam for AlphaBlend deficiencies. --- dlls/winex11.drv/xrender.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index c7dac70..08bb71f 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -1569,7 +1569,12 @@ BOOL X11DRV_AlphaBlend(X11DRV_PDEVICE *devDst, INT xDst, INT yDst, INT widthDst, if (!devSrc->bitmap || GetObjectW( devSrc->bitmap->hbitmap, sizeof(dib), &dib ) != sizeof(dib)) { - FIXME("not a dibsection\n"); + static BOOL out = FALSE; + if (!out) + { + FIXME("not a dibsection\n"); + out = TRUE; + } return FALSE; }

1 0

James Hawkins : msi: Change an ERR that was supposed to be a TRACE.
by Alexandre Julliard 05 Aug '08

05 Aug '08

Module: wine Branch: master Commit: 92ed390b2887e848592ae6ca9c2cecaaaccb6a0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=92ed390b2887e848592ae6ca9… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Mon Aug 4 11:52:02 2008 -0500 msi: Change an ERR that was supposed to be a TRACE. --- dlls/msi/action.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 6662945..2d2fe6c 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -5743,7 +5743,7 @@ static UINT ITERATE_PublishAssembly( MSIRECORD *rec, LPVOID param ) if (!comp || !comp->Enabled || !(comp->Action & (INSTALLSTATE_LOCAL | INSTALLSTATE_SOURCE))) { - ERR("Component not set for install, not publishing assembly\n"); + TRACE("Component not set for install, not publishing assembly\n"); return ERROR_SUCCESS; }

1 0

Paul Vriens : quartz/tests: Skip some tests on NT4.
by Alexandre Julliard 05 Aug '08

05 Aug '08

Module: wine Branch: master Commit: 04c40f2f5f779776bdece8e60b0c9cf0686c2daa URL: http://source.winehq.org/git/wine.git/?a=commit;h=04c40f2f5f779776bdece8e60… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Mon Aug 4 18:25:29 2008 +0200 quartz/tests: Skip some tests on NT4. --- dlls/quartz/tests/avisplitter.c | 23 ++++++++++++++++++++--- 1 files changed, 20 insertions(+), 3 deletions(-) diff --git a/dlls/quartz/tests/avisplitter.c b/dlls/quartz/tests/avisplitter.c index a7461f4..cdebe26 100644 --- a/dlls/quartz/tests/avisplitter.c +++ b/dlls/quartz/tests/avisplitter.c @@ -25,6 +25,10 @@ #include "dshow.h" #include "tlhelp32.h" +static HANDLE (WINAPI *pCreateToolhelp32Snapshot)(DWORD, DWORD); +static BOOL (WINAPI *pThread32First)(HANDLE, LPTHREADENTRY32); +static BOOL (WINAPI *pThread32Next)(HANDLE, LPTHREADENTRY32); + static IUnknown *pAviSplitter = NULL; static int count_threads(void) @@ -33,19 +37,19 @@ static int count_threads(void) int threads; HANDLE h; - h = CreateToolhelp32Snapshot(TH32CS_SNAPTHREAD, 0); + h = pCreateToolhelp32Snapshot(TH32CS_SNAPTHREAD, 0); te.dwSize = sizeof(te); if (h == INVALID_HANDLE_VALUE) return -1; - Thread32First(h, &te); + pThread32First(h, &te); if (te.th32OwnerProcessID == GetCurrentProcessId()) threads = 1; else threads = 0; - while (Thread32Next(h, &te)) + while (pThread32Next(h, &te)) if (te.th32OwnerProcessID == GetCurrentProcessId()) ++threads; @@ -195,6 +199,13 @@ static void test_threads() DWORD readbytes; FILTER_STATE state; + /* We need another way of counting threads on NT4. Skip these tests (for now) */ + if (!pCreateToolhelp32Snapshot || !pThread32First || !pThread32Next) + { + win_skip("Needed thread functions are not available (NT4)\n"); + return; + } + /* Before doing anything */ baselevel = count_threads(); expected = 1; @@ -447,6 +458,12 @@ fail: START_TEST(avisplitter) { + HMODULE kernel32 = GetModuleHandleA("kernel32.dll"); + + pCreateToolhelp32Snapshot = (void*)GetProcAddress(kernel32, "CreateToolhelp32Snapshot"); + pThread32First = (void*)GetProcAddress(kernel32, "Thread32First"); + pThread32Next = (void*)GetProcAddress(kernel32, "Thread32Next"); + CoInitialize(NULL); if (!create_avisplitter())

1 0

Paul Vriens : kernel32/tests: Fix a test failure on Win9x.
by Alexandre Julliard 05 Aug '08

05 Aug '08

Module: wine Branch: master Commit: 7661c6989d7c9416acc4b8821e2c32e367a910a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7661c6989d7c9416acc4b8821… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Mon Aug 4 17:29:49 2008 +0200 kernel32/tests: Fix a test failure on Win9x. --- dlls/kernel32/tests/sync.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index 02904f7..b685259 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -54,7 +54,7 @@ static void test_signalandwait(void) r = pSignalObjectAndWait(NULL, NULL, 0, 0); if (r == ERROR_INVALID_FUNCTION) { - trace("SignalObjectAndWait not implemented, skipping tests\n"); + skip("SignalObjectAndWait is not implemented\n"); return; /* Win98/ME */ } ok( r == WAIT_FAILED, "should fail\n"); @@ -427,7 +427,9 @@ static void test_waitable_timer(void) SetLastError(0xdeadbeef); handle2 = pOpenWaitableTimerA( TIMER_ALL_ACCESS, FALSE, __FILE__ ": TEST WAITABLETIMER"); ok( !handle2, "OpenWaitableTimer succeeded\n"); - ok( GetLastError() == ERROR_FILE_NOT_FOUND, "wrong error %u\n", GetLastError()); + ok( GetLastError() == ERROR_FILE_NOT_FOUND || + GetLastError() == ERROR_INVALID_NAME, /* win98 */ + "wrong error %u\n", GetLastError()); CloseHandle( handle ); }

1 0

Paul Vriens : iphlpapi/tests: Skip some tests for unsupported functions.
by Alexandre Julliard 05 Aug '08

05 Aug '08

Module: wine Branch: master Commit: 220bb6d188ac816ff88d3281db92fb57c7b7718f URL: http://source.winehq.org/git/wine.git/?a=commit;h=220bb6d188ac816ff88d3281d… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Mon Aug 4 14:29:41 2008 +0200 iphlpapi/tests: Skip some tests for unsupported functions. --- dlls/iphlpapi/tests/iphlpapi.c | 56 ++++++++++++++++++++++++++++++--------- 1 files changed, 43 insertions(+), 13 deletions(-) diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 01eab25..a68ea7b 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -186,8 +186,10 @@ static void testGetIfEntry(DWORD index) memset(&row, 0, sizeof(row)); apiReturn = gGetIfEntry(NULL); - if (apiReturn == ERROR_NOT_SUPPORTED) + if (apiReturn == ERROR_NOT_SUPPORTED) { + skip("GetIfEntry is not supported\n"); return; + } ok(apiReturn == ERROR_INVALID_PARAMETER, "GetIfEntry(NULL) returned %d, expected ERROR_INVALID_PARAMETER\n", apiReturn); @@ -211,8 +213,10 @@ static void testGetIpAddrTable(void) ULONG dwSize = 0; apiReturn = gGetIpAddrTable(NULL, NULL, FALSE); - if (apiReturn == ERROR_NOT_SUPPORTED) + if (apiReturn == ERROR_NOT_SUPPORTED) { + skip("GetIpAddrTable is not supported\n"); return; + } ok(apiReturn == ERROR_INVALID_PARAMETER, "GetIpAddrTable(NULL, NULL, FALSE) returned %d, expected ERROR_INVALID_PARAMETER\n", apiReturn); @@ -241,8 +245,10 @@ static void testGetIfTable(void) ULONG dwSize = 0; apiReturn = gGetIfTable(NULL, NULL, FALSE); - if (apiReturn == ERROR_NOT_SUPPORTED) + if (apiReturn == ERROR_NOT_SUPPORTED) { + skip("GetIfTable is not supported\n"); return; + } ok(apiReturn == ERROR_INVALID_PARAMETER, "GetIfTable(NULL, NULL, FALSE) returned %d, expected ERROR_INVALID_PARAMETER\n", apiReturn); @@ -269,8 +275,10 @@ static void testGetIpForwardTable(void) ULONG dwSize = 0; apiReturn = gGetIpForwardTable(NULL, NULL, FALSE); - if (apiReturn == ERROR_NOT_SUPPORTED) + if (apiReturn == ERROR_NOT_SUPPORTED) { + skip("GetIpForwardTable is not supported\n"); return; + } ok(apiReturn == ERROR_INVALID_PARAMETER, "GetIpForwardTable(NULL, NULL, FALSE) returned %d, expected ERROR_INVALID_PARAMETER\n", apiReturn); @@ -297,8 +305,10 @@ static void testGetIpNetTable(void) ULONG dwSize = 0; apiReturn = gGetIpNetTable(NULL, NULL, FALSE); - if (apiReturn == ERROR_NOT_SUPPORTED) + if (apiReturn == ERROR_NOT_SUPPORTED) { + skip("GetIpNetTable is not supported\n"); return; + } ok(apiReturn == ERROR_INVALID_PARAMETER, "GetIpNetTable(NULL, NULL, FALSE) returned %d, expected ERROR_INVALID_PARAMETER\n", apiReturn); @@ -354,8 +364,10 @@ static void testGetIpStatistics(void) MIB_IPSTATS stats; apiReturn = gGetIpStatistics(NULL); - if (apiReturn == ERROR_NOT_SUPPORTED) + if (apiReturn == ERROR_NOT_SUPPORTED) { + skip("GetIpStatistics is not supported\n"); return; + } ok(apiReturn == ERROR_INVALID_PARAMETER, "GetIpStatistics(NULL) returned %d, expected ERROR_INVALID_PARAMETER\n", apiReturn); @@ -372,8 +384,10 @@ static void testGetTcpStatistics(void) MIB_TCPSTATS stats; apiReturn = gGetTcpStatistics(NULL); - if (apiReturn == ERROR_NOT_SUPPORTED) + if (apiReturn == ERROR_NOT_SUPPORTED) { + skip("GetTcpStatistics is not supported\n"); return; + } ok(apiReturn == ERROR_INVALID_PARAMETER, "GetTcpStatistics(NULL) returned %d, expected ERROR_INVALID_PARAMETER\n", apiReturn); @@ -390,8 +404,10 @@ static void testGetUdpStatistics(void) MIB_UDPSTATS stats; apiReturn = gGetUdpStatistics(NULL); - if (apiReturn == ERROR_NOT_SUPPORTED) + if (apiReturn == ERROR_NOT_SUPPORTED) { + skip("GetUdpStatistics is not supported\n"); return; + } ok(apiReturn == ERROR_INVALID_PARAMETER, "GetUdpStatistics(NULL) returned %d, expected ERROR_INVALID_PARAMETER\n", apiReturn); @@ -408,8 +424,10 @@ static void testGetTcpTable(void) ULONG dwSize = 0; apiReturn = gGetTcpTable(NULL, NULL, FALSE); - if (apiReturn == ERROR_NOT_SUPPORTED) + if (apiReturn == ERROR_NOT_SUPPORTED) { + skip("GetTcpTable is not supported\n"); return; + } ok(apiReturn == ERROR_INVALID_PARAMETER, "GetTcpTable(NULL, NULL, FALSE) returned %d, expected ERROR_INVALID_PARAMETER\n", apiReturn); @@ -436,8 +454,10 @@ static void testGetUdpTable(void) ULONG dwSize = 0; apiReturn = gGetUdpTable(NULL, NULL, FALSE); - if (apiReturn == ERROR_NOT_SUPPORTED) + if (apiReturn == ERROR_NOT_SUPPORTED) { + skip("GetUdpTable is not supported\n"); return; + } ok(apiReturn == ERROR_INVALID_PARAMETER, "GetUdpTable(NULL, NULL, FALSE) returned %d, expected ERROR_INVALID_PARAMETER\n", apiReturn); @@ -494,8 +514,10 @@ static void testGetInterfaceInfo(void) ULONG len = 0; apiReturn = gGetInterfaceInfo(NULL, NULL); - if (apiReturn == ERROR_NOT_SUPPORTED) + if (apiReturn == ERROR_NOT_SUPPORTED) { + skip("GetInterfaceInfo is not supported\n"); return; + } ok(apiReturn == ERROR_INVALID_PARAMETER, "GetInterfaceInfo returned %d, expected ERROR_INVALID_PARAMETER\n", apiReturn); @@ -522,8 +544,10 @@ static void testGetAdaptersInfo(void) ULONG len = 0; apiReturn = gGetAdaptersInfo(NULL, NULL); - if (apiReturn == ERROR_NOT_SUPPORTED) + if (apiReturn == ERROR_NOT_SUPPORTED) { + skip("GetAdaptersInfo is not supported\n"); return; + } ok(apiReturn == ERROR_INVALID_PARAMETER, "GetAdaptersInfo returned %d, expected ERROR_INVALID_PARAMETER\n", apiReturn); @@ -552,8 +576,10 @@ static void testGetNetworkParams(void) ULONG len = 0; apiReturn = gGetNetworkParams(NULL, NULL); - if (apiReturn == ERROR_NOT_SUPPORTED) + if (apiReturn == ERROR_NOT_SUPPORTED) { + skip("GetNetworkParams is not supported\n"); return; + } ok(apiReturn == ERROR_INVALID_PARAMETER, "GetNetworkParams returned %d, expected ERROR_INVALID_PARAMETER\n", apiReturn); @@ -594,6 +620,10 @@ static void testGetPerAdapterInfo(void) if (!gGetPerAdapterInfo) return; ret = gGetPerAdapterInfo(1, NULL, NULL); + if (ret == ERROR_NOT_SUPPORTED) { + skip("GetPerAdapterInfo is not supported\n"); + return; + } ok( ret == ERROR_INVALID_PARAMETER, "got %u instead of ERROR_INVALID_PARAMETER\n", ret ); needed = 0xdeadbeef; ret = gGetPerAdapterInfo(1, NULL, &needed);

1 0

Alexandre Julliard : user32/tests: Fix a number of message sequence tests that could sometimes fail.
by Alexandre Julliard 05 Aug '08

05 Aug '08

Module: wine Branch: master Commit: f59540ddad25c99a1697d5dc5c2f71f30d57d9eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=f59540ddad25c99a1697d5dc5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 4 23:07:10 2008 +0200 user32/tests: Fix a number of message sequence tests that could sometimes fail. --- dlls/user32/tests/msg.c | 160 +++++++++++++++++++++++++++++----------------- dlls/user32/tests/win.c | 3 + 2 files changed, 104 insertions(+), 59 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f59540ddad25c99a1697d…

1 0

Alexandre Julliard : user32/tests: Fix some test failures on win9x.
by Alexandre Julliard 05 Aug '08

05 Aug '08

Module: wine Branch: master Commit: 2b1c4ba13896c1c882009df6e5fd1d941541943b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b1c4ba13896c1c882009df6e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 4 23:06:54 2008 +0200 user32/tests: Fix some test failures on win9x. --- dlls/user32/tests/resource.c | 7 +++++-- dlls/user32/tests/static.c | 10 +++++++--- dlls/user32/tests/text.c | 37 ++++++++++++++++++++++++------------- 3 files changed, 36 insertions(+), 18 deletions(-) diff --git a/dlls/user32/tests/resource.c b/dlls/user32/tests/resource.c index e588524..30b3e1f 100644 --- a/dlls/user32/tests/resource.c +++ b/dlls/user32/tests/resource.c @@ -42,9 +42,12 @@ static void test_LoadStringW(void) the string at the pointer returned by LoadStringW when called with buflen = 0 */ SetLastError(0xdeadbeef); length1 = LoadStringW(hInst, 2, (WCHAR *) &resourcepointer, 0); /* get pointer to resource. */ - if (!length1 && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) + if (!length1) { - win_skip( "LoadStringW not implemented\n" ); + if (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) + win_skip( "LoadStringW not implemented\n" ); + else + win_skip( "LoadStringW does not return a pointer to the resource\n" ); return; } length2 = LoadStringW(hInst, 2, returnedstringw, sizeof(returnedstringw) /sizeof(WCHAR)); /* get resource string */ diff --git a/dlls/user32/tests/static.c b/dlls/user32/tests/static.c index 7810db4..8a9366d 100644 --- a/dlls/user32/tests/static.c +++ b/dlls/user32/tests/static.c @@ -33,12 +33,12 @@ static HWND hMainWnd; -#define expect_eq(expr, value, type, fmt) { type val = expr; ok(val == (value), #expr " expected " #fmt " got " #fmt "\n", (value), val); } +#define expect_eq(expr, value, type, fmt) { type val = expr; ok(val == (value), #expr " expected " fmt " got " fmt "\n", (value), val); } #define expect_rect(r, _left, _top, _right, _bottom) ok(r.left == _left && r.top == _top && \ r.bottom == _bottom && r.right == _right, "Invalid rect (%d,%d) (%d,%d) vs (%d,%d) (%d,%d)\n", \ r.left, r.top, r.right, r.bottom, _left, _top, _right, _bottom); -int g_nReceivedColorStatic = 0; +static int g_nReceivedColorStatic = 0; static HWND build_static(DWORD style) { @@ -63,7 +63,7 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lpara return DefWindowProc(hwnd, msg, wparam, lparam); } -void test_updates(int style, int flags) +static void test_updates(int style, int flags) { RECT r1 = {20, 20, 30, 30}; HWND hStatic = build_static(style); @@ -89,6 +89,10 @@ void test_updates(int style, int flags) if (flags & TODO_COUNT) todo_wine { expect_eq(g_nReceivedColorStatic, exp, int, "%d"); } + else if (style == SS_ICON || style == SS_BITMAP) + ok( g_nReceivedColorStatic == exp || + broken(g_nReceivedColorStatic == 0), /* win9x */ + "expected %u got %u\n", exp, g_nReceivedColorStatic ); else expect_eq(g_nReceivedColorStatic, exp, int, "%d"); DestroyWindow(hStatic); diff --git a/dlls/user32/tests/text.c b/dlls/user32/tests/text.c index 1e09650..7627280 100644 --- a/dlls/user32/tests/text.c +++ b/dlls/user32/tests/text.c @@ -110,21 +110,21 @@ static void test_DrawTextCalcRect(void) SetRect( &rect, 10,10, 100, 100); textheight = DrawTextExA(hdc, text, 0, &rect, DT_CALCRECT, NULL ); ok( !(rect.left == rect.right && rect.bottom == rect.top), - "rectangle should NOT be empty.\n"); + "rectangle should NOT be empty got %d,%d-%d,%d\n", rect.left, rect.top, rect.right, rect.bottom ); SetRect( &rect, 10,10, 100, 100); SetLastError( 0); textheight = DrawTextExA(hdc, emptystring, -1, &rect, DT_CALCRECT, NULL ); ok( (rect.left == rect.right && rect.bottom == rect.top), - "rectangle should be empty.\n"); + "rectangle should be empty got %d,%d-%d,%d\n", rect.left, rect.top, rect.right, rect.bottom ); SetRect( &rect, 10,10, 100, 100); SetLastError( 0); textheight = DrawTextExA(hdc, NULL, -1, &rect, DT_CALCRECT, NULL ); ok( (rect.left == rect.right && rect.bottom == rect.top), - "rectangle should be empty.\n"); + "rectangle should be empty got %d,%d-%d,%d\n", rect.left, rect.top, rect.right, rect.bottom ); SetRect( &rect, 10,10, 100, 100); textheight = DrawTextExA(hdc, NULL, 0, &rect, DT_CALCRECT, NULL ); ok( !(rect.left == rect.right && rect.bottom == rect.top), - "rectangle should NOT be empty.\n"); + "rectangle should NOT be empty got %d,%d-%d,%d\n", rect.left, rect.top, rect.right, rect.bottom ); /* Wide char versions */ SetRect( &rect, 10,10, 100, 100); @@ -132,19 +132,23 @@ static void test_DrawTextCalcRect(void) textheight = DrawTextExW(hdc, textW, 0, &rect, DT_CALCRECT, NULL ); if( GetLastError() != ERROR_CALL_NOT_IMPLEMENTED) { ok( !(rect.left == rect.right && rect.bottom == rect.top), - "rectangle should NOT be empty.\n"); + "rectangle should NOT be empty got %d,%d-%d,%d\n", + rect.left, rect.top, rect.right, rect.bottom ); SetRect( &rect, 10,10, 100, 100); textheight = DrawTextExW(hdc, emptystringW, -1, &rect, DT_CALCRECT, NULL ); ok( (rect.left == rect.right && rect.bottom == rect.top), - "rectangle should be empty.\n"); + "rectangle should be empty got %d,%d-%d,%d\n", + rect.left, rect.top, rect.right, rect.bottom ); SetRect( &rect, 10,10, 100, 100); textheight = DrawTextExW(hdc, NULL, -1, &rect, DT_CALCRECT, NULL ); ok( !(rect.left == rect.right && rect.bottom == rect.top), - "rectangle should NOT be empty.\n"); + "rectangle should NOT be empty got %d,%d-%d,%d\n", + rect.left, rect.top, rect.right, rect.bottom ); SetRect( &rect, 10,10, 100, 100); textheight = DrawTextExW(hdc, NULL, 0, &rect, DT_CALCRECT, NULL ); ok( !(rect.left == rect.right && rect.bottom == rect.top), - "rectangle should NOT be empty.\n"); + "rectangle should NOT be empty got %d,%d-%d,%d\n", + rect.left, rect.top, rect.right, rect.bottom ); } /* More test cases from bug 12226 */ @@ -158,11 +162,18 @@ static void test_DrawTextCalcRect(void) SetRect(&rect, 0, 0, 0, 0); textheight = DrawTextW(hdc, emptystringW, -1, &rect, DT_CALCRECT | DT_LEFT | DT_SINGLELINE); - todo_wine ok(textheight, "DrawTextW error %u\n", GetLastError()); - ok(0 == rect.left, "expected 0, got %d\n", rect.left); - ok(0 == rect.right, "expected 0, got %d\n", rect.right); - ok(0 == rect.top, "expected 0, got %d\n", rect.top); - todo_wine ok(rect.bottom, "rect.bottom should not be 0\n"); + if (!textheight && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) + { + win_skip( "DrawTextW not implemented\n" ); + } + else + { + todo_wine ok(textheight, "DrawTextW error %u\n", GetLastError()); + ok(0 == rect.left, "expected 0, got %d\n", rect.left); + ok(0 == rect.right, "expected 0, got %d\n", rect.right); + ok(0 == rect.top, "expected 0, got %d\n", rect.top); + todo_wine ok(rect.bottom, "rect.bottom should not be 0\n"); + } SelectObject(hdc, hOldFont); ret = DeleteObject(hFont);

1 0

← Newer
1
...
70
71
72
73
74
75
76
...
84
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 August 2008