September 2007 - Wine-Commits

Francois Gouget : crypt32: Better match the PSDK types and fix the winapi_check warnings.
by Alexandre Julliard Sept. 10, 2007

Sept. 10, 2007

Module: wine Branch: master Commit: 4aed59ef5b246fead260256631ab2a18d99a37f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4aed59ef5b246fead26025663… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Sep 1 02:45:39 2007 +0200 crypt32: Better match the PSDK types and fix the winapi_check warnings. --- include/wincrypt.h | 4 ++-- tools/winapi/win32.api | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/include/wincrypt.h b/include/wincrypt.h index 3213b4a..890934c 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -3537,7 +3537,7 @@ BOOL WINAPI CertCreateCertificateChainEngine(PCERT_CHAIN_ENGINE_CONFIG pConfig, BOOL WINAPI CertResyncCertificateChainEngine(HCERTCHAINENGINE hChainEngine); -void WINAPI CertFreeCertificateChainEngine(HCERTCHAINENGINE hChainEngine); +VOID WINAPI CertFreeCertificateChainEngine(HCERTCHAINENGINE hChainEngine); BOOL WINAPI CertGetCertificateChain(HCERTCHAINENGINE hChainEngine, PCCERT_CONTEXT pCertContext, LPFILETIME pTime, HCERTSTORE hAdditionalStore, @@ -3547,7 +3547,7 @@ BOOL WINAPI CertGetCertificateChain(HCERTCHAINENGINE hChainEngine, PCCERT_CHAIN_CONTEXT WINAPI CertDuplicateCertificateChain( PCCERT_CHAIN_CONTEXT pChainContext); -void WINAPI CertFreeCertificateChain(PCCERT_CHAIN_CONTEXT pChainContext); +VOID WINAPI CertFreeCertificateChain(PCCERT_CHAIN_CONTEXT pChainContext); PCCERT_CHAIN_CONTEXT WINAPI CertFindChainInStore(HCERTSTORE hCertStore, DWORD dwCertEncodingType, DWORD dwFindFlags, DWORD dwFindType, diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api index 8f6e35d..e82bd49 100644 --- a/tools/winapi/win32.api +++ b/tools/winapi/win32.api @@ -696,6 +696,7 @@ ALG_ID BOOL DWORD HANDLE +HCRYPTASN1MODULE HCRYPTMSG HCRYPTPROV HCRYPTPROV_LEGACY @@ -706,6 +707,9 @@ ULONG %ptr +ASN1decoding_t +ASN1encoding_t +ASN1module_t BOOL * BYTE * CERT_EXTENSION[] @@ -733,6 +737,7 @@ LPFILETIME LPSTR * LPVOID LPWSTR * +PCCERT_CHAIN_CONTEXT PCCERT_CHAIN_CONTEXT * PCCERT_CONTEXT PCCERT_CONTEXT *

1 0

Francois Gouget : quartz: Make errors. h more complete and better match the PSDK types.
by Alexandre Julliard Sept. 10, 2007

Sept. 10, 2007

Module: wine Branch: master Commit: c0716ef18ca02e46c1fc3b552a8004ff1c647176 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0716ef18ca02e46c1fc3b552… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Sep 1 02:45:13 2007 +0200 quartz: Make errors.h more complete and better match the PSDK types. --- include/errors.h | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/include/errors.h b/include/errors.h index eed221f..c8c3067 100644 --- a/include/errors.h +++ b/include/errors.h @@ -23,14 +23,19 @@ extern "C" { #endif +#define AMOVIEAPI + #define VFW_FIRST_CODE 0x200 #define MAX_ERROR_TEXT_LEN 160 #include <vfwmsgs.h> -DWORD WINAPI AMGetErrorTextA(HRESULT hr, char *buffer, DWORD maxlen); -DWORD WINAPI AMGetErrorTextW(HRESULT hr, WCHAR *buffer, DWORD maxlen); +typedef BOOL (WINAPI* AMGETERRORTEXTPROCA)(HRESULT,char*,DWORD); +typedef BOOL (WINAPI* AMGETERRORTEXTPROCW)(HRESULT,WCHAR*,DWORD); +DECL_WINELIB_TYPE_AW(AMGETERRORTEXTPROC) +DWORD WINAPI AMGetErrorTextA(HRESULT,LPSTR,DWORD); +DWORD WINAPI AMGetErrorTextW(HRESULT,LPWSTR,DWORD); #define AMGetErrorText WINELIB_NAME_AW(AMGetErrorText) #ifdef __cplusplus

1 0

Francois Gouget : rpcrt4: Update win32.api to fix the winapi_check warnings .
by Alexandre Julliard Sept. 10, 2007

Sept. 10, 2007

Module: wine Branch: master Commit: e32fa84bb24a9d88624e0b7b10ef2f77c0b33c69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e32fa84bb24a9d88624e0b7b1… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Sep 1 02:44:28 2007 +0200 rpcrt4: Update win32.api to fix the winapi_check warnings. --- tools/winapi/win32.api | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api index 43a88f6..498ca49 100644 --- a/tools/winapi/win32.api +++ b/tools/winapi/win32.api @@ -4245,6 +4245,8 @@ UUID_VECTOR * ULONG * struct IRpcChannelBuffer * struct IRpcStubBuffer * +char * +char ** twr_t * twr_t ** unsigned char *

1 0

Francois Gouget : vdmdbg: Update win32.api to fix the winapi_check warnings .
by Alexandre Julliard Sept. 10, 2007

Sept. 10, 2007

Module: wine Branch: master Commit: 823f386914ce83ed1cec5fd42c046de5d1b83ab7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=823f386914ce83ed1cec5fd42… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Sep 1 02:44:47 2007 +0200 vdmdbg: Update win32.api to fix the winapi_check warnings. --- tools/winapi/win32.api | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api index e263ed1..ee16018 100644 --- a/tools/winapi/win32.api +++ b/tools/winapi/win32.api @@ -5316,6 +5316,18 @@ LPDWORD LPOVERLAPPED LPVOID +%%vdmdbg.dll + +%long + +DWORD +INT +LPARAM + +%ptr + +TASKENUMPROC + %%version.dll %long

1 0

Francois Gouget : shobjidl.h: Add missing #include directives, and some commented-out ones as reminders.
by Alexandre Julliard Sept. 10, 2007

Sept. 10, 2007

Module: wine Branch: master Commit: b1ed9ce820ee01cf30dae50640ea3ff4f61d49fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1ed9ce820ee01cf30dae5064… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Sep 1 02:44:52 2007 +0200 shobjidl.h: Add missing #include directives, and some commented-out ones as reminders. --- include/shobjidl.idl | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/include/shobjidl.idl b/include/shobjidl.idl index 474b264..5e937dc 100644 --- a/include/shobjidl.idl +++ b/include/shobjidl.idl @@ -22,12 +22,18 @@ import "objidl.idl"; import "oleidl.idl"; import "oaidl.idl"; +import "docobj.idl"; import "shtypes.idl"; import "servprov.idl"; import "comcat.idl"; import "propidl.idl"; -/*import "prsht.idl";*/ -/*import "msxml.idl";*/ +/* FIXME: import "prsht.idl";*/ +import "msxml.idl"; +import "wtypes.idl"; +/* FIXME: import "propsys.idl"; */ +/* FIXME: import "structuredquery.idl"; */ + +cpp_quote("/* FIXME: #include <sherrors.h> */") /*****************************************************************************

1 0

Francois Gouget : schannel: Update win32. api to fix the winapi_check warnings.
by Alexandre Julliard Sept. 10, 2007

Sept. 10, 2007

Module: wine Branch: master Commit: 48ae1a47bc942873296ea42615458307ae7eb9ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=48ae1a47bc942873296ea4261… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Sep 1 02:44:33 2007 +0200 schannel: Update win32.api to fix the winapi_check warnings. --- tools/winapi/win32.api | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api index 498ca49..e263ed1 100644 --- a/tools/winapi/win32.api +++ b/tools/winapi/win32.api @@ -4295,6 +4295,19 @@ LPSTR LPCWSTR +%%schannel.dll + +%long + +NTSTATUS +ULONG + +%ptr + +PSECPKG_FUNCTION_TABLE * +PSECPKG_USER_FUNCTION_TABLE * +PULONG + %%secur32.dll %long

1 0

Francois Gouget : spoolss: Update win32. api to fix the winapi_check warnings.
by Alexandre Julliard Sept. 10, 2007

Sept. 10, 2007

Module: wine Branch: master Commit: 225ff4307621a979df24df812b6a77728e8b64ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=225ff4307621a979df24df812… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Sep 1 02:44:37 2007 +0200 spoolss: Update win32.api to fix the winapi_check warnings. --- tools/winapi/win32.api | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api index 8f396b9..43a88f6 100644 --- a/tools/winapi/win32.api +++ b/tools/winapi/win32.api @@ -4823,6 +4823,24 @@ SnmpVarBind * SnmpVarBindList * UINT * +%%spoolss.dll + +%long + +BOOL +DWORD +HANDLE + +%ptr + +LPBYTE +LPVOID + +%wstr + +LPCWSTR +LPWSTR + %%sti.dll %long

1 0

appdb/include version.php
by WineHQ Sept. 8, 2007

Sept. 8, 2007

ChangeSet ID: 31365 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/09/08 19:32:29 Modified files: include : version.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Fix obsolete notice in setup emails Patch: http://cvs.winehq.org/patch.py?id=31365 Old revision New revision Changes Path 1.152 1.153 +1 -0 appdb/include/version.php Index: appdb/include/version.php diff -u -p appdb/include/version.php:1.152 appdb/include/version.php:1.153 --- appdb/include/version.php:1.152 9 Sep 2007 0:32:29 -0000 +++ appdb/include/version.php 9 Sep 2007 0:32:29 -0000 @@ -207,6 +207,7 @@ class version { { if(!query_parameters("UPDATE appVersion SET obsoleteBy = '?' WHERE versionId = '?'", $this->iObsoleteBy, $this->iVersionId)) + return FALSE; if($this->iObsoleteBy) $sWhatChanged .= "The version was marked as obsolete.\n\n";

1 0

appdb/ include/application.php include/version ...
by WineHQ Sept. 8, 2007

Sept. 8, 2007

ChangeSet ID: 31364 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/09/08 17:52:00 Modified files: include : application.php version.php vote.php tables : appdb_tables.sql Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Allow marking versions as obsolete Patch: http://cvs.winehq.org/patch.py?id=31364 Old revision New revision Changes Path 1.127 1.128 +32 -4 appdb/include/application.php 1.151 1.152 +71 -0 appdb/include/version.php 1.30 1.31 +26 -18 appdb/include/vote.php 1.34 1.35 +1 -0 appdb/tables/appdb_tables.sql

1 0

appdb/include application.php distribution.php ...
by WineHQ Sept. 8, 2007

Sept. 8, 2007

ChangeSet ID: 31363 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/09/08 17:42:34 Modified files: include : application.php distribution.php objectManager.php vendor.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Only show the 'add entry' link if the class has enabled it. The link is only useful for classes that have no parent objects. The objectShowAddEntry() method is not required because it only affects the user interface. Patch: http://cvs.winehq.org/patch.py?id=31363 Old revision New revision Changes Path 1.126 1.127 +5 -0 appdb/include/application.php 1.46 1.47 +5 -0 appdb/include/distribution.php 1.50 1.51 +11 -3 appdb/include/objectManager.php 1.37 1.38 +5 -0 appdb/include/vendor.php Index: appdb/include/application.php diff -u -p appdb/include/application.php:1.126 appdb/include/application.php:1.127 --- appdb/include/application.php:1.126 8 Sep 2007 22:42:34 -0000 +++ appdb/include/application.php 8 Sep 2007 22:42:34 -0000 @@ -1068,6 +1068,11 @@ class Application { { return $this->iAppId; } + + function objectShowAddEntry() + { + return TRUE; + } } function get_vendor_from_keywords($sKeywords) Index: appdb/include/distribution.php diff -u -p appdb/include/distribution.php:1.46 appdb/include/distribution.php:1.47 --- appdb/include/distribution.php:1.46 8 Sep 2007 22:42:34 -0000 +++ appdb/include/distribution.php 8 Sep 2007 22:42:34 -0000 @@ -669,6 +669,11 @@ class distribution { { return FALSE; } + + function objectShowAddEntry() + { + return TRUE; + } } ?> Index: appdb/include/objectManager.php diff -u -p appdb/include/objectManager.php:1.50 appdb/include/objectManager.php:1.51 --- appdb/include/objectManager.php:1.50 8 Sep 2007 22:42:34 -0000 +++ appdb/include/objectManager.php 8 Sep 2007 22:42:34 -0000 @@ -130,8 +130,14 @@ class ObjectManager break; } - echo "<br /><center><a href=\"".$this->makeUrl("add", false, - "Add $this->sClass entry")."\">Add an entry?</a></center>"; + if(method_exists($oObject, "objectShowAddEntry") && + $oObject->objectShowAddEntry()) + { + echo "<br /><center><a href=\"". + $this->makeUrl("add", false, + "Add $this->sClass entry"). + "\">Add an entry?</a></center>"; + } return; } @@ -187,7 +193,9 @@ class ObjectManager echo "</table>"; $oObject = new $this->sClass(); - if($oObject->canEdit()) + if($oObject->canEdit() && + method_exists($oObject, "objectShowAddEntry") && + $oObject->objectShowAddEntry()) { echo "<br /><br /><a href=\"".$this->makeUrl("add", false, "Add $this->sClass")."\">Add entry</a>\n"; Index: appdb/include/vendor.php diff -u -p appdb/include/vendor.php:1.37 appdb/include/vendor.php:1.38 --- appdb/include/vendor.php:1.37 8 Sep 2007 22:42:34 -0000 +++ appdb/include/vendor.php 8 Sep 2007 22:42:34 -0000 @@ -395,6 +395,11 @@ class Vendor { $iDefaultPerPage = 25; return array($aItemsPerPage, $iDefaultPerPage); } + + function objectShowAddEntry() + { + return TRUE; + } } ?>

1 0