wine-commits October 2009

wine-commits@winehq.org

3 participants
1207 discussions

Alexandre Julliard : kernel32: Make GetQueuedCompletionStatus return failure for I/O errors, as per MSDN.
by Alexandre Julliard 28 Oct '09

28 Oct '09

Module: wine Branch: master Commit: e487b560d9a54a5f21274ca5722bb2b268b9424e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e487b560d9a54a5f21274ca57… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 27 16:52:35 2009 +0100 kernel32: Make GetQueuedCompletionStatus return failure for I/O errors, as per MSDN. --- dlls/kernel32/sync.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c index be73c98..8330d4a 100644 --- a/dlls/kernel32/sync.c +++ b/dlls/kernel32/sync.c @@ -2127,7 +2127,9 @@ BOOL WINAPI GetQueuedCompletionStatus( HANDLE CompletionPort, LPDWORD lpNumberOf if (status == STATUS_SUCCESS) { *lpNumberOfBytesTransferred = iosb.Information; - return TRUE; + if (iosb.u.Status >= 0) return TRUE; + SetLastError( RtlNtStatusToDosError(iosb.u.Status) ); + return FALSE; } if (status == STATUS_TIMEOUT) SetLastError( WAIT_TIMEOUT );

1 0

Alexander Nicolaysen Sørnes : Use objectManager to show 'Comments Management' page
by Alexander Nicolaysen Sørnes 28 Oct '09

28 Oct '09

Module: appdb Branch: master Commit: 0b8e7c97fe4b0a4f97734c98fab6aa464d972809 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=0b8e7c97fe4b0a4f97734c98… Author: Alexander Nicolaysen Sørnes <alexander(a)linux-xqqm.(none)> Date: Tue Oct 27 23:25:26 2009 +0100 Use objectManager to show 'Comments Management' page --- admin/adminCommentView.php | 73 ------------------------------------------- include/comment.php | 74 ++++++++++++++++++++++++++++++++++++++++++++ include/sidebar_admin.php | 2 +- 3 files changed, 75 insertions(+), 74 deletions(-) diff --git a/admin/adminCommentView.php b/admin/adminCommentView.php deleted file mode 100644 index 13f5929..0000000 --- a/admin/adminCommentView.php +++ /dev/null @@ -1,73 +0,0 @@ -<?php -/************************************************************/ -/* Page for managing all of the comments in the apidb */ -/* Without having go into each application version to do so */ -/************************************************************/ - -require("path.php"); -require(BASE."include/incl.php"); - -apidb_header("Comments"); - -/* display a range of 10 pages */ -$pageRange = 10; - -$ItemsPerPage = isset($aClean['iItemsPerPage']) ? $aClean['iItemsPerPage'] : 10; -$currentPage = isset($aClean['iPage']) ? $aClean['iPage'] : 1; - -$totalPages = ceil(getNumberOfComments()/$ItemsPerPage); - -if($ItemsPerPage > 100) $ItemsPerPage = 100; - - -/* display page selection links */ -echo "<center>"; -echo "<b>Page $currentPage of $totalPages</b><br>"; -display_page_range($currentPage, $pageRange, $totalPages, $_SERVER['PHP_SELF']."?iItemsPerPage=".$ItemsPerPage); -echo "<br>"; -echo "<br>"; - -/* display the option to choose how many comments per-page to display */ -echo "<form method=\"get\" name=\"sMessage\" action=\"".$_SERVER['PHP_SELF']."\">"; -echo "<b>Number of comments per page:</b>"; -echo " <select name='iItemsPerPage'>"; - -$ItemsPerPageArray = array(10, 20, 50, 100, 500); -foreach($ItemsPerPageArray as $i => $value) -{ - if($ItemsPerPageArray[$i] == $ItemsPerPage) - echo "<option value='$ItemsPerPageArray[$i]' SELECTED>$ItemsPerPageArray[$i]"; - else - echo "<option value='$ItemsPerPageArray[$i]'>$ItemsPerPageArray[$i]"; -} -echo "</select>"; - -echo "<input type=hidden name=iPage value=$currentPage>"; -echo " <input type=submit value='Refresh'>"; -echo "</form>"; - -echo "</center>"; - -/* query for all of the commentId's, ordering by their time in reverse order */ -$offset = (($currentPage-1) * $ItemsPerPage); -$commentIds = query_parameters("SELECT commentId from appComments ORDER BY ". - "appComments.time ASC LIMIT ?, ?", $offset, $ItemsPerPage); -while ($oRow = query_fetch_object($commentIds)) -{ - $sQuery = "SELECT from_unixtime(unix_timestamp(time), \"%W %M %D %Y, %k:%i\") as time, ". - "commentId, parentId, versionId, userid, subject, body ". - "FROM appComments WHERE commentId = '?'"; - $hResult = query_parameters($sQuery, $oRow->commentId); - /* call view_app_comment to display the comment */ - $oComment_row = query_fetch_object($hResult); - Comment::view_app_comment($oComment_row, true); -} - -/* display page selection links */ - -echo "<center>"; -display_page_range($currentPage, $pageRange, $totalPages, $_SERVER['PHP_SELF']."?iItemsPerPage=".$ItemsPerPage); -echo "</center>"; - -apidb_footer(); -?> diff --git a/include/comment.php b/include/comment.php index a999e41..a890ec3 100644 --- a/include/comment.php +++ b/include/comment.php @@ -296,6 +296,80 @@ class Comment { echo html_frame_end(); } + public function objectWantCustomDraw($sWhat, $sQueued) + { + switch($sWhat) + { + case 'table': + return true; + } + + return false; + } + + public static function objectGetEntries($sState, $iNumRows = 0, $iStart = 0, $sOrderBy = 'commentId') + { + $sLimit = ''; + + if($iNumRows) + { + $iStart = mysql_real_escape_string($iStart); + $iNumRows = mysql_real_escape_string($iNumRows); + $sLimit = " LIMIT $iStart,$iNumRows"; + } + + if($sOrderBy) + $sOrderBy = " ORDER BY ".mysql_real_escape_string($sOrderBy); + + $hResult = query_parameters("SELECT * FROM appComments$sOrderBy$sLimit"); + + return $hResult; + } + + public function objectGetDefaultSort() + { + return 'commentId'; + } + + public static function objectGetEntriesCount($sState) + { + $hResult = query_parameters("SELECT COUNT(commentId) as count FROM appComments"); + + if(!$hResult) + return null; + + $oRow = mysql_fetch_object($hResult); + + return $oRow->count; + } + + public function objectGetItemsPerPage() + { + $aItemsPerPage = array(10, 20, 50, 100, 500); + $iDefaultPerPage = 10; + + return array($aItemsPerPage, $iDefaultPerPage); + } + + public function objectDrawCustomTable($hResult, $sQueued) + { + while($oRow = mysql_fetch_object($hResult)) + comment::view_app_comment($oRow, true); + } + + public function objectGetHeader() + { + return new TableRow(); + } + + public function objectGetTableRow() + { + $oTableRow = new TableRow(); + $oOMRow = new OMTableRow($oTableRow); + + return $oOMRow; + } + function display() { $this->output_comment(); diff --git a/include/sidebar_admin.php b/include/sidebar_admin.php index c06864e..746470d 100644 --- a/include/sidebar_admin.php +++ b/include/sidebar_admin.php @@ -39,7 +39,7 @@ function global_admin_menu() { BASE."objectManager.php?sClass=testData&sTitle=". "View%20Test%20Results"); $g->add("Users Management", BASE."admin/adminUsers.php"); - $g->add("Comments Management", BASE."admin/adminCommentView.php"); + $g->add('Comments Management', BASE.'objectManager.php?sClass=comment'); $g->add("Screenshots Management", BASE."admin/adminScreenshots.php"); $g->addmisc(" ");

1 0

Alexander Nicolaysen Sørnes : appBundle: Add apps using 'Add' button instead of single-click
by Alexander Nicolaysen Sørnes 28 Oct '09

28 Oct '09

Module: appdb Branch: master Commit: f9e50695d185db22cb0532d61212275ef9ea6aba URL: http://source.winehq.org/git/appdb.git/?a=commit;h=f9e50695d185db22cb0532d6… Author: Alexander Nicolaysen Sørnes <alexander(a)linux-xqqm.(none)> Date: Tue Oct 27 22:01:45 2009 +0100 appBundle: Add apps using 'Add' button instead of single-click --- admin/editBundle.php | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/admin/editBundle.php b/admin/editBundle.php index 68e5318..bbe38b7 100644 --- a/admin/editBundle.php +++ b/admin/editBundle.php @@ -10,7 +10,7 @@ function build_app_list() { $hResult = application::objectGetEntries('accepted'); - echo "<select name=iAppId size=5 onChange='this.form.submit()'>\n"; + echo "<select name=iAppId size=5'>\n"; while($oRow = query_fetch_object($hResult)) { echo "<option value=$oRow->appId>$oRow->appName</option>\n"; @@ -95,12 +95,13 @@ echo html_frame_end(); echo "<form method=post action=editBundle.php>\n"; -echo html_frame_start("Application List (double click to add)","",'',2); +echo html_frame_start("Application list","",'',2); build_app_list(); echo html_frame_end(); echo "<input type=\"hidden\" name=\"iBundleId\" value=\"".$aClean['iBundleId']."\">\n"; echo "<input type=\"hidden\" name=\"sCmd\" value=\"add\">\n"; +echo "<input type=\"submit\" value=\"Add\" />\n"; echo "</form>\n"; apidb_footer();

1 0

Alexander Nicolaysen Sørnes : appBundle: Improve on-screen message when adding an app to a bundle
by Alexander Nicolaysen Sørnes 28 Oct '09

28 Oct '09

Module: appdb Branch: master Commit: 15e3155c6cd8d3b69d0261d239faa9f8551f165f URL: http://source.winehq.org/git/appdb.git/?a=commit;h=15e3155c6cd8d3b69d0261d2… Author: Alexander Nicolaysen Sørnes <alexander(a)linux-xqqm.(none)> Date: Tue Oct 27 21:53:38 2009 +0100 appBundle: Improve on-screen message when adding an app to a bundle --- admin/editBundle.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/admin/editBundle.php b/admin/editBundle.php index adb0ec1..68e5318 100644 --- a/admin/editBundle.php +++ b/admin/editBundle.php @@ -41,7 +41,7 @@ if($aClean['sCmd']) $aClean['iBundleId'], $aClean['iAppId']); if($hResult) - addmsg("App $appId added to Bundle".$aClean['iBundleId'], "green"); + addmsg("{$oApp->sName} added to bundle {$aClean['iBundleId']}", 'green'); } else { addmsg("{$oApp->sName} is already in the bundle", 'red');

1 0

Alexander Nicolaysen Sørnes : appBundle: Don't allow apps to be added more than once to a given bundle
by Alexander Nicolaysen Sørnes 28 Oct '09

28 Oct '09

Module: appdb Branch: master Commit: 7aa0f3e59cd8c0678e40700db8ba64107cb72517 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=7aa0f3e59cd8c0678e40700d… Author: Alexander Nicolaysen Sørnes <alexander(a)linux-xqqm.(none)> Date: Tue Oct 27 21:45:33 2009 +0100 appBundle: Don't allow apps to be added more than once to a given bundle --- admin/editBundle.php | 21 +++++++++++++++------ 1 files changed, 15 insertions(+), 6 deletions(-) diff --git a/admin/editBundle.php b/admin/editBundle.php index 8243d5c..adb0ec1 100644 --- a/admin/editBundle.php +++ b/admin/editBundle.php @@ -31,12 +31,21 @@ if($aClean['sCmd']) } if($aClean['sCmd'] == "add") { - $hResult = query_parameters("INSERT INTO appBundle (bundleId, appId) VALUES". - "('?', '?')", - $aClean['iBundleId'], - $aClean['iAppId']); - if($hResult) - addmsg("App $appId added to Bundle".$aClean['iBundleId'], "green"); + $oApp = new application($aClean['iAppId']); + /* Check that the app hasn't already been added */ + $hResult = query_parameters("SELECT * FROM appBundle WHERE bundleId = '?' AND appId = '?'", $aClean['iBundleId'], $aClean['iAppId']); + if($hResult && mysql_num_rows($hResult) == 0) + { + $hResult = query_parameters("INSERT INTO appBundle (bundleId, appId) VALUES". + "('?', '?')", + $aClean['iBundleId'], + $aClean['iAppId']); + if($hResult) + addmsg("App $appId added to Bundle".$aClean['iBundleId'], "green"); + } else + { + addmsg("{$oApp->sName} is already in the bundle", 'red'); + } } }

1 0

Alexander Nicolaysen Sørnes : appBundle: Don't show deleted apps as part of bundle when editing
by Alexander Nicolaysen Sørnes 28 Oct '09

28 Oct '09

Module: appdb Branch: master Commit: 03bdcfd585ac9ad8e4c14942a05e3b1225391838 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=03bdcfd585ac9ad8e4c14942… Author: Alexander Nicolaysen Sørnes <alexander(a)linux-xqqm.(none)> Date: Tue Oct 27 21:37:42 2009 +0100 appBundle: Don't show deleted apps as part of bundle when editing --- admin/editBundle.php | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/admin/editBundle.php b/admin/editBundle.php index 03ac946..8243d5c 100644 --- a/admin/editBundle.php +++ b/admin/editBundle.php @@ -44,7 +44,8 @@ if($aClean['sCmd']) apidb_header("Edit Application Bundle"); $hResult = query_parameters("SELECT bundleId, appBundle.appId, appName FROM appBundle, appFamily ". - "WHERE bundleId = '?' AND appFamily.appId = appBundle.appId", + "WHERE bundleId = '?' AND appFamily.appId = appBundle.appId + AND appFamily.state != 'deleted'", $aClean['iBundleId']); echo html_frame_start("Apps in this Bundle","300",'',0);

1 0

Alexander Nicolaysen Sørnes : vendor: Ignore deleted entries when checking for duplicates
by Alexander Nicolaysen Sørnes 28 Oct '09

28 Oct '09

Module: appdb Branch: master Commit: f852373d168fd7674971c43fdcfff07740b358a0 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=f852373d168fd7674971c43f… Author: Alexander Nicolaysen Sørnes <alexander(a)linux-xqqm.(none)> Date: Tue Oct 27 21:06:59 2009 +0100 vendor: Ignore deleted entries when checking for duplicates --- include/vendor.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/vendor.php b/include/vendor.php index 6242978..e808215 100644 --- a/include/vendor.php +++ b/include/vendor.php @@ -68,7 +68,7 @@ class Vendor { function create() { /* Check for duplicates */ - $hResult = query_parameters("SELECT * FROM vendor WHERE vendorName = '?'", + $hResult = query_parameters("SELECT * FROM vendor WHERE vendorName = '?' AND state != 'deleted'", $this->sName); if($hResult && $oRow = query_fetch_object($hResult)) {

1 0

Nate Gallaher : msi: Test that a query on a join of two tables returns data from the correct table .
by Alexandre Julliard 27 Oct '09

27 Oct '09

Module: wine Branch: master Commit: 07c321ba73bf7d01501668ca4af681843b98de9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=07c321ba73bf7d01501668ca4… Author: Nate Gallaher <ngallaher(a)deepthought.org> Date: Sun Oct 18 12:47:02 2009 -0400 msi: Test that a query on a join of two tables returns data from the correct table. --- dlls/msi/tests/db.c | 96 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 96 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index bfaba17..19cd74c 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -1566,6 +1566,101 @@ static void test_binary(void) DeleteFile( msifile ); } +static void test_where_not_in_selected(void) +{ + MSIHANDLE hdb = 0, rec, view; + LPCSTR query; + UINT r; + + hdb = create_db(); + ok( hdb, "failed to create db\n"); + + r = run_query(hdb, 0, + "CREATE TABLE `IESTable` (" + "`Action` CHAR(64), " + "`Condition` CHAR(64), " + "`Sequence` LONG PRIMARY KEY `Sequence`)"); + ok( r == S_OK, "Cannot create IESTable table: %d\n", r); + + r = run_query(hdb, 0, + "CREATE TABLE `CATable` (" + "`Action` CHAR(64), " + "`Type` LONG PRIMARY KEY `Type`)"); + ok( r == S_OK, "Cannot create CATable table: %d\n", r); + + r = run_query(hdb, 0, "INSERT INTO `IESTable` " + "( `Action`, `Condition`, `Sequence`) " + "VALUES ( 'clean', 'cond4', 4)"); + ok( r == S_OK, "cannot add entry to IESTable table:%d\n", r ); + + r = run_query(hdb, 0, "INSERT INTO `IESTable` " + "( `Action`, `Condition`, `Sequence`) " + "VALUES ( 'depends', 'cond1', 1)"); + ok( r == S_OK, "cannot add entry to IESTable table:%d\n", r ); + + r = run_query(hdb, 0, "INSERT INTO `IESTable` " + "( `Action`, `Condition`, `Sequence`) " + "VALUES ( 'build', 'cond2', 2)"); + ok( r == S_OK, "cannot add entry to IESTable table:%d\n", r ); + + r = run_query(hdb, 0, "INSERT INTO `IESTable` " + "( `Action`, `Condition`, `Sequence`) " + "VALUES ( 'build2', 'cond6', 6)"); + ok( r == S_OK, "cannot add entry to IESTable table:%d\n", r ); + + r = run_query(hdb, 0, "INSERT INTO `IESTable` " + "( `Action`, `Condition`, `Sequence`) " + "VALUES ( 'build', 'cond3', 3)"); + ok(r == S_OK, "cannot add entry to IESTable table:%d\n", r ); + + r = run_query(hdb, 0, "INSERT INTO `CATable` " + "( `Action`, `Type` ) " + "VALUES ( 'build', 32)"); + ok(r == S_OK, "cannot add entry to CATable table:%d\n", r ); + + r = run_query(hdb, 0, "INSERT INTO `CATable` " + "( `Action`, `Type` ) " + "VALUES ( 'depends', 64)"); + ok(r == S_OK, "cannot add entry to CATable table:%d\n", r ); + + r = run_query(hdb, 0, "INSERT INTO `CATable` " + "( `Action`, `Type` ) " + "VALUES ( 'clean', 63)"); + ok(r == S_OK, "cannot add entry to CATable table:%d\n", r ); + + r = run_query(hdb, 0, "INSERT INTO `CATable` " + "( `Action`, `Type` ) " + "VALUES ( 'build2', 34)"); + ok(r == S_OK, "cannot add entry to CATable table:%d\n", r ); + query = "Select IESTable.Condition from CATable, IESTable where " + "CATable.Action = IESTable.Action and CATable.Type = 32"; + r = MsiDatabaseOpenView(hdb, query, &view); + ok( r == ERROR_SUCCESS, "failed to open view: %d\n", r ); + + r = MsiViewExecute(view, 0); + ok( r == ERROR_SUCCESS, "failed to execute view: %d\n", r ); + + r = MsiViewFetch(view, &rec); + ok( r == ERROR_SUCCESS, "failed to fetch view: %d\n", r ); + + ok( check_record( rec, 1, "cond2"), "wrong condition\n"); + + MsiCloseHandle( rec ); + r = MsiViewFetch(view, &rec); + ok( r == ERROR_SUCCESS, "failed to fetch view: %d\n", r ); + + ok( check_record( rec, 1, "cond3"), "wrong condition\n"); + + MsiCloseHandle( rec ); + MsiViewClose(view); + MsiCloseHandle(view); + + MsiCloseHandle( hdb ); + DeleteFile(msifile); + +} + + static void test_where(void) { MSIHANDLE hdb = 0, rec, view; @@ -8450,6 +8545,7 @@ START_TEST(db) test_longstrings(); test_streamtable(); test_binary(); + test_where_not_in_selected(); test_where(); test_msiimport(); test_binary_import();

1 0

Nate Gallaher : msi: Add tablename tracking to VIEW_find_column.
by Alexandre Julliard 27 Oct '09

27 Oct '09

Module: wine Branch: master Commit: cc366e12829a20570b3d2e3cc508a8c861c722cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc366e12829a20570b3d2e3cc… Author: Nate Gallaher <ngallaher(a)deepthought.org> Date: Sun Oct 18 12:41:41 2009 -0400 msi: Add tablename tracking to VIEW_find_column. This fixes the bug where multiple columns of the same name, but different tables are members of a join. Any attempt to refer to these columns will resolve to the first available column with that name, irregardless of any tablename modifier. --- dlls/msi/alter.c | 5 +++-- dlls/msi/create.c | 5 +++-- dlls/msi/delete.c | 7 ++++--- dlls/msi/distinct.c | 7 ++++--- dlls/msi/insert.c | 19 +++++++++++-------- dlls/msi/join.c | 8 +++++--- dlls/msi/msipriv.h | 8 ++++---- dlls/msi/msiquery.c | 14 ++++++++++---- dlls/msi/query.h | 8 +++++++- dlls/msi/select.c | 11 ++++++----- dlls/msi/sql.y | 3 ++- dlls/msi/storages.c | 6 ++++-- dlls/msi/streams.c | 6 ++++-- dlls/msi/table.c | 13 +++++++++++-- dlls/msi/update.c | 7 ++++--- dlls/msi/where.c | 15 +++++++++------ 16 files changed, 91 insertions(+), 51 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cc366e12829a20570b3d2…

1 0

Matteo Bruni : d3dx9: Add D3DXAssembleShader tests.
by Alexandre Julliard 27 Oct '09

27 Oct '09

Module: wine Branch: master Commit: c6af1f5cd4abffd37a1fb8a3fd17abdf6b879d26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6af1f5cd4abffd37a1fb8a3f… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Wed Sep 16 00:41:33 2009 +0200 d3dx9: Add D3DXAssembleShader tests. --- dlls/d3dx9_36/tests/Makefile.in | 1 + dlls/d3dx9_36/tests/asm.c | 1409 +++++++++++++++++++++++++++++++++++++++ dlls/d3dx9_36/tests/res.vsh | 2 + dlls/d3dx9_36/tests/resources.h | 2 + dlls/d3dx9_36/tests/rsrc.rc | 3 + 5 files changed, 1417 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c6af1f5cd4abffd37a1fb…

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