May 2006 - Wine-Commits - list.winehq.org

Juan Lang : crypt32: Implement CertSerializeCRLStoreElement.
by Alexandre Julliard May 26, 2006

May 26, 2006

Module: wine Branch: master Commit: f94d49dcd4c161d38b8568ee8c9a5d4dd5358f64 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f94d49dcd4c161d38b8568e… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Thu May 25 19:43:30 2006 -0700 crypt32: Implement CertSerializeCRLStoreElement. --- dlls/crypt32/crypt32.spec | 2 + dlls/crypt32/crypt32_private.h | 2 + dlls/crypt32/serialize.c | 76 ++++++++++++++++++++++------------------ dlls/crypt32/store.c | 10 +++++ 4 files changed, 55 insertions(+), 35 deletions(-) diff --git a/dlls/crypt32/crypt32.spec b/dlls/crypt32/crypt32.spec index 88dba5b..8900bec 100644 --- a/dlls/crypt32/crypt32.spec +++ b/dlls/crypt32/crypt32.spec @@ -30,7 +30,7 @@ @ stdcall CertDuplicateStore(ptr) @ stdcall CertEnumCRLContextProperties(ptr long) @ stdcall CertEnumCRLsInStore(ptr ptr) -@ stub CertEnumCTLContextProperties +@ stdcall CertEnumCTLContextProperties(ptr long) @ stdcall CertEnumCTLsInStore(ptr ptr) @ stdcall CertEnumCertificateContextProperties(ptr long) @ stdcall CertEnumCertificatesInStore(long ptr) diff --git a/dlls/crypt32/crypt32_private.h b/dlls/crypt32/crypt32_private.h index 5b39b12..67306b3 100644 --- a/dlls/crypt32/crypt32_private.h +++ b/dlls/crypt32/crypt32_private.h @@ -56,6 +56,7 @@ typedef BOOL (WINAPI *AddEncodedContextT typedef const void *(WINAPI *DuplicateContextFunc)(const void *context); typedef const void *(WINAPI *EnumContextsInStoreFunc)(HCERTSTORE hCertStore, const void *pPrevContext); +typedef DWORD (WINAPI *EnumPropertiesFunc)(const void *context, DWORD dwPropId); typedef BOOL (WINAPI *GetContextPropertyFunc)(const void *context, DWORD dwPropID, void *pvData, DWORD *pcbData); typedef BOOL (WINAPI *SetContextPropertyFunc)(const void *context, @@ -73,6 +74,7 @@ typedef struct _WINE_CONTEXT_INTERFACE AddEncodedContextToStoreFunc addEncodedToStore; DuplicateContextFunc duplicate; EnumContextsInStoreFunc enumContextsInStore; + EnumPropertiesFunc enumProps; GetContextPropertyFunc getProp; SetContextPropertyFunc setProp; SerializeElementFunc serialize; diff --git a/dlls/crypt32/serialize.c b/dlls/crypt32/serialize.c index f1f3989..b0765a7 100644 --- a/dlls/crypt32/serialize.c +++ b/dlls/crypt32/serialize.c @@ -36,45 +36,29 @@ typedef struct _WINE_CERT_PROP_HEADER DWORD cb; } WINE_CERT_PROP_HEADER, *PWINE_CERT_PROP_HEADER; -BOOL WINAPI CertSerializeCRLStoreElement(PCCRL_CONTEXT pCrlContext, - DWORD dwFlags, BYTE *pbElement, DWORD *pcbElement) -{ - FIXME("(%p, %08lx, %p, %p): stub\n", pCrlContext, dwFlags, pbElement, - pcbElement); - return FALSE; -} - -BOOL WINAPI CertSerializeCTLStoreElement(PCCTL_CONTEXT pCtlContext, - DWORD dwFlags, BYTE *pbElement, DWORD *pcbElement) -{ - FIXME("(%p, %08lx, %p, %p): stub\n", pCtlContext, dwFlags, pbElement, - pcbElement); - return FALSE; -} - -BOOL WINAPI CertSerializeCertificateStoreElement(PCCERT_CONTEXT pCertContext, - DWORD dwFlags, BYTE *pbElement, DWORD *pcbElement) +static BOOL CRYPT_SerializeStoreElement(const void *context, + const BYTE *encodedContext, DWORD cbEncodedContext, DWORD contextPropID, + PCWINE_CONTEXT_INTERFACE contextInterface, DWORD dwFlags, BYTE *pbElement, + DWORD *pcbElement) { BOOL ret; - TRACE("(%p, %08lx, %p, %p)\n", pCertContext, dwFlags, pbElement, - pcbElement); + TRACE("(%p, %p, %08lx, %p, %p)\n", context, contextInterface, dwFlags, + pbElement, pcbElement); - if (pCertContext) + if (context) { - DWORD bytesNeeded = sizeof(WINE_CERT_PROP_HEADER) + - pCertContext->cbCertEncoded; + DWORD bytesNeeded = sizeof(WINE_CERT_PROP_HEADER) + cbEncodedContext; DWORD prop = 0; ret = TRUE; do { - prop = CertEnumCertificateContextProperties(pCertContext, prop); + prop = contextInterface->enumProps(context, prop); if (prop) { DWORD propSize = 0; - ret = CertGetCertificateContextProperty(pCertContext, - prop, NULL, &propSize); + ret = contextInterface->getProp(context, prop, NULL, &propSize); if (ret) bytesNeeded += sizeof(WINE_CERT_PROP_HEADER) + propSize; } @@ -99,13 +83,13 @@ BOOL WINAPI CertSerializeCertificateStor prop = 0; do { - prop = CertEnumCertificateContextProperties(pCertContext, prop); + prop = contextInterface->enumProps(context, prop); if (prop) { DWORD propSize = 0; - ret = CertGetCertificateContextProperty(pCertContext, - prop, NULL, &propSize); + ret = contextInterface->getProp(context, prop, NULL, + &propSize); if (ret) { if (bufSize < propSize) @@ -118,8 +102,8 @@ BOOL WINAPI CertSerializeCertificateStor } if (buf) { - ret = CertGetCertificateContextProperty( - pCertContext, prop, buf, &propSize); + ret = contextInterface->getProp(context, prop, buf, + &propSize); if (ret) { hdr = (PWINE_CERT_PROP_HEADER)pbElement; @@ -142,11 +126,11 @@ BOOL WINAPI CertSerializeCertificateStor CryptMemFree(buf); hdr = (PWINE_CERT_PROP_HEADER)pbElement; - hdr->propID = CERT_CERT_PROP_ID; + hdr->propID = contextPropID; hdr->unknown = 1; - hdr->cb = pCertContext->cbCertEncoded; + hdr->cb = cbEncodedContext; memcpy(pbElement + sizeof(WINE_CERT_PROP_HEADER), - pCertContext->pbCertEncoded, pCertContext->cbCertEncoded); + encodedContext, cbEncodedContext); } } else @@ -154,6 +138,30 @@ BOOL WINAPI CertSerializeCertificateStor return ret; } +BOOL WINAPI CertSerializeCertificateStoreElement(PCCERT_CONTEXT pCertContext, + DWORD dwFlags, BYTE *pbElement, DWORD *pcbElement) +{ + return CRYPT_SerializeStoreElement(pCertContext, + pCertContext->pbCertEncoded, pCertContext->cbCertEncoded, + CERT_CERT_PROP_ID, pCertInterface, dwFlags, pbElement, pcbElement); +} + +BOOL WINAPI CertSerializeCRLStoreElement(PCCRL_CONTEXT pCrlContext, + DWORD dwFlags, BYTE *pbElement, DWORD *pcbElement) +{ + return CRYPT_SerializeStoreElement(pCrlContext, + pCrlContext->pbCrlEncoded, pCrlContext->cbCrlEncoded, + CERT_CRL_PROP_ID, pCRLInterface, dwFlags, pbElement, pcbElement); +} + +BOOL WINAPI CertSerializeCTLStoreElement(PCCTL_CONTEXT pCtlContext, + DWORD dwFlags, BYTE *pbElement, DWORD *pcbElement) +{ + return CRYPT_SerializeStoreElement(pCtlContext, + pCtlContext->pbCtlEncoded, pCtlContext->cbCtlEncoded, + CERT_CTL_PROP_ID, pCRLInterface, dwFlags, pbElement, pcbElement); +} + /* Looks for the property with ID propID in the buffer buf. Returns a pointer * to its header if a valid header is found, NULL if not. Valid means the * length of thte property won't overrun buf, and the unknown field is 1. diff --git a/dlls/crypt32/store.c b/dlls/crypt32/store.c index 774d2b3..6d3a1be 100644 --- a/dlls/crypt32/store.c +++ b/dlls/crypt32/store.c @@ -47,6 +47,7 @@ static const WINE_CONTEXT_INTERFACE gCer (AddEncodedContextToStoreFunc)CertAddEncodedCertificateToStore, (DuplicateContextFunc)CertDuplicateCertificateContext, (EnumContextsInStoreFunc)CertEnumCertificatesInStore, + (EnumPropertiesFunc)CertEnumCertificateContextProperties, (GetContextPropertyFunc)CertGetCertificateContextProperty, (SetContextPropertyFunc)CertSetCertificateContextProperty, (SerializeElementFunc)CertSerializeCertificateStoreElement, @@ -61,6 +62,7 @@ static const WINE_CONTEXT_INTERFACE gCRL (AddEncodedContextToStoreFunc)CertAddEncodedCRLToStore, (DuplicateContextFunc)CertDuplicateCRLContext, (EnumContextsInStoreFunc)CertEnumCRLsInStore, + (EnumPropertiesFunc)CertEnumCRLContextProperties, (GetContextPropertyFunc)CertGetCRLContextProperty, (SetContextPropertyFunc)CertSetCRLContextProperty, (SerializeElementFunc)CertSerializeCRLStoreElement, @@ -75,6 +77,7 @@ static const WINE_CONTEXT_INTERFACE gCTL (AddEncodedContextToStoreFunc)CertAddEncodedCTLToStore, (DuplicateContextFunc)CertDuplicateCTLContext, (EnumContextsInStoreFunc)CertEnumCTLsInStore, + (EnumPropertiesFunc)CertEnumCTLContextProperties, (GetContextPropertyFunc)CertGetCTLContextProperty, (SetContextPropertyFunc)CertSetCTLContextProperty, (SerializeElementFunc)CertSerializeCTLStoreElement, @@ -2240,6 +2243,13 @@ BOOL WINAPI CertControlStore(HCERTSTORE return ret; } +DWORD WINAPI CertEnumCTLContextProperties(PCCTL_CONTEXT pCTLContext, + DWORD dwPropId) +{ + FIXME("(%p, %ld): stub\n", pCTLContext, dwPropId); + return 0; +} + BOOL WINAPI CertGetCTLContextProperty(PCCTL_CONTEXT pCTLContext, DWORD dwPropId, void *pvData, DWORD *pcbData) {

1 0

Dmitry Timoshkov : gdi: Add more const qualifiers.
by Alexandre Julliard May 26, 2006

May 26, 2006

Module: wine Branch: master Commit: 0a4f4b23cfe1a2f3799589c0ae84a9374520ec44 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0a4f4b23cfe1a2f3799589c… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Fri May 26 13:34:50 2006 +0900 gdi: Add more const qualifiers. --- dlls/gdi/freetype.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/gdi/freetype.c b/dlls/gdi/freetype.c index 6bbf4f8..8317eb1 100644 --- a/dlls/gdi/freetype.c +++ b/dlls/gdi/freetype.c @@ -213,7 +213,7 @@ typedef struct tagFace { typedef struct tagFamily { struct list entry; - WCHAR *FamilyName; + const WCHAR *FamilyName; struct list faces; } Family; @@ -275,7 +275,7 @@ struct tagGdiFont { typedef struct { struct list entry; - WCHAR *font_name; + const WCHAR *font_name; struct list links; } SYSTEM_LINKS; @@ -319,7 +319,7 @@ static const WCHAR FixedSys_Value[] = {' static const WCHAR System_Value[] = {'F','O','N','T','S','.','F','O','N','\0'}; static const WCHAR OEMFont_Value[] = {'O','E','M','F','O','N','T','.','F','O','N','\0'}; -static const WCHAR const *SystemFontValues[4] = { +static const WCHAR * const SystemFontValues[4] = { System_Value, OEMFont_Value, FixedSys_Value, @@ -348,7 +348,7 @@ static const WCHAR VietnameseW[] = {'V', static const WCHAR WesternW[] = {'W','e','s','t','e','r','n','\0'}; static const WCHAR OEM_DOSW[] = {'O','E','M','/','D','O','S','\0'}; -static const WCHAR *ElfScriptsW[32] = { /* these are in the order of the fsCsb[0] bits */ +static const WCHAR * const ElfScriptsW[32] = { /* these are in the order of the fsCsb[0] bits */ WesternW, /*00*/ Central_EuropeanW, CyrillicW, @@ -447,7 +447,7 @@ static Face *find_face_from_filename(con { Family *family; Face *face; - char *file; + const char *file; DWORD len = WideCharToMultiByte(CP_UNIXCP, 0, file_name, -1, NULL, 0, NULL, NULL); char *file_nameA = HeapAlloc(GetProcessHeap(), 0, len); Face *ret = NULL; @@ -1256,7 +1256,7 @@ static void load_system_fonts(void) { HKEY hkey; WCHAR data[MAX_PATH], windowsdir[MAX_PATH], pathW[MAX_PATH]; - const WCHAR **value; + const WCHAR * const *value; DWORD dlen, type; static const WCHAR fmtW[] = {'%','s','\\','%','s','\0'}; char *unixname;

1 0

Dmitry Timoshkov : mapi32: Break out of the loop as soon as MSI call succeeds.
by Alexandre Julliard May 26, 2006

May 26, 2006

Module: wine Branch: master Commit: 44c3d3288cb1b8154e8a16f16ec2576c5844082f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=44c3d3288cb1b8154e8a16f… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Fri May 26 13:35:47 2006 +0900 mapi32: Break out of the loop as soon as MSI call succeeds. --- dlls/mapi32/util.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/mapi32/util.c b/dlls/mapi32/util.c index d3184c6..9d75f14 100644 --- a/dlls/mapi32/util.c +++ b/dlls/mapi32/util.c @@ -878,7 +878,10 @@ BOOL WINAPI FGetComponentPath(LPCSTR com if (pMsiProvideQualifiedComponentA(component, qualifier, install ? INSTALLMODE_DEFAULT : INSTALLMODE_EXISTING, dll_path, &dll_path_length) == ERROR_SUCCESS) + { ret = TRUE; + break; + } if (qualifier != lcid_ver) break; }

1 0

lostwages/news 2006052601.xml
by WineHQ May 26, 2006

May 26, 2006

ChangeSet ID: 25170 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: wineowner(a)winehq.org 2006/05/26 01:14:39 Added files: news : 2006052601.xml Log message: News about Picasa port. Patch: http://cvs.winehq.org/patch.py?id=25170 Old revision New revision Changes Path Added 1.1 +0 -0 lostwages/news/2006052601.xml Index: lostwages/news/2006052601.xml diff -u -p /dev/null lostwages/news/2006052601.xml:1.1 --- /dev/null 26 May 2006 6:14:39 -0000 +++ lostwages/news/2006052601.xml 26 May 2006 6:14:39 -0000 @@ -0,0 +1,18 @@ +<news> + <date>May 26, 2006</date> + <title>Picasa for Linux</title> + <body> +<p>Google just released <a href="http://picasa.google.com/linux/">Picasa for +Linux</a>. In case you haven't used it, Picasa is an advanced image archiving +tool that also includes some basic photo manipulation features. Interestingly, +there's some technical details available about how the Linux version came to be. +The port was done using Wine and in the process over +<a href="http://code.google.com/wine.html">200 patches</a> were contributed +back to the Wine project. The final product ships with a self-contained +version of Wine and includes important features such as camera access using +gPhoto. Dan Kegel sent an email to the wine-devel mailing list +<a href="http://www.winehq.com/pipermail/wine-devel/2006-May/047806.html">providing more details</a> of this unique port. +</p><p>Go forth and +<a href="http://picasa.google.com/linux/download.html">download</a>.</p> + </body> +</news>

1 0

Dmitry Timoshkov : mapi32: Implement FGetComponentPath.
by Alexandre Julliard May 25, 2006

May 25, 2006

Module: wine Branch: refs/heads/master Commit: 64152a756454182ff5ee020d6059f9c4608ad58d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=64152a756454182ff5ee020… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu May 25 22:18:11 2006 +0900 mapi32: Implement FGetComponentPath. --- dlls/mapi32/mapi32.spec | 5 +--- dlls/mapi32/util.c | 66 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 68 insertions(+), 3 deletions(-) diff --git a/dlls/mapi32/mapi32.spec b/dlls/mapi32/mapi32.spec index 296a9bc..ab134cd 100644 --- a/dlls/mapi32/mapi32.spec +++ b/dlls/mapi32/mapi32.spec @@ -186,6 +186,5 @@ 251 stub GetOutlookVersion(a)0 252 stub FixMAPI 253 stub FixMAPI(a)0 -# This entry point is sometimes used to detect if the mapi dll came from Outlook -#254 stub FGetComponentPath -#255 stub FGetComponentPath(a)20 +254 stdcall FGetComponentPath(str str ptr long long) +255 stdcall FGetComponentPath(a)20(str str ptr long long) FGetComponentPath diff --git a/dlls/mapi32/util.c b/dlls/mapi32/util.c index d441527..d3184c6 100644 --- a/dlls/mapi32/util.c +++ b/dlls/mapi32/util.c @@ -19,6 +19,7 @@ */ #include <stdarg.h> +#include <stdio.h> #define COBJMACROS #define NONAMELESSUNION @@ -35,6 +36,7 @@ #include "wine/debug.h" #include "wine/unicode.h" #include "mapival.h" #include "xcmc.h" +#include "msi.h" WINE_DEFAULT_DEBUG_CHANNEL(mapi); @@ -821,3 +823,67 @@ CMC_return_code WINAPI cmc_query_configu FIXME("stub"); return CMC_E_NOT_SUPPORTED; } + +/************************************************************************** + * FGetComponentPath (MAPI32.254) + * FGetComponentPath(a)20 (MAPI32.255) + * + * Return the installed component path, usually to the private mapi32.dll. + * + * PARAMS + * component [I] Component ID + * qualifier [I] Application LCID + * dll_path [O] returned component path + * dll_path_length [I] component path length + * install [I] install mode + * + * RETURNS + * Success: TRUE. + * Failure: FALSE. + * + * NOTES + * Previously documented in Q229700 "How to locate the correct path + * to the Mapisvc.inf file in Microsoft Outlook". + */ +BOOL WINAPI FGetComponentPath(LPCSTR component, LPCSTR qualifier, LPSTR dll_path, + DWORD dll_path_length, BOOL install) +{ + BOOL ret = FALSE; + HMODULE hmsi; + + TRACE("%s %s %p %lu %d\n", component, qualifier, dll_path, dll_path_length, install); + + dll_path[0] = 0; + + hmsi = LoadLibraryA("msi.dll"); + if (hmsi) + { + FARPROC pMsiProvideQualifiedComponentA = GetProcAddress(hmsi, "MsiProvideQualifiedComponentA"); + + if (pMsiProvideQualifiedComponentA) + { + static const char * const fmt[] = { "%d\\NT", "%d\\95", "%d" }; + char lcid_ver[20]; + UINT i; + + for (i = 0; i < sizeof(fmt)/sizeof(fmt[0]); i++) + { + /* FIXME: what's the correct behaviour here? */ + if (!qualifier || qualifier == lcid_ver) + { + sprintf(lcid_ver, fmt[i], GetUserDefaultUILanguage()); + qualifier = lcid_ver; + } + + if (pMsiProvideQualifiedComponentA(component, qualifier, + install ? INSTALLMODE_DEFAULT : INSTALLMODE_EXISTING, + dll_path, &dll_path_length) == ERROR_SUCCESS) + ret = TRUE; + + if (qualifier != lcid_ver) break; + } + } + FreeLibrary(hmsi); + } + return ret; +}

1 0

Dmitry Timoshkov : msi: Translate the resulting string only if the previous call succeeded.
by Alexandre Julliard May 25, 2006

May 25, 2006

Module: wine Branch: refs/heads/master Commit: 0d13a99e799cb4d232027f1e8182856f71a14e45 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0d13a99e799cb4d232027f1… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu May 25 22:17:46 2006 +0900 msi: Translate the resulting string only if the previous call succeeded. --- dlls/msi/msi.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 48e726e..53efaee 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -1610,8 +1610,10 @@ UINT WINAPI MsiProvideQualifiedComponent msi_free(szwComponent); msi_free(szwQualifier); - *pcchPathBuf = WideCharToMultiByte(CP_ACP, 0, lpwPathBuf, pcchwPathBuf, - lpPathBuf, *pcchPathBuf, NULL, NULL); + + if (rc == ERROR_SUCCESS) + *pcchPathBuf = WideCharToMultiByte(CP_ACP, 0, lpwPathBuf, pcchwPathBuf, + lpPathBuf, *pcchPathBuf, NULL, NULL); msi_free(lpwPathBuf); return rc;

1 0

Jacek Caban : urlmon: Fix implementation of ReleaseBindInfo.
by Alexandre Julliard May 25, 2006

May 25, 2006

Module: wine Branch: refs/heads/master Commit: bcd6e9f33b23e9b9c78460acd5dc36ef29c74674 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=bcd6e9f33b23e9b9c78460a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 25 18:43:34 2006 +0200 urlmon: Fix implementation of ReleaseBindInfo. --- dlls/urlmon/tests/misc.c | 46 +++++++++++++++++++++++++++++++++++++++++++++ dlls/urlmon/urlmon_main.c | 15 +++++++++++++-- 2 files changed, 59 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index 9bc52f2..0a1da4a 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -58,6 +58,7 @@ #define CHECK_CALLED(func) \ DEFINE_EXPECT(ParseUrl); DEFINE_EXPECT(QI_IInternetProtocolInfo); DEFINE_EXPECT(CreateInstance); +DEFINE_EXPECT(unk_Release); static void test_CreateFormatEnum(void) { @@ -829,6 +830,50 @@ static void test_NameSpace(void) IInternetSession_Release(session); } +static ULONG WINAPI unk_Release(IUnknown *iface) +{ + CHECK_EXPECT(unk_Release); + return 0; +} + +static const IUnknownVtbl unk_vtbl = { + (void*)0xdeadbeef, + (void*)0xdeadbeef, + unk_Release +}; + +static void test_ReleaseBindInfo(void) +{ + BINDINFO bi; + IUnknown unk = { &unk_vtbl }; + + ReleaseBindInfo(NULL); /* shouldn't crash */ + + memset(&bi, 0, sizeof(bi)); + bi.cbSize = sizeof(BINDINFO); + bi.pUnk = &unk; + SET_EXPECT(unk_Release); + ReleaseBindInfo(&bi); + ok(bi.cbSize == sizeof(BINDINFO), "bi.cbSize=%ld, expected %d\n", + bi.cbSize, sizeof(bi)); + ok(bi.pUnk == NULL, "bi.pUnk=%p, expected NULL\n", bi.pUnk); + CHECK_CALLED(unk_Release); + + memset(&bi, 0, sizeof(bi)); + bi.cbSize = offsetof(BINDINFO, pUnk); + bi.pUnk = &unk; + ReleaseBindInfo(&bi); + ok(bi.cbSize == offsetof(BINDINFO, pUnk), "bi.cbSize=%ld, expected %d\n", + bi.cbSize, sizeof(bi)); + ok(bi.pUnk == &unk, "bi.pUnk=%p, expected %p\n", bi.pUnk, &unk); + + memset(&bi, 0, sizeof(bi)); + bi.pUnk = &unk; + ReleaseBindInfo(&bi); + ok(!bi.cbSize, "bi.cbSize=%ld, expected 0\n", bi.cbSize); + ok(bi.pUnk == &unk, "bi.pUnk=%p, expected %p\n", bi.pUnk, &unk); +} + START_TEST(misc) { OleInitialize(NULL); @@ -842,6 +887,7 @@ START_TEST(misc) test_SecurityManager(); test_ZoneManager(); test_NameSpace(); + test_ReleaseBindInfo(); OleUninitialize(); } diff --git a/dlls/urlmon/urlmon_main.c b/dlls/urlmon/urlmon_main.c index edec353..0cd57bc 100644 --- a/dlls/urlmon/urlmon_main.c +++ b/dlls/urlmon/urlmon_main.c @@ -35,6 +35,7 @@ #include "wine/unicode.h" #include "winuser.h" #include "urlmon.h" #include "urlmon_main.h" +#include "ole2.h" WINE_DEFAULT_DEBUG_CHANNEL(urlmon); @@ -370,15 +371,25 @@ HRESULT WINAPI CoGetClassObjectFromURL( */ void WINAPI ReleaseBindInfo(BINDINFO* pbindinfo) { + DWORD size; + TRACE("(%p)\n", pbindinfo); - if(!pbindinfo) + if(!pbindinfo || !(size = pbindinfo->cbSize)) return; CoTaskMemFree(pbindinfo->szExtraInfo); + ReleaseStgMedium(&pbindinfo->stgmedData); + + if(offsetof(BINDINFO, szExtraInfo) < size) + CoTaskMemFree(pbindinfo->szCustomVerb); - if(pbindinfo->pUnk) + + if(pbindinfo->pUnk && offsetof(BINDINFO, pUnk) < size) IUnknown_Release(pbindinfo->pUnk); + + memset(pbindinfo, 0, size); + pbindinfo->cbSize = size; } /***********************************************************************

1 0

Jacek Caban : urlmon: Better pending read handling.
by Alexandre Julliard May 25, 2006

May 25, 2006

Module: wine Branch: refs/heads/master Commit: 27b5c54f56aa0c96be8a130ad97f2a871e41c32e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=27b5c54f56aa0c96be8a130… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 25 18:40:47 2006 +0200 urlmon: Better pending read handling. --- dlls/urlmon/binding.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index 859057f..44d3e39 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -333,6 +333,7 @@ static HRESULT WINAPI ProtocolStream_Rea { ProtocolStream *This = STREAM_THIS(iface); DWORD read = 0, pread = 0; + HRESULT hres; TRACE("(%p)->(%p %ld %p)\n", This, pv, cb, pcbRead); @@ -354,9 +355,14 @@ static HRESULT WINAPI ProtocolStream_Rea return S_OK; } - IInternetProtocol_Read(This->protocol, (PBYTE)pv+read, cb-read, &pread); + hres = IInternetProtocol_Read(This->protocol, (PBYTE)pv+read, cb-read, &pread); *pcbRead = read + pread; + if(hres == E_PENDING) + return E_PENDING; + else if(FAILED(hres)) + FIXME("Read failed: %08lx\n", hres); + return read || pread ? S_OK : S_FALSE; }

1 0

Jacek Caban : urlmon: Added Switch implementation.
by Alexandre Julliard May 25, 2006

May 25, 2006

Module: wine Branch: refs/heads/master Commit: 8b69bf72da5f94ba9385e8e43ce83e3e417a4185 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8b69bf72da5f94ba9385e8e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 25 18:39:26 2006 +0200 urlmon: Added Switch implementation. --- dlls/urlmon/binding.c | 30 ++++++++++++++++++++++++++++-- 1 files changed, 28 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index bc43174..859057f 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -78,6 +78,7 @@ #define SERVPROV(x) ((IServiceProvider* #define STREAM(x) ((IStream*) &(x)->lpStreamVtbl) #define WM_MK_ONPROGRESS (WM_USER+100) +#define WM_MK_CONTINUE (WM_USER+101) typedef struct { Binding *binding; @@ -87,6 +88,11 @@ typedef struct { LPWSTR status_text; } on_progress_data; +typedef struct { + Binding *binding; + PROTOCOLDATA *data; +} switch_data; + static LRESULT WINAPI notif_wnd_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) { switch(msg) { @@ -104,6 +110,15 @@ static LRESULT WINAPI notif_wnd_proc(HWN return 0; } + case WM_MK_CONTINUE: { + switch_data *data = (switch_data*)lParam; + + IInternetProtocol_Continue(data->binding->protocol, data->data); + + IBinding_Release(BINDING(data->binding)); + HeapFree(GetProcessHeap(), 0, data); + return 0; + } } return DefWindowProcW(hwnd, msg, wParam, lParam); @@ -631,8 +646,19 @@ static HRESULT WINAPI InternetProtocolSi PROTOCOLDATA *pProtocolData) { Binding *This = PROTSINK_THIS(iface); - FIXME("(%p)->(%p)\n", This, pProtocolData); - return E_NOTIMPL; + switch_data *data; + + TRACE("(%p)->(%p)\n", This, pProtocolData); + + data = HeapAlloc(GetProcessHeap(), 0, sizeof(switch_data)); + + IBinding_AddRef(BINDING(This)); + data->binding = This; + data->data = pProtocolData; + + PostMessageW(This->notif_hwnd, WM_MK_CONTINUE, 0, (LPARAM)data); + + return S_OK; } static HRESULT WINAPI InternetProtocolSink_ReportProgress(IInternetProtocolSink *iface,

1 0

Jacek Caban : urlmon: Added handling BINDDSTATUS_FINDINGSOURCE and BINDSTATUS_CONNECTING in ReportProgress .
by Alexandre Julliard May 25, 2006

May 25, 2006

Module: wine Branch: refs/heads/master Commit: 675fd219ad9da2928133698d3574ec2cf0c3955e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=675fd219ad9da2928133698… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 25 18:37:55 2006 +0200 urlmon: Added handling BINDDSTATUS_FINDINGSOURCE and BINDSTATUS_CONNECTING in ReportProgress. --- dlls/urlmon/binding.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index 7de0847..bc43174 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -643,6 +643,12 @@ static HRESULT WINAPI InternetProtocolSi TRACE("(%p)->(%lu %s)\n", This, ulStatusCode, debugstr_w(szStatusText)); switch(ulStatusCode) { + case BINDSTATUS_FINDINGRESOURCE: + on_progress(This, 0, 0, BINDSTATUS_FINDINGRESOURCE, szStatusText); + break; + case BINDSTATUS_CONNECTING: + on_progress(This, 0, 0, BINDSTATUS_CONNECTING, szStatusText); + break; case BINDSTATUS_MIMETYPEAVAILABLE: { int len = strlenW(szStatusText)+1; This->mime = HeapAlloc(GetProcessHeap(), 0, len*sizeof(WCHAR));

1 0