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

Jason Green : wined3d: Move the GLSL registry check again.
by Alexandre Julliard 26 May '06

26 May '06

Module: wine Branch: master Commit: cef19b57690db3957e054ffc7d761c8804cc9d76 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=cef19b57690db3957e054ff… Author: Jason Green <jave27(a)gmail.com> Date: Fri May 26 00:33:13 2006 -0400 wined3d: Move the GLSL registry check again. --- dlls/wined3d/device.c | 10 ++++++++++ dlls/wined3d/directx.c | 10 ---------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 07edde1..eff9504 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1733,6 +1733,16 @@ #endif } + /* Determine shader mode to use based on GL caps */ + if (GL_SUPPORT(ARB_SHADING_LANGUAGE_100) && wined3d_settings.glslRequested + && (wined3d_settings.vs_mode == VS_HW || wined3d_settings.ps_mode == PS_HW)) + wined3d_settings.shader_mode = SHADER_GLSL; + else if ((GL_SUPPORT(ARB_VERTEX_PROGRAM) && wined3d_settings.vs_mode == VS_HW) || + (GL_SUPPORT(ARB_FRAGMENT_PROGRAM) && wined3d_settings.ps_mode == PS_HW)) + wined3d_settings.shader_mode = SHADER_ARB; + else + wined3d_settings.shader_mode = SHADER_SW; + /* Initialize the current view state */ This->modelview_valid = 1; This->proj_valid = 0; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 0bb5589..ec9c5d7 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1696,16 +1696,6 @@ #endif *pCaps->MaxStreams = MAX_STREAMS; *pCaps->MaxStreamStride = 1024; - /* Determine shader mode to use based on GL caps */ - if (GL_SUPPORT(ARB_SHADING_LANGUAGE_100) && wined3d_settings.glslRequested - && (wined3d_settings.vs_mode == VS_HW || wined3d_settings.ps_mode == PS_HW)) - wined3d_settings.shader_mode = SHADER_GLSL; - else if ((GL_SUPPORT(ARB_VERTEX_PROGRAM) && wined3d_settings.vs_mode == VS_HW) || - (GL_SUPPORT(ARB_FRAGMENT_PROGRAM) && wined3d_settings.ps_mode == PS_HW)) - wined3d_settings.shader_mode = SHADER_ARB; - else - wined3d_settings.shader_mode = SHADER_SW; - if (wined3d_settings.vs_mode == VS_HW && wined3d_settings.shader_mode == SHADER_GLSL && DeviceType != WINED3DDEVTYPE_REF) { *pCaps->VertexShaderVersion = D3DVS_VERSION(3,0);

1 0

Mike McCormack : rpcrt4: Remove unused IN and OUT macros.
by Alexandre Julliard 26 May '06

26 May '06

Module: wine Branch: master Commit: 3742333581dfbec54f3451956c87798047d3dd44 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3742333581dfbec54f34519… Author: Mike McCormack <mike(a)codeweavers.com> Date: Fri May 26 12:36:03 2006 +0900 rpcrt4: Remove unused IN and OUT macros. --- include/rpcndr.h | 58 +++++++++++++++++++++++++++--------------------------- 1 files changed, 29 insertions(+), 29 deletions(-) diff --git a/include/rpcndr.h b/include/rpcndr.h index 6f43bb4..42e5b1c 100644 --- a/include/rpcndr.h +++ b/include/rpcndr.h @@ -30,7 +30,7 @@ #endif #include <basetsd.h> -/* stupid #if can't handle casts... this __stupidity +/* stupid #if can't handle casts... this __stupidity is just a workaround for that limitation */ #define __NDR_CHAR_REP_MASK 0x000fL @@ -451,67 +451,67 @@ typedef struct _SCONTEXT_QUEUE { /* Context Handles */ RPCRTAPI RPC_BINDING_HANDLE RPC_ENTRY - NDRCContextBinding( IN NDR_CCONTEXT CContext ); + NDRCContextBinding( NDR_CCONTEXT CContext ); RPCRTAPI void RPC_ENTRY - NDRCContextMarshall( IN NDR_CCONTEXT CContext, OUT void *pBuff ); + NDRCContextMarshall( NDR_CCONTEXT CContext, void *pBuff ); RPCRTAPI void RPC_ENTRY - NDRCContextUnmarshall( OUT NDR_CCONTEXT *pCContext, IN RPC_BINDING_HANDLE hBinding, - IN void *pBuff, IN unsigned long DataRepresentation ); + NDRCContextUnmarshall( NDR_CCONTEXT *pCContext, RPC_BINDING_HANDLE hBinding, + void *pBuff, unsigned long DataRepresentation ); RPCRTAPI void RPC_ENTRY - NDRSContextMarshall( IN NDR_SCONTEXT CContext, OUT void *pBuff, IN NDR_RUNDOWN userRunDownIn ); + NDRSContextMarshall( NDR_SCONTEXT CContext, void *pBuff, NDR_RUNDOWN userRunDownIn ); RPCRTAPI NDR_SCONTEXT RPC_ENTRY - NDRSContextUnmarshall( IN void *pBuff, IN unsigned long DataRepresentation ); + NDRSContextUnmarshall( void *pBuff, unsigned long DataRepresentation ); RPCRTAPI void RPC_ENTRY - NDRSContextMarshallEx( IN RPC_BINDING_HANDLE BindingHandle, IN NDR_SCONTEXT CContext, - OUT void *pBuff, IN NDR_RUNDOWN userRunDownIn ); + NDRSContextMarshallEx( RPC_BINDING_HANDLE BindingHandle, NDR_SCONTEXT CContext, + void *pBuff, NDR_RUNDOWN userRunDownIn ); RPCRTAPI void RPC_ENTRY - NDRSContextMarshall2( IN RPC_BINDING_HANDLE BindingHandle, IN NDR_SCONTEXT CContext, - OUT void *pBuff, IN NDR_RUNDOWN userRunDownIn, IN void * CtxGuard, - IN unsigned long Flags ); + NDRSContextMarshall2( RPC_BINDING_HANDLE BindingHandle, NDR_SCONTEXT CContext, + void *pBuff, NDR_RUNDOWN userRunDownIn, void * CtxGuard, + unsigned long Flags ); RPCRTAPI NDR_SCONTEXT RPC_ENTRY - NDRSContextUnmarshallEx( IN RPC_BINDING_HANDLE BindingHandle, IN void *pBuff, - IN unsigned long DataRepresentation ); + NDRSContextUnmarshallEx( RPC_BINDING_HANDLE BindingHandle, void *pBuff, + unsigned long DataRepresentation ); RPCRTAPI NDR_SCONTEXT RPC_ENTRY - NDRSContextUnmarshall2( IN RPC_BINDING_HANDLE BindingHandle, IN void *pBuff, - IN unsigned long DataRepresentation, IN void *CtxGuard, - IN unsigned long Flags ); + NDRSContextUnmarshall2( RPC_BINDING_HANDLE BindingHandle, void *pBuff, + unsigned long DataRepresentation, void *CtxGuard, + unsigned long Flags ); RPCRTAPI void RPC_ENTRY NdrClientContextMarshall ( PMIDL_STUB_MESSAGE pStubMsg, NDR_CCONTEXT ContextHandle, int fCheck ); RPCRTAPI void RPC_ENTRY - NdrClientContextUnmarshall( IN PMIDL_STUB_MESSAGE pStubMsg, OUT NDR_CCONTEXT* pContextHandle, - IN RPC_BINDING_HANDLE BindHandle ); + NdrClientContextUnmarshall( PMIDL_STUB_MESSAGE pStubMsg, NDR_CCONTEXT* pContextHandle, + RPC_BINDING_HANDLE BindHandle ); RPCRTAPI void RPC_ENTRY NdrServerContextMarshall ( PMIDL_STUB_MESSAGE pStubMsg, NDR_SCONTEXT ContextHandle, NDR_RUNDOWN RundownRoutine ); RPCRTAPI NDR_SCONTEXT RPC_ENTRY - NdrServerContextUnmarshall( IN PMIDL_STUB_MESSAGE pStubMsg ); + NdrServerContextUnmarshall( PMIDL_STUB_MESSAGE pStubMsg ); RPCRTAPI void RPC_ENTRY NdrContextHandleSize( PMIDL_STUB_MESSAGE pStubMsg, unsigned char* pMemory, PFORMAT_STRING pFormat ); RPCRTAPI NDR_SCONTEXT RPC_ENTRY - NdrContextHandleInitialize( IN PMIDL_STUB_MESSAGE pStubMsg, IN PFORMAT_STRING pFormat ); + NdrContextHandleInitialize( PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat ); RPCRTAPI void RPC_ENTRY NdrServerContextNewMarshall( PMIDL_STUB_MESSAGE pStubMsg, NDR_SCONTEXT ContextHandle, NDR_RUNDOWN RundownRoutine, PFORMAT_STRING pFormat ); RPCRTAPI NDR_SCONTEXT RPC_ENTRY - NdrServerContextNewUnmarshall( IN PMIDL_STUB_MESSAGE pStubMsg, IN PFORMAT_STRING pFormat ); + NdrServerContextNewUnmarshall( PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat ); RPCRTAPI void RPC_ENTRY - RpcSsDestroyClientContext( IN void **ContextHandle ); + RpcSsDestroyClientContext( void **ContextHandle ); RPCRTAPI void RPC_ENTRY NdrSimpleTypeMarshall( PMIDL_STUB_MESSAGE pStubMsg, unsigned char* pMemory, unsigned char FormatChar ); @@ -600,10 +600,10 @@ RPCRTAPI void RPC_ENTRY NdrOleFree( void* NodeToFree ); RPCRTAPI void RPC_ENTRY - NdrClientInitializeNew( PRPC_MESSAGE pRpcMessage, PMIDL_STUB_MESSAGE pStubMsg, + NdrClientInitializeNew( PRPC_MESSAGE pRpcMessage, PMIDL_STUB_MESSAGE pStubMsg, PMIDL_STUB_DESC pStubDesc, unsigned int ProcNum ); RPCRTAPI unsigned char* RPC_ENTRY - NdrServerInitializeNew( PRPC_MESSAGE pRpcMsg, PMIDL_STUB_MESSAGE pStubMsg, PMIDL_STUB_DESC pStubDesc ); + NdrServerInitializeNew( PRPC_MESSAGE pRpcMsg, PMIDL_STUB_MESSAGE pStubMsg, PMIDL_STUB_DESC pStubDesc ); RPCRTAPI unsigned char* RPC_ENTRY NdrGetBuffer( MIDL_STUB_MESSAGE *stubmsg, unsigned long buflen, RPC_BINDING_HANDLE handle ); RPCRTAPI void RPC_ENTRY @@ -638,13 +638,13 @@ RPCRTAPI void RPC_ENTRY RPCRTAPI void RPC_ENTRY NdrRpcSmSetClientToOsf( PMIDL_STUB_MESSAGE pMessage ); RPCRTAPI void * RPC_ENTRY - NdrRpcSmClientAllocate( IN size_t Size ); + NdrRpcSmClientAllocate( size_t Size ); RPCRTAPI void RPC_ENTRY - NdrRpcSmClientFree( IN void *NodeToFree ); + NdrRpcSmClientFree( void *NodeToFree ); RPCRTAPI void * RPC_ENTRY - NdrRpcSsDefaultAllocate( IN size_t Size ); + NdrRpcSsDefaultAllocate( size_t Size ); RPCRTAPI void RPC_ENTRY - NdrRpcSsDefaultFree( IN void *NodeToFree ); + NdrRpcSsDefaultFree( void *NodeToFree ); #ifdef __cplusplus }

1 0

Mike McCormack : winapi: IMAGE_OPTIONAL_HEADER has different members on x86-64.
by Alexandre Julliard 26 May '06

26 May '06

Module: wine Branch: master Commit: 1cf527c3a32ea070c9d827f804d43e4271cf1b4c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1cf527c3a32ea070c9d827f… Author: Mike McCormack <mike(a)codeweavers.com> Date: Fri May 26 12:36:42 2006 +0900 winapi: IMAGE_OPTIONAL_HEADER has different members on x86-64. --- tools/winapi/tests.dat | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/winapi/tests.dat b/tools/winapi/tests.dat index 9b3c83f..016e95c 100644 --- a/tools/winapi/tests.dat +++ b/tools/winapi/tests.dat @@ -694,7 +694,7 @@ IMAGE_IMPORT_DESCRIPTOR IMAGE_LINENUMBER IMAGE_LOAD_CONFIG_DIRECTORY IMAGE_NT_HEADERS -IMAGE_OPTIONAL_HEADER +!IMAGE_OPTIONAL_HEADER # different on Win64 IMAGE_OS2_HEADER IMAGE_RELOCATION IMAGE_RESOURCE_DATA_ENTRY

1 0

lostwages/news 2006052601.xml
by WineHQ 26 May '06

26 May '06

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 25 May '06

25 May '06

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 25 May '06

25 May '06

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 25 May '06

25 May '06

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 25 May '06

25 May '06

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 25 May '06

25 May '06

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 25 May '06

25 May '06

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