October 2009 - Wine-commits

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

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

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

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

Christian Costa : d3dxof: Only consider 4 lowest bits in DXFILELOADOPTIONS + tests.
by Alexandre Julliard 23 Oct '09

23 Oct '09

Module: wine Branch: master Commit: c94763b4204cf10dd79af215aa51b5715dfd6c9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c94763b4204cf10dd79af215a… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Fri Oct 23 08:41:04 2009 +0200 d3dxof: Only consider 4 lowest bits in DXFILELOADOPTIONS + tests. --- dlls/d3dxof/d3dxof.c | 3 ++ dlls/d3dxof/tests/d3dxof.c | 54 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 57 insertions(+), 0 deletions(-) diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c index 5d42d53..cd4690d 100644 --- a/dlls/d3dxof/d3dxof.c +++ b/dlls/d3dxof/d3dxof.c @@ -142,6 +142,9 @@ static HRESULT WINAPI IDirectXFileImpl_CreateEnumObject(IDirectXFile* iface, LPV if (!ppEnumObj) return DXFILEERR_BADVALUE; + /* Only lowest 4 bits are relevant in DXFILELOADOPTIONS */ + dwLoadOptions &= 0xF; + if (dwLoadOptions == DXFILELOAD_FROMFILE) { TRACE("Open source file '%s'\n", (char*)pvSource); diff --git a/dlls/d3dxof/tests/d3dxof.c b/dlls/d3dxof/tests/d3dxof.c index aec29b0..9f1295f 100644 --- a/dlls/d3dxof/tests/d3dxof.c +++ b/dlls/d3dxof/tests/d3dxof.c @@ -137,6 +137,59 @@ static void test_refcount(void) ok(ref == 0, "Got refcount %d, expected 0\n", ref); } +static void test_CreateEnumObject(void) +{ + HRESULT hr; + ULONG ref; + LPDIRECTXFILE lpDirectXFile = NULL; + LPDIRECTXFILEENUMOBJECT lpdxfeo; + LPDIRECTXFILEDATA lpdxfd; + DXFILELOADMEMORY dxflm; + BYTE* pdata; + DWORD size; + + if (!pDirectXFileCreate) + { + win_skip("DirectXFileCreate is not available\n"); + return; + } + + hr = pDirectXFileCreate(&lpDirectXFile); + ok(hr == DXFILE_OK, "DirectXFileCreate: %x\n", hr); + if(!lpDirectXFile) + { + skip("Couldn't create DirectXFile interface\n"); + return; + } + + hr = IDirectXFile_RegisterTemplates(lpDirectXFile, template, strlen(template)); + ok(hr == DXFILE_OK, "IDirectXFileImpl_RegisterTemplates: %x\n", hr); + + dxflm.lpMemory = &object; + dxflm.dSize = strlen(object); + /* Check that only lowest 4 bits are relevant in DXFILELOADOPTIONS */ + hr = IDirectXFile_CreateEnumObject(lpDirectXFile, &dxflm, 0xFFFFFFF0 + DXFILELOAD_FROMMEMORY, &lpdxfeo); + ok(hr == DXFILE_OK, "IDirectXFile_CreateEnumObject: %x\n", hr); + + hr = IDirectXFileEnumObject_GetNextDataObject(lpdxfeo, &lpdxfd); + ok(hr == DXFILE_OK, "IDirectXFileEnumObject_GetNextDataObject: %x\n", hr); + + hr = IDirectXFileData_GetData(lpdxfd, NULL, &size, (void**)&pdata); + ok(hr == DXFILE_OK, "IDirectXFileData_GetData: %x\n", hr); + + ok(size == 8, "Retreived data size is wrong\n"); + ok((*((WORD*)pdata) == 1) && (*((WORD*)(pdata+2)) == 2) && (*((DWORD*)(pdata+4)) == 3), "Retreived data is wrong\n"); + + ref = IDirectXFileEnumObject_Release(lpdxfeo); + ok(ref == 0, "Got refcount %d, expected 0\n", ref); + + ref = IDirectXFile_Release(lpDirectXFile); + ok(ref == 0, "Got refcount %d, expected 0\n", ref); + + ref = IDirectXFileData_Release(lpdxfd); + ok(ref == 0, "Got refcount %d, expected 0\n", ref); +} + /* Set it to 1 to expand the string when dumping the object. This is useful when there is * only one string in a sub-object (very common). Use with care, this may lead to a crash. */ #define EXPAND_STRING 0 @@ -310,6 +363,7 @@ START_TEST(d3dxof) init_function_pointers(); test_refcount(); + test_CreateEnumObject(); test_dump(); FreeLibrary(hd3dxof);

1 0

Alexandre Julliard : user32: Don' t print CreateWindow warning for HWND_MESSAGE windows.
by Alexandre Julliard 23 Oct '09

23 Oct '09

Module: wine Branch: master Commit: 67cbdfb575e79b3cc96c7bdfb859f761e2fb6b4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=67cbdfb575e79b3cc96c7bdfb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 23 12:23:51 2009 +0200 user32: Don't print CreateWindow warning for HWND_MESSAGE windows. --- dlls/user32/driver.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index 6454f65..1c6db68 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -320,8 +320,10 @@ static BOOL CDECL nulldrv_CreateDesktopWindow( HWND hwnd ) static BOOL CDECL nulldrv_CreateWindow( HWND hwnd ) { static int warned; - if (warned++) - return FALSE; + + /* HWND_MESSAGE windows don't need a graphics driver */ + if (GetAncestor( hwnd, GA_PARENT ) == get_user_thread_info()->msg_window) return TRUE; + if (warned++) return FALSE; MESSAGE( "Application tried to create a window, but no driver could be loaded.\n"); switch (driver_load_error)

1 0

Alexandre Julliard : winex11: Do not give focus to a WS_EX_NOACTIVATE window.
by Alexandre Julliard 23 Oct '09

23 Oct '09

Module: wine Branch: master Commit: 9ea4e18be6332c63a9874330de500f19624ec62c URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ea4e18be6332c63a9874330d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 23 12:25:22 2009 +0200 winex11: Do not give focus to a WS_EX_NOACTIVATE window. --- dlls/winex11.drv/event.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 956e4f1..345b675 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -463,6 +463,7 @@ static inline BOOL can_activate_window( HWND hwnd ) if (!(style & WS_VISIBLE)) return FALSE; if ((style & (WS_POPUP|WS_CHILD)) == WS_CHILD) return FALSE; if (style & WS_MINIMIZE) return FALSE; + if (GetWindowLongW( hwnd, GWL_EXSTYLE ) & WS_EX_NOACTIVATE) return FALSE; if (hwnd == GetDesktopWindow()) return FALSE; return !(style & WS_DISABLED); }

1 0

Louis Lenders : kernel32: Add stub for GetVolumePathNamesForVolumeNameW.
by Alexandre Julliard 23 Oct '09

23 Oct '09

Module: wine Branch: master Commit: 3c92b6c5e405115c02874f4df4a4277dcd588ca7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c92b6c5e405115c02874f4df… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Fri Oct 23 11:56:22 2009 +0200 kernel32: Add stub for GetVolumePathNamesForVolumeNameW. --- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/volume.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index f5df031..bf6078e 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -669,7 +669,7 @@ @ stdcall GetVolumePathNameA(str ptr long) @ stdcall GetVolumePathNameW(wstr ptr long) # @ stub GetVolumePathNamesForVolumeNameA -# @ stub GetVolumePathNamesForVolumeNameW +@ stdcall GetVolumePathNamesForVolumeNameW(wstr ptr long ptr) @ stdcall GetWindowsDirectoryA(ptr long) @ stdcall GetWindowsDirectoryW(ptr long) @ stdcall GetWriteWatch(long ptr long ptr ptr ptr) diff --git a/dlls/kernel32/volume.c b/dlls/kernel32/volume.c index 4a51d50..7596864 100644 --- a/dlls/kernel32/volume.c +++ b/dlls/kernel32/volume.c @@ -1566,6 +1566,16 @@ BOOL WINAPI GetVolumePathNameW(LPCWSTR filename, LPWSTR volumepathname, DWORD bu } /*********************************************************************** + * GetVolumePathNamesForVolumeNameW (KERNEL32.@) + */ +BOOL WINAPI GetVolumePathNamesForVolumeNameW(LPCWSTR volumename, LPWSTR volumepathname, DWORD buflen, PDWORD returnlen) +{ + FIXME("(%s, %p, %d, %p), stub!\n", debugstr_w(volumename), volumepathname, buflen, returnlen); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/*********************************************************************** * FindFirstVolumeA (KERNEL32.@) */ HANDLE WINAPI FindFirstVolumeA(LPSTR volume, DWORD len)

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