November 2008 - Wine-Commits

Alexandre Julliard : user32/tests: Fix the monitor tests on NT4.
by Alexandre Julliard Nov. 21, 2008

Nov. 21, 2008

Module: wine Branch: master Commit: dcd8cf72145f5e5a2554efb25d5b6c8adf86789a URL: http://source.winehq.org/git/wine.git/?a=commit;h=dcd8cf72145f5e5a2554efb25… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 20 20:06:46 2008 +0100 user32/tests: Fix the monitor tests on NT4. --- dlls/user32/tests/monitor.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index 441b94f..3d03596 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -88,7 +88,6 @@ static void test_enumdisplaydevices(void) BOOL ret; HDC dc; ret = pEnumDisplayDevicesA(NULL, num, &dd, 0); - ok(ret || num != 0, "EnumDisplayDevices fails with num == 0\n"); if(!ret) break; if(dd.StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE) { @@ -104,11 +103,10 @@ static void test_enumdisplaydevices(void) } num++; } - ok(primary_num != -1, "Didn't get the primary device\n"); - if (!pEnumDisplayMonitors || !pGetMonitorInfoA) + if (primary_num == -1 || !pEnumDisplayMonitors || !pGetMonitorInfoA) { - skip("EnumDisplayMonitors or GetMonitorInfoA are not available\n"); + win_skip("EnumDisplayMonitors or GetMonitorInfoA are not available\n"); return; } @@ -172,7 +170,8 @@ static void test_ChangeDisplaySettingsEx(void) res = ChangeDisplaySettingsA(&dm, CDS_TEST); ok(res == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsA returned %d, expected DISP_CHANGE_SUCCESSFUL\n", res); - ok(dm.dmDriverExtra == 0, "ChangeDisplaySettingsA didn't reset dmDriverExtra to 0\n"); + ok(dm.dmDriverExtra == 0 || broken(dm.dmDriverExtra == 1) /* win9x */, + "ChangeDisplaySettingsA didn't reset dmDriverExtra to 0\n"); /* crashes under XP SP3 for large dmDriverExtra values */ dm.dmDriverExtra = 1; @@ -225,8 +224,9 @@ static void test_ChangeDisplaySettingsEx(void) res = pChangeDisplaySettingsExW(NULL, &dmW, NULL, CDS_TEST, NULL); if (GetLastError() != ERROR_CALL_NOT_IMPLEMENTED) ok(res == DISP_CHANGE_FAILED || + res == DISP_CHANGE_BADPARAM || /* NT4 */ res == DISP_CHANGE_BADMODE /* XP SP3 */, - "ChangeDisplaySettingsExW returned %d, expected DISP_CHANGE_FAILED or DISP_CHANGE_BADMODE\n", res); + "ChangeDisplaySettingsExW returned %d\n", res); memset(&dm, 0, sizeof(dm)); dm.dmSize = sizeof(dm); @@ -249,6 +249,8 @@ static void test_ChangeDisplaySettingsEx(void) RECT r, r1, virt; SetRect(&virt, 0, 0, GetSystemMetrics(SM_CXVIRTUALSCREEN), GetSystemMetrics(SM_CYVIRTUALSCREEN)); + if (IsRectEmpty(&virt)) /* NT4 doesn't have SM_CX/YVIRTUALSCREEN */ + SetRect(&virt, 0, 0, GetSystemMetrics(SM_CXSCREEN), GetSystemMetrics(SM_CYSCREEN)); OffsetRect(&virt, GetSystemMetrics(SM_XVIRTUALSCREEN), GetSystemMetrics(SM_YVIRTUALSCREEN)); /* Resolution change resets clip rect */

1 0

Alexandre Julliard : user32/tests: Fix the edit margins tests on Win9x.
by Alexandre Julliard Nov. 21, 2008

Nov. 21, 2008

Module: wine Branch: master Commit: 2032da7d420f0d794ed03eb93a15bb768b479a10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2032da7d420f0d794ed03eb93… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 20 18:21:38 2008 +0100 user32/tests: Fix the edit margins tests on Win9x. --- dlls/user32/tests/edit.c | 38 +++++++++++++++++++++++++------------- 1 files changed, 25 insertions(+), 13 deletions(-) diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index b70dae5..f6dc918 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -1336,30 +1336,41 @@ static void test_margins_font_change(void) SendMessageA(hwEdit, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(0,0)); SendMessageA(hwEdit, WM_SETFONT, (WPARAM)hfont, 0); margins = SendMessage(hwEdit, EM_GETMARGINS, 0, 0); - ok(LOWORD(margins) == 0, "got %d\n", LOWORD(margins)); - ok(HIWORD(margins) == 0, "got %d\n", HIWORD(margins)); - + ok(LOWORD(margins) == 0 || broken(LOWORD(margins) == LOWORD(font_margins)), /* win95 */ + "got %d\n", LOWORD(margins)); + ok(HIWORD(margins) == 0 || broken(HIWORD(margins) == HIWORD(font_margins)), /* win95 */ + "got %d\n", HIWORD(margins)); + SendMessageA(hwEdit, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(1,0)); SendMessageA(hwEdit, WM_SETFONT, (WPARAM)hfont, 0); margins = SendMessage(hwEdit, EM_GETMARGINS, 0, 0); - ok(LOWORD(margins) == 1, "got %d\n", LOWORD(margins)); - ok(HIWORD(margins) == 0, "got %d\n", HIWORD(margins)); + ok(LOWORD(margins) == 1 || broken(LOWORD(margins) == LOWORD(font_margins)), /* win95 */ + "got %d\n", LOWORD(margins)); + ok(HIWORD(margins) == 0 || broken(HIWORD(margins) == HIWORD(font_margins)), /* win95 */ + "got %d\n", HIWORD(margins)); SendMessageA(hwEdit, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(1,1)); SendMessageA(hwEdit, WM_SETFONT, (WPARAM)hfont, 0); margins = SendMessage(hwEdit, EM_GETMARGINS, 0, 0); - ok(LOWORD(margins) == 1, "got %d\n", LOWORD(margins)); - ok(HIWORD(margins) == 1, "got %d\n", HIWORD(margins)); + ok(LOWORD(margins) == 1 || broken(LOWORD(margins) == LOWORD(font_margins)), /* win95 */ + "got %d\n", LOWORD(margins)); + ok(HIWORD(margins) == 1 || broken(HIWORD(margins) == HIWORD(font_margins)), /* win95 */ + "got %d\n", HIWORD(margins)); SendMessageA(hwEdit, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(EC_USEFONTINFO,EC_USEFONTINFO)); margins = SendMessage(hwEdit, EM_GETMARGINS, 0, 0); - ok(LOWORD(margins) == 1, "got %d\n", LOWORD(margins)); - ok(HIWORD(margins) == 1, "got %d\n", HIWORD(margins)); + ok(LOWORD(margins) == 1 || broken(LOWORD(margins) == LOWORD(font_margins)), /* win95 */ + "got %d\n", LOWORD(margins)); + ok(HIWORD(margins) == 1 || broken(HIWORD(margins) == HIWORD(font_margins)), /* win95 */ + "got %d\n", HIWORD(margins)); + SendMessageA(hwEdit, WM_SETFONT, (WPARAM)hfont2, 0); margins = SendMessage(hwEdit, EM_GETMARGINS, 0, 0); - ok(LOWORD(margins) == 1, "got %d\n", LOWORD(margins)); - ok(HIWORD(margins) == 1, "got %d\n", HIWORD(margins)); - + ok(LOWORD(margins) == 1 || broken(LOWORD(margins) != 1 && LOWORD(margins) != LOWORD(font_margins)), /* win95 */ + "got %d\n", LOWORD(margins)); + ok(HIWORD(margins) == 1 || broken(HIWORD(margins) != 1 && HIWORD(margins) != HIWORD(font_margins)), /* win95 */ + "got %d\n", HIWORD(margins)); + /* Above a certain size threshold then the margin is updated */ SetWindowPos(hwEdit, NULL, 10, 10, 1000, 100, SWP_NOZORDER | SWP_NOACTIVATE); SendMessageA(hwEdit, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(1,0)); @@ -1380,7 +1391,8 @@ static void test_margins_font_change(void) ok(HIWORD(margins) == HIWORD(font_margins), "got %d\n", HIWORD(margins)); SendMessageA(hwEdit, WM_SETFONT, (WPARAM)hfont2, 0); margins = SendMessage(hwEdit, EM_GETMARGINS, 0, 0); - ok(LOWORD(margins) != LOWORD(font_margins), "got %d\n", LOWORD(margins)); + ok(LOWORD(margins) != LOWORD(font_margins) || broken(LOWORD(margins) == LOWORD(font_margins)), /* win98 */ + "got %d\n", LOWORD(margins)); ok(HIWORD(margins) != HIWORD(font_margins), "got %d\n", HIWORD(margins)); SendMessageA(hwEdit, WM_SETFONT, 0, 0);

1 0

Alexandre Julliard : user32/tests: Fix the cursor tests on Win9x.
by Alexandre Julliard Nov. 21, 2008

Nov. 21, 2008

Module: wine Branch: master Commit: 4afb1c54c082b386a0afd1529ecf0ae8e5f8d530 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4afb1c54c082b386a0afd1529… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 20 18:09:10 2008 +0100 user32/tests: Fix the cursor tests on Win9x. --- dlls/user32/tests/cursoricon.c | 39 ++++++++++++++++++++------------------- 1 files changed, 20 insertions(+), 19 deletions(-) diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index 36f5e98..5d1cf2b 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -76,7 +76,7 @@ static LRESULT CALLBACK callback_child(HWND hwnd, UINT msg, WPARAM wParam, LPARA SetLastError(0xdeadbeef); ret = DestroyCursor((HCURSOR) lParam); error = GetLastError(); - todo_wine ok(!ret, "DestroyCursor on the active cursor succeeded.\n"); + todo_wine ok(!ret || broken(ret) /* win9x */, "DestroyCursor on the active cursor succeeded.\n"); ok(error == ERROR_DESTROY_OBJECT_OF_OTHER_THREAD || error == 0xdeadbeef, /* vista */ "Last error: %u\n", error); @@ -983,25 +983,26 @@ static void test_DestroyCursor(void) SetLastError(0xdeadbeef); ret = DestroyCursor(cursor); - ok(!ret, "DestroyCursor on the active cursor succeeded\n"); + ok(!ret || broken(ret) /* succeeds on win9x */, "DestroyCursor on the active cursor succeeded\n"); error = GetLastError(); ok(error == 0xdeadbeef, "Last error: %u\n", error); - - cursor2 = GetCursor(); - ok(cursor2 == cursor, "Active was set to %p when trying to destroy it\n", cursor2); - - SetCursor(NULL); - - /* Trying to destroy the cursor properly fails now with - * ERROR_INVALID_CURSOR_HANDLE. This happens because we called - * DestroyCursor() 2+ times after calling SetCursor(). The calls to - * GetCursor() and SetCursor(NULL) in between make no difference. */ - ret = DestroyCursor(cursor); - todo_wine { - ok(!ret, "DestroyCursor succeeded.\n"); - error = GetLastError(); - ok(error == ERROR_INVALID_CURSOR_HANDLE || error == 0xdeadbeef, /* vista */ - "Last error: 0x%08x\n", error); + if (!ret) + { + cursor2 = GetCursor(); + ok(cursor2 == cursor, "Active was set to %p when trying to destroy it\n", cursor2); + SetCursor(NULL); + + /* Trying to destroy the cursor properly fails now with + * ERROR_INVALID_CURSOR_HANDLE. This happens because we called + * DestroyCursor() 2+ times after calling SetCursor(). The calls to + * GetCursor() and SetCursor(NULL) in between make no difference. */ + ret = DestroyCursor(cursor); + todo_wine { + ok(!ret, "DestroyCursor succeeded.\n"); + error = GetLastError(); + ok(error == ERROR_INVALID_CURSOR_HANDLE || error == 0xdeadbeef, /* vista */ + "Last error: 0x%08x\n", error); + } } DeleteObject(cursorInfo.hbmMask); @@ -1012,7 +1013,7 @@ static void test_DestroyCursor(void) SetLastError(0xdeadbeef); ret = DestroyCursor(cursor); - ok(ret, "DestroyCursor on the active cursor failed.\n"); + ok(ret || broken(!ret) /* fails on win9x */, "DestroyCursor on the active cursor failed.\n"); error = GetLastError(); ok(error == 0xdeadbeef, "Last error: 0x%08x\n", error);

1 0

Alexandre Julliard : user32/tests: The BSF_SENDNOTIFYMESSAGE flag is not supported on NT4.
by Alexandre Julliard Nov. 21, 2008

Nov. 21, 2008

Module: wine Branch: master Commit: 43a70a68bc5e7c2c9bcfbff58751b6e9ce59fe1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=43a70a68bc5e7c2c9bcfbff58… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 20 18:01:23 2008 +0100 user32/tests: The BSF_SENDNOTIFYMESSAGE flag is not supported on NT4. --- dlls/user32/tests/broadcast.c | 36 +++++++++++++++++++++--------------- 1 files changed, 21 insertions(+), 15 deletions(-) diff --git a/dlls/user32/tests/broadcast.c b/dlls/user32/tests/broadcast.c index 0b2c2d6..ae9cd29 100644 --- a/dlls/user32/tests/broadcast.c +++ b/dlls/user32/tests/broadcast.c @@ -150,23 +150,29 @@ static void test_parameters(PBROADCAST broadcast, const char *functionname) ok(WaitForSingleObject(hevent, 0) != WAIT_TIMEOUT, "Asynchronous message sent instead\n"); PulseEvent(hevent); + SetLastError( 0xdeadbeef ); recips = BSM_APPLICATIONS; ret = broadcast( BSF_POSTMESSAGE|BSF_SENDNOTIFYMESSAGE, &recips, WM_NULL, 100, 0 ); - ok(ret==1, "Returned: %d\n", ret); - ok(WaitForSingleObject(hevent, 0) != WAIT_OBJECT_0, "Synchronous message sent instead\n"); - PulseEvent(hevent); - - recips = BSM_APPLICATIONS; - ret = broadcast( BSF_SENDNOTIFYMESSAGE, &recips, WM_NULL, 100, BROADCAST_QUERY_DENY ); - ok(ret==1, "Returned: %d\n", ret); - ok(WaitForSingleObject(hevent, 0) != WAIT_TIMEOUT, "Asynchronous message sent instead\n"); - PulseEvent(hevent); - - recips = BSM_APPLICATIONS; - ret = broadcast( BSF_SENDNOTIFYMESSAGE|BSF_QUERY, &recips, WM_NULL, 100, BROADCAST_QUERY_DENY ); - ok(!ret, "Returned: %d\n", ret); - ok(WaitForSingleObject(hevent, 0) != WAIT_TIMEOUT, "Asynchronous message sent instead\n"); - PulseEvent(hevent); + if (ret) + { + ok(ret==1, "Returned: %d\n", ret); + ok(WaitForSingleObject(hevent, 0) != WAIT_OBJECT_0, "Synchronous message sent instead\n"); + PulseEvent(hevent); + + recips = BSM_APPLICATIONS; + ret = broadcast( BSF_SENDNOTIFYMESSAGE, &recips, WM_NULL, 100, BROADCAST_QUERY_DENY ); + ok(ret==1, "Returned: %d\n", ret); + ok(WaitForSingleObject(hevent, 0) != WAIT_TIMEOUT, "Asynchronous message sent instead\n"); + PulseEvent(hevent); + + recips = BSM_APPLICATIONS; + ret = broadcast( BSF_SENDNOTIFYMESSAGE|BSF_QUERY, &recips, WM_NULL, 100, BROADCAST_QUERY_DENY ); + ok(!ret, "Returned: %d\n", ret); + ok(WaitForSingleObject(hevent, 0) != WAIT_TIMEOUT, "Asynchronous message sent instead\n"); + PulseEvent(hevent); + } + else /* BSF_SENDNOTIFYMESSAGE not supported on NT4 */ + ok( GetLastError() == ERROR_INVALID_PARAMETER, "failed with err %u\n", GetLastError() ); recips = BSM_APPLICATIONS; ret = broadcast( 0, &recips, WM_NULL, 100, 0 );

1 0

Alexandre Julliard : user32/tests: Fix wildcard directory lists handling for Win9x.
by Alexandre Julliard Nov. 21, 2008

Nov. 21, 2008

Module: wine Branch: master Commit: bda507fb588f5b47b47280f05ce475d765437d31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bda507fb588f5b47b47280f05… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 20 19:52:03 2008 +0100 user32/tests: Fix wildcard directory lists handling for Win9x. --- dlls/user32/tests/listbox.c | 39 +++++++++++++++++++++++---------------- 1 files changed, 23 insertions(+), 16 deletions(-) diff --git a/dlls/user32/tests/listbox.c b/dlls/user32/tests/listbox.c index 06cb44a..c872357 100644 --- a/dlls/user32/tests/listbox.c +++ b/dlls/user32/tests/listbox.c @@ -557,7 +557,7 @@ static void test_listbox_item_data(void) DestroyWindow( hList ); } -static void test_listbox_LB_DIR() +static void test_listbox_LB_DIR(void) { HWND hList; int res, itemCount; @@ -650,9 +650,10 @@ static void test_listbox_LB_DIR() strcpy(pathBuffer, "*"); SendMessage(hList, LB_RESETCONTENT, 0, 0); res = SendMessage(hList, LB_DIR, DDL_DIRECTORY, (LPARAM)pathBuffer); - if (res == -1) /* "*" wildcard doesn't work on win9x */ + if (res == -1 || res <= itemCount_allFiles) /* "*" wildcard doesn't work on win9x */ { strcpy(pathBuffer, "*.*"); + SendMessage(hList, LB_RESETCONTENT, 0, 0); res = SendMessage(hList, LB_DIR, DDL_DIRECTORY, (LPARAM)pathBuffer); } ok (res > 0, "SendMessage(LB_DIR, DDL_DIRECTORY, *) failed - 0x%08x\n", GetLastError()); @@ -713,7 +714,7 @@ static void test_listbox_LB_DIR() strcpy(pathBuffer, "*"); SendMessage(hList, LB_RESETCONTENT, 0, 0); res = SendMessage(hList, LB_DIR, DDL_DRIVES|DDL_EXCLUSIVE, (LPARAM)pathBuffer); - ok (res > 0, "SendMessage(LB_DIR, DDL_DRIVES|DDL_EXCLUSIVE, *) failed - 0x%08x\n", GetLastError()); + ok (res >= 0, "SendMessage(LB_DIR, DDL_DRIVES|DDL_EXCLUSIVE, *) failed - 0x%08x\n", GetLastError()); /* There should be some content in the listbox. In particular, there should * be at least one element before, since the string "[-c-]" should @@ -768,10 +769,11 @@ static void test_listbox_LB_DIR() * been added. */ itemCount = SendMessage(hList, LB_GETCOUNT, 0, 0); - ok (itemCount == itemCount_justDrives + itemCount_allFiles, - "SendMessage(LB_DIR, DDL_DRIVES, w*.c) filled with %d entries, expected %d\n", + ok (itemCount == itemCount_justDrives + itemCount_allFiles || + broken(itemCount == itemCount_justDrives), /* "*" wildcard broken on win9x */ + "SendMessage(LB_DIR, DDL_DRIVES, *) filled with %d entries, expected %d\n", itemCount, itemCount_justDrives + itemCount_allFiles); - ok(res + 1 == itemCount, "SendMessage(LB_DIR, DDL_DRIVES, w*.c) returned incorrect index!\n"); + ok(res + 1 == itemCount, "SendMessage(LB_DIR, DDL_DRIVES, *) returned incorrect index!\n"); /* This tests behavior when no files match the wildcard */ strcpy(pathBuffer, BAD_EXTENSION); @@ -829,7 +831,8 @@ static void test_listbox_LB_DIR() * be exactly the number of plain files, plus the number of mapped drives. */ itemCount = SendMessage(hList, LB_GETCOUNT, 0, 0); - ok (itemCount == itemCount_allFiles + itemCount_justDrives + itemCount_allDirs, + ok (itemCount == itemCount_allFiles + itemCount_justDrives + itemCount_allDirs || + broken(itemCount == itemCount_justDrives + itemCount_allDirs), /* "*" wildcard broken on win9x */ "SendMessage(LB_DIR, DDL_DIRECTORY|DDL_DRIVES) filled with %d entries, expected %d\n", itemCount, itemCount_allFiles + itemCount_justDrives + itemCount_allDirs); ok(res + 1 == itemCount, "SendMessage(LB_DIR, DDL_DIRECTORY|DDL_DRIVES, w*.c) returned incorrect index!\n"); @@ -900,16 +903,18 @@ static void test_listbox_LB_DIR() res = SendMessage(hList, LB_DIR, DDL_DIRECTORY|DDL_EXCLUSIVE, (LPARAM)pathBuffer); ok (res != -1, "SendMessage(LB_DIR, DDL_DIRECTORY|DDL_EXCLUSIVE, *) failed err %u\n", GetLastError()); - /* There should be exactly one element: "[..]" */ itemCount = SendMessage(hList, LB_GETCOUNT, 0, 0); ok (itemCount == itemCount_allDirs, "SendMessage(LB_DIR, DDL_DIRECTORY|DDL_EXCLUSIVE) filled with %d entries, expected %d\n", itemCount, itemCount_allDirs); ok(res + 1 == itemCount, "SendMessage(LB_DIR, DDL_DIRECTORY|DDL_EXCLUSIVE, *) returned incorrect index!\n"); - memset(pathBuffer, 0, MAX_PATH); - SendMessage(hList, LB_GETTEXT, 0, (LPARAM)pathBuffer); - ok( !strcmp(pathBuffer, "[..]"), "First (and only) element is not [..]\n"); + if (itemCount && GetCurrentDirectoryA( MAX_PATH, pathBuffer ) > 3) /* there's no [..] in drive root */ + { + memset(pathBuffer, 0, MAX_PATH); + SendMessage(hList, LB_GETTEXT, 0, (LPARAM)pathBuffer); + ok( !strcmp(pathBuffer, "[..]"), "First element is not [..]\n"); + } /* This tests behavior when no files match the wildcard */ strcpy(pathBuffer, BAD_EXTENSION); @@ -974,7 +979,7 @@ static void test_listbox_LB_DIR() strcpy(pathBuffer, "w*.c"); SendMessage(hList, LB_RESETCONTENT, 0, 0); res = SendMessage(hList, LB_DIR, DDL_DIRECTORY|DDL_DRIVES|DDL_EXCLUSIVE, (LPARAM)pathBuffer); - ok (res > 0, "SendMessage(LB_DIR, DDL_DIRECTORY|DDL_DRIVES|DDL_EXCLUSIVE, w*.c,) failed - 0x%08x\n", GetLastError()); + ok (res >= 0, "SendMessage(LB_DIR, DDL_DIRECTORY|DDL_DRIVES|DDL_EXCLUSIVE, w*.c,) failed - 0x%08x\n", GetLastError()); /* There should be no plain files on the listbox, and no [..], since it does not fit w*.c */ itemCount = SendMessage(hList, LB_GETCOUNT, 0, 0); @@ -1288,10 +1293,12 @@ static void test_listbox_dlgdir(void) "DlgDirList(DDL_DIRECTORY|DDL_EXCLUSIVE) filled with %d entries, expected %d\n", itemCount, itemCount_allDirs); - memset(pathBuffer, 0, MAX_PATH); - SendMessage(g_listBox, LB_GETTEXT, 0, (LPARAM)pathBuffer); - ok( !strcmp(pathBuffer, "[..]"), "First (and only) element is not [..]\n"); - + if (itemCount && GetCurrentDirectoryA( MAX_PATH, pathBuffer ) > 3) /* there's no [..] in drive root */ + { + memset(pathBuffer, 0, MAX_PATH); + SendMessage(g_listBox, LB_GETTEXT, 0, (LPARAM)pathBuffer); + ok( !strcmp(pathBuffer, "[..]"), "First (and only) element is not [..]\n"); + } /* Test behavior when no files match the wildcard */ strcpy(pathBuffer, BAD_EXTENSION);

1 0

Lamaresh : deb for lenny amd64
by Jeremy Newman Nov. 20, 2008

Nov. 20, 2008

Module: website Branch: master Commit: 506cb4cffef89edbf81f7b08f5e150fc8612cf67 URL: http://source.winehq.org/git/website.git/?a=commit;h=506cb4cffef89edbf81f7b… Author: Lamaresh <lamalennyrepo(a)altervista.org> Date: Wed Nov 19 21:51:22 2008 +0100 deb for lenny amd64 in attachment Maurilio Genovese >From 231671954c96d3d32e8803554543104b429cdadd Mon Sep 17 00:00:00 2001 From: Maurilio Genovese <lamalennyrepo(a)altervista.org> Date: Wed, 19 Nov 2008 21:46:11 +0100 Subject: Updated download page after adding amd64 packages modified: templates/en/download-deblenny.template modified: templates/en/download.template --- templates/en/download-deblenny.template | 4 ++-- templates/en/download.template | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/en/download-deblenny.template b/templates/en/download-deblenny.template index f1893e3..fb51a5d 100644 --- a/templates/en/download-deblenny.template +++ b/templates/en/download-deblenny.template @@ -9,7 +9,7 @@ Wine for Debian Lenny <p><b>Warning: These are beta packages</b><br> <i>This means they will periodically suffer from <a href="http://wiki.winehq.org/Regression">regressions</a>, and as a result an update may break functionality in Wine. If the latest stable release of Wine (currently Wine 1.0.1) works for you, then you may not want to use these beta packages.</i></p> -<p><b>WARNING:</b> for now there are only packages for i386 users, packages for AMD64 will be added as soon as possible.</p> +<p>This repository contains packages for i386 and amd64 architecture.</p> <p>To install wine packages you can use two methods: add the repository or download a .deb package and manually install it, but first of all you have to remove older wine version. If you use the first method you'll have wine automatically upgraded by apt, otherwise you'll need to manually download and install every new version.</p> @@ -30,7 +30,7 @@ Wine for Debian Lenny <div style="position:relative;left:20px">Open a terminal</div> <div style="position:relative;left:20px"><i>cd ~</i> <font color="gray">#to go to your home directory</font></div> <div style="position:relative;left:20px"><i>su</i> <font color="gray">#to log as root</font></div> -<div style="position:relative;left:20px"><i>dpkg -i wine_1.1.x_i386.deb</i> <font color="gray">#change x with your chosen version, this will install wine</font></div> +<div style="position:relative;left:20px"><i>dpkg -i wine_1.1.x_i386.deb</i> <font color="gray">#change xxx with your chosen package, this will install wine</font></div> <br><br><p style="font-size:12px;text-align:left;font-style: italic;">Manteiner: <a href="http://www.lamalennyrepo.altervista.org" target="_new">homepage</a>, <a href="mailto:lamalennyrepo(a)altervista.org">email</a></p> diff --git a/templates/en/download.template b/templates/en/download.template index 9eb654e..a03027a 100644 --- a/templates/en/download.template +++ b/templates/en/download.template @@ -44,7 +44,7 @@ for post-installation instructions.</b></p> <img src="{$root}/images/distro/debian.png" width="50" height="50" alt="Debian Linux" border="0"></a> </td> <td> <b><a href="{$root}/site/download-deblenny">Debian</a></b> - binary and source .debs for Debian Lenny (5.0)</td> + binary .debs for Debian Lenny (5.0)</td> <td><a href="mailto:lamalennyreport(a)altervista.org">Maurilio Genovese</a></td> </tr>

1 0

Alexandre Julliard : winetest: Treat missing dependencies the same way as missing dlls.
by Alexandre Julliard Nov. 20, 2008

Nov. 20, 2008

Module: tools Branch: master Commit: 00539980278532290015fbcb616670250b099561 URL: http://source.winehq.org/git/tools.git/?a=commit;h=00539980278532290015fbcb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 20 15:05:03 2008 +0100 winetest: Treat missing dependencies the same way as missing dlls. --- winetest/dissect | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/winetest/dissect b/winetest/dissect index 4d137c1..9a00d8e 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -211,7 +211,7 @@ while ($_ = <IN>) { s/\r+$//; last if (!/^\s+([^ =]+)=(.*)\r?$/); $dllinfo{$1} = { version => $2 }; - if ($2 eq "dll is missing") + if ($2 eq "dll is missing" || $2 eq "load error 1157") { print SUM "- $1 - missing - - - - -\n"; } @@ -305,6 +305,15 @@ foreach my $dll (sort keys %dllinfo) { $dllbox->{data} .= sprintf "<tr><td>%s</td><td class=\"skipped\">missing</td></tr>\n", escapeHTML($dll); } + elsif ($dllinfo{$dll}->{version} eq "load error 1157") + { + $dllbox->{data} .= sprintf "<tr><td>%s</td><td class=\"skipped\">missing dependencies</td></tr>\n", escapeHTML($dll); + } + elsif ($dllinfo{$dll}->{version} =~ /^load error/) + { + $dllbox->{data} .= sprintf "<tr><td>%s</td><td class=\"failed\">%s</td></tr>\n", + escapeHTML($dll), escapeHTML($dllinfo{$dll}->{version}); + } elsif (defined($dllinfo{$dll}->{first})) { $dllbox->{data} .= sprintf "<tr><td><a href=\"report.html#%s\">%s</a></td><td>%s</td></tr>\n",

1 0

Alexandre Julliard : git-notify: Fix the usage message.
by Alexandre Julliard Nov. 20, 2008

Nov. 20, 2008

Module: tools Branch: master Commit: af9758dd1fec920cc332dd1e5caf6f13d33b858d URL: http://source.winehq.org/git/tools.git/?a=commit;h=af9758dd1fec920cc332dd1e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 7 09:30:46 2008 +0100 git-notify: Fix the usage message. --- git-notify | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/git-notify b/git-notify index ad4b90e..50345b1 100755 --- a/git-notify +++ b/git-notify @@ -70,7 +70,7 @@ my @exclude_list = split /\s+/, git_config( "notify.exclude" ) || ""; sub usage() { - print "Usage: $0 [options] [--] refname old-sha1 new-sha1\n"; + print "Usage: $0 [options] [--] old-sha1 new-sha1 refname\n"; print " -c name Send CIA notifications under specified project name\n"; print " -m addr Send mail notifications to specified address\n"; print " -n max Set max number of individual mails to send\n";

1 0

Hans Leidekker : winhttp: Prefer builtin over native.
by Alexandre Julliard Nov. 20, 2008

Nov. 20, 2008

Module: wine Branch: master Commit: e4f7809cc9969c693d910348315502892848aaf9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4f7809cc9969c693d9103483… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Nov 20 14:50:58 2008 +0100 winhttp: Prefer builtin over native. --- dlls/winhttp/main.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/winhttp/main.c b/dlls/winhttp/main.c index 1a4a131..c0ac9cb 100644 --- a/dlls/winhttp/main.c +++ b/dlls/winhttp/main.c @@ -38,8 +38,6 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) { switch(fdwReason) { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(hInstDLL); break;

1 0

Alexandre Julliard : kernel32/tests: Add a couple of tests for write watches.
by Alexandre Julliard Nov. 20, 2008

Nov. 20, 2008

Module: wine Branch: master Commit: 8772c5f150956a06062daff2a3f7185271218545 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8772c5f150956a06062daff2a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 20 14:27:35 2008 +0100 kernel32/tests: Add a couple of tests for write watches. --- dlls/kernel32/tests/virtual.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index a18f2d6..3302306 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -938,6 +938,18 @@ static void test_write_watch(void) ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); SetLastError( 0xdeadbeef ); + count = 64; + ret = pGetWriteWatch( 0, base, size * 2, results, &count, &pagesize ); + ok( ret == ~0u, "GetWriteWatch succeeded %u\n", ret ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + count = 64; + ret = pGetWriteWatch( 0, base + size - pagesize, pagesize + 1, results, &count, &pagesize ); + ok( ret == ~0u, "GetWriteWatch succeeded %u\n", ret ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); ret = pResetWriteWatch( base, 0 ); ok( ret == ~0u, "ResetWriteWatch succeeded %u\n", ret ); ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() );

1 0