November 2009 - Wine-Commits

Alexander Nicolaysen Sørnes : testData: Allow users to only show entries for unmaintained versions
by Alexander Nicolaysen Sørnes Nov. 12, 2009

Nov. 12, 2009

Module: appdb Branch: master Commit: abb82efe505decb39f16f99af50b8bcd542f1c89 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=abb82efe505decb39f16f99a… Author: Alexander Nicolaysen Sørnes <alexander(a)linux-xqqm.(none)> Date: Thu Nov 12 17:34:39 2009 +0100 testData: Allow users to only show entries for unmaintained versions --- include/testData.php | 53 ++++++++++++++++++++++++++++++++++---------- include/testData_queue.php | 13 +++++++--- 2 files changed, 50 insertions(+), 16 deletions(-) diff --git a/include/testData.php b/include/testData.php index 33661b1..19007d6 100644 --- a/include/testData.php +++ b/include/testData.php @@ -1171,8 +1171,26 @@ class testData{ return $oRow->cnt; } - function objectGetEntriesCount($sState) + public function objectGetFilterInfo() { + $oFilter = new FilterInterface(); + $oFilter->AddFilterInfo('onlyWithoutMaintainers', 'Only show test data for versions without maintainers', array(FILTER_OPTION_BOOL), FILTER_VALUES_OPTION_BOOL, array('false','true')); + return $oFilter; + } + + function objectGetEntriesCount($sState, $oFilters = null) + { + $sExtraTables = ''; + $aOptions = $oFilters ? $oFilters->getOptions() : array('onlyWithoutMaintainers' => 'false'); + $sWhereFilter = ''; + + if($aOptions['onlyWithoutMaintainers'] == 'true') + { + $sExtraTables = ',appVersion'; + + $sWhereFilter .= " AND appVersion.hasMaintainer = 'false' AND appVersion.versionId = testResults.versionId"; + } + $oTest = new testData(); if($sState != 'accepted' && !$oTest->canEdit()) @@ -1180,10 +1198,10 @@ class testData{ if($sState == 'rejected') { $sQuery = "SELECT COUNT(testingId) AS count FROM - testResults WHERE + testResults$sExtraTables WHERE testResults.submitterId = '?' AND - testResults.state = '?'"; + testResults.state = '?'$sWhereFilter"; } else { $sQuery = "SELECT COUNT(testingId) AS count FROM @@ -1208,15 +1226,15 @@ class testData{ ) ) AND - testResults.state = '?'"; + testResults.state = '?'$sWhereFilter"; } $hResult = query_parameters($sQuery, $_SESSION['current']->iUserId, $sState); } else { - $sQuery = "SELECT COUNT(testingId) as count FROM testResults WHERE - testResults.state = '?'"; + $sQuery = "SELECT COUNT(testingId) as count FROM testResults$sExtraTables WHERE + testResults.state = '?'$sWhereFilter"; $hResult = query_parameters($sQuery, $sState); } @@ -1234,8 +1252,19 @@ class testData{ return 'testingId'; } - function objectGetEntries($sState, $iRows = 0, $iStart = 0, $sOrderBy = "testingId", $bAscending = true) + function objectGetEntries($sState, $iRows = 0, $iStart = 0, $sOrderBy = "testingId", $bAscending = true, $oFilters = null) { + $sExtraTables = ''; + $aOptions = $oFilters ? $oFilters->getOptions() : array('onlyWithoutMaintainers' => 'false'); + $sWhereFilter = ''; + + if($aOptions['onlyWithoutMaintainers'] == 'true') + { + $sExtraTables = ',appVersion'; + + $sWhereFilter .= " AND appVersion.hasMaintainer = 'false' AND appVersion.versionId = testResults.versionId"; + } + $oTest = new testData(); $sLimit = ""; @@ -1255,10 +1284,10 @@ class testData{ { if($sState == 'rejected') { - $sQuery = "SELECT testResults.* FROM testResults WHERE + $sQuery = "SELECT testResults.* FROM testResults$sExtraTables WHERE testResults.submitterId = '?' AND - testResults.state = '?' ORDER BY ?$sLimit"; + testResults.state = '?'$sWhereFilter ORDER BY ?$sLimit"; } else { $sQuery = "SELECT testResults.* FROM testResults, appVersion, @@ -1283,7 +1312,7 @@ class testData{ AND appMaintainers.state = 'accepted' AND - testResults.state = '?' ORDER BY ?$sLimit"; + testResults.state = '?'$sWhereFilter ORDER BY ?$sLimit"; } if($sLimit) { @@ -1296,8 +1325,8 @@ class testData{ } } else { - $sQuery = "SELECT testResults.* FROM testResults WHERE - testResults.state = '?' ORDER by ?$sLimit"; + $sQuery = "SELECT testResults.* FROM testResults$sExtraTables WHERE + testResults.state = '?'$sWhereFilter ORDER by ?$sLimit"; if($sLimit) $hResult = query_parameters($sQuery, $sState, $sOrderBy, $iStart, $iRows); else diff --git a/include/testData_queue.php b/include/testData_queue.php index fcc5992..0877535 100644 --- a/include/testData_queue.php +++ b/include/testData_queue.php @@ -147,14 +147,19 @@ class testData_queue return testData::objectGetDefaultSort(); } - function objectGetEntries($sState, $iRows = 0, $iStart = 0, $sOrderBy = "testingId", $bAscending = true) + public function objectGetFilterInfo() { - return $this->oTestData->objectGetEntries($sState, $iRows, $iStart, $sOrderBy, $bAscending); + return testData::objectGetFilterInfo(); } - function objectGetEntriesCount($sState) + function objectGetEntries($sState, $iRows = 0, $iStart = 0, $sOrderBy = "testingId", $bAscending = true, $oFilters = null) { - return testData::objectGetEntriesCount($sState); + return $this->oTestData->objectGetEntries($sState, $iRows, $iStart, $sOrderBy, $bAscending, $oFilters); + } + + function objectGetEntriesCount($sState, $oFilters = null) + { + return testData::objectGetEntriesCount($sState, $oFilters); } function objectGetHeader()

1 0

Alexander Nicolaysen Sørnes : Comments Management: Show whether the versions are maintained
by Alexander Nicolaysen Sørnes Nov. 12, 2009

Nov. 12, 2009

Module: appdb Branch: master Commit: 24e0202de791c553f39c506b7b0fb47ec038b651 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=24e0202de791c553f39c506b… Author: Alexander Nicolaysen Sørnes <alexander(a)linux-xqqm.(none)> Date: Thu Nov 12 17:51:47 2009 +0100 Comments Management: Show whether the versions are maintained --- include/comment.php | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/include/comment.php b/include/comment.php index a890ec3..a4732f7 100644 --- a/include/comment.php +++ b/include/comment.php @@ -258,7 +258,12 @@ class Comment { echo " ".$this->sSubject." \n"; if($bShowAppName) - echo 'Application: ' . version::fullNameLink($this->iVersionId) . " \n"; + { + $oVersion = new version($this->iVersionId); + $sMaintainerText = $oVersion->bHasMaintainer ? 'has maintainer' : 'no maintainers'; + echo 'Application: ' . version::fullNameLink($this->iVersionId); + echo " ($sMaintainerText) \n"; + } echo " by ".forum_lookup_user($this->oOwner->iUserId)." on ".$this->sDateCreated." \n"; echo "</td></tr><tr><td>\n";

1 0

Alexander Nicolaysen Sørnes : testData: Use a versions cached maintainer state instead of querying DB in objectGetTableRow ()
by Alexander Nicolaysen Sørnes Nov. 12, 2009

Nov. 12, 2009

Module: appdb Branch: master Commit: da19094389afaefe672cd260d569c8bd35eb5a68 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=da19094389afaefe672cd260… Author: Alexander Nicolaysen Sørnes <alexander(a)linux-xqqm.(none)> Date: Thu Nov 12 17:35:52 2009 +0100 testData: Use a versions cached maintainer state instead of querying DB in objectGetTableRow() --- include/testData.php | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/include/testData.php b/include/testData.php index 19007d6..1a6762f 100644 --- a/include/testData.php +++ b/include/testData.php @@ -1358,8 +1358,7 @@ class testData{ $oApp = new application($oVersion->iAppId); $oUser = new user($this->iSubmitterId); - $hMaintainers = maintainer::getMaintainersForAppIdVersionId(null, $this->iVersionId); - $bHasMaintainer = (query_num_rows($hMaintainers) == 0) ? false : true; + $bHasMaintainer = $oVersion->bHasMaintainer; $oTableRow = new TableRow(); $oTableRow->AddCell(new TableCell(print_date(mysqldatetime_to_unixtimestamp($this->sSubmitTime))));

1 0

Alexander Nicolaysen Sørnes : Cache whether a version as a maintainer
by Alexander Nicolaysen Sørnes Nov. 12, 2009

Nov. 12, 2009

Module: appdb Branch: master Commit: 6b51c62a3f022fe139ae6648b7acbdc46967d82e URL: http://source.winehq.org/git/appdb.git/?a=commit;h=6b51c62a3f022fe139ae6648… Author: Alexander Nicolaysen Sørnes <alexander(a)linux-xqqm.(none)> Date: Thu Nov 12 00:36:48 2009 +0100 Cache whether a version as a maintainer --- include/maintainer.php | 44 +++++++++++++++++++++++++++++++++++++++----- include/version.php | 9 +++++++++ tables/appdb_tables.sql | 1 + 3 files changed, 49 insertions(+), 5 deletions(-) diff --git a/include/maintainer.php b/include/maintainer.php index 9285f8f..3741264 100644 --- a/include/maintainer.php +++ b/include/maintainer.php @@ -230,7 +230,7 @@ class maintainer $this->iMaintainerId = query_appdb_insert_id(); if(!$this->mustBeQueued()) - $this->updateAppMaintainerState(); + $this->updateMaintainerState(); /* If this is a non-queued maintainer submission, remove the user's non- super maintainer entries for the application's versions. This check is @@ -260,7 +260,7 @@ class maintainer { $sStatusMessage = "The maintainer was successfully added into the database\n"; - $this->updateAppMaintainerState(); + $this->updateMaintainerState(); //Send Status Email $sEmail = $oUser->sEmail; @@ -353,7 +353,7 @@ class maintainer if(!$hResult) return FALSE; - $this->updateAppMaintainerState(); + $this->updateMaintainerState(); return TRUE; } @@ -424,12 +424,33 @@ class maintainer return $hResult; } - public function updateAppMaintainerState() + public function updateMaintainerState() { - $oApp = new application($this->iAppId); + if($this->bSuperMaintainer) + { + $this->updateAppMaintainerState($this->iAppId); + $oApp = new application($this->iAppId); + $aVersions = $oApp->objectGetChildrenClassSpecific('version'); + foreach($aVersions as $oVersion) + $this->updateVersionMaintainerState($oVersion->objectGetId()); + } else + { + $this->updateVersionMaintainerState($this->iVersionId); + } + } + + public function updateAppMaintainerState($iAppId) + { + $oApp = new application($iAppId); $oApp->updateMaintainerState(); } + public function updateVersionMaintainerState($iVersionId) + { + $oVersion = new version($iVersionId); + $oVersion->updateMaintainerState(); + } + function getSubmitterEmails() { $sRecipients = ''; @@ -623,6 +644,19 @@ class maintainer return $oRow->count > 0; } + /* Returns true if the given version has a maintainer, false otherwise */ + public function versionHasMaintainer($iVersionId) + { + $oVersion = new version($iVersionId); + $hResult = query_parameters("SELECT COUNT(maintainerId) as count FROM appMaintainers WHERE (appId = '?' AND superMaintainer = '1') OR (versionId = '?') AND state = 'accepted'", $oVersion->iAppId, $iVersionId); + + if(!$hResult) + return false; + + $oRow = mysql_fetch_object($hResult); + return $oRow->count > 0; + } + /* if given an appid or a version id return a handle for a query that has */ /* the user ids that are maintainers for this particular appid or version id */ function getMaintainersForAppIdVersionId($iAppId = null, $iVersionId = null) diff --git a/include/version.php b/include/version.php index 70a5b37..4fccfd0 100644 --- a/include/version.php +++ b/include/version.php @@ -36,6 +36,7 @@ class version { var $iSubmitterId; private $sState; var $sLicense; + var $bHasMaintainer; var $aTestResults; /* Array of test result objects. Especially useful when we want to preview a version before submitting it; in that case there is no data in the database */ @@ -81,6 +82,7 @@ class version { $this->sState = $oRow->state; $this->sLicense = $oRow->license; $this->iObsoleteBy = $oRow->obsoleteBy; + $this->bHasMaintainer = $oRow->hasMaintainer == 'true' ? true : false; } } @@ -1532,6 +1534,13 @@ class version { $this->sState = $sState; } + public function updateMaintainerState() + { + $this->bHasMaintainer = maintainer::versionHasMaintainer($this->iVersionId); + + $hResult = query_parameters("UPDATE appVersion SET hasMaintainer = '?' WHERE versionId = '?'", $this->bHasMaintainer ? 'true' : 'false', $this->iVersionId); + } + public function canEdit() { if($_SESSION['current']->hasPriv("admin")) diff --git a/tables/appdb_tables.sql b/tables/appdb_tables.sql index 69ab049..d2bfbb8 100644 --- a/tables/appdb_tables.sql +++ b/tables/appdb_tables.sql @@ -60,6 +60,7 @@ create table appVersion ( license enum('Retail','Open Source','Demo','Shareware','Free to use','Free to use and share'), obsoleteBy int(11) NOT NULL default '0', state enum('accepted','queued','rejected','pending','deleted') NOT NULL default 'accepted', + hasMaintainer enum('true','false') NOT NULL default 'false', key(versionId), index(appId) );

1 0

Alexander Nicolaysen Sørnes : Add ability to update all versions' maintainer states
by Alexander Nicolaysen Sørnes Nov. 12, 2009

Nov. 12, 2009

Module: appdb Branch: master Commit: 98cc98c38aead5e32746a1fa3aaf5bcc34397729 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=98cc98c38aead5e32746a1fa… Author: Alexander Nicolaysen Sørnes <alexander(a)linux-xqqm.(none)> Date: Thu Nov 12 17:31:58 2009 +0100 Add ability to update all versions' maintainer states --- updateMaintainerStates.php | 54 ++++++++++++++++++++++++++++++++++++++----- 1 files changed, 47 insertions(+), 7 deletions(-) diff --git a/updateMaintainerStates.php b/updateMaintainerStates.php index 8791c51..f8644aa 100644 --- a/updateMaintainerStates.php +++ b/updateMaintainerStates.php @@ -7,16 +7,56 @@ require_once('include/maintainer.php'); if(!$_SESSION['current']->hasPriv('admin')) util_show_error_page_and_exit("Only admins are allowed in here"); -$hResult = application::objectGetEntries('accepted'); +function updateAppMaintainerStates() +{ + $hResult = application::objectGetEntries('accepted'); + + $i = 0; + while($oRow = mysql_fetch_object($hResult)) + { + $oApp = new application(null, $oRow); + $oApp->updateMaintainerState(); + $i++; + } + + echo "Updated $i entries"; +} + +function updateVersionMaintainerStates() +{ + $hResult = version::objectGetEntries('accepted'); + + $i = 0; + while($oRow = mysql_fetch_object($hResult)) + { + $oVersion = new version(null, $oRow); + $oVersion->updateMaintainerState(); + $i++; + } -$i = 0; -while($oRow = mysql_fetch_object($hResult)) + echo "Updated $i entries"; +} + +function showChoices() { - $oApp = new application(null, $oRow); - $oApp->updateMaintainerState(); - $i++; + echo '<a href="updateMaintainerStates.php?sAction=updateAppMaintainerStates">Update application maintainer states</a> '; + echo '<a href="updateMaintainerStates.php?sAction=updateVersionMaintainerStates">Update version maintainer states</a>'; +} + +switch(getInput('sAction', $aClean)) +{ + case 'updateAppMaintainerStates': + updateAppMaintainerStates(); + break; + + case 'updateVersionMaintainerStates': + updateVersionMaintainerStates(); + break; + + default: + showChoices(); + break; } -echo "Updated $i entries"; ?>

1 0

Alexander Nicolaysen Sørnes : maintainerdelete.php: Use maintainer::delete() instead of deleteMaintainer ()
by Alexander Nicolaysen Sørnes Nov. 12, 2009

Nov. 12, 2009

Module: appdb Branch: master Commit: 0ef8ec3c6c654661a013257015b43cf6684618e5 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=0ef8ec3c6c654661a0132570… Author: Alexander Nicolaysen Sørnes <alexander(a)linux-xqqm.(none)> Date: Thu Nov 12 17:10:42 2009 +0100 maintainerdelete.php: Use maintainer::delete() instead of deleteMaintainer() --- include/maintainer.php | 11 +++++++++++ maintainerdelete.php | 3 ++- 2 files changed, 13 insertions(+), 1 deletions(-) diff --git a/include/maintainer.php b/include/maintainer.php index 489bafb..9285f8f 100644 --- a/include/maintainer.php +++ b/include/maintainer.php @@ -369,6 +369,17 @@ class maintainer return new maintainer(null, $oRow); } + public function findVersionMaintainer($iUserId, $iVersionId) + { + $hResult = query_parameters("SELECT * FROM appMaintainers WHERE userId = '?' AND versionId = '?'", $iUserId, $iVersionId); + + if(!$hResult) + return null; + + $oRow = mysql_fetch_object($hResult); + return new maintainer(null, $oRow); + } + function deleteMaintainer($oUser, $iAppId = null, $iVersionId = null) { /* remove supermaintainer */ diff --git a/maintainerdelete.php b/maintainerdelete.php index 9ca069c..b062c28 100644 --- a/maintainerdelete.php +++ b/maintainerdelete.php @@ -39,7 +39,8 @@ if($aClean['iConfirmed']) { $oVersion = new Version($aClean['iVersionId']); apidb_header("You have resigned as maintainer of ".$oApp->sName." ".$oVersion->sName); - $result = Maintainer::deleteMaintainer($_SESSION['current'], $oApp->iAppId, $oVersion->iVersionId); + $oMaintainer = maintainer::findVersionMaintainer($_SESSION['current']->iUserId, $aClean['iVersionId']); + $result = $oMaintainer->delete(); } /* echo html_frame_start("Removing",400,"",0); */

1 0

Nikolay Sivov : comctl32/treeview: Collapse some message handlers.
by Alexandre Julliard Nov. 12, 2009

Nov. 12, 2009

Module: wine Branch: master Commit: 459a0c4de9ab222f0fd8f00f7af3c914a418917d URL: http://source.winehq.org/git/wine.git/?a=commit;h=459a0c4de9ab222f0fd8f00f7… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sun Nov 8 07:20:01 2009 +0300 comctl32/treeview: Collapse some message handlers. --- dlls/comctl32/treeview.c | 20 ++++++-------------- 1 files changed, 6 insertions(+), 14 deletions(-) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index bff4b81..a456e21 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -5540,8 +5540,6 @@ TREEVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return TREEVIEW_DeleteItem(infoPtr, (HTREEITEM)lParam); case TVM_EDITLABELA: - return (LRESULT)TREEVIEW_EditLabel(infoPtr, (HTREEITEM)lParam); - case TVM_EDITLABELW: return (LRESULT)TREEVIEW_EditLabel(infoPtr, (HTREEITEM)lParam); @@ -5581,11 +5579,9 @@ TREEVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return 0; case TVM_GETITEMA: - return TREEVIEW_GetItemT(infoPtr, (LPTVITEMEXW)lParam, FALSE); - case TVM_GETITEMW: - return TREEVIEW_GetItemT(infoPtr, (LPTVITEMEXW)lParam, TRUE); - + return TREEVIEW_GetItemT(infoPtr, (LPTVITEMEXW)lParam, + uMsg == TVM_GETITEMW); case TVM_GETITEMHEIGHT: return TREEVIEW_GetItemHeight(infoPtr); @@ -5620,11 +5616,9 @@ TREEVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return TREEVIEW_HitTest(infoPtr, (LPTVHITTESTINFO)lParam); case TVM_INSERTITEMA: - return TREEVIEW_InsertItemT(infoPtr, (LPTVINSERTSTRUCTW)lParam, FALSE); - case TVM_INSERTITEMW: - return TREEVIEW_InsertItemT(infoPtr, (LPTVINSERTSTRUCTW)lParam, TRUE); - + return TREEVIEW_InsertItemT(infoPtr, (LPTVINSERTSTRUCTW)lParam, + uMsg == TVM_INSERTITEMW); case TVM_SELECTITEM: return TREEVIEW_SelectItem(infoPtr, (INT)wParam, (HTREEITEM)lParam); @@ -5644,11 +5638,9 @@ TREEVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return TREEVIEW_SetInsertMarkColor(infoPtr, (COLORREF)lParam); case TVM_SETITEMA: - return TREEVIEW_SetItemT(infoPtr, (LPTVITEMEXW)lParam, FALSE); - case TVM_SETITEMW: - return TREEVIEW_SetItemT(infoPtr, (LPTVITEMEXW)lParam, TRUE); - + return TREEVIEW_SetItemT(infoPtr, (LPTVITEMEXW)lParam, + uMsg == TVM_SETITEMW); case TVM_SETLINECOLOR: return TREEVIEW_SetLineColor(infoPtr, (COLORREF)lParam);

1 0

Nikolay Sivov : comctl32/toolbar: Use single handler for TB_GETBUTTONTEXTW/ TB_GETBUTTONTEXTA.
by Alexandre Julliard Nov. 12, 2009

Nov. 12, 2009

Module: wine Branch: master Commit: 7b19d8bba60c8205edeb179ea5853228b4839c43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b19d8bba60c8205edeb179ea… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sun Nov 8 06:23:52 2009 +0300 comctl32/toolbar: Use single handler for TB_GETBUTTONTEXTW/TB_GETBUTTONTEXTA. --- dlls/comctl32/toolbar.c | 39 ++++++++++++--------------------------- 1 files changed, 12 insertions(+), 27 deletions(-) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index fd30c27..f7175a9 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -3395,24 +3395,7 @@ TOOLBAR_GetButtonSize (const TOOLBAR_INFO *infoPtr) static LRESULT -TOOLBAR_GetButtonTextA (const TOOLBAR_INFO *infoPtr, INT Id, LPSTR lpText) -{ - INT nIndex; - LPWSTR lpTextW; - - nIndex = TOOLBAR_GetButtonIndex (infoPtr, Id, FALSE); - if (nIndex == -1) - return -1; - - lpTextW = TOOLBAR_GetText(infoPtr,&infoPtr->buttons[nIndex]); - - return WideCharToMultiByte( CP_ACP, 0, lpTextW, -1, - lpText, lpText ? 0x7fffffff : 0, NULL, NULL ) - 1; -} - - -static LRESULT -TOOLBAR_GetButtonTextW (const TOOLBAR_INFO *infoPtr, INT Id, LPWSTR lpStr) +TOOLBAR_GetButtonText (const TOOLBAR_INFO *infoPtr, INT Id, LPWSTR lpStr, BOOL isW) { INT nIndex; LPWSTR lpText; @@ -3424,14 +3407,17 @@ TOOLBAR_GetButtonTextW (const TOOLBAR_INFO *infoPtr, INT Id, LPWSTR lpStr) lpText = TOOLBAR_GetText(infoPtr,&infoPtr->buttons[nIndex]); - if (lpText) + if (isW) { - ret = strlenW (lpText); - - if (lpStr) - strcpyW (lpStr, lpText); + if (lpText) + { + ret = strlenW (lpText); + if (lpStr) strcpyW (lpStr, lpText); + } } - + else + ret = WideCharToMultiByte( CP_ACP, 0, lpText, -1, + (LPSTR)lpStr, lpStr ? 0x7fffffff : 0, NULL, NULL ) - 1; return ret; } @@ -6495,10 +6481,9 @@ ToolbarWindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return TOOLBAR_GetButtonSize (infoPtr); case TB_GETBUTTONTEXTA: - return TOOLBAR_GetButtonTextA (infoPtr, wParam, (LPSTR)lParam); - case TB_GETBUTTONTEXTW: - return TOOLBAR_GetButtonTextW (infoPtr, wParam, (LPWSTR)lParam); + return TOOLBAR_GetButtonText (infoPtr, wParam, (LPWSTR)lParam, + uMsg == TB_GETBUTTONTEXTW); case TB_GETDISABLEDIMAGELIST: return TOOLBAR_GetDisabledImageList (infoPtr, wParam);

1 0

Maarten Lankhorst : avrt: Add stub for Av(Set, Revert) MmThreadCharacteristics.
by Alexandre Julliard Nov. 12, 2009

Nov. 12, 2009

Module: wine Branch: master Commit: f17484205aea11caa6935703b27f2cddfb22bf40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f17484205aea11caa6935703b… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Nov 10 21:13:23 2009 +0100 avrt: Add stub for Av(Set,Revert)MmThreadCharacteristics. --- dlls/avrt/avrt.spec | 6 +++--- dlls/avrt/main.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 3 deletions(-) diff --git a/dlls/avrt/avrt.spec b/dlls/avrt/avrt.spec index 103798d..a253d9a 100644 --- a/dlls/avrt/avrt.spec +++ b/dlls/avrt/avrt.spec @@ -1,5 +1,5 @@ @ stub AvQuerySystemResponsiveness -@ stub AvRevertMmThreadCharacteristics +@ stdcall AvRevertMmThreadCharacteristics(long) @ stub AvRtCreateThreadOrderingGroup @ stub AvRtCreateThreadOrderingGroupExA @ stub AvRtCreateThreadOrderingGroupExW @@ -9,6 +9,6 @@ @ stub AvRtWaitOnThreadOrderingGroup @ stub AvSetMmMaxThreadCharacteristicsA @ stub AvSetMmMaxThreadCharacteristicsW -@ stub AvSetMmThreadCharacteristicsA -@ stub AvSetMmThreadCharacteristicsW +@ stdcall AvSetMmThreadCharacteristicsA(str ptr) +@ stdcall AvSetMmThreadCharacteristicsW(wstr ptr) @ stub AvSetMmThreadPriority diff --git a/dlls/avrt/main.c b/dlls/avrt/main.c index a39743c..c4e53dd 100644 --- a/dlls/avrt/main.c +++ b/dlls/avrt/main.c @@ -23,6 +23,7 @@ #include "windef.h" #include "winbase.h" +#include "winnls.h" #include "wine/debug.h" #include "avrt.h" @@ -45,3 +46,47 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) return TRUE; } + +HANDLE WINAPI AvSetMmThreadCharacteristicsA(LPCSTR TaskName, LPDWORD TaskIndex) +{ + HANDLE ret; + LPWSTR str = NULL; + + if (TaskName) + { + DWORD len = (lstrlenA(TaskName)+1); + str = HeapAlloc(GetProcessHeap, 0, len*sizeof(WCHAR)); + if (!str) + { + SetLastError(ERROR_OUTOFMEMORY); + return NULL; + } + MultiByteToWideChar(CP_ACP, 0, TaskName, len, str, len); + } + ret = AvSetMmThreadCharacteristicsW(str, TaskIndex); + HeapFree(GetProcessHeap(), 0, str); + return ret; +} + +HANDLE WINAPI AvSetMmThreadCharacteristicsW(LPCWSTR TaskName, LPDWORD TaskIndex) +{ + FIXME("(%s,%p): stub\n", debugstr_w(TaskName), TaskIndex); + + if (!TaskName) + { + SetLastError(ERROR_INVALID_TASK_NAME); + return NULL; + } + if (!TaskIndex) + { + SetLastError(ERROR_INVALID_HANDLE); + return NULL; + } + return (HANDLE)0x12345678; +} + +BOOL WINAPI AvRevertMmThreadCharacteristics(HANDLE AvrtHandle) +{ + FIXME("(%p): stub\n", AvrtHandle); + return 1; +}

1 0

Huw Davies : include: Add asysta.idl.
by Alexandre Julliard Nov. 12, 2009

Nov. 12, 2009

Module: wine Branch: master Commit: b03b1443b2efc75539d271d5a459d9307ec063ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=b03b1443b2efc75539d271d5a… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Nov 12 15:19:00 2009 +0000 include: Add asysta.idl. --- dlls/msdaps/usrmarshal.c | 31 ++++++++++++++++++++++++++++ include/Makefile.in | 1 + include/asysta.idl | 51 ++++++++++++++++++++++++++++++++++++++++++++++ include/oledb.idl | 1 + tools/make_makefiles | 1 + 5 files changed, 85 insertions(+), 0 deletions(-) diff --git a/dlls/msdaps/usrmarshal.c b/dlls/msdaps/usrmarshal.c index 6a436a3..8e15862 100644 --- a/dlls/msdaps/usrmarshal.c +++ b/dlls/msdaps/usrmarshal.c @@ -817,3 +817,34 @@ HRESULT __RPC_STUB IDBAsynchNotify_OnStop_Stub(IDBAsynchNotify* This, HCHAPTER h FIXME("(%p)->(%lx, %d, %08x, %s): stub\n", This, hChapter, eOperation, hrStatus, debugstr_w(pwszStatusText)); return E_NOTIMPL; } + +HRESULT CALLBACK IDBAsynchStatus_Abort_Proxy(IDBAsynchStatus* This, HCHAPTER hChapter, DBASYNCHOP eOperation) +{ + FIXME("(%p)->(%lx, %d): stub\n", This, hChapter, eOperation); + return E_NOTIMPL; +} + +HRESULT __RPC_STUB IDBAsynchStatus_Abort_Stub(IDBAsynchStatus* This, HCHAPTER hChapter, DBASYNCHOP eOperation, + IErrorInfo **ppErrorInfoRem) +{ + FIXME("(%p)->(%lx, %d, %p): stub\n", This, hChapter, eOperation, ppErrorInfoRem); + return E_NOTIMPL; +} + +HRESULT CALLBACK IDBAsynchStatus_GetStatus_Proxy(IDBAsynchStatus* This, HCHAPTER hChapter, DBASYNCHOP eOperation, + DBCOUNTITEM *pulProgress, DBCOUNTITEM *pulProgressMax, DBASYNCHPHASE *peAsynchPhase, + LPOLESTR *ppwszStatusText) +{ + FIXME("(%p)->(%lx, %d, %p, %p, %p, %p): stub\n", This, hChapter, eOperation, pulProgress, pulProgressMax, + peAsynchPhase, ppwszStatusText); + return E_NOTIMPL; +} + +HRESULT __RPC_STUB IDBAsynchStatus_GetStatus_Stub(IDBAsynchStatus* This, HCHAPTER hChapter, DBASYNCHOP eOperation, + DBCOUNTITEM *pulProgress, DBCOUNTITEM *pulProgressMax, DBASYNCHPHASE *peAsynchPhase, + LPOLESTR *ppwszStatusText, IErrorInfo **ppErrorInfoRem) +{ + FIXME("(%p)->(%lx, %d, %p, %p, %p, %p, %p): stub\n", This, hChapter, eOperation, pulProgress, pulProgressMax, + peAsynchPhase, ppwszStatusText, ppErrorInfoRem); + return E_NOTIMPL; +} diff --git a/include/Makefile.in b/include/Makefile.in index 827d25e..88bafcc 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -107,6 +107,7 @@ SRCDIR_INCLUDES = \ af_irda.h \ appmgmt.h \ asynot.idl \ + asysta.idl \ audevcod.h \ audiosessiontypes.h \ aviriff.h \ diff --git a/include/asysta.idl b/include/asysta.idl new file mode 100644 index 0000000..e3e009e --- /dev/null +++ b/include/asysta.idl @@ -0,0 +1,51 @@ +/* + * Copyright (C) 2009 Huw Davies + * + * 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 + */ + +[ + object, + uuid(0c733a95-2a1c-11ce-ade5-00aa0044773d), + pointer_default(unique) +] +interface IDBAsynchStatus : IUnknown +{ + [local] + HRESULT Abort([in] HCHAPTER hChapter, + [in] DBASYNCHOP eOperation); + + [call_as(Abort)] + HRESULT RemoteAbort([in] HCHAPTER hChapter, + [in] DBASYNCHOP eOperation, + [out] IErrorInfo **ppErrorInfoRem); + + [local] + HRESULT GetStatus([in] HCHAPTER hChapter, + [in] DBASYNCHOP eOperation, + [out, annotation("__out_opt")] DBCOUNTITEM *pulProgress, + [out, annotation("__out_opt")] DBCOUNTITEM *pulProgressMax, + [out, annotation("__out")] DBASYNCHPHASE *peAsynchPhase, + [out, annotation("__deref_opt_inout_opt")] LPOLESTR *ppwszStatusText); + + [call_as(GetStatus)] + HRESULT RemoteGetStatus([in] HCHAPTER hChapter, + [in] DBASYNCHOP eOperation, + [in, out, unique] DBCOUNTITEM *pulProgress, + [in, out, unique] DBCOUNTITEM *pulProgressMax, + [in, out, unique] DBASYNCHPHASE *peAsynchPhase, + [in, out, unique] LPOLESTR *ppwszStatusText, + [out] IErrorInfo **ppErrorInfoRem); +} diff --git a/include/oledb.idl b/include/oledb.idl index b9f0654..127df2b 100644 --- a/include/oledb.idl +++ b/include/oledb.idl @@ -55,6 +55,7 @@ typedef DWORD DBHASHVALUE; #include "dbinit.idl" #include "dbdsad.idl" #include "asynot.idl" +#include "asysta.idl" #include "sesprp.idl" #include "opnrst.idl" #include "row.idl" diff --git a/tools/make_makefiles b/tools/make_makefiles index 1ef571b..845f118 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -111,6 +111,7 @@ my %exported_wine_headers = ( my %private_idl_headers = ( "access.idl" => 1, "asynot.idl" => 1, + "asysta.idl" => 1, "axcore.idl" => 1, "axextend.idl" => 1, "binres.idl" => 1,

1 0