February 2008 - Wine-commits

Stefan Dösinger : wined3d: Restore the Window size on reset.
by Alexandre Julliard 07 Feb '08

07 Feb '08

Module: wine Branch: master Commit: 62a92d160e57a5a8fceedb90fd393d14e1379d9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=62a92d160e57a5a8fceedb90f… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Feb 6 22:12:06 2008 +0100 wined3d: Restore the Window size on reset. --- dlls/wined3d/device.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index c504e50..bf41d08 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -6958,6 +6958,17 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Reset(IWineD3DDevice* iface, WINED3DPRE IWineD3DDevice_SetFullscreen(iface, FALSE); } swapchain->presentParms.Windowed = pPresentationParameters->Windowed; + } else if(!pPresentationParameters->Windowed) { + DWORD style = This->style, exStyle = This->exStyle; + /* If we're in fullscreen, and the mode wasn't changed, we have to get the window back into + * the right position. Some applications(Battlefield 2, Guild Wars) move it and then call + * Reset to clear up their mess. Guild Wars also loses the device during that. + */ + This->style = 0; + This->exStyle = 0; + IWineD3DDeviceImpl_SetupFullscreenWindow(iface, This->ddraw_window); + This->style = style; + This->exStyle = exStyle; } /* Recreate the primary swapchain's context */

1 0

Rob Shearman : comctl32: Move the getting of the DC outside of ANIMATE_DrawFrame.
by Alexandre Julliard 07 Feb '08

07 Feb '08

Module: wine Branch: master Commit: 2a56d15997558346615b9b65ea76697607c8f289 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a56d15997558346615b9b65e… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Feb 7 12:37:45 2008 +0000 comctl32: Move the getting of the DC outside of ANIMATE_DrawFrame. This allows the handle to the DC to be passed in the WM_CTLCOLORSTATIC message sent to the parent. --- dlls/comctl32/animate.c | 56 ++++++++++++++++++++++++++++------------------ 1 files changed, 34 insertions(+), 22 deletions(-) diff --git a/dlls/comctl32/animate.c b/dlls/comctl32/animate.c index 6ba05bd..e0730f8 100644 --- a/dlls/comctl32/animate.c +++ b/dlls/comctl32/animate.c @@ -345,10 +345,8 @@ static BOOL ANIMATE_PaintFrame(ANIMATE_INFO* infoPtr, HDC hDC) return TRUE; } -static BOOL ANIMATE_DrawFrame(ANIMATE_INFO *infoPtr) +static BOOL ANIMATE_DrawFrame(ANIMATE_INFO *infoPtr, HDC hDC) { - HDC hDC; - TRACE("Drawing frame %d (loop %d)\n", infoPtr->currFrame, infoPtr->nLoop); mmioSeek(infoPtr->hMMio, infoPtr->lpIndex[infoPtr->currFrame], SEEK_SET); @@ -361,10 +359,7 @@ static BOOL ANIMATE_DrawFrame(ANIMATE_INFO *infoPtr) return FALSE; } - if ((hDC = GetDC(infoPtr->hwndSelf)) != 0) { - ANIMATE_PaintFrame(infoPtr, hDC); - ReleaseDC(infoPtr->hwndSelf, hDC); - } + ANIMATE_PaintFrame(infoPtr, hDC); if (infoPtr->currFrame++ >= infoPtr->nToFrame) { infoPtr->currFrame = infoPtr->nFromFrame; @@ -380,14 +375,20 @@ static BOOL ANIMATE_DrawFrame(ANIMATE_INFO *infoPtr) static LRESULT ANIMATE_Timer(ANIMATE_INFO *infoPtr) { - /* FIXME: we should pass the hDC instead of 0 to WM_CTLCOLORSTATIC */ - if (infoPtr->dwStyle & ACS_TRANSPARENT) - infoPtr->hbrushBG = (HBRUSH)SendMessageW(infoPtr->hwndNotify, - WM_CTLCOLORSTATIC, - 0, (LPARAM)infoPtr->hwndSelf); - EnterCriticalSection(&infoPtr->cs); - ANIMATE_DrawFrame(infoPtr); - LeaveCriticalSection(&infoPtr->cs); + HDC hDC; + + if ((hDC = GetDC(infoPtr->hwndSelf)) != 0) + { + if (infoPtr->dwStyle & ACS_TRANSPARENT) + infoPtr->hbrushBG = (HBRUSH)SendMessageW(infoPtr->hwndNotify, + WM_CTLCOLORSTATIC, + (WPARAM)hDC, (LPARAM)infoPtr->hwndSelf); + EnterCriticalSection(&infoPtr->cs); + ANIMATE_DrawFrame(infoPtr, hDC); + LeaveCriticalSection(&infoPtr->cs); + + ReleaseDC(infoPtr->hwndSelf, hDC); + } return 0; } @@ -400,16 +401,20 @@ static DWORD CALLBACK ANIMATE_AnimationThread(LPVOID ptr_) while(1) { + HDC hDC = GetDC(infoPtr->hwndSelf); + if (infoPtr->dwStyle & ACS_TRANSPARENT) infoPtr->hbrushBG = (HBRUSH)SendMessageW(infoPtr->hwndNotify, WM_CTLCOLORSTATIC, - 0, (LPARAM)infoPtr->hwndSelf); + (WPARAM)hDC, (LPARAM)infoPtr->hwndSelf); EnterCriticalSection(&infoPtr->cs); - ANIMATE_DrawFrame(infoPtr); + ANIMATE_DrawFrame(infoPtr, hDC); timeout = infoPtr->mah.dwMicroSecPerFrame; event = infoPtr->hStopEvent; LeaveCriticalSection(&infoPtr->cs); + ReleaseDC(infoPtr->hwndSelf, hDC); + /* time is in microseconds, we should convert it to milliseconds */ if ((event == 0) || WaitForSingleObject( event, (timeout+500)/1000) == WAIT_OBJECT_0) break; @@ -452,11 +457,18 @@ static LRESULT ANIMATE_Play(ANIMATE_INFO *infoPtr, UINT cRepeat, WORD wFrom, WOR * does it send a notification */ if (infoPtr->nFromFrame == infoPtr->nToFrame) { - if (infoPtr->dwStyle & ACS_TRANSPARENT) - infoPtr->hbrushBG = (HBRUSH)SendMessageW(infoPtr->hwndNotify, - WM_CTLCOLORSTATIC, - 0, (LPARAM)infoPtr->hwndSelf); - ANIMATE_DrawFrame(infoPtr); + HDC hDC; + + if ((hDC = GetDC(infoPtr->hwndSelf)) != 0) + { + if (infoPtr->dwStyle & ACS_TRANSPARENT) + infoPtr->hbrushBG = (HBRUSH)SendMessageW(infoPtr->hwndNotify, + WM_CTLCOLORSTATIC, + (WPARAM)hDC, (LPARAM)infoPtr->hwndSelf); + ANIMATE_DrawFrame(infoPtr, hDC); + + ReleaseDC(infoPtr->hwndSelf, hDC); + } return TRUE; }

1 0

Stefan Dösinger : d3d9: Implement the device lost state.
by Alexandre Julliard 07 Feb '08

07 Feb '08

Module: wine Branch: master Commit: ef4119029b08e94e31f1c59e54f6eead938d7b8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef4119029b08e94e31f1c59e5… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Feb 6 20:35:06 2008 +0100 d3d9: Implement the device lost state. --- dlls/d3d9/d3d9_private.h | 1 + dlls/d3d9/device.c | 43 +++++++++++++++++++++++++++---------------- dlls/d3d9/tests/device.c | 27 +++++++++++++++++++++++++++ 3 files changed, 55 insertions(+), 16 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ef4119029b08e94e31f1c…

1 0

Stefan Dösinger : wined3d: Add some ATI cards to the version database.
by Alexandre Julliard 07 Feb '08

07 Feb '08

Module: wine Branch: master Commit: 3e7f1388befbc7d554f2e3ebb5368c49f52f22cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e7f1388befbc7d554f2e3ebb… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Feb 6 16:10:48 2008 +0100 wined3d: Add some ATI cards to the version database. --- dlls/wined3d/directx.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index bce51b3..3c9ea69 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2903,7 +2903,15 @@ static const struct driver_version_information driver_version_table[] = { {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_8600MGT, 7, 15, 10, 16921 }, {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_8800GTS, 7, 15, 10, 16921 }, - /* TODO: Add information about legacy nvidia hardware, ATI, Intel and other cards */ + /* ATI cards. The driver versions are somewhat similar, but not quite the same. Let's hardcode */ + {VENDOR_ATI, CARD_ATI_RADEON_9500, 6, 14, 10, 6764 }, + {VENDOR_ATI, CARD_ATI_RADEON_X700, 6, 14, 10, 6764 }, + {VENDOR_ATI, CARD_ATI_RADEON_X1600, 6, 14, 10, 6764 }, + {VENDOR_ATI, CARD_ATI_RADEON_HD2300, 6, 14, 10, 6764 }, + {VENDOR_ATI, CARD_ATI_RADEON_HD2600, 6, 14, 10, 6764 }, + {VENDOR_ATI, CARD_ATI_RADEON_HD2900, 6, 14, 10, 6764 }, + + /* TODO: Add information about legacy nvidia and ATI hardware, Intel and other cards */ }; static void fixup_extensions(WineD3D_GL_Info *gl_info) {

1 0

Stefan Dösinger : wined3d: Reject unsupported modes when restting the device.
by Alexandre Julliard 07 Feb '08

07 Feb '08

Module: wine Branch: master Commit: b322f81b758b88d2a060c3d1408b827cf7885735 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b322f81b758b88d2a060c3d14… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Feb 6 20:16:13 2008 +0100 wined3d: Reject unsupported modes when restting the device. --- dlls/d3d9/tests/device.c | 42 +++++++++++++++++++++++++++++++++++++++++- dlls/wined3d/device.c | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 74 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index bba4eb2..4c6f82e 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -716,7 +716,7 @@ static void test_reset(void) IDirect3D9 *pD3d = NULL; IDirect3DDevice9 *pDevice = NULL; D3DPRESENT_PARAMETERS d3dpp; - D3DDISPLAYMODE d3ddm; + D3DDISPLAYMODE d3ddm, d3ddm2; D3DVIEWPORT9 vp; DWORD width, orig_width = GetSystemMetrics(SM_CXSCREEN); DWORD height, orig_height = GetSystemMetrics(SM_CYSCREEN); @@ -724,6 +724,8 @@ static void test_reset(void) IDirect3DSurface9 *surface; IDirect3DTexture9 *texture; IDirect3DVertexShader9 *shader; + BOOL support_800x600 = FALSE; + UINT i; pD3d = pDirect3DCreate9( D3D_SDK_VERSION ); ok(pD3d != NULL, "Failed to create IDirect3D9 object\n"); @@ -739,6 +741,27 @@ static void test_reset(void) d3dpp.BackBufferHeight = 600; d3dpp.BackBufferFormat = d3ddm.Format; + for(i = 0; i < IDirect3D9_GetAdapterModeCount(pD3d, D3DADAPTER_DEFAULT, d3ddm.Format); i++) { + ZeroMemory( &d3ddm2, sizeof(d3ddm2) ); + hr = IDirect3D9_EnumAdapterModes(pD3d, D3DADAPTER_DEFAULT, d3ddm.Format, i, &d3ddm2); + ok(hr == D3D_OK, "IDirect3D9Impl_EnumAdapterModes returned %#x\n", hr); + + if(d3ddm2.Width == 800 && d3ddm2.Height == 600) { + support_800x600 = TRUE; + } + /* We use them as invalid modes */ + if((d3ddm2.Width == 801 && d3ddm2.Height == 600) || + (d3ddm2.Width == 32 && d3ddm2.Height == 32)) { + skip("This system supports a screen resolution of %dx%d, not running mode tests\n", + d3ddm2.Width, d3ddm2.Height); + goto cleanup; + } + } + if(!support_800x600) { + skip("Mode 800x600 not supported, skipping mode tests\n"); + goto cleanup; + } + hr = IDirect3D9_CreateDevice( pD3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL /* no NULLREF here */, hwnd, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &pDevice ); @@ -903,6 +926,22 @@ static void test_reset(void) ok(hr == D3D_OK, "IDirect3DDevice9_Reset failed with %s\n", DXGetErrorString9(hr)); IDirect3DVertexShader9_Release(shader); + /* Try setting invalid modes */ + ZeroMemory( &d3dpp, sizeof(d3dpp) ); + d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; + d3dpp.Windowed = FALSE; + d3dpp.BackBufferWidth = 32; + d3dpp.BackBufferHeight = 32; + hr = IDirect3DDevice9_Reset(pDevice, &d3dpp); + ok(hr == D3DERR_INVALIDCALL, "IDirect3DDevice9_Reset to w=32, h=32, windowed=FALSE failed with %s\n", DXGetErrorString9(hr)); + ZeroMemory( &d3dpp, sizeof(d3dpp) ); + d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; + d3dpp.Windowed = FALSE; + d3dpp.BackBufferWidth = 801; + d3dpp.BackBufferHeight = 600; + hr = IDirect3DDevice9_Reset(pDevice, &d3dpp); + ok(hr == D3DERR_INVALIDCALL, "IDirect3DDevice9_Reset to w=801, h=600, windowed=FALSE failed with %s\n", DXGetErrorString9(hr)); + cleanup: if(pD3d) IDirect3D9_Release(pD3d); if(pDevice) IDirect3D9_Release(pDevice); @@ -1820,6 +1859,7 @@ START_TEST(device) test_mipmap_levels(); test_cursor(); test_reset(); + test_reset(); test_scene(); test_limits(); test_depthstenciltest(); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 10d11b8..c504e50 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -6769,6 +6769,32 @@ static void reset_fbo_state(IWineD3DDevice *iface) { This->fbo_depth_attachment = NULL; } +static BOOL is_display_mode_supported(IWineD3DDeviceImpl *This, WINED3DPRESENT_PARAMETERS *pp) { + UINT i, count; + WINED3DDISPLAYMODE m; + HRESULT hr; + + /* All Windowed modes are supported, as is leaving the current mode */ + if(pp->Windowed) return TRUE; + if(!pp->BackBufferWidth) return TRUE; + if(!pp->BackBufferHeight) return TRUE; + + count = IWineD3D_GetAdapterModeCount(This->wineD3D, This->adapter->num, WINED3DFMT_UNKNOWN); + for(i = 0; i < count; i++) { + memset(&m, 0, sizeof(m)); + hr = IWineD3D_EnumAdapterModes(This->wineD3D, This->adapter->num, WINED3DFMT_UNKNOWN, i, &m); + if(FAILED(hr)) { + ERR("EnumAdapterModes failed\n"); + } + if(m.Width == pp->BackBufferWidth && m.Height == pp->BackBufferHeight) { + /* Mode found, it is supported */ + return TRUE; + } + } + /* Mode not found -> not supported */ + return FALSE; +} + static HRESULT WINAPI IWineD3DDeviceImpl_Reset(IWineD3DDevice* iface, WINED3DPRESENT_PARAMETERS* pPresentationParameters) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *) iface; IWineD3DSwapChainImpl *swapchain; @@ -6786,6 +6812,13 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Reset(IWineD3DDevice* iface, WINED3DPRE return hr; } + if(!is_display_mode_supported(This, pPresentationParameters)) { + WARN("Rejecting Reset() call because the requested display mode is not supported\n"); + WARN("Requested mode: %d, %d\n", pPresentationParameters->BackBufferWidth, + pPresentationParameters->BackBufferHeight); + return WINED3DERR_INVALIDCALL; + } + /* Is it necessary to recreate the gl context? Actually every setting can be changed * on an existing gl context, so there's no real need for recreation. *

1 0

Stefan Dösinger : wined3d: Add infrastructure for faking driver versions.
by Alexandre Julliard 07 Feb '08

07 Feb '08

Module: wine Branch: master Commit: 1c1a6f32ae9bac0387d569eec4ba74d80a2ae4c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c1a6f32ae9bac0387d569eec… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Feb 6 16:09:29 2008 +0100 wined3d: Add infrastructure for faking driver versions. Often the Linux / MacOS graphics driver version is of no use for finding a proper driver version to report to the D3D app. So this patch adds some infrastructure for easy hardcoding of card specific driver versions to report to the application. This helps applications which make assumptions based on the driver version, like bug workarounds. --- dlls/wined3d/directx.c | 52 +++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 51 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index d7d4c58..bce51b3 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2873,8 +2873,44 @@ static BOOL implementation_is_apple(WineD3D_GL_Info *gl_info) { } } +/* Certain applications(Steam) complain if we report an outdated driver version. In general, + * reporting a driver version is moot because we are not the Windows driver, and we have different + * bugs, features, etc. + * + * If a card is not found in this table, the gl driver version is reported + */ +struct driver_version_information { + WORD vendor; /* reported PCI card vendor ID */ + WORD card; /* reported PCI card device ID */ + WORD hipart_hi, hipart_lo; /* driver hiword to report */ + WORD lopart_hi, lopart_lo; /* driver loword to report */ +}; + +static const struct driver_version_information driver_version_table[] = { + /* Nvidia drivers. Geforce FX and newer cards are supported by the current driver */ + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCEFX_5200, 7, 15, 10, 16921 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCEFX_5600, 7, 15, 10, 16921 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCEFX_5800, 7, 15, 10, 16921 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_6200, 7, 15, 10, 16921 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_6600GT, 7, 15, 10, 16921 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_6800, 7, 15, 10, 16921 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_7400, 7, 15, 10, 16921 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_7300, 7, 15, 10, 16921 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_7600, 7, 15, 10, 16921 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_7800GT, 7, 15, 10, 16921 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_8300GS, 7, 15, 10, 16921 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_8600GT, 7, 15, 10, 16921 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_8600MGT, 7, 15, 10, 16921 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_8800GTS, 7, 15, 10, 16921 }, + + /* TODO: Add information about legacy nvidia hardware, ATI, Intel and other cards */ +}; + static void fixup_extensions(WineD3D_GL_Info *gl_info) { - if(implementation_is_apple(gl_info)) { + unsigned int i; + BOOL apple = implementation_is_apple(gl_info); + + if(apple) { /* MacOS advertises more GLSL vertex shader uniforms than supported by the hardware, and if more are * used it falls back to software. While the compiler can detect if the shader uses all declared * uniforms, the optimization fails if the shader uses relative addressing. So any GLSL shader @@ -2919,6 +2955,20 @@ static void fixup_extensions(WineD3D_GL_Info *gl_info) { gl_info->set_texcoord_w = TRUE; } } + + /* Fixup the driver version */ + for(i = 0; i < (sizeof(driver_version_table) / sizeof(driver_version_table[0])); i++) { + if(gl_info->gl_vendor == driver_version_table[i].vendor && + gl_info->gl_card == driver_version_table[i].card) { + TRACE_(d3d_caps)("Found card 0x%04x, 0x%04x in driver version DB\n", gl_info->gl_vendor, gl_info->gl_card); + + gl_info->driver_version = MAKEDWORD_VERSION(driver_version_table[i].lopart_hi, + driver_version_table[i].lopart_lo); + gl_info->driver_version_hipart = MAKEDWORD_VERSION(driver_version_table[i].hipart_hi, + driver_version_table[i].hipart_lo); + break; + } + } } void invalid_func(void *data) {

1 0

Reece H. Dunn : comctl32: Vista sends an unidentified message when destroying datetime and monthcal windows .
by Alexandre Julliard 07 Feb '08

07 Feb '08

Module: wine Branch: master Commit: 743a63abc9da21f7ece76089d569f40cb3df86d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=743a63abc9da21f7ece76089d… Author: Reece H. Dunn <msclrhd(a)gmail.com> Date: Sat Jan 26 08:49:09 2008 +0000 comctl32: Vista sends an unidentified message when destroying datetime and monthcal windows. --- dlls/comctl32/tests/datetime.c | 2 ++ dlls/comctl32/tests/monthcal.c | 3 +++ 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/datetime.c b/dlls/comctl32/tests/datetime.c index 73c7af3..76fdccc 100644 --- a/dlls/comctl32/tests/datetime.c +++ b/dlls/comctl32/tests/datetime.c @@ -112,6 +112,7 @@ static const struct message test_dtm_set_range_swap_min_max_seq[] = { static const struct message test_dtm_set_and_get_system_time_seq[] = { { DTM_SETSYSTEMTIME, sent|wparam, 0x00000001 }, + { 0x0090, sent|optional }, /* Vista */ { WM_DESTROY, sent|wparam|lparam, 0x00000000, 0x00000000 }, { WM_NCDESTROY, sent|wparam|lparam, 0x00000000, 0x00000000 }, { DTM_SETSYSTEMTIME, sent|wparam, 0x00000001 }, @@ -125,6 +126,7 @@ static const struct message test_dtm_set_and_get_system_time_seq[] = { }; static const struct message destroy_window_seq[] = { + { 0x0090, sent|optional }, /* Vista */ { WM_DESTROY, sent|wparam|lparam, 0x00000000, 0x00000000 }, { WM_NCDESTROY, sent|wparam|lparam, 0x00000000, 0x00000000 }, { 0 } diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c index d33f07c..c056ede 100644 --- a/dlls/comctl32/tests/monthcal.c +++ b/dlls/comctl32/tests/monthcal.c @@ -280,6 +280,7 @@ static const struct message destroy_monthcal_parent_msgs_seq[] = { /* expected message sequence for child*/ static const struct message destroy_monthcal_child_msgs_seq[] = { + { 0x0090, sent|optional }, /* Vista */ { WM_SHOWWINDOW, sent|wparam|lparam, 0, 0}, { WM_WINDOWPOSCHANGING, sent|wparam, 0}, { WM_WINDOWPOSCHANGED, sent|wparam, 0}, @@ -289,6 +290,7 @@ static const struct message destroy_monthcal_child_msgs_seq[] = { }; static const struct message destroy_monthcal_multi_sel_style_seq[] = { + { 0x0090, sent|optional }, /* Vista */ { WM_DESTROY, sent|wparam|lparam, 0, 0}, { WM_NCDESTROY, sent|wparam|lparam, 0, 0}, { 0 } @@ -296,6 +298,7 @@ static const struct message destroy_monthcal_multi_sel_style_seq[] = { /* expected message sequence for parent window*/ static const struct message destroy_parent_seq[] = { + { 0x0090, sent|optional }, /* Vista */ { WM_WINDOWPOSCHANGING, sent|wparam, 0}, { WM_WINDOWPOSCHANGED, sent|wparam, 0}, { WM_NCACTIVATE, sent|wparam|lparam, 0, 0},

1 0

James Hawkins : msi: Test using carriage returns in SQL queries and imported tables.
by Alexandre Julliard 07 Feb '08

07 Feb '08

Module: wine Branch: master Commit: d89ee5fdd6798a31f7dfb885110bc37de594fdca URL: http://source.winehq.org/git/wine.git/?a=commit;h=d89ee5fdd6798a31f7dfb8851… Author: James Hawkins <truiken(a)gmail.com> Date: Wed Feb 6 16:17:46 2008 -0600 msi: Test using carriage returns in SQL queries and imported tables. --- dlls/msi/database.c | 4 + dlls/msi/tests/db.c | 321 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 325 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d89ee5fdd6798a31f7dfb…

1 0

Alexandre Julliard : tests: Add a helper routine to wait for a child process and propagate its result correctly .
by Alexandre Julliard 07 Feb '08

07 Feb '08

Module: wine Branch: master Commit: 05c7174909e975fc7d0ebf9a59bb07160c09d66d URL: http://source.winehq.org/git/wine.git/?a=commit;h=05c7174909e975fc7d0ebf9a5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 7 12:56:00 2008 +0100 tests: Add a helper routine to wait for a child process and propagate its result correctly. --- dlls/advapi32/tests/security.c | 4 +++- dlls/kernel32/tests/actctx.c | 3 +-- dlls/kernel32/tests/toolhelp.c | 5 +---- dlls/ntdll/tests/exception.c | 3 ++- dlls/ole32/tests/marshal.c | 2 +- dlls/rpcrt4/tests/server.c | 12 ++++-------- dlls/shell32/tests/shellpath.c | 3 +-- dlls/user32/tests/cursoricon.c | 10 +--------- include/wine/test.h | 18 ++++++++++++++++++ 9 files changed, 32 insertions(+), 28 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 6b43cb3..97b5a85 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -1812,8 +1812,10 @@ static void test_process_security(void) ok(CreateProcessA( NULL, buffer, &psa, NULL, FALSE, 0, NULL, NULL, &startup, &info ), "CreateProcess with err:%d\n", GetLastError()); TEST_GRANTED_ACCESS( info.hProcess, PROCESS_ALL_ACCESS ); - ok(WaitForSingleObject(info.hProcess, 30000) == WAIT_OBJECT_0, "Child process termination\n"); + winetest_wait_child_process( info.hProcess ); + CloseHandle( info.hProcess ); + CloseHandle( info.hThread ); CloseHandle( event ); HeapFree(GetProcessHeap(), 0, Acl); HeapFree(GetProcessHeap(), 0, SecurityDescriptor); diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c index c36396c..8c76464 100644 --- a/dlls/kernel32/tests/actctx.c +++ b/dlls/kernel32/tests/actctx.c @@ -1097,9 +1097,8 @@ static void run_child_process(void) sprintf(cmdline, "\"%s\" %s manifest1", argv[0], argv[1]); ok(CreateProcess(argv[0], cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi) != 0, "Could not create process: %u\n", GetLastError()); + winetest_wait_child_process( pi.hProcess ); CloseHandle(pi.hThread); - - WaitForSingleObject(pi.hProcess, INFINITE); CloseHandle(pi.hProcess); DeleteFileA(path); } diff --git a/dlls/kernel32/tests/toolhelp.c b/dlls/kernel32/tests/toolhelp.c index 3249379..aafc982 100644 --- a/dlls/kernel32/tests/toolhelp.c +++ b/dlls/kernel32/tests/toolhelp.c @@ -342,8 +342,5 @@ START_TEST(toolhelp) test_module(info.dwProcessId, sub_expected_modules, NUM_OF(sub_expected_modules)); SetEvent(ev2); - w = WaitForSingleObject(info.hProcess, WAIT_TIME); - ok(w == WAIT_OBJECT_0, "Failed to wait on sub-process termination\n"); - ok(GetExitCodeProcess(info.hProcess, &w), "couldn't get process exit code\n"); - ok(w == WAIT_OBJECT_0, "Sub-Process failed to terminate properly\n"); + winetest_wait_child_process( info.hProcess ); } diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 9bd5678..ae3c84b 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -619,7 +619,7 @@ static void test_debugger(void) if(de.u.CreateProcessInfo.lpBaseOfImage != pNtCurrentTeb()->Peb->ImageBaseAddress) { skip("child process loaded at different address, terminating it\n"); - pNtTerminateProcess(pi.hProcess, 1); + pNtTerminateProcess(pi.hProcess, 0); } } else if (de.dwDebugEventCode == EXCEPTION_DEBUG_EVENT) @@ -710,6 +710,7 @@ static void test_debugger(void) } while (de.dwDebugEventCode != EXIT_PROCESS_DEBUG_EVENT); + winetest_wait_child_process( pi.hProcess ); ok(CloseHandle(pi.hThread) != 0, "error %u\n", GetLastError()); ok(CloseHandle(pi.hProcess) != 0, "error %u\n", GetLastError()); diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index 035a725..c7f7996 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -2575,7 +2575,7 @@ static void test_local_server(void) quit_event = CreateEvent(NULL, FALSE, FALSE, "Wine COM Test Quit Event"); SetEvent(quit_event); - WaitForSingleObject(process, INFINITE); + winetest_wait_child_process( process ); CloseHandle(quit_event); CloseHandle(process); } diff --git a/dlls/rpcrt4/tests/server.c b/dlls/rpcrt4/tests/server.c index 425b20b..43c3ec2 100644 --- a/dlls/rpcrt4/tests/server.c +++ b/dlls/rpcrt4/tests/server.c @@ -634,25 +634,21 @@ make_cmdline(char buffer[MAX_PATH], const char *test) sprintf(buffer, "%s server %s", progname, test); } -static int +static void run_client(const char *test) { char cmdline[MAX_PATH]; PROCESS_INFORMATION info; STARTUPINFOA startup; - DWORD exitcode; memset(&startup, 0, sizeof startup); startup.cb = sizeof startup; make_cmdline(cmdline, test); ok(CreateProcessA(NULL, cmdline, NULL, NULL, FALSE, 0L, NULL, NULL, &startup, &info), "CreateProcess\n"); - ok(WaitForSingleObject(info.hProcess, 30000) == WAIT_OBJECT_0, "Child process termination\n"); - ok(GetExitCodeProcess(info.hProcess, &exitcode), "GetExitCodeProcess\n"); + winetest_wait_child_process( info.hProcess ); ok(CloseHandle(info.hProcess), "CloseHandle\n"); ok(CloseHandle(info.hThread), "CloseHandle\n"); - - return exitcode == 0; } static void @@ -1208,10 +1204,10 @@ server(void) stop_event = CreateEvent(NULL, FALSE, FALSE, NULL); ok(stop_event != NULL, "CreateEvent failed\n"); - ok(run_client("tcp_basic"), "tcp_basic client test failed\n"); + run_client("tcp_basic"); ok(RPC_S_OK == RpcServerUseProtseqEp(np, 0, pipe, NULL), "RpcServerUseProtseqEp\n"); - ok(run_client("np_basic"), "np_basic client test failed\n"); + run_client("np_basic"); ok(WAIT_OBJECT_0 == WaitForSingleObject(stop_event, 60000), "WaitForSingleObject\n"); todo_wine { diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c index 6fb485e..ff041c8 100644 --- a/dlls/shell32/tests/shellpath.c +++ b/dlls/shell32/tests/shellpath.c @@ -864,8 +864,7 @@ static void testNonExistentPath(void) startup.dwFlags = SW_SHOWNORMAL; CreateProcessA(NULL, buffer, NULL, NULL, FALSE, 0L, NULL, NULL, &startup, &info); - ok(WaitForSingleObject(info.hProcess, 30000) == WAIT_OBJECT_0, - "child process termination\n"); + winetest_wait_child_process( info.hProcess ); /* Query the path to be able to delete it below */ hr = pSHGetFolderPathA(NULL, CSIDL_FAVORITES, NULL, diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index f65aa5e..ca4b118 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -167,16 +167,8 @@ static void do_parent(void) static void finish_child_process(void) { - DWORD exit_code; - BOOL ret; - SendMessage(child, WM_CLOSE, 0, 0); - ok(WaitForSingleObject(child_process, 30000) == WAIT_OBJECT_0, "Child process termination failed.\n"); - - ret = GetExitCodeProcess(child_process, &exit_code); - ok(ret, "GetExitCodeProcess() failed. Error: %u\n", GetLastError()); - ok(exit_code == 0, "Exit code == %u.\n", exit_code); - + winetest_wait_child_process( child_process ); CloseHandle(child_process); } diff --git a/include/wine/test.h b/include/wine/test.h index dbce98c..32850ce 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -57,6 +57,7 @@ extern void winetest_start_todo( const char* platform ); extern int winetest_loop_todo(void); extern void winetest_end_todo( const char* platform ); extern int winetest_get_mainargs( char*** pargv ); +extern void winetest_wait_child_process( HANDLE process ); #ifdef STANDALONE #define START_TEST(name) \ @@ -340,6 +341,23 @@ int winetest_get_mainargs( char*** pargv ) return winetest_argc; } +void winetest_wait_child_process( HANDLE process ) +{ + DWORD exit_code = 1; + + if (WaitForSingleObject( process, 30000 )) + fprintf( stdout, "%s: child process wait failed\n", current_test->name ); + else + GetExitCodeProcess( process, &exit_code ); + + if (exit_code) + { + fprintf( stdout, "%s: %u failures in child process\n", + current_test->name, exit_code ); + InterlockedExchangeAdd( &failures, exit_code ); + } +} + /* Find a test by name */ static const struct test *find_test( const char *name ) {

1 0

Reece H. Dunn : uxtheme: Fix the system tests so they pass on Vista.
by Alexandre Julliard 07 Feb '08

07 Feb '08

Module: wine Branch: master Commit: d10eaa5a8949281f711bc26e94edf84022a4a887 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d10eaa5a8949281f711bc26e9… Author: Reece H. Dunn <msclrhd(a)gmail.com> Date: Thu Feb 7 08:12:25 2008 +0000 uxtheme: Fix the system tests so they pass on Vista. --- dlls/uxtheme/tests/system.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index 8b4e29a..b5f6619 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -417,8 +417,10 @@ static void test_GetCurrentThemeName(void) /* Given number of characters for the theme name is too large */ SetLastError(0xdeadbeef); hRes = pGetCurrentThemeName(currentTheme, sizeof(currentTheme), NULL, 0, NULL, 0); - todo_wine - ok( hRes == E_POINTER, "Expected E_POINTER, got 0x%08x\n", hRes); + if (bThemeActive) + ok( hRes == E_POINTER || hRes == S_OK, "Expected E_POINTER or S_OK, got 0x%08x\n", hRes); + else + ok( hRes == E_PROP_ID_UNSUPPORTED, "Expected E_PROP_ID_UNSUPPORTED, got 0x%08x\n", hRes); ok( GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got 0x%08x\n", GetLastError());

1 0