April 2010 - Wine-Commits - list.winehq.org

Alexandre Julliard : configure: Don' t warn about libhal if we can use an alternative.
by Alexandre Julliard April 26, 2010

April 26, 2010

Module: wine Branch: master Commit: d80627362d8141524075630491c5908e20e380f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d80627362d814152407563049… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 26 06:57:49 2010 -0500 configure: Don't warn about libhal if we can use an alternative. --- configure | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 783b776..bcc43d8 100755 --- a/configure +++ b/configure @@ -9377,7 +9377,7 @@ fi fi CPPFLAGS="$ac_save_CPPFLAGS" fi -if test "x$ac_cv_lib_soname_hal" = "x"; then : +if test "x$ac_cv_lib_soname_hal" = "x" -a "x$ac_cv_header_DiskArbitration_DiskArbitration_h" != "xyes"; then : case "x$with_hal" in x) as_fn_append wine_notices "|libhal/libdbus ${notice_platform}development files not found, no dynamic device support." ;; xno) ;; diff --git a/configure.ac b/configure.ac index 83b3240..71b1f16 100644 --- a/configure.ac +++ b/configure.ac @@ -1133,7 +1133,7 @@ then fi CPPFLAGS="$ac_save_CPPFLAGS" fi -WINE_NOTICE_WITH(hal,[test "x$ac_cv_lib_soname_hal" = "x"], +WINE_NOTICE_WITH(hal,[test "x$ac_cv_lib_soname_hal" = "x" -a "x$ac_cv_header_DiskArbitration_DiskArbitration_h" != "xyes"], [libhal/libdbus ${notice_platform}development files not found, no dynamic device support.]) dnl **** Check for libgnutls ****

1 0

Gerald Pfeifer : comctl32: Remove variable iRet which is not really used from test_EnumMRUList.
by Alexandre Julliard April 26, 2010

April 26, 2010

Module: wine Branch: master Commit: 414b50690966b38fb44276316198eb5ea72ec22d URL: http://source.winehq.org/git/wine.git/?a=commit;h=414b50690966b38fb44276316… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Fri Apr 23 20:56:36 2010 +0200 comctl32: Remove variable iRet which is not really used from test_EnumMRUList. --- dlls/comctl32/tests/mru.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/tests/mru.c b/dlls/comctl32/tests/mru.c index 3eae9a9..24fcff5 100644 --- a/dlls/comctl32/tests/mru.c +++ b/dlls/comctl32/tests/mru.c @@ -471,11 +471,9 @@ static void test_EnumMRUList(void) /* NULL handle */ if (0) { - INT iRet; - /* crashes on NT4, passed on Win2k, XP, 2k3, Vista, 2k8 */ - iRet = pEnumMRUList(NULL, 0, NULL, 0); - iRet = pEnumMRUListW(NULL, 0, NULL, 0); + pEnumMRUList(NULL, 0, NULL, 0); + pEnumMRUListW(NULL, 0, NULL, 0); } }

1 0

Vitaliy Margolen : Remove task list and tasklets searches that use deleted keywords. (try 2)
by Jeremy Newman April 26, 2010

April 26, 2010

Module: bugzilla Branch: master Commit: c244520d4154cd9110632200930c73fbd83396c3 URL: http://source.winehq.org/git/bugzilla.git/?a=commit;h=c244520d4154cd9110632… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sat Apr 24 13:33:05 2010 -0600 Remove task list and tasklets searches that use deleted keywords. (try 2) Remove links from side menu as well. --- template/en/default/global/sidebar.html.tmpl | 2 -- template/en/default/index.html.tmpl | 9 --------- 2 files changed, 0 insertions(+), 11 deletions(-) diff --git a/template/en/default/global/sidebar.html.tmpl b/template/en/default/global/sidebar.html.tmpl index 4c19f78..e52cd05 100644 --- a/template/en/default/global/sidebar.html.tmpl +++ b/template/en/default/global/sidebar.html.tmpl @@ -25,8 +25,6 @@ %] <li><a href="buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&product=Wine&target_milestone=1.2.0&order=bugs.bug_severity">Wine 1.2</a></li> <li><a href="buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&product=Wine&keywords=regression&keywords_type=anywords">Regressions</a></li> - <li><a href="buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&product=Wine&keywords=tasklist&keywords_type=anywords">Tasklist</a></li> - <li><a href="buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&product=Wine&keywords=tasklet&keywords_type=anywords">Tasklets</a></li> <li><a href="buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&product=Wine&keywords=download&keywords_type=anywords">With download</a></li> [% INCLUDE global/menu_end.html.tmpl %] diff --git a/template/en/default/index.html.tmpl b/template/en/default/index.html.tmpl index 8a859a4..2c326cb 100644 --- a/template/en/default/index.html.tmpl +++ b/template/en/default/index.html.tmpl @@ -175,15 +175,6 @@ function addSidebar() { Bugs introduced as result of a regression. </li> - <li><a href="http://bugs.winehq.org/buglist.cgi?bug_status=NEW&bug_status=ASSIGNED&a…">Task List</a> - Available large scale tasks. - </li> - - <li><a href="http://bugs.winehq.org/buglist.cgi?bug_status=NEW&bug_status=ASSIGNED&a…">Tasklets</a> - - Small tasks available to be worked on. - </li> - <li><a href="http://bugs.winehq.org/buglist.cgi?bug_status=NEW&bug_status=ASSIGNED&a…">With download</a> Bugs in downloadable Applications. </li>

1 0

Scott Ritchie : Add Ubuntu 10.04 to Download page
by Jeremy Newman April 26, 2010

April 26, 2010

Module: website Branch: master Commit: dc86af318a86a5d8e636860c569df09cab2cea32 URL: http://source.winehq.org/git/website.git/?a=commit;h=dc86af318a86a5d8e63686… Author: Scott Ritchie <scott(a)open-vote.org> Date: Fri Apr 23 16:55:50 2010 -0700 Add Ubuntu 10.04 to Download page --- templates/en/download.template | 2 +- templates/en/download/deb.template | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/templates/en/download.template b/templates/en/download.template index e58e5e1..5f2d51f 100644 --- a/templates/en/download.template +++ b/templates/en/download.template @@ -61,7 +61,7 @@ requested in exchange for hosting the Wine web site. <img src="{$root}/images/distro/ubuntu.png" width="50" height="50" alt="Ubuntu linux" border="0"></a> </td> <td> <a href="{$root}/download/deb">Download Ubuntu packages</a> - - binary and source .debs for Ubuntu Karmic (9.10), Jaunty (9.04), Intrepid (8.10), and Hardy (8.04) + - binary and source .debs for Ubuntu Lucid (10.04), Karmic (9.10), Jaunty (9.04), Intrepid (8.10), and Hardy (8.04) <td><a href="mailto:scott(a)open-vote.org">Scott Ritchie</a></td> </tr> diff --git a/templates/en/download/deb.template b/templates/en/download/deb.template index b843618..15dc245 100644 --- a/templates/en/download/deb.template +++ b/templates/en/download/deb.template @@ -32,6 +32,8 @@ Party Software tab and click Add. Then, copy and paste one of the lines below depending on which version you are running. +For Ubuntu Lucid (10.04): +ppa:ubuntu-wine/ppa For Ubuntu Karmic (9.10): ppa:ubuntu-wine/ppa For Ubuntu Jaunty (9.04): @@ -84,7 +86,7 @@ the packages are available at line, as follows. These may be useful on Kubuntu, Xubuntu, and other Ubuntu derivatives. You will need to run these in a terminal window. -<h3>For 9.10 (Karmic):</h3> +<h3>For 10.04 (Lucid) and 9.10 (Karmic):</h3> sudo add-apt-repository ppa:ubuntu-wine/ppa

1 0

Jacek Caban : mshtml: Don't access url in translate_url after freeing it.
by Alexandre Julliard April 26, 2010

April 26, 2010

Module: wine Branch: master Commit: 5075f00f2590e95283d2c02fd1b391bd7aa59944 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5075f00f2590e95283d2c02fd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 22 21:36:08 2010 +0200 mshtml: Don't access url in translate_url after freeing it. --- dlls/mshtml/nsio.c | 15 +++++++-------- 1 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index c9bb54a..d55f169 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -196,16 +196,15 @@ static BOOL translate_url(HTMLDocumentObj *doc, nsWineURI *uri) url = heap_strdupW(uri->wine_url); hres = IDocHostUIHandler_TranslateUrl(doc->hostui, 0, url, &new_url); - heap_free(url); - if(hres != S_OK || !new_url) - return FALSE; - - if(strcmpW(url, new_url)) { - FIXME("TranslateUrl returned new URL %s -> %s\n", debugstr_w(url), debugstr_w(new_url)); - ret = TRUE; + if(hres == S_OK && new_url) { + if(strcmpW(url, new_url)) { + FIXME("TranslateUrl returned new URL %s -> %s\n", debugstr_w(url), debugstr_w(new_url)); + ret = TRUE; + } + CoTaskMemFree(new_url); } - CoTaskMemFree(new_url); + heap_free(url); return ret; }

1 0

Paul Vriens : wineconsole: Update Dutch translation.
by Alexandre Julliard April 26, 2010

April 26, 2010

Module: wine Branch: master Commit: 62644ee1a2763ed6a1ffabaa4a1780bf6db46805 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62644ee1a2763ed6a1ffabaa4… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Apr 23 19:03:09 2010 +0200 wineconsole: Update Dutch translation. --- programs/wineconsole/wineconsole_Nl.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/wineconsole/wineconsole_Nl.rc b/programs/wineconsole/wineconsole_Nl.rc index 8500763..df3556e 100644 --- a/programs/wineconsole/wineconsole_Nl.rc +++ b/programs/wineconsole/wineconsole_Nl.rc @@ -29,7 +29,7 @@ IDS_EDIT, "&Bewerken" IDS_DEFAULT, "&Standaardinstellingen" IDS_PROPERTIES, "&Eigenschappen" IDS_MARK, "&Markeren" -IDS_COPY, "&Kopi�ren�" +IDS_COPY, "&Kopi�ren" IDS_PASTE, "&Plakken" IDS_SELECTALL, "&Alles selecteren" IDS_SCROLL, "Sc&rollen" @@ -53,7 +53,7 @@ IDS_USAGE_BACKEND " --backend={user|curses} Kiezen voor user zal een " curses zal proberen de huidige terminal om te zetten\n"\ " in een Wine console\n" IDS_USAGE_COMMAND " <commando> Het Wine programma dat zal starten in de Wine console\n" -IDS_USAGE_FOOTER "\nExample:\n wineconsole cmd\nStarts the Wine command prompt in a Wine console\n\n" +IDS_USAGE_FOOTER "\nVoorbeeld:\n wineconsole cmd\nStart de Wine command prompt in een Wine console\n\n" END

1 0

Nikolay Sivov : comctl32/listview: Don' t change Z-order of edit window while resizing edit box.
by Alexandre Julliard April 26, 2010

April 26, 2010

Module: wine Branch: master Commit: 379cf468734363da9c5aa60dec23702ae478a4a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=379cf468734363da9c5aa60de… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Apr 23 22:39:55 2010 +0400 comctl32/listview: Don't change Z-order of edit window while resizing edit box. --- dlls/comctl32/listview.c | 14 ++++---------- dlls/comctl32/tests/listview.c | 26 +++++++++++++++++++------- 2 files changed, 23 insertions(+), 17 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 256d4c6..09c731a 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -11599,7 +11599,7 @@ static LRESULT LISTVIEW_Command(LISTVIEW_INFO *infoPtr, WPARAM wParam, LPARAM lP /* Select font to get the right dimension of the string */ hFont = (HFONT)SendMessageW(infoPtr->hwndEdit, WM_GETFONT, 0, 0); - if(hFont != 0) + if (hFont) { hOldFont = SelectObject(hdc, hFont); } @@ -11612,16 +11612,10 @@ static LRESULT LISTVIEW_Command(LISTVIEW_INFO *infoPtr, WPARAM wParam, LPARAM lP GetTextMetricsW(hdc, &textMetric); sz.cx += (textMetric.tmMaxCharWidth * 2); - SetWindowPos ( - infoPtr->hwndEdit, - HWND_TOP, - 0, - 0, - sz.cx, - rect.bottom - rect.top, - SWP_DRAWFRAME|SWP_NOMOVE); + SetWindowPos(infoPtr->hwndEdit, NULL, 0, 0, sz.cx, + rect.bottom - rect.top, SWP_DRAWFRAME | SWP_NOMOVE | SWP_NOZORDER); } - if(hFont != 0) + if (hFont) SelectObject(hdc, hOldFont); ReleaseDC(infoPtr->hwndEdit, hdc); diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 4bf877a..176f323 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -3422,12 +3422,12 @@ static void test_getitemrect(void) static void test_editbox(void) { - HWND hwnd, hwndedit, hwndedit2; + static CHAR testitemA[] = "testitem"; + static CHAR testitem1A[] = "testitem_quitelongname"; + static CHAR buffer[25]; + HWND hwnd, hwndedit, hwndedit2, header; LVITEMA item; DWORD r; - static CHAR testitemA[] = "testitem"; - static CHAR testitem1A[] = "testitem1"; - static CHAR buffer[10]; hwnd = create_listview_control(LVS_EDITLABELS | LVS_REPORT); ok(hwnd != NULL, "failed to create a listview window\n"); @@ -3447,16 +3447,28 @@ static void test_editbox(void) hwndedit = (HWND)SendMessage(hwnd, LVM_EDITLABEL, 0, 0); ok(IsWindow(hwndedit), "Expected Edit window to be created\n"); + /* test children Z-order after Edit box created */ + header = (HWND)SendMessageA(hwnd, LVM_GETHEADER, 0, 0); + ok(IsWindow(header), "Expected header to be created\n"); + ok(GetTopWindow(hwnd) == header, "Expected header to be on top\n"); + ok(GetNextWindow(header, GW_HWNDNEXT) == hwndedit, "got %p\n", GetNextWindow(header, GW_HWNDNEXT)); + /* modify initial string */ r = SendMessage(hwndedit, WM_SETTEXT, 0, (LPARAM)testitem1A); expect(TRUE, r); + + /* edit window is resized and repositioned, + check again for Z-order - it should be preserved */ + ok(GetTopWindow(hwnd) == header, "Expected header to be on top\n"); + ok(GetNextWindow(header, GW_HWNDNEXT) == hwndedit, "got %p\n", GetNextWindow(header, GW_HWNDNEXT)); + /* return focus to listview */ SetFocus(hwnd); memset(&item, 0, sizeof(item)); item.mask = LVIF_TEXT; item.pszText = buffer; - item.cchTextMax = 10; + item.cchTextMax = sizeof(buffer); item.iItem = 0; item.iSubItem = 0; r = SendMessage(hwnd, LVM_GETITEMA, 0, (LPARAM)&item); @@ -3496,7 +3508,7 @@ static void test_editbox(void) expect(0, r); memset(&item, 0, sizeof(item)); item.pszText = buffer; - item.cchTextMax = 10; + item.cchTextMax = sizeof(buffer); item.iItem = 0; item.iSubItem = 0; r = SendMessage(hwnd, LVM_GETITEMTEXTA, 0, (LPARAM)&item); @@ -3522,7 +3534,7 @@ static void test_editbox(void) memset(&item, 0, sizeof(item)); item.pszText = buffer; - item.cchTextMax = 10; + item.cchTextMax = sizeof(buffer); item.iItem = 0; item.iSubItem = 0; r = SendMessage(hwnd, LVM_GETITEMTEXTA, 0, (LPARAM)&item);

1 0

Joel Holdsworth : comdlg32: Replaced pd32_portrait.ico and pd32_landscape. ico with Tango compliant icons.
by Alexandre Julliard April 26, 2010

April 26, 2010

Module: wine Branch: master Commit: 57b55f36601248b054c738906c0d750915ba3c33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57b55f36601248b054c738906… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Thu Apr 22 23:20:52 2010 +0100 comdlg32: Replaced pd32_portrait.ico and pd32_landscape.ico with Tango compliant icons. --- dlls/comdlg32/Makefile.in | 4 +++- dlls/comdlg32/pd32_landscape.ico | Bin 766 -> 7278 bytes dlls/comdlg32/pd32_landscape.svg | 30 ++++++++++++++++++++++++++++++ dlls/comdlg32/pd32_portrait.ico | Bin 766 -> 7278 bytes dlls/comdlg32/pd32_portrait.svg | 30 ++++++++++++++++++++++++++++++ 5 files changed, 63 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=57b55f36601248b054c73…

1 0

Joel Holdsworth : credui: Replaced banner with a tango compliant image.
by Alexandre Julliard April 26, 2010

April 26, 2010

Module: wine Branch: master Commit: 20beb068cc0847908d3465b508d54fcb6f9a897c URL: http://source.winehq.org/git/wine.git/?a=commit;h=20beb068cc0847908d3465b50… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Sat Apr 24 14:06:15 2010 +0100 credui: Replaced banner with a tango compliant image. --- dlls/credui/Makefile.in | 3 + dlls/credui/banner.bmp | Bin 57654 -> 57654 bytes dlls/credui/banner.svg | 101 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 104 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=20beb068cc0847908d346…

1 0

Jacek Caban : shdocvw: Fixed typo in async_doc_navigate.
by Alexandre Julliard April 26, 2010

April 26, 2010

Module: wine Branch: master Commit: 1e7b754bbb5314aa5314fda0acc0c2f392aba061 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e7b754bbb5314aa5314fda0a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Apr 25 13:36:45 2010 +0200 shdocvw: Fixed typo in async_doc_navigate. --- dlls/shdocvw/navigate.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shdocvw/navigate.c b/dlls/shdocvw/navigate.c index 8ba5f69..db6a3c4 100644 --- a/dlls/shdocvw/navigate.c +++ b/dlls/shdocvw/navigate.c @@ -642,7 +642,7 @@ static HRESULT async_doc_navigate(DocHost *This, LPCWSTR url, LPCWSTR headers, P return free_doc_navigate_task(task, TRUE); } - if(task->post_data) { + if(post_data) { task->post_data = SafeArrayCreateVector(VT_UI1, 0, post_data_size); if(!task->post_data) return free_doc_navigate_task(task, TRUE);

1 0