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

Mike McCormack : kernel32: Fix some pointer to integer casts.
by Alexandre Julliard May 25, 2006

May 25, 2006

Module: wine Branch: refs/heads/master Commit: d5a998b38fd48eaebffab98c678bed9b6290169f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d5a998b38fd48eaebffab98… Author: Mike McCormack <mike(a)codeweavers.com> Date: Thu May 25 13:46:32 2006 +0900 kernel32: Fix some pointer to integer casts. --- dlls/kernel/console.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel/console.c b/dlls/kernel/console.c index 884b8dc..384bbfd 100644 --- a/dlls/kernel/console.c +++ b/dlls/kernel/console.c @@ -1040,7 +1040,7 @@ static BOOL start_console_renderer_h PROCESS_INFORMATION pi; /* FIXME: use dynamic allocation for most of the buffers below */ - ret = snprintf(buffer, sizeof(buffer), "%s --use-event=%d", appname, (INT)hEvent); + ret = snprintf(buffer, sizeof(buffer), "%s --use-event=%ld", appname, (DWORD_PTR)hEvent); if ((ret > -1) && (ret < sizeof(buffer)) && CreateProcessA(NULL, buffer, NULL, NULL, TRUE, DETACHED_PROCESS, NULL, NULL, si, &pi)) @@ -1532,7 +1532,7 @@ static WINE_EXCEPTION_FILTER(CONSOLE_Ctr */ static DWORD WINAPI CONSOLE_SendEventThread(void* pmt) { - DWORD event = (DWORD)pmt; + DWORD_PTR event = (DWORD_PTR)pmt; struct ConsoleHandler* ch; if (event == CTRL_C_EVENT)

1 0

Mike McCormack : mapi32: Fix prototype of MAPILogon and MAPILogoff.
by Alexandre Julliard May 25, 2006

May 25, 2006

Module: wine Branch: refs/heads/master Commit: d39686f482574a5851cdf4d29e6211bd38d69b10 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d39686f482574a5851cdf4d… Author: Mike McCormack <mike(a)codeweavers.com> Date: Thu May 25 11:41:27 2006 +0900 mapi32: Fix prototype of MAPILogon and MAPILogoff. --- dlls/mapi32/mapi32_main.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mapi32/mapi32_main.c b/dlls/mapi32/mapi32_main.c index 2f2b717..8b74999 100644 --- a/dlls/mapi32/mapi32_main.c +++ b/dlls/mapi32/mapi32_main.c @@ -74,7 +74,7 @@ HRESULT WINAPI MAPIInitialize(LPVOID ini return SUCCESS_SUCCESS; } -ULONG WINAPI MAPILogon(ULONG uiparam, LPSTR profile, LPSTR password, +ULONG WINAPI MAPILogon(ULONG_PTR uiparam, LPSTR profile, LPSTR password, FLAGS flags, ULONG reserved, LPLHANDLE session) { FIXME("(0x%08lx %s %p 0x%08lx 0x%08lx %p) Stub\n", uiparam, @@ -84,7 +84,7 @@ ULONG WINAPI MAPILogon(ULONG uiparam, LP return SUCCESS_SUCCESS; } -ULONG WINAPI MAPILogoff(LHANDLE session, ULONG uiparam, FLAGS flags, +ULONG WINAPI MAPILogoff(LHANDLE session, ULONG_PTR uiparam, FLAGS flags, ULONG reserved ) { FIXME("(0x%08lx 0x%08lx 0x%08lx 0x%08lx) Stub\n", session,

1 0

Mike McCormack : richedit: Fix prototype of the callback function.
by Alexandre Julliard May 25, 2006

May 25, 2006

Module: wine Branch: refs/heads/master Commit: ba8f40d4654bcf835572b0494111a16bfb322dd5 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ba8f40d4654bcf835572b04… Author: Mike McCormack <mike(a)codeweavers.com> Date: Thu May 25 11:41:11 2006 +0900 richedit: Fix prototype of the callback function. --- include/richedit.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/richedit.h b/include/richedit.h index ecf3c98..9798fc6 100644 --- a/include/richedit.h +++ b/include/richedit.h @@ -159,7 +159,7 @@ #define EN_ALIGNLTR 0x0710 #define EN_ALIGNRTL 0x0711 -typedef DWORD (CALLBACK * EDITSTREAMCALLBACK)( DWORD, LPBYTE, LONG, LONG * ); +typedef DWORD (CALLBACK * EDITSTREAMCALLBACK)( DWORD_PTR, LPBYTE, LONG, LONG * ); /* tab stops number limit */ #define MAX_TAB_STOPS 0x00000020

1 0

Robert Shearman : ole32: Add a class factory for CLSID_InProcFreeMarshaler.
by Alexandre Julliard May 25, 2006

May 25, 2006

Module: wine Branch: refs/heads/master Commit: f2bd261f120c9bfbb42930a19192e134a306e8f3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f2bd261f120c9bfbb42930a… Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed May 24 23:02:35 2006 +0100 ole32: Add a class factory for CLSID_InProcFreeMarshaler. --- dlls/ole32/compobj.c | 3 ++ dlls/ole32/compobj_private.h | 1 + dlls/ole32/ftmarshal.c | 65 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 69 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index f2a587f..d241bfb 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -1642,6 +1642,9 @@ HRESULT WINAPI CoGetClassObject( static const WCHAR wszInprocServer32[] = {'I','n','p','r','o','c','S','e','r','v','e','r','3','2',0}; HKEY hkey; + if (IsEqualCLSID(rclsid, &CLSID_InProcFreeMarshaler)) + return FTMarshalCF_Create(iid, ppv); + hres = COM_OpenKeyForCLSID(rclsid, wszInprocServer32, KEY_READ, &hkey); if (FAILED(hres)) { diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h index 2237469..f9fac80 100644 --- a/dlls/ole32/compobj_private.h +++ b/dlls/ole32/compobj_private.h @@ -178,6 +178,7 @@ extern HRESULT WINE_StringFromCLSID(cons HRESULT COM_OpenKeyForCLSID(REFCLSID clsid, LPCWSTR keyname, REGSAM access, HKEY *key); HRESULT MARSHAL_GetStandardMarshalCF(LPVOID *ppv); +HRESULT FTMarshalCF_Create(REFIID riid, LPVOID *ppv); /* Stub Manager */ diff --git a/dlls/ole32/ftmarshal.c b/dlls/ole32/ftmarshal.c index a0befee..9f41f65 100644 --- a/dlls/ole32/ftmarshal.c +++ b/dlls/ole32/ftmarshal.c @@ -325,3 +325,68 @@ HRESULT WINAPI CoCreateFreeThreadedMarsh *ppunkMarshal = _IFTMUnknown_ (ftm); return S_OK; } + +static HRESULT WINAPI FTMarshalCF_QueryInterface(LPCLASSFACTORY iface, + REFIID riid, LPVOID *ppv) +{ + *ppv = NULL; + if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IClassFactory)) + { + *ppv = iface; + IUnknown_AddRef(iface); + return S_OK; + } + return E_NOINTERFACE; +} + +static ULONG WINAPI FTMarshalCF_AddRef(LPCLASSFACTORY iface) +{ + return 2; /* non-heap based object */ +} + +static ULONG WINAPI FTMarshalCF_Release(LPCLASSFACTORY iface) +{ + return 1; /* non-heap based object */ +} + +static HRESULT WINAPI FTMarshalCF_CreateInstance(LPCLASSFACTORY iface, + LPUNKNOWN pUnk, REFIID riid, LPVOID *ppv) +{ + IUnknown *pUnknown; + HRESULT hr; + + TRACE("(%p, %s, %p)\n", pUnk, debugstr_guid(riid), ppv); + + *ppv = NULL; + + hr = CoCreateFreeThreadedMarshaler(pUnk, &pUnknown); + + if (SUCCEEDED(hr)) + { + hr = IUnknown_QueryInterface(pUnknown, riid, ppv); + IUnknown_Release(pUnknown); + } + + return hr; +} + +static HRESULT WINAPI FTMarshalCF_LockServer(LPCLASSFACTORY iface, BOOL fLock) +{ + FIXME("(%d), stub!\n",fLock); + return S_OK; +} + +static const IClassFactoryVtbl FTMarshalCFVtbl = +{ + FTMarshalCF_QueryInterface, + FTMarshalCF_AddRef, + FTMarshalCF_Release, + FTMarshalCF_CreateInstance, + FTMarshalCF_LockServer +}; +static const IClassFactoryVtbl *FTMarshalCF = &FTMarshalCFVtbl; + +HRESULT FTMarshalCF_Create(REFIID riid, LPVOID *ppv) +{ + return IClassFactory_QueryInterface((IClassFactory *)&FTMarshalCF, riid, ppv); +}

1 0

Robert Shearman : ole32: Implement GetUnmarshalClass for the free-threaded marshaler and
by Alexandre Julliard May 25, 2006

May 25, 2006

Module: wine Branch: refs/heads/master Commit: 386fcbb5f789be359e983097f86d571df28669ea URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=386fcbb5f789be359e98309… Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed May 24 23:02:26 2006 +0100 ole32: Implement GetUnmarshalClass for the free-threaded marshaler and remove unnecessary unmarshaling code for the standard-marshal case - this is handled by CoUnmarshalInterface and CoReleaseMarshalData. --- dlls/ole32/ftmarshal.c | 99 +++++++++++++++++------------------------------- 1 files changed, 36 insertions(+), 63 deletions(-) diff --git a/dlls/ole32/ftmarshal.c b/dlls/ole32/ftmarshal.c index 5255f60..a0befee 100644 --- a/dlls/ole32/ftmarshal.c +++ b/dlls/ole32/ftmarshal.c @@ -38,6 +38,8 @@ #include "compobj_private.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); +const CLSID CLSID_InProcFreeMarshaler = { 0x33A, 0, 0, {0xC0, 0, 0, 0, 0, 0, 0, 0x46} }; + typedef struct _FTMarshalImpl { const IUnknownVtbl *lpVtbl; LONG ref; @@ -138,7 +140,12 @@ static HRESULT WINAPI FTMarshalImpl_GetUnmarshalClass (LPMARSHAL iface, REFIID riid, void *pv, DWORD dwDestContext, void *pvDestContext, DWORD mshlflags, CLSID * pCid) { - FIXME ("(), stub!\n"); + TRACE("(%s, %p, 0x%lx, %p, 0x%lx, %p)\n", debugstr_guid(riid), pv, + dwDestContext, pvDestContext, mshlflags, pCid); + if (dwDestContext == MSHCTX_INPROC || dwDestContext == MSHCTX_CROSSCTX) + memcpy(pCid, &CLSID_InProcFreeMarshaler, sizeof(CLSID_InProcFreeMarshaler)); + else + memcpy(pCid, &CLSID_DfMarshal, sizeof(CLSID_InProcFreeMarshaler)); return S_OK; } @@ -175,7 +182,6 @@ FTMarshalImpl_MarshalInterface (LPMARSHA IMarshal *pMarshal = NULL; HRESULT hres; - DWORD magic = 0x57dfd54d /* MEOW */; TRACE("(%p, %s, %p, 0x%lx, %p, 0x%lx)\n", pStm, debugstr_guid(riid), pv, dwDestContext, pvDestContext, mshlflags); @@ -210,13 +216,6 @@ FTMarshalImpl_MarshalInterface (LPMARSHA return S_OK; } - /* FIXME: this isn't exactly corret. it looks like the standard marshaler - * for native writes all of the OBJREF data into the stream, so we should - * really rely on it to write this constant for us. however, we need a - * constant to differentiate the outofproc data from the inproc data */ - hres = IStream_Write (pStm, &magic, sizeof (magic), NULL); - if (hres != S_OK) return STG_E_MEDIUMFULL; - /* use the standard marshaler to handle all other cases */ CoGetStandardMarshal (riid, pv, dwDestContext, pvDestContext, mshlflags, &pMarshal); hres = IMarshal_MarshalInterface (pMarshal, pStm, riid, pv, dwDestContext, pvDestContext, mshlflags); @@ -228,6 +227,9 @@ static HRESULT WINAPI FTMarshalImpl_UnmarshalInterface (LPMARSHAL iface, IStream * pStm, REFIID riid, void **ppv) { DWORD mshlflags; + IUnknown *object; + DWORD constant; + GUID unknown_guid; HRESULT hres; TRACE ("(%p, %s, %p)\n", pStm, debugstr_guid(riid), ppv); @@ -235,42 +237,29 @@ FTMarshalImpl_UnmarshalInterface (LPMARS hres = IStream_Read (pStm, &mshlflags, sizeof (mshlflags), NULL); if (hres != S_OK) return STG_E_READFAULT; - if (mshlflags == 0x57dfd54d /* MEOW */) { - IMarshal *pMarshal; - - hres = CoCreateInstance (&CLSID_DfMarshal, NULL, CLSCTX_INPROC, &IID_IMarshal, (void **)&pMarshal); - if (FAILED(hres)) return hres; - - hres = IMarshal_UnmarshalInterface (pMarshal, pStm, riid, ppv); - IMarshal_Release (pMarshal); - return hres; - } - else { - IUnknown *object; - DWORD constant; - GUID unknown_guid; - - hres = IStream_Read (pStm, &object, sizeof (object), NULL); - if (hres != S_OK) return STG_E_READFAULT; + hres = IStream_Read (pStm, &object, sizeof (object), NULL); + if (hres != S_OK) return STG_E_READFAULT; - hres = IStream_Read (pStm, &constant, sizeof (constant), NULL); - if (hres != S_OK) return STG_E_READFAULT; - if (constant != 0) - FIXME("constant is 0x%lx instead of 0\n", constant); + hres = IStream_Read (pStm, &constant, sizeof (constant), NULL); + if (hres != S_OK) return STG_E_READFAULT; + if (constant != 0) + FIXME("constant is 0x%lx instead of 0\n", constant); - hres = IStream_Read (pStm, &unknown_guid, sizeof (unknown_guid), NULL); - if (hres != S_OK) return STG_E_READFAULT; + hres = IStream_Read (pStm, &unknown_guid, sizeof (unknown_guid), NULL); + if (hres != S_OK) return STG_E_READFAULT; - hres = IUnknown_QueryInterface(object, riid, ppv); - if (!(mshlflags & (MSHLFLAGS_TABLEWEAK|MSHLFLAGS_TABLESTRONG))) - IUnknown_Release(object); - return hres; - } + hres = IUnknown_QueryInterface(object, riid, ppv); + if (!(mshlflags & (MSHLFLAGS_TABLEWEAK|MSHLFLAGS_TABLESTRONG))) + IUnknown_Release(object); + return hres; } static HRESULT WINAPI FTMarshalImpl_ReleaseMarshalData (LPMARSHAL iface, IStream * pStm) { DWORD mshlflags; + IUnknown *object; + DWORD constant; + GUID unknown_guid; HRESULT hres; TRACE ("(%p)\n", pStm); @@ -278,35 +267,19 @@ static HRESULT WINAPI FTMarshalImpl_Rele hres = IStream_Read (pStm, &mshlflags, sizeof (mshlflags), NULL); if (hres != S_OK) return STG_E_READFAULT; - if (mshlflags == 0x57dfd54d /* MEOW */) { - IMarshal *pMarshal; - - hres = CoCreateInstance (&CLSID_DfMarshal, NULL, CLSCTX_INPROC, &IID_IMarshal, (void **)&pMarshal); - if (FAILED(hres)) return hres; - - hres = IMarshal_ReleaseMarshalData (pMarshal, pStm); - IMarshal_Release (pMarshal); - return hres; - } - else { - IUnknown *object; - DWORD constant; - GUID unknown_guid; - - hres = IStream_Read (pStm, &object, sizeof (object), NULL); - if (hres != S_OK) return STG_E_READFAULT; + hres = IStream_Read (pStm, &object, sizeof (object), NULL); + if (hres != S_OK) return STG_E_READFAULT; - hres = IStream_Read (pStm, &constant, sizeof (constant), NULL); - if (hres != S_OK) return STG_E_READFAULT; - if (constant != 0) - FIXME("constant is 0x%lx instead of 0\n", constant); + hres = IStream_Read (pStm, &constant, sizeof (constant), NULL); + if (hres != S_OK) return STG_E_READFAULT; + if (constant != 0) + FIXME("constant is 0x%lx instead of 0\n", constant); - hres = IStream_Read (pStm, &unknown_guid, sizeof (unknown_guid), NULL); - if (hres != S_OK) return STG_E_READFAULT; + hres = IStream_Read (pStm, &unknown_guid, sizeof (unknown_guid), NULL); + if (hres != S_OK) return STG_E_READFAULT; - IUnknown_Release(object); - return S_OK; - } + IUnknown_Release(object); + return S_OK; } static HRESULT WINAPI FTMarshalImpl_DisconnectObject (LPMARSHAL iface, DWORD dwReserved)

1 0

Robert Shearman : ole32: Implement table-strong marshaling and ReleaseMarshalData for the free-threaded marshaler .
by Alexandre Julliard May 25, 2006

May 25, 2006

Module: wine Branch: refs/heads/master Commit: 2c57189a97a24109958d6df7a3e4624a055b6bac URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2c57189a97a24109958d6df… Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed May 24 23:02:14 2006 +0100 ole32: Implement table-strong marshaling and ReleaseMarshalData for the free-threaded marshaler. --- dlls/ole32/ftmarshal.c | 44 ++++++++++++++++++++++++++++++++++++++++---- dlls/ole32/tests/marshal.c | 6 +++--- 2 files changed, 43 insertions(+), 7 deletions(-) diff --git a/dlls/ole32/ftmarshal.c b/dlls/ole32/ftmarshal.c index 4c32796..5255f60 100644 --- a/dlls/ole32/ftmarshal.c +++ b/dlls/ole32/ftmarshal.c @@ -262,7 +262,7 @@ FTMarshalImpl_UnmarshalInterface (LPMARS if (hres != S_OK) return STG_E_READFAULT; hres = IUnknown_QueryInterface(object, riid, ppv); - if (!(mshlflags & MSHLFLAGS_TABLEWEAK)) + if (!(mshlflags & (MSHLFLAGS_TABLEWEAK|MSHLFLAGS_TABLESTRONG))) IUnknown_Release(object); return hres; } @@ -270,13 +270,49 @@ FTMarshalImpl_UnmarshalInterface (LPMARS static HRESULT WINAPI FTMarshalImpl_ReleaseMarshalData (LPMARSHAL iface, IStream * pStm) { - FIXME ("(), stub!\n"); - return S_OK; + DWORD mshlflags; + HRESULT hres; + + TRACE ("(%p)\n", pStm); + + hres = IStream_Read (pStm, &mshlflags, sizeof (mshlflags), NULL); + if (hres != S_OK) return STG_E_READFAULT; + + if (mshlflags == 0x57dfd54d /* MEOW */) { + IMarshal *pMarshal; + + hres = CoCreateInstance (&CLSID_DfMarshal, NULL, CLSCTX_INPROC, &IID_IMarshal, (void **)&pMarshal); + if (FAILED(hres)) return hres; + + hres = IMarshal_ReleaseMarshalData (pMarshal, pStm); + IMarshal_Release (pMarshal); + return hres; + } + else { + IUnknown *object; + DWORD constant; + GUID unknown_guid; + + hres = IStream_Read (pStm, &object, sizeof (object), NULL); + if (hres != S_OK) return STG_E_READFAULT; + + hres = IStream_Read (pStm, &constant, sizeof (constant), NULL); + if (hres != S_OK) return STG_E_READFAULT; + if (constant != 0) + FIXME("constant is 0x%lx instead of 0\n", constant); + + hres = IStream_Read (pStm, &unknown_guid, sizeof (unknown_guid), NULL); + if (hres != S_OK) return STG_E_READFAULT; + + IUnknown_Release(object); + return S_OK; + } } static HRESULT WINAPI FTMarshalImpl_DisconnectObject (LPMARSHAL iface, DWORD dwReserved) { - FIXME ("(), stub!\n"); + TRACE ("()\n"); + /* nothing to do */ return S_OK; } diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index 203a128..7aba67e 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -1718,7 +1718,7 @@ #endif IUnknown_Release(pProxy); - todo_wine ok_more_than_one_lock(); + ok_more_than_one_lock(); IStream_Seek(pStream, llZero, STREAM_SEEK_SET, NULL); hr = IMarshal_ReleaseMarshalData(pFTMarshal, pStream); @@ -1767,7 +1767,7 @@ #endif hr = IMarshal_ReleaseMarshalData(pFTMarshal, pStream); ok_ole_success(hr, IMarshal_ReleaseMarshalData); - todo_wine ok_no_locks(); + ok_no_locks(); /* doesn't enforce marshaling rules here and allows us to unmarshal the * interface, even though it was freed above */ @@ -1775,7 +1775,7 @@ #endif hr = IMarshal_UnmarshalInterface(pFTMarshal, pStream, &IID_IUnknown, (void **)&pProxy); ok_ole_success(hr, IMarshal_UnmarshalInterface); - todo_wine ok_no_locks(); + ok_no_locks(); IStream_Release(pStream); IMarshal_Release(pFTMarshal);

1 0

Robert Shearman : ole32: Release the standard marshal in the free-threaded marshaler' s UnmarshalInterface function.
by Alexandre Julliard May 25, 2006

May 25, 2006

Module: wine Branch: refs/heads/master Commit: b795631daa6d70e40f473b46c17a7ded2256deb1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b795631daa6d70e40f473b4… Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed May 24 23:02:05 2006 +0100 ole32: Release the standard marshal in the free-threaded marshaler's UnmarshalInterface function. --- dlls/ole32/ftmarshal.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/ftmarshal.c b/dlls/ole32/ftmarshal.c index 8749c3c..04eb745 100644 --- a/dlls/ole32/ftmarshal.c +++ b/dlls/ole32/ftmarshal.c @@ -238,6 +238,8 @@ FTMarshalImpl_UnmarshalInterface (LPMARS if (FAILED(hres)) return hres; hres = IMarshal_UnmarshalInterface (pMarshal, pStm, riid, ppv); + IMarshal_Release (pMarshal); + return hres; } else { IUnknown *object; @@ -259,8 +261,6 @@ FTMarshalImpl_UnmarshalInterface (LPMARS IUnknown_Release(object); return hres; } - - return S_OK; } static HRESULT WINAPI FTMarshalImpl_ReleaseMarshalData (LPMARSHAL iface, IStream * pStm)

1 0

Robert Shearman : ole32: Implement table-weak marshaling for the free-threaded marshaler.
by Alexandre Julliard May 25, 2006

May 25, 2006

Module: wine Branch: refs/heads/master Commit: f9b5280dd0057462a50df9efdf472b22865f9b17 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f9b5280dd0057462a50df9e… Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed May 24 23:01:53 2006 +0100 ole32: Implement table-weak marshaling for the free-threaded marshaler. --- dlls/ole32/ftmarshal.c | 7 ++++++- dlls/ole32/tests/marshal.c | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/ftmarshal.c b/dlls/ole32/ftmarshal.c index 04eb745..4c32796 100644 --- a/dlls/ole32/ftmarshal.c +++ b/dlls/ole32/ftmarshal.c @@ -191,6 +191,10 @@ FTMarshalImpl_MarshalInterface (LPMARSHA if (FAILED(hres)) return hres; + /* don't hold a reference to table-weak marshaled interfaces */ + if (mshlflags & MSHLFLAGS_TABLEWEAK) + IUnknown_Release((IUnknown *)object); + hres = IStream_Write (pStm, &mshlflags, sizeof (mshlflags), NULL); if (hres != S_OK) return STG_E_MEDIUMFULL; @@ -258,7 +262,8 @@ FTMarshalImpl_UnmarshalInterface (LPMARS if (hres != S_OK) return STG_E_READFAULT; hres = IUnknown_QueryInterface(object, riid, ppv); - IUnknown_Release(object); + if (!(mshlflags & MSHLFLAGS_TABLEWEAK)) + IUnknown_Release(object); return hres; } } diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index e2eb472..203a128 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -1734,7 +1734,7 @@ #endif MSHLFLAGS_TABLEWEAK); ok_ole_success(hr, IMarshal_MarshalInterface); - todo_wine ok_no_locks(); + ok_no_locks(); test_freethreadedmarshaldata(pStream, MSHCTX_INPROC, &Test_ClassFactory, MSHLFLAGS_TABLEWEAK);

1 0

Robert Shearman : ole32: Add a rough implementation of the free-threaded marshaler MarshalInterface and UnmarshalInterface methods , with test cases.
by Alexandre Julliard May 25, 2006

May 25, 2006

Module: wine Branch: refs/heads/master Commit: 4335c64f7b944b195c33b54daac070cf87519015 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4335c64f7b944b195c33b54… Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed May 24 23:01:41 2006 +0100 ole32: Add a rough implementation of the free-threaded marshaler MarshalInterface and UnmarshalInterface methods, with test cases. --- dlls/ole32/ftmarshal.c | 75 +++++++++++++++++- dlls/ole32/tests/marshal.c | 179 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 249 insertions(+), 5 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=4335c64f7b944b195c3…

1 0

Robert Shearman : ole32: Fix the free-threaded marshaler when it has no outer unknown.
by Alexandre Julliard May 25, 2006

May 25, 2006

Module: wine Branch: refs/heads/master Commit: 4d1d2b6c1f362b0c4e312aa12fcb22edcc22769e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4d1d2b6c1f362b0c4e312aa… Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed May 24 23:00:53 2006 +0100 ole32: Fix the free-threaded marshaler when it has no outer unknown. --- dlls/ole32/ftmarshal.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/ftmarshal.c b/dlls/ole32/ftmarshal.c index c938f6d..8a776f1 100644 --- a/dlls/ole32/ftmarshal.c +++ b/dlls/ole32/ftmarshal.c @@ -241,7 +241,7 @@ HRESULT WINAPI CoCreateFreeThreadedMarsh ftm->lpVtbl = &iunkvt; ftm->lpvtblFTM = &ftmvtbl; ftm->ref = 1; - ftm->pUnkOuter = punkOuter; + ftm->pUnkOuter = punkOuter ? punkOuter : _IFTMUnknown_(ftm); *ppunkMarshal = _IFTMUnknown_ (ftm); return S_OK;

1 0