wine-commits October 2009

wine-commits@winehq.org

3 participants
1207 discussions

Alexander Nicolaysen Sørnes : Edit app bundle: Only show accepted apps
by Alexander Nicolaysen Sørnes 25 Oct '09

25 Oct '09

Module: appdb Branch: master Commit: a038ccf82cd5162482110185b5fdee2237175b2a URL: http://source.winehq.org/git/appdb.git/?a=commit;h=a038ccf82cd5162482110185… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sun Oct 25 17:35:13 2009 +0100 Edit app bundle: Only show accepted apps --- admin/editBundle.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/admin/editBundle.php b/admin/editBundle.php index b0523e6..03ac946 100644 --- a/admin/editBundle.php +++ b/admin/editBundle.php @@ -8,7 +8,7 @@ if(!$_SESSION['current']->hasPriv("admin")) function build_app_list() { - $hResult = query_parameters("SELECT appId, appName FROM appFamily ORDER BY appName"); + $hResult = application::objectGetEntries('accepted'); echo "<select name=iAppId size=5 onChange='this.form.submit()'>\n"; while($oRow = query_fetch_object($hResult))

1 0

Alexandre Julliard : Wine release 1.1.32
by Alexandre Julliard 23 Oct '09

23 Oct '09

Module: website Branch: master Commit: a2224a053ba124c5bfe1046c47f50151fd4d0cf6 URL: http://source.winehq.org/git/website.git/?a=commit;h=a2224a053ba124c5bfe104… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 23 20:17:27 2009 +0200 Wine release 1.1.32 --- news/en/2009102301.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/en/2009102301.xml b/news/en/2009102301.xml new file mode 100644 index 0000000..7ace5d6 --- /dev/null +++ b/news/en/2009102301.xml @@ -0,0 +1,17 @@ +<news> +<date>October 23, 2009</date> +<title>Wine 1.1.32 Released</title> +<body> + The Wine development release 1.1.32 is now available. + <a href="{$root}/announce/1.1.32">What's new</a> in this release: +<ul> + <li>Many crypto fixes, particularly on 64-bit.</li> + <li>Improved DVD access on Mac OS.</li> + <li>Several common controls improvements.</li> + <li>Various HTML support improvements.</li> + <li>More DIB optimizations.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.1.32.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-1.1.32 : Alexandre Julliard : Release 1.1.32
by Alexandre Julliard 23 Oct '09

23 Oct '09

Module: wine Branch: refs/tags/wine-1.1.32 Tag: 3e033bdedff5cad30a3916ebc65762bfc904d9a9 URL: http://source.winehq.org/git/wine.git/?a=tag;h=3e033bdedff5cad30a3916ebc657… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 23 20:08:50 2009 +0200 Release 1.1.32

1 0

Alexandre Julliard : Release 1.1.32.
by Alexandre Julliard 23 Oct '09

23 Oct '09

Module: wine Branch: master Commit: a94d2db85135706a5b8e1c5438e3a842e982a717 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a94d2db85135706a5b8e1c543… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 23 20:08:49 2009 +0200 Release 1.1.32. --- ANNOUNCE | 1445 +++++++++++++++++++++++++++++++------------------------------ VERSION | 2 +- configure | 18 +- 3 files changed, 740 insertions(+), 725 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a94d2db85135706a5b8e1…

1 0

Paul Vriens : user32/tests: Fix a typo.
by Alexandre Julliard 23 Oct '09

23 Oct '09

Module: wine Branch: master Commit: eaec876917d5a759ea7e1f3e8304b8cb107f7184 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eaec876917d5a759ea7e1f3e8… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Oct 23 18:00:59 2009 +0200 user32/tests: Fix a typo. --- dlls/user32/tests/win.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 1c9103a..0bd6fbf 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -607,7 +607,7 @@ static DWORD CALLBACK enum_thread( void *arg ) count = 0; ret = EnumThreadWindows( GetCurrentThreadId(), enum_proc, (LPARAM)&count ); ok( !ret, "EnumThreadWindows should have returned FALSE\n" ); - ok( count == 3, "count should be 1 got %d\n", count ); + ok( count == 3, "count should be 3 got %d\n", count ); if (hwnd[2]) DestroyWindow(hwnd[2]); DestroyWindow(hwnd[1]);

1 0

Paul Vriens : user32/tests: Skip some tests on Win9x/WinMe.
by Alexandre Julliard 23 Oct '09

23 Oct '09

Module: wine Branch: master Commit: 05765a0b0c0f0b3caa8cb4ad10a2a206ddf7f913 URL: http://source.winehq.org/git/wine.git/?a=commit;h=05765a0b0c0f0b3caa8cb4ad1… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Oct 23 15:03:12 2009 +0200 user32/tests: Skip some tests on Win9x/WinMe. --- dlls/user32/tests/input.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 42d9544..d82ef3c 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -904,7 +904,12 @@ static void test_Input_blackbox(void) SetWindowPos( window, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOSIZE|SWP_NOMOVE ); SetForegroundWindow( window ); - hook = SetWindowsHookExA(WH_KEYBOARD_LL, hook_proc, GetModuleHandleA( NULL ), 0); + if (!(hook = SetWindowsHookExA(WH_KEYBOARD_LL, hook_proc, GetModuleHandleA( NULL ), 0))) + { + DestroyWindow(window); + win_skip("WH_KEYBOARD_LL is not supported\n"); + return; + } /* must process all initial messages, otherwise X11DRV_KeymapNotify unsets * key state set by SendInput(). */

1 0

Detlef Riekenberg : user32: Bump version to XP values.
by Alexandre Julliard 23 Oct '09

23 Oct '09

Module: wine Branch: master Commit: 6f6ce4a3250216f77897e6fc2c905c50ca8493c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f6ce4a3250216f77897e6fc2… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Oct 23 15:02:47 2009 +0200 user32: Bump version to XP values. --- dlls/user32/resources/version.rc | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/user32/resources/version.rc b/dlls/user32/resources/version.rc index 228da33..9848a31 100644 --- a/dlls/user32/resources/version.rc +++ b/dlls/user32/resources/version.rc @@ -20,8 +20,13 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL -#define WINE_FILEVERSION_STR "1.0" #define WINE_FILEDESCRIPTION_STR "Wine core dll" #define WINE_FILENAME_STR "user32.dll" +/* these values come from Windows XP SP2 */ +#define WINE_FILEVERSION 5,1,2600,2180 +#define WINE_FILEVERSION_STR "5.01.2600.2180" +#define WINE_PRODUCTVERSION 5,1,2600,2180 +#define WINE_PRODUCTVERSION_STR "5.01.2600.2180" + #include "wine/wine_common_ver.rc"

1 0

Detlef Riekenberg : localspl: Accept environment 'Windows IA64'.
by Alexandre Julliard 23 Oct '09

23 Oct '09

Module: wine Branch: master Commit: 836ca78fd59af8e710298defcb5744894e67aba0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=836ca78fd59af8e710298defc… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Oct 23 14:01:51 2009 +0200 localspl: Accept environment 'Windows IA64'. --- dlls/localspl/provider.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c index 8c6a940..b17e074 100644 --- a/dlls/localspl/provider.c +++ b/dlls/localspl/provider.c @@ -118,6 +118,8 @@ static const WCHAR fmt_printprocessorsW[] = { 'S','y','s','t','e','m','\\', 'P','r','i','n','t',' ','P','r','o','c','e','s','s','o','r','s',0 }; static const WCHAR hardwareidW[] = {'H','a','r','d','w','a','r','e','I','D',0}; static const WCHAR help_fileW[] = {'H','e','l','p',' ','F','i','l','e',0}; +static const WCHAR ia64_envnameW[] = {'W','i','n','d','o','w','s',' ','I','A','6','4',0}; +static const WCHAR ia64_subdirW[] = {'i','a','6','4',0}; static const WCHAR localportW[] = {'L','o','c','a','l',' ','P','o','r','t',0}; static const WCHAR locationW[] = {'L','o','c','a','t','i','o','n',0}; static const WCHAR manufacturerW[] = {'M','a','n','u','f','a','c','t','u','r','e','r',0}; @@ -161,6 +163,9 @@ static const WCHAR XcvMonitorW[] = {',','X','c','v','M','o','n','i','t','o','r', static const WCHAR XcvPortW[] = {',','X','c','v','P','o','r','t',' ',0}; +static const printenv_t env_ia64 = {ia64_envnameW, ia64_subdirW, 3, + version3_regpathW, version3_subdirW}; + static const printenv_t env_x86 = {x86_envnameW, x86_subdirW, 3, version3_regpathW, version3_subdirW}; @@ -170,7 +175,7 @@ static const printenv_t env_x64 = {x64_envnameW, x64_subdirW, 3, static const printenv_t env_win40 = {win40_envnameW, win40_subdirW, 0, version0_regpathW, version0_subdirW}; -static const printenv_t * const all_printenv[] = {&env_x86, &env_x64, &env_win40}; +static const printenv_t * const all_printenv[] = {&env_x86, &env_x64, &env_ia64, &env_win40}; static const DWORD di_sizeof[] = {0, sizeof(DRIVER_INFO_1W), sizeof(DRIVER_INFO_2W),

1 0

Alexandre Julliard : user32: Fix the return value of EnumThreadWindows.
by Alexandre Julliard 23 Oct '09

23 Oct '09

Module: wine Branch: master Commit: 1b27890af69f78f657ddac886b9eaecf4372cf28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b27890af69f78f657ddac886… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 23 14:46:58 2009 +0200 user32: Fix the return value of EnumThreadWindows. --- dlls/user32/tests/win.c | 55 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/user32/win.c | 5 ++- 2 files changed, 58 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 63f25bc..1c9103a 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -569,6 +569,60 @@ static void test_parent_owner(void) DestroyWindow( owner ); } +static BOOL CALLBACK enum_proc( HWND hwnd, LPARAM lParam) +{ + (*(LPINT)lParam)++; + if (*(LPINT)lParam > 2) return FALSE; + return TRUE; +} +static DWORD CALLBACK enum_thread( void *arg ) +{ + INT count; + HWND hwnd[3]; + BOOL ret; + MSG msg; + + PeekMessage( &msg, 0, 0, 0, PM_NOREMOVE ); /* make sure we have a message queue */ + + count = 0; + ret = EnumThreadWindows( GetCurrentThreadId(), enum_proc, (LPARAM)&count ); + ok( ret, "EnumThreadWindows should have returned TRUE\n" ); + ok( count == 0, "count should be 0 got %d\n", count ); + + hwnd[0] = CreateWindowExA(0, "ToolWindowClass", "Tool window 1", WS_POPUP, + 0, 0, 100, 100, 0, 0, 0, NULL ); + count = 0; + ret = EnumThreadWindows( GetCurrentThreadId(), enum_proc, (LPARAM)&count ); + ok( ret, "EnumThreadWindows should have returned TRUE\n" ); + if (count != 2) /* Vista gives us two windows for the price of one */ + { + ok( count == 1, "count should be 1 got %d\n", count ); + hwnd[2] = CreateWindowExA(0, "ToolWindowClass", "Tool window 2", WS_POPUP, + 0, 0, 100, 100, 0, 0, 0, NULL ); + } + else hwnd[2] = 0; + + hwnd[1] = CreateWindowExA(0, "ToolWindowClass", "Tool window 3", WS_POPUP, + 0, 0, 100, 100, 0, 0, 0, NULL ); + count = 0; + ret = EnumThreadWindows( GetCurrentThreadId(), enum_proc, (LPARAM)&count ); + ok( !ret, "EnumThreadWindows should have returned FALSE\n" ); + ok( count == 3, "count should be 1 got %d\n", count ); + + if (hwnd[2]) DestroyWindow(hwnd[2]); + DestroyWindow(hwnd[1]); + DestroyWindow(hwnd[0]); + return 0; +} + +/* test EnumThreadWindows in a separate thread */ +static void test_enum_thread_windows(void) +{ + DWORD id; + HANDLE handle = CreateThread( NULL, 0, enum_thread, 0, 0, &id ); + ok( !WaitForSingleObject( handle, 10000 ), "wait failed\n" ); + CloseHandle( handle ); +} static LRESULT WINAPI main_window_procA(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) { @@ -5762,6 +5816,7 @@ START_TEST(win) test_CreateWindow(); test_parent_owner(); test_SetParent(); + test_enum_thread_windows(); test_mdi(); test_icons(); diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 3e6dc37..d6746b0 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -3151,6 +3151,7 @@ BOOL WINAPI EnumThreadWindows( DWORD id, WNDENUMPROC func, LPARAM lParam ) { HWND *list; int i; + BOOL ret = TRUE; USER_CheckNotLock(); @@ -3159,9 +3160,9 @@ BOOL WINAPI EnumThreadWindows( DWORD id, WNDENUMPROC func, LPARAM lParam ) /* Now call the callback function for every window */ for (i = 0; list[i]; i++) - if (!func( list[i], lParam )) break; + if (!(ret = func( list[i], lParam ))) break; HeapFree( GetProcessHeap(), 0, list ); - return TRUE; + return ret; }

1 0

Nikolay Sivov : comctl32/tests: Explicitly initialize window handle.
by Alexandre Julliard 23 Oct '09

23 Oct '09

Module: wine Branch: master Commit: a04c6db804bc52082cf0064ca12e21b05be60352 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a04c6db804bc52082cf0064ca… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Fri Oct 23 14:46:43 2009 +0400 comctl32/tests: Explicitly initialize window handle. --- dlls/comctl32/tests/toolbar.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index d0a444e..3b3708b 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -162,7 +162,7 @@ static void basic_test(void) static void rebuild_toolbar(HWND *hToolbar) { - if (*hToolbar != NULL) + if (*hToolbar) DestroyWindow(*hToolbar); *hToolbar = CreateWindowEx(0, TOOLBARCLASSNAME, NULL, WS_CHILD | WS_VISIBLE, 0, 0, 0, 0, hMainWnd, (HMENU)5, GetModuleHandle(NULL), NULL); @@ -1082,7 +1082,7 @@ static void restore_recalc_state(HWND hToolbar) static void test_recalc(void) { - HWND hToolbar; + HWND hToolbar = NULL; TBBUTTONINFO bi; CHAR test[] = "Test"; const int EX_STYLES_COUNT = 5;

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2009