September 2006 - Wine-Commits

Paul Vriens : wintrust: Add some documentation.
by Alexandre Julliard Sept. 7, 2006

Sept. 7, 2006

Module: wine Branch: master Commit: 1f30d8994ade283d6f02a9781f4fbc4efaa18f32 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1f30d8994ade283d6f02a97… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Tue Aug 29 19:33:00 2006 +0200 wintrust: Add some documentation. --- dlls/wintrust/register.c | 34 ++++++++++++++++++++++++++++++++++ 1 files changed, 34 insertions(+), 0 deletions(-) diff --git a/dlls/wintrust/register.c b/dlls/wintrust/register.c index 928d9e9..d01e343 100644 --- a/dlls/wintrust/register.c +++ b/dlls/wintrust/register.c @@ -34,6 +34,25 @@ WINE_DEFAULT_DEBUG_CHANNEL(wintrust); /*********************************************************************** * WintrustAddActionID (WINTRUST.@) + * + * Add the definitions of the actions a Trust provider can perform to + * the registry. + * + * PARAMS + * pgActionID [I] Pointer to a GUID for the Trust provider. + * fdwFlags [I] Flag to indicate whether registry errors are passed on. + * psProvInfo [I] Pointer to a structure with information about DLL + * name and functions. + * + * RETURNS + * Success: TRUE. + * Failure: FALSE. (Use GetLastError() for more information) + * + * NOTES + * Adding a Trust provider is basically only adding relevant information + * to the registry. No verification takes place whether a DLL or it's + * entrypoints exist. + * Information in the registry will always be overwritten. */ BOOL WINAPI WintrustAddActionID( GUID* pgActionID, DWORD fdwFlags, CRYPT_REGISTER_ACTIONID* psProvInfo) @@ -45,6 +64,21 @@ BOOL WINAPI WintrustAddActionID( GUID* p /*********************************************************************** * WintrustRemoveActionID (WINTRUST.@) + * + * Remove the definitions of the actions a Trust provider can perform + * from the registry. + * + * PARAMS + * pgActionID [I] Pointer to a GUID for the Trust provider. + * + * RETURNS + * Success: TRUE. (Use GetLastError() for more information) + * Failure: FALSE. (Use GetLastError() for more information) + * + * NOTES + * Testing shows that WintrustRemoveActionID always returns TRUE and + * that a possible error should be retrieved via GetLastError(). + * There are no checks if the definitions are in the registry. */ BOOL WINAPI WintrustRemoveActionID( GUID* pgActionID ) {

1 0

Paul Vriens : wincrypt.h: Add new OID.
by Alexandre Julliard Sept. 7, 2006

Sept. 7, 2006

Module: wine Branch: master Commit: 4b5e6b767f0ffdd6bdd75dbb51fbb3324346f35d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4b5e6b767f0ffdd6bdd75db… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Fri Sep 1 13:59:50 2006 +0200 wincrypt.h: Add new OID. --- include/wincrypt.h | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/include/wincrypt.h b/include/wincrypt.h index a64165a..18ea897 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -2514,6 +2514,9 @@ #define szOID_KP_TIME_STAMP_SIGNING #ifndef szOID_SERVER_GATED_CRYPTO #define szOID_SERVER_GATED_CRYPTO "1.3.6.1.4.1.311.10.3.3" #endif +#ifndef szOID_SGC_NETSCAPE +#define szOID_SGC_NETSCAPE "2.16.840.1.113730.4.1" +#endif #define szOID_KP_EFS "1.3.6.1.4.1.311.10.3.4" #define szOID_EFS_RECOVERY "1.3.6.1.4.1.311.10.3.4.1" #define szOID_WHQL_CRYPTO "1.3.6.1.4.1.311.10.3.5"

1 0

Paul Vriens : softpub.h: Add a GUID.
by Alexandre Julliard Sept. 7, 2006

Sept. 7, 2006

Module: wine Branch: master Commit: e4c771cd524e710c657afe30bcf33e4143847571 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e4c771cd524e710c657afe3… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Fri Sep 1 12:48:20 2006 +0200 softpub.h: Add a GUID. --- include/softpub.h | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/include/softpub.h b/include/softpub.h index 963dadd..05a43e5 100644 --- a/include/softpub.h +++ b/include/softpub.h @@ -33,6 +33,9 @@ #define WINTRUST_ACTION_GENERIC_VERIFY_V #define WINTRUST_ACTION_TRUSTPROVIDER_TEST \ { 0x573e31f8, 0xddba, 0x11d0, { 0x8c,0xcb,0x00,0xc0,0x4f,0xc2,0x95,0xee }} +#define HTTPSPROV_ACTION \ + { 0x573e31f8, 0xaaba, 0x11d0, { 0x8c,0xcb,0x00,0xc0,0x4f,0xc2,0x95,0xee }} + #define OFFICESIGN_ACTION_VERIFY \ { 0x5555c2cd, 0x17fb, 0x11d1, { 0x85,0xc4,0x00,0xc0,0x4f,0xc2,0x95,0xee }}

1 0

Paul Vriens : wintrust.h: Add a GUID.
by Alexandre Julliard Sept. 7, 2006

Sept. 7, 2006

Module: wine Branch: master Commit: 036e4ffb6eb4b45e36897a84325411890ab7bfbc URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=036e4ffb6eb4b45e36897a8… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Fri Sep 1 12:48:34 2006 +0200 wintrust.h: Add a GUID. --- include/wintrust.h | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/include/wintrust.h b/include/wintrust.h index 3d2ba8c..2e7917d 100644 --- a/include/wintrust.h +++ b/include/wintrust.h @@ -314,6 +314,9 @@ CRYPT_PROVIDER_SGNR * WINAPI WTHelperGet DWORD idxCounterSigner); CRYPT_PROVIDER_DATA * WINAPI WTHelperProvDataFromStateData(HANDLE hStateData); +#define WIN_SPUB_ACTION_PUBLISHED_SOFTWARE \ + { 0x64b9d180, 0x8da2, 0x11cf, { 0x87,0x36,0x00,0xaa,0x00,0xa4,0x85,0xeb }} + #ifdef __cplusplus } #endif

1 0

Paul Vriens : wintrust: Add some extra tests for WintrustRemoveActionID.
by Alexandre Julliard Sept. 7, 2006

Sept. 7, 2006

Module: wine Branch: master Commit: dce0d05e83d8f27e46da1bf6f77a1da5f77c4659 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=dce0d05e83d8f27e46da1bf… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Tue Aug 29 17:57:35 2006 +0200 wintrust: Add some extra tests for WintrustRemoveActionID. --- dlls/wintrust/tests/register.c | 24 ++++++++++++++++++++++-- 1 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/wintrust/tests/register.c b/dlls/wintrust/tests/register.c index f41b21d..78f2214 100644 --- a/dlls/wintrust/tests/register.c +++ b/dlls/wintrust/tests/register.c @@ -130,7 +130,7 @@ static void test_AddRem_ActionID(void) todo_wine { ok (ret, "Expected WintrustAddActionID to succeed.\n"); - ok (GetLastError() == ERROR_INVALID_PARAMETER /* W2K */, + ok (GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %ld.\n", GetLastError()); } @@ -152,7 +152,7 @@ static void test_AddRem_ActionID(void) todo_wine { ok (ret, "Expected WintrustAddActionID to succeed.\n"); - ok (GetLastError() == 0xdeadbeef /* W2K */, + ok (GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %ld.\n", GetLastError()); } @@ -163,6 +163,26 @@ static void test_AddRem_ActionID(void) ok ( ret, "WintrustRemoveActionID failed : 0x%08lx\n", GetLastError()); ok ( GetLastError() == 0xdeadbeef, "Last error should not have been changed: 0x%08lx\n", GetLastError()); } + + /* NULL input */ + SetLastError(0xdeadbeef); + ret = pWintrustRemoveActionID(NULL); + todo_wine + { + ok (ret, "Expected WintrustRemoveActionID to succeed.\n"); + ok (GetLastError() == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %ld.\n", GetLastError()); + } + + /* The passed GUID is removed by a previous call, so it's basically a test with a non-existent Trust provider */ + SetLastError(0xdeadbeef); + ret = pWintrustRemoveActionID(&ActionID); + todo_wine + { + ok (ret, "Expected WintrustRemoveActionID to succeed.\n"); + ok (GetLastError() == 0xdeadbeef, + "Expected 0xdeadbeef, got %ld.\n", GetLastError()); + } } START_TEST(register)

1 0

appdb/ ./appview.php admin/adminBugs.php inclu ...
by WineHQ Sept. 6, 2006

Sept. 6, 2006

ChangeSet ID: 27751 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/09/05 20:43:30 Modified files: . : appview.php admin : adminBugs.php include : bugs.php version.php Log message: "EA Durbin" <ead1234(a)hotmail.com> Standardize the case of Bug class constructors Patch: http://cvs.winehq.org/patch.py?id=27751 Old revision New revision Changes Path 1.95 1.96 +3 -3 appdb/appview.php 1.12 1.13 +2 -2 appdb/admin/adminBugs.php 1.15 1.16 +1 -1 appdb/include/bugs.php 1.80 1.81 +1 -1 appdb/include/version.php Index: appdb/appview.php diff -u -p appdb/appview.php:1.95 appdb/appview.php:1.96 --- appdb/appview.php:1.95 6 Sep 2006 1:43:30 -0000 +++ appdb/appview.php 6 Sep 2006 1:43:30 -0000 @@ -91,7 +91,7 @@ if ($aClean['sSub']) $_SESSION['current']->isMaintainer($oVersion->iVersionId) || $_SESSION['current']->isSuperMaintainer($oVersion->iAppId))) { - $oBuglink = new bug($aClean['iBuglinkId']); + $oBuglink = new Bug($aClean['iBuglinkId']); $oBuglink->delete(); util_redirect_and_exit(apidb_fullurl("appview.php?iVersionId=".$aClean['iVersionId'])); } @@ -103,7 +103,7 @@ if ($aClean['sSub']) $_SESSION['current']->isMaintainer($oVersion->iVersionId) || $_SESSION['current']->isSuperMaintainer($oVersion->iAppId))) { - $oBuglink = new bug($aClean['iBuglinkId']); + $oBuglink = new Bug($aClean['iBuglinkId']); $oBuglink->unqueue(); util_redirect_and_exit(apidb_fullurl("appview.php?iVersionId=".$aClean['iVersionId'])); } @@ -111,7 +111,7 @@ if ($aClean['sSub']) } if(($aClean['sSub'] == 'Submit a new bug link.' ) && ($aClean['iBuglinkId'])) { - $oBuglink = new bug(); + $oBuglink = new Bug(); $oBuglink->create($aClean['iVersionId'],$aClean['iBuglinkId']); util_redirect_and_exit(apidb_fullurl("appview.php?iVersionId=".$aClean['iVersionId'])); } Index: appdb/admin/adminBugs.php diff -u -p appdb/admin/adminBugs.php:1.12 appdb/admin/adminBugs.php:1.13 --- appdb/admin/adminBugs.php:1.12 6 Sep 2006 1:43:30 -0000 +++ appdb/admin/adminBugs.php 6 Sep 2006 1:43:30 -0000 @@ -27,12 +27,12 @@ if ($aClean['sSub']) { if(($aClean['sSub'] == 'delete' ) && ($aClean['iBuglinkId'])) { - $oBuglink = new bug($aClean['iBuglinkId']); + $oBuglink = new Bug($aClean['iBuglinkId']); $oBuglink->delete(); } if(($aClean['sSub'] == 'unqueue' ) && ($aClean['iBuglinkId'])) { - $oBuglink = new bug($aClean['iBuglinkId']); + $oBuglink = new Bug($aClean['iBuglinkId']); $oBuglink->unqueue(); } util_redirect_and_exit($_SERVER['PHP_SELF']."?iItemsPerPage=".$aClean['iItemsPerPage']."&sQueuedOnly=".$aClean['sQueuedOnly']."&iPage=".$aClean['iPage']); Index: appdb/include/bugs.php diff -u -p appdb/include/bugs.php:1.15 appdb/include/bugs.php:1.16 --- appdb/include/bugs.php:1.15 6 Sep 2006 1:43:30 -0000 +++ appdb/include/bugs.php 6 Sep 2006 1:43:30 -0000 @@ -301,7 +301,7 @@ function view_version_bugs($iVersionId = $c = 0; foreach($aBuglinkIds as $iBuglinkId) { - $oBuglink = new bug($iBuglinkId); + $oBuglink = new Bug($iBuglinkId); // set row color $bgcolor = ($c % 2 == 0) ? "color0" : "color1"; Index: appdb/include/version.php diff -u -p appdb/include/version.php:1.80 appdb/include/version.php:1.81 --- appdb/include/version.php:1.80 6 Sep 2006 1:43:30 -0000 +++ appdb/include/version.php 6 Sep 2006 1:43:30 -0000 @@ -255,7 +255,7 @@ class Version { foreach($this->aBuglinkIds as $iBug_id) { - $oBug = new bug($iBug_id); + $oBug = new Bug($iBug_id); $oBug->delete($bSilent); }

1 0

appdb/include screenshot.php
by WineHQ Sept. 6, 2006

Sept. 6, 2006

ChangeSet ID: 27750 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/09/05 20:42:25 Modified files: include : screenshot.php Log message: "EA Durbin" <ead1234(a)hotmail.com> Standardize all Image constructors to match the case defined in the Image class Patch: http://cvs.winehq.org/patch.py?id=27750 Old revision New revision Changes Path 1.49 1.50 +1 -1 appdb/include/screenshot.php Index: appdb/include/screenshot.php diff -u -p appdb/include/screenshot.php:1.49 appdb/include/screenshot.php:1.50 --- appdb/include/screenshot.php:1.49 6 Sep 2006 1:42:25 -0000 +++ appdb/include/screenshot.php 6 Sep 2006 1:42:25 -0000 @@ -7,7 +7,7 @@ require_once(BASE."include/util.php"); require_once(BASE."include/image.php"); // load the watermark -$watermark = new image("/images/watermark.png"); +$watermark = new Image("/images/watermark.png"); /** * Screenshot class for handling screenshots and thumbnails

1 0

appdb/include tableve.php
by WineHQ Sept. 1, 2006

Sept. 1, 2006

ChangeSet ID: 27749 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/08/31 21:28:38 Modified files: include : tableve.php Log message: "EA Durbin" <ead1234(a)hotmail.com> Standardize the case of all User constructors to match the case defined in the class. Patch: http://cvs.winehq.org/patch.py?id=27749 Old revision New revision Changes Path 1.12 1.13 +1 -1 appdb/include/tableve.php Index: appdb/include/tableve.php diff -u -p appdb/include/tableve.php:1.12 appdb/include/tableve.php:1.13 --- appdb/include/tableve.php:1.12 1 Sep 2006 2:28:38 -0000 +++ appdb/include/tableve.php 1 Sep 2006 2:28:38 -0000 @@ -280,7 +280,7 @@ class TableVE { if($field->name == "lastmodby") { - $user = new user(); + $user = new User(); $name = $user->lookup_realname($value); if(!$name) $name = "system";

1 0

appdb/include comment.php
by WineHQ Sept. 1, 2006

Sept. 1, 2006

ChangeSet ID: 27748 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/08/31 21:27:31 Modified files: include : comment.php Log message: "EA Durbin" <ead1234(a)hotmail.com> Add user.php to includes as comment.php creates a new user. Patch: http://cvs.winehq.org/patch.py?id=27748 Old revision New revision Changes Path 1.30 1.31 +1 -1 appdb/include/comment.php Index: appdb/include/comment.php diff -u -p appdb/include/comment.php:1.30 appdb/include/comment.php:1.31 --- appdb/include/comment.php:1.30 1 Sep 2006 2:27:31 -0000 +++ appdb/include/comment.php 1 Sep 2006 2:27:31 -0000 @@ -2,7 +2,7 @@ /***************************************/ /* comment class and related functions */ /***************************************/ - +require_once(BASE."include/user.php"); /** * Comment class for handling comments

1 0

appdb/include note.php
by WineHQ Sept. 1, 2006

Sept. 1, 2006

ChangeSet ID: 27747 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/08/31 21:25:18 Modified files: include : note.php Log message: "EA Durbin" <ead1234(a)hotmail.com> Add version.php to includes as notes.php calls a new Version constructor. Patch: http://cvs.winehq.org/patch.py?id=27747 Old revision New revision Changes Path 1.16 1.17 +1 -0 appdb/include/note.php Index: appdb/include/note.php diff -u -p appdb/include/note.php:1.16 appdb/include/note.php:1.17 --- appdb/include/note.php:1.16 1 Sep 2006 2:25:18 -0000 +++ appdb/include/note.php 1 Sep 2006 2:25:18 -0000 @@ -1,5 +1,6 @@ <?php require_once(BASE."include/util.php"); +require_once(BASE."include/version.php"); $aClean = array(); //array of filtered user input $aClean['sReplyText'] = makeSafe( $_REQUEST['sReplyText'] );

1 0