December 2006 - Wine-commits

Andrew Talbot : version/tests: Write-strings warning fix.
by Alexandre Julliard 18 Dec '06

18 Dec '06

Module: wine Branch: master Commit: 7eb681533640d70c718a11cbbf37aec142270137 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7eb681533640d70c718a11cbb… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sat Dec 16 12:15:53 2006 +0000 version/tests: Write-strings warning fix. --- dlls/version/tests/info.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/version/tests/info.c b/dlls/version/tests/info.c index 5eafa49..3a5f2c0 100644 --- a/dlls/version/tests/info.c +++ b/dlls/version/tests/info.c @@ -233,7 +233,7 @@ static void test_info(void) { /* this test crashes on WinNT4 */ - boolret = VerQueryValueA( pVersionInfo, "\\", (LPVOID *)&pFixedVersionInfo, 0); + boolret = VerQueryValueA( pVersionInfo, backslash, (LPVOID *)&pFixedVersionInfo, 0); ok (boolret, "VerQueryValue failed: GetLastError = 0x%08x\n", GetLastError()); }

1 0

Andrew Talbot : progman: Cast-qual warnings fix.
by Alexandre Julliard 18 Dec '06

18 Dec '06

Module: wine Branch: master Commit: 1412bcdb7ebe48001cebbe759983f126ab0eb5aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=1412bcdb7ebe48001cebbe759… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sat Dec 16 12:55:31 2006 +0000 progman: Cast-qual warnings fix. --- programs/progman/group.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/progman/group.c b/programs/progman/group.c index ea2dd7b..031d014 100644 --- a/programs/progman/group.c +++ b/programs/progman/group.c @@ -169,7 +169,7 @@ HLOCAL GROUP_AddGroup(LPCSTR lpszName, L group->hActiveProgram = 0; cs.szClass = STRING_GROUP_WIN_CLASS_NAME; - cs.szTitle = (LPSTR)lpszName; + cs.szTitle = lpszName; cs.hOwner = 0; cs.x = x; cs.y = y;

1 0

Andrew Talbot : winecfg: Cast-qual warning fix.
by Alexandre Julliard 18 Dec '06

18 Dec '06

Module: wine Branch: master Commit: e181d5d0e2a3a45bd490b248c84fc2de0ecf9a32 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e181d5d0e2a3a45bd490b248c… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sat Dec 16 14:25:11 2006 +0000 winecfg: Cast-qual warning fix. --- programs/winecfg/theme.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/winecfg/theme.c b/programs/winecfg/theme.c index 7410a0d..f34d1ca 100644 --- a/programs/winecfg/theme.c +++ b/programs/winecfg/theme.c @@ -59,9 +59,9 @@ typedef BOOL (CALLBACK *EnumThemeProc)(L LPCWSTR pszToolTip, LPVOID lpReserved2, LPVOID lpData); -HRESULT WINAPI EnumThemeColors (LPWSTR pszThemeFileName, LPWSTR pszSizeName, +HRESULT WINAPI EnumThemeColors (LPCWSTR pszThemeFileName, LPWSTR pszSizeName, DWORD dwColorNum, PTHEMENAMES pszColorNames); -HRESULT WINAPI EnumThemeSizes (LPWSTR pszThemeFileName, LPWSTR pszColorName, +HRESULT WINAPI EnumThemeSizes (LPCWSTR pszThemeFileName, LPWSTR pszColorName, DWORD dwSizeNum, PTHEMENAMES pszSizeNames); HRESULT WINAPI ApplyTheme (HTHEMEFILE hThemeFile, char* unknown, HWND hWnd); HRESULT WINAPI OpenThemeFile (LPCWSTR pszThemeFileName, LPCWSTR pszColorName, @@ -171,7 +171,7 @@ static void free_theme_files(void) themeFilesCount = 0; } -typedef HRESULT (WINAPI * EnumTheme) (LPWSTR, LPWSTR, DWORD, PTHEMENAMES); +typedef HRESULT (WINAPI * EnumTheme) (LPCWSTR, LPWSTR, DWORD, PTHEMENAMES); /* fill a string list with either colors or sizes of a theme */ static void fill_theme_string_array (const WCHAR* filename, @@ -183,7 +183,7 @@ static void fill_theme_string_array (con WINE_TRACE ("%s %p %p\n", wine_dbgstr_w (filename), wdsa, enumTheme); - while (SUCCEEDED (enumTheme ((WCHAR*)filename, NULL, index++, &names))) + while (SUCCEEDED (enumTheme (filename, NULL, index++, &names))) { WINE_TRACE ("%s: %s\n", wine_dbgstr_w (names.szName), wine_dbgstr_w (names.szDisplayName));

1 0

Alexandre Julliard : configure: Remove some no longer used libcurses checks .
by Alexandre Julliard 18 Dec '06

18 Dec '06

Module: wine Branch: master Commit: 8f1d42eba42964e694ce21ac8ed3015b562bc36c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f1d42eba42964e694ce21ac8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Dec 16 17:01:37 2006 +0100 configure: Remove some no longer used libcurses checks. --- configure | 47 ++++++++++++----------------------------------- configure.ac | 27 +++++++++------------------ include/config.h.in | 6 ------ 3 files changed, 21 insertions(+), 59 deletions(-) diff --git a/configure b/configure index d7c208b..1ba9d3b 100755 --- a/configure +++ b/configure @@ -704,7 +704,6 @@ XML2INCL XSLTLIBS XSLTINCL HALINCL -CURSESLIBS sane_devel SANELIBS SANEINCL @@ -1362,7 +1361,6 @@ Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) --without-opengl do not use OpenGL - --without-curses do not use curses --with-wine-tools=<dir> use Wine tools from directory <dir> --with-x use the X Window System @@ -1863,12 +1861,6 @@ if test "${with_opengl+set}" = set; then fi -# Check whether --with-curses was given. -if test "${with_curses+set}" = set; then - withval=$with_curses; -fi - - # Check whether --with-wine-tools was given. if test "${with_wine_tools+set}" = set; then withval=$with_wine_tools; @@ -10915,11 +10907,9 @@ fi fi CURSESLIBS="" -if test "x$with_curses" != "xno" +if test "$ac_cv_header_ncurses_h" = "yes" then - if test "$ac_cv_header_ncurses_h" = "yes" - then - { echo "$as_me:$LINENO: checking for waddch in -lncurses" >&5 + { echo "$as_me:$LINENO: checking for waddch in -lncurses" >&5 echo $ECHO_N "checking for waddch in -lncurses... $ECHO_C" >&6; } if test "${ac_cv_lib_ncurses_waddch+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -10997,17 +10987,12 @@ fi { echo "$as_me:$LINENO: result: $ac_cv_lib_ncurses_waddch" >&5 echo "${ECHO_T}$ac_cv_lib_ncurses_waddch" >&6; } if test $ac_cv_lib_ncurses_waddch = yes; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_LIBNCURSES 1 -_ACEOF - - CURSESLIBS="-lncurses" + CURSESLIBS="-lncurses" fi - elif test "$ac_cv_header_curses_h" = "yes" - then - { echo "$as_me:$LINENO: checking for waddch in -lcurses" >&5 +elif test "$ac_cv_header_curses_h" = "yes" +then + { echo "$as_me:$LINENO: checking for waddch in -lcurses" >&5 echo $ECHO_N "checking for waddch in -lcurses... $ECHO_C" >&6; } if test "${ac_cv_lib_curses_waddch+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -11085,17 +11070,12 @@ fi { echo "$as_me:$LINENO: result: $ac_cv_lib_curses_waddch" >&5 echo "${ECHO_T}$ac_cv_lib_curses_waddch" >&6; } if test $ac_cv_lib_curses_waddch = yes; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_LIBCURSES 1 -_ACEOF - - CURSESLIBS="-lcurses" + CURSESLIBS="-lcurses" fi - fi - ac_save_LIBS="$LIBS" - LIBS="$LIBS $CURSESLIBS" +fi +ac_save_LIBS="$LIBS" +LIBS="$LIBS $CURSESLIBS" for ac_func in mousemask do @@ -11206,9 +11186,7 @@ _ACEOF fi done - LIBS="$ac_save_LIBS" -fi - +LIBS="$ac_save_LIBS" # Extract the first word of "sane-config", so it can be a program name with args. set dummy sane-config; ac_word=$2 @@ -24821,7 +24799,6 @@ XML2INCL!$XML2INCL$ac_delim XSLTLIBS!$XSLTLIBS$ac_delim XSLTINCL!$XSLTINCL$ac_delim HALINCL!$HALINCL$ac_delim -CURSESLIBS!$CURSESLIBS$ac_delim sane_devel!$sane_devel$ac_delim SANELIBS!$SANELIBS$ac_delim SANEINCL!$SANEINCL$ac_delim @@ -24878,7 +24855,7 @@ LIBOBJS!$LIBOBJS$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 77; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 76; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 diff --git a/configure.ac b/configure.ac index 7ddc521..f44e3eb 100644 --- a/configure.ac +++ b/configure.ac @@ -16,7 +16,6 @@ AC_ARG_ENABLE(win16, AC_HELP_STRING([--d AC_ARG_ENABLE(win64, AC_HELP_STRING([--enable-win64], [build a Win64 emulator on AMD64 (won't run Win32 binaries)])) AC_ARG_WITH(opengl, AC_HELP_STRING([--without-opengl],[do not use OpenGL])) -AC_ARG_WITH(curses, AC_HELP_STRING([--without-curses],[do not use curses])) AC_ARG_WITH(wine-tools,AC_HELP_STRING([--with-wine-tools=<dir>],[use Wine tools from directory <dir>])) AC_CANONICAL_HOST @@ -520,25 +519,17 @@ fi dnl **** Check which curses lib to use *** CURSESLIBS="" -if test "x$with_curses" != "xno" +if test "$ac_cv_header_ncurses_h" = "yes" then - if test "$ac_cv_header_ncurses_h" = "yes" - then - AC_CHECK_LIB(ncurses,waddch, - [AC_DEFINE(HAVE_LIBNCURSES, 1, [Define if you have the ncurses library (-lncurses)]) - CURSESLIBS="-lncurses"]) - elif test "$ac_cv_header_curses_h" = "yes" - then - AC_CHECK_LIB(curses,waddch, - [AC_DEFINE(HAVE_LIBCURSES, 1, [Define if you have the curses library (-lcurses)]) - CURSESLIBS="-lcurses"]) - fi - ac_save_LIBS="$LIBS" - LIBS="$LIBS $CURSESLIBS" - AC_CHECK_FUNCS(mousemask) - LIBS="$ac_save_LIBS" + AC_CHECK_LIB(ncurses,waddch,[CURSESLIBS="-lncurses"]) +elif test "$ac_cv_header_curses_h" = "yes" +then + AC_CHECK_LIB(curses,waddch,[CURSESLIBS="-lcurses"]) fi -AC_SUBST(CURSESLIBS) +ac_save_LIBS="$LIBS" +LIBS="$LIBS $CURSESLIBS" +AC_CHECK_FUNCS(mousemask) +LIBS="$ac_save_LIBS" dnl **** Check for SANE **** AC_CHECK_PROG(sane_devel,sane-config,sane-config,no) diff --git a/include/config.h.in b/include/config.h.in index 24052dc..11bd3bb 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -306,18 +306,12 @@ /* Define to 1 if you have the <libaudioio.h> header file. */ #undef HAVE_LIBAUDIOIO_H -/* Define if you have the curses library (-lcurses) */ -#undef HAVE_LIBCURSES - /* Define if you have the hal library */ #undef HAVE_LIBHAL /* Define to 1 if you have the `i386' library (-li386). */ #undef HAVE_LIBI386 -/* Define if you have the ncurses library (-lncurses) */ -#undef HAVE_LIBNCURSES - /* Define to 1 if you have the `nsl' library (-lnsl). */ #undef HAVE_LIBNSL

1 0

Detlef Riekenberg : localspl/tests: Add tests for XcvDataPort.
by Alexandre Julliard 18 Dec '06

18 Dec '06

Module: wine Branch: master Commit: 27caa4dc96cf7fc6c6e780697d856b70145ca9c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27caa4dc96cf7fc6c6e780697… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Dec 15 15:52:39 2006 +0100 localspl/tests: Add tests for XcvDataPort. --- dlls/localspl/tests/localmon.c | 92 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 92 insertions(+), 0 deletions(-) diff --git a/dlls/localspl/tests/localmon.c b/dlls/localspl/tests/localmon.c index 682d6f2..93b595c 100644 --- a/dlls/localspl/tests/localmon.c +++ b/dlls/localspl/tests/localmon.c @@ -58,6 +58,8 @@ static BOOL (WINAPI *pXcvOpenPort)(LPCW static DWORD (WINAPI *pXcvDataPort)(HANDLE, LPCWSTR, PBYTE, DWORD, PBYTE, DWORD, PDWORD); static BOOL (WINAPI *pXcvClosePort)(HANDLE); +static WCHAR cmd_MonitorUIW[] = {'M','o','n','i','t','o','r','U','I',0}; +static WCHAR cmd_MonitorUI_lcaseW[] = {'m','o','n','i','t','o','r','u','i',0}; static WCHAR does_not_existW[] = {'d','o','e','s','_','n','o','t','_','e','x','i','s','t',0}; static WCHAR emptyW[] = {0}; static WCHAR invalid_serverW[] = {'\\','\\','i','n','v','a','l','i','d','_','s','e','r','v','e','r',0}; @@ -332,6 +334,95 @@ static void test_XcvClosePort(void) /* ########################### */ +static void test_XcvDataPort(void) +{ + DWORD res; + HANDLE hXcv; + BYTE buffer[MAX_PATH + 2]; + DWORD needed; + DWORD len; + + + if ((pXcvOpenPort == NULL) || (pXcvDataPort == NULL) || (pXcvClosePort == NULL)) return; + + hXcv = (HANDLE) 0xdeadbeef; + SetLastError(0xdeadbeef); + res = pXcvOpenPort(emptyW, SERVER_ACCESS_ADMINISTER, &hXcv); + ok(res, "returned %d with 0x%x and %p (expected '!= 0')\n", res, GetLastError(), hXcv); + if (!res) return; + + /* ask for needed size */ + needed = (DWORD) 0xdeadbeef; + SetLastError(0xdeadbeef); + res = pXcvDataPort(hXcv, cmd_MonitorUIW, NULL, 0, NULL, 0, &needed); + ok( (res == ERROR_INSUFFICIENT_BUFFER) && (needed <= MAX_PATH), + "returned %d with 0x%x and 0x%x (expected 'ERROR_INSUFFICIENT_BUFFER' " \ + " and '<= MAX_PATH')\n", res, GetLastError(), needed); + + if (needed > MAX_PATH) goto xcv_cleanup; + len = needed; + + /* the command is required */ + needed = (DWORD) 0xdeadbeef; + SetLastError(0xdeadbeef); + res = pXcvDataPort(hXcv, emptyW, NULL, 0, NULL, 0, &needed); + ok( res == ERROR_INVALID_PARAMETER, "returned %d with 0x%x and 0x%x " \ + "(expected 'ERROR_INVALID_PARAMETER')\n", res, GetLastError(), needed); + + if (0) { + /* crash with native localspl.dll (w2k+xp) */ + res = pXcvDataPort(hXcv, NULL, NULL, 0, buffer, MAX_PATH, &needed); + res = pXcvDataPort(hXcv, cmd_MonitorUIW, NULL, 0, NULL, len, &needed); + res = pXcvDataPort(hXcv, cmd_MonitorUIW, NULL, 0, buffer, len, NULL); + } + + + /* hXcv is ignored for the command "MonitorUI" */ + needed = (DWORD) 0xdeadbeef; + SetLastError(0xdeadbeef); + res = pXcvDataPort(NULL, cmd_MonitorUIW, NULL, 0, buffer, len, &needed); + ok( res == ERROR_SUCCESS, "returned %d with 0x%x and 0x%x " \ + "(expected 'ERROR_SUCCESS')\n", res, GetLastError(), needed); + + + /* pszDataName is case-sensitive */ + memset(buffer, 0, len); + needed = (DWORD) 0xdeadbeef; + SetLastError(0xdeadbeef); + res = pXcvDataPort(hXcv, cmd_MonitorUI_lcaseW, NULL, 0, buffer, len, &needed); + ok( res == ERROR_INVALID_PARAMETER, "returned %d with 0x%x and 0x%x " \ + "(expected 'ERROR_INVALID_PARAMETER')\n", res, GetLastError(), needed); + + /* off by one: larger */ + needed = (DWORD) 0xdeadbeef; + SetLastError(0xdeadbeef); + res = pXcvDataPort(hXcv, cmd_MonitorUIW, NULL, 0, buffer, len+1, &needed); + ok( res == ERROR_SUCCESS, "returned %d with 0x%x and 0x%x " \ + "(expected 'ERROR_SUCCESS')\n", res, GetLastError(), needed); + + + /* off by one: smaller */ + needed = (DWORD) 0xdeadbeef; + SetLastError(0xdeadbeef); + res = pXcvDataPort(hXcv, cmd_MonitorUIW, NULL, 0, buffer, len-1, &needed); + ok( res == ERROR_INSUFFICIENT_BUFFER, "returned %d with 0x%x and 0x%x " \ + "(expected 'ERROR_INSUFFICIENT_BUFFER')\n", res, GetLastError(), needed); + + /* Normal use. The DLL-Name without a Path is returned */ + memset(buffer, 0, len); + needed = (DWORD) 0xdeadbeef; + SetLastError(0xdeadbeef); + res = pXcvDataPort(hXcv, cmd_MonitorUIW, NULL, 0, buffer, len, &needed); + ok( res == ERROR_SUCCESS, "returned %d with 0x%x and 0x%x " \ + "(expected 'ERROR_SUCCESS')\n", res, GetLastError(), needed); + +xcv_cleanup: + pXcvClosePort(hXcv); + +} + +/* ########################### */ + static void test_XcvOpenPort(void) { DWORD res; @@ -440,5 +531,6 @@ START_TEST(localmon) test_DeletePort(); test_EnumPorts(); test_XcvClosePort(); + test_XcvDataPort(); test_XcvOpenPort(); }

1 0

Ulrich Czekalla : ddraw: Initialize the IDirectDraw3 vtable.
by Alexandre Julliard 18 Dec '06

18 Dec '06

Module: wine Branch: master Commit: f26cb44c73d7c91abe8a598bc624c61f26c21d08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f26cb44c73d7c91abe8a598bc… Author: Ulrich Czekalla <ulrich.czekalla(a)utoronto.ca> Date: Fri Dec 15 11:15:45 2006 -0500 ddraw: Initialize the IDirectDraw3 vtable. --- dlls/ddraw/main.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c index eec98f1..a520381 100644 --- a/dlls/ddraw/main.c +++ b/dlls/ddraw/main.c @@ -149,6 +149,7 @@ DDRAW_Create(GUID *guid, */ ICOM_INIT_INTERFACE(This, IDirectDraw, IDirectDraw1_Vtbl); ICOM_INIT_INTERFACE(This, IDirectDraw2, IDirectDraw2_Vtbl); + ICOM_INIT_INTERFACE(This, IDirectDraw3, IDirectDraw3_Vtbl); ICOM_INIT_INTERFACE(This, IDirectDraw4, IDirectDraw4_Vtbl); ICOM_INIT_INTERFACE(This, IDirectDraw7, IDirectDraw7_Vtbl); ICOM_INIT_INTERFACE(This, IDirect3D, IDirect3D1_Vtbl);

1 0

appdb/include monitor.php sidebar_login.php
by WineHQ 16 Dec '06

16 Dec '06

ChangeSet ID: 30616 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/12/15 21:20:37 Modified files: include : monitor.php sidebar_login.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Add a list of the user's monitored versions to the sidebar. Patch: http://cvs.winehq.org/patch.py?id=30616 Old revision New revision Changes Path 1.9 1.10 +17 -1 appdb/include/monitor.php 1.17 1.18 +11 -0 appdb/include/sidebar_login.php Index: appdb/include/monitor.php diff -u -p appdb/include/monitor.php:1.9 appdb/include/monitor.php:1.10 --- appdb/include/monitor.php:1.9 16 Dec 2006 3:20:37 -0000 +++ appdb/include/monitor.php 16 Dec 2006 3:20:37 -0000 @@ -135,6 +135,22 @@ class Monitor { $sEmail = User::get_notify_email_address_list(null, $this->iVersionId); if($sEmail) mail_appdb($sEmail, $sSubject ,$sMsg); - } + } + + /* Retrieve the user's monitored versions */ + function getVersionsMonitored($oUser) + { + $hResult = query_parameters("SELECT appId, versionId FROM appMonitors WHERE userId = '?'", $oUser->iUserId); + + if(!$hResult || mysql_num_rows($hResult) == 0) + return NULL; + + $aVersionsMonitored = array(); + + for($i = 0; $oRow = mysql_fetch_object($hResult); $i++) + $aVersionsMonitored[$i] = array($oRow->appId, $oRow->versionId); + + return $aVersionsMonitored; + } } ?> Index: appdb/include/sidebar_login.php diff -u -p appdb/include/sidebar_login.php:1.17 appdb/include/sidebar_login.php:1.18 --- appdb/include/sidebar_login.php:1.17 16 Dec 2006 3:20:37 -0000 +++ appdb/include/sidebar_login.php 16 Dec 2006 3:20:37 -0000 @@ -6,6 +6,7 @@ require_once(BASE."include/maintainer.php"); require_once(BASE."include/application.php"); require_once(BASE."include/user.php"); +require_once(BASE."include/monitor.php"); function global_sidebar_login() { @@ -36,6 +37,16 @@ function global_sidebar_login() { if($appsRejected) $g->addmisc("<a href='".BASE."appsubmit.php?'>Review Rejected Apps</a>", "center"); + $aMonitored = Monitor::getVersionsMonitored($_SESSION['current']); + if($aMonitored) + { + $g->addmisc(""); + $g->addmisc("You monitor:\n"); + + while(list($i, list($iAppId, $iVersionId)) = each($aMonitored)) + $g->addmisc("<a href=\"".BASE."appview.php?iVersionId=$iVersionId\">".Application::lookup_name($iAppId)." ".Version::lookup_name($iVersionId)."</a>","center"); + } + } else {

1 0

Ulrich Czekalla : winex11.drv: Avoid grabbing syslevel locks in the wrong order.
by Alexandre Julliard 15 Dec '06

15 Dec '06

Module: wine Branch: master Commit: 4d8135e0c87022518b9f24fdc572181dc2f47b24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d8135e0c87022518b9f24fdc… Author: Ulrich Czekalla <ulrich.czekalla(a)utoronto.ca> Date: Thu Dec 14 15:42:30 2006 -0500 winex11.drv: Avoid grabbing syslevel locks in the wrong order. --- dlls/gdi32/opengl.c | 2 +- dlls/winex11.drv/opengl.c | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/gdi32/opengl.c b/dlls/gdi32/opengl.c index fdf39f3..6793918 100644 --- a/dlls/gdi32/opengl.c +++ b/dlls/gdi32/opengl.c @@ -169,7 +169,7 @@ BOOL WINAPI wglMakeCurrent(HDC hdc, HGLR if(hglrc == NULL) dc = OPENGL_GetDefaultDC(); else - dc = DC_GetDCPtr( hdc ); + dc = DC_GetDCUpdate( hdc ); TRACE("hdc: (%p), hglrc: (%p)\n", hdc, hglrc); diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 95ca135..07e076d 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1443,7 +1443,7 @@ PROC X11DRV_wglGetProcAddress(LPCSTR lps * Adjust the current viewport and scissor in order to position * and size the current drawable correctly on the parent window. */ -static void sync_current_drawable(void) +static void sync_current_drawable(BOOL updatedc) { int dy; int width; @@ -1455,7 +1455,8 @@ static void sync_current_drawable(void) if (ctx && ctx->physDev) { - GetClipBox(ctx->physDev->hdc, &rc); /* Make sure physDev is up to date */ + if (updatedc) + GetClipBox(ctx->physDev->hdc, &rc); /* Make sure physDev is up to date */ dy = ctx->physDev->drawable_rect.bottom - ctx->physDev->drawable_rect.top - ctx->physDev->dc_rect.bottom; @@ -1535,7 +1536,7 @@ BOOL X11DRV_wglMakeCurrent(X11DRV_PDEVIC } else { - sync_current_drawable(); + sync_current_drawable(FALSE); } } } @@ -1885,7 +1886,7 @@ static void WINAPI X11DRV_wglScissor(GLi ctx->scissor.right = x + width; ctx->scissor.bottom = y + height; - sync_current_drawable(); + sync_current_drawable(TRUE); } static void WINAPI X11DRV_wglViewport(GLint x, GLint y, GLsizei width, GLsizei height) @@ -1897,7 +1898,7 @@ static void WINAPI X11DRV_wglViewport(GL ctx->viewport.right = x + width; ctx->viewport.bottom = y + height; - sync_current_drawable(); + sync_current_drawable(TRUE); } /**

1 0

Vitaliy Margolen : wined3d: When changing display modes clip cursor to the requested display size.
by Alexandre Julliard 15 Dec '06

15 Dec '06

Module: wine Branch: master Commit: 2a63a03eb1d8c35ba9ba801068e2e5f860e67f5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a63a03eb1d8c35ba9ba80106… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Thu Dec 14 15:51:23 2006 -0700 wined3d: When changing display modes clip cursor to the requested display size. --- dlls/ddraw/tests/ddrawmodes.c | 22 +++++++++++++++++++++- dlls/wined3d/device.c | 5 +++++ 2 files changed, 26 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/tests/ddrawmodes.c b/dlls/ddraw/tests/ddrawmodes.c index f11021d..4db0856 100644 --- a/dlls/ddraw/tests/ddrawmodes.c +++ b/dlls/ddraw/tests/ddrawmodes.c @@ -146,7 +146,27 @@ static void setdisplaymode(int i) modes[i].dwWidth, modes[i].dwHeight, U1(modes[i].ddpfPixelFormat).dwRGBBitCount); ok(DD_OK==rc || DDERR_UNSUPPORTED==rc,"SetDisplayMode returned: %x\n",rc); - if (DD_OK==rc) { + if (rc == DD_OK) + { + RECT r, scrn, virt; + + SetRect(&virt, 0, 0, GetSystemMetrics(SM_CXVIRTUALSCREEN), GetSystemMetrics(SM_CYVIRTUALSCREEN)); + OffsetRect(&virt, GetSystemMetrics(SM_XVIRTUALSCREEN), GetSystemMetrics(SM_YVIRTUALSCREEN)); + SetRect(&scrn, 0, 0, GetSystemMetrics(SM_CXSCREEN), GetSystemMetrics(SM_CYSCREEN)); + trace("Mode (%dx%d) [%dx%d] (%d %d)x(%d %d)\n", modes[i].dwWidth, modes[i].dwHeight, + scrn.right, scrn.bottom, virt.left, virt.top, virt.right, virt.bottom); + + ok(GetClipCursor(&r), "GetClipCursor() failed\n"); + /* ddraw sets clip rect here to the screen size, even for + multiple monitors */ + ok(EqualRect(&r, &scrn), "Invalid clip rect: (%d %d) x (%d %d)\n", + r.left, r.top, r.right, r.bottom); + + ok(ClipCursor(NULL), "ClipCursor() failed\n"); + ok(GetClipCursor(&r), "GetClipCursor() failed\n"); + ok(EqualRect(&r, &virt), "Invalid clip rect: (%d %d) x (%d %d)\n", + r.left, r.top, r.right, r.bottom); + rc = IDirectDraw_RestoreDisplayMode(lpDD); ok(DD_OK==rc,"RestoreDisplayMode returned: %x\n",rc); } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index a78b005..ff3c987 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2254,6 +2254,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; LONG ret; const PixelFormatDesc *formatDesc = getFormatDescEntry(pMode->Format); + RECT clip_rc; TRACE("(%p)->(%d,%p) Mode=%dx%dx@%d, %s\n", This, iSwapChain, pMode, pMode->Width, pMode->Height, pMode->RefreshRate, debug_d3dformat(pMode->Format)); @@ -2304,6 +2305,10 @@ static HRESULT WINAPI IWineD3DDeviceImpl if(This->ddraw_window) MoveWindow(This->ddraw_window, 0, 0, pMode->Width, pMode->Height, TRUE); + /* And finally clip mouse to our screen */ + SetRect(&clip_rc, 0, 0, pMode->Width, pMode->Height); + ClipCursor(&clip_rc); + return WINED3D_OK; }

1 0

James Hawkins : cabinet: Close the opened file handle even in error cases.
by Alexandre Julliard 15 Dec '06

15 Dec '06

Module: wine Branch: master Commit: a79765ff02ad5c4a8bbe070b8b82430027fe2261 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a79765ff02ad5c4a8bbe070b8… Author: James Hawkins <truiken(a)gmail.com> Date: Fri Dec 15 03:47:15 2006 -0600 cabinet: Close the opened file handle even in error cases. --- dlls/cabinet/fdi.c | 33 +++++++++++---------------------- 1 files changed, 11 insertions(+), 22 deletions(-) diff --git a/dlls/cabinet/fdi.c b/dlls/cabinet/fdi.c index 0cb319c..70db803 100644 --- a/dlls/cabinet/fdi.c +++ b/dlls/cabinet/fdi.c @@ -2809,6 +2809,17 @@ BOOL __cdecl FDICopy( err = fdi_decomp(file, 1, decomp_state, pszCabPath, pfnfdin, pvUser); if (err) CAB(current) = NULL; else CAB(offset) += file->length; + /* fdintCLOSE_FILE_INFO notification */ + ZeroMemory(&fdin, sizeof(FDINOTIFICATION)); + fdin.pv = pvUser; + fdin.psz1 = (char *)file->filename; + fdin.hf = filehf; + fdin.cb = (file->attribs & cffile_A_EXEC) ? TRUE : FALSE; /* FIXME: is that right? */ + fdin.date = file->date; + fdin.time = file->time; + fdin.attribs = file->attribs; /* FIXME: filter _A_EXEC? */ + ((*pfnfdin)(fdintCLOSE_FILE_INFO, &fdin)); + switch (err) { case DECR_OK: break; @@ -2829,28 +2840,6 @@ BOOL __cdecl FDICopy( PFDI_INT(hfdi)->perf->fError = TRUE; goto bail_and_fail; } - - /* fdintCLOSE_FILE_INFO notification */ - ZeroMemory(&fdin, sizeof(FDINOTIFICATION)); - fdin.pv = pvUser; - fdin.psz1 = (char *)file->filename; - fdin.hf = filehf; - fdin.cb = (file->attribs & cffile_A_EXEC) ? TRUE : FALSE; /* FIXME: is that right? */ - fdin.date = file->date; - fdin.time = file->time; - fdin.attribs = file->attribs; /* FIXME: filter _A_EXEC? */ - err = ((*pfnfdin)(fdintCLOSE_FILE_INFO, &fdin)); - if (err == FALSE || err == -1) { - /* - * SDK states that even though they indicated failure, - * we are not supposed to try and close the file, so we - * just treat this like all the others - */ - PFDI_INT(hfdi)->perf->erfOper = FDIERROR_USER_ABORT; - PFDI_INT(hfdi)->perf->erfType = 0; - PFDI_INT(hfdi)->perf->fError = TRUE; - goto bail_and_fail; - } } }

1 0