November 2009 - Wine-Commits

Alexander Nicolaysen Sørnes : version: Only show some filter optiosn for admins, as they have no effect for others
by Alexander Nicolaysen Sørnes Nov. 22, 2009

Nov. 22, 2009

Module: appdb Branch: master Commit: dd8399a861d665a0b85b39c93c78e18a4e8eea6e URL: http://source.winehq.org/git/appdb.git/?a=commit;h=dd8399a861d665a0b85b39c9… Author: Alexander Nicolaysen Sørnes <alexander(a)linux-xqqm.(none)> Date: Sun Nov 22 04:14:08 2009 +0100 version: Only show some filter optiosn for admins, as they have no effect for others --- include/version_queue.php | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/include/version_queue.php b/include/version_queue.php index 0be7ba4..2d1ee55 100644 --- a/include/version_queue.php +++ b/include/version_queue.php @@ -265,6 +265,11 @@ class version_queue public function objectGetFilterInfo() { $oFilter = new FilterInterface(); + + /* The following filters are only useful for admins */ + if(!$_SESSION['current']->hasPriv('admin')) + return null; + $oFilter->AddFilterInfo('onlyWithoutMaintainers', 'Only show versions without maintainers', array(FILTER_OPTION_BOOL), FILTER_VALUES_OPTION_BOOL, array('false','true')); return $oFilter; }

1 0

Alexander Nicolaysen Sørnes : vendor: If an admin adds a duplicate vendor, unqueue matching entry if it exists
by Alexander Nicolaysen Sørnes Nov. 22, 2009

Nov. 22, 2009

Module: appdb Branch: master Commit: 61439a79ce6af01e66fd578793c80a864f370f75 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=61439a79ce6af01e66fd5787… Author: Alexander Nicolaysen Sørnes <alexander(a)linux-xqqm.(none)> Date: Sun Nov 22 04:07:50 2009 +0100 vendor: If an admin adds a duplicate vendor, unqueue matching entry if it exists --- include/vendor.php | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/include/vendor.php b/include/vendor.php index e808215..820741b 100644 --- a/include/vendor.php +++ b/include/vendor.php @@ -76,6 +76,9 @@ class Vendor { { $this->vendor($oRow->vendorId); + if(!$this->mustBeQueued()) + $this->unQueue(); + /* Even though we did not create a new vendor, the caller is provided with an id and can proceed as normal, so we return TRUE */ return TRUE;

1 0

Alexander Nicolaysen Sørnes : Make updateMaintainerStates.php into a Control Center
by Alexander Nicolaysen Sørnes Nov. 22, 2009

Nov. 22, 2009

Module: appdb Branch: master Commit: 68f0ac116cdc6feb19161b0fde9d93cb1487a53e URL: http://source.winehq.org/git/appdb.git/?a=commit;h=68f0ac116cdc6feb19161b0f… Author: Alexander Nicolaysen Sørnes <alexander(a)linux-xqqm.(none)> Date: Sun Nov 22 04:45:27 2009 +0100 Make updateMaintainerStates.php into a Control Center --- updateMaintainerStates.php => admin.php | 7 +++++-- include/sidebar_admin.php | 1 + 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/updateMaintainerStates.php b/admin.php similarity index 80% rename from updateMaintainerStates.php rename to admin.php index f8644aa..2a4f757 100644 --- a/updateMaintainerStates.php +++ b/admin.php @@ -7,6 +7,8 @@ require_once('include/maintainer.php'); if(!$_SESSION['current']->hasPriv('admin')) util_show_error_page_and_exit("Only admins are allowed in here"); +apidb_header('AppDB Control Center'); + function updateAppMaintainerStates() { $hResult = application::objectGetEntries('accepted'); @@ -39,8 +41,8 @@ function updateVersionMaintainerStates() function showChoices() { - echo '<a href="updateMaintainerStates.php?sAction=updateAppMaintainerStates">Update application maintainer states</a><br />'; - echo '<a href="updateMaintainerStates.php?sAction=updateVersionMaintainerStates">Update version maintainer states</a>'; + echo '<a href="admin.php?sAction=updateAppMaintainerStates">Update application maintainer states</a><br />'; + echo '<a href="admin.php?sAction=updateVersionMaintainerStates">Update version maintainer states</a>'; } switch(getInput('sAction', $aClean)) @@ -58,5 +60,6 @@ switch(getInput('sAction', $aClean)) break; } +apidb_footer(); ?> diff --git a/include/sidebar_admin.php b/include/sidebar_admin.php index b059e3a..ef22c77 100644 --- a/include/sidebar_admin.php +++ b/include/sidebar_admin.php @@ -59,6 +59,7 @@ function global_admin_menu() { $g->add("Add Category", BASE."objectManager.php?sClass=category&sAction=add&sTitle=Add+Category"); $g->add("Add Vendor", BASE."objectManager.php?sClass=vendor&bQueue=". "false&sAction=add&sTitle=Add%20Vendor"); + $g->add('Control Center', BASE.'admin.php'); $g->done(); }

1 0

Alexander Nicolaysen Sørnes : version: Allow admins to only show versions for apps they maintian
by Alexander Nicolaysen Sørnes Nov. 22, 2009

Nov. 22, 2009

Module: appdb Branch: master Commit: 15ddca9ff5515ba64aa7b11f7c33794163457bce URL: http://source.winehq.org/git/appdb.git/?a=commit;h=15ddca9ff5515ba64aa7b11f… Author: Alexander Nicolaysen Sørnes <alexander(a)linux-xqqm.(none)> Date: Sun Nov 22 04:22:34 2009 +0100 version: Allow admins to only show versions for apps they maintian --- include/version.php | 53 ++++++++++++++++++++++++++++++++++----------- include/version_queue.php | 3 ++ 2 files changed, 43 insertions(+), 13 deletions(-) diff --git a/include/version.php b/include/version.php index 4fccfd0..a14a2c4 100644 --- a/include/version.php +++ b/include/version.php @@ -1472,22 +1472,35 @@ class version { public static function objectGetEntriesCount($sState, $oFilters = null) { $sExtraTables = ''; - $aOptions = $oFilters ? $oFilters->getOptions() : array('onlyWithoutMaintainers' => 'false'); + $aOptions = $oFilters ? $oFilters->getOptions() : array('onlyWithoutMaintainers' => 'false', 'onlyMyMaintainedEntries' => 'false'); $sWhereFilter = ''; + $bOnlyMyMaintainedEntries = false; - if($aOptions['onlyWithoutMaintainers'] == 'true') + $oVersion = new version(); + + if(getInput('onlyMyMaintainedEntries', $aOptions) == 'true' + || ($sState != 'accepted' && !$oVersion->canEdit())) + { + $bOnlyMyMaintainedEntries = true; + } + + /* This combination doesn't make sense */ + if(getInput('onlyWithoutMaintainers', $aOptions) == 'true' + && getInput('onlyMyMaintainedEntries', $aOptions) == 'true') + { + return false; + } + + if(getInput('onlyWithoutMaintainers', $aOptions) == 'true') { $sExtraTables = ',appFamily'; $sWhereFilter .= " AND appFamily.hasMaintainer = 'false' AND appFamily.appId = appVersion.appId"; } - $oVersion = new version(); - if($sState != 'accepted' && !$oVersion->canEdit()) + if($bOnlyMyMaintainedEntries) { - /* Users should see their own rejected entries, but maintainers should - not be able to see rejected entries for versions they maintain */ - if($sState == 'rejected') + if(!$oVersion->canEdit() && $sState == 'rejected') $sQuery = "SELECT COUNT(DISTINCT appVersion.versionId) as count FROM appVersion$sExtraTables WHERE appVersion.submitterId = '?' @@ -1618,10 +1631,26 @@ class version { public static function objectGetEntries($sState, $iRows = 0, $iStart = 0, $sOrderBy = "versionId", $bAscending = true, $oFilters = null) { $sExtraTables = ''; - $aOptions = $oFilters ? $oFilters->getOptions() : array('onlyWithoutMaintainers' => 'false'); + $aOptions = $oFilters ? $oFilters->getOptions() : array('onlyWithoutMaintainers' => 'false', 'onlyMyMaintainedEntries' => 'false'); $sWhereFilter = ''; + $bOnlyMyMaintainedEntries = false; + + $oVersion = new version(); + + if(getInput('onlyMyMaintainedEntries', $aOptions) == 'true' + || ($sState != 'accepted' && !$oVersion->canEdit())) + { + $bOnlyMyMaintainedEntries = true; + } + + /* This combination doesn't make sense */ + if(getInput('onlyWithoutMaintainers', $aOptions) == 'true' + && getInput('onlyMyMaintainedEntries', $aOptions) == 'true') + { + return false; + } - if($aOptions['onlyWithoutMaintainers'] == 'true') + if(getInput('onlyWithoutMaintainers', $aOptions) == 'true') { $sExtraTables = ',appFamily'; @@ -1641,11 +1670,9 @@ class version { $iRows = version::objectGetEntriesCount($sState); } - if($sState != 'accepted' && !version::canEdit()) + if($bOnlyMyMaintainedEntries) { - /* Users should see their own rejected entries, but maintainers should - not be able to see rejected entries for versions they maintain */ - if($sState == 'rejected') + if(!$oVersion->canEdit() && $sState == 'rejected') $sQuery = "SELECT * FROM appVersion$sExtraTables WHERE appVersion.submitterId = '?' AND diff --git a/include/version_queue.php b/include/version_queue.php index 2d1ee55..d922adc 100644 --- a/include/version_queue.php +++ b/include/version_queue.php @@ -271,6 +271,9 @@ class version_queue return null; $oFilter->AddFilterInfo('onlyWithoutMaintainers', 'Only show versions without maintainers', array(FILTER_OPTION_BOOL), FILTER_VALUES_OPTION_BOOL, array('false','true')); + + $oFilter->AddFilterInfo('onlyMyMaintainedEntries', 'Only show versions for apps you maintain', array(FILTER_OPTION_BOOL), FILTER_VALUES_OPTION_BOOL, array('false','true')); + return $oFilter; }

1 0

Alexander Nicolaysen Sørnes : Fix sending admin-only emails
by Alexander Nicolaysen Sørnes Nov. 22, 2009

Nov. 22, 2009

Module: appdb Branch: master Commit: 158c5c3939bfeb32a40378b7ae840862a7a7b0f3 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=158c5c3939bfeb32a40378b7… Author: Alexander Nicolaysen Sørnes <alexander(a)linux-xqqm.(none)> Date: Sat Nov 21 13:22:03 2009 +0100 Fix sending admin-only emails --- include/user.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/user.php b/include/user.php index a3b3426..b7cb192 100644 --- a/include/user.php +++ b/include/user.php @@ -585,7 +585,7 @@ class User { // requesting to email admins, so the mail should be sent // regardless of global emails setting $oAdmin = new user($oRow->userid); - if($i === false && ($oAdmin->getPref('disable_global_emails','no') == 'no' && ($iAppId || $iVersionId))) + if($i === false && ($oAdmin->getPref('disable_global_emails','no') == 'no' || (!$iAppId && !$iVersionId))) $aUserId[] = $oRow->userid; } }

1 0

Louis Lenders : wine.inf: Create wbem directory, and add it to the PATH.
by Alexandre Julliard Nov. 20, 2009

Nov. 20, 2009

Module: wine Branch: master Commit: bacbfb481a5e6d8a7cdec4b57fec2d930dbf7284 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bacbfb481a5e6d8a7cdec4b57… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Fri Nov 20 13:13:27 2009 +0100 wine.inf: Create wbem directory, and add it to the PATH. --- tools/wine.inf.in | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index 6022e88..d264054 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -456,7 +456,7 @@ HKLM,Software\Microsoft\DirectPlay\Service Providers\Serial Connection For Direc HKLM,System\CurrentControlSet\Control\Session Manager\Environment,"APPDATA",,"%16410%" HKLM,System\CurrentControlSet\Control\Session Manager\Environment,"ComSpec",0x00020000,"%11%\cmd.exe" HKLM,System\CurrentControlSet\Control\Session Manager\Environment,"LOCALAPPDATA",,"%16412%" -HKLM,System\CurrentControlSet\Control\Session Manager\Environment,"PATH",0x00020002,"%11%;%10%" +HKLM,System\CurrentControlSet\Control\Session Manager\Environment,"PATH",0x00020002,"%11%;%10%;%11%\wbem" HKLM,System\CurrentControlSet\Control\Session Manager\Environment,"ProgramFiles",,"%16422%" HKLM,System\CurrentControlSet\Control\Session Manager\Environment,"SystemDrive",2,"c:" HKLM,System\CurrentControlSet\Control\Session Manager\Environment,"SYSTEMROOT",,"%10%" @@ -2423,6 +2423,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,mui, 11,spool\drivers\color, 11,spool\printers, +11,wbem, 10,,explorer.exe 10,,hh.exe 10,,notepad.exe

1 0

Rob Shearman : ole32: Fix buffer overrun in CLIPFORMAT_UserMarshal.
by Alexandre Julliard Nov. 20, 2009

Nov. 20, 2009

Module: wine Branch: master Commit: d1db29e801f378f7310fa66ff54980368db1869b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1db29e801f378f7310fa66ff… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Fri Nov 20 14:37:13 2009 +0000 ole32: Fix buffer overrun in CLIPFORMAT_UserMarshal. The string in format is nul-terminated so use memcpy to copy it into the buffer and don't try to nul-terminate it manually which causes a write outside of the allocated buffer length. Fix a similar off-by-one error in CLIPFORMAT_UserUnmarshal too. This time it is only reading from beyond the buffer. --- dlls/ole32/usrmarshal.c | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/ole32/usrmarshal.c b/dlls/ole32/usrmarshal.c index f180f42..ed31620 100644 --- a/dlls/ole32/usrmarshal.c +++ b/dlls/ole32/usrmarshal.c @@ -170,11 +170,9 @@ unsigned char * __RPC_USER CLIPFORMAT_UserMarshal(ULONG *pFlags, unsigned char * pBuffer += sizeof(UINT); *(UINT *)pBuffer = len; pBuffer += sizeof(UINT); - TRACE("marshaling format name %s\n", debugstr_wn(format, len-1)); - lstrcpynW((LPWSTR)pBuffer, format, len); + TRACE("marshaling format name %s\n", debugstr_w(format)); + memcpy(pBuffer, format, len * sizeof(WCHAR)); pBuffer += len * sizeof(WCHAR); - *(WCHAR *)pBuffer = '\0'; - pBuffer += sizeof(WCHAR); } else { @@ -238,11 +236,11 @@ unsigned char * __RPC_USER CLIPFORMAT_UserUnmarshal(ULONG *pFlags, unsigned char if (*(UINT *)pBuffer != len) RaiseException(RPC_S_INVALID_BOUND, 0, 0, NULL); pBuffer += sizeof(UINT); - if (((WCHAR *)pBuffer)[len] != '\0') + if (((WCHAR *)pBuffer)[len - 1] != '\0') RaiseException(RPC_S_INVALID_BOUND, 0, 0, NULL); TRACE("unmarshaling clip format %s\n", debugstr_w((LPCWSTR)pBuffer)); cf = RegisterClipboardFormatW((LPCWSTR)pBuffer); - pBuffer += (len + 1) * sizeof(WCHAR); + pBuffer += len * sizeof(WCHAR); if (!cf) RaiseException(DV_E_CLIPFORMAT, 0, 0, NULL); *pCF = cf;

1 0

Rob Shearman : ole32: Fix size of memory allocation in FileMonikerImpl_DecomposePath.
by Alexandre Julliard Nov. 20, 2009

Nov. 20, 2009

Module: wine Branch: master Commit: 377159c4a76a9e7d830498d01b40b989f7223983 URL: http://source.winehq.org/git/wine.git/?a=commit;h=377159c4a76a9e7d830498d01… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Fri Nov 20 14:38:01 2009 +0000 ole32: Fix size of memory allocation in FileMonikerImpl_DecomposePath. --- dlls/ole32/filemoniker.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/filemoniker.c b/dlls/ole32/filemoniker.c index 9decfaf..c179b7f 100644 --- a/dlls/ole32/filemoniker.c +++ b/dlls/ole32/filemoniker.c @@ -1036,7 +1036,7 @@ int FileMonikerImpl_DecomposePath(LPCOLESTR str, LPOLESTR** stringTable) TRACE("%s, %p\n", debugstr_w(str), *stringTable); - strgtable = CoTaskMemAlloc(len*sizeof(WCHAR)); + strgtable = CoTaskMemAlloc(len*sizeof(*strgtable)); if (strgtable==NULL) return E_OUTOFMEMORY;

1 0

Rob Shearman : ole32: Objects registered as local servers don' t need to support IClassFactory.
by Alexandre Julliard Nov. 20, 2009

Nov. 20, 2009

Module: wine Branch: master Commit: d963e97f32249ba25128be7f890b3eb55e9db9a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d963e97f32249ba25128be7f8… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Fri Nov 20 14:48:57 2009 +0000 ole32: Objects registered as local servers don't need to support IClassFactory. --- dlls/ole32/compobj.c | 2 +- dlls/ole32/tests/compobj.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index c8c4808..580f4d3 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -2130,7 +2130,7 @@ HRESULT WINAPI CoRegisterClassObject( FIXME("Failed to create stream on hglobal, %x\n", hr); return hr; } - hr = CoMarshalInterface(newClass->pMarshaledData, &IID_IClassFactory, + hr = CoMarshalInterface(newClass->pMarshaledData, &IID_IUnknown, newClass->classObject, MSHCTX_LOCAL, NULL, MSHLFLAGS_TABLESTRONG); if (hr) { diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 5ddfc11..e868014 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -837,6 +837,14 @@ static void test_CoRegisterClassObject(void) hr = CoRevokeClassObject(cookie); ok_ole_success(hr, "CoRevokeClassObject"); + /* test whether an object that doesn't support IClassFactory can be + * registered for CLSCTX_LOCAL_SERVER */ + hr = CoRegisterClassObject(&CLSID_WineOOPTest, &Test_Unknown, + CLSCTX_LOCAL_SERVER, REGCLS_SINGLEUSE, &cookie); + ok_ole_success(hr, "CoRegisterClassObject"); + hr = CoRevokeClassObject(cookie); + ok_ole_success(hr, "CoRevokeClassObject"); + /* test whether registered class becomes invalid when apartment is destroyed */ hr = CoRegisterClassObject(&CLSID_WineOOPTest, (IUnknown *)&Test_ClassFactory, CLSCTX_INPROC_SERVER, REGCLS_SINGLEUSE, &cookie);

1 0

Nikolay Sivov : comctl32/tab: Fix selection change when selected item is deleted.
by Alexandre Julliard Nov. 20, 2009

Nov. 20, 2009

Module: wine Branch: master Commit: 33a1e827a7b47657e66f9b2a84ad82126bbe2939 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33a1e827a7b47657e66f9b2a8… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Fri Nov 20 08:50:24 2009 +0300 comctl32/tab: Fix selection change when selected item is deleted. --- dlls/comctl32/tab.c | 7 +++---- dlls/comctl32/tests/tab.c | 23 +++++++++++++++++++++++ 2 files changed, 26 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/tab.c b/dlls/comctl32/tab.c index f8f9f5c..a9e29e2 100644 --- a/dlls/comctl32/tab.c +++ b/dlls/comctl32/tab.c @@ -2916,10 +2916,9 @@ static LRESULT TAB_DeleteItem (TAB_INFO *infoPtr, INT iItem) Free(oldItems); /* Readjust the selected index */ - if ((iItem == infoPtr->iSelected) && (iItem > 0)) - infoPtr->iSelected--; - - if (iItem < infoPtr->iSelected) + if (iItem == infoPtr->iSelected) + infoPtr->iSelected = -1; + else if (iItem < infoPtr->iSelected) infoPtr->iSelected--; if (infoPtr->uNumItem == 0) diff --git a/dlls/comctl32/tests/tab.c b/dlls/comctl32/tests/tab.c index 6061507..144f834 100644 --- a/dlls/comctl32/tests/tab.c +++ b/dlls/comctl32/tests/tab.c @@ -1176,6 +1176,28 @@ static void test_removeimage(HWND parent_wnd) DestroyIcon(hicon); } +static void test_delete_selection(HWND parent_wnd) +{ + HWND hTab; + DWORD ret; + + hTab = createFilledTabControl(parent_wnd, TCS_FIXEDWIDTH, TCIF_TEXT|TCIF_IMAGE, 4); + ok(hTab != NULL, "Failed to create tab control\n"); + + ret = SendMessage(hTab, TCM_SETCURSEL, 3, 0); + expect(0, ret); + ret = SendMessage(hTab, TCM_GETCURSEL, 0, 0); + expect(3, ret); + /* delete selected item - selection goes to -1 */ + ret = SendMessage(hTab, TCM_DELETEITEM, 3, 0); + expect(TRUE, ret); + + ret = SendMessage(hTab, TCM_GETCURSEL, 0, 0); + expect(-1, ret); + + DestroyWindow(hTab); +} + START_TEST(tab) { HWND parent_wnd; @@ -1218,6 +1240,7 @@ START_TEST(tab) test_insert_focus(parent_wnd); test_delete_focus(parent_wnd); + test_delete_selection(parent_wnd); test_removeimage(parent_wnd); DestroyWindow(parent_wnd);

1 0