August 2007 - Wine-Commits - list.winehq.org

Paul Vriens : kernel32/tests: Changed skip message.
by Alexandre Julliard Aug. 8, 2007

Aug. 8, 2007

Module: wine Branch: master Commit: e90f1e3568504d5384c457c198637e8987943305 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e90f1e3568504d5384c457c19… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Tue Aug 7 16:45:26 2007 +0200 kernel32/tests: Changed skip message. --- dlls/kernel32/tests/actctx.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c index 054f034..2992c38 100644 --- a/dlls/kernel32/tests/actctx.c +++ b/dlls/kernel32/tests/actctx.c @@ -1044,7 +1044,7 @@ START_TEST(actctx) init_paths(); if (!init_funcs()) { - skip("Couldn't load kernel32\n"); + skip("Needed functions are not available\n"); return; }

1 0

Alexandre Julliard : user32: Get rid of winproc. h and move definitions in user_private.h.
by Alexandre Julliard Aug. 8, 2007

Aug. 8, 2007

Module: wine Branch: master Commit: d00d54ebeb71ddaec5213954397ff96a4406f4d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d00d54ebeb71ddaec52139543… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 7 21:01:55 2007 +0200 user32: Get rid of winproc.h and move definitions in user_private.h. --- dlls/user32/class.c | 1 - dlls/user32/defdlg.c | 2 +- dlls/user32/hook16.c | 1 - dlls/user32/message.c | 1 - dlls/user32/msg16.c | 1 - dlls/user32/user_private.h | 22 ++++++++++++++++++ dlls/user32/win.c | 1 - dlls/user32/winproc.c | 1 - dlls/user32/winproc.h | 52 -------------------------------------------- dlls/user32/wnd16.c | 1 - 10 files changed, 23 insertions(+), 60 deletions(-) diff --git a/dlls/user32/class.c b/dlls/user32/class.c index 4f6c7b5..51801bc 100644 --- a/dlls/user32/class.c +++ b/dlls/user32/class.c @@ -36,7 +36,6 @@ #include "win.h" #include "user_private.h" #include "controls.h" -#include "winproc.h" #include "wine/server.h" #include "wine/list.h" #include "wine/debug.h" diff --git a/dlls/user32/defdlg.c b/dlls/user32/defdlg.c index 794ae0e..911e0ce 100644 --- a/dlls/user32/defdlg.c +++ b/dlls/user32/defdlg.c @@ -26,7 +26,7 @@ #include "wine/winuser16.h" #include "controls.h" #include "win.h" -#include "winproc.h" +#include "user_private.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(dialog); diff --git a/dlls/user32/hook16.c b/dlls/user32/hook16.c index f44ba12..436a168 100644 --- a/dlls/user32/hook16.c +++ b/dlls/user32/hook16.c @@ -30,7 +30,6 @@ #include "wine/winuser16.h" #include "win.h" #include "user_private.h" -#include "winproc.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(hook); diff --git a/dlls/user32/message.c b/dlls/user32/message.c index a665b12..2c0f6fb 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -39,7 +39,6 @@ #include "user_private.h" #include "win.h" #include "controls.h" -#include "winproc.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(msg); diff --git a/dlls/user32/msg16.c b/dlls/user32/msg16.c index ffc01e2..ec42ae9 100644 --- a/dlls/user32/msg16.c +++ b/dlls/user32/msg16.c @@ -23,7 +23,6 @@ #include "winerror.h" #include "win.h" #include "user_private.h" -#include "winproc.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(msg); diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 67be8f5..692eca9 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -225,6 +225,28 @@ extern BOOL USER_IsExitingThread( DWORD tid ); extern BOOL USER_SetWindowPos( WINDOWPOS * winpos ); +typedef LRESULT (*winproc_callback_t)( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp, + LRESULT *result, void *arg ); +typedef LRESULT (*winproc_callback16_t)( HWND16 hwnd, UINT16 msg, WPARAM16 wp, LPARAM lp, + LRESULT *result, void *arg ); + +extern WNDPROC16 WINPROC_GetProc16( WNDPROC proc, BOOL unicode ); +extern WNDPROC WINPROC_AllocProc16( WNDPROC16 func ); +extern WNDPROC WINPROC_GetProc( WNDPROC proc, BOOL unicode ); +extern WNDPROC WINPROC_AllocProc( WNDPROC funcA, WNDPROC funcW ); +extern BOOL WINPROC_IsUnicode( WNDPROC proc, BOOL def_val ); + +extern LRESULT WINPROC_CallProcAtoW( winproc_callback_t callback, HWND hwnd, UINT msg, + WPARAM wParam, LPARAM lParam, LRESULT *result, void *arg ); +extern LRESULT WINPROC_CallProc16To32A( winproc_callback_t callback, HWND16 hwnd, UINT16 msg, + WPARAM16 wParam, LPARAM lParam, LRESULT *result, void *arg ); +extern LRESULT WINPROC_CallProc32ATo16( winproc_callback16_t callback, HWND hwnd, UINT msg, + WPARAM wParam, LPARAM lParam, LRESULT *result, void *arg ); + +extern INT_PTR WINPROC_CallDlgProc16( DLGPROC16 func, HWND16 hwnd, UINT16 msg, WPARAM16 wParam, LPARAM lParam ); +extern INT_PTR WINPROC_CallDlgProcA( DLGPROC func, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ); +extern INT_PTR WINPROC_CallDlgProcW( DLGPROC func, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ); + /* message spy definitions */ #define SPY_DISPATCHMESSAGE16 0x0100 diff --git a/dlls/user32/win.c b/dlls/user32/win.c index d9b3a2e..0ef021a 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -33,7 +33,6 @@ #include "wine/server.h" #include "wine/unicode.h" #include "win.h" -#include "winproc.h" #include "user_private.h" #include "controls.h" #include "winerror.h" diff --git a/dlls/user32/winproc.c b/dlls/user32/winproc.c index 27b31a1..50b5858 100644 --- a/dlls/user32/winproc.c +++ b/dlls/user32/winproc.c @@ -33,7 +33,6 @@ #include "wine/winuser16.h" #include "controls.h" #include "win.h" -#include "winproc.h" #include "user_private.h" #include "dde.h" #include "winternl.h" diff --git a/dlls/user32/winproc.h b/dlls/user32/winproc.h deleted file mode 100644 index 69b6d76..0000000 --- a/dlls/user32/winproc.h +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Window procedure callbacks definitions - * - * Copyright 1996 Alexandre Julliard - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#ifndef __WINE_WINPROC_H -#define __WINE_WINPROC_H - -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "wine/winbase16.h" - -typedef LRESULT (*winproc_callback_t)( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp, - LRESULT *result, void *arg ); -typedef LRESULT (*winproc_callback16_t)( HWND16 hwnd, UINT16 msg, WPARAM16 wp, LPARAM lp, - LRESULT *result, void *arg ); - -extern WNDPROC16 WINPROC_GetProc16( WNDPROC proc, BOOL unicode ); -extern WNDPROC WINPROC_AllocProc16( WNDPROC16 func ); -extern WNDPROC WINPROC_GetProc( WNDPROC proc, BOOL unicode ); -extern WNDPROC WINPROC_AllocProc( WNDPROC funcA, WNDPROC funcW ); -extern BOOL WINPROC_IsUnicode( WNDPROC proc, BOOL def_val ); - -extern LRESULT WINPROC_CallProcAtoW( winproc_callback_t callback, HWND hwnd, UINT msg, - WPARAM wParam, LPARAM lParam, LRESULT *result, void *arg ); -extern LRESULT WINPROC_CallProc16To32A( winproc_callback_t callback, HWND16 hwnd, UINT16 msg, - WPARAM16 wParam, LPARAM lParam, LRESULT *result, void *arg ); -extern LRESULT WINPROC_CallProc32ATo16( winproc_callback16_t callback, HWND hwnd, UINT msg, - WPARAM wParam, LPARAM lParam, LRESULT *result, void *arg ); - -extern INT_PTR WINPROC_CallDlgProc16( DLGPROC16 func, HWND16 hwnd, UINT16 msg, WPARAM16 wParam, LPARAM lParam ); -extern INT_PTR WINPROC_CallDlgProcA( DLGPROC func, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ); -extern INT_PTR WINPROC_CallDlgProcW( DLGPROC func, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ); - -#endif /* __WINE_WINPROC_H */ diff --git a/dlls/user32/wnd16.c b/dlls/user32/wnd16.c index f29124c..0b0d0c1 100644 --- a/dlls/user32/wnd16.c +++ b/dlls/user32/wnd16.c @@ -21,7 +21,6 @@ #include "wine/winuser16.h" #include "wownt32.h" #include "win.h" -#include "winproc.h" #include "user_private.h" /* handle <--> handle16 conversions */

1 0

appdb/include appData.php
by WineHQ Aug. 8, 2007

Aug. 8, 2007

ChangeSet ID: 31320 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/08/07 19:55:27 Modified files: include : appData.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Order appData entries by the application name, otherwise the order is based on when the application was added to the database and this grouping doesn't work well for screenshots. Patch: http://cvs.winehq.org/patch.py?id=31320 Old revision New revision Changes Path 1.33 1.34 +35 -29 appdb/include/appData.php Index: appdb/include/appData.php diff -u -p appdb/include/appData.php:1.33 appdb/include/appData.php:1.34 --- appdb/include/appData.php:1.33 8 Aug 2007 0:55:27 -0000 +++ appdb/include/appData.php 8 Aug 2007 0:55:27 -0000 @@ -366,7 +366,8 @@ class appData AND appData.queued = '?' AND - appData.type = '?'"; + appData.type = '?' + ORDER BY appFamily.appName"; if(!$iRows && !$iStart) { $hResult = query_parameters($sQuery, $_SESSION['current']->iUserId, @@ -386,37 +387,42 @@ class appData if($iStart || $iRows) $sLimit = " LIMIT ?,?"; - $sQuery = "(SELECT DISTINCT appData.* FROM appData, - appFamily, appVersion WHERE - appFamily.appId = appVersion.appId - AND - ( + $sQuery = + "( + SELECT DISTINCT appData.* FROM appData, + appFamily, appVersion WHERE + appFamily.appId = appVersion.appId + AND + ( appData.appId = appFamily.appId + ) + AND + appVersion.queued = 'false' + AND + appFamily.queued = 'false' + AND + appData.queued = '?' + AND + appData.type = '?' ORDER BY appFamily.appName $sLimit ) - AND - appVersion.queued = 'false' - AND - appFamily.queued = 'false' - AND - appData.queued = '?' - AND - appData.type = '?'$sLimit) UNION - ( - SELECT DISTINCT appData.* FROM appData, - appFamily, appVersion WHERE - appFamily.appId = appVersion.appId - AND + UNION ( - appData.versionId = appVersion.versionId - ) - AND - appVersion.queued = 'false' - AND - appFamily.queued = 'false' - AND - appData.queued = '?' - AND - appData.type = '?'$sLimit)"; + SELECT DISTINCT appData.* FROM appData, + appFamily, appVersion WHERE + appFamily.appId = appVersion.appId + AND + ( + appData.versionId = appVersion.versionId + ) + AND + appVersion.queued = 'false' + AND + appFamily.queued = 'false' + AND + appData.queued = '?' + AND + appData.type = '?' ORDER BY appFamily.appName $sLimit + )"; if(!$iRows && !$iStart) { $hResult = query_parameters($sQuery, $bQueued ? "true" : "false", $sType,

1 0

tools/winetest gather
by Jeremy Newman Aug. 7, 2007

Aug. 7, 2007

ChangeSet ID: 31319 CVSROOT: /opt/cvs-commit Module name: tools Changes by: jnewman(a)winehq.org 2007/08/07 16:54:21 Modified files: winetest : gather Log message: Paul Vriens <paul.vriens.wine(a)gmail.com> Show crashed winetest in the single/group results Patch: http://cvs.winehq.org/patch.py?id=31319 Old revision New revision Changes Path 1.23 1.24 +14 -0 tools/winetest/gather Index: tools/winetest/gather diff -u -p tools/winetest/gather:1.23 tools/winetest/gather:1.24 --- tools/winetest/gather:1.23 7 Aug 2007 21:54:21 -0000 +++ tools/winetest/gather 7 Aug 2007 21:54:21 -0000 @@ -112,6 +112,8 @@ foreach my $file (glob "$datadir/$build/ } else { $group->{extrema}->{$testname} = [$error, $error]; } + } elsif ($todo eq "-") { + $testref->{crash} = $testname; } my $prevdigest = \$group->{digests}->{$testname}; $$prevdigest = ($count eq "failed" || $error || $skipped || @@ -132,9 +134,14 @@ foreach my $group (@groups) { # Make sure missing tests are shown in the group results $group->{digests}->{$testname} = "differ"; my ($dll, $subtest) = split(/:/, $testname); + my $crash = $test->{crash}; if (exists $test->{dllmissing}->{$dll}) { # Mark this test as missing because of a missing dll $test->{results}->{$testname} = ["dll missing", "-", "-", "-"]; + } elsif (defined $crash && $testname gt $crash) { + # Mark this test as missing because of what looks like a winetest crash. + # The cause of that is most likely a partial report file. + $test->{results}->{$testname} = ["winetest crash", "-", "-", "-"]; } else { # Mark this test as missing for an unknown reason $test->{results}->{$testname} = ["test missing", "-", "-", "-"]; @@ -239,6 +246,13 @@ sub singletest { onMouseOver="No tests run as $dll.dll is not present on this system" >0</a></td> EOF + } elsif ($count eq "winetest crash") { + print OUT <<"EOF"; + <td class="skip_fail"><a + title="Test did not run as winetest crashed" + onMouseOver="Test did not run as winetest crashed"; + >.</a></td> +EOF } elsif ($count eq "test missing") { print OUT <<"EOF"; <td class="skip_fail"><a

1 0

Dmitry Timoshkov : include: winres.h no longer exists in PSDK, fix winresrc .h includes.
by Alexandre Julliard Aug. 7, 2007

Aug. 7, 2007

Module: wine Branch: master Commit: 197f4059ab2af5f13f9c56faa26e3b4af902f869 URL: http://source.winehq.org/git/wine.git/?a=commit;h=197f4059ab2af5f13f9c56faa… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Aug 7 15:30:43 2007 +0900 include: winres.h no longer exists in PSDK, fix winresrc.h includes. --- include/Makefile.in | 1 - include/winres.h | 25 ------------------------- include/winresrc.h | 8 ++++---- programs/clock/rsrc.rc | 3 ++- programs/cmd/wcmdrc.rc | 3 +++ programs/cmdlgtst/cmdlgr.rc | 5 ++++- programs/net/rsrc.rc | 3 ++- programs/oleview/rsrc.rc | 4 +++- programs/progman/rsrc.rc | 4 +++- programs/regedit/rsrc.rc | 4 +++- programs/start/rsrc.rc | 3 ++- programs/taskmgr/taskmgr.rc | 5 ++++- programs/uninstaller/rsrc.rc | 4 +++- programs/view/viewrc.rc | 3 ++- programs/winecfg/winecfg.rc | 4 ++-- programs/winefile/rsrc.rc | 4 +++- programs/winemine/rsrc.rc | 4 +++- programs/winetest/resource.h | 2 ++ programs/winetest/winetest.rc | 6 ++++-- programs/winhelp/rsrc.rc | 3 ++- programs/wordpad/rsrc.rc | 4 +++- programs/write/rsrc.rc | 3 ++- programs/xcopy/rsrc.rc | 3 ++- 23 files changed, 58 insertions(+), 50 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index f3702d5..6c3a31d 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -378,7 +378,6 @@ SRCDIR_INCLUDES = \ winnt.h \ winperf.h \ winreg.h \ - winres.h \ winresrc.h \ winscard.h \ winsmcrd.h \ diff --git a/include/winres.h b/include/winres.h deleted file mode 100644 index 19012da..0000000 --- a/include/winres.h +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright (C) 2000 Francois Gouget - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include <winresrc.h> - -#ifdef IDC_STATIC -#undef IDC_STATIC -#endif -#define IDC_STATIC (-1) - diff --git a/include/winresrc.h b/include/winresrc.h index 49325e0..51ab5bc 100644 --- a/include/winresrc.h +++ b/include/winresrc.h @@ -35,10 +35,10 @@ #define _WIN32_WINNT 0x0500 #endif -#include <winuser.h> -#include <commctrl.h> -#include <dde.h> -#include <winnt.h> +/* FIXME: #include <winuser.rh> */ +/* FIXME: #include <commctrl.rh> */ +/* FIXME: #include <dde.rh> */ +/* FIXME: #include <winnt.rh> */ #include <dlgs.h> #include <winver.h> diff --git a/programs/clock/rsrc.rc b/programs/clock/rsrc.rc index 8275028..092293f 100644 --- a/programs/clock/rsrc.rc +++ b/programs/clock/rsrc.rc @@ -18,7 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <windows.h> +#include <windef.h> +#include <winuser.h> #include "clock_res.h" diff --git a/programs/cmd/wcmdrc.rc b/programs/cmd/wcmdrc.rc index c449f58..93194d7 100644 --- a/programs/cmd/wcmdrc.rc +++ b/programs/cmd/wcmdrc.rc @@ -16,6 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <windef.h> +#include <winuser.h> + #include "wcmd.h" #include "Cs.rc" diff --git a/programs/cmdlgtst/cmdlgr.rc b/programs/cmdlgtst/cmdlgr.rc index 949bd2a..e4164b9 100644 --- a/programs/cmdlgtst/cmdlgr.rc +++ b/programs/cmdlgtst/cmdlgr.rc @@ -18,7 +18,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <windows.h> +#include <windef.h> +#include <winuser.h> +#include <dlgs.h> + #include "cmdlgtst.h" #include "Cs.rc" diff --git a/programs/net/rsrc.rc b/programs/net/rsrc.rc index 0f4b1da..3125252 100644 --- a/programs/net/rsrc.rc +++ b/programs/net/rsrc.rc @@ -16,7 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <windows.h> +#include <windef.h> + #include "resources.h" LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL diff --git a/programs/oleview/rsrc.rc b/programs/oleview/rsrc.rc index a00ab6b..6cf7fb3 100644 --- a/programs/oleview/rsrc.rc +++ b/programs/oleview/rsrc.rc @@ -18,7 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <windows.h> +#include <windef.h> +#include <winuser.h> + #include "resource.h" #include "De.rc" diff --git a/programs/progman/rsrc.rc b/programs/progman/rsrc.rc index 5b052e3..91d38c1 100644 --- a/programs/progman/rsrc.rc +++ b/programs/progman/rsrc.rc @@ -16,7 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <windows.h> +#include <windef.h> +#include <winuser.h> + #include "progman.h" #include "accel.rc" diff --git a/programs/regedit/rsrc.rc b/programs/regedit/rsrc.rc index 3601930..da9d068 100644 --- a/programs/regedit/rsrc.rc +++ b/programs/regedit/rsrc.rc @@ -18,7 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "windows.h" +#include <windef.h> +#include <winuser.h> + #include "resource.h" /* define language neutral resources */ diff --git a/programs/start/rsrc.rc b/programs/start/rsrc.rc index cc8666f..9f59c76 100644 --- a/programs/start/rsrc.rc +++ b/programs/start/rsrc.rc @@ -16,7 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <windows.h> +#include <windef.h> + #include "resources.h" LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL diff --git a/programs/taskmgr/taskmgr.rc b/programs/taskmgr/taskmgr.rc index a89d666..41bc1dc 100644 --- a/programs/taskmgr/taskmgr.rc +++ b/programs/taskmgr/taskmgr.rc @@ -19,7 +19,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <windows.h> +#include <windef.h> +#include <winuser.h> +#include <commctrl.h> + #include "resource.h" /* Language resources */ diff --git a/programs/uninstaller/rsrc.rc b/programs/uninstaller/rsrc.rc index 5e64715..701e031 100644 --- a/programs/uninstaller/rsrc.rc +++ b/programs/uninstaller/rsrc.rc @@ -22,7 +22,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <windows.h> +#include <windef.h> +#include <winuser.h> + #include "resource.h" #include "Bg.rc" #include "Cs.rc" diff --git a/programs/view/viewrc.rc b/programs/view/viewrc.rc index 93a2d01..0473067 100644 --- a/programs/view/viewrc.rc +++ b/programs/view/viewrc.rc @@ -16,7 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <windows.h> +#include <windef.h> + #include "resource.h" #include "Cs.rc" diff --git a/programs/winecfg/winecfg.rc b/programs/winecfg/winecfg.rc index 34ed703..974cf9b 100644 --- a/programs/winecfg/winecfg.rc +++ b/programs/winecfg/winecfg.rc @@ -20,12 +20,12 @@ * */ -#include "config.h" #include "windef.h" #include "winbase.h" #include "wingdi.h" #include "winnls.h" -#include "winresrc.h" +#include "winuser.h" +#include "commctrl.h" #include "resource.h" #include "Bg.rc" diff --git a/programs/winefile/rsrc.rc b/programs/winefile/rsrc.rc index f7e14a9..5259936 100644 --- a/programs/winefile/rsrc.rc +++ b/programs/winefile/rsrc.rc @@ -16,7 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <windows.h> +#include <windef.h> +#include <winuser.h> + #include "resource.h" /* define language neutral resources */ diff --git a/programs/winemine/rsrc.rc b/programs/winemine/rsrc.rc index 6a9ed32..0490d85 100644 --- a/programs/winemine/rsrc.rc +++ b/programs/winemine/rsrc.rc @@ -19,7 +19,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <windows.h> +#include <windef.h> +#include <winuser.h> + #include "resource.h" #include "Cs.rc" diff --git a/programs/winetest/resource.h b/programs/winetest/resource.h index 6941796..61fe35c 100644 --- a/programs/winetest/resource.h +++ b/programs/winetest/resource.h @@ -24,6 +24,8 @@ #define IDD_ABOUT 101 #define IDD_TAG 102 +#define IDC_STATIC -1 + #define IDC_ST0 1000 #define IDC_PB0 1001 #define IDC_ST1 1002 diff --git a/programs/winetest/winetest.rc b/programs/winetest/winetest.rc index 4cf35a9..ff6e2c2 100644 --- a/programs/winetest/winetest.rc +++ b/programs/winetest/winetest.rc @@ -18,8 +18,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <windows.h> -#include <winres.h> +#include <windef.h> +#include <winuser.h> +#include <commctrl.h> + #include "resource.h" IDD_TAG DIALOG 0, 0, 150, 65 diff --git a/programs/winhelp/rsrc.rc b/programs/winhelp/rsrc.rc index ebf5e34..7a1f5e2 100644 --- a/programs/winhelp/rsrc.rc +++ b/programs/winhelp/rsrc.rc @@ -19,7 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <windows.h> +#include <windef.h> + #include "winhelp.h" #include "winhelp_res.h" diff --git a/programs/wordpad/rsrc.rc b/programs/wordpad/rsrc.rc index 0ef3ff5..89fb4f2 100644 --- a/programs/wordpad/rsrc.rc +++ b/programs/wordpad/rsrc.rc @@ -16,7 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <windows.h> +#include <windef.h> +#include <winuser.h> + #include "resource.h" MAINACCELTABLE ACCELERATORS diff --git a/programs/write/rsrc.rc b/programs/write/rsrc.rc index 6e63eee..ea4377c 100644 --- a/programs/write/rsrc.rc +++ b/programs/write/rsrc.rc @@ -16,7 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <windows.h> +#include <windef.h> + #include "resources.h" LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL diff --git a/programs/xcopy/rsrc.rc b/programs/xcopy/rsrc.rc index 23f778c..234a4cb 100644 --- a/programs/xcopy/rsrc.rc +++ b/programs/xcopy/rsrc.rc @@ -16,7 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <windows.h> +#include <windef.h> + #include "xcopy.h" LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL

1 0

Paul Vriens : winecfg: Fix virtual desktop selection.
by Alexandre Julliard Aug. 7, 2007

Aug. 7, 2007

Module: wine Branch: master Commit: a15b9fb860648f392c39f575d9b2efc314b3e705 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a15b9fb860648f392c39f575d… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Tue Aug 7 12:38:11 2007 +0200 winecfg: Fix virtual desktop selection. --- programs/winecfg/winecfg.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/programs/winecfg/winecfg.c b/programs/winecfg/winecfg.c index a3e5e07..4c86514 100644 --- a/programs/winecfg/winecfg.c +++ b/programs/winecfg/winecfg.c @@ -363,9 +363,12 @@ char *get_reg_key(HKEY root, const char *path, const char *name, const char *def wRet = get_reg_keyW(root, wpath, wname, wdef); - len = WideCharToMultiByte(CP_ACP, 0, wRet, -1, szRet, 0, NULL, NULL); - szRet = HeapAlloc(GetProcessHeap(), 0, len); - WideCharToMultiByte(CP_ACP, 0, wRet, -1, szRet, len, NULL, NULL); + len = WideCharToMultiByte(CP_ACP, 0, wRet, -1, NULL, 0, NULL, NULL); + if (len) + { + szRet = HeapAlloc(GetProcessHeap(), 0, len); + WideCharToMultiByte(CP_ACP, 0, wRet, -1, szRet, len, NULL, NULL); + } HeapFree(GetProcessHeap(), 0, wpath); HeapFree(GetProcessHeap(), 0, wname); @@ -397,7 +400,7 @@ static void set_reg_key_ex(HKEY root, const WCHAR *path, const WCHAR *name, cons assert( path != NULL ); - WINE_TRACE("path=%s, name=%s, value=%p\n", wine_dbgstr_w(path), + WINE_TRACE("path=%s, name=%s, value=%s\n", wine_dbgstr_w(path), wine_dbgstr_w(name), wine_dbgstr_w(value)); /* firstly, see if we already set this setting */

1 0

Jason Edmeades : dpnet: Implement directplay lobbied application stubs.
by Alexandre Julliard Aug. 7, 2007

Aug. 7, 2007

Module: wine Branch: master Commit: 3b597af01eb88a8d3edbd29fa40931be347fe06b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b597af01eb88a8d3edbd29fa… Author: Jason Edmeades <jason.edmeades(a)googlemail.com> Date: Mon Jul 30 22:41:59 2007 +0100 dpnet: Implement directplay lobbied application stubs. --- dlls/dpnet/Makefile.in | 1 + dlls/dpnet/dpnet_main.c | 5 +- dlls/dpnet/dpnet_private.h | 15 +++- dlls/dpnet/lobbiedapp.c | 193 ++++++++++++++++++++++++++++++++++++++++++++ dlls/dpnet/regsvr.c | 11 +++ 5 files changed, 222 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3b597af01eb88a8d3edbd…

1 0

Huw Davies : wininet: Fix the case when Proxy or ProxyBypass is NULL.
by Alexandre Julliard Aug. 7, 2007

Aug. 7, 2007

Module: wine Branch: master Commit: dc881a258e0881e1a20417f5dbfdd72535a025e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc881a258e0881e1a20417f5d… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Aug 7 10:33:20 2007 +0100 wininet: Fix the case when Proxy or ProxyBypass is NULL. --- dlls/wininet/internet.c | 28 ++++++++-------------------- 1 files changed, 8 insertions(+), 20 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index fb6970b..b6a29a5 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -2100,25 +2100,19 @@ static BOOL INET_QueryOptionHelper(BOOL bIsUnicode, HINTERNET hInternet, DWORD d proxyBytesRequired); pPI->dwAccessType = lpwai->dwAccessType; + pPI->lpszProxy = NULL; + pPI->lpszProxyBypass = NULL; if (lpwai->lpszProxy) { lstrcpyW(proxy, lpwai->lpszProxy); + pPI->lpszProxy = proxy; } - else - { - *proxy = 0; - } - pPI->lpszProxy = proxy; if (lpwai->lpszProxyBypass) { lstrcpyW(proxy_bypass, lpwai->lpszProxyBypass); + pPI->lpszProxyBypass = proxy_bypass; } - else - { - *proxy_bypass = 0; - } - pPI->lpszProxyBypass = proxy_bypass; bSuccess = TRUE; } *lpdwBufferLength = sizeof(INTERNET_PROXY_INFOW) + @@ -2147,28 +2141,22 @@ static BOOL INET_QueryOptionHelper(BOOL bIsUnicode, HINTERNET hInternet, DWORD d proxyBytesRequired); pPI->dwAccessType = lpwai->dwAccessType; + pPI->lpszProxy = NULL; + pPI->lpszProxyBypass = NULL; if (lpwai->lpszProxy) { WideCharToMultiByte(CP_ACP, 0, lpwai->lpszProxy, -1, proxy, proxyBytesRequired, NULL, NULL); + pPI->lpszProxy = proxy; } - else - { - *proxy = '\0'; - } - pPI->lpszProxy = proxy; if (lpwai->lpszProxyBypass) { WideCharToMultiByte(CP_ACP, 0, lpwai->lpszProxyBypass, -1, proxy_bypass, proxyBypassBytesRequired, NULL, NULL); + pPI->lpszProxyBypass = proxy_bypass; } - else - { - *proxy_bypass = '\0'; - } - pPI->lpszProxyBypass = proxy_bypass; bSuccess = TRUE; } *lpdwBufferLength = sizeof(INTERNET_PROXY_INFOA) +

1 0

Maarten Lankhorst : dsound: Make hardware acceleration work again.
by Alexandre Julliard Aug. 7, 2007

Aug. 7, 2007

Module: wine Branch: master Commit: cdbd17bdb85a80d62acec036a0314e7343e30d7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdbd17bdb85a80d62acec036a… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Aug 7 11:00:17 2007 +0200 dsound: Make hardware acceleration work again. --- dlls/dsound/capture.c | 3 +-- dlls/dsound/dsound.c | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/dsound/capture.c b/dlls/dsound/capture.c index 2ee27ae..833c039 100644 --- a/dlls/dsound/capture.c +++ b/dlls/dsound/capture.c @@ -1584,7 +1584,7 @@ HRESULT DirectSoundCaptureDevice_Initialize( /* Disable the direct sound driver to force emulation if requested. */ device->driver = NULL; - if (ds_hw_accel > DS_HW_ACCEL_EMULATION) + if (ds_hw_accel != DS_HW_ACCEL_EMULATION) { err = mmErr(waveInMessage((HWAVEIN)wid,DRV_QUERYDSOUNDIFACE,(DWORD_PTR)&(device->driver),0)); if ( (err != DS_OK) && (err != DSERR_UNSUPPORTED) ) { @@ -1594,7 +1594,6 @@ HRESULT DirectSoundCaptureDevice_Initialize( } err = DS_OK; - /* Get driver description */ if (device->driver) { TRACE("using DirectSound driver\n"); diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c index cc693cb..0cb66ca 100644 --- a/dlls/dsound/dsound.c +++ b/dlls/dsound/dsound.c @@ -1414,7 +1414,7 @@ HRESULT DirectSoundDevice_Initialize(DirectSoundDevice ** ppDevice, LPCGUID lpcG device->driver = NULL; /* DRV_QUERYDSOUNDIFACE is a "Wine extension" to get the DSound interface */ - if (ds_hw_accel > DS_HW_ACCEL_EMULATION) + if (ds_hw_accel != DS_HW_ACCEL_EMULATION) waveOutMessage((HWAVEOUT)wod, DRV_QUERYDSOUNDIFACE, (DWORD_PTR)&device->driver, 0); /* Get driver description */

1 0

Misha Koshelev : urlmon/tests: Keep track of download state in tests.
by Alexandre Julliard Aug. 7, 2007

Aug. 7, 2007

Module: wine Branch: master Commit: 84cf17c3e91cef51a5f4539e57236fdb79302bea URL: http://source.winehq.org/git/wine.git/?a=commit;h=84cf17c3e91cef51a5f4539e5… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Mon Aug 6 23:08:49 2007 -0500 urlmon/tests: Keep track of download state in tests. --- dlls/urlmon/tests/url.c | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index a28c32c..ef3bd30 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -124,6 +124,12 @@ static enum { MK_TEST } test_protocol; +static enum { + BEFORE_DOWNLOAD, + DOWNLOADING, + END_DOWNLOAD +} download_state; + static void test_CreateURLMoniker(LPCWSTR url1, LPCWSTR url2) { HRESULT hr; @@ -549,21 +555,31 @@ static HRESULT WINAPI statusclb_OnProgress(IBindStatusCallback *iface, ULONG ulP break; case BINDSTATUS_MIMETYPEAVAILABLE: CHECK_EXPECT(OnProgress_MIMETYPEAVAILABLE); + ok(download_state == BEFORE_DOWNLOAD, "Download state was %d, expected BEFORE_DOWNLOAD\n", + download_state); break; case BINDSTATUS_BEGINDOWNLOADDATA: CHECK_EXPECT(OnProgress_BEGINDOWNLOADDATA); ok(szStatusText != NULL, "szStatusText == NULL\n"); if(szStatusText) ok(!lstrcmpW(szStatusText, urls[test_protocol]), "wrong szStatusText\n"); + ok(download_state == BEFORE_DOWNLOAD, "Download state was %d, expected BEFORE_DOWNLOAD\n", + download_state); + download_state = DOWNLOADING; break; case BINDSTATUS_DOWNLOADINGDATA: CHECK_EXPECT2(OnProgress_DOWNLOADINGDATA); + ok(download_state == DOWNLOADING, "Download state was %d, expected DOWNLOADING\n", + download_state); break; case BINDSTATUS_ENDDOWNLOADDATA: CHECK_EXPECT(OnProgress_ENDDOWNLOADDATA); ok(szStatusText != NULL, "szStatusText == NULL\n"); if(szStatusText) ok(!lstrcmpW(szStatusText, urls[test_protocol]), "wrong szStatusText\n"); + ok(download_state == DOWNLOADING, "Download state was %d, expected DOWNLOADING\n", + download_state); + download_state = END_DOWNLOAD; break; case BINDSTATUS_CACHEFILENAMEAVAILABLE: ok(szStatusText != NULL, "szStatusText == NULL\n"); @@ -613,6 +629,9 @@ static HRESULT WINAPI statusclb_OnDataAvailable(IBindStatusCallback *iface, DWOR BYTE buf[512]; CHECK_EXPECT2(OnDataAvailable); + ok(download_state == DOWNLOADING || download_state == END_DOWNLOAD, + "Download state was %d, expected DOWNLOADING or END_DOWNLOAD\n", + download_state); data_available = TRUE; if (0) @@ -770,6 +789,7 @@ static void test_BindToStorage(int protocol, BOOL emul) test_protocol = protocol; emulate_protocol = emul; + download_state = BEFORE_DOWNLOAD; stopped_binding = FALSE; data_available = FALSE;

1 0