June 2007 - Wine-Commits - list.winehq.org

appdb/cron cleanup.php
by WineHQ June 14, 2007

June 14, 2007

ChangeSet ID: 31196 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/06/13 20:17:07 Modified files: cron : cleanup.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Add missing 'global $sEmailSubject;' declaration to functions using the global $sEmailSubject value. Patch: http://cvs.winehq.org/patch.py?id=31196 Old revision New revision Changes Path 1.37 1.38 +12 -0 appdb/cron/cleanup.php Index: appdb/cron/cleanup.php diff -u -p appdb/cron/cleanup.php:1.37 appdb/cron/cleanup.php:1.38 --- appdb/cron/cleanup.php:1.37 14 Jun 2007 1:17: 7 -0000 +++ appdb/cron/cleanup.php 14 Jun 2007 1:17: 7 -0000 @@ -130,6 +130,8 @@ function warnUserDeleted($sEmail) function notifyAdminsOfCleanupStart() { + global $sEmailSubject; + $sSubject = $sEmailSubject."Cleanup script starting\r\n"; $sMsg = "Appdb cleanup cron script started.\r\n"; $sEmail = User::get_notify_email_address_list(null, null); /* get list admins */ @@ -142,6 +144,8 @@ function notifyAdminsOfCleanupStart() /* events of the appdb */ function notifyAdminsOfCleanupExecution($usersWarned, $usersUnwarnedWithData, $usersDeleted, $usersWithData) { + global $sEmailSubject; + $warnedUsers = User::get_inactive_users_pending_deletion(); $sSubject = $sEmailSubject."Inactive users\r\n"; @@ -162,6 +166,8 @@ function notifyAdminsOfCleanupExecution( /* we don't report anything if no orphans are found */ function orphanVersionCheck() { + global $sEmailSubject; + $sQuery = "select versionId, versionName from appVersion where appId = 0"; $hResult = query_appdb($sQuery); $found_orphans = false; @@ -192,6 +198,8 @@ function orphanVersionCheck() /* so we'll want to purge them here after reporting how many we have */ function orphanSessionMessagesCheck() { + global $sEmailSubject; + $iSessionMessageDayLimit = 1; /* the number of days a session message must be stuck before being purges */ /* get a count of the messages older than $iSessionMessageDayLimit */ @@ -220,6 +228,8 @@ function orphanSessionMessagesCheck() /* by one row each time a user logs */ function orphanSessionListCheck() { + global $sEmailSubject; + /* get a count of the messages older than $iSessionListDayLimit */ $sQuery = "SELECT count(*) as cnt from session_list where TO_DAYS(NOW()) - TO_DAYS(stamp) > ?"; $hResult = query_parameters($sQuery, SESSION_DAYS_TO_EXPIRE + 2); @@ -281,6 +291,8 @@ function getMissingScreenshotArray() function removeScreenshotsWithMissingFiles() { + global $sEmailSubject; + $aMissingScreenshotIds = getMissingScreenshotArray(); // build the email to admins about what we are doing

1 0

appdb/include application.php
by WineHQ June 14, 2007

June 14, 2007

ChangeSet ID: 31195 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/06/13 19:52:57 Modified files: include : application.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Fix admin response in submitter notifications. Some code was in the wrong place inside of a switch statement Patch: http://cvs.winehq.org/patch.py?id=31195 Old revision New revision Changes Path 1.114 1.115 +3 -2 appdb/include/application.php Index: appdb/include/application.php diff -u -p appdb/include/application.php:1.114 appdb/include/application.php:1.115 --- appdb/include/application.php:1.114 14 Jun 2007 0:52:57 -0000 +++ appdb/include/application.php 14 Jun 2007 0:52:57 -0000 @@ -372,7 +372,7 @@ class Application { { case "add": $sSubject = "Submitted application accepted"; - $sMsg = "The application you submitted (".$this->sName.") has been accepted by ".$_SESSION['current']->sRealname."."; + $sMsg = "The application you submitted (".$this->sName.") has been accepted by ".$_SESSION['current']->sRealname.".\n"; $sMsg .= "Administrator's Response:\n"; break; case "reject": @@ -390,10 +390,11 @@ class Application { $sMsg = "The application you submitted (".$this->sName.") has been deleted by ".$_SESSION['current']->sRealname."."; $sMsg .= "Reason given:\n"; break; + } $sMsg .= $aClean['sReplyText']."\n"; $sMsg .= "We appreciate your help in making the Application Database better for all users."; - } + mail_appdb($oSubmitter->sEmail, $sSubject ,$sMsg); } }

1 0

appdb/include application_queue.php
by WineHQ June 14, 2007

June 14, 2007

ChangeSet ID: 31194 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/06/13 19:51:21 Modified files: include : application_queue.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Display the help text for application queues Patch: http://cvs.winehq.org/patch.py?id=31194 Old revision New revision Changes Path 1.8 1.9 +5 -0 appdb/include/application_queue.php Index: appdb/include/application_queue.php diff -u -p appdb/include/application_queue.php:1.8 appdb/include/application_queue.php:1.9 --- appdb/include/application_queue.php:1.8 14 Jun 2007 0:51:21 -0000 +++ appdb/include/application_queue.php 14 Jun 2007 0:51:21 -0000 @@ -312,6 +312,11 @@ class application_queue return $this->oApp->objectMoveChildren($iNewId); } + function objectDisplayQueueProcessingHelp() + { + return application::objectDisplayQueueProcessingHelp(); + } + function objectDisplayAddItemHelp() { $this->oApp->objectDisplayAddItemHelp();

1 0

appdb/ include/appData.php include/application ...
by WineHQ June 14, 2007

June 14, 2007

ChangeSet ID: 31193 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/06/13 19:50:35 Modified files: include : appData.php application.php application_queue.php distribution.php downloadurl.php maintainer.php objectManager.php screenshot.php testData.php testData_queue.php vendor.php version.php version_queue.php unit_test : test_om_objects.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Replace objectOutputTableRow() with objectGetTableRow(). Redesign the table output mechanism so that we fetch a table row from a class instead of letting the class display it. Move adding of edit/delete links from the classes to the objectManager. Fix a hole in the distribution class where an uninitialized variable could have been used in the constructor. Patch: http://cvs.winehq.org/patch.py?id=31193 Old revision New revision Changes Path 1.26 1.27 +7 -7 appdb/include/appData.php 1.113 1.114 +7 -9 appdb/include/application.php 1.7 1.8 +7 -2 appdb/include/application_queue.php 1.34 1.35 +5 -20 appdb/include/distribution.php 1.18 1.19 +7 -3 appdb/include/downloadurl.php 1.43 1.44 +2 -8 appdb/include/maintainer.php 1.26 1.27 +54 -4 appdb/include/objectManager.php 1.70 1.71 +7 -3 appdb/include/screenshot.php 1.61 1.62 +7 -14 appdb/include/testData.php 1.10 1.11 +11 -12 appdb/include/testData_queue.php 1.31 1.32 +4 -15 appdb/include/vendor.php 1.130 1.131 +7 -8 appdb/include/version.php 1.13 1.14 +7 -2 appdb/include/version_queue.php 1.14 1.15 +2 -1 appdb/unit_test/test_om_objects.php

1 0

Paul Vriens : crypt32/tests: Skip tests if we don't have enough rights.
by Alexandre Julliard June 13, 2007

June 13, 2007

Module: wine Branch: master Commit: 023d6fd9861da57da4c6e3ff30c44aad4ed2e405 URL: http://source.winehq.org/git/wine.git/?a=commit;h=023d6fd9861da57da4c6e3ff3… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Wed Jun 13 12:17:06 2007 +0200 crypt32/tests: Skip tests if we don't have enough rights. --- dlls/crypt32/tests/oid.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/tests/oid.c b/dlls/crypt32/tests/oid.c index c1cde67..c42b891 100644 --- a/dlls/crypt32/tests/oid.c +++ b/dlls/crypt32/tests/oid.c @@ -286,8 +286,14 @@ static void test_registerOIDFunction(void) ret = CryptRegisterOIDFunction(X509_ASN_ENCODING, "foo", "1.2.3.4.5.6.7.8.9.10", NULL, NULL); ok(ret, "Expected pseudo-success, got %d\n", GetLastError()); + SetLastError(0xdeadbeef); ret = CryptRegisterOIDFunction(X509_ASN_ENCODING, "CryptDllEncodeObject", "1.2.3.4.5.6.7.8.9.10", bogusDll, NULL); + if (!ret && GetLastError() == ERROR_ACCESS_DENIED) + { + skip("Need admin rights\n"); + return; + } ok(ret, "CryptRegisterOIDFunction failed: %d\n", GetLastError()); ret = CryptUnregisterOIDFunction(X509_ASN_ENCODING, "CryptDllEncodeObject", "1.2.3.4.5.6.7.8.9.10"); @@ -334,8 +340,14 @@ static void test_registerDefaultOIDFunction(void) ret = CryptRegisterDefaultOIDFunction(0, NULL, 0, bogusDll); */ /* Register one at index 0 */ + SetLastError(0xdeadbeef); ret = CryptRegisterDefaultOIDFunction(0, "CertDllOpenStoreProv", 0, bogusDll); + if (!ret && GetLastError() == ERROR_ACCESS_DENIED) + { + skip("Need admin rights\n"); + return; + } ok(ret, "CryptRegisterDefaultOIDFunction failed: %08x\n", GetLastError()); /* Reregistering should fail */ ret = CryptRegisterDefaultOIDFunction(0, "CertDllOpenStoreProv", 0,

1 0

Maarten Lankhorst : winealsa: Detach directsound implementation from waveout implementation.
by Alexandre Julliard June 13, 2007

June 13, 2007

Module: wine Branch: master Commit: c846950e3524b615f0b92cd154b9f1d9d99e1223 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c846950e3524b615f0b92cd15… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Sat Jun 2 17:03:24 2007 +0200 winealsa: Detach directsound implementation from waveout implementation. --- dlls/winealsa.drv/dsoutput.c | 404 +++++++++++++++++++++++++++++------------- dlls/winealsa.drv/waveout.c | 90 ++-------- 2 files changed, 299 insertions(+), 195 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c846950e3524b615f0b92…

1 0

Rob Shearman : mshtml: Use the implementation of IHlink in hlink. dll instead of duplicating it.
by Alexandre Julliard June 13, 2007

June 13, 2007

Module: wine Branch: master Commit: 24b1b2bc69ca246cccd1569e4a3dfb893e19adbe URL: http://source.winehq.org/git/wine.git/?a=commit;h=24b1b2bc69ca246cccd1569e4… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Jun 12 10:26:50 2007 +0100 mshtml: Use the implementation of IHlink in hlink.dll instead of duplicating it. --- dlls/mshtml/hlink.c | 252 ------------------------------------------ dlls/mshtml/mshtml_private.h | 1 - dlls/mshtml/navigate.c | 5 +- 3 files changed, 3 insertions(+), 255 deletions(-) diff --git a/dlls/mshtml/hlink.c b/dlls/mshtml/hlink.c index d6238e0..80332a1 100644 --- a/dlls/mshtml/hlink.c +++ b/dlls/mshtml/hlink.c @@ -118,255 +118,3 @@ void HTMLDocument_Hlink_Init(HTMLDocument *This) { This->lpHlinkTargetVtbl = &HlinkTargetVtbl; } - -typedef struct { - const IHlinkVtbl *lpHlinkVtbl; - - LONG ref; - - IMoniker *mon; - LPWSTR location; -} Hlink; - -#define HLINK(x) ((IHlink*) &(x)->lpHlinkVtbl) - -#define HLINK_THIS(iface) DEFINE_THIS(Hlink, Hlink, iface) - -static HRESULT WINAPI Hlink_QueryInterface(IHlink *iface, REFIID riid, void **ppv) -{ - Hlink *This = HLINK_THIS(iface); - - *ppv = NULL; - - if(IsEqualGUID(&IID_IUnknown, riid)) { - TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); - *ppv = HLINK(This); - }else if(IsEqualGUID(&IID_IHlink, riid)) { - TRACE("(%p)->(IID_IHlink %p)\n", This, ppv); - *ppv = HLINK(This); - } - - if(*ppv) { - IHlink_AddRef(HLINK(This)); - return S_OK; - } - - WARN("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); - return E_NOINTERFACE; -} - -static ULONG WINAPI Hlink_AddRef(IHlink *iface) -{ - Hlink *This = HLINK_THIS(iface); - LONG ref = InterlockedIncrement(&This->ref); - - TRACE("(%p) ref=%d\n", This, ref); - - return ref; -} - -static ULONG WINAPI Hlink_Release(IHlink *iface) -{ - Hlink *This = HLINK_THIS(iface); - LONG ref = InterlockedDecrement(&This->ref); - - TRACE("(%p) ref=%d\n", This, ref); - - if(!ref) { - if(This->mon) - IMoniker_Release(This->mon); - mshtml_free(This->location); - mshtml_free(This); - } - - return ref; -} - -static HRESULT WINAPI Hlink_SetHlinkSite(IHlink *iface, IHlinkSite *pihlSite, DWORD dwSiteData) -{ - Hlink *This = HLINK_THIS(iface); - FIXME("(%p)->(%p %d)\n", This, pihlSite, dwSiteData); - return E_NOTIMPL; -} - -static HRESULT WINAPI Hlink_GetHlinkSite(IHlink *iface, IHlinkSite **ppihlSite, - DWORD *pdwSiteData) -{ - Hlink *This = HLINK_THIS(iface); - - TRACE("(%p)->(%p %p)\n", This, ppihlSite, pdwSiteData); - - *ppihlSite = NULL; - return S_OK; -} - -static HRESULT WINAPI Hlink_SetMonikerReference(IHlink *iface, DWORD grfHLSETF, - IMoniker *pimkTarget, LPCWSTR pwzLocation) -{ - Hlink *This = HLINK_THIS(iface); - - TRACE("(%p)->(%08x %p %s)\n", This, grfHLSETF, pimkTarget, debugstr_w(pwzLocation)); - - if(grfHLSETF) - FIXME("unsupported grfHLSETF=%08x\n", grfHLSETF); - - if(This->mon) - IMoniker_Release(This->mon); - mshtml_free(This->location); - - if(pimkTarget) - IMoniker_AddRef(pimkTarget); - This->mon = pimkTarget; - - if(pwzLocation) { - DWORD len = strlenW(pwzLocation)+1; - - This->location = mshtml_alloc(len*sizeof(WCHAR)); - memcpy(This->location, pwzLocation, len*sizeof(WCHAR)); - }else { - This->location = NULL; - } - - return S_OK; -} - -static HRESULT WINAPI Hlink_GetMonikerReference(IHlink *iface, DWORD dwWhichRef, - IMoniker **ppimkTarget, LPWSTR *ppwzLocation) -{ - Hlink *This = HLINK_THIS(iface); - - TRACE("(%p)->(%d %p %p)\n", This, dwWhichRef, ppimkTarget, ppwzLocation); - - if(dwWhichRef != 1) - FIXME("upsupported dwWhichRef = %d\n", dwWhichRef); - - if(This->mon) - IMoniker_AddRef(This->mon); - *ppimkTarget = This->mon; - - if(This->location) { - DWORD len = strlenW(This->location)+1; - - *ppwzLocation = CoTaskMemAlloc(len*sizeof(WCHAR)); - memcpy(*ppwzLocation, This->location, len*sizeof(WCHAR)); - }else { - *ppwzLocation = NULL; - } - - return S_OK; -} - -static HRESULT WINAPI Hlink_SetStringReference(IHlink *iface, DWORD grfHLSETF, - LPCWSTR pwzTarget, LPCWSTR pwzLocation) -{ - Hlink *This = HLINK_THIS(iface); - FIXME("(%p)->(%08x %s %s)\n", This, grfHLSETF, debugstr_w(pwzTarget), - debugstr_w(pwzLocation)); - return E_NOTIMPL; -} - -static HRESULT WINAPI Hlink_GetStringReference(IHlink *iface, DWORD dwWhichRef, - LPWSTR *ppwzTarget, LPWSTR *ppwzLocation) -{ - Hlink *This = HLINK_THIS(iface); - FIXME("(%p)->(%d %p %p)\n", This, dwWhichRef, ppwzTarget, ppwzLocation); - return E_NOTIMPL; -} - -static HRESULT WINAPI Hlink_SetFriendlyName(IHlink *iface, LPCWSTR pwzFriendlyName) -{ - Hlink *This = HLINK_THIS(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(pwzFriendlyName)); - return E_NOTIMPL; -} - -static HRESULT WINAPI Hlink_GetFriendlyName(IHlink *iface, DWORD grfHLNAMEF, - LPWSTR *ppwzFriendlyName) -{ - Hlink *This = HLINK_THIS(iface); - - TRACE("(%p)->(%08x %p)\n", This, grfHLNAMEF, ppwzFriendlyName); - - *ppwzFriendlyName = NULL; - return S_FALSE; -} - -static HRESULT WINAPI Hlink_SetTargetFrameName(IHlink *iface, LPCWSTR pwzTargetFrameName) -{ - Hlink *This = HLINK_THIS(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(pwzTargetFrameName)); - return E_NOTIMPL; -} - -static HRESULT WINAPI Hlink_GetTargetFrameName(IHlink *iface, LPWSTR *ppwzTargetFrameName) -{ - Hlink *This = HLINK_THIS(iface); - - TRACE("(%p)->(%p)\n", This, ppwzTargetFrameName); - - *ppwzTargetFrameName = NULL; - return S_FALSE; -} - -static HRESULT WINAPI Hlink_GetMiscStatus(IHlink *iface, DWORD *pdwStatus) -{ - Hlink *This = HLINK_THIS(iface); - FIXME("(%p)->(%p)\n", This, pdwStatus); - return E_NOTIMPL; -} - -static HRESULT WINAPI Hlink_Navigate(IHlink *iface, DWORD grfHLNF, LPBC pibc, - IBindStatusCallback *pibsc, IHlinkBrowseContext *pihlbc) -{ - Hlink *This = HLINK_THIS(iface); - FIXME("(%p)->(%08x %p %p %p)\n", This, grfHLNF, pibc, pibsc, pihlbc); - return E_NOTIMPL; -} - -static HRESULT WINAPI Hlink_SetAdditionalParams(IHlink *iface, LPCWSTR pwzAdditionalParams) -{ - Hlink *This = HLINK_THIS(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(pwzAdditionalParams)); - return E_NOTIMPL; -} - -static HRESULT WINAPI Hlink_GetAdditionalParams(IHlink *iface, LPWSTR *ppwzAdditionalParams) -{ - Hlink *This = HLINK_THIS(iface); - FIXME("(%p)->(%p)\n", This, ppwzAdditionalParams); - return E_NOTIMPL; -} - -#undef HLINK_THIS - -static const IHlinkVtbl HlinkVtbl = { - Hlink_QueryInterface, - Hlink_AddRef, - Hlink_Release, - Hlink_SetHlinkSite, - Hlink_GetHlinkSite, - Hlink_SetMonikerReference, - Hlink_GetMonikerReference, - Hlink_SetStringReference, - Hlink_GetStringReference, - Hlink_SetFriendlyName, - Hlink_GetFriendlyName, - Hlink_SetTargetFrameName, - Hlink_GetTargetFrameName, - Hlink_GetMiscStatus, - Hlink_Navigate, - Hlink_SetAdditionalParams, - Hlink_GetAdditionalParams -}; - -IHlink *Hlink_Create(void) -{ - Hlink *ret = mshtml_alloc(sizeof(Hlink)); - - ret->lpHlinkVtbl = &HlinkVtbl; - ret->ref = 1; - ret->mon = NULL; - ret->location = NULL; - - return HLINK(ret); -} diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 5623736..b20354c 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -357,7 +357,6 @@ HRESULT load_stream(BSCallback*,IStream*); void set_document_bscallback(HTMLDocument*,BSCallback*); void set_current_mon(HTMLDocument*,IMoniker*); -IHlink *Hlink_Create(void); IHTMLSelectionObject *HTMLSelectionObject_Create(nsISelection*); IHTMLTxtRange *HTMLTxtRange_Create(nsIDOMRange*); IHTMLStyle *HTMLStyle_Create(nsIDOMCSSStyleDeclaration*); diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 459cc63..15a2f9c 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -28,6 +28,7 @@ #include "winbase.h" #include "winuser.h" #include "ole2.h" +#include "hlguids.h" #include "wine/debug.h" #include "wine/unicode.h" @@ -761,8 +762,8 @@ void hlink_frame_navigate(HTMLDocument *doc, IHlinkFrame *hlink_frame, return; } - hlink = Hlink_Create(); - if (!hlink) { + hr = CoCreateInstance(&CLSID_StdHlink, NULL, CLSCTX_INPROC_SERVER, &IID_IHlink, (LPVOID*)&hlink); + if (FAILED(hr)) { IBindCtx_Release(bindctx); IBindStatusCallback_Release(STATUSCLB(callback)); return;

1 0

Dmitry Timoshkov : gdi32: Make BITMAPINFOHEADER biSize check match what other parts of code do.
by Alexandre Julliard June 13, 2007

June 13, 2007

Module: wine Branch: master Commit: 2a81c1ada70d97d574a48f34347d4818eae1b2b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a81c1ada70d97d574a48f343… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Jun 13 19:18:55 2007 +0900 gdi32: Make BITMAPINFOHEADER biSize check match what other parts of code do. --- dlls/gdi32/dib.c | 41 +++++++++-------------------------------- 1 files changed, 9 insertions(+), 32 deletions(-) diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index 86e1308..2a98efb 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -149,22 +149,11 @@ int DIB_BitmapInfoSize( const BITMAPINFO * info, WORD coloruse ) * DIB_GetBitmapInfo * * Get the info from a bitmap header. - * Return 1 for INFOHEADER, 0 for COREHEADER, - * 4 for V4HEADER, 5 for V5HEADER, -1 for error. + * Return 0 for COREHEADER, 1 for INFOHEADER, -1 for error. */ static int DIB_GetBitmapInfo( const BITMAPINFOHEADER *header, LONG *width, LONG *height, WORD *planes, WORD *bpp, DWORD *compr, DWORD *size ) { - if (header->biSize == sizeof(BITMAPINFOHEADER)) - { - *width = header->biWidth; - *height = header->biHeight; - *planes = header->biPlanes; - *bpp = header->biBitCount; - *compr = header->biCompression; - *size = header->biSizeImage; - return 1; - } if (header->biSize == sizeof(BITMAPCOREHEADER)) { const BITMAPCOREHEADER *core = (const BITMAPCOREHEADER *)header; @@ -176,27 +165,15 @@ static int DIB_GetBitmapInfo( const BITMAPINFOHEADER *header, LONG *width, *size = 0; return 0; } - if (header->biSize == sizeof(BITMAPV4HEADER)) + if (header->biSize >= sizeof(BITMAPINFOHEADER)) /* assume BITMAPINFOHEADER */ { - const BITMAPV4HEADER *v4hdr = (const BITMAPV4HEADER *)header; - *width = v4hdr->bV4Width; - *height = v4hdr->bV4Height; - *planes = v4hdr->bV4Planes; - *bpp = v4hdr->bV4BitCount; - *compr = v4hdr->bV4V4Compression; - *size = v4hdr->bV4SizeImage; - return 4; - } - if (header->biSize == sizeof(BITMAPV5HEADER)) - { - const BITMAPV5HEADER *v5hdr = (const BITMAPV5HEADER *)header; - *width = v5hdr->bV5Width; - *height = v5hdr->bV5Height; - *planes = v5hdr->bV5Planes; - *bpp = v5hdr->bV5BitCount; - *compr = v5hdr->bV5Compression; - *size = v5hdr->bV5SizeImage; - return 5; + *width = header->biWidth; + *height = header->biHeight; + *planes = header->biPlanes; + *bpp = header->biBitCount; + *compr = header->biCompression; + *size = header->biSizeImage; + return 1; } ERR("(%d): unknown/wrong size for header\n", header->biSize ); return -1;

1 0

Maarten Lankhorst : rsaenh: Allow CRYPT_NEWKEYSET and CRYPT_VERIFYCONTEXT at same time when acquiring context .
by Alexandre Julliard June 13, 2007

June 13, 2007

Module: wine Branch: master Commit: 4e0ef1cb38ccef8cf994a6c34544b822f0e081f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e0ef1cb38ccef8cf994a6c34… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Jun 13 08:31:07 2007 +0200 rsaenh: Allow CRYPT_NEWKEYSET and CRYPT_VERIFYCONTEXT at same time when acquiring context. --- dlls/rsaenh/rsaenh.c | 1 + dlls/rsaenh/tests/rsaenh.c | 5 +++++ 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index 101eb8c..8f58d82 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -1502,6 +1502,7 @@ BOOL WINAPI RSAENH_CPAcquireContext(HCRYPTPROV *phProv, LPSTR pszContainer, *phProv = new_key_container(szKeyContainerName, dwFlags, pVTable); break; + case CRYPT_VERIFYCONTEXT|CRYPT_NEWKEYSET: case CRYPT_VERIFYCONTEXT: if (pszContainer) { TRACE("pszContainer should be NULL\n"); diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index 5d17be2..53ec374 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -1318,6 +1318,11 @@ static void test_schannel_provider(void) 0x3d, 0xca, 0x6a, 0x6f, 0xfa, 0x15, 0x4e, 0xaa }; + result = CryptAcquireContext(&hProv, NULL, NULL, PROV_RSA_SCHANNEL, CRYPT_VERIFYCONTEXT|CRYPT_NEWKEYSET); + ok (result, "%08x\n", GetLastError()); + if (result) + CryptReleaseContext(hProv, 0); + result = CryptAcquireContext(&hProv, NULL, NULL, PROV_RSA_SCHANNEL, CRYPT_VERIFYCONTEXT); ok (result, "%08x\n", GetLastError()); if (!result) return;

1 0

Alexandre Julliard : wintrust/tests: Fix the WintrustGetRegPolicyFlags to work right the first time.
by Alexandre Julliard June 13, 2007

June 13, 2007

Module: wine Branch: master Commit: 0e3e2875a53260584520ae043f79255e040cee3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e3e2875a53260584520ae043… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 13 12:05:55 2007 +0200 wintrust/tests: Fix the WintrustGetRegPolicyFlags to work right the first time. --- dlls/wintrust/tests/register.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wintrust/tests/register.c b/dlls/wintrust/tests/register.c index 049e8e3..6e6ed20 100644 --- a/dlls/wintrust/tests/register.c +++ b/dlls/wintrust/tests/register.c @@ -311,6 +311,8 @@ static void test_RegPolicyFlags(void) if (!pGetFlags || !pSetFlags) skip("Policy flags functions not present\n"); + pGetFlags(&flags2); + r = RegOpenKeyExA(HKEY_CURRENT_USER, Software_Publishing, 0, KEY_ALL_ACCESS, &key); ok(!r, "RegOpenKeyEx failed: %d\n", r); @@ -319,7 +321,6 @@ static void test_RegPolicyFlags(void) r = RegQueryValueExA(key, State, NULL, NULL, (LPBYTE)&flags1, &size); ok(!r, "RegQueryValueEx failed: %d\n", r); - pGetFlags(&flags2); ok(flags1 == flags2, "Got %08x flags instead of %08x\n", flags1, flags2); flags3 = flags2 | 1;

1 0