February 2011 - Wine-commits

Austin English : kernel32/tests: Don't check return values inside of if(0) (LLVM/Clang).
by Alexandre Julliard 10 Feb '11

10 Feb '11

Module: wine Branch: master Commit: ab4dba3e75f6e9c098317bad9160f2cde531deec URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab4dba3e75f6e9c098317bad9… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Feb 9 13:44:09 2011 -0800 kernel32/tests: Don't check return values inside of if(0) (LLVM/Clang). --- dlls/kernel32/tests/format_msg.c | 12 +++++------- 1 files changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/tests/format_msg.c b/dlls/kernel32/tests/format_msg.c index 1c4dd76..ea2ed43 100644 --- a/dlls/kernel32/tests/format_msg.c +++ b/dlls/kernel32/tests/format_msg.c @@ -143,7 +143,7 @@ static void test_message_from_string_wide(void) { SetLastError(0xdeadbeef); memcpy(out, init_buf, sizeof(init_buf)); - r = FormatMessageW(FORMAT_MESSAGE_FROM_STRING, NULL, 0, + FormatMessageW(FORMAT_MESSAGE_FROM_STRING, NULL, 0, 0, out, sizeof(out)/sizeof(WCHAR), NULL); } @@ -283,6 +283,7 @@ static void test_message_from_string_wide(void) r = doitW(FORMAT_MESSAGE_FROM_STRING, fmt_14d, 0, 0, out, sizeof(out)/sizeof(WCHAR), 1); ok(!lstrcmpW(s_14d, out), "failed out=%s\n", wine_dbgstr_w(out)); + ok(r==4,"failed: r=%d\n", r); /* a single digit, left justified */ r = doitW(FORMAT_MESSAGE_FROM_STRING, fmt_1_4d, 0, @@ -466,7 +467,7 @@ static void test_message_from_string(void) { SetLastError(0xdeadbeef); memcpy(out, init_buf, sizeof(init_buf)); - r = FormatMessageA(FORMAT_MESSAGE_FROM_STRING, NULL, 0, + FormatMessageA(FORMAT_MESSAGE_FROM_STRING, NULL, 0, 0, out, sizeof(out)/sizeof(CHAR), NULL); } @@ -1119,10 +1120,7 @@ static void test_message_null_buffer(void) if (0) /* crashes on Windows */ { SetLastError(0xdeadbeef); - ret = FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM, NULL, 0, 0, NULL, 256, NULL); - error = GetLastError(); - ok(!ret, "FormatMessageA returned %u\n", ret); - trace("last error %u\n", error); + FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM, NULL, 0, 0, NULL, 256, NULL); } SetLastError(0xdeadbeef); @@ -1296,7 +1294,7 @@ static void test_message_allocate_buffer_wide(void) if (0) /* crashes on Windows */ { buf = (WCHAR *)0xdeadbeef; - ret = FormatMessageW(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_ALLOCATE_BUFFER, + FormatMessageW(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_ALLOCATE_BUFFER, NULL, 0, 0, (WCHAR *)&buf, 0, NULL); }

1 0

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

10 Feb '11

Module: wine Branch: master Commit: a13e596c78afbc40308621b34075910fd3aaf6e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a13e596c78afbc40308621b34… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Feb 9 13:44:13 2011 -0800 gdi32/tests: Make sure to use return values (LLVM/Clang). --- dlls/gdi32/tests/metafile.c | 21 +++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index d036065..a4630f1 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -520,8 +520,10 @@ static void test_SaveDC(void) SetPixelV(hdcMetafile, 50, 50, 0); ret = GetViewportOrgEx(hdcMetafile, &pt); + ok(ret, "GetViewportOrgEx error %u\n", GetLastError()); ok(pt.x == 0,"Expecting ViewportOrg x of 0, got %i\n",pt.x); ret = GetViewportExtEx(hdcMetafile, &size); + ok(ret, "GetViewportExtEx error %u\n", GetLastError()); ok(size.cx == 120,"Expecting ViewportExt cx of 120, got %i\n",size.cx); ret = SaveDC(hdcMetafile); ok(ret == 1, "ret = %d\n", ret); @@ -535,8 +537,10 @@ static void test_SaveDC(void) SetPixelV(hdcMetafile, 50, 50, 0); ret = GetViewportOrgEx(hdcMetafile, &pt); + ok(ret, "GetViewportOrgEx error %u\n", GetLastError()); ok(pt.x == 10,"Expecting ViewportOrg x of 10, got %i\n",pt.x); ret = GetViewportExtEx(hdcMetafile, &size); + ok(ret, "GetViewportExtEx error %u\n", GetLastError()); ok(size.cx == 200,"Expecting ViewportExt cx of 200, got %i\n",size.cx); ret = SaveDC(hdcMetafile); ok(ret == 2, "ret = %d\n", ret); @@ -552,8 +556,10 @@ static void test_SaveDC(void) SetPixelV(hdcMetafile, 50, 50, 0); ret = GetViewportOrgEx(hdcMetafile, &pt); + ok(ret, "GetViewportOrgEx error %u\n", GetLastError()); ok(pt.x == 20,"Expecting ViewportOrg x of 20, got %i\n",pt.x); ret = GetViewportExtEx(hdcMetafile, &size); + ok(ret, "GetViewportExtEx error %u\n", GetLastError()); ok(size.cx == 300,"Expecting ViewportExt cx of 300, got %i\n",size.cx); ret = SaveDC(hdcMetafile); ok(ret == 3, "ret = %d\n", ret); @@ -572,15 +578,19 @@ static void test_SaveDC(void) SetPixelV(hdcMetafile, 50, 50, 0); ret = GetViewportOrgEx(hdcMetafile, &pt); + ok(ret, "GetViewportOrgEx error %u\n", GetLastError()); ok(pt.x == 30,"Expecting ViewportOrg x of 30, got %i\n",pt.x); ret = GetViewportExtEx(hdcMetafile, &size); + ok(ret, "GetViewportExtEx error %u\n", GetLastError()); ok(size.cx == 400,"Expecting ViewportExt cx of 400, got %i\n",size.cx); ret = RestoreDC(hdcMetafile, -1); ok(ret, "ret = %d\n", ret); ret = GetViewportOrgEx(hdcMetafile, &pt); + ok(ret, "GetViewportOrgEx error %u\n", GetLastError()); ok(pt.x == 20,"Expecting ViewportOrg x of 20, got %i\n",pt.x); ret = GetViewportExtEx(hdcMetafile, &size); + ok(ret, "GetViewportExtEx error %u\n", GetLastError()); ok(size.cx == 300,"Expecting ViewportExt cx of 300, got %i\n",size.cx); ok( GetPolyFillMode( hdcMetafile ) == ALTERNATE, "PolyFillMode not restored\n" ); ok( GetBkColor( hdcMetafile ) == 0, "Background color not restored\n" ); @@ -588,14 +598,18 @@ static void test_SaveDC(void) ok(ret == 3, "ret = %d\n", ret); ret = GetViewportOrgEx(hdcMetafile, &pt); + ok(ret, "GetViewportOrgEx error %u\n", GetLastError()); ok(pt.x == 20,"Expecting ViewportOrg x of 20, got %i\n",pt.x); ret = GetViewportExtEx(hdcMetafile, &size); + ok(ret, "GetViewportExtEx error %u\n", GetLastError()); ok(size.cx == 300,"Expecting ViewportExt cx of 300, got %i\n",size.cx); ret = RestoreDC(hdcMetafile, 1); ok(ret, "ret = %d\n", ret); ret = GetViewportOrgEx(hdcMetafile, &pt); + ok(ret, "GetViewportOrgEx error %u\n", GetLastError()); ok(pt.x == 0,"Expecting ViewportOrg x of 0, got %i\n",pt.x); ret = GetViewportExtEx(hdcMetafile, &size); + ok(ret, "GetViewportExtEx error %u\n", GetLastError()); ok(size.cx == 120,"Expecting ViewportExt cx of 120, got %i\n",size.cx); SetWindowOrgEx(hdcMetafile, -4, -4, NULL); @@ -607,15 +621,19 @@ static void test_SaveDC(void) SetPixelV(hdcMetafile, 50, 50, 0); ret = GetViewportOrgEx(hdcMetafile, &pt); + ok(ret, "GetViewportOrgEx error %u\n", GetLastError()); ok(pt.x == 40,"Expecting ViewportOrg x of 40, got %i\n",pt.x); ret = GetViewportExtEx(hdcMetafile, &size); + ok(ret, "GetViewportExtEx error %u\n", GetLastError()); ok(size.cx == 50,"Expecting ViewportExt cx of 50, got %i\n",size.cx); ret = SaveDC(hdcMetafile); ok(ret == 1, "ret = %d\n", ret); ret = GetViewportOrgEx(hdcMetafile, &pt); + ok(ret, "GetViewportOrgEx error %u\n", GetLastError()); ok(pt.x == 40,"Expecting ViewportOrg x of 40, got %i\n",pt.x); ret = GetViewportExtEx(hdcMetafile, &size); + ok(ret, "GetViewportExtEx error %u\n", GetLastError()); ok(size.cx == 50,"Expecting ViewportExt cx of 50, got %i\n",size.cx); ret = SaveDC(hdcMetafile); ok(ret == 2, "ret = %d\n", ret); @@ -643,8 +661,10 @@ static void test_SaveDC(void) ret = RestoreDC(hdcMetafile, 1); ok(ret, "ret = %d\n", ret); ret = GetViewportOrgEx(hdcMetafile, &pt); + ok(ret, "GetViewportOrgEx error %u\n", GetLastError()); ok(pt.x == 40,"Expecting ViewportOrg x of 40, got %i\n",pt.x); ret = GetViewportExtEx(hdcMetafile, &size); + ok(ret, "GetViewportExtEx error %u\n", GetLastError()); ok(size.cx == 50,"Expecting ViewportExt cx of 50, got %i\n",size.cx); hFontCheck = SelectObject(hdcMetafile, hFontOld); @@ -1996,6 +2016,7 @@ static int CALLBACK clip_emf_enum_proc(HDC hdc, HANDLETABLE *handle_table, ok(ret == sizeof(rgn2.data.rdh) + sizeof(RECT), "expected sizeof(rgn), got %u\n", ret); ret = GetRegionData(hrgn, sizeof(rgn2), &rgn2.data); + ok(ret == sizeof(rgn2), "expected sizeof(rgn2), got %u\n", ret); trace("size %u, type %u, count %u, rgn size %u, bound (%d,%d-%d,%d)\n", rgn2.data.rdh.dwSize, rgn2.data.rdh.iType,

1 0

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

10 Feb '11

Module: wine Branch: master Commit: 273065cebee039ab61aa22835810fb0003c08f1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=273065cebee039ab61aa22835… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Feb 9 13:44:18 2011 -0800 gdiplus/tests: Make sure to use return values (LLVM/Clang). --- dlls/gdiplus/tests/image.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 989e0bb..6e62178 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -937,6 +937,7 @@ static void test_fromhicon(void) expect(Ok, stat); expect(ImageTypeBitmap, type); stat = GdipGetImagePixelFormat((GpImage*)bitmap, &format); + expect(Ok, stat); expect(PixelFormat32bppARGB, format); /* raw format */ expect_rawformat(&ImageFormatMemoryBMP, (GpImage*)bitmap, __LINE__, FALSE); @@ -973,6 +974,7 @@ static void test_fromhicon(void) expect(Ok, stat); expect(ImageTypeBitmap, type); stat = GdipGetImagePixelFormat((GpImage*)bitmap, &format); + expect(Ok, stat); expect(PixelFormat32bppARGB, format); /* raw format */ expect_rawformat(&ImageFormatMemoryBMP, (GpImage*)bitmap, __LINE__, FALSE);

1 0

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

10 Feb '11

Module: wine Branch: master Commit: f6fb95230c17438712ceb8ed30ac2eb42e66f912 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6fb95230c17438712ceb8ed3… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Feb 9 13:44:22 2011 -0800 dsound/tests: Make sure to use a return value (LLVM/Clang). --- dlls/dsound/tests/duplex.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/dsound/tests/duplex.c b/dlls/dsound/tests/duplex.c index 11fb2a7..0f8d6d1 100644 --- a/dlls/dsound/tests/duplex.c +++ b/dlls/dsound/tests/duplex.c @@ -93,8 +93,9 @@ static void IDirectSoundFullDuplex_test(LPDIRECTSOUNDFULLDUPLEX dsfdo, ok(rc==DS_OK,"IDirectSoundFullDuplex_QueryInterface(IID_IDirectSoundFullDuplex) " "failed: %08x\n",rc); if (rc==DS_OK) { - ok (dsfdo==dsfd, "different interfaces\n"); + ok(dsfdo==dsfd, "different interfaces\n"); ref=IDirectSound8_Release(dsfd); + ok(ref==1, "IDirectSoundFullDuplex_Release() has %d references, should have 1\n", ref); } ref=IDirectSoundFullDuplex_Release(dsfdo);

1 0

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

10 Feb '11

Module: wine Branch: master Commit: f0ca65a287277143964fc34f5d05df05f4988d36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0ca65a287277143964fc34f5… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Feb 9 13:44:25 2011 -0800 ole32/tests: Make sure to use return values (LLVM/Clang). --- dlls/ole32/tests/marshal.c | 17 +++++------------ 1 files changed, 5 insertions(+), 12 deletions(-) diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index 25253d3..86a8f0f 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -1767,12 +1767,8 @@ static void test_proxybuffer(REFIID riid) refs = IUnknown_Release(&pUnkOuter->IUnknown_iface); ok(refs == 1, "Ref count of outer unknown should have been 1 instead of %d\n", refs); - refs = IPSFactoryBuffer_Release(psfb); - if (0) - { - /* not reliable on native. maybe it leaks references! */ - ok(refs == 0, "Ref-count leak of %d on IPSFactoryBuffer\n", refs); - } + /* Not checking return, unreliable on native. Maybe it leaks references? */ + IPSFactoryBuffer_Release(psfb); refs = IUnknown_Release((IUnknown *)lpvtbl); ok(refs == 0, "Ref-count leak of %d on IRpcProxyBuffer\n", refs); @@ -1800,12 +1796,8 @@ static void test_stubbuffer(REFIID riid) hr = IPSFactoryBuffer_CreateStub(psfb, riid, (IUnknown*)&Test_ClassFactory, &stub); ok_ole_success(hr, IPSFactoryBuffer_CreateStub); - refs = IPSFactoryBuffer_Release(psfb); - if (0) - { - /* not reliable on native. maybe it leaks references */ - ok(refs == 0, "Ref-count leak of %d on IPSFactoryBuffer\n", refs); - } + /* Not checking return, unreliable on native. Maybe it leaks references? */ + IPSFactoryBuffer_Release(psfb); ok_more_than_one_lock(); @@ -1916,6 +1908,7 @@ static LRESULT CALLBACK window_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM l * WM_QUIT message doesn't stop the call from succeeding */ PostMessage(hwnd, WM_QUIT, 0, 0); hr = IClassFactory_CreateInstance(proxy, NULL, &IID_IUnknown, (void **)&object); + ok(hr == S_FALSE, "IClassFactory_CreateInstance returned 0x%08x, expected S_FALSE\n", hr); IClassFactory_Release(proxy);

1 0

Austin English : shlwapi/tests: Don't check return values inside of if(0) ( LLVM/Clang).
by Alexandre Julliard 10 Feb '11

10 Feb '11

Module: wine Branch: master Commit: 757aaecc83d2d344adfc77d169514f6a017a7e1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=757aaecc83d2d344adfc77d16… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Feb 9 13:44:37 2011 -0800 shlwapi/tests: Don't check return values inside of if(0) (LLVM/Clang). --- dlls/shlwapi/tests/thread.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shlwapi/tests/thread.c b/dlls/shlwapi/tests/thread.c index cee87e7..d4a1787 100644 --- a/dlls/shlwapi/tests/thread.c +++ b/dlls/shlwapi/tests/thread.c @@ -191,7 +191,7 @@ static void test_SHGetThreadRef(void) if (0) { /* this crash on Windows */ - hr = pSHGetThreadRef(NULL); + pSHGetThreadRef(NULL); } }

1 0

Austin English : user32/tests: Remove some dead assignments (LLVM/Clang).
by Alexandre Julliard 10 Feb '11

10 Feb '11

Module: wine Branch: master Commit: fc2d1ded12d47dca49cfb497adf7edf1fd175b1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc2d1ded12d47dca49cfb497a… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Feb 9 13:44:47 2011 -0800 user32/tests: Remove some dead assignments (LLVM/Clang). --- dlls/user32/tests/listbox.c | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diff --git a/dlls/user32/tests/listbox.c b/dlls/user32/tests/listbox.c index 2559be5..be4640f 100644 --- a/dlls/user32/tests/listbox.c +++ b/dlls/user32/tests/listbox.c @@ -840,7 +840,6 @@ static void test_listbox_LB_DIR(void) memset(pathBuffer, 0, MAX_PATH); driveletter = '\0'; SendMessage(hList, LB_GETTEXT, i, (LPARAM)pathBuffer); - p = pathBuffer + strlen(pathBuffer); if (sscanf(pathBuffer, "[-%c-]", &driveletter) == 1) { ok( driveletter >= 'a' && driveletter <= 'z', "Drive letter not in range a..z, got ascii %d\n", driveletter); } @@ -951,7 +950,6 @@ static void test_listbox_LB_DIR(void) memset(pathBuffer, 0, MAX_PATH); driveletter = '\0'; SendMessage(hList, LB_GETTEXT, i, (LPARAM)pathBuffer); - p = pathBuffer + strlen(pathBuffer); if (sscanf(pathBuffer, "[-%c-]", &driveletter) == 1) { ok( driveletter >= 'a' && driveletter <= 'z', "Drive letter not in range a..z, got ascii %d\n", driveletter); } else { @@ -987,7 +985,6 @@ static void test_listbox_LB_DIR(void) memset(pathBuffer, 0, MAX_PATH); driveletter = '\0'; SendMessage(hList, LB_GETTEXT, i, (LPARAM)pathBuffer); - p = pathBuffer + strlen(pathBuffer); ok (sscanf(pathBuffer, "[-%c-]", &driveletter) == 1, "Element %d (%s) does not fit [-X-]\n", i, pathBuffer); ok( driveletter >= 'a' && driveletter <= 'z', "Drive letter not in range a..z, got ascii %d\n", driveletter); } @@ -1181,7 +1178,6 @@ static void test_listbox_dlgdir(void) for (i = 0; i < itemCount; i++) { memset(pathBuffer, 0, MAX_PATH); SendMessage(g_listBox, LB_GETTEXT, i, (LPARAM)pathBuffer); - p = pathBuffer + strlen(pathBuffer); ok( pathBuffer[0] == '[' && pathBuffer[strlen(pathBuffer)-1] == ']', "Element %d (%s) does not fit requested [...]\n", i, pathBuffer); } @@ -1321,7 +1317,6 @@ static void test_listbox_dlgdir(void) memset(pathBuffer, 0, MAX_PATH); driveletter = '\0'; SendMessage(g_listBox, LB_GETTEXT, i, (LPARAM)pathBuffer); - p = pathBuffer + strlen(pathBuffer); if (sscanf(pathBuffer, "[-%c-]", &driveletter) == 1) { ok( driveletter >= 'a' && driveletter <= 'z', "Drive letter not in range a..z, got ascii %d\n", driveletter); } else {

1 0

Dmitry Timoshkov : user32: Add message tests for SetParent().
by Alexandre Julliard 09 Feb '11

09 Feb '11

Module: wine Branch: master Commit: 07cfce6edff99cc7f1f571d7cd8c54ca0d6e6546 URL: http://source.winehq.org/git/wine.git/?a=commit;h=07cfce6edff99cc7f1f571d7c… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Feb 9 18:47:38 2011 +0800 user32: Add message tests for SetParent(). --- dlls/user32/tests/msg.c | 121 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 121 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index ccb4e39..b3ca5d0 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -12664,6 +12664,126 @@ static void test_WaitForInputIdle( char *argv0 ) CloseHandle( thread ); } +static const struct message WmSetParentSeq_1[] = { + { WM_SHOWWINDOW, sent|wparam, 0 }, + { EVENT_OBJECT_PARENTCHANGE, winevent_hook|wparam|lparam, 0, 0 }, + { WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOSIZE }, + { WM_CHILDACTIVATE, sent }, + { WM_WINDOWPOSCHANGED, sent|wparam, SWP_NOSIZE|SWP_NOREDRAW|SWP_NOCLIENTSIZE }, + { WM_MOVE, sent|defwinproc|wparam, 0 }, + { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam, 0, 0 }, + { WM_SHOWWINDOW, sent|wparam, 1 }, + { 0 } +}; + +static const struct message WmSetParentSeq_2[] = { + { WM_SHOWWINDOW, sent|wparam, 0 }, + { WM_WINDOWPOSCHANGING, sent|wparam, SWP_HIDEWINDOW|SWP_NOSIZE|SWP_NOMOVE }, + { EVENT_OBJECT_HIDE, winevent_hook|wparam|lparam, 0, 0 }, + { WM_WINDOWPOSCHANGED, sent|wparam, SWP_HIDEWINDOW|SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, + { WM_NCACTIVATE, sent|wparam, 0 }, + { WM_ACTIVATE, sent|wparam, 0 }, + { WM_ACTIVATEAPP, sent|wparam, 0 }, + { WM_KILLFOCUS, sent|wparam, 0 }, + { EVENT_OBJECT_PARENTCHANGE, winevent_hook|wparam|lparam, 0, 0 }, + { WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOSIZE }, + { HCBT_ACTIVATE, hook }, + { EVENT_SYSTEM_FOREGROUND, winevent_hook|wparam|lparam, 0, 0 }, + { WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOSIZE|SWP_NOMOVE }, + { WM_NCACTIVATE, sent|wparam, 1 }, + { WM_ACTIVATE, sent|wparam, 1 }, + { HCBT_SETFOCUS, hook }, + { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, + { WM_SETFOCUS, sent|defwinproc }, + { WM_WINDOWPOSCHANGED, sent|wparam, SWP_NOREDRAW|SWP_NOSIZE|SWP_NOCLIENTSIZE }, + { WM_MOVE, sent|defwinproc|wparam, 0 }, + { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam, 0, 0 }, + { WM_SHOWWINDOW, sent|wparam, 1 }, + { WM_WINDOWPOSCHANGING, sent|wparam, SWP_SHOWWINDOW|SWP_NOSIZE|SWP_NOMOVE }, + { EVENT_OBJECT_SHOW, winevent_hook|wparam|lparam, 0, 0 }, + { WM_WINDOWPOSCHANGED, sent|wparam, SWP_SHOWWINDOW|SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, + { 0 } +}; + + +static void test_SetParent(void) +{ + HWND parent1, parent2, child, popup; + RECT rc, rc_old; + + parent1 = CreateWindowEx(0, "TestParentClass", NULL, WS_OVERLAPPEDWINDOW, + 100, 100, 200, 200, 0, 0, 0, NULL); + ok(parent1 != 0, "Failed to create parent1 window\n"); + + parent2 = CreateWindowEx(0, "TestParentClass", NULL, WS_OVERLAPPEDWINDOW, + 400, 100, 200, 200, 0, 0, 0, NULL); + ok(parent2 != 0, "Failed to create parent2 window\n"); + + /* WS_CHILD window */ + child = CreateWindowEx(0, "TestWindowClass", NULL, WS_CHILD | WS_VISIBLE, + 10, 10, 150, 150, parent1, 0, 0, NULL); + ok(child != 0, "Failed to create child window\n"); + + GetWindowRect(parent1, &rc); + trace("parent1 (%d,%d)-(%d,%d)\n", rc.left, rc.top, rc.right, rc.bottom); + GetWindowRect(child, &rc_old); + MapWindowPoints(0, parent1, (POINT *)&rc_old, 2); + trace("child (%d,%d)-(%d,%d)\n", rc_old.left, rc_old.top, rc_old.right, rc_old.bottom); + + flush_sequence(); + + SetParent(child, parent2); + flush_events(); + ok_sequence(WmSetParentSeq_1, "SetParent() visible WS_CHILD", TRUE); + + ok(GetWindowLongA(child, GWL_STYLE) & WS_VISIBLE, "WS_VISIBLE should be set\n"); + ok(!IsWindowVisible(child), "IsWindowVisible() should return FALSE\n"); + + GetWindowRect(parent2, &rc); + trace("parent2 (%d,%d)-(%d,%d)\n", rc.left, rc.top, rc.right, rc.bottom); + GetWindowRect(child, &rc); + MapWindowPoints(0, parent2, (POINT *)&rc, 2); + trace("child (%d,%d)-(%d,%d)\n", rc.left, rc.top, rc.right, rc.bottom); + + ok(EqualRect(&rc_old, &rc), "rects do not match (%d,%d-%d,%d) / (%d,%d-%d,%d)\n", + rc_old.left, rc_old.top, rc_old.right, rc_old.bottom, + rc.left, rc.top, rc.right, rc.bottom ); + + /* WS_POPUP window */ + popup = CreateWindowEx(0, "TestWindowClass", NULL, WS_POPUP | WS_VISIBLE, + 20, 20, 100, 100, 0, 0, 0, NULL); + ok(popup != 0, "Failed to create popup window\n"); + + GetWindowRect(popup, &rc_old); + trace("popup (%d,%d)-(%d,%d)\n", rc_old.left, rc_old.top, rc_old.right, rc_old.bottom); + + flush_sequence(); + + SetParent(popup, child); + flush_events(); + ok_sequence(WmSetParentSeq_2, "SetParent() visible WS_POPUP", TRUE); + + ok(GetWindowLongA(popup, GWL_STYLE) & WS_VISIBLE, "WS_VISIBLE should be set\n"); + ok(!IsWindowVisible(popup), "IsWindowVisible() should return FALSE\n"); + + GetWindowRect(child, &rc); + trace("parent2 (%d,%d)-(%d,%d)\n", rc.left, rc.top, rc.right, rc.bottom); + GetWindowRect(popup, &rc); + MapWindowPoints(0, child, (POINT *)&rc, 2); + trace("popup (%d,%d)-(%d,%d)\n", rc.left, rc.top, rc.right, rc.bottom); + + ok(EqualRect(&rc_old, &rc), "rects do not match (%d,%d-%d,%d) / (%d,%d-%d,%d)\n", + rc_old.left, rc_old.top, rc_old.right, rc_old.bottom, + rc.left, rc.top, rc.right, rc.bottom ); + + DestroyWindow(popup); + DestroyWindow(child); + DestroyWindow(parent1); + DestroyWindow(parent2); + + flush_sequence(); +} + START_TEST(msg) { char **test_argv; @@ -12727,6 +12847,7 @@ START_TEST(msg) hEvent_hook = 0; #endif + test_SetParent(); test_PostMessage(); test_ShowWindow(); test_PeekMessage();

1 0

Maarten Lankhorst : riched20: Do not call callback when no data needs to be flushed.
by Alexandre Julliard 09 Feb '11

09 Feb '11

Module: wine Branch: master Commit: 1e758c5e8c863e24ac1bcffdbbc2e36bb8649f5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e758c5e8c863e24ac1bcffdb… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Feb 9 18:49:37 2011 +0100 riched20: Do not call callback when no data needs to be flushed. --- dlls/riched20/writer.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/writer.c b/dlls/riched20/writer.c index 8c87145..45047bd 100644 --- a/dlls/riched20/writer.c +++ b/dlls/riched20/writer.c @@ -54,7 +54,7 @@ ME_StreamOutFlush(ME_OutStream *pStream) LONG nRemaining = 0; EDITSTREAM *stream = pStream->stream; - do { + while (nStart < pStream->pos) { TRACE("sending %u bytes\n", pStream->pos - nStart); /* Some apps seem not to set *pcb unless a problem arises, relying on initial random nWritten value, which is usually >STREAMOUT_BUFFER_SIZE */ @@ -72,7 +72,7 @@ ME_StreamOutFlush(ME_OutStream *pStream) return FALSE; pStream->written += nWritten; nStart += nWritten; - } while (nStart < pStream->pos); + } pStream->pos = 0; return TRUE; }

1 0

André Hentschel : oleaut32: Remove an unneeded error.
by Alexandre Julliard 09 Feb '11

09 Feb '11

Module: wine Branch: master Commit: ba6bdf9fd6303361a9e121547db4b41ff58e24e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba6bdf9fd6303361a9e121547… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Feb 9 18:51:49 2011 +0100 oleaut32: Remove an unneeded error. --- dlls/oleaut32/safearray.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/safearray.c b/dlls/oleaut32/safearray.c index dd00cfd..ced885c 100644 --- a/dlls/oleaut32/safearray.c +++ b/dlls/oleaut32/safearray.c @@ -1356,10 +1356,7 @@ HRESULT WINAPI SafeArrayCopy(SAFEARRAY *psa, SAFEARRAY **ppsaOut) return S_OK; /* Handles copying of NULL arrays */ if (!psa->cbElements) - { - ERR("not copying an array of 0 elements\n"); return E_INVALIDARG; - } if (psa->fFeatures & (FADF_RECORD|FADF_HAVEIID|FADF_HAVEVARTYPE)) {

1 0