November 2009 - Wine-commits

Alexander Nicolaysen Sørnes : Add and use maintainer::getMaintainerCountForUserId
by Alexander Nicolaysen Sørnes 22 Nov '09

22 Nov '09

Module: appdb Branch: master Commit: b4f0ac8507229e75934d7c6f6af946dcf3e90e85 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=b4f0ac8507229e75934d7c6f… Author: Alexander Nicolaysen Sørnes <alexander(a)linux-xqqm.(none)> Date: Sun Nov 22 04:29:46 2009 +0100 Add and use maintainer::getMaintainerCountForUserId --- include/maintainer.php | 10 ++++++++-- include/maintainerView.php | 5 +++-- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/include/maintainer.php b/include/maintainer.php index 5ca2751..881b315 100644 --- a/include/maintainer.php +++ b/include/maintainer.php @@ -529,17 +529,23 @@ class maintainer } // returns the number of applications/versions a particular user maintains - function getMaintainerCountForUser($oUser, $bSuperMaintainer) + function getMaintainerCountForUserId($iUserId, $bSuperMaintainer) { $sQuery = "SELECT count(*) as cnt from appMaintainers WHERE userid = '?' AND superMaintainer = '?'". " AND state ='?'"; - $hResult = query_parameters($sQuery, $oUser->iUserId, $bSuperMaintainer ? "1" : "0", 'accepted'); + $hResult = query_parameters($sQuery, $iUserId, $bSuperMaintainer ? "1" : "0", 'accepted'); if(!$hResult) return 0; $oRow = query_fetch_object($hResult); return $oRow->cnt; } + // returns the number of applications/versions a particular user maintains + function getMaintainerCountForUser($oUser, $bSuperMaintainer) + { + return getMaintainerCountForUserId($oUser->iUserId, $bSuperMaintainer); + } + /** * get the applications and versions that this user maintains */ diff --git a/include/maintainerView.php b/include/maintainerView.php index 36cee0a..3fade1e 100644 --- a/include/maintainerView.php +++ b/include/maintainerView.php @@ -96,6 +96,7 @@ class maintainerView { $oTableRow = new TableRow(); $oMaintainerView = new maintainerView(null, $oRow); + $iUserId = $oMaintainerView->iUserId; $oUser = new user($oMaintainerView->iUserId); $sStyle = 'border-top: thin solid; border-bottom: thin solid;'; @@ -107,13 +108,13 @@ class maintainerView $oCell->SetStyle($sStyle); $oTableRow->AddCell($oCell); - $iMaintainedApps = maintainer::GetMaintainerCountForUser($oUser, true); + $iMaintainedApps = maintainer::GetMaintainerCountForUserId($iUserId, true); $sPlural = ($iMaintainedApps == 1) ? '' : 's'; $oCell = new TableCell($iMaintainedApps ? "$iMaintainedApps application$sPlural" : ' '); $oCell->SetStyle($sStyle); $oTableRow->AddCell($oCell); - $iMaintainedVersions = maintainer::GetMaintainerCountForUser($oUser, false); + $iMaintainedVersions = maintainer::GetMaintainerCountForUserId($iUserId, false); $sPlural = ($iMaintainedVersions == 1) ? '' : 's'; $oCell = new TableCell($iMaintainedVersions ? "$iMaintainedVersions version$sPlural" : ' '); $oCell->SetStyle($sStyle);

1 0

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

22 Nov '09

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 : Admin Maintainers: Re-add link to email all maintainers
by Alexander Nicolaysen Sørnes 22 Nov '09

22 Nov '09

Module: appdb Branch: master Commit: ed3d1d04757400c542dc53d8232c44c5a98adb00 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=ed3d1d04757400c542dc53d8… Author: Alexander Nicolaysen Sørnes <alexander(a)linux-xqqm.(none)> Date: Sun Nov 22 05:07:33 2009 +0100 Admin Maintainers: Re-add link to email all maintainers --- include/maintainerView.php | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/include/maintainerView.php b/include/maintainerView.php index 3fade1e..bf90582 100644 --- a/include/maintainerView.php +++ b/include/maintainerView.php @@ -80,6 +80,8 @@ class maintainerView public function objectDrawCustomTable($hResult, $sQueued, $oM) { + echo '<div align="center"><a href="'.BASE.'contact.php?sRecipientGroup=maintainers">E-mail all maintainers</a></div>'; + $oTable = new Table(); $oNewOM = new objectManager('maintainer');

1 0

Alexander Nicolaysen Sørnes : contact. php: Fix some warnings
by Alexander Nicolaysen Sørnes 22 Nov '09

22 Nov '09

Module: appdb Branch: master Commit: 4134a08fde157a936f34cb87da09ec40df738113 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=4134a08fde157a936f34cb87… Author: Alexander Nicolaysen Sørnes <alexander(a)linux-xqqm.(none)> Date: Sun Nov 22 05:12:03 2009 +0100 contact.php: Fix some warnings --- contact.php | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/contact.php b/contact.php index 06757c6..9bbb4fd 100644 --- a/contact.php +++ b/contact.php @@ -9,6 +9,7 @@ require_once(BASE."/include/incl.php"); */ $oUser = new User($_SESSION['current']->iUserId); +$shError = ''; /* Restrict error to logged-in users */ if(!$oUser->isLoggedIn()) @@ -55,7 +56,7 @@ if($sRecipientGroup) /* Check for errors */ if((!$aClean['sMessage'] || !$aClean['sSubject']) && $aClean['sSubmit']) { - $error = "<font color=\"red\">Please enter both a subject and a ". + $shError = "<font color=\"red\">Please enter both a subject and a ". "message.</font>"; $aClean['sSubmit'] = ""; } @@ -67,7 +68,7 @@ if(!$aClean['sSubmit']) echo '&nbsp'; echo html_frame_start("Composer",400,"",0); - echo $error; + echo $shError; echo "<form action=\"".$_SERVER['PHP_SELF']."\" method=\"post\">"; /* User manager */ @@ -96,7 +97,7 @@ if(!$aClean['sSubmit']) $oTableRow->SetClass("color4"); $oTableRow->AddTextCell("Subject"); $oTableCell = new TableCell("<input type=\"text\" name=\"sSubject\" size=\"71\"". - " value=\"".$aClean['sSubject']."\">"); + " value=\"".getInput('sSubject', $aClean)."\">"); $oTableRow->AddCell($oTableCell); $oTable->AddRow($oTableRow); @@ -106,7 +107,7 @@ if(!$aClean['sSubmit']) $oTableCell->SetValign("top"); $oTableRow->AddCell($oTableCell); $oTableCell = new TableCell("<textarea name=\"sMessage\" rows=\"15\" cols=\"60\">" - .$aClean['sMessage']."</textarea>"); + .getInput('sMessage', $aClean)."</textarea>"); $oTableRow->AddCell($oTableCell); $oTable->AddRow($oTableRow);

1 0

Alexander Nicolaysen Sørnes : Fix sending admin-only emails
by Alexander Nicolaysen Sørnes 22 Nov '09

22 Nov '09

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 20 Nov '09

20 Nov '09

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 20 Nov '09

20 Nov '09

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 20 Nov '09

20 Nov '09

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 20 Nov '09

20 Nov '09

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

Paul Vriens : comdlg32/tests: Fix some test failures on Win7.
by Alexandre Julliard 20 Nov '09

20 Nov '09

Module: wine Branch: master Commit: 50592566d32b19ac893eeaa5bfd500f01c7465a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50592566d32b19ac893eeaa5b… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Nov 20 14:20:40 2009 +0100 comdlg32/tests: Fix some test failures on Win7. --- dlls/comdlg32/tests/filedlg.c | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/comdlg32/tests/filedlg.c b/dlls/comdlg32/tests/filedlg.c index aca2841..71f7d2a 100644 --- a/dlls/comdlg32/tests/filedlg.c +++ b/dlls/comdlg32/tests/filedlg.c @@ -876,7 +876,7 @@ static void test_arrange(void) } } -static CHAR WINDIR[MAX_PATH]; +static CHAR SYSDIR[MAX_PATH]; static UINT_PTR CALLBACK path_hook_proc( HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam) { @@ -896,8 +896,8 @@ static UINT_PTR CALLBACK path_hook_proc( HWND hDlg, UINT msg, WPARAM wParam, LPA memset(buf, 0x66, sizeof(buf)); ret = SendMessageA( GetParent(hDlg), CDM_GETFOLDERPATH, sizeof(buf), (LPARAM)buf); - ok(!lstrcmpA(WINDIR, buf), "Expected '%s', got '%s'\n", WINDIR, buf); - ok(lstrlenA(WINDIR) + 1 == ret, "Expected %d, got %d\n", lstrlenA(WINDIR) + 1, ret); + ok(!lstrcmpiA(SYSDIR, buf), "Expected '%s', got '%s'\n", SYSDIR, buf); + ok(lstrlenA(SYSDIR) + 1 == ret, "Expected %d, got %d\n", lstrlenA(SYSDIR) + 1, ret); } } @@ -911,8 +911,11 @@ static void test_getfolderpath(void) char szFileName[MAX_PATH] = ""; char szInitialDir[MAX_PATH]; - GetWindowsDirectory(szInitialDir, MAX_PATH); - lstrcpyA(WINDIR, szInitialDir); + /* We need to pick a different directory as the other tests because of new + * Windows 7 behavior. + */ + GetSystemDirectory(szInitialDir, MAX_PATH); + lstrcpyA(SYSDIR, szInitialDir); ZeroMemory(&ofn, sizeof(ofn));

1 0