February 2011 - Wine-commits

Peter Urbanec : gdi32/tests: Use virtual screen size instead of primary monitor screen size.
by Alexandre Julliard 09 Feb '11

09 Feb '11

Module: wine Branch: master Commit: b8e1a19a1dc2ac7de3d93f439c8050315396a68c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8e1a19a1dc2ac7de3d93f439… Author: Peter Urbanec <winehq.org(a)urbanec.net> Date: Wed Feb 9 13:08:50 2011 +1100 gdi32/tests: Use virtual screen size instead of primary monitor screen size. --- dlls/gdi32/tests/clipping.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/tests/clipping.c b/dlls/gdi32/tests/clipping.c index f6cf9b6..3019d67 100644 --- a/dlls/gdi32/tests/clipping.c +++ b/dlls/gdi32/tests/clipping.c @@ -413,8 +413,12 @@ static void test_window_dc_clipping(void) RECT rc; int ret, screen_width, screen_height; - screen_width = GetSystemMetrics(SM_CXSCREEN); - screen_height = GetSystemMetrics(SM_CYSCREEN); + /* Windows versions earlier than Win2k do not support the virtual screen metrics, + * so we fall back to the primary screen metrics. */ + screen_width = GetSystemMetrics(SM_CXVIRTUALSCREEN); + if(!screen_width) screen_width = GetSystemMetrics(SM_CXSCREEN); + screen_height = GetSystemMetrics(SM_CYVIRTUALSCREEN); + if(!screen_height) screen_height = GetSystemMetrics(SM_CYSCREEN); trace("screen resolution %d x %d\n", screen_width, screen_height);

1 0

Austin English : d3dx9_36: Make sure return values are used (LLVM/Clang).
by Alexandre Julliard 09 Feb '11

09 Feb '11

Module: wine Branch: master Commit: 517f6aa5264c369da2fbcc78245156e8a196e337 URL: http://source.winehq.org/git/wine.git/?a=commit;h=517f6aa5264c369da2fbcc782… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Feb 9 09:59:46 2011 -0800 d3dx9_36: Make sure return values are used (LLVM/Clang). --- dlls/d3dx9_36/tests/texture.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c index 1f31d81..c575346 100644 --- a/dlls/d3dx9_36/tests/texture.c +++ b/dlls/d3dx9_36/tests/texture.c @@ -421,6 +421,8 @@ static void test_D3DXCreateTexture(IDirect3DDevice9 *device) if (texture) { hr = IDirect3DTexture9_GetLevelDesc(texture, 0, &desc); + ok(hr == D3D_OK, "GetLevelDesc returned %#x, expected %#x\n", hr, D3D_OK); + ok(desc.Format == D3DFMT_A8R8G8B8, "Returned format %u, expected %u\n", desc.Format, D3DFMT_A8R8G8B8); ok(desc.Width == 256, "Returned width %d, expected %d\n", desc.Width, 256); ok(desc.Height == 256, "Returned height %d, expected %d\n", desc.Height, 256); @@ -435,6 +437,8 @@ static void test_D3DXCreateTexture(IDirect3DDevice9 *device) if (texture) { hr = IDirect3DTexture9_GetLevelDesc(texture, 0, &desc); + ok(hr == D3D_OK, "GetLevelDesc returned %#x, expected %#x\n", hr, D3D_OK); + ok(desc.Format == D3DFMT_A8R8G8B8, "Returned format %u, expected %u\n", desc.Format, D3DFMT_A8R8G8B8); ok(desc.Width == 1, "Returned width %d, expected %d\n", desc.Width, 1); ok(desc.Height == 1, "Returned height %d, expected %d\n", desc.Height, 1); @@ -456,6 +460,8 @@ static void test_D3DXCreateTexture(IDirect3DDevice9 *device) if (texture) { hr = IDirect3DTexture9_GetLevelDesc(texture, 0, &desc); + ok(hr == D3D_OK, "GetLevelDesc returned %#x, expected %#x\n", hr, D3D_OK); + ok(desc.Format == D3DFMT_A8R8G8B8, "Returned format %u, expected %u\n", desc.Format, D3DFMT_A8R8G8B8); /* Conditional NPOT may create a texture with different dimensions, so allow those situations instead of returning a fail */ @@ -542,6 +548,7 @@ static void test_D3DXCreateTexture(IDirect3DDevice9 *device) if (texture) { hr = IDirect3DTexture9_GetLevelDesc(texture, 0, &desc); + ok(hr == D3D_OK, "GetLevelDesc returned %#x, expected %#x\n", hr, D3D_OK); ok(desc.Format == D3DFMT_A8R8G8B8, "Returned format %u, expected %u\n", desc.Format, D3DFMT_A8R8G8B8); IDirect3DTexture9_Release(texture); @@ -554,6 +561,7 @@ static void test_D3DXCreateTexture(IDirect3DDevice9 *device) if (texture) { hr = IDirect3DTexture9_GetLevelDesc(texture, 0, &desc); + ok(hr == D3D_OK, "GetLevelDesc returned %#x, expected %#x\n", hr, D3D_OK); ok(desc.Format == D3DFMT_A8R8G8B8, "Returned format %u, expected %u\n", desc.Format, D3DFMT_A8R8G8B8); IDirect3DTexture9_Release(texture);

1 0

Austin English : gdi32/tests: Make sure to use return value (LLVM/Clang).
by Alexandre Julliard 09 Feb '11

09 Feb '11

Module: wine Branch: master Commit: b667582a71a0a1258328d4cd094e057e263ef703 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b667582a71a0a1258328d4cd0… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Feb 8 16:06:02 2011 -0800 gdi32/tests: Make sure to use return value (LLVM/Clang). --- dlls/gdi32/tests/path.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/tests/path.c b/dlls/gdi32/tests/path.c index 9fe6f43..4b061f9 100644 --- a/dlls/gdi32/tests/path.c +++ b/dlls/gdi32/tests/path.c @@ -89,6 +89,7 @@ static void test_widenpath(void) Polyline(hdc, pnt, 6); EndPath(hdc); ret = WidenPath(hdc); + ok(ret == TRUE, "WidenPath failed: %d", GetLastError()); nSize = GetPath(hdc, NULL, NULL, 0); ok(nSize > 6, "WidenPath should compute a widdened path with a 1px wide pen. Path length is %d, should be more than 6\n", nSize);

1 0

Austin English : mshtml/tests: Make sure return values are used (LLVM/Clang ).
by Alexandre Julliard 09 Feb '11

09 Feb '11

Module: wine Branch: master Commit: 78470d705678cb5038b8506862d7f66d5d576871 URL: http://source.winehq.org/git/wine.git/?a=commit;h=78470d705678cb5038b850686… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Feb 8 16:06:18 2011 -0800 mshtml/tests: Make sure return values are used (LLVM/Clang). --- dlls/mshtml/tests/dom.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 062507e..031ecc7 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -3150,6 +3150,7 @@ static void test_elem_bounding_client_rect(IUnknown *unk) elem2 = get_elem2_iface(unk); hres = IHTMLElement2_getBoundingClientRect(elem2, &rect); + ok(hres == S_OK, "getBoundingClientRect failed: %08x\n", hres); hres = IHTMLElement2_getBoundingClientRect(elem2, &rect2); IHTMLElement2_Release(elem2); ok(hres == S_OK, "getBoundingClientRect failed: %08x\n", hres); @@ -3441,6 +3442,7 @@ static IHTMLTxtRange *test_create_body_range(IHTMLDocument2 *doc) elem = doc_get_body(doc); hres = IHTMLElement_QueryInterface(elem, &IID_IHTMLBodyElement, (void**)&body); + ok(hres == S_OK, "QueryInterface failed: %08x\n", hres); IHTMLElement_Release(elem); hres = IHTMLBodyElement_createTextRange(body, &range);

1 0

Austin English : urlmon/tests: Make sure return values are used (LLVM/Clang ).
by Alexandre Julliard 09 Feb '11

09 Feb '11

Module: wine Branch: master Commit: c6aa255fdff516117b8f4d80a49a34b8b244e69b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6aa255fdff516117b8f4d80a… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Feb 8 16:04:48 2011 -0800 urlmon/tests: Make sure return values are used (LLVM/Clang). --- dlls/urlmon/tests/sec_mgr.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/tests/sec_mgr.c b/dlls/urlmon/tests/sec_mgr.c index b91f090..f50ca17 100644 --- a/dlls/urlmon/tests/sec_mgr.c +++ b/dlls/urlmon/tests/sec_mgr.c @@ -482,6 +482,7 @@ static void test_CoInternetCreateZoneManager(void) IUnknown_Release(punk); hr = IInternetZoneManager_QueryInterface(zonemgr, &IID_IInternetZoneManagerEx2, (void **) &punk); + ok(hr == S_OK, "got 0x%x (expected S_OK)\n", hr); if (punk) IUnknown_Release(punk); else @@ -631,7 +632,7 @@ static void test_GetZoneAt(void) if (0) { /* this crashes with native urlmon */ - hr = IInternetZoneManager_GetZoneAt(zonemgr, dwEnum, 0, NULL); + IInternetZoneManager_GetZoneAt(zonemgr, dwEnum, 0, NULL); } dwZone = 0xdeadbeef;

1 0

Max TenEyck Woodbury : c2man: Search sub-directories for headers too.
by Alexandre Julliard 09 Feb '11

09 Feb '11

Module: wine Branch: master Commit: a2cc82ccd120b73326e7e17ffbeca9b4ea1cae8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2cc82ccd120b73326e7e17ff… Author: Max TenEyck Woodbury <max(a)mtew.isa-geek.net> Date: Tue Feb 8 18:36:06 2011 -0500 c2man: Search sub-directories for headers too. --- tools/c2man.pl | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-) diff --git a/tools/c2man.pl b/tools/c2man.pl index 4fff8d7..984563d 100755 --- a/tools/c2man.pl +++ b/tools/c2man.pl @@ -21,7 +21,7 @@ # # TODO # Consolidate A+W pairs together, and only write one doc, without the suffix -# Implement automatic docs fo structs/defines in headers +# Implement automatic docs of structs/defines in headers # SGML gurus - feel free to smarten up the SGML. # Add any other relevant information for the dll - imports etc # Should we have a special output mode for WineHQ? @@ -882,7 +882,7 @@ sub process_comment($) $h_file =~ s/\n//; if ($h_file eq "") { - $h_file = "Not defined in a Wine header. The function is either undocumented, or missing from Wine." + $h_file = "Not declared in a Wine header. The function is either undocumented, or missing from Wine." } else { @@ -2265,10 +2265,13 @@ while(defined($_ = shift @ARGV)) /^L$/ && do { last; }; /^w$/ && do { @opt_spec_file_list = (@opt_spec_file_list, shift @ARGV); last; }; s/^I// && do { if ($_ ne ".") { - my $include = $_."/*.h"; - $include =~ s/\/\//\//g; - my $have_headers = `ls $include >/dev/null 2>&1`; - if ($? >> 8 == 0) { @opt_header_file_list = (@opt_header_file_list, $include); } + foreach my $include (`find $_ -type d ! -name tests`) { + $include =~ s/\n//; + $include = $include."/*.h"; + $include =~ s/\/\//\//g; + my $have_headers = `ls $include >/dev/null 2>&1`; + if ($? >> 8 == 0) { @opt_header_file_list = (@opt_header_file_list, $include); } + }; } last; };

1 0

Alistair Leslie-Hughes : mshtml: Implement IHTMLStyle_put_borderLeftColor.
by Alexandre Julliard 09 Feb '11

09 Feb '11

Module: wine Branch: master Commit: 1492a12c221af22f618b41db3530f4c7d6555835 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1492a12c221af22f618b41db3… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sat Feb 5 03:42:29 2011 +1100 mshtml: Implement IHTMLStyle_put_borderLeftColor. --- dlls/mshtml/htmlstyle.c | 6 ++++-- dlls/mshtml/tests/dom.c | 18 ++++++++++++++++++ 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index d2c79c8..51e3fd3 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -1595,8 +1595,10 @@ static HRESULT WINAPI HTMLStyle_get_borderBottomColor(IHTMLStyle *iface, VARIANT static HRESULT WINAPI HTMLStyle_put_borderLeftColor(IHTMLStyle *iface, VARIANT v) { HTMLStyle *This = impl_from_IHTMLStyle(iface); - FIXME("(%p)->(v%d)\n", This, V_VT(&v)); - return E_NOTIMPL; + + TRACE("(%p)->(v%d)\n", This, V_VT(&v)); + + return set_nsstyle_attr_var(This->nsstyle, STYLEID_BORDER_LEFT_COLOR, &v, ATTR_HEX_INT); } static HRESULT WINAPI HTMLStyle_get_borderLeftColor(IHTMLStyle *iface, VARIANT *p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 031ecc7..b699b19 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -5499,6 +5499,24 @@ static void test_default_style(IHTMLStyle *style) hres = IHTMLStyle_put_borderBottomColor(style, vDefault); ok(hres == S_OK, "put_borderBottomColor: %08x\n", hres); + /* borderLeftColor */ + hres = IHTMLStyle_get_borderLeftColor(style, &vDefault); + ok(hres == S_OK, "get_borderBottomColor: %08x\n", hres); + + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = a2bstr("cyan"); + hres = IHTMLStyle_put_borderLeftColor(style, v); + ok(hres == S_OK, "put_borderLeftColor: %08x\n", hres); + VariantClear(&v); + + hres = IHTMLStyle_get_borderLeftColor(style, &v); + ok(hres == S_OK, "get_borderLeftColor: %08x\n", hres); + ok(!strcmp_wa(V_BSTR(&v), "cyan"), "expected cyan = %s\n", wine_dbgstr_w(V_BSTR(&v))); + VariantClear(&v); + + hres = IHTMLStyle_put_borderLeftColor(style, vDefault); + ok(hres == S_OK, "put_borderLeftColor: %08x\n", hres); + hres = IHTMLStyle_QueryInterface(style, &IID_IHTMLStyle2, (void**)&style2); ok(hres == S_OK, "Could not get IHTMLStyle2 iface: %08x\n", hres); if(SUCCEEDED(hres)) {

1 0

Alistair Leslie-Hughes : mshtml: Implement IHTMLCurrentStyle_get_padding.
by Alexandre Julliard 09 Feb '11

09 Feb '11

Module: wine Branch: master Commit: eb2d7b6604d51c8cb931c07558185ae30c1692ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb2d7b6604d51c8cb931c0755… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sat Feb 5 07:26:42 2011 +1100 mshtml: Implement IHTMLCurrentStyle_get_padding. --- dlls/mshtml/htmlcurstyle.c | 4 ++-- dlls/mshtml/tests/dom.c | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlcurstyle.c b/dlls/mshtml/htmlcurstyle.c index 8398a42..ff8e075 100644 --- a/dlls/mshtml/htmlcurstyle.c +++ b/dlls/mshtml/htmlcurstyle.c @@ -735,8 +735,8 @@ static HRESULT WINAPI HTMLCurrentStyle_get_borderWidth(IHTMLCurrentStyle *iface, static HRESULT WINAPI HTMLCurrentStyle_get_padding(IHTMLCurrentStyle *iface, BSTR *p) { HTMLCurrentStyle *This = impl_from_IHTMLCurrentStyle(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, p); + return get_nsstyle_attr(This->nsstyle, STYLEID_PADDING, p); } static HRESULT WINAPI HTMLCurrentStyle_get_margin(IHTMLCurrentStyle *iface, BSTR *p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index b699b19..03666fa 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -3995,6 +3995,10 @@ static void test_current_style(IHTMLCurrentStyle *current_style) ok(hres == S_OK, "get_margin failed: %08x\n", hres); SysFreeString(str); + hres = IHTMLCurrentStyle_get_padding(current_style, &str); + ok(hres == S_OK, "get_padding failed: %08x\n", hres); + SysFreeString(str); + hres = IHTMLCurrentStyle_get_fontWeight(current_style, &v); ok(hres == S_OK, "get_fontWeight failed: %08x\n", hres); ok(V_VT(&v) == VT_I4, "V_VT(v) = %d\n", V_VT(&v));

1 0

Dmitry Timoshkov : user32: Add a test for reparenting a WS_POPUP window to a WS_CHILD parent.
by Alexandre Julliard 09 Feb '11

09 Feb '11

Module: wine Branch: master Commit: de2aeebe72e153872959a8544d970cb6263c0c0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=de2aeebe72e153872959a8544… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Feb 8 18:59:29 2011 +0800 user32: Add a test for reparenting a WS_POPUP window to a WS_CHILD parent. --- dlls/user32/tests/win.c | 79 +++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 66 insertions(+), 13 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index ca55c80..3de1021 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -2453,6 +2453,20 @@ static void check_wnd_state_(const char *file, int line, ok_(file, line)(capture == GetCapture(), "GetCapture() = %p\n", GetCapture()); } +/* same as above but without capture test */ +#define check_active_state(a,b,c) check_active_state_(__FILE__,__LINE__,a,b,c) +static void check_active_state_(const char *file, int line, + HWND active, HWND foreground, HWND focus) +{ + ok_(file, line)(active == GetActiveWindow(), "GetActiveWindow() = %p\n", GetActiveWindow()); + /* only check foreground if it belongs to the current thread */ + /* foreground can be moved to a different app pretty much at any time */ + if (foreground && GetForegroundWindow() && + GetWindowThreadProcessId(GetForegroundWindow(), NULL) == GetCurrentThreadId()) + ok_(file, line)(foreground == GetForegroundWindow(), "GetForegroundWindow() = %p\n", GetForegroundWindow()); + ok_(file, line)(focus == GetFocus(), "GetFocus() = %p\n", GetFocus()); +} + static void test_SetActiveWindow(HWND hwnd) { HWND hwnd2; @@ -2706,10 +2720,7 @@ static LRESULT WINAPI button_hook_proc(HWND button, UINT msg, WPARAM wparam, LPA static void test_capture_1(void) { - HWND button, capture, oldFocus, oldActive; - - oldFocus = GetFocus(); - oldActive = GetActiveWindow(); + HWND button, capture; capture = GetCapture(); ok(capture == 0, "GetCapture() = %p\n", capture); @@ -2727,7 +2738,9 @@ static void test_capture_1(void) check_wnd_state(button, 0, button, button); DestroyWindow(button); - check_wnd_state(oldActive, 0, oldFocus, 0); + /* old active window test depends on previously executed window + * activation tests, and fails under NT4. + check_wnd_state(oldActive, 0, oldFocus, 0);*/ } static void test_capture_2(void) @@ -3330,10 +3343,9 @@ static void test_nccalcscroll(HWND parent) static void test_SetParent(void) { - BOOL ret; HWND desktop = GetDesktopWindow(); HMENU hMenu; - HWND parent, child1, child2, child3, child4, sibling; + HWND ret, parent, child1, child2, child3, child4, sibling, popup; parent = CreateWindowExA(0, "static", NULL, WS_OVERLAPPEDWINDOW, 100, 100, 200, 200, 0, 0, 0, NULL); @@ -3378,8 +3390,6 @@ static void test_SetParent(void) if (!is_win9x) /* Win9x doesn't survive this test */ { - HWND ret; - ok(!SetParent(parent, child1), "SetParent should fail\n"); ok(!SetParent(child2, child3), "SetParent should fail\n"); ok(SetParent(child1, parent) != 0, "SetParent should not fail\n"); @@ -3425,8 +3435,7 @@ static void test_SetParent(void) ok(SetParent(sibling, parent) != 0, "SetParent should not fail\n"); ok(GetMenu(sibling) == hMenu, "SetParent should not remove menu\n"); - ret = DestroyWindow(parent); - ok( ret, "DestroyWindow() error %d\n", GetLastError()); + ok(DestroyWindow(parent), "DestroyWindow() failed\n"); ok(!IsWindow(parent), "parent still exists\n"); ok(!IsWindow(sibling), "sibling still exists\n"); @@ -3434,6 +3443,50 @@ static void test_SetParent(void) ok(!IsWindow(child2), "child2 still exists\n"); ok(!IsWindow(child3), "child3 still exists\n"); ok(!IsWindow(child4), "child4 still exists\n"); + + parent = CreateWindowExA(0, "static", NULL, WS_OVERLAPPEDWINDOW, + 100, 100, 200, 200, 0, 0, 0, NULL); + assert(parent != 0); + child1 = CreateWindowExA(0, "static", NULL, WS_CHILD, + 0, 0, 50, 50, parent, 0, 0, NULL); + assert(child1 != 0); + popup = CreateWindowExA(0, "static", NULL, WS_POPUP, + 0, 0, 50, 50, 0, 0, 0, NULL); + assert(popup != 0); + + trace("parent %p, child %p, popup %p\n", parent, child1, popup); + + check_parents(parent, desktop, 0, 0, 0, parent, parent); + check_parents(child1, parent, parent, parent, 0, parent, parent); + check_parents(popup, desktop, 0, 0, 0, popup, popup); + + SetFocus(0); + SetActiveWindow(0); + check_active_state(0, 0, 0); + + ret = SetParent(popup, child1); + ok(ret == desktop, "expected %p, got %p\n", desktop, ret); + check_parents(popup, child1, child1, 0, 0, parent, popup); +todo_wine + check_active_state(popup, 0, popup); + + SetFocus(0); + SetActiveWindow(0); + /* NT4 sets active window to 0, other Windows versions + * leave the popup an active window. + check_active_state(popup, 0, 0); */ + +todo_wine + ok(SetForegroundWindow(popup), "SetForegroundWindow() failed\n"); + /* NT4 sets focus window to the popup, other Windows versions + * leave the focus set to 0. + check_active_state(popup, 0, 0); */ + + ok(DestroyWindow(parent), "DestroyWindow() failed\n"); + + ok(!IsWindow(parent), "parent still exists\n"); + ok(!IsWindow(child1), "child1 still exists\n"); + ok(!IsWindow(popup), "popup still exists\n"); } static LRESULT WINAPI StyleCheckProc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) @@ -6343,8 +6396,9 @@ START_TEST(win) hhook = SetWindowsHookExA(WH_CBT, cbt_hook_proc, 0, GetCurrentThreadId()); if (!hhook) win_skip( "Cannot set CBT hook, skipping some tests\n" ); - /* make sure that FindWindow tests are executed first */ + /* make sure that these tests are executed first */ test_FindWindowEx(); + test_SetParent(); hwndMain = CreateWindowExA(/*WS_EX_TOOLWINDOW*/ 0, "MainWindowClass", "Main window", WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | @@ -6376,7 +6430,6 @@ START_TEST(win) test_CreateWindow(); test_parent_owner(); - test_SetParent(); test_enum_thread_windows(); test_mdi();

1 0

Austin English : kernel32/tests: Make sure to use return values (LLVM/Clang ).
by Alexandre Julliard 09 Feb '11

09 Feb '11

Module: wine Branch: master Commit: 4e3c3ad593173ba0c2659c15f5bdc06479479c79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e3c3ad593173ba0c2659c15f… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Feb 8 16:06:09 2011 -0800 kernel32/tests: Make sure to use return values (LLVM/Clang). --- dlls/kernel32/tests/directory.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/directory.c b/dlls/kernel32/tests/directory.c index 8d1c457..9baae47 100644 --- a/dlls/kernel32/tests/directory.c +++ b/dlls/kernel32/tests/directory.c @@ -393,6 +393,7 @@ static void test_CreateDirectoryW(void) "CreateDirectoryW with ? wildcard name should fail with error 183, ret=%s error=%d\n", ret ? " True" : "False", GetLastError()); ret = RemoveDirectoryW(tmpdir); + ok(ret == FALSE, "RemoveDirectoryW should have failed\n"); tmpdir[lstrlenW(tmpdir) - 1] = '*'; ret = CreateDirectoryW(tmpdir, NULL); @@ -400,6 +401,7 @@ static void test_CreateDirectoryW(void) "CreateDirectoryW with * wildcard name should fail with error 183, ret=%s error=%d\n", ret ? " True" : "False", GetLastError()); ret = RemoveDirectoryW(tmpdir); + ok(ret == FALSE, "RemoveDirectoryW should have failed\n"); GetTempPathW(MAX_PATH, tmpdir); lstrcatW(tmpdir, tmp_dir_name); @@ -410,6 +412,7 @@ static void test_CreateDirectoryW(void) "CreateDirectoryW with multiple nonexistent directories in path should fail ret %u err %u\n", ret, GetLastError()); ret = RemoveDirectoryW(tmpdir); + ok(ret == FALSE, "RemoveDirectoryW should have failed\n"); } static void test_RemoveDirectoryA(void)

1 0