October 2007 - Wine-commits

Lei Zhang : comctl32: Move tab test's createParentWindow() into START_TEST( ).
by Alexandre Julliard 30 Oct '07

30 Oct '07

Module: wine Branch: master Commit: c5a17f98df43d5cac9b666334c9135479b7d935d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5a17f98df43d5cac9b666334… Author: Lei Zhang <thestig(a)google.com> Date: Mon Oct 29 16:39:10 2007 -0700 comctl32: Move tab test's createParentWindow() into START_TEST(). --- dlls/comctl32/tests/tab.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/tests/tab.c b/dlls/comctl32/tests/tab.c index 1787a8b..784901d 100644 --- a/dlls/comctl32/tests/tab.c +++ b/dlls/comctl32/tests/tab.c @@ -593,16 +593,14 @@ static void test_tab(INT nMinTabWidth) DeleteObject(hFont); } -static void test_getters_setters(INT nTabs) +static void test_getters_setters(HWND parent_wnd, INT nTabs) { HWND hTab; - HWND parent_wnd; RECT rTab; INT nTabsRetrieved; INT rowCount; - parent_wnd = createParentWindow(); - ok(parent_wnd != NULL, "Failed to create parent window!\n"); + ok(parent_wnd != NULL, "no parent window!\n"); flush_sequences(sequences, NUM_MSG_SEQUENCES); hTab = createFilledTabControl(parent_wnd, TCS_FIXEDWIDTH, TCIF_TEXT|TCIF_IMAGE, nTabs); @@ -810,11 +808,11 @@ static void test_getters_setters(INT nTabs) } DestroyWindow(hTab); - DestroyWindow(parent_wnd); } START_TEST(tab) { + HWND parent_wnd; LOGFONTA logfont; lstrcpyA(logfont.lfFaceName, "Arial"); @@ -839,6 +837,10 @@ START_TEST(tab) init_msg_sequences(sequences, NUM_MSG_SEQUENCES); + parent_wnd = createParentWindow(); + ok(parent_wnd != NULL, "Failed to create parent window!\n"); + /* Testing getters and setters with 5 tabs */ - test_getters_setters(5); + test_getters_setters(parent_wnd, 5); + DestroyWindow(parent_wnd); }

1 0

Lei Zhang : comctl32: Add tab insert item / get focus test.
by Alexandre Julliard 30 Oct '07

30 Oct '07

Module: wine Branch: master Commit: 31a09c3b7bc0b89e59c77a1f361c095536046fe9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=31a09c3b7bc0b89e59c77a1f3… Author: Lei Zhang <thestig(a)google.com> Date: Mon Oct 29 18:32:34 2007 -0700 comctl32: Add tab insert item / get focus test. --- dlls/comctl32/tests/tab.c | 92 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 92 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/tab.c b/dlls/comctl32/tests/tab.c index 784901d..51bb067 100644 --- a/dlls/comctl32/tests/tab.c +++ b/dlls/comctl32/tests/tab.c @@ -233,6 +233,26 @@ static const struct message getset_tooltip_parent_seq[] = { { 0 } }; +static const struct message insert_focus_seq[] = { + { TCM_GETITEMCOUNT, sent|wparam|lparam, 0, 0 }, + { TCM_GETCURFOCUS, sent|wparam|lparam, 0, 0 }, + { TCM_INSERTITEM, sent|wparam, 1 }, + { TCM_GETITEMCOUNT, sent|wparam|lparam, 0, 0 }, + { TCM_GETCURFOCUS, sent|wparam|lparam, 0, 0 }, + { TCM_INSERTITEM, sent|wparam, 2 }, + { WM_NOTIFYFORMAT, sent|defwinproc, }, + { WM_QUERYUISTATE, sent|defwinproc, }, + { WM_PARENTNOTIFY, sent|defwinproc, }, + { TCM_GETITEMCOUNT, sent|wparam|lparam, 0, 0 }, + { TCM_GETCURFOCUS, sent|wparam|lparam, 0, 0 }, + { TCM_SETCURFOCUS, sent|wparam|lparam, -1, 0 }, + { TCM_GETCURFOCUS, sent|wparam|lparam, 0, 0 }, + { TCM_INSERTITEM, sent|wparam, 3 }, + { TCM_GETCURFOCUS, sent|wparam|lparam, 0, 0 }, + { 0 } +}; + + static HWND create_tabcontrol (DWORD style, DWORD mask) { @@ -810,6 +830,75 @@ static void test_getters_setters(HWND parent_wnd, INT nTabs) DestroyWindow(hTab); } +static void test_insert_focus(HWND parent_wnd) +{ + HWND hTab; + INT nTabsRetrieved; + INT r; + TCITEM tcNewTab; + DWORD mask = TCIF_TEXT|TCIF_IMAGE; + static char tabName[] = "TAB"; + tcNewTab.mask = mask; + tcNewTab.pszText = tabName; + + ok(parent_wnd != NULL, "no parent window!\n"); + + hTab = createFilledTabControl(parent_wnd, TCS_FIXEDWIDTH, mask, 0); + ok(hTab != NULL, "Failed to create tab control\n"); + + flush_sequences(sequences, NUM_MSG_SEQUENCES); + + nTabsRetrieved = SendMessage(hTab, TCM_GETITEMCOUNT, 0, 0); + expect(0, nTabsRetrieved); + + r = SendMessage(hTab, TCM_GETCURFOCUS, 0, 0); + expect(-1, r); + + tcNewTab.iImage = 1; + r = SendMessage(hTab, TCM_INSERTITEM, 1, (LPARAM) &tcNewTab); + expect(0, r); + + nTabsRetrieved = SendMessage(hTab, TCM_GETITEMCOUNT, 0, 0); + expect(1, nTabsRetrieved); + + r = SendMessage(hTab, TCM_GETCURFOCUS, 0, 0); + todo_wine { + expect(0, r); + } + + tcNewTab.iImage = 2; + r = SendMessage(hTab, TCM_INSERTITEM, 2, (LPARAM) &tcNewTab); + expect(1, r); + + nTabsRetrieved = SendMessage(hTab, TCM_GETITEMCOUNT, 0, 0); + expect(2, nTabsRetrieved); + + r = SendMessage(hTab, TCM_GETCURFOCUS, 0, 0); + todo_wine { + expect(0, r); + } + + r = SendMessage(hTab, TCM_SETCURFOCUS, -1, 0); + expect(0, r); + + r = SendMessage(hTab, TCM_GETCURFOCUS, 0, 0); + expect(-1, r); + + tcNewTab.iImage = 3; + r = SendMessage(hTab, TCM_INSERTITEM, 3, (LPARAM) &tcNewTab); + expect(2, r); + + r = SendMessage(hTab, TCM_GETCURFOCUS, 0, 0); + todo_wine { + expect(2, r); + } + + ok_sequence(sequences, TAB_SEQ_INDEX, insert_focus_seq, "insert_focus test sequence", TRUE); + ok_sequence(sequences, PARENT_SEQ_INDEX, empty_sequence, "insert_focus parent test sequence", FALSE); + + DestroyWindow(hTab); +} + START_TEST(tab) { HWND parent_wnd; @@ -842,5 +931,8 @@ START_TEST(tab) /* Testing getters and setters with 5 tabs */ test_getters_setters(parent_wnd, 5); + + test_insert_focus(parent_wnd); + DestroyWindow(parent_wnd); }

1 0

Lei Zhang : comctl32: Add tab delete item / get focus test.
by Alexandre Julliard 30 Oct '07

30 Oct '07

Module: wine Branch: master Commit: 73213d14440d42e58fe1acc0ac1fc94dc14d32c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=73213d14440d42e58fe1acc0a… Author: Lei Zhang <thestig(a)google.com> Date: Mon Oct 29 18:44:48 2007 -0700 comctl32: Add tab delete item / get focus test. --- dlls/comctl32/tests/tab.c | 68 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 68 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/tab.c b/dlls/comctl32/tests/tab.c index 51bb067..32de6bc 100644 --- a/dlls/comctl32/tests/tab.c +++ b/dlls/comctl32/tests/tab.c @@ -252,6 +252,20 @@ static const struct message insert_focus_seq[] = { { 0 } }; +static const struct message delete_focus_seq[] = { + { TCM_GETITEMCOUNT, sent|wparam|lparam, 0, 0 }, + { TCM_GETCURFOCUS, sent|wparam|lparam, 0, 0 }, + { TCM_DELETEITEM, sent|wparam|lparam, 1, 0 }, + { TCM_GETITEMCOUNT, sent|wparam|lparam, 0, 0 }, + { TCM_GETCURFOCUS, sent|wparam|lparam, 0, 0 }, + { TCM_SETCURFOCUS, sent|wparam|lparam, -1, 0 }, + { TCM_GETCURFOCUS, sent|wparam|lparam, 0, 0 }, + { TCM_DELETEITEM, sent|wparam|lparam, 0, 0 }, + { TCM_GETITEMCOUNT, sent|wparam|lparam, 0, 0 }, + { TCM_GETCURFOCUS, sent|wparam|lparam, 0, 0 }, + { 0 } +}; + static HWND create_tabcontrol (DWORD style, DWORD mask) @@ -899,6 +913,59 @@ static void test_insert_focus(HWND parent_wnd) DestroyWindow(hTab); } +static void test_delete_focus(HWND parent_wnd) +{ + HWND hTab; + INT nTabsRetrieved; + INT r; + + ok(parent_wnd != NULL, "no parent window!\n"); + + hTab = createFilledTabControl(parent_wnd, TCS_FIXEDWIDTH, TCIF_TEXT|TCIF_IMAGE, 2); + ok(hTab != NULL, "Failed to create tab control\n"); + + flush_sequences(sequences, NUM_MSG_SEQUENCES); + + nTabsRetrieved = SendMessage(hTab, TCM_GETITEMCOUNT, 0, 0); + expect(2, nTabsRetrieved); + + r = SendMessage(hTab, TCM_GETCURFOCUS, 0, 0); + todo_wine { + expect(0, r); + } + + r = SendMessage(hTab, TCM_DELETEITEM, 1, 0); + expect(1, r); + + nTabsRetrieved = SendMessage(hTab, TCM_GETITEMCOUNT, 0, 0); + expect(1, nTabsRetrieved); + + r = SendMessage(hTab, TCM_GETCURFOCUS, 0, 0); + todo_wine { + expect(0, r); + } + + r = SendMessage(hTab, TCM_SETCURFOCUS, -1, 0); + expect(0, r); + + r = SendMessage(hTab, TCM_GETCURFOCUS, 0, 0); + expect(-1, r); + + r = SendMessage(hTab, TCM_DELETEITEM, 0, 0); + expect(1, r); + + nTabsRetrieved = SendMessage(hTab, TCM_GETITEMCOUNT, 0, 0); + expect(0, nTabsRetrieved); + + r = SendMessage(hTab, TCM_GETCURFOCUS, 0, 0); + expect(-1, r); + + ok_sequence(sequences, TAB_SEQ_INDEX, delete_focus_seq, "delete_focus test sequence", FALSE); + ok_sequence(sequences, PARENT_SEQ_INDEX, empty_sequence, "delete_focus parent test sequence", FALSE); + + DestroyWindow(hTab); +} + START_TEST(tab) { HWND parent_wnd; @@ -933,6 +1000,7 @@ START_TEST(tab) test_getters_setters(parent_wnd, 5); test_insert_focus(parent_wnd); + test_delete_focus(parent_wnd); DestroyWindow(parent_wnd); }

1 0

Klaus Layer : ntdll: Add missing FIXMEs for incomplete info classes in NtQuerySystemInformation .
by Alexandre Julliard 30 Oct '07

30 Oct '07

Module: wine Branch: master Commit: 9f8d9e3e05f4703784d889f9855c3e3580cd3ce6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f8d9e3e05f4703784d889f98… Author: Klaus Layer <klaus.layer(a)gmx.de> Date: Sun Oct 28 00:02:41 2007 +0200 ntdll: Add missing FIXMEs for incomplete info classes in NtQuerySystemInformation. --- dlls/ntdll/nt.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 15fb507..c241e94 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -738,6 +738,7 @@ NTSTATUS WINAPI NtQuerySystemInformation( else memcpy( SystemInformation, &spi, len); } else ret = STATUS_INFO_LENGTH_MISMATCH; + FIXME("info_class SYSTEM_PERFORMANCE_INFORMATION\n"); } break; case SystemTimeOfDayInformation: @@ -892,6 +893,7 @@ NTSTATUS WINAPI NtQuerySystemInformation( else memcpy( SystemInformation, &sppi, len); } else ret = STATUS_INFO_LENGTH_MISMATCH; + FIXME("info_class SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION\n"); } break; case SystemModuleInformation: @@ -912,6 +914,7 @@ NTSTATUS WINAPI NtQuerySystemInformation( else memcpy( SystemInformation, &shi, len); } else ret = STATUS_INFO_LENGTH_MISMATCH; + FIXME("info_class SYSTEM_HANDLE_INFORMATION\n"); } break; case SystemCacheInformation: @@ -927,6 +930,7 @@ NTSTATUS WINAPI NtQuerySystemInformation( else memcpy( SystemInformation, &sci, len); } else ret = STATUS_INFO_LENGTH_MISMATCH; + FIXME("info_class SYSTEM_CACHE_INFORMATION\n"); } break; case SystemInterruptInformation: @@ -942,6 +946,7 @@ NTSTATUS WINAPI NtQuerySystemInformation( else memcpy( SystemInformation, &sii, len); } else ret = STATUS_INFO_LENGTH_MISMATCH; + FIXME("info_class SYSTEM_INTERRUPT_INFORMATION\n"); } break; case SystemKernelDebuggerInformation:

1 0

Paul Vriens : ntdll: Report FIXME only once.
by Alexandre Julliard 30 Oct '07

30 Oct '07

Module: wine Branch: master Commit: 2f09f50641751b2eee6c8bb8142be8c769e83974 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f09f50641751b2eee6c8bb81… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Mon Oct 29 14:11:23 2007 +0100 ntdll: Report FIXME only once. --- dlls/ntdll/thread.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index aaa5216..37a845f 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -1217,9 +1217,17 @@ NTSTATUS WINAPI NtQueryInformationThread( HANDLE handle, THREADINFOCLASS class, } else { + static BOOL reported = FALSE; + kusrt.KernelTime.QuadPart = 0; kusrt.UserTime.QuadPart = 0; - FIXME("Cannot get kerneltime or usertime of other threads\n"); + if (reported) + TRACE("Cannot get kerneltime or usertime of other threads\n"); + else + { + FIXME("Cannot get kerneltime or usertime of other threads\n"); + reported = TRUE; + } } if (data) memcpy( data, &kusrt, min( length, sizeof(kusrt) )); if (ret_len) *ret_len = min( length, sizeof(kusrt) );

1 0

Andrew Talbot : shell32: Constify some variables.
by Alexandre Julliard 30 Oct '07

30 Oct '07

Module: wine Branch: master Commit: a7d80730d666faabb4f0bafc59555241a9cda13b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7d80730d666faabb4f0bafc5… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Oct 29 21:51:02 2007 +0000 shell32: Constify some variables. --- dlls/shell32/shfldr_unixfs.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/shfldr_unixfs.c b/dlls/shell32/shfldr_unixfs.c index f780037..c18da27 100644 --- a/dlls/shell32/shfldr_unixfs.c +++ b/dlls/shell32/shfldr_unixfs.c @@ -356,8 +356,8 @@ cleanup: * TRUE, if pIDL is accepted by fFilter * FALSE, otherwise */ -static inline BOOL UNIXFS_is_pidl_of_type(LPITEMIDLIST pIDL, SHCONTF fFilter) { - LPPIDLDATA pIDLData = _ILGetDataPointer(pIDL); +static inline BOOL UNIXFS_is_pidl_of_type(LPCITEMIDLIST pIDL, SHCONTF fFilter) { + const PIDLDATA *pIDLData = _ILGetDataPointer(pIDL); if (!(fFilter & SHCONTF_INCLUDEHIDDEN) && pIDLData && (pIDLData->u.file.uFileAttribs & FILE_ATTRIBUTE_HIDDEN)) { @@ -1738,7 +1738,7 @@ static HRESULT WINAPI UnixFolder_ISFHelper_AddFolder(ISFHelper* iface, HWND hwnd * be converted, S_FALSE is returned. In such situation DeleteItems will try to delete * the files using syscalls */ -static HRESULT UNIXFS_delete_with_shfileop(UnixFolder *This, UINT cidl, LPCITEMIDLIST *apidl) +static HRESULT UNIXFS_delete_with_shfileop(UnixFolder *This, UINT cidl, const LPCITEMIDLIST *apidl) { char szAbsolute[FILENAME_MAX], *pszRelative; LPWSTR wszPathsList, wszListPos; @@ -1792,7 +1792,7 @@ static HRESULT UNIXFS_delete_with_shfileop(UnixFolder *This, UINT cidl, LPCITEMI return ret; } -static HRESULT UNIXFS_delete_with_syscalls(UnixFolder *This, UINT cidl, LPCITEMIDLIST *apidl) +static HRESULT UNIXFS_delete_with_syscalls(UnixFolder *This, UINT cidl, const LPCITEMIDLIST *apidl) { char szAbsolute[FILENAME_MAX], *pszRelative; static const WCHAR empty[] = {0};

1 0

Hans Leidekker : wininet: Use a single connection for all ftp tests.
by Alexandre Julliard 30 Oct '07

30 Oct '07

Module: wine Branch: master Commit: a844a38fad038dc4561e171b3a58b88a8ef111de URL: http://source.winehq.org/git/wine.git/?a=commit;h=a844a38fad038dc4561e171b3… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Mon Oct 29 21:46:52 2007 +0100 wininet: Use a single connection for all ftp tests. --- dlls/wininet/tests/ftp.c | 244 +++++++-------------------------------------- 1 files changed, 38 insertions(+), 206 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a844a38fad038dc4561e1…

1 0

Alexander Nicolaysen Sørnes : application: Allow clearing the Application URL
by Chris Morgan 29 Oct '07

29 Oct '07

Module: appdb Branch: master Commit: 710d79224ab7e26d6ad6d3bb4b8659e4c0f34b6a URL: http://source.winehq.org/git/appdb.git/?a=commit;h=710d79224ab7e26d6ad6d3bb… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Tue Oct 30 00:09:15 2007 +0100 application: Allow clearing the Application URL --- include/application.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/application.php b/include/application.php index beba629..9bab415 100644 --- a/include/application.php +++ b/include/application.php @@ -203,7 +203,7 @@ class Application { $sWhatChanged .= "Keywords were changed from\n ".$oApp->sKeywords."\n to \n".$this->sKeywords.".\n\n"; } - if ($this->sWebpage && ($this->sWebpage!=$oApp->sWebpage)) + if ($this->sWebpage!=$oApp->sWebpage) { if (!query_parameters("UPDATE appFamily SET webPage = '?' WHERE appId = '?'", $this->sWebpage, $this->iAppId))

1 0

Alexander Dorofeyev : comctl32: Pass command id of button in wParam.
by Alexandre Julliard 29 Oct '07

29 Oct '07

Module: wine Branch: master Commit: 77c376e0f83f7430f6549367297f81660b33cb44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77c376e0f83f7430f65493672… Author: Alexander Dorofeyev <alexd14(a)hushmail.com> Date: Sun Oct 28 18:59:07 2007 -0700 comctl32: Pass command id of button in wParam. --- dlls/comctl32/toolbar.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 921c0ff..b55298a 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -6374,7 +6374,7 @@ static LRESULT TOOLBAR_TTGetDispInfo (TOOLBAR_INFO *infoPtr, NMTTDISPINFOW *lpnm /* last resort: send notification on to app */ /* FIXME: find out what is really used here */ - return SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, 0, (LPARAM)lpnmtdi); + return SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, (WPARAM)lpnmtdi->hdr.idFrom, (LPARAM)lpnmtdi); }

1 0

Alexander Dorofeyev : comctl32: Fix broken detection of non-empty string.
by Alexandre Julliard 29 Oct '07

29 Oct '07

Module: wine Branch: master Commit: 35ff6d675000333db57c27d2975a850eec25dd2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=35ff6d675000333db57c27d29… Author: Alexander Dorofeyev <alexd14(a)hushmail.com> Date: Sun Oct 28 22:56:06 2007 -0700 comctl32: Fix broken detection of non-empty string. --- dlls/comctl32/toolbar.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index b55298a..429444e 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -6332,7 +6332,7 @@ static LRESULT TOOLBAR_TTGetDispInfo (TOOLBAR_INFO *infoPtr, NMTTDISPINFOW *lpnm return 0; } } - else if (len > 0) + else if (tbgit.pszText[0]) { MultiByteToWideChar(CP_ACP, 0, tbgit.pszText, -1, lpnmtdi->lpszText, sizeof(lpnmtdi->szText)/sizeof(lpnmtdi->szText[0]));

1 0