September 2008 - Wine-commits

Francois Gouget : jscript: Add a trailing '\n' to a Wine trace.
by Alexandre Julliard 24 Sep '08

24 Sep '08

Module: wine Branch: master Commit: db031bff74e7dae9ebf5a59bf4aeac6319199b19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db031bff74e7dae9ebf5a59bf… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Sep 24 12:17:41 2008 +0200 jscript: Add a trailing '\n' to a Wine trace. --- dlls/jscript/string.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index d4f58cd..1ceb80a 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -457,7 +457,7 @@ static HRESULT String_slice(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAM str = string->str; length = string->length; }else { - FIXME("this is not a string class"); + FIXME("this is not a string class\n"); return E_NOTIMPL; }

1 0

James Hawkins : secur32: Fix a failing test in win95.
by Alexandre Julliard 24 Sep '08

24 Sep '08

Module: wine Branch: master Commit: 4a0b67d72a358cbd97f5c1a3c09a10d26e7f5d74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a0b67d72a358cbd97f5c1a3c… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Wed Sep 24 03:06:35 2008 -0500 secur32: Fix a failing test in win95. --- dlls/secur32/tests/main.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/secur32/tests/main.c b/dlls/secur32/tests/main.c index bc6bbe6..359bcc7 100644 --- a/dlls/secur32/tests/main.c +++ b/dlls/secur32/tests/main.c @@ -199,7 +199,8 @@ static void testQuerySecurityPackageInfo(void) pkg_info = (void *)0xdeadbeef; sec_status = setupPackageA(ntlm, &pkg_info); - ok((sec_status == SEC_E_OK) || (sec_status == SEC_E_SECPKG_NOT_FOUND), + ok((sec_status == SEC_E_OK) || (sec_status == SEC_E_SECPKG_NOT_FOUND) || + broken(sec_status == SEC_E_UNSUPPORTED_FUNCTION), /* win95 */ "Return value of QuerySecurityPackageInfo() shouldn't be %s\n", getSecError(sec_status) );

1 0

James Hawkins : crypt32: Fix several test failures in win98.
by Alexandre Julliard 24 Sep '08

24 Sep '08

Module: wine Branch: master Commit: a94594983da9c2038ca06b223e383d3f312af64d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a94594983da9c2038ca06b223… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Wed Sep 24 03:04:40 2008 -0500 crypt32: Fix several test failures in win98. --- dlls/crypt32/tests/message.c | 46 ++++++++++++++++++++++++++++------------- 1 files changed, 31 insertions(+), 15 deletions(-) diff --git a/dlls/crypt32/tests/message.c b/dlls/crypt32/tests/message.c index 28f9a4e..fa8df0e 100644 --- a/dlls/crypt32/tests/message.c +++ b/dlls/crypt32/tests/message.c @@ -220,8 +220,10 @@ static void test_verify_message_hash(void) para.dwMsgEncodingType = PKCS_7_ASN_ENCODING; SetLastError(0xdeadbeef); ret = CryptVerifyMessageHash(&para, NULL, 0, NULL, NULL, NULL, NULL); - ok(!ret && GetLastError() == CRYPT_E_ASN1_EOD, - "expected CRYPT_E_ASN1_EOD, got %08x\n", GetLastError()); + ok(!ret, "Expected 0, got %d\n", ret); + ok(GetLastError() == CRYPT_E_ASN1_EOD || + GetLastError() == OSS_BAD_ARG, /* win98 */ + "Expected CRYPT_E_ASN1_EOD or OSS_BAD_ARG, got %08x\n", GetLastError()); /* Verifying the hash of a detached message succeeds? */ ret = CryptVerifyMessageHash(&para, detachedHashContent, sizeof(detachedHashContent), NULL, NULL, NULL, NULL); @@ -358,39 +360,51 @@ static void test_verify_detached_message_signature(void) SetLastError(0xdeadbeef); ret = CryptVerifyDetachedMessageSignature(&para, 0, NULL, 0, 0, NULL, NULL, NULL); - ok(!ret && GetLastError() == CRYPT_E_ASN1_EOD, - "Expected CRYPT_E_ASN1_EOD, got %08x\n", GetLastError()); + ok(!ret, "Expected 0, got %d\n", ret); + ok(GetLastError() == CRYPT_E_ASN1_EOD || + GetLastError() == OSS_BAD_ARG, /* win98 */ + "Expected CRYPT_E_ASN1_EOD or OSS_BAD_ARG, got %08x\n", GetLastError()); /* None of these messages contains a cert in the message itself, so the * default callback isn't able to verify their signature. */ SetLastError(0xdeadbeef); ret = CryptVerifyDetachedMessageSignature(&para, 0, signedWithCertContent, sizeof(signedWithCertContent), 0, NULL, NULL, NULL); + ok(!ret, "Expected 0, got %d\n", ret); todo_wine - ok(!ret && GetLastError() == CRYPT_E_NOT_FOUND, - "Expected CRYPT_E_NOT_FOUND, got %08x\n", GetLastError()); + ok(GetLastError() == CRYPT_E_NOT_FOUND || + GetLastError() == OSS_DATA_ERROR, /* win98 */ + "Expected CRYPT_E_NOT_FOUND or OSS_DATA_ERROR, got %08x\n", GetLastError()); SetLastError(0xdeadbeef); ret = CryptVerifyDetachedMessageSignature(&para, 0, signedContent, sizeof(signedContent), 0, NULL, NULL, NULL); - ok(!ret && GetLastError() == CRYPT_E_NOT_FOUND, - "Expected CRYPT_E_NOT_FOUND, got %08x\n", GetLastError()); + ok(!ret, "Expected 0, got %d\n", ret); + ok(GetLastError() == CRYPT_E_NOT_FOUND || + GetLastError() == OSS_DATA_ERROR, /* win98 */ + "Expected CRYPT_E_NOT_FOUND or OSS_DATA_ERROR, got %08x\n", GetLastError()); SetLastError(0xdeadbeef); ret = CryptVerifyDetachedMessageSignature(&para, 0, detachedSignedContent, sizeof(detachedSignedContent), 0, NULL, NULL, NULL); - ok(!ret && GetLastError() == CRYPT_E_NOT_FOUND, - "Expected CRYPT_E_NOT_FOUND, got %08x\n", GetLastError()); + ok(!ret, "Expected 0, got %d\n", ret); + ok(GetLastError() == CRYPT_E_NOT_FOUND || + GetLastError() == OSS_DATA_ERROR, /* win98 */ + "Expected CRYPT_E_NOT_FOUND or OSS_DATA_ERROR, got %08x\n", GetLastError()); SetLastError(0xdeadbeef); pContent = msgData; cbContent = sizeof(msgData); ret = CryptVerifyDetachedMessageSignature(&para, 0, detachedSignedContent, sizeof(detachedSignedContent), 1, &pContent, &cbContent, NULL); - ok(!ret && GetLastError() == CRYPT_E_NOT_FOUND, - "Expected CRYPT_E_NOT_FOUND, got %08x\n", GetLastError()); + ok(!ret, "Expected 0, got %d\n", ret); + ok(GetLastError() == CRYPT_E_NOT_FOUND || + GetLastError() == OSS_DATA_ERROR, /* win98 */ + "Expected CRYPT_E_NOT_FOUND or OSS_DATA_ERROR, got %08x\n", GetLastError()); /* Passing the correct callback results in success */ para.pfnGetSignerCertificate = msg_get_signer_callback; ret = CryptVerifyDetachedMessageSignature(&para, 0, detachedSignedContent, sizeof(detachedSignedContent), 1, &pContent, &cbContent, NULL); - ok(ret, "CryptVerifyDetachedMessageSignature failed: %08x\n", + ok(ret || + broken(!ret), /* win98 */ + "CryptVerifyDetachedMessageSignature failed: %08x\n", GetLastError()); /* Not passing the correct data to be signed results in the signature not * matching. @@ -398,8 +412,10 @@ static void test_verify_detached_message_signature(void) SetLastError(0xdeadbeef); ret = CryptVerifyDetachedMessageSignature(&para, 0, detachedSignedContent, sizeof(detachedSignedContent), 0, NULL, NULL, NULL); - ok(!ret && GetLastError() == NTE_BAD_SIGNATURE, - "expected NTE_BAD_SIGNATURE, got %08x\n", GetLastError()); + ok(!ret, "Expected 0, got %d\n", ret); + ok(GetLastError() == NTE_BAD_SIGNATURE || + GetLastError() == OSS_DATA_ERROR, /* win98 */ + "Expected NTE_BAD_SIGNATURE or OSS_DATA_ERROR, got %08x\n", GetLastError()); } static const BYTE signedWithCertEmptyContent[] = {

1 0

James Hawkins : ntdll: Fix a couple failing tests in NT4.
by Alexandre Julliard 24 Sep '08

24 Sep '08

Module: wine Branch: master Commit: a5684fdfb3f4d0d5ff647af7e7ac41908bcdd5b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5684fdfb3f4d0d5ff647af7e… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Wed Sep 24 03:05:19 2008 -0500 ntdll: Fix a couple failing tests in NT4. --- dlls/ntdll/tests/om.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index 46c9084..2e5f355 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -451,16 +451,20 @@ static void test_directory(void) pNtClose(dir); } -#define SYMLNK_TEST_CREATE_OPEN_FAILURE(h,n,t,e) \ +#define SYMLNK_TEST_CREATE_OPEN_FAILURE2(h,n,t,e,e2) \ pRtlCreateUnicodeStringFromAsciiz(&str, n);\ pRtlCreateUnicodeStringFromAsciiz(&target, t);\ status = pNtCreateSymbolicLinkObject(h, SYMBOLIC_LINK_QUERY, &attr, &target);\ - ok(status == e,"NtCreateSymbolicLinkObject should have failed with %s got(%08x)\n", #e, status);\ + ok(status == e || status == e2, \ + "NtCreateSymbolicLinkObject should have failed with %s or %s got(%08x)\n", #e, #e2, status);\ status = pNtOpenSymbolicLinkObject(h, SYMBOLIC_LINK_QUERY, &attr);\ - ok(status == e,"NtOpenSymbolicLinkObject should have failed with %s got(%08x)\n", #e, status);\ + ok(status == e || status == e2, \ + "NtOpenSymbolicLinkObject should have failed with %s or %s got(%08x)\n", #e, #e2, status);\ pRtlFreeUnicodeString(&target);\ pRtlFreeUnicodeString(&str); +#define SYMLNK_TEST_CREATE_OPEN_FAILURE(h,n,t,e) SYMLNK_TEST_CREATE_OPEN_FAILURE2(h,n,t,e,e) + static void test_symboliclink(void) { NTSTATUS status; @@ -521,7 +525,8 @@ static void test_symboliclink(void) SYMLNK_TEST_CREATE_OPEN_FAILURE(&h, "\\BaseNamedObjects\\", "->Somewhere", STATUS_OBJECT_NAME_INVALID) SYMLNK_TEST_CREATE_OPEN_FAILURE(&h, "\\\\BaseNamedObjects", "->Somewhere", STATUS_OBJECT_NAME_INVALID) SYMLNK_TEST_CREATE_OPEN_FAILURE(&h, "\\BaseNamedObjects\\\\om.c-test", "->Somewhere", STATUS_OBJECT_NAME_INVALID) - SYMLNK_TEST_CREATE_OPEN_FAILURE(&h, "\\BaseNamedObjects\\om.c-test\\", "->Somewhere", STATUS_OBJECT_NAME_INVALID) + SYMLNK_TEST_CREATE_OPEN_FAILURE2(&h, "\\BaseNamedObjects\\om.c-test\\", "->Somewhere", + STATUS_OBJECT_NAME_INVALID, STATUS_OBJECT_PATH_NOT_FOUND) /* Compaund test */

1 0

James Hawkins : oleaut32: Fix a failing test in win95.
by Alexandre Julliard 24 Sep '08

24 Sep '08

Module: wine Branch: master Commit: 40aeb9563f1a51431679048ec3e89d09aafca223 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40aeb9563f1a51431679048ec… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Wed Sep 24 03:06:00 2008 -0500 oleaut32: Fix a failing test in win95. --- dlls/oleaut32/tests/olefont.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/tests/olefont.c b/dlls/oleaut32/tests/olefont.c index 0e5f55f..6774368 100644 --- a/dlls/oleaut32/tests/olefont.c +++ b/dlls/oleaut32/tests/olefont.c @@ -138,7 +138,9 @@ static void test_QueryInterface(void) /* Test if QueryInterface increments ref counter for IFONTs */ ret = IFont_AddRef(font); - ok(ret == 3, "IFont_QI expected ref value 3 but instead got %12u\n",ret); + ok(ret == 3 || + broken(ret == 1), /* win95 */ + "IFont_QI expected ref value 3 but instead got %ld\n",ret); IFont_Release(font); ok(hres == S_OK,"IFont_QI does not return S_OK, but 0x%08x\n", hres);

1 0

James Hawkins : comctl32: Add a missing newline.
by Alexandre Julliard 24 Sep '08

24 Sep '08

Module: wine Branch: master Commit: 56260ec782b7f0fcc7c1d4de1be0616c0081ab28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56260ec782b7f0fcc7c1d4de1… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Wed Sep 24 03:04:05 2008 -0500 comctl32: Add a missing newline. --- dlls/comctl32/tests/status.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tests/status.c b/dlls/comctl32/tests/status.c index fcdd953..e2ec11d 100644 --- a/dlls/comctl32/tests/status.c +++ b/dlls/comctl32/tests/status.c @@ -168,7 +168,7 @@ static void test_height(void) SendMessage(hwndStatus, WM_SETFONT, (WPARAM)hFont, TRUE); if (!g_wmsize_count) { - skip("Status control not resized in win95, skipping broken tests."); + skip("Status control not resized in win95, skipping broken tests.\n"); return; } ok(g_wmsize_count > 0, "WM_SETFONT should issue WM_SIZE\n");

1 0

James Hawkins : comctl32: Fix a failing test in win95.
by Alexandre Julliard 24 Sep '08

24 Sep '08

Module: wine Branch: master Commit: 921f67a607377c6548796a533a2438efba96b934 URL: http://source.winehq.org/git/wine.git/?a=commit;h=921f67a607377c6548796a533… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Wed Sep 24 03:03:28 2008 -0500 comctl32: Fix a failing test in win95. --- dlls/comctl32/tests/status.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tests/status.c b/dlls/comctl32/tests/status.c index 0418c8d..fcdd953 100644 --- a/dlls/comctl32/tests/status.c +++ b/dlls/comctl32/tests/status.c @@ -376,7 +376,9 @@ static void test_status_control(void) /* Make simple */ SendMessage(hWndStatus, SB_SIMPLE, TRUE, 0); r = SendMessage(hWndStatus, SB_ISSIMPLE, 0, 0); - expect(TRUE,r); + ok(r == TRUE || + broken(r == FALSE), /* win95 */ + "Expected TRUE, got %d\n", r); DestroyWindow(hWndStatus); }

1 0

James Hawkins : comctl32: Fix several failing tests in win95.
by Alexandre Julliard 24 Sep '08

24 Sep '08

Module: wine Branch: master Commit: 0f38a6c881ab0b7c4a3054d32a7191694909de9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f38a6c881ab0b7c4a3054d32… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Wed Sep 24 03:02:51 2008 -0500 comctl32: Fix several failing tests in win95. --- dlls/comctl32/tests/imagelist.c | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index 0d1770b..03aaca1 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -835,10 +835,18 @@ static void check_ilhead_data(const char *ilh_data, INT cx, INT cy, INT cur, INT ok(ilh->cy == cy, "wrong cy %d (expected %d)\n", ilh->cy, cy); ok(ilh->bkcolor == CLR_NONE, "wrong bkcolor %x\n", ilh->bkcolor); ok(ilh->flags == ILC_COLOR24, "wrong flags %04x\n", ilh->flags); - ok(ilh->ovls[0] == -1, "wrong ovls[0] %04x\n", ilh->ovls[0]); - ok(ilh->ovls[1] == -1, "wrong ovls[1] %04x\n", ilh->ovls[1]); - ok(ilh->ovls[2] == -1, "wrong ovls[2] %04x\n", ilh->ovls[2]); - ok(ilh->ovls[3] == -1, "wrong ovls[3] %04x\n", ilh->ovls[3]); + ok(ilh->ovls[0] == -1 || + ilh->ovls[0] == 0, /* win95 */ + "wrong ovls[0] %04x\n", ilh->ovls[0]); + ok(ilh->ovls[1] == -1 || + ilh->ovls[1] == 0, /* win95 */ + "wrong ovls[1] %04x\n", ilh->ovls[1]); + ok(ilh->ovls[2] == -1 || + ilh->ovls[2] == 0, /* win95 */ + "wrong ovls[2] %04x\n", ilh->ovls[2]); + ok(ilh->ovls[3] == -1 || + ilh->ovls[3] == 0, /* win95 */ + "wrong ovls[3] %04x\n", ilh->ovls[3]); } static HBITMAP create_bitmap(INT cx, INT cy, COLORREF color, const char *comment)

1 0

Alexandre Julliard : user32/tests: Fix more message test failures on NT4 and XP.
by Alexandre Julliard 24 Sep '08

24 Sep '08

Module: wine Branch: master Commit: d9e26cb9d4735d2dfae159ded3a292af6029f906 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9e26cb9d4735d2dfae159ded… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 24 13:11:26 2008 +0200 user32/tests: Fix more message test failures on NT4 and XP. --- dlls/user32/tests/msg.c | 37 ++++++++++++++++++++++--------------- 1 files changed, 22 insertions(+), 15 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 95fd382..c78401a 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -1889,10 +1889,10 @@ static const struct message WmCreateMDIframeSeq[] = { static const struct message WmDestroyMDIframeSeq[] = { { HCBT_DESTROYWND, hook }, { 0x0090, sent|optional }, - { WM_WINDOWPOSCHANGING, sent|wparam, SWP_HIDEWINDOW|SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOMOVE }, + { WM_WINDOWPOSCHANGING, sent|wparam|optional, SWP_HIDEWINDOW|SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOMOVE }, { EVENT_OBJECT_HIDE, winevent_hook|wparam|lparam, 0, 0 }, { WM_NCACTIVATE, sent|wparam|optional, 0 }, /* Win9x */ - { WM_WINDOWPOSCHANGED, sent|wparam, SWP_HIDEWINDOW|SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, + { WM_WINDOWPOSCHANGED, sent|wparam|optional, SWP_HIDEWINDOW|SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, { WM_NCACTIVATE, sent|wparam|optional, 0 }, /* XP */ { WM_ACTIVATE, sent|wparam|optional, 0 }, /* Win9x */ { WM_ACTIVATEAPP, sent|wparam|optional, 0 }, /* Win9x */ @@ -1915,26 +1915,26 @@ static const struct message WmCreateMDIclientSeq[] = { { WM_MOVE, sent }, { WM_PARENTNOTIFY, sent|wparam, WM_CREATE }, /* in MDI frame */ { WM_SHOWWINDOW, sent|wparam, 1 }, - { WM_WINDOWPOSCHANGING, sent|wparam, SWP_SHOWWINDOW|SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOMOVE }, + { WM_WINDOWPOSCHANGING, sent|wparam|optional, SWP_SHOWWINDOW|SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOMOVE }, { EVENT_OBJECT_SHOW, winevent_hook|wparam|lparam, 0, 0 }, - { WM_WINDOWPOSCHANGED, sent|wparam, SWP_SHOWWINDOW|SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, + { WM_WINDOWPOSCHANGED, sent|wparam|optional, SWP_SHOWWINDOW|SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, { 0 } }; /* ShowWindow(SW_SHOW) for MDI client window */ static const struct message WmShowMDIclientSeq[] = { { WM_SHOWWINDOW, sent|wparam, 1 }, - { WM_WINDOWPOSCHANGING, sent|wparam, SWP_SHOWWINDOW|SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOMOVE }, + { WM_WINDOWPOSCHANGING, sent|wparam|optional, SWP_SHOWWINDOW|SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOMOVE }, { EVENT_OBJECT_SHOW, winevent_hook|wparam|lparam, 0, 0 }, - { WM_WINDOWPOSCHANGED, sent|wparam, SWP_SHOWWINDOW|SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, + { WM_WINDOWPOSCHANGED, sent|wparam|optional, SWP_SHOWWINDOW|SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, { 0 } }; /* ShowWindow(SW_HIDE) for MDI client window */ static const struct message WmHideMDIclientSeq[] = { { WM_SHOWWINDOW, sent|wparam, 0 }, - { WM_WINDOWPOSCHANGING, sent|wparam, SWP_HIDEWINDOW|SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOMOVE }, + { WM_WINDOWPOSCHANGING, sent|wparam|optional, SWP_HIDEWINDOW|SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOMOVE }, { EVENT_OBJECT_SHOW, winevent_hook|wparam|lparam|optional, 0, 0 }, /* win2000 */ { EVENT_OBJECT_HIDE, winevent_hook|wparam|lparam|optional, 0, 0 }, /* XP */ - { WM_WINDOWPOSCHANGED, sent|wparam, SWP_HIDEWINDOW|SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, + { WM_WINDOWPOSCHANGED, sent|wparam|optional, SWP_HIDEWINDOW|SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, { 0 } }; /* DestroyWindow for MDI client window, initially visible */ @@ -1943,9 +1943,9 @@ static const struct message WmDestroyMDIclientSeq[] = { { 0x0090, sent|optional }, { WM_PARENTNOTIFY, sent|wparam, WM_DESTROY }, /* in MDI frame */ { WM_SHOWWINDOW, sent|wparam, 0 }, - { WM_WINDOWPOSCHANGING, sent|wparam, SWP_HIDEWINDOW|SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOMOVE }, + { WM_WINDOWPOSCHANGING, sent|wparam|optional, SWP_HIDEWINDOW|SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOMOVE }, { EVENT_OBJECT_HIDE, winevent_hook|wparam|lparam, 0, 0 }, - { WM_WINDOWPOSCHANGED, sent|wparam, SWP_HIDEWINDOW|SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, + { WM_WINDOWPOSCHANGED, sent|wparam|optional, SWP_HIDEWINDOW|SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, { EVENT_OBJECT_DESTROY, winevent_hook|wparam|lparam, 0, 0 }, { WM_DESTROY, sent }, { WM_NCDESTROY, sent }, @@ -2038,10 +2038,10 @@ static const struct message WmDestroyMDIchildVisibleSeq[] = { { 0x0090, sent|optional }, { WM_PARENTNOTIFY, sent /*|wparam, WM_DESTROY*/ }, /* in MDI client */ { WM_SHOWWINDOW, sent|wparam, 0 }, - { WM_WINDOWPOSCHANGING, sent|wparam, SWP_HIDEWINDOW|SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOMOVE }, + { WM_WINDOWPOSCHANGING, sent|wparam|optional, SWP_HIDEWINDOW|SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOMOVE }, { EVENT_OBJECT_HIDE, winevent_hook|wparam|lparam, 0, 0 }, { WM_ERASEBKGND, sent|parent|optional }, - { WM_WINDOWPOSCHANGED, sent|wparam, SWP_HIDEWINDOW|SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, + { WM_WINDOWPOSCHANGED, sent|wparam|optional, SWP_HIDEWINDOW|SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, /* { WM_DESTROY, sent } * Win9x: message sequence terminates here. @@ -2657,10 +2657,10 @@ static const struct message WmDestroyMDIchildVisibleMaxSeq1[] = { { WM_PARENTNOTIFY, sent /*|wparam, WM_DESTROY*/ }, /* in MDI client */ { WM_SHOWWINDOW, sent|wparam, 0 }, - { WM_WINDOWPOSCHANGING, sent|wparam, SWP_HIDEWINDOW|SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOMOVE }, + { WM_WINDOWPOSCHANGING, sent|wparam|optional, SWP_HIDEWINDOW|SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOMOVE }, { EVENT_OBJECT_HIDE, winevent_hook|wparam|lparam, 0, 0 }, { WM_ERASEBKGND, sent|parent|optional }, - { WM_WINDOWPOSCHANGED, sent|wparam, SWP_HIDEWINDOW|SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, + { WM_WINDOWPOSCHANGED, sent|wparam|optional, SWP_HIDEWINDOW|SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, { EVENT_OBJECT_DESTROY, winevent_hook|wparam|lparam, 0, 0 }, { WM_DESTROY, sent }, @@ -8869,6 +8869,7 @@ static void test_PeekMessage(void) DWORD tid, qstatus; UINT qs_all_input = QS_ALLINPUT; UINT qs_input = QS_INPUT; + UINT qs_sendmessage = 0; BOOL ret; struct peekmsg_info info; @@ -8952,6 +8953,12 @@ static void test_PeekMessage(void) ok(!ret, "PeekMessageA should have returned FALSE instead of msg %04x\n", msg.message); + if (!sequence_cnt) /* nt4 needs explicit PM_QS_SENDMESSAGE to process sent messages */ + { + qs_sendmessage = QS_SENDMESSAGE; + ret = PeekMessageA(&msg, 0, 0, 0, PM_REMOVE | ((qs_input|qs_sendmessage) << 16)); + ok(!ret, "PeekMessageA should have returned FALSE instead of msg %04x\n", msg.message); + } ok_sequence(WmUser, "WmUser", FALSE); qstatus = GetQueueStatus(qs_all_input); @@ -8967,7 +8974,7 @@ static void test_PeekMessage(void) "wrong qstatus %08x\n", qstatus); msg.message = 0; - ret = PeekMessageA(&msg, 0, 0, 0, PM_REMOVE | PM_QS_POSTMESSAGE); + ret = PeekMessageA(&msg, 0, 0, 0, PM_REMOVE | PM_QS_POSTMESSAGE | (qs_sendmessage << 16) ); ok(!ret, "PeekMessageA should have returned FALSE instead of msg %04x\n", msg.message);

1 0

Alexandre Julliard : configure: Make sure opengl is not built with --without-opengl is specified.
by Alexandre Julliard 24 Sep '08

24 Sep '08

Module: wine Branch: master Commit: 8e9504da5c6c996f6f69367e84d898493ec1351c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e9504da5c6c996f6f69367e8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 24 13:11:11 2008 +0200 configure: Make sure opengl is not built with --without-opengl is specified. --- configure | 8 +++++--- configure.ac | 8 +++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/configure b/configure index 059a310..2875786 100755 --- a/configure +++ b/configure @@ -11387,6 +11387,11 @@ fi else opengl_msg="OpenGL development headers not found." fi + test -n "$opengl_msg" && enable_opengl32=${enable_opengl32:-no} + test "x$ac_cv_lib_soname_GLU" = "x" && enable_glu32=${enable_glu32:-no} + else + enable_opengl32=${enable_opengl32:-no} + enable_glu32=${enable_glu32:-no} fi if test -n "$opengl_msg"; then case "x$with_opengl" in @@ -11404,9 +11409,6 @@ esac fi - test -n "$opengl_msg" && enable_opengl32=${enable_opengl32:-no} - test "x$ac_cv_lib_soname_GLU" = "x" && enable_glu32=${enable_glu32:-no} - NASLIBS="" diff --git a/configure.ac b/configure.ac index bce9247..52f5752 100644 --- a/configure.ac +++ b/configure.ac @@ -790,13 +790,15 @@ This probably prevents linking to OpenGL. Try deleting the file and restarting c else opengl_msg="OpenGL development headers not found." fi + test -n "$opengl_msg" && enable_opengl32=${enable_opengl32:-no} + test "x$ac_cv_lib_soname_GLU" = "x" && enable_glu32=${enable_glu32:-no} + else + enable_opengl32=${enable_opengl32:-no} + enable_glu32=${enable_glu32:-no} fi WINE_WARNING_WITH(opengl,[test -n "$opengl_msg"],[$opengl_msg OpenGL and Direct3D won't be supported.]) - test -n "$opengl_msg" && enable_opengl32=${enable_opengl32:-no} - test "x$ac_cv_lib_soname_GLU" = "x" && enable_glu32=${enable_glu32:-no} - dnl **** Check for NAS **** AC_SUBST(NASLIBS,"") AC_CHECK_HEADERS(audio/audiolib.h,

1 0