January 2007 - Wine-commits

Dmitry Timoshkov : user32: Update the ShowWindow test to pass cleanly under Windows 2000.
by Alexandre Julliard 02 Jan '07

02 Jan '07

Module: wine Branch: master Commit: bc2a0ca50f9ac818ffe9579f4b541e72bc8db997 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc2a0ca50f9ac818ffe9579f4… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Sat Dec 30 22:03:03 2006 +0800 user32: Update the ShowWindow test to pass cleanly under Windows 2000. --- dlls/user32/tests/msg.c | 42 ++++++++++++++++++++++-------------------- 1 files changed, 22 insertions(+), 20 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 77e223b..601d967 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -8338,9 +8338,9 @@ static const struct message WmShowNormal static const struct message WmShow[] = { { WM_SHOWWINDOW, sent|wparam, 1 }, { WM_WINDOWPOSCHANGING, sent|wparam, SWP_SHOWWINDOW|SWP_NOSIZE|SWP_NOMOVE }, - { HCBT_ACTIVATE, hook }, - { WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOSIZE|SWP_NOMOVE }, - { HCBT_SETFOCUS, hook }, + { HCBT_ACTIVATE, hook|optional }, /* win2000 doesn't send it */ + { WM_WINDOWPOSCHANGING, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE }, /* win2000 doesn't send it */ + { HCBT_SETFOCUS, hook|optional }, /* win2000 doesn't send it */ { WM_WINDOWPOSCHANGED, sent|wparam, SWP_SHOWWINDOW|SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, { 0 } }; @@ -8378,12 +8378,13 @@ static const struct message WmShowNA_2[] static const struct message WmRestore_1[] = { { HCBT_MINMAX, hook|lparam, 0, SW_RESTORE }, { WM_WINDOWPOSCHANGING, sent|wparam, SWP_SHOWWINDOW|SWP_FRAMECHANGED|SWP_NOCOPYBITS|0x8000 }, - { HCBT_ACTIVATE, hook }, - { WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOSIZE|SWP_NOMOVE }, - { HCBT_SETFOCUS, hook }, + { HCBT_ACTIVATE, hook|optional }, /* win2000 doesn't send it */ + { WM_WINDOWPOSCHANGING, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE }, /* win2000 doesn't send it */ + { HCBT_SETFOCUS, hook|optional }, /* win2000 doesn't send it */ { WM_WINDOWPOSCHANGED, sent|wparam, SWP_SHOWWINDOW|SWP_FRAMECHANGED|SWP_NOCOPYBITS|0x8000 }, { WM_MOVE, sent|defwinproc }, { WM_SIZE, sent|wparam|defwinproc, SIZE_RESTORED }, + { HCBT_SETFOCUS, hook|optional }, /* win2000 sends it */ { 0 } }; static const struct message WmRestore_2[] = { @@ -8424,12 +8425,13 @@ static const struct message WmHide_1[] = { WM_SHOWWINDOW, sent|wparam, 0 }, { WM_WINDOWPOSCHANGING, sent|wparam, SWP_HIDEWINDOW|SWP_NOSIZE|SWP_NOMOVE }, { WM_WINDOWPOSCHANGED, sent|wparam, SWP_HIDEWINDOW|SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, + { HCBT_SETFOCUS, hook|optional }, /* win2000 sends it */ { 0 } }; static const struct message WmHide_2[] = { { WM_SHOWWINDOW, sent|wparam, 0 }, - { WM_WINDOWPOSCHANGING, sent|wparam, SWP_HIDEWINDOW|SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOMOVE }, - { WM_WINDOWPOSCHANGED, sent|wparam, SWP_HIDEWINDOW|SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, + { WM_WINDOWPOSCHANGING, sent /*|wparam, SWP_HIDEWINDOW|SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOMOVE*/ }, /* win2000 doesn't add SWP_NOACTIVATE */ + { WM_WINDOWPOSCHANGED, sent /*|wparam, SWP_HIDEWINDOW|SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE*/ }, /* win2000 doesn't add SWP_NOACTIVATE */ { 0 } }; static const struct message WmHide_3[] = { @@ -8442,8 +8444,8 @@ static const struct message WmHide_3[] = static const struct message WmShowMinimized_1[] = { { HCBT_MINMAX, hook|lparam, 0, SW_SHOWMINIMIZED }, { WM_WINDOWPOSCHANGING, sent|wparam, SWP_SHOWWINDOW|SWP_FRAMECHANGED|SWP_NOCOPYBITS|0x8000 }, - { HCBT_ACTIVATE, hook }, - { WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOSIZE|SWP_NOMOVE }, + { HCBT_ACTIVATE, hook|optional }, /* win2000 doesn't send it */ + { WM_WINDOWPOSCHANGING, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE }, /* win2000 doesn't send it */ { WM_WINDOWPOSCHANGED, sent|wparam, SWP_SHOWWINDOW|SWP_FRAMECHANGED|SWP_NOCOPYBITS|0x8000 }, { WM_MOVE, sent|defwinproc }, { WM_SIZE, sent|wparam|defwinproc, SIZE_MINIMIZED }, @@ -8451,7 +8453,7 @@ static const struct message WmShowMinimi }; static const struct message WmMinimize_1[] = { { HCBT_MINMAX, hook|lparam, 0, SW_MINIMIZE }, - { HCBT_SETFOCUS, hook }, + { HCBT_SETFOCUS, hook|optional }, /* win2000 doesn't send it */ { WM_WINDOWPOSCHANGING, sent|wparam, SWP_SHOWWINDOW|SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOCOPYBITS|0x8000 }, { WM_WINDOWPOSCHANGED, sent|wparam, SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOCOPYBITS|0x8000 }, { WM_MOVE, sent|defwinproc }, @@ -8500,9 +8502,9 @@ static const struct message WmShowMaximi { HCBT_MINMAX, hook|lparam, 0, SW_SHOWMAXIMIZED }, { WM_GETMINMAXINFO, sent }, { WM_WINDOWPOSCHANGING, sent|wparam, SWP_SHOWWINDOW|SWP_FRAMECHANGED|SWP_NOCOPYBITS|0x8000 }, - { HCBT_ACTIVATE, hook }, - { WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOSIZE|SWP_NOMOVE }, - { HCBT_SETFOCUS, hook }, + { HCBT_ACTIVATE, hook|optional }, /* win2000 doesn't send it */ + { WM_WINDOWPOSCHANGING, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE }, /* win2000 doesn't send it */ + { HCBT_SETFOCUS, hook|optional }, /* win2000 doesn't send it */ { WM_WINDOWPOSCHANGED, sent|wparam, SWP_SHOWWINDOW|SWP_FRAMECHANGED|SWP_NOCOPYBITS|0x8000 }, { WM_MOVE, sent|defwinproc }, { WM_SIZE, sent|wparam|defwinproc, SIZE_MAXIMIZED }, @@ -8548,11 +8550,11 @@ static void test_ShowWindow(void) /* 2 */ { SW_SHOWNORMAL, TRUE, WS_VISIBLE, WmEmptySeq, TRUE }, /* 3 */ { SW_HIDE, TRUE, 0, WmHide_1, FALSE }, /* 4 */ { SW_HIDE, FALSE, 0, WmEmptySeq, FALSE }, -/* 5 */ { SW_SHOWMINIMIZED, FALSE, WS_VISIBLE|WS_MINIMIZE, WmShowMinimized_1, TRUE }, +/* 5 */ { SW_SHOWMINIMIZED, FALSE, WS_VISIBLE|WS_MINIMIZE, WmShowMinimized_1, FALSE }, /* 6 */ { SW_SHOWMINIMIZED, TRUE, WS_VISIBLE|WS_MINIMIZE, WmMinMax_1, FALSE }, /* 7 */ { SW_HIDE, TRUE, WS_MINIMIZE, WmHide_1, FALSE }, /* 8 */ { SW_HIDE, FALSE, WS_MINIMIZE, WmEmptySeq, FALSE }, -/* 9 */ { SW_SHOWMAXIMIZED, FALSE, WS_VISIBLE|WS_MAXIMIZE, WmShowMaximized_1, TRUE }, +/* 9 */ { SW_SHOWMAXIMIZED, FALSE, WS_VISIBLE|WS_MAXIMIZE, WmShowMaximized_1, FALSE }, /* 10 */ { SW_SHOWMAXIMIZED, TRUE, WS_VISIBLE|WS_MAXIMIZE, WmMinMax_2, FALSE }, /* 11 */ { SW_HIDE, TRUE, WS_MAXIMIZE, WmHide_1, FALSE }, /* 12 */ { SW_HIDE, FALSE, WS_MAXIMIZE, WmEmptySeq, FALSE }, @@ -8560,11 +8562,11 @@ static void test_ShowWindow(void) /* 14 */ { SW_SHOWNOACTIVATE, TRUE, WS_VISIBLE, WmEmptySeq, TRUE }, /* 15 */ { SW_HIDE, TRUE, 0, WmHide_2, FALSE }, /* 16 */ { SW_HIDE, FALSE, 0, WmEmptySeq, FALSE }, -/* 17 */ { SW_SHOW, FALSE, WS_VISIBLE, WmShow, TRUE }, +/* 17 */ { SW_SHOW, FALSE, WS_VISIBLE, WmShow, FALSE }, /* 18 */ { SW_SHOW, TRUE, WS_VISIBLE, WmEmptySeq, FALSE }, /* 19 */ { SW_MINIMIZE, TRUE, WS_VISIBLE|WS_MINIMIZE, WmMinimize_1, TRUE }, /* 20 */ { SW_MINIMIZE, TRUE, WS_VISIBLE|WS_MINIMIZE, WmMinMax_3, FALSE }, -/* 21 */ { SW_HIDE, TRUE, WS_MINIMIZE, WmHide_2, TRUE }, +/* 21 */ { SW_HIDE, TRUE, WS_MINIMIZE, WmHide_2, FALSE }, /* 22 */ { SW_SHOWMINNOACTIVE, FALSE, WS_VISIBLE|WS_MINIMIZE, WmShowMinNoActivate, TRUE }, /* 23 */ { SW_SHOWMINNOACTIVE, TRUE, WS_VISIBLE|WS_MINIMIZE, WmMinMax_4, FALSE }, /* 24 */ { SW_HIDE, TRUE, WS_MINIMIZE, WmHide_2, FALSE }, @@ -8573,7 +8575,7 @@ static void test_ShowWindow(void) /* 27 */ { SW_SHOWNA, TRUE, WS_VISIBLE|WS_MINIMIZE, WmShowNA_2, FALSE }, /* 28 */ { SW_HIDE, TRUE, WS_MINIMIZE, WmHide_2, FALSE }, /* 29 */ { SW_HIDE, FALSE, WS_MINIMIZE, WmEmptySeq, FALSE }, -/* 30 */ { SW_RESTORE, FALSE, WS_VISIBLE, WmRestore_1, TRUE }, +/* 30 */ { SW_RESTORE, FALSE, WS_VISIBLE, WmRestore_1, FALSE }, /* 31 */ { SW_RESTORE, TRUE, WS_VISIBLE, WmEmptySeq, TRUE }, /* 32 */ { SW_HIDE, TRUE, 0, WmHide_3, TRUE }, /* 33 */ { SW_HIDE, FALSE, 0, WmEmptySeq, FALSE }, @@ -8598,7 +8600,7 @@ static void test_ShowWindow(void) /* 52 */ { SW_HIDE, TRUE, 0, WmHide_1, FALSE }, /* 53 */ { SW_HIDE, FALSE, 0, WmEmptySeq, FALSE }, /* 54 */ { SW_MINIMIZE, FALSE, WS_VISIBLE|WS_MINIMIZE, WmMinimize_3, TRUE }, -/* 55 */ { SW_HIDE, TRUE, WS_MINIMIZE, WmHide_2, TRUE }, +/* 55 */ { SW_HIDE, TRUE, WS_MINIMIZE, WmHide_2, FALSE }, /* 56 */ { SW_SHOWNOACTIVATE, FALSE, WS_VISIBLE, WmShowNoActivate_2, TRUE }, /* 57 */ { SW_SHOW, TRUE, WS_VISIBLE, WmEmptySeq, FALSE } };

1 0

Alexandre Julliard : configure: Added a generic macro for checking for Mingw programs.
by Alexandre Julliard 02 Jan '07

02 Jan '07

Module: wine Branch: master Commit: eae0dc23abed151196bc1488608bc1a96b289a00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eae0dc23abed151196bc14886… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 1 13:14:21 2007 +0100 configure: Added a generic macro for checking for Mingw programs. --- aclocal.m4 | 12 ++++++++++++ configure.ac | 6 +++--- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index 82fb19d..32163fb 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -131,6 +131,18 @@ else fi rm -f conf$$ conf$$.file]) +dnl **** Check for a mingw program, trying the various mingw prefixes **** +dnl +dnl Usage: WINE_CHECK_MINGW_PROG(variable,prog,[value-if-not-found],[path]) +dnl +AC_DEFUN([WINE_CHECK_MINGW_PROG], +[AC_CHECK_PROGS([$1], + m4_foreach([ac_wine_prefix], + [i586-mingw32msvc, i386-mingw32msvc, i386-mingw32, mingw32, mingw], + [ac_wine_prefix-$2 ]), + [$3],[$4])]) + + dnl **** Create nonexistent directories from config.status **** dnl dnl Usage: WINE_CONFIG_EXTRA_DIR(dirname) diff --git a/configure.ac b/configure.ac index d56250f..92552d3 100644 --- a/configure.ac +++ b/configure.ac @@ -1101,9 +1101,9 @@ case $host_os in AC_SUBST(CROSSTEST,"") if test "$cross_compiling" = "no" then - AC_CHECK_PROGS(CROSSCC,i586-mingw32msvc-gcc i386-mingw32msvc-gcc i386-mingw32-gcc mingw32-gcc mingw-gcc,false) - AC_CHECK_PROGS(DLLTOOL,i586-mingw32msvc-dlltool i386-mingw32msvc-dlltool i386-mingw32-dlltool mingw32-dlltool mingw-dlltool,false) - AC_CHECK_PROGS(CROSSWINDRES,i586-mingw32msvc-windres i386-mingw32msvc-windres i386-mingw32-windres mingw32-windres mingw-windres,false) + WINE_CHECK_MINGW_PROG(CROSSCC,gcc,false) + WINE_CHECK_MINGW_PROG(DLLTOOL,dlltool,false) + WINE_CHECK_MINGW_PROG(CROSSWINDRES,windres,false) if test "$CROSSCC" != "false"; then CROSSTEST="\$(CROSSTEST)"; fi fi ;;

1 0

appdb/ include/note.php tables/appdb_tables.sql
by WineHQ 02 Jan '07

02 Jan '07

ChangeSet ID: 30846 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/01/01 22:44:27 Modified files: include : note.php tables : appdb_tables.sql Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Fix the note deletion mail so it displays the information it is supposed to. Patch: http://cvs.winehq.org/patch.py?id=30846 Old revision New revision Changes Path 1.19 1.20 +11 -5 appdb/include/note.php 1.26 1.27 +2 -0 appdb/tables/appdb_tables.sql Index: appdb/include/note.php diff -u -p appdb/include/note.php:1.19 appdb/include/note.php:1.20 --- appdb/include/note.php:1.19 2 Jan 2007 4:44:27 -0000 +++ appdb/include/note.php 2 Jan 2007 4:44:27 -0000 @@ -22,6 +22,8 @@ class Note { var $iVersionId; var $sTitle; var $sDescription; + var $iSubmitterId; + var $sSubmitTime; /** * Constructor. @@ -44,6 +46,8 @@ class Note { $this->iVersionId = $oRow->versionId; $this->sTitle = $oRow->noteTitle; $this->sDescription = $oRow->noteDesc; + $this->sSubmitTime = $oRow->submitTime; + $this->iSubmitterId = $oRow->submitterId; } } } @@ -56,9 +60,9 @@ class Note { */ function create() { - $hResult = query_parameters("INSERT INTO appNotes (versionId, noteTitle, noteDesc) ". - "VALUES('?', '?', '?')", - $this->iVersionId, $this->sTitle, $this->sDescription); + $hResult = query_parameters("INSERT INTO appNotes (versionId, noteTitle, noteDesc, submitterId) ". + "VALUES('?', '?', '?', '?')", + $this->iVersionId, $this->sTitle, $this->sDescription, $_SESSION['current']->iUserId); if($hResult) { @@ -152,12 +156,14 @@ class Note { addmsg("Note modified.", "green"); break; case "delete": + $oSubmitter = new User($this->iSubmitterId); $sSubject = "Note ".$this->sTitle." for ".$sAppName." has been deleted by ".$_SESSION['current']->sRealname; - $sMsg .= "This note was made on ".substr($this->sDateCreated,0,10)." by ".$this->oOwner->sRealname."\n"; + $sMsg .= "This note was made on ".print_date(mysqltimestamp_to_unixtimestamp($this->sSubmitTime))." by ".$oSubmitter->sRealname."\n"; $sMsg .= "\n"; $sMsg .= "Subject: ".$this->sTitle."\n"; $sMsg .= "\n"; - $sMsg .= $this->sBody."\n"; + $sMsg .= "Note contents:\n"; + $sMsg .= $this->sDescription."\n"; $sMsg .= "\n"; $sMsg .= "Because:\n"; if($aClean['sReplyText']) Index: appdb/tables/appdb_tables.sql diff -u -p appdb/tables/appdb_tables.sql:1.26 appdb/tables/appdb_tables.sql:1.27 --- appdb/tables/appdb_tables.sql:1.26 2 Jan 2007 4:44:27 -0000 +++ appdb/tables/appdb_tables.sql 2 Jan 2007 4:44:27 -0000 @@ -168,6 +168,8 @@ create table appNotes ( noteTitle varchar(255), noteDesc text, versionId int not null, + submitterId int not null, + submitTime timestamp not null, key(noteId) );

1 0