April 2007 - Wine-commits - list.winehq.org

Aric Stewart : gdi32: Make the comparison for system link font replacement not case sensitive.
by Alexandre Julliard 20 Apr '07

20 Apr '07

Module: wine Branch: master Commit: 1e4e99a295d179e65e41fba6088842c2028cd049 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e4e99a295d179e65e41fba60… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Apr 19 09:00:02 2007 -0500 gdi32: Make the comparison for system link font replacement not case sensitive. --- dlls/gdi32/freetype.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index c372477..caadf4b 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1031,7 +1031,7 @@ static BOOL AddFontFileToList(const char *file, char *fake_family, const WCHAR * if (target_family) { localised_family = get_familyname(ft_face); - if (localised_family && lstrcmpW(localised_family,target_family)!=0) + if (localised_family && strcmpiW(localised_family,target_family)!=0) { TRACE("Skipping Index %i: Incorrect Family name for replacement\n",(INT)face_index); HeapFree(GetProcessHeap(), 0, localised_family); @@ -2767,7 +2767,7 @@ GdiFont *WineEngCreateFontInstance(DC *dc, HFONT hfont) */ LIST_FOR_EACH_ENTRY(font_link, &system_links, SYSTEM_LINKS, entry) { - if(!strcmpW(font_link->font_name, lf.lfFaceName)) + if(!strcmpiW(font_link->font_name, lf.lfFaceName)) { TRACE("found entry in system list\n"); LIST_FOR_EACH_ENTRY(font_link_entry, &font_link->links, CHILD_FONT, entry) @@ -2778,7 +2778,7 @@ GdiFont *WineEngCreateFontInstance(DC *dc, HFONT hfont) { family = face->family; if(csi.fs.fsCsb[0] & - (face->fs.fsCsb[0] | face->fs_links.fsCsb[0])) + (face->fs.fsCsb[0] | face->fs_links.fsCsb[0]) || !csi.fs.fsCsb[0]) { if(face->scalable || can_use_bitmap) goto found;

1 0

Detlef Riekenberg : localui: Implement ConfigurePortUI.
by Alexandre Julliard 20 Apr '07

20 Apr '07

Module: wine Branch: master Commit: 3fc87ef6263327a4fc6be0bcf16a2c7d93a26802 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fc87ef6263327a4fc6be0bcf… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Thu Apr 19 22:59:42 2007 +0200 localui: Implement ConfigurePortUI. --- dlls/localui/Makefile.in | 2 +- dlls/localui/localui.c | 35 +++++++++++++++++++++++++++++++++-- dlls/localui/localui.h | 34 ++++++++++++++++++++++++++++++++++ dlls/localui/localui.rc | 5 ++++- dlls/localui/ui_En.rc | 27 +++++++++++++++++++++++++++ 5 files changed, 99 insertions(+), 4 deletions(-) diff --git a/dlls/localui/Makefile.in b/dlls/localui/Makefile.in index 2250333..6a43906 100644 --- a/dlls/localui/Makefile.in +++ b/dlls/localui/Makefile.in @@ -3,7 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = localui.dll -IMPORTS = winspool kernel32 +IMPORTS = winspool user32 kernel32 C_SRCS = \ localui.c diff --git a/dlls/localui/localui.c b/dlls/localui/localui.c index 2153bcc..36b2812 100644 --- a/dlls/localui/localui.c +++ b/dlls/localui/localui.c @@ -26,11 +26,13 @@ #include "winbase.h" #include "wingdi.h" #include "winreg.h" +#include "winuser.h" #include "winspool.h" #include "ddk/winsplp.h" #include "wine/debug.h" +#include "localui.h" WINE_DEFAULT_DEBUG_CHANNEL(localui); @@ -57,6 +59,24 @@ static LPWSTR strdupWW(LPCWSTR pPrefix, LPCWSTR pSuffix) return ptr; } +/****************************************************************** + * display the Dialog "Nothing to configure" + * + */ + +static void dlg_nothingtoconfig(HWND hWnd) +{ + WCHAR res_PortW[IDS_LOCALPORT_MAXLEN]; + WCHAR res_nothingW[IDS_NOTHINGTOCONFIG_MAXLEN]; + + res_PortW[0] = '\0'; + res_nothingW[0] = '\0'; + LoadStringW(LOCALUI_hInstance, IDS_LOCALPORT, res_PortW, IDS_LOCALPORT_MAXLEN); + LoadStringW(LOCALUI_hInstance, IDS_NOTHINGTOCONFIG, res_nothingW, IDS_NOTHINGTOCONFIG_MAXLEN); + + MessageBoxW(hWnd, res_nothingW, res_PortW, MB_OK | MB_ICONINFORMATION); +} + /***************************************************** * open_monitor_by_name [internal] * @@ -120,8 +140,19 @@ static BOOL WINAPI localui_AddPortUI(PCWSTR pName, HWND hWnd, PCWSTR pMonitorNam */ static BOOL WINAPI localui_ConfigurePortUI(PCWSTR pName, HWND hWnd, PCWSTR pPortName) { - FIXME("(%s, %p, %s) stub\n", debugstr_w(pName), hWnd, debugstr_w(pPortName)); - return TRUE; + HANDLE hXcv; + + TRACE("(%s, %p, %s)\n", debugstr_w(pName), hWnd, debugstr_w(pPortName)); + if (open_monitor_by_name(XcvPortW, pPortName, &hXcv)) { + + dlg_nothingtoconfig(hWnd); + + ClosePrinter(hXcv); + return TRUE; + } + SetLastError(ERROR_UNKNOWN_PORT); + return FALSE; + } /***************************************************** diff --git a/dlls/localui/localui.h b/dlls/localui/localui.h new file mode 100644 index 0000000..eb7dfff --- /dev/null +++ b/dlls/localui/localui.h @@ -0,0 +1,34 @@ +/* + * internal include file of the Local Printmonitor User Interface + * + * Copyright 2007 Detlef Riekenberg + * + * 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 + */ + +#ifndef __WINE_LOCALUI__ +#define __WINE_LOCALUI__ + + +/* ## Resource-ID ## */ +#define IDS_LOCALPORT 300 +#define IDS_NOTHINGTOCONFIG 303 + +/* ## Reserved memorysize for the strings (in WCHAR) ## */ +#define IDS_LOCALPORT_MAXLEN 32 +#define IDS_NOTHINGTOCONFIG_MAXLEN 80 + + +#endif /* __WINE_LOCALUI__ */ diff --git a/dlls/localui/localui.rc b/dlls/localui/localui.rc index 5162b6e..23a6b95 100644 --- a/dlls/localui/localui.rc +++ b/dlls/localui/localui.rc @@ -22,7 +22,7 @@ #include "windef.h" #include "winbase.h" #include "winver.h" - +#include "localui.h" #define WINE_FILENAME_STR "localui.dll" #define WINE_FILEDESCRIPTION_STR "User Interface for the Local Monitor" @@ -35,3 +35,6 @@ #define WINE_PRODUCTVERSION_STR "5.1.2600.2180" #include "wine/wine_common_ver.rc" + + +#include "ui_En.rc" diff --git a/dlls/localui/ui_En.rc b/dlls/localui/ui_En.rc new file mode 100644 index 0000000..7b687f1 --- /dev/null +++ b/dlls/localui/ui_En.rc @@ -0,0 +1,27 @@ +/* + * English resources for localui + * + * Copyright 2007 Detlef Riekenberg + * + * 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 + */ + +LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + IDS_LOCALPORT "Local Port" + IDS_NOTHINGTOCONFIG "This port has no options to configure" +}

1 0

Detlef Riekenberg : localspl: ConfigurePort is now in localui.dll.
by Alexandre Julliard 20 Apr '07

20 Apr '07

Module: wine Branch: master Commit: d5b2a0c37e995c6cea519246accbb3a0a8697635 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5b2a0c37e995c6cea519246a… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Thu Apr 19 22:59:56 2007 +0200 localspl: ConfigurePort is now in localui.dll. --- dlls/localspl/localmon.c | 43 +------------------------------------- dlls/localspl/localspl_private.h | 2 - dlls/localspl/spl_De.rc | 1 - dlls/localspl/spl_En.rc | 1 - dlls/localspl/spl_Fr.rc | 1 - dlls/localspl/spl_Ko.rc | 1 - dlls/localspl/spl_No.rc | 1 - dlls/localspl/spl_Pl.rc | 1 - 8 files changed, 1 insertions(+), 50 deletions(-) diff --git a/dlls/localspl/localmon.c b/dlls/localspl/localmon.c index 384e1f1..0dc128c 100644 --- a/dlls/localspl/localmon.c +++ b/dlls/localspl/localmon.c @@ -109,23 +109,6 @@ static const WCHAR WinNT_CV_WindowsW[] = {'S','o','f','t','w','a','r','e','\\', 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', 'W','i','n','d','o','w','s',0}; -/****************************************************************** - * display the Dialog "Nothing to configure" - * - */ - -static void dlg_nothingtoconfig(HWND hWnd) -{ - WCHAR res_PortW[IDS_LOCALPORT_MAXLEN]; - WCHAR res_nothingW[IDS_NOTHINGTOCONFIG_MAXLEN]; - - res_PortW[0] = '\0'; - res_nothingW[0] = '\0'; - LoadStringW(LOCALSPL_hInstance, IDS_LOCALPORT, res_PortW, IDS_LOCALPORT_MAXLEN); - LoadStringW(LOCALSPL_hInstance, IDS_NOTHINGTOCONFIG, res_nothingW, IDS_NOTHINGTOCONFIG_MAXLEN); - - MessageBoxW(hWnd, res_nothingW, res_PortW, MB_OK | MB_ICONINFORMATION); -} /****************************************************************** * does_port_exist (internal) @@ -318,30 +301,6 @@ static DWORD get_type_from_name(LPCWSTR name) } /***************************************************** - * localmon_ConfigurePortW [exported through MONITOREX] - * - * Display the Configuration-Dialog for a specific Port - * - * PARAMS - * pName [I] Servername or NULL (local Computer) - * hWnd [I] Handle to parent Window for the Dialog-Box - * pPortName [I] Name of the Port, that should be configured - * - * RETURNS - * Success: TRUE - * Failure: FALSE - * - */ -BOOL WINAPI localmon_ConfigurePortW(LPWSTR pName, HWND hWnd, LPWSTR pPortName) -{ - TRACE("(%s, %p, %s)\n", debugstr_w(pName), hWnd, debugstr_w(pPortName)); - /* ToDo: Dialogs by Portname ("LPTx:", "COMx:") */ - - dlg_nothingtoconfig(hWnd); - return ROUTER_SUCCESS; -} - -/***************************************************** * localmon_EnumPortsW [exported through MONITOREX] * * Enumerate all local Ports @@ -651,7 +610,7 @@ LPMONITOREX WINAPI InitializePrintMonitor(LPWSTR regroot) NULL, /* localmon_ClosePortW */ NULL, /* localmon_AddPortW */ NULL, /* localmon_AddPortExW */ - localmon_ConfigurePortW, + NULL, /* Use ConfigurePortUI in localui.dll */ NULL, /* Use DeletePortUI in localui.dll */ NULL, /* localmon_GetPrinterDataFromPort */ NULL, /* localmon_SetPortTimeOuts */ diff --git a/dlls/localspl/localspl_private.h b/dlls/localspl/localspl_private.h index 7755858..461f50c 100644 --- a/dlls/localspl/localspl_private.h +++ b/dlls/localspl/localspl_private.h @@ -28,12 +28,10 @@ extern HINSTANCE LOCALSPL_hInstance; /* ## Resource-ID ## */ #define IDS_LOCALPORT 500 #define IDS_LOCALMONITOR 507 -#define IDS_NOTHINGTOCONFIG 508 /* ## Reserved memorysize for the strings (in WCHAR) ## */ #define IDS_LOCALMONITOR_MAXLEN 64 #define IDS_LOCALPORT_MAXLEN 32 -#define IDS_NOTHINGTOCONFIG_MAXLEN 80 /* ## Type of Ports ## */ /* windows types */ diff --git a/dlls/localspl/spl_De.rc b/dlls/localspl/spl_De.rc index acc4776..4c95e2b 100644 --- a/dlls/localspl/spl_De.rc +++ b/dlls/localspl/spl_De.rc @@ -25,5 +25,4 @@ STRINGTABLE DISCARDABLE { IDS_LOCALPORT "Lokaler Anschluss" IDS_LOCALMONITOR "Lokaler Monitor" - IDS_NOTHINGTOCONFIG "Dieser Anschluss hat keine Optionen zum Konfigurieren" } diff --git a/dlls/localspl/spl_En.rc b/dlls/localspl/spl_En.rc index 3e54f88..c9d12f4 100644 --- a/dlls/localspl/spl_En.rc +++ b/dlls/localspl/spl_En.rc @@ -25,5 +25,4 @@ STRINGTABLE DISCARDABLE { IDS_LOCALPORT "Local Port" IDS_LOCALMONITOR "Local Monitor" - IDS_NOTHINGTOCONFIG "This port has no options to configure" } diff --git a/dlls/localspl/spl_Fr.rc b/dlls/localspl/spl_Fr.rc index cafe232..9526972 100644 --- a/dlls/localspl/spl_Fr.rc +++ b/dlls/localspl/spl_Fr.rc @@ -24,5 +24,4 @@ STRINGTABLE DISCARDABLE { IDS_LOCALPORT "Port local" IDS_LOCALMONITOR "Moniteur local" - IDS_NOTHINGTOCONFIG "Ce port n'a pas d'option � configurer" } diff --git a/dlls/localspl/spl_Ko.rc b/dlls/localspl/spl_Ko.rc index 6a0f2d2..b46be3a 100644 --- a/dlls/localspl/spl_Ko.rc +++ b/dlls/localspl/spl_Ko.rc @@ -26,5 +26,4 @@ STRINGTABLE DISCARDABLE { IDS_LOCALPORT "�� Ʈ" IDS_LOCALMONITOR "�� " - IDS_NOTHINGTOCONFIG "This port has no options to configure" } diff --git a/dlls/localspl/spl_No.rc b/dlls/localspl/spl_No.rc index f4600f4..5efa563 100644 --- a/dlls/localspl/spl_No.rc +++ b/dlls/localspl/spl_No.rc @@ -24,5 +24,4 @@ STRINGTABLE DISCARDABLE { IDS_LOCALPORT "Lokal port" IDS_LOCALMONITOR "Lokal overv�ker" - IDS_NOTHINGTOCONFIG "Denne porten har ingen innstillinger" } diff --git a/dlls/localspl/spl_Pl.rc b/dlls/localspl/spl_Pl.rc index 9f63b69..a080208 100644 --- a/dlls/localspl/spl_Pl.rc +++ b/dlls/localspl/spl_Pl.rc @@ -26,5 +26,4 @@ STRINGTABLE DISCARDABLE { IDS_LOCALPORT "Port lokalny" IDS_LOCALMONITOR "Monitor lokalny" - IDS_NOTHINGTOCONFIG "Ten port nie ma opcji do skonfigurowania" }

1 0

appdb/include testData.php
by WineHQ 20 Apr '07

20 Apr '07

ChangeSet ID: 31058 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/04/19 19:02:20 Modified files: include : testData.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Make testData's objectGetEntries more consistent for rejected testData. Don't allow maintainers to view rejected entries for the versions they maintain, but show them their own rejected entries instead Patch: http://cvs.winehq.org/patch.py?id=31058 Old revision New revision Changes Path 1.41 1.42 +30 -17 appdb/include/testData.php Index: appdb/include/testData.php diff -u -p appdb/include/testData.php:1.41 appdb/include/testData.php:1.42 --- appdb/include/testData.php:1.41 20 Apr 2007 0: 2:20 -0000 +++ appdb/include/testData.php 20 Apr 2007 0: 2:20 -0000 @@ -267,8 +267,7 @@ class testData{ $sSubject = "Submitted testing data rejected"; $sMsg = "The testing data you submitted for '$sName' has ". "been rejected by ".$_SESSION['current']->sRealname."."; - $sMsg .= APPDB_ROOT."testResults.php?sSub=view&iTestingId=". - $this->iTestingId."\n"; + $sMsg .= $this->objectMakeUrl()."\n"; $sMsg .= "Reason given:\n"; break; case "delete": @@ -696,7 +695,18 @@ class testData{ $sQueued = objectManager::getQueueString($bQueued, $bRejected); if($bQueued && !$oTest->canEdit()) { - if($oTest->canEditSome()) + if($bRejected) + { + $sQuery = "SELECT COUNT(testingId) AS count FROM + testResults, appVersion WHERE + appVersion.queued = 'false' + AND + appVersion.versionId = testResults.versionId + AND + testResults.submitterId = '?' + AND + testResults.queued = '?'"; + } else { $sQuery = "SELECT COUNT(testingId) AS count FROM testResults, appVersion, appMaintainers WHERE @@ -713,9 +723,10 @@ class testData{ ) AND testResults.queued = '?'"; - $hResult = query_parameters($sQuery, $_SESSION['current']->iUserId, - $sQueued); } + + $hResult = query_parameters($sQuery, $_SESSION['current']->iUserId, + $sQueued); } else { $sQuery = "SELECT COUNT(testingId) as count FROM testResults, @@ -743,7 +754,17 @@ class testData{ $sQueued = objectManager::getQueueString($bQueued, $bRejected); if($bQueued && !$oTest->canEdit()) { - if($oTest->canEditSome()) + if($bRejected) + { + $sQuery = "SELECT testResults.* FROM testResults, appVersion WHERE + appVersion.queued = 'false' + AND + appVersion.versionId = testResults.versionId + AND + testResults.submitterId = '?' + AND + testResults.queued = '?'"; + } else { $sQuery = "SELECT testResults.* FROM testResults, appVersion, appMaintainers WHERE @@ -760,9 +781,9 @@ class testData{ ) AND testResults.queued = '?'"; - $hResult = query_parameters($sQuery, $_SESSION['current']->iUserId, - $sQueued); } + $hResult = query_parameters($sQuery, $_SESSION['current']->iUserId, + $sQueued); } else { $sQuery = "SELECT testResults.* FROM testResults, appVersion WHERE @@ -810,21 +831,13 @@ class testData{ $this->sTestedRelease, $this->sTestedRating); - if($this->canEditSome()) + if($this->canEdit() or $this->sQueued == "rejected") $aCells[] = "[ <a href=\"".$oObject->makeUrl("edit", $this->iTestingId)."\">$sEditLinkLabel</a> ]"; echo html_tr($aCells, $this->sTestedRating); } - function canEditSome() - { - if($this->canEdit() || maintainer::isUserMaintainer($_SESSION['current'])) - return TRUE; - else - return FALSE; - } - function canEdit() { if($_SESSION['current']->hasPriv("admin"))

1 0

appdb/admin resubmitRejectedApps.php
by WineHQ 20 Apr '07

20 Apr '07

ChangeSet ID: 31057 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/04/19 18:53:28 Removed files: admin : resubmitRejectedApps.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Delete admin/resubmitRejectedApps.php, this file is no longer used Patch: http://cvs.winehq.org/patch.py?id=31057 Old revision New revision Changes Path 1.7 Removed +0 -0 appdb/admin/resubmitRejectedApps.php Index: appdb/admin/resubmitRejectedApps.php diff -u -p appdb/admin/resubmitRejectedApps.php:1.7 /dev/null --- appdb/admin/resubmitRejectedApps.php 19 Apr 2007 23:53:28 -0000 +++ /dev/null 19 Apr 2007 23:53:28 -0000 @@ -1,11 +0,0 @@ -<?php -/*************************************/ -/* code to View and resubmit Apps */ -/*************************************/ - -require("path.php"); -require(BASE."include/incl.php"); - -util_redirect_and_exit(BASE."appsubmit.php"); - -?>

1 0

appdb/include sidebar_login.php
by WineHQ 20 Apr '07

20 Apr '07

ChangeSet ID: 31056 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/04/19 18:51:23 Modified files: include : sidebar_login.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Highlight maintained apps/versions in the menu Patch: http://cvs.winehq.org/patch.py?id=31056 Old revision New revision Changes Path 1.23 1.24 +8 -2 appdb/include/sidebar_login.php Index: appdb/include/sidebar_login.php diff -u -p appdb/include/sidebar_login.php:1.23 appdb/include/sidebar_login.php:1.24 --- appdb/include/sidebar_login.php:1.23 19 Apr 2007 23:51:23 -0000 +++ appdb/include/sidebar_login.php 19 Apr 2007 23:51:23 -0000 @@ -29,11 +29,17 @@ function global_sidebar_login() { { $oApp = new application($appId); if($superMaintainer) - $g->addmisc($oApp->objectMakeLink()."*", "center"); + $g->add($oApp->sName."*", $oApp->objectMakeUrl(),"center"); else - $g->addmisc(version::fullNameLink($versionId), "center"); + { + $oVersion = new version($versionId); + $g->add(version::fullName($versionId), + $oVersion->objectMakeUrl(), "center"); + } } } + + /* Display the user's rejected applications/versions */ $iAppsRejected = application::objectGetEntriesCount(true, true) + version::objectGetEntriesCount(true, true); if($iAppsRejected && !$_SESSION['current']->hasPriv("admin"))

1 0

appdb/include distribution.php
by WineHQ 20 Apr '07

20 Apr '07

ChangeSet ID: 31055 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/04/19 18:48:23 Modified files: include : distribution.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Only show un-queued distributions in the testData list Patch: http://cvs.winehq.org/patch.py?id=31055 Old revision New revision Changes Path 1.23 1.24 +3 -1 appdb/include/distribution.php Index: appdb/include/distribution.php diff -u -p appdb/include/distribution.php:1.23 appdb/include/distribution.php:1.24 --- appdb/include/distribution.php:1.23 19 Apr 2007 23:48:23 -0000 +++ appdb/include/distribution.php 19 Apr 2007 23:48:23 -0000 @@ -400,7 +400,9 @@ class distribution { /* Make a dropdown list of distributions */ function make_distribution_list($varname, $cvalue) { - $sQuery = "SELECT name, distributionId FROM distributions ORDER BY name"; + $sQuery = "SELECT name, distributionId FROM distributions + WHERE queued = 'false' + ORDER BY name"; $hResult = query_parameters($sQuery); if(!$hResult) return;

1 0

appdb/ ./objectManager.php include/application ...
by WineHQ 20 Apr '07

20 Apr '07

ChangeSet ID: 31054 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/04/19 18:45:16 Modified files: . : objectManager.php include : application.php objectManager.php sidebar_admin.php sidebar_maintainer_admin.php testData.php version.php Added files: include : version_queue.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Fix testData::create() permissions. Separate the cases where a user has edit rights from when he has the right to unqueue items Patch: http://cvs.winehq.org/patch.py?id=31054 Old revision New revision Changes Path 1.4 1.5 +2 -2 appdb/objectManager.php 1.102 1.103 +3 -1 appdb/include/application.php 1.11 1.12 +6 -1 appdb/include/objectManager.php 1.39 1.40 +1 -1 appdb/include/sidebar_admin.php 1.8 1.9 +1 -1 appdb/include/sidebar_maintainer_admin.php 1.40 1.41 +20 -4 appdb/include/testData.php 1.115 1.116 +12 -20 appdb/include/version.php Added 1.1 +0 -0 appdb/include/version_queue.php

1 0

appdb/include testData_queue.php
by WineHQ 20 Apr '07

20 Apr '07

ChangeSet ID: 31053 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/04/19 18:19:24 Modified files: include : testData_queue.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Conform testData_queue to OM standards Patch: http://cvs.winehq.org/patch.py?id=31053 Old revision New revision Changes Path 1.1 1.2 +68 -2 appdb/include/testData_queue.php Index: appdb/include/testData_queue.php diff -u -p appdb/include/testData_queue.php:1.1 appdb/include/testData_queue.php:1.2 --- appdb/include/testData_queue.php:1.1 19 Apr 2007 23:19:24 -0000 +++ appdb/include/testData_queue.php 19 Apr 2007 23:19:24 -0000 @@ -18,7 +18,18 @@ class testData_queue $this->oDistribution->create(); $this->oTestData->iDistributionId = $this->oDistribution->iDistributionId; } - $this->oTestData->create(); + return $this->oTestData->create(); + } + + function delete() + { + return $this->oTestData->delete(); + } + + function unQueue() + { + $this->oTestData->unQueue(); + $this->oDistribution->unQueue(); } function update() @@ -31,9 +42,17 @@ class testData_queue { $this->oTestData->outputEditor(); + /* If we are processing queued test results with a queued distribution, we display + some additional help here */ + if($this->oDistribution->sQueued != "false" && $this->canEdit()) + { + echo "The user submitted a new distribution, which will be un-queued together ". + "with the test data unless you select an existing one from the list above."; + } + /* If the testData is already associated with a distribution and the distribution is un-queued, there is no need to display the distribution form here */ - if(!$this->oTestData->iDistributionId or $this->oDistributionId->sQueued != "false") + if(!$this->oTestData->iDistributionId or $this->oDistribution->sQueued != "false") $this->oDistribution->outputEditor(); } @@ -57,6 +76,53 @@ class testData_queue { $this->oTestData->objectDisplayAddItemHelp(); } + + function objectGetEntries($bQueued, $bRejected) + { + return $this->oTestData->objectGetEntries($bQueued, $bRejected); + } + + function objectGetHeader() + { + return $this->oTestData->objectGetHeader(); + } + + function objectGetInstanceFromRow($oRow) + { + return testData::objectGetInstanceFromRow($oRow); + } + + function objectOutputTableRow($oObject, $sClass, $sEditLinkLabel) + { + return $this->oTestData->objectOutputTableRow($oObject, $sClass, $sEditLinkLabel); + } + + function objectDisplayQueueProcessingHelp() + { + $oTest = new testData(); + echo "<p>"; + if($oTest->canEdit) + echo "This is the list of rejected test results, waiting to be resubmitted or deleted."; + else + echo "This is the list of your rejected test results. Here you can make changes to ". + "them and resubmit them into the database."; + echo "</p>\n"; + } + + function display() + { + return $this->oTest->display(); + } + + function objectMakeUrl() + { + return $this->oTest->objectMakeUrl(); + } + + function objectMakeLink() + { + return $this->oTest->objectMakeLink(); + } } ?>

1 0

Detlef Riekenberg : localspl: DeletePort is now in localui.dll.
by Alexandre Julliard 19 Apr '07

19 Apr '07

Module: wine Branch: master Commit: 55a18d7af25af02aacd0378f015926a24790a6c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=55a18d7af25af02aacd0378f0… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Thu Apr 19 00:41:19 2007 +0200 localspl: DeletePort is now in localui.dll. --- dlls/localspl/localmon.c | 35 +---------------------------------- 1 files changed, 1 insertions(+), 34 deletions(-) diff --git a/dlls/localspl/localmon.c b/dlls/localspl/localmon.c index 4dd0664..384e1f1 100644 --- a/dlls/localspl/localmon.c +++ b/dlls/localspl/localmon.c @@ -342,39 +342,6 @@ BOOL WINAPI localmon_ConfigurePortW(LPWSTR pName, HWND hWnd, LPWSTR pPortName) } /***************************************************** - * localmon_DeletePortW [exported through MONITOREX] - * - * Delete a specific Port - * - * PARAMS - * pName [I] Servername or NULL (local Computer) - * hWnd [I] Handle to parent Window - * pPortName [I] Name of the Port, that should be deleted - * - * RETURNS - * Success: TRUE - * Failure: FALSE - * - */ -BOOL WINAPI localmon_DeletePortW(LPWSTR pName, HWND hWnd, LPWSTR pPortName) -{ - DWORD res; - HKEY hroot; - - TRACE("(%s, %p, %s)\n", debugstr_w(pName), hWnd, debugstr_w(pPortName)); - - if ((!pPortName) || (!pPortName[0])) return FALSE; - - res = RegOpenKeyW(HKEY_LOCAL_MACHINE, WinNT_CV_PortsW, &hroot); - if (res == ERROR_SUCCESS) { - res = RegDeleteValueW(hroot, pPortName); - RegCloseKey(hroot); - } - TRACE("=> %d\n", (res == ERROR_SUCCESS)); - return (res == ERROR_SUCCESS); -} - -/***************************************************** * localmon_EnumPortsW [exported through MONITOREX] * * Enumerate all local Ports @@ -685,7 +652,7 @@ LPMONITOREX WINAPI InitializePrintMonitor(LPWSTR regroot) NULL, /* localmon_AddPortW */ NULL, /* localmon_AddPortExW */ localmon_ConfigurePortW, - localmon_DeletePortW, + NULL, /* Use DeletePortUI in localui.dll */ NULL, /* localmon_GetPrinterDataFromPort */ NULL, /* localmon_SetPortTimeOuts */ localmon_XcvOpenPort,

1 0