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

Rob Shearman : include: Add credential serialisation APIs to wincred.h.
by Alexandre Julliard 13 Mar '07

13 Mar '07

Module: wine Branch: master Commit: 213f645a109e22cbcf7be5ab4bd2918b979764c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=213f645a109e22cbcf7be5ab4… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Mar 13 12:38:46 2007 +0000 include: Add credential serialisation APIs to wincred.h. --- include/wincred.h | 97 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 97 insertions(+), 0 deletions(-) diff --git a/include/wincred.h b/include/wincred.h index b44a83f..983bcb4 100644 --- a/include/wincred.h +++ b/include/wincred.h @@ -35,6 +35,60 @@ typedef struct _SecHandle typedef SecHandle CtxtHandle; typedef PSecHandle PCtxtHandle; +typedef struct _CREDENTIAL_ATTRIBUTEA +{ + LPSTR Keyword; + DWORD Flags; + DWORD ValueSize; + LPBYTE Value; +} CREDENTIAL_ATTRIBUTEA, *PCREDENTIAL_ATTRIBUTEA; + +typedef struct _CREDENTIAL_ATTRIBUTEW +{ + LPWSTR Keyword; + DWORD Flags; + DWORD ValueSize; + LPBYTE Value; +} CREDENTIAL_ATTRIBUTEW, *PCREDENTIAL_ATTRIBUTEW; + +DECL_WINELIB_TYPE_AW(CREDENTIAL_ATTRIBUTE) +DECL_WINELIB_TYPE_AW(PCREDENTIAL_ATTRIBUTE) + +typedef struct _CREDENTIALA +{ + DWORD Flags; + DWORD Type; + LPSTR TargetName; + LPSTR Comment; + FILETIME LastWritten; + DWORD CredentialBlobSize; + LPBYTE CredentialBlob; + DWORD Persist; + DWORD AttributeCount; + PCREDENTIAL_ATTRIBUTEA Attribute; + LPSTR TargetAlias; + LPSTR UserName; +} CREDENTIALA, *PCREDENTIALA; + +typedef struct _CREDENTIALW +{ + DWORD Flags; + DWORD Type; + LPWSTR TargetName; + LPWSTR Comment; + FILETIME LastWritten; + DWORD CredentialBlobSize; + LPBYTE CredentialBlob; + DWORD Persist; + DWORD AttributeCount; + PCREDENTIAL_ATTRIBUTEW Attribute; + LPWSTR TargetAlias; + LPWSTR UserName; +} CREDENTIALW, *PCREDENTIALW; + +DECL_WINELIB_TYPE_AW(CREDENTIAL) +DECL_WINELIB_TYPE_AW(PCREDENTIAL) + typedef struct _CREDUI_INFOA { DWORD cbSize; @@ -53,6 +107,9 @@ typedef struct _CREDUI_INFOW HBITMAP hbmBanner; } CREDUI_INFOW, *PCREDUI_INFOW; +DECL_WINELIB_TYPE_AW(CREDUI_INFO) +DECL_WINELIB_TYPE_AW(PCREDUI_INFO) + #define CRED_MAX_STRING_LENGTH 256 #define CRED_MAX_USERNAME_LENGTH 513 #define CRED_MAX_GENERIC_TARGET_NAME_LENGTH 32767 @@ -69,6 +126,26 @@ typedef struct _CREDUI_INFOW #define CREDUI_MAX_USERNAME_LENGTH CRED_MAX_USERNAME_LENGTH #define CREDUI_MAX_PASSWORD_LENGTH (CRED_MAX_CREDENTIAL_BLOB_SIZE / 2) +/* flags for CREDENTIAL::Flags */ +#define CRED_FLAGS_PASSWORD_FOR_CERT 0x0001 +#define CRED_FLAGS_PROMPT_NOW 0x0002 +#define CRED_FLAGS_USERNAME_TARGET 0x0004 +#define CRED_FLAGS_OWF_CRED_BLOB 0x0008 +#define CRED_FLAGS_VALID_FLAGS 0x000f + +/* values for CREDENTIAL::Type */ +#define CRED_TYPE_GENERIC 1 +#define CRED_TYPE_DOMAIN_PASSWORD 2 +#define CRED_TYPE_DOMAIN_CERTIFICATE 3 +#define CRED_TYPE_DOMAIN_VISIBLE_PASSWORD 4 +#define CRED_TYPE_MAXIMUM 5 + +/* values for CREDENTIAL::Persist */ +#define CRED_PERSIST_NONE 0 +#define CRED_PERSIST_SESSION 1 +#define CRED_PERSIST_LOCAL_MACHINE 2 +#define CRED_PERSIST_ENTERPRISE 3 + #define CREDUI_FLAGS_INCORRECT_PASSWORD 0x00000001 #define CREDUI_FLAGS_DO_NOT_PERSIST 0x00000002 #define CREDUI_FLAGS_REQUEST_ADMINISTRATOR 0x00000004 @@ -87,6 +164,26 @@ typedef struct _CREDUI_INFOW #define CREDUI_FLAGS_USERNAME_TARGET_CREDENTIALS 0x00080000 #define CREDUI_FLAGS_KEEP_USERNAME 0x00100000 +/* flags for CredWrite and CredWriteDomainCredentials */ +#define CRED_PRESERVE_CREDENTIAL_BLOB 0x00000001 + +BOOL WINAPI CredDeleteA(LPCSTR,DWORD,DWORD); +BOOL WINAPI CredDeleteW(LPCWSTR,DWORD,DWORD); +#define CredDelete WINELIB_NAME_AW(CredDelete) +BOOL WINAPI CredEnumerateA(LPCSTR,DWORD,DWORD *,PCREDENTIALA **); +BOOL WINAPI CredEnumerateW(LPCWSTR,DWORD,DWORD *,PCREDENTIALW **); +#define CredEnumerate WINELIB_NAME_AW(CredEnumerate) +VOID WINAPI CredFree(PVOID); +BOOL WINAPI CredReadA(LPCSTR,DWORD,DWORD,PCREDENTIALA *); +BOOL WINAPI CredReadW(LPCWSTR,DWORD,DWORD,PCREDENTIALW *); +#define CredRead WINELIB_NAME_AW(CredRead) +BOOL WINAPI CredRenameA(LPCSTR,LPCSTR,DWORD,DWORD); +BOOL WINAPI CredRenameW(LPCWSTR,LPCWSTR,DWORD,DWORD); +#define CredRename WINELIB_NAME_AW(CredRename) +BOOL WINAPI CredWriteA(PCREDENTIALA,DWORD); +BOOL WINAPI CredWriteW(PCREDENTIALW,DWORD); +#define CredWrite WINELIB_NAME_AW(CredWrite) + DWORD WINAPI CredUICmdLinePromptForCredentialsW(PCWSTR,PCtxtHandle,DWORD,PWSTR,ULONG,PWSTR,ULONG,PBOOL,DWORD); DWORD WINAPI CredUICmdLinePromptForCredentialsA(PCSTR,PCtxtHandle,DWORD,PSTR,ULONG,PSTR,ULONG,PBOOL,DWORD); #define CredUICmdLinePromptForCredentials WINELIB_NAME_AW(CredUICmdLinePromptForCredentials)

1 0

Rob Shearman : ole32: Don't allocate an initial table for bind contexts.
by Alexandre Julliard 13 Mar '07

13 Mar '07

Module: wine Branch: master Commit: 2815cd8ef49ad57261b377d9721ab9b62ddc1597 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2815cd8ef49ad57261b377d97… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Mar 13 12:38:03 2007 +0000 ole32: Don't allocate an initial table for bind contexts. Most users of bind contexts don't use bound objects or object params, so don't create an initial table. Instead, create it on demand and use an exponential algorithm for increasing the size of the table when full. --- dlls/ole32/bindctx.c | 80 ++++++++++++++++++++++++++----------------------- 1 files changed, 42 insertions(+), 38 deletions(-) diff --git a/dlls/ole32/bindctx.c b/dlls/ole32/bindctx.c index 1dc702d..6e87128 100644 --- a/dlls/ole32/bindctx.c +++ b/dlls/ole32/bindctx.c @@ -33,9 +33,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole); -/* represent the first size table and it's increment block size */ -#define BLOCK_TAB_SIZE 10 -#define MAX_TAB_SIZE 0xFFFFFFFF +#define BINDCTX_FIRST_TABLE_SIZE 4 /* data structure of the BindCtx table elements */ typedef struct BindCtxObject{ @@ -66,6 +64,7 @@ typedef struct BindCtxImpl{ /* IBindCtx prototype functions : */ static HRESULT WINAPI BindCtxImpl_ReleaseBoundObjects(IBindCtx*); static HRESULT BindCtxImpl_GetObjectIndex(BindCtxImpl*, IUnknown*, LPOLESTR, DWORD *); +static HRESULT BindCtxImpl_ExpandTable(BindCtxImpl *); /******************************************************************************* * BindCtx_QueryInterface @@ -160,6 +159,13 @@ BindCtxImpl_RegisterObjectBound(IBindCtx* iface,IUnknown* punk) if (punk==NULL) return S_OK; + if (lastIndex == This->bindCtxTableSize) + { + HRESULT hr = BindCtxImpl_ExpandTable(This); + if (FAILED(hr)) + return hr; + } + IUnknown_AddRef(punk); /* put the object in the first free element in the table */ @@ -168,20 +174,6 @@ BindCtxImpl_RegisterObjectBound(IBindCtx* iface,IUnknown* punk) This->bindCtxTable[lastIndex].regType = 0; lastIndex= ++This->bindCtxTableLastIndex; - if (lastIndex == This->bindCtxTableSize){ /* the table is full so it must be resized */ - - if (This->bindCtxTableSize > (MAX_TAB_SIZE-BLOCK_TAB_SIZE)){ - FIXME("This->bindCtxTableSize: %d is out of data limite\n", This->bindCtxTableSize); - return E_FAIL; - } - - This->bindCtxTableSize+=BLOCK_TAB_SIZE; /* new table size */ - - This->bindCtxTable = HeapReAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,This->bindCtxTable, - This->bindCtxTableSize * sizeof(BindCtxObject)); - if (!This->bindCtxTable) - return E_OUTOFMEMORY; - } return S_OK; } @@ -330,6 +322,14 @@ BindCtxImpl_RegisterObjectParam(IBindCtx* iface,LPOLESTR pszkey, IUnknown* punk) IUnknown_AddRef(punk); return S_OK; } + + if (This->bindCtxTableLastIndex == This->bindCtxTableSize) + { + HRESULT hr = BindCtxImpl_ExpandTable(This); + if (FAILED(hr)) + return hr; + } + This->bindCtxTable[This->bindCtxTableLastIndex].pObj = punk; This->bindCtxTable[This->bindCtxTableLastIndex].regType = 1; @@ -350,21 +350,6 @@ BindCtxImpl_RegisterObjectParam(IBindCtx* iface,LPOLESTR pszkey, IUnknown* punk) This->bindCtxTableLastIndex++; - if (This->bindCtxTableLastIndex == This->bindCtxTableSize) - { - /* table is full ! must be resized */ - - This->bindCtxTableSize+=BLOCK_TAB_SIZE; /* new table size */ - if (This->bindCtxTableSize > (MAX_TAB_SIZE-BLOCK_TAB_SIZE)) - { - FIXME("This->bindCtxTableSize: %d is out of data limite\n", This->bindCtxTableSize); - return E_FAIL; - } - This->bindCtxTable = HeapReAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,This->bindCtxTable, - This->bindCtxTableSize * sizeof(BindCtxObject)); - if (!This->bindCtxTable) - return E_OUTOFMEMORY; - } IUnknown_AddRef(punk); return S_OK; } @@ -483,6 +468,29 @@ static HRESULT BindCtxImpl_GetObjectIndex(BindCtxImpl* This, return S_FALSE; } +static HRESULT BindCtxImpl_ExpandTable(BindCtxImpl *This) +{ + if (!This->bindCtxTableSize) + { + This->bindCtxTableSize = BINDCTX_FIRST_TABLE_SIZE; + This->bindCtxTable = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY, + This->bindCtxTableSize * sizeof(BindCtxObject)); + } + else + { + This->bindCtxTableSize *= 2; + + This->bindCtxTable = HeapReAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,This->bindCtxTable, + This->bindCtxTableSize * sizeof(BindCtxObject)); + } + + if (!This->bindCtxTable) + return E_OUTOFMEMORY; + + return S_OK; +} + + /* Virtual function table for the BindCtx class. */ static const IBindCtxVtbl VT_BindCtxImpl = { @@ -524,13 +532,9 @@ static HRESULT BindCtxImpl_Construct(BindCtxImpl* This) This->bindOption2.pServerInfo = 0; /* Initialize the bindctx table */ - This->bindCtxTableSize=BLOCK_TAB_SIZE; + This->bindCtxTableSize=0; This->bindCtxTableLastIndex=0; - This->bindCtxTable = HeapAlloc(GetProcessHeap(), 0, - This->bindCtxTableSize*sizeof(BindCtxObject)); - - if (This->bindCtxTable==NULL) - return E_OUTOFMEMORY; + This->bindCtxTable = NULL; return S_OK; }

1 0

Rob Shearman : ole32: OleCreate shouldn' t pass CLSCTX_LOCAL_SERVER to CoCreateInstance.
by Alexandre Julliard 13 Mar '07

13 Mar '07

Module: wine Branch: master Commit: 39f0f9d52ad634f11096b44161515ffbb29b7969 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39f0f9d52ad634f11096b4416… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Mar 13 12:41:18 2007 +0000 ole32: OleCreate shouldn't pass CLSCTX_LOCAL_SERVER to CoCreateInstance. --- dlls/ole32/ole2.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index 8b3103f..6d15245 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -2327,7 +2327,7 @@ HRESULT WINAPI OleCreate( FIXME("\n\t%s\n\t%s semi-stub!\n", debugstr_guid(rclsid), debugstr_guid(riid)); - hres = CoCreateInstance(rclsid, 0, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER|CLSCTX_LOCAL_SERVER , riid, (LPVOID*)&pUnk); + hres = CoCreateInstance(rclsid, 0, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, riid, (LPVOID*)&pUnk); if (SUCCEEDED(hres)) hres = IStorage_SetClass(pStg, rclsid);

1 0

Alexandre Julliard : msvcrt: Improved _local_unwind2 implementation.
by Alexandre Julliard 13 Mar '07

13 Mar '07

Module: wine Branch: master Commit: 35d728ef50b640113df0005360e873ae997b0f31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35d728ef50b640113df000536… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 13 15:53:09 2007 +0100 msvcrt: Improved _local_unwind2 implementation. Thanks to Dmitry Timoshkov for a test case. --- dlls/msvcrt/except.c | 24 +++++++++++------------- 1 files changed, 11 insertions(+), 13 deletions(-) diff --git a/dlls/msvcrt/except.c b/dlls/msvcrt/except.c index 51fd82d..f204e8b 100644 --- a/dlls/msvcrt/except.c +++ b/dlls/msvcrt/except.c @@ -88,7 +88,7 @@ static DWORD MSVCRT_nested_handler(PEXCEPTION_RECORD rec, PCONTEXT context, EXCEPTION_REGISTRATION_RECORD** dispatch) { - if (rec->ExceptionFlags & 0x6) + if (!(rec->ExceptionFlags & (EH_UNWINDING | EH_EXIT_UNWIND))) return ExceptionContinueSearch; *dispatch = frame; return ExceptionCollidedUnwind; @@ -126,28 +126,26 @@ void CDECL _global_unwind2(EXCEPTION_REGISTRATION_RECORD* frame) */ void CDECL _local_unwind2(MSVCRT_EXCEPTION_FRAME* frame, int trylevel) { - MSVCRT_EXCEPTION_FRAME *curframe = frame; EXCEPTION_REGISTRATION_RECORD reg; TRACE("(%p,%d,%d)\n",frame, frame->trylevel, trylevel); /* Register a handler in case of a nested exception */ - reg.Handler = (PEXCEPTION_HANDLER)MSVCRT_nested_handler; + reg.Handler = MSVCRT_nested_handler; reg.Prev = NtCurrentTeb()->Tib.ExceptionList; __wine_push_frame(&reg); while (frame->trylevel != TRYLEVEL_END && frame->trylevel != trylevel) { - int curtrylevel = frame->scopetable[frame->trylevel].previousTryLevel; - curframe = frame; - curframe->trylevel = curtrylevel; - if (!frame->scopetable[curtrylevel].lpfnFilter) - { - ERR("__try block cleanup not implemented - expect crash!\n"); - /* FIXME: Remove current frame, set ebp, call - * frame->scopetable[curtrylevel].lpfnHandler() - */ - } + int level = frame->trylevel; + frame->trylevel = frame->scopetable[level].previousTryLevel; + if (!frame->scopetable[level].lpfnFilter) + { + FIXME( "__try block cleanup level %d handler %p not fully implemented\n", + level, frame->scopetable[level].lpfnHandler ); + /* FIXME: should probably set ebp to frame->_ebp */ + frame->scopetable[level].lpfnHandler(); + } } __wine_pop_frame(&reg); TRACE("unwound OK\n");

1 0

Hans Leidekker : mscms: Fix compilation with the latest lcms header.
by Alexandre Julliard 13 Mar '07

13 Mar '07

Module: wine Branch: master Commit: 83f1c1df254c8613daea2bec5645887b6b13a18c URL: http://source.winehq.org/git/wine.git/?a=commit;h=83f1c1df254c8613daea2bec5… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Tue Mar 13 12:42:40 2007 +0100 mscms: Fix compilation with the latest lcms header. --- dlls/mscms/mscms_priv.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/mscms/mscms_priv.h b/dlls/mscms/mscms_priv.h index e05f602..9bde1c8 100644 --- a/dlls/mscms/mscms_priv.h +++ b/dlls/mscms/mscms_priv.h @@ -58,9 +58,11 @@ * (typedef) definitions. */ +#undef BOOL #undef DWORD #undef LPDWORD +#define BOOL BOOL #define DWORD DWORD #define LPDWORD LPDWORD

1 0

Hans Leidekker : wininet: Fix buffer size calculation in INTERNET_InternetOpenUrlW.
by Alexandre Julliard 13 Mar '07

13 Mar '07

Module: wine Branch: master Commit: 13a04ac0a8cd4d26d90dd5b65881fe37c92ccc29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=13a04ac0a8cd4d26d90dd5b65… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Tue Mar 13 12:42:53 2007 +0100 wininet: Fix buffer size calculation in INTERNET_InternetOpenUrlW. Spotted by Ron Yorston. --- dlls/wininet/internet.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index e11fcb7..6345a5b 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -2860,9 +2860,9 @@ HINTERNET WINAPI INTERNET_InternetOpenUrlW(LPWININETAPPINFOW hIC, LPCWSTR lpszUr if (urlComponents.dwExtraInfoLength) { WCHAR *path_extra; - DWORD size = urlComponents.dwUrlPathLength + urlComponents.dwExtraInfoLength + 1; + DWORD len = urlComponents.dwUrlPathLength + urlComponents.dwExtraInfoLength + 1; - if (!(path_extra = HeapAlloc(GetProcessHeap(), 0, size))) + if (!(path_extra = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)))) { InternetCloseHandle(client); break;

1 0

appdb/include appData.php distribution.php mai ...
by WineHQ 13 Mar '07

13 Mar '07

ChangeSet ID: 30969 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/03/13 16:08:39 Modified files: include : appData.php distribution.php maintainer.php objectManager.php screenshot.php vendor.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Let objectManager label the edit link in objectOutputTableRow() because the edit link text depends on the queue state Patch: http://cvs.winehq.org/patch.py?id=30969 Old revision New revision Changes Path 1.8 1.9 +3 -2 appdb/include/appData.php 1.15 1.16 +7 -7 appdb/include/distribution.php 1.28 1.29 +4 -3 appdb/include/maintainer.php 1.4 1.5 +4 -3 appdb/include/objectManager.php 1.58 1.59 +3 -2 appdb/include/screenshot.php 1.15 1.16 +4 -3 appdb/include/vendor.php Index: appdb/include/appData.php diff -u -p appdb/include/appData.php:1.8 appdb/include/appData.php:1.9 --- appdb/include/appData.php:1.8 13 Mar 2007 21: 8:39 -0000 +++ appdb/include/appData.php 13 Mar 2007 21: 8:39 -0000 @@ -330,7 +330,8 @@ class appData } } - function objectOutputTableRow($oObject, $sClass) + /* arg1 = OM object, arg2 = CSS style, arg3 = text for edit link */ + function objectOutputTableRow($oObject, $sClass, $sEditLinkLabel) { $oVersion = new Version($this->iVersionId); @@ -347,7 +348,7 @@ class appData if(appData::canEdit($oObject->sClass)) $aCells[] = "[ <a href=\"".$oObject->makeUrl("edit", - $this->iId)."\">Process</a> ]"; + $this->iId)."\">$sEditLinkLabel</a> ]"; echo html_tr($aCells, $sClass); } Index: appdb/include/distribution.php diff -u -p appdb/include/distribution.php:1.15 appdb/include/distribution.php:1.16 --- appdb/include/distribution.php:1.15 13 Mar 2007 21: 8:39 -0000 +++ appdb/include/distribution.php 13 Mar 2007 21: 8:39 -0000 @@ -438,7 +438,8 @@ class distribution { return new distribution($oRow->distributionId, $oRow); } - function objectOutputTableRow($oManager, $sClass) + /* arg1 = OM object, arg2 = CSS style, arg3 = text for edit link */ + function objectOutputTableRow($oManager, $sClass, $sEditLinkLabel) { $aCells = array( "<a href=\"".$oManager->makeUrl("view", $this->iDistributionId, @@ -449,13 +450,12 @@ class distribution { if($this->canEdit()) { if(!sizeof($this->aTestingIds)) - { - $sDelete = "   [<a href='".$oManager->makeUrl("delete", + $shDeleteLink = "   [<a href='".$oManager->makeUrl("delete", $this->iDistributionId)."'>delete</a>]"; - } - $aCells[3] = array( - "[<a href='".$oManager->makeUrl("edit", $this->iDistributionId, - "Edit Distribution")."'>edit</a>]$sDelete", + + $aCells[] = array( + "[<a href='".$oManager->makeUrl("edit", + $this->iDistributionId)."'>$sEditLinkLabel</a>]$shDeleteLink", "align=\"center\""); } Index: appdb/include/maintainer.php diff -u -p appdb/include/maintainer.php:1.28 appdb/include/maintainer.php:1.29 --- appdb/include/maintainer.php:1.28 13 Mar 2007 21: 8:39 -0000 +++ appdb/include/maintainer.php 13 Mar 2007 21: 8:39 -0000 @@ -421,7 +421,8 @@ class maintainer echo html_tr($aCells, $sClass); } - function ObjectOutputTableRow($oObject, $sClass) + /* arg1 = OM object, arg2 = CSS style, arg3 = text for edit link */ + function ObjectOutputTableRow($oObject, $sClass, $sEditLinkLabel) { $oUser = new User($this->iUserId); $oApp = new Application($this->iAppId); @@ -435,8 +436,8 @@ class maintainer "<a href=\"mailto:".$oUser->sEmail."\">".$oUser->sRealname."</a>"); if(maintainer::canEdit()) - $aCells[sizeof($aCells)] = "<a href=\"".$oObject->makeUrl("edit", - $this->iMaintainerId)."\">answer</a>"; + $aCells[sizeof($aCells)] = "[ <a href=\"".$oObject->makeUrl("edit", + $this->iMaintainerId)."\">$sEditLinkLabel</a> ]"; echo html_tr($aCells, $sClass); Index: appdb/include/objectManager.php diff -u -p appdb/include/objectManager.php:1.4 appdb/include/objectManager.php:1.5 --- appdb/include/objectManager.php:1.4 13 Mar 2007 21: 8:39 -0000 +++ appdb/include/objectManager.php 13 Mar 2007 21: 8:39 -0000 @@ -95,8 +95,9 @@ class ObjectManager $oObject = call_user_func(array($this->sClass, "objectGetInstanceFromRow"), $oRow); - $oObject->objectOutputTableRow($this, - ($iCount % 2) ? "color0" : "color1"); + /* arg1 = OM object, arg2 = CSS style, arg3 = text for edit link */ + $oObject->objectOutputTableRow($this, ($iCount % 2) ? "color0" : "color1", + $this->bIsQueue ? "process" : "edit"); } echo "</table>"; @@ -313,7 +314,7 @@ class ObjectManager $sTitle = urlencode($sTitle); - return $_SERVER['PHP_SELF']."?bIsQueue=$sIsQueue&sClass=$this->sClass". + return BASE."objectManager.php?bIsQueue=$sIsQueue&sClass=$this->sClass". "&sTitle=$sTitle$sId$sAction"; } Index: appdb/include/screenshot.php diff -u -p appdb/include/screenshot.php:1.58 appdb/include/screenshot.php:1.59 --- appdb/include/screenshot.php:1.58 13 Mar 2007 21: 8:39 -0000 +++ appdb/include/screenshot.php 13 Mar 2007 21: 8:39 -0000 @@ -537,10 +537,11 @@ class Screenshot { return new appData($oRow->id, $oRow); } - function objectOutputTableRow($oObject, $sClass) + /* arg1 = OM object, arg2 = CSS style, arg3 = text for edit link */ + function objectOutputTableRow($oObject, $sClass, $sEditLinkLabel) { $oAppData = new AppData(); - $oAppData->objectOutputTableRow($oObject, $sClass); + $oAppData->objectOutputTableRow($oObject, $sClass, $sEditLinkLabel); } function objectDisplayQueueProcessingHelp() Index: appdb/include/vendor.php diff -u -p appdb/include/vendor.php:1.15 appdb/include/vendor.php:1.16 --- appdb/include/vendor.php:1.15 13 Mar 2007 21: 8:39 -0000 +++ appdb/include/vendor.php 13 Mar 2007 21: 8:39 -0000 @@ -185,7 +185,8 @@ class Vendor { return new vendor($oRow->vendorId, $oRow); } - function objectOutputTableRow($oObject, $sClass = "") + /* arg1 = OM object, arg2 = CSS style, arg3 = text for edit link */ + function objectOutputTableRow($oObject, $sClass = "", $sEditLinkLabel) { $aCells = array( "<a href=\"".$oObject->makeUrl("view", $this->iVendorId, @@ -196,12 +197,12 @@ class Vendor { if($this->canEdit()) { if(!sizeof($this->aApplicationsIds)) - $sDelete = "   [<a href=\"".$oObject->makeUrl("delete", + $shDeleteLink = "   [<a href=\"".$oObject->makeUrl("delete", $this->iVendorId, "View Vendors")."\">". "delete</a>]"; $aCells[sizeof($aCells)] = "[<a href=\"".$oObject->makeUrl("edit", - $this->iVendorId, "Edit Vendor")."\">edit</a>]$sDelete"; + $this->iVendorId, "Edit Vendor")."\">$sEditLinkLabel</a>]$shDeleteLink"; } echo html_tr($aCells, $sClass);

1 0

appdb/unit_test test_om_objects.php
by WineHQ 13 Mar '07

13 Mar '07

ChangeSet ID: 30968 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/03/13 16:05:11 Modified files: unit_test : test_om_objects.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Test more objectManager functions Patch: http://cvs.winehq.org/patch.py?id=30968 Old revision New revision Changes Path 1.1 1.2 +18 -40 appdb/unit_test/test_om_objects.php Index: appdb/unit_test/test_om_objects.php diff -u -p appdb/unit_test/test_om_objects.php:1.1 appdb/unit_test/test_om_objects.php:1.2 --- appdb/unit_test/test_om_objects.php:1.1 13 Mar 2007 21: 5:11 -0000 +++ appdb/unit_test/test_om_objects.php 13 Mar 2007 21: 5:11 -0000 @@ -12,15 +12,19 @@ require_once(BASE.'include/maintainer.ph //require_once(BASE.'include/version_queue.php'); /* internal function */ -function test_class($sClassName) +function test_class($sClassName, $aTestMethods) { - $oOMM = new objectManager($sClassName); - if(!$oOMM->hasValidMethods(true)) + $oObject = new ObjectManager(""); + $oObject->sClass = $sClassName; + if(!$oObject->checkMethods($aTestMethods, false)) { + echo $oObject->sClass." class does not have valid methods for use with". + " the object manager\n"; return false; + } else + { + echo "PASSED:\t\t".$oObject->sClass."\n"; } - - return true; } function test_object_methods() @@ -65,44 +69,18 @@ function test_object_methods() } else { echo "PASSED:\t\t".$sClassName."\n"; - } - - $sClassName = 'maintainer'; - if(!test_class($sClassName)) - { - echo $sClassName." class does not have valid methods for use with the object manager\n"; - return false; - } else - { - echo "PASSED:\t\t".$sClassName."\n"; - } */ + }*/ $aTestMethods = array("objectOutputHeader", "objectOutputTableRow", "objectGetEntries", "display", - "objectGetInstanceFromRow", "outputEditor", "canEdit"); - - $oObject = new ObjectManager(""); - $oObject->sClass = 'distribution'; - if(!$oObject->checkMethods($aTestMethods, false)) - { - echo $oObject->sClass." class does not have valid methods for use with". - " the object manager\n"; - return false; - } else - { - echo "PASSED:\t\t".$oObject->sClass."\n"; - } - - $oObject->sClass = 'vendor'; - if(!$oObject->checkMethods($aTestMethods, false)) - { - echo $oObject->sClass." class does not have valid methods for use with". - " the object manager\n"; - return false; - } else - { - echo "PASSED:\t\t".$oObject->sClass."\n"; - } + "objectGetInstanceFromRow", "outputEditor", "canEdit", + "getOutputEditorValues", "objectGetEntries", + "objectMakeUrl", "objectMakeLink"); + + test_class("distribution", $aTestMethods); + test_class("vendor", $aTestMethods); +/* test_class("maintainer", $aTestMethods); + test_class("screenshot", $aTestMethods); */ return true; }

1 0

appdb/ include/distribution.php include/incl.p ...
by WineHQ 13 Mar '07

13 Mar '07

ChangeSet ID: 30967 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/03/13 16:03:08 Modified files: include : distribution.php incl.php testData.php Removed files: . : distributionView.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Remove references to distributionView.php and remove now unused distributionView.php Patch: http://cvs.winehq.org/patch.py?id=30967 Old revision New revision Changes Path 1.25 Removed +0 -0 appdb/distributionView.php 1.14 1.15 +20 -5 appdb/include/distribution.php 1.41 1.42 +1 -0 appdb/include/incl.php 1.21 1.22 +1 -2 appdb/include/testData.php Index: appdb/distributionView.php diff -u -p appdb/distributionView.php:1.25 /dev/null --- appdb/distributionView.php 13 Mar 2007 21: 3: 8 -0000 +++ /dev/null 13 Mar 2007 21: 3: 8 -0000 @@ -1,67 +0,0 @@ -<?php -/*************************************/ -/* code to view distributions */ -/*************************************/ - -/* - * application environment - */ -require("path.php"); -require(BASE."include/incl.php"); -require_once(BASE."include/distribution.php"); -require_once(BASE."include/testData.php"); - -if ($aClean['sSub']) -{ - if(!$_SESSION['current']->hasPriv("admin")) - util_show_error_page_and_exit("Insufficient privileges."); - - if($aClean['sSub'] == 'delete') - { - $oDistribution = new distribution($aClean['iDistributionId']); - $oDistribution->delete(); - util_redirect_and_exit($_SERVER['PHP_SELF']); - } -} -$oDistribution = new distribution($aClean['iDistributionId']); - -/* Display distribution list if no id given */ -if(!$oDistribution->iDistributionId) -{ - apidb_header("View Distributions"); - - //get available Distributions - $hResult = distribution::ObjectGetEntries(false); - - // show Distribution list - echo html_frame_start("","90%","",0); - echo "<table width='100%' border=0 cellpadding=3 cellspacing=0>\n\n"; - - distribution::ObjectOutputHeader("color4"); - - for($c = 1; $oRow = mysql_fetch_object($hResult); $c++) - { - $oDistribution = distribution::ObjectGetInstanceFromRow($oRow); - - $oDistribution->objectOutputTableRow(($c % 2) ? "color0" : "color1"); - } - echo "</table>\n\n"; - echo html_frame_end(" "); - if ($_SESSION['current']->hasPriv("admin")) - echo "[<a href='".BASE."admin/editDistribution.php'>Add New Distribution</a>]"; - apidb_footer(); -} -else -{ - //display page - apidb_header("View Distribution"); - echo html_frame_start("Distribution Information",500); - - $oDistribution->display(); - - echo html_frame_end(); - echo html_back_link(1); - apidb_footer(); -} - -?> Index: appdb/include/distribution.php diff -u -p appdb/include/distribution.php:1.14 appdb/include/distribution.php:1.15 --- appdb/include/distribution.php:1.14 13 Mar 2007 21: 3: 8 -0000 +++ appdb/include/distribution.php 13 Mar 2007 21: 3: 8 -0000 @@ -286,8 +286,9 @@ class distribution { case "add": if($this->sQueued == "false") { - $sSubject = "Distribution ".$this->sName." added by ".$_SESSION['current']->sRealname; - $sMsg = APPDB_ROOT."distributionView.php?iDistributionId=".$this->iDistributionId."\n"; + $sSubject = "Distribution ".$this->sName." added by ". + $_SESSION['current']->sRealname; + $sMsg = $this->objectMakeUrl."\n"; if($this->iSubmitterId) { $oSubmitter = new User($this->iSubmitterId); @@ -307,7 +308,7 @@ class distribution { break; case "edit": $sSubject = "Distribution ".$this->sName." has been modified by ".$_SESSION['current']->sRealname; - $sMsg = APPDB_ROOT."distributionView.php?iDistributionId=".$this->iDistributionId."\n"; + $sMsg = $this->objectMakeUrl()."\n"; addmsg("Distribution modified.", "green"); break; case "delete": @@ -323,8 +324,9 @@ class distribution { addmsg("Distribution deleted.", "green"); break; case "reject": - $sSubject = "Distribution '".$this->sName." has been rejected by ".$_SESSION['current']->sRealname; - $sMsg = APPDB_ROOT."distributionView.php?iDistributionId=".$this->iDistributionId."\n"; + $sSubject = "Distribution '".$this->sName." has been rejected by ". + $_SESSION['current']->sRealname; + $sMsg = $this->objectMakeUrl()."\n"; // if sReplyText is set we should report the reason the data was rejected if($aClean['sReplyText']) @@ -549,6 +551,19 @@ class distribution { echo '</table>',"\n"; } } + + /* Make a URL for viewing the specified distribution */ + function objectMakeUrl() + { + $oObject = new objectManager("distribution", "View Distribution"); + return $oObject->makeUrl("view", $this->iDistributionId); + } + + /* Make an HTML link for viewing the specified distirbution */ + function objectMakeLink() + { + return "<a href=\"".$this->objectMakeUrl()."\">$this->sName</a>"; + } } ?> Index: appdb/include/incl.php diff -u -p appdb/include/incl.php:1.41 appdb/include/incl.php:1.42 --- appdb/include/incl.php:1.41 13 Mar 2007 21: 3: 8 -0000 +++ appdb/include/incl.php 13 Mar 2007 21: 3: 8 -0000 @@ -13,6 +13,7 @@ require(BASE."include/menu.php"); require(BASE."include/html.php"); require(BASE."include/error_log.php"); require(BASE."include/query.php"); +require_once(BASE."include/objectManager.php"); /* if magic quotes are enabled make sure the user disables them */ /* otherwise they will see all kinds of odd effects that are difficult */ Index: appdb/include/testData.php diff -u -p appdb/include/testData.php:1.21 appdb/include/testData.php:1.22 --- appdb/include/testData.php:1.21 13 Mar 2007 21: 3: 8 -0000 +++ appdb/include/testData.php 13 Mar 2007 21: 3: 8 -0000 @@ -446,8 +446,7 @@ class testData{ } echo ' <td>',"\n"; - echo '<a href="'.BASE.'distributionView.php?iDistributionId='.$oTest->iDistributionId.'">',"\n"; - echo $oDistribution->sName.'</a>',"\n"; + echo $oDistribution->objectMakeLink()."\n"; echo ' </td>',"\n"; echo ' <td>'.date("M d Y", mysqldatetime_to_unixtimestamp($oTest->sTestedDate)).'</td>',"\n"; echo ' <td>'.$oTest->sTestedRelease.'&nbsp</td>',"\n";

1 0

appdb/ include/application.php include/vendor. ...
by WineHQ 13 Mar '07

13 Mar '07

ChangeSet ID: 30966 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/03/13 15:59:45 Modified files: include : application.php vendor.php Removed files: . : vendorview.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Remove references to vendorview.php and remove now unused vendorview.php Patch: http://cvs.winehq.org/patch.py?id=30966 Old revision New revision Changes Path 1.27 Removed +0 -0 appdb/vendorview.php 1.91 1.92 +12 -3 appdb/include/application.php 1.14 1.15 +13 -0 appdb/include/vendor.php Index: appdb/vendorview.php diff -u -p appdb/vendorview.php:1.27 /dev/null --- appdb/vendorview.php 13 Mar 2007 20:59:45 -0000 +++ /dev/null 13 Mar 2007 20:59:45 -0000 @@ -1,68 +0,0 @@ -<?php -/*************************************/ -/* code to view vendors & their apps */ -/*************************************/ - -/* - * application environment - */ -require("path.php"); -require(BASE."include/incl.php"); -require_once(BASE."include/application.php"); -require_once(BASE."include/vendor.php"); - -$oVendor = new Vendor($aClean['iVendorId']); - -if ($aClean['sSub']) -{ - if(!$_SESSION['current']->hasPriv("admin")) - util_show_error_page_and_exit("Insufficient privileges."); - - if($aClean['sSub'] == 'delete') - { - $oVendor->delete(); - util_redirect_and_exit($_SERVER['PHP_SELF']); - } - -} - - -if($oVendor->iVendorId) -{ - //display page - apidb_header("View Vendor"); - echo html_frame_start("Vendor Information",500); - - $oVendor->display(); - - echo html_frame_end(); - echo html_back_link(1); - apidb_footer(); - -} -else -{ - apidb_header("View Vendors"); - - //get available vendors - $hResult = vendor::objectGetEntries(false); - - // show vendorlist - echo "<table width='100%' border=0 cellpadding=3 cellspacing=0>\n\n"; - - vendor::objectOutputHeader("color4"); - - for($c = 0; $oRow = mysql_fetch_object($hResult); $c++) - { - $oVendor = vendor::objectGetInstanceFromRow($oRow); - $oVendor->objectOutputTableRow(($c % 2) ? "color0" : "color1"); - } - - echo '<tr><td>',"\n"; - echo html_back_link(1); - echo '</td></tr></table>',"\n"; - apidb_footer(); - -} - -?> Index: appdb/include/application.php diff -u -p appdb/include/application.php:1.91 appdb/include/application.php:1.92 --- appdb/include/application.php:1.91 13 Mar 2007 20:59:45 -0000 +++ appdb/include/application.php 13 Mar 2007 20:59:45 -0000 @@ -635,7 +635,7 @@ class Application { echo ' <table width="250" border="0" cellpadding="3" cellspacing="1">',"\n"; echo " <tr class=color0 valign=top><td width=\"100\"><b>Name</b></td><td width='100%'> ".$this->sName." </td>\n"; echo " <tr class=\"color1\"><td><b>Vendor</b></td><td> ". - " <a href='vendorview.php?iVendorId=$oVendor->iVendorId'> ".$oVendor->sName." </a>  \n"; + $oVendor->objectMakeLink()." \n"; echo " </td></tr>\n"; // main URL @@ -788,7 +788,13 @@ class Application { /* List applications submitted by a given user */ function listSubmittedBy($iUserId, $bQueued = true) { - $hResult = query_parameters("SELECT appId, appName, appFamily.vendorId, description, submitTime, vendorName FROM appFamily, vendor WHERE appFamily.vendorId = vendor.vendorId AND submitterId = '?' AND queued = '?' ORDER BY appId", $iUserId, $bQueued ? "true" : "false"); + $hResult = query_parameters("SELECT appId, appName, vendorId, description, + submitTime FROM appFamily + WHERE + submitterId = '?' + AND + queued = '?' + ORDER BY appId", $iUserId, $bQueued ? "true" : "false"); if(!$hResult || !mysql_num_rows($hResult)) return false; @@ -802,12 +808,15 @@ class Application { "color4"); for($i = 1; $oRow = mysql_fetch_object($hResult); $i++) + { + $oVendor = new vendor($oRow->vendorId); $sResult .= html_tr(array( "<a href=\"".BASE."appview.php?iAppId=$oRow->appId\">$oRow->appName</a>", $oRow->description, - "<a href=\"".BASE."vendorview.php?iVendorId=$oRow->vendorId\">$oRow->vendorName</a>", + $oVendor->objectMakeLink(), print_date(mysqltimestamp_to_unixtimestamp($oRow->submitTime))), ($i % 2) ? "color0" : "color1"); + } $sResult .= html_table_end(); Index: appdb/include/vendor.php diff -u -p appdb/include/vendor.php:1.14 appdb/include/vendor.php:1.15 --- appdb/include/vendor.php:1.14 13 Mar 2007 20:59:45 -0000 +++ appdb/include/vendor.php 13 Mar 2007 20:59:45 -0000 @@ -248,6 +248,19 @@ class Vendor { echo '</ol>',"\n"; } } + + /* Make a URL for viewing the specified vendor */ + function objectMakeUrl() + { + $oManager = new objectManager("vendor", "View Vendor"); + return $oManager->makeUrl("view", $this->iVendorId); + } + + /* Make a HTML link for viewing the specified vendor */ + function objectMakeLink() + { + return "<a href=\"".$this->objectMakeUrl()."\">$this->sName</a>"; + } } /* Get the total number of Vendors in the database */

1 0