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

Robert Shearman : ole32: The type check in AntiMonikerImpl_CommonPrefixWith should be for anti-monikers , not item-monikers.
by Alexandre Julliard 08 May '06

08 May '06

Module: wine Branch: refs/heads/master Commit: 1c6f16a384d356e3c3fb0e03bd17b38e4b6e3b62 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1c6f16a384d356e3c3fb0e0… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon May 8 15:55:52 2006 +0100 ole32: The type check in AntiMonikerImpl_CommonPrefixWith should be for anti-monikers, not item-monikers. --- dlls/ole32/antimoniker.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/antimoniker.c b/dlls/ole32/antimoniker.c index 77d883a..472683f 100644 --- a/dlls/ole32/antimoniker.c +++ b/dlls/ole32/antimoniker.c @@ -409,7 +409,7 @@ AntiMonikerImpl_CommonPrefixWith(IMonike IMoniker_IsSystemMoniker(pmkOther,&mkSys); - if(mkSys==MKSYS_ITEMMONIKER){ + if(mkSys==MKSYS_ANTIMONIKER){ IMoniker_AddRef(iface);

1 0

Robert Shearman : ole32: Implement several class moniker functions using the description provided on MSDN .
by Alexandre Julliard 08 May '06

08 May '06

Module: wine Branch: refs/heads/master Commit: ae62ab039f4a1594aadf820b62084945f90d1066 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ae62ab039f4a1594aadf820… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon May 8 15:55:40 2006 +0100 ole32: Implement several class moniker functions using the description provided on MSDN. --- dlls/ole32/classmoniker.c | 58 +++++++++++++++++++++++++++++++++++--------- dlls/ole32/tests/moniker.c | 3 -- 2 files changed, 46 insertions(+), 15 deletions(-) diff --git a/dlls/ole32/classmoniker.c b/dlls/ole32/classmoniker.c index 74a0952..afdf48a 100644 --- a/dlls/ole32/classmoniker.c +++ b/dlls/ole32/classmoniker.c @@ -242,8 +242,33 @@ static HRESULT WINAPI ClassMoniker_BindT REFIID riid, VOID** ppvResult) { - FIXME("(%p,%p,%p,%p)\n", pbc, pmkToLeft, riid, ppvResult); - return E_NOTIMPL; + ClassMoniker *This = (ClassMoniker *)iface; + BIND_OPTS2 bindopts; + IClassActivator *pActivator; + HRESULT hr; + + TRACE("(%p,%p,%p,%p)\n", pbc, pmkToLeft, riid, ppvResult); + + bindopts.cbStruct = sizeof(bindopts); + IBindCtx_GetBindOptions(pbc, (BIND_OPTS *)&bindopts); + + if (!pmkToLeft) + return CoGetClassObject(&This->clsid, bindopts.dwClassContext, NULL, + riid, ppvResult); + else + { + hr = IMoniker_BindToObject(pmkToLeft, pbc, NULL, &IID_IClassActivator, + (void **)&pActivator); + if (FAILED(hr)) return hr; + + hr = IClassActivator_GetClassObject(pActivator, &This->clsid, + bindopts.dwClassContext, + bindopts.locale, riid, ppvResult); + + IClassActivator_Release(pActivator); + + return hr; + } } /****************************************************************************** @@ -255,8 +280,8 @@ static HRESULT WINAPI ClassMoniker_BindT REFIID riid, VOID** ppvResult) { - FIXME("(%p,%p,%p,%p)\n",pbc, pmkToLeft, riid, ppvResult); - return E_NOTIMPL; + TRACE("(%p,%p,%p,%p)\n",pbc, pmkToLeft, riid, ppvResult); + return ClassMoniker_BindToObject(iface, pbc, pmkToLeft, riid, ppvResult); } /****************************************************************************** @@ -424,8 +449,9 @@ static HRESULT WINAPI ClassMoniker_IsRun IMoniker* pmkToLeft, IMoniker* pmkNewlyRunning) { - FIXME("(%p, %p, %p)\n", pbc, pmkToLeft, pmkNewlyRunning); + TRACE("(%p, %p, %p)\n", pbc, pmkToLeft, pmkNewlyRunning); + /* as in native */ return E_NOTIMPL; } @@ -437,8 +463,9 @@ static HRESULT WINAPI ClassMoniker_GetTi IMoniker* pmkToLeft, FILETIME* pItemTime) { - FIXME("(%p, %p, %p)\n", pbc, pmkToLeft, pItemTime); - return E_NOTIMPL; + TRACE("(%p, %p, %p)\n", pbc, pmkToLeft, pItemTime); + + return MK_E_UNAVAILABLE; } /****************************************************************************** @@ -463,18 +490,25 @@ static HRESULT WINAPI ClassMoniker_Commo TRACE("(%p, %p)\n", pmkOther, ppmkPrefix); + *ppmkPrefix = NULL; + IMoniker_IsSystemMoniker(pmkOther, &mkSys); /* If the other moniker is an class moniker that is equal to this moniker, this method sets *ppmkPrefix */ /* to this moniker and returns MK_S_US */ - if((mkSys == MKSYS_CLASSMONIKER) && (IMoniker_IsEqual(iface, pmkOther) == S_OK) ){ - - *ppmkPrefix = iface; + if (mkSys == MKSYS_CLASSMONIKER) + { + if (IMoniker_IsEqual(iface, pmkOther) == S_OK) + { + *ppmkPrefix = iface; - IMoniker_AddRef(iface); + IMoniker_AddRef(iface); - return MK_S_US; + return MK_S_US; + } + else + return MK_E_NOPREFIX; } else /* otherwise, the method calls the MonikerCommonPrefixWith function. This function correctly handles */ diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index 14dcda3..6ae8cf1 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -523,16 +523,13 @@ static void test_class_moniker(void) ok(hr == E_NOTIMPL, "IMoniker_IsRunning should return E_NOTIMPL, not 0x%08lx\n", hr); hr = IMoniker_GetTimeOfLastChange(moniker, bindctx, NULL, &filetime); - todo_wine ok(hr == MK_E_UNAVAILABLE, "IMoniker_GetTimeOfLastChange should return MK_E_UNAVAILABLE, not 0x%08lx\n", hr); hr = IMoniker_BindToObject(moniker, bindctx, NULL, &IID_IUnknown, (void **)&unknown); - todo_wine ok_ole_success(hr, IMoniker_BindToStorage); IUnknown_Release(unknown); hr = IMoniker_BindToStorage(moniker, bindctx, NULL, &IID_IUnknown, (void **)&unknown); - todo_wine ok_ole_success(hr, IMoniker_BindToStorage); IUnknown_Release(unknown);

1 0

Robert Shearman : ole32: Add an implementation of class monikers.
by Alexandre Julliard 08 May '06

08 May '06

Module: wine Branch: refs/heads/master Commit: 8a4f71c61e4c3e9668245f2e39be5b24065f1a80 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8a4f71c61e4c3e9668245f2… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon May 8 15:55:14 2006 +0100 ole32: Add an implementation of class monikers. --- dlls/ole32/Makefile.in | 1 dlls/ole32/classmoniker.c | 771 ++++++++++++++++++++++++++++++++++++++++++++ dlls/ole32/moniker.c | 11 - dlls/ole32/moniker.h | 2 dlls/ole32/oleproxy.c | 2 dlls/ole32/tests/moniker.c | 5 6 files changed, 780 insertions(+), 12 deletions(-) create mode 100644 dlls/ole32/classmoniker.c Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=8a4f71c61e4c3e96682…

1 0

Robert Shearman : ole32: Remove duplicated CLSIDs.
by Alexandre Julliard 08 May '06

08 May '06

Module: wine Branch: refs/heads/master Commit: b155f233f30cb2dfc4b2bd20e870e8b6bda9dff2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b155f233f30cb2dfc4b2bd2… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon May 8 15:55:25 2006 +0100 ole32: Remove duplicated CLSIDs. --- dlls/ole32/compobj_private.h | 3 +++ dlls/ole32/regsvr.c | 24 +----------------------- 2 files changed, 4 insertions(+), 23 deletions(-) diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h index 66a7c1c..f362d16 100644 --- a/dlls/ole32/compobj_private.h +++ b/dlls/ole32/compobj_private.h @@ -41,6 +41,9 @@ #include "winternl.h" struct apartment; typedef struct apartment APARTMENT; +extern const CLSID CLSID_PSFactoryBuffer; +extern const CLSID CLSID_DfMarshal; + /* Thread-safety Annotation Legend: * * RO - The value is read only. It never changes after creation, so no diff --git a/dlls/ole32/regsvr.c b/dlls/ole32/regsvr.c index 31f0e22..741821f 100644 --- a/dlls/ole32/regsvr.c +++ b/dlls/ole32/regsvr.c @@ -33,6 +33,7 @@ #include "objbase.h" #include "compobj_private.h" #include "ole2.h" #include "olectl.h" +#include "moniker.h" #include "wine/debug.h" @@ -398,35 +399,12 @@ static LONG recursive_delete_key(HKEY ke /*********************************************************************** * coclass list */ -static GUID const CLSID_FileMoniker = { - 0x00000303, 0x0000, 0x0000, {0xC0,0x00,0x00,0x00,0x00,0x00,0x00,0x46} }; - -static GUID const CLSID_ItemMoniker = { - 0x00000304, 0x0000, 0x0000, {0xC0,0x00,0x00,0x00,0x00,0x00,0x00,0x46} }; - -static GUID const CLSID_AntiMoniker = { - 0x00000305, 0x0000, 0x0000, {0xC0,0x00,0x00,0x00,0x00,0x00,0x00,0x46} }; - static GUID const CLSID_PointerMoniker = { 0x00000306, 0x0000, 0x0000, {0xC0,0x00,0x00,0x00,0x00,0x00,0x00,0x46} }; static GUID const CLSID_PackagerMoniker = { 0x00000308, 0x0000, 0x0000, {0xC0,0x00,0x00,0x00,0x00,0x00,0x00,0x46} }; -static GUID const CLSID_CompositeMoniker = { - 0x00000309, 0x0000, 0x0000, {0xC0,0x00,0x00,0x00,0x00,0x00,0x00,0x46} }; - -/* FIXME: DfMarshal and PSFactoryBuffer are defined elsewhere too */ - -static GUID const CLSID_DfMarshal = { - 0x0000030B, 0x0000, 0x0000, {0xC0,0x00,0x00,0x00,0x00,0x00,0x00,0x46} }; - -static GUID const CLSID_ClassMoniker = { - 0x0000031A, 0x0000, 0x0000, {0xC0,0x00,0x00,0x00,0x00,0x00,0x00,0x46} }; - -static GUID const CLSID_PSFactoryBuffer = { - 0x00000320, 0x0000, 0x0000, {0xC0,0x00,0x00,0x00,0x00,0x00,0x00,0x46} }; - static struct regsvr_coclass const coclass_list[] = { { &CLSID_FileMoniker, "FileMoniker",

1 0

Robert Shearman : ole32: Fix regression caused by an earlier patch that removed the
by Alexandre Julliard 08 May '06

08 May '06

Module: wine Branch: refs/heads/master Commit: 288fb09b314f6d3e761323092a7520772775bf7f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=288fb09b314f6d3e7613230… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon May 8 15:54:52 2006 +0100 ole32: Fix regression caused by an earlier patch that removed the check for the composite moniker having only one moniker in it. In this case, return the one moniker and free the memory associate with the composite moniker. --- dlls/ole32/compositemoniker.c | 39 ++++++++++++++++++++++++++++----------- 1 files changed, 28 insertions(+), 11 deletions(-) diff --git a/dlls/ole32/compositemoniker.c b/dlls/ole32/compositemoniker.c index 059eabf..8912e6d 100644 --- a/dlls/ole32/compositemoniker.c +++ b/dlls/ole32/compositemoniker.c @@ -1764,7 +1764,7 @@ static const IMarshalVtbl VT_MarshalImpl * Composite-Moniker_Construct (local function) *******************************************************************************/ static HRESULT -CompositeMonikerImpl_Construct(CompositeMonikerImpl** ppThis, +CompositeMonikerImpl_Construct(IMoniker** ppMoniker, LPMONIKER pmkFirst, LPMONIKER pmkRest) { DWORD mkSys; @@ -1773,7 +1773,7 @@ CompositeMonikerImpl_Construct(Composite HRESULT res; CompositeMonikerImpl *This; - *ppThis = This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); + This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); if (!This) return E_OUTOFMEMORY; @@ -1784,7 +1784,7 @@ CompositeMonikerImpl_Construct(Composite This->lpvtbl1 = &VT_CompositeMonikerImpl; This->lpvtbl2 = &VT_ROTDataImpl; This->lpvtblMarshal= &VT_MarshalImpl; - This->ref = 0; + This->ref = 1; This->tabSize=BLOCK_TAB_SIZE; This->tabLastIndex=0; @@ -1794,7 +1794,10 @@ CompositeMonikerImpl_Construct(Composite return E_OUTOFMEMORY; if (!pmkFirst && !pmkRest) + { + *ppMoniker = (IMoniker *)This; return S_OK; + } IMoniker_IsSystemMoniker(pmkFirst,&mkSys); @@ -1913,6 +1916,16 @@ CompositeMonikerImpl_Construct(Composite IEnumMoniker_Release(enumMoniker); } + /* only one moniker, then just return it */ + if (This->tabLastIndex == 1) + { + *ppMoniker = This->tabMoniker[0]; + IMoniker_AddRef(*ppMoniker); + IMoniker_Release((IMoniker *)This); + } + else + *ppMoniker = (IMoniker *)This; + return S_OK; } @@ -1923,7 +1936,7 @@ HRESULT WINAPI CreateGenericComposite(LPMONIKER pmkFirst, LPMONIKER pmkRest, LPMONIKER* ppmkComposite) { - CompositeMonikerImpl* newCompositeMoniker = 0; + IMoniker* moniker = 0; HRESULT hr = S_OK; TRACE("(%p,%p,%p)\n",pmkFirst,pmkRest,ppmkComposite); @@ -1945,12 +1958,15 @@ CreateGenericComposite(LPMONIKER pmkFirs else if (pmkFirst==NULL && pmkRest==NULL) return S_OK; - hr = CompositeMonikerImpl_Construct(&newCompositeMoniker,pmkFirst,pmkRest); + hr = CompositeMonikerImpl_Construct(&moniker,pmkFirst,pmkRest); if (FAILED(hr)) return hr; - return IMoniker_QueryInterface((IMoniker*)newCompositeMoniker,&IID_IMoniker,(void**)ppmkComposite); + hr = IMoniker_QueryInterface(moniker,&IID_IMoniker,(void**)ppmkComposite); + IMoniker_Release(moniker); + + return hr; } /****************************************************************************** @@ -1989,7 +2005,7 @@ static ULONG WINAPI CompositeMonikerCF_R static HRESULT WINAPI CompositeMonikerCF_CreateInstance(LPCLASSFACTORY iface, LPUNKNOWN pUnk, REFIID riid, LPVOID *ppv) { - CompositeMonikerImpl* newCompositeMoniker; + IMoniker* pMoniker; HRESULT hr; TRACE("(%p, %s, %p)\n", pUnk, debugstr_guid(riid), ppv); @@ -1999,12 +2015,13 @@ static HRESULT WINAPI CompositeMonikerCF if (pUnk) return CLASS_E_NOAGGREGATION; - hr = CompositeMonikerImpl_Construct(&newCompositeMoniker, NULL, NULL); + hr = CompositeMonikerImpl_Construct(&pMoniker, NULL, NULL); if (SUCCEEDED(hr)) - hr = CompositeMonikerImpl_QueryInterface((IMoniker*)newCompositeMoniker, riid, ppv); - if (FAILED(hr)) - HeapFree(GetProcessHeap(),0,newCompositeMoniker); + { + hr = IMoniker_QueryInterface(pMoniker, riid, ppv); + IMoniker_Release(pMoniker); + } return hr; }

1 0

Robert Shearman : ole32: Add tests for IsRunning, GetTimeOfLastChange, BindToObject, BindToStorage and Inverse.
by Alexandre Julliard 08 May '06

08 May '06

Module: wine Branch: refs/heads/master Commit: 71a7393f451cca87d0c1625dbc294fa84e0c094e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=71a7393f451cca87d0c1625… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon May 8 15:55:01 2006 +0100 ole32: Add tests for IsRunning, GetTimeOfLastChange, BindToObject, BindToStorage and Inverse. --- dlls/ole32/tests/moniker.c | 102 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 101 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index 2e7cd7d..bb22b74 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -482,6 +482,10 @@ static void test_class_moniker(void) IMoniker *moniker; DWORD moniker_type; DWORD hash; + IBindCtx *bindctx; + IMoniker *inverse; + IUnknown *unknown; + FILETIME filetime; hr = CreateClassMoniker(&CLSID_StdComponentCategoriesMgr, &moniker); todo_wine ok_ole_success(hr, CreateClassMoniker); @@ -511,6 +515,30 @@ static void test_class_moniker(void) "dwMkSys != MKSYS_CLASSMONIKER, instead was 0x%08lx", moniker_type); + hr = CreateBindCtx(0, &bindctx); + ok_ole_success(hr, CreateBindCtx); + + /* IsRunning test */ + hr = IMoniker_IsRunning(moniker, bindctx, NULL, NULL); + ok(hr == E_NOTIMPL, "IMoniker_IsRunning should return E_NOTIMPL, not 0x%08lx\n", hr); + + hr = IMoniker_GetTimeOfLastChange(moniker, bindctx, NULL, &filetime); + ok(hr == MK_E_UNAVAILABLE, "IMoniker_GetTimeOfLastChange should return MK_E_UNAVAILABLE, not 0x%08lx\n", hr); + + hr = IMoniker_BindToObject(moniker, bindctx, NULL, &IID_IUnknown, (void **)&unknown); + ok_ole_success(hr, IMoniker_BindToStorage); + IUnknown_Release(unknown); + + hr = IMoniker_BindToStorage(moniker, bindctx, NULL, &IID_IUnknown, (void **)&unknown); + ok_ole_success(hr, IMoniker_BindToStorage); + IUnknown_Release(unknown); + + IBindCtx_Release(bindctx); + + hr = IMoniker_Inverse(moniker, &inverse); + ok_ole_success(hr, IMoniker_Inverse); + IMoniker_Release(inverse); + IMoniker_Release(moniker); } @@ -582,6 +610,9 @@ static void test_item_moniker(void) IMoniker *moniker; DWORD moniker_type; DWORD hash; + IBindCtx *bindctx; + IMoniker *inverse; + IUnknown *unknown; static const WCHAR wszDelimeter[] = {'!',0}; static const WCHAR wszObjectName[] = {'T','e','s','t',0}; static const WCHAR expected_display_name[] = { '!','T','e','s','t',0 }; @@ -613,6 +644,25 @@ static void test_item_moniker(void) "dwMkSys != MKSYS_ITEMMONIKER, instead was 0x%08lx", moniker_type); + hr = CreateBindCtx(0, &bindctx); + ok_ole_success(hr, CreateBindCtx); + + /* IsRunning test */ + hr = IMoniker_IsRunning(moniker, bindctx, NULL, NULL); + ok(hr == S_FALSE, "IMoniker_IsRunning should return S_FALSE, not 0x%08lx\n", hr); + + hr = IMoniker_BindToObject(moniker, bindctx, NULL, &IID_IUnknown, (void **)&unknown); + ok(hr == E_INVALIDARG, "IMoniker_BindToStorage should return E_INVALIDARG, not 0x%08lx\n", hr); + + hr = IMoniker_BindToStorage(moniker, bindctx, NULL, &IID_IUnknown, (void **)&unknown); + ok(hr == E_INVALIDARG, "IMoniker_BindToObject should return E_INVALIDARG, not 0x%08lx\n", hr); + + IBindCtx_Release(bindctx); + + hr = IMoniker_Inverse(moniker, &inverse); + ok_ole_success(hr, IMoniker_Inverse); + IMoniker_Release(inverse); + IMoniker_Release(moniker); } @@ -620,9 +670,12 @@ static void test_anti_moniker(void) { HRESULT hr; IMoniker *moniker; - IMoniker *inverse; DWORD moniker_type; DWORD hash; + IBindCtx *bindctx; + FILETIME filetime; + IMoniker *inverse; + IUnknown *unknown; static const WCHAR expected_display_name[] = { '\\','.','.',0 }; hr = CreateAntiMoniker(&moniker); @@ -653,6 +706,24 @@ static void test_anti_moniker(void) ok(hr == MK_E_NOINVERSE, "IMoniker_Inverse should have returned MK_E_NOINVERSE instead of 0x%08lx\n", hr); ok(inverse == NULL, "inverse should have been set to NULL instead of %p\n", inverse); + hr = CreateBindCtx(0, &bindctx); + ok_ole_success(hr, CreateBindCtx); + + /* IsRunning test */ + hr = IMoniker_IsRunning(moniker, bindctx, NULL, NULL); + ok(hr == S_FALSE, "IMoniker_IsRunning should return S_FALSE, not 0x%08lx\n", hr); + + hr = IMoniker_GetTimeOfLastChange(moniker, bindctx, NULL, &filetime); + ok(hr == E_NOTIMPL, "IMoniker_GetTimeOfLastChange should return E_NOTIMPL, not 0x%08lx\n", hr); + + hr = IMoniker_BindToObject(moniker, bindctx, NULL, &IID_IUnknown, (void **)&unknown); + ok(hr == E_NOTIMPL, "IMoniker_BindToObject should return E_NOTIMPL, not 0x%08lx\n", hr); + + hr = IMoniker_BindToStorage(moniker, bindctx, NULL, &IID_IUnknown, (void **)&unknown); + ok(hr == E_NOTIMPL, "IMoniker_BindToStorage should return E_NOTIMPL, not 0x%08lx\n", hr); + + IBindCtx_Release(bindctx); + IMoniker_Release(moniker); } @@ -664,6 +735,10 @@ static void test_generic_composite_monik IMoniker *moniker2; DWORD moniker_type; DWORD hash; + IBindCtx *bindctx; + FILETIME filetime; + IMoniker *inverse; + IUnknown *unknown; static const WCHAR wszDelimeter1[] = {'!',0}; static const WCHAR wszObjectName1[] = {'T','e','s','t',0}; static const WCHAR wszDelimeter2[] = {'#',0}; @@ -701,6 +776,31 @@ static void test_generic_composite_monik "dwMkSys != MKSYS_GENERICCOMPOSITE, instead was 0x%08lx", moniker_type); + hr = CreateBindCtx(0, &bindctx); + ok_ole_success(hr, CreateBindCtx); + + /* IsRunning test */ + hr = IMoniker_IsRunning(moniker, bindctx, NULL, NULL); + todo_wine + ok(hr == S_FALSE, "IMoniker_IsRunning should return S_FALSE, not 0x%08lx\n", hr); + + hr = IMoniker_GetTimeOfLastChange(moniker, bindctx, NULL, &filetime); + ok(hr == MK_E_NOTBINDABLE, "IMoniker_GetTimeOfLastChange should return MK_E_NOTBINDABLE, not 0x%08lx\n", hr); + + hr = IMoniker_BindToObject(moniker, bindctx, NULL, &IID_IUnknown, (void **)&unknown); + todo_wine + ok(hr == E_INVALIDARG, "IMoniker_BindToObject should return E_INVALIDARG, not 0x%08lx\n", hr); + + todo_wine + hr = IMoniker_BindToStorage(moniker, bindctx, NULL, &IID_IUnknown, (void **)&unknown); + ok(hr == E_INVALIDARG, "IMoniker_BindToStorage should return E_INVALIDARG, not 0x%08lx\n", hr); + + IBindCtx_Release(bindctx); + + hr = IMoniker_Inverse(moniker, &inverse); + ok_ole_success(hr, IMoniker_Inverse); + IMoniker_Release(inverse); + IMoniker_Release(moniker); }

1 0

Robert Shearman : ole32: Fix infinite recursion in CompositeMonikerImpl_GetTimeOfLastChange by handling pmkToLeft properly .
by Alexandre Julliard 08 May '06

08 May '06

Module: wine Branch: refs/heads/master Commit: 96646d532ff072414afd8315b43ffcd3e81eb358 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=96646d532ff072414afd831… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon May 8 15:54:43 2006 +0100 ole32: Fix infinite recursion in CompositeMonikerImpl_GetTimeOfLastChange by handling pmkToLeft properly. Fix a typo where CompositeMonikerImpl_GetTimeOfLastChange was called instead of the virtual implementation of it on mostRightMk. --- dlls/ole32/compositemoniker.c | 50 ++++++++++++++++++++++++----------------- 1 files changed, 29 insertions(+), 21 deletions(-) diff --git a/dlls/ole32/compositemoniker.c b/dlls/ole32/compositemoniker.c index fbeaa74..059eabf 100644 --- a/dlls/ole32/compositemoniker.c +++ b/dlls/ole32/compositemoniker.c @@ -727,9 +727,8 @@ static HRESULT WINAPI CompositeMonikerImpl_GetTimeOfLastChange(IMoniker* iface, IBindCtx* pbc, IMoniker* pmkToLeft, FILETIME* pCompositeTime) { - IRunningObjectTable* rot; HRESULT res; - IMoniker *tempMk,*antiMk,*mostRigthMk; + IMoniker *tempMk,*antiMk,*mostRigthMk,*leftMk; IEnumMoniker *enumMoniker; TRACE("(%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,pCompositeTime); @@ -741,36 +740,45 @@ CompositeMonikerImpl_GetTimeOfLastChange /* retrieve the time of last change. If the object is not in the ROT, the method recursively calls */ /* IMoniker::GetTimeOfLastChange on the rightmost component of the composite, passing the remainder */ /* of the composite as the pmkToLeft parameter for that call. */ - if (pmkToLeft!=NULL){ - - res=CreateGenericComposite(pmkToLeft,iface,&tempMk); + if (pmkToLeft) + { + IRunningObjectTable* rot; - res=IBindCtx_GetRunningObjectTable(pbc,&rot); + res = IMoniker_ComposeWith(pmkToLeft, iface, FALSE, &leftMk); + res = IBindCtx_GetRunningObjectTable(pbc,&rot); if (FAILED(res)) + { + IMoniker_Release(leftMk); return res; + } - if (IRunningObjectTable_GetTimeOfLastChange(rot,tempMk,pCompositeTime)==S_OK) + if (IRunningObjectTable_GetTimeOfLastChange(rot,leftMk,pCompositeTime)==S_OK) + { + IMoniker_Release(leftMk); return res; - else + } + } + else + leftMk = iface; - IMoniker_Enum(iface,FALSE,&enumMoniker); - IEnumMoniker_Next(enumMoniker,1,&mostRigthMk,NULL); - IEnumMoniker_Release(enumMoniker); + IMoniker_Enum(iface, FALSE, &enumMoniker); + IEnumMoniker_Next(enumMoniker, 1, &mostRigthMk, NULL); + IEnumMoniker_Release(enumMoniker); - res=CreateAntiMoniker(&antiMk); - res=IMoniker_ComposeWith(iface,antiMk,0,&tempMk); - IMoniker_Release(antiMk); + res = CreateAntiMoniker(&antiMk); + res = IMoniker_ComposeWith(leftMk, antiMk, 0, &tempMk); + IMoniker_Release(antiMk); - res=CompositeMonikerImpl_GetTimeOfLastChange(mostRigthMk,pbc,tempMk,pCompositeTime); + res = IMoniker_GetTimeOfLastChange(mostRigthMk, pbc, tempMk, pCompositeTime); - IMoniker_Release(tempMk); - IMoniker_Release(mostRigthMk); + IMoniker_Release(tempMk); + IMoniker_Release(mostRigthMk); - return res; - } - else - return IMoniker_GetTimeOfLastChange(iface,pbc,NULL,pCompositeTime); + if (pmkToLeft) + IMoniker_Release(leftMk); + + return res; } /******************************************************************************

1 0

Robert Shearman : ole32: Fix infinite recursion in CompositeMonikerImpl_BindToStorage.
by Alexandre Julliard 08 May '06

08 May '06

Module: wine Branch: refs/heads/master Commit: 91afe981e0571e7f2b3904b701dde166ed7dd178 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=91afe981e0571e7f2b3904b… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon May 8 15:54:34 2006 +0100 ole32: Fix infinite recursion in CompositeMonikerImpl_BindToStorage. --- dlls/ole32/compositemoniker.c | 38 +++++++++++++++++++++++--------------- 1 files changed, 23 insertions(+), 15 deletions(-) diff --git a/dlls/ole32/compositemoniker.c b/dlls/ole32/compositemoniker.c index 439fbca..fbeaa74 100644 --- a/dlls/ole32/compositemoniker.c +++ b/dlls/ole32/compositemoniker.c @@ -402,7 +402,7 @@ CompositeMonikerImpl_BindToStorage(IMoni IMoniker* pmkToLeft, REFIID riid, VOID** ppvResult) { HRESULT res; - IMoniker *tempMk,*antiMk,*mostRigthMk; + IMoniker *tempMk,*antiMk,*mostRigthMk,*leftMk; IEnumMoniker *enumMoniker; TRACE("(%p,%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,riid,ppvResult); @@ -412,26 +412,34 @@ CompositeMonikerImpl_BindToStorage(IMoni /* This method recursively calls BindToStorage on the rightmost component of the composite, */ /* passing the rest of the composite as the pmkToLeft parameter for that call. */ - if (pmkToLeft!=NULL){ + if (pmkToLeft) + { + res = IMoniker_ComposeWith(pmkToLeft, iface, FALSE, &leftMk); + if (FAILED(res)) return res; + } + else + leftMk = iface; - IMoniker_Enum(iface,FALSE,&enumMoniker); - IEnumMoniker_Next(enumMoniker,1,&mostRigthMk,NULL); - IEnumMoniker_Release(enumMoniker); + IMoniker_Enum(iface, FALSE, &enumMoniker); + IEnumMoniker_Next(enumMoniker, 1, &mostRigthMk, NULL); + IEnumMoniker_Release(enumMoniker); - res=CreateAntiMoniker(&antiMk); - res=IMoniker_ComposeWith(iface,antiMk,0,&tempMk); - IMoniker_Release(antiMk); + res = CreateAntiMoniker(&antiMk); + if (FAILED(res)) return res; + res = IMoniker_ComposeWith(leftMk, antiMk, 0, &tempMk); + if (FAILED(res)) return res; + IMoniker_Release(antiMk); - res=IMoniker_BindToStorage(mostRigthMk,pbc,tempMk,riid,ppvResult); + res = IMoniker_BindToStorage(mostRigthMk, pbc, tempMk, riid, ppvResult); - IMoniker_Release(tempMk); + IMoniker_Release(tempMk); - IMoniker_Release(mostRigthMk); + IMoniker_Release(mostRigthMk); - return res; - } - else - return IMoniker_BindToStorage(iface,pbc,NULL,riid,ppvResult); + if (pmkToLeft) + IMoniker_Release(leftMk); + + return res; } /******************************************************************************

1 0

Stefan Dösinger : wined3d: Implement IWineD3DSurface:: GetDC and IWineD3DSurface::ReleaseDC.
by Alexandre Julliard 08 May '06

08 May '06

Module: wine Branch: refs/heads/master Commit: af462957c36d6020f41cd9d3fb0a905622e3348f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=af462957c36d6020f41cd9d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat May 6 18:08:33 2006 +0200 wined3d: Implement IWineD3DSurface::GetDC and IWineD3DSurface::ReleaseDC. --- dlls/wined3d/surface.c | 245 +++++++++++++++++++++++++++++++++++++++- dlls/wined3d/utils.c | 181 ++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 20 +++ 3 files changed, 440 insertions(+), 6 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=af462957c36d6020f41…

1 0

Roderick Colenbrander : dinput8: DllGetClassObject support.
by Alexandre Julliard 08 May '06

08 May '06

Module: wine Branch: refs/heads/master Commit: 969ae13ebb2c177508b2c052c3f352c73ec5b3c6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=969ae13ebb2c177508b2c05… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Sat May 6 20:45:11 2006 +0200 dinput8: DllGetClassObject support. --- dlls/dinput8/Makefile.in | 2 - dlls/dinput8/dinput8_main.c | 96 +++++++++++++++++++++++++++++++++++++++---- 2 files changed, 87 insertions(+), 11 deletions(-) diff --git a/dlls/dinput8/Makefile.in b/dlls/dinput8/Makefile.in index cd23d04..34135c1 100644 --- a/dlls/dinput8/Makefile.in +++ b/dlls/dinput8/Makefile.in @@ -5,7 +5,7 @@ VPATH = @srcdir@ MODULE = dinput8.dll IMPORTLIB = libdinput8.$(IMPLIBEXT) IMPORTS = dinput kernel32 -EXTRALIBS = -luuid +EXTRALIBS = -luuid -ldxguid C_SRCS = \ dinput8_main.c diff --git a/dlls/dinput8/dinput8_main.c b/dlls/dinput8/dinput8_main.c index 432d3f1..ad9b2eb 100644 --- a/dlls/dinput8/dinput8_main.c +++ b/dlls/dinput8/dinput8_main.c @@ -1,6 +1,7 @@ /* DirectInput 8 * * Copyright 2002 TransGaming Technologies Inc. + * Copyright 2006 Roderick Colenbrander * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -22,6 +23,8 @@ #include <assert.h> #include <stdarg.h> #include <string.h> +#define COBJMACROS + #include "wine/debug.h" #include "windef.h" #include "winbase.h" @@ -29,25 +32,93 @@ #include "winerror.h" #include "dinput.h" WINE_DEFAULT_DEBUG_CHANNEL(dinput); +static LONG dll_count; + +/* + * Dll lifetime tracking declaration + */ +static void LockModule(void) +{ + InterlockedIncrement(&dll_count); +} + +static void UnlockModule(void) +{ + InterlockedDecrement(&dll_count); +} /****************************************************************************** * DirectInput8Create (DINPUT8.@) */ -HRESULT WINAPI DirectInput8Create( - HINSTANCE hinst, DWORD dwVersion, REFIID riid, LPVOID *ppDI, - LPUNKNOWN punkOuter -) { - return DirectInputCreateEx(hinst, dwVersion, riid, ppDI, punkOuter); +HRESULT WINAPI DirectInput8Create(HINSTANCE hinst, DWORD dwVersion, REFIID riid, LPVOID *ppDI, LPUNKNOWN punkOuter) { + /* TODO: Create the interface using CoCreateInstance as that's what windows does too and check if the version number >= 0x800 */ + return DirectInputCreateEx(hinst, dwVersion, riid, ppDI, punkOuter); +} + +/******************************************************************************* + * DirectInput8 ClassFactory + */ +typedef struct +{ + /* IUnknown fields */ + const IClassFactoryVtbl *lpVtbl; +} IClassFactoryImpl; + +static HRESULT WINAPI DI8CF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) { + IClassFactoryImpl *This = (IClassFactoryImpl *)iface; + FIXME("%p %s %p\n",This,debugstr_guid(riid),ppobj); + return E_NOINTERFACE; +} + +static ULONG WINAPI DI8CF_AddRef(LPCLASSFACTORY iface) { + LockModule(); + return 2; } +static ULONG WINAPI DI8CF_Release(LPCLASSFACTORY iface) { + UnlockModule(); + return 1; +} + +static HRESULT WINAPI DI8CF_CreateInstance(LPCLASSFACTORY iface,LPUNKNOWN pOuter,REFIID riid,LPVOID *ppobj) { + IClassFactoryImpl *This = (IClassFactoryImpl *)iface; + + TRACE("(%p)->(%p,%s,%p)\n",This,pOuter,debugstr_guid(riid),ppobj); + if( IsEqualGUID( &IID_IDirectInput8A, riid ) || IsEqualGUID( &IID_IDirectInput8W, riid ) ) { + return DirectInput8Create(0, DIRECTINPUT_VERSION, riid, ppobj, pOuter); + } + + ERR("(%p,%p,%s,%p) Interface not found!\n",This,pOuter,debugstr_guid(riid),ppobj); + return E_NOINTERFACE; +} + +static HRESULT WINAPI DI8CF_LockServer(LPCLASSFACTORY iface,BOOL dolock) { + TRACE("(%p)->(%d)\n", iface, dolock); + + if(dolock) + LockModule(); + else + UnlockModule(); + + return S_OK; +} + +static const IClassFactoryVtbl DI8CF_Vtbl = { + DI8CF_QueryInterface, + DI8CF_AddRef, + DI8CF_Release, + DI8CF_CreateInstance, + DI8CF_LockServer +}; +static IClassFactoryImpl DINPUT8_CF = { &DI8CF_Vtbl }; + + /*********************************************************************** * DllCanUnloadNow (DINPUT8.@) */ HRESULT WINAPI DllCanUnloadNow(void) { - FIXME("(void): stub\n"); - - return S_FALSE; + return dll_count == 0 ? S_OK : S_FALSE; } /*********************************************************************** @@ -55,9 +126,14 @@ HRESULT WINAPI DllCanUnloadNow(void) */ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) { - FIXME("(%p, %p, %p): stub\n", debugstr_guid(rclsid), - debugstr_guid(riid), ppv); + TRACE("(%s,%s,%p)\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); + if ( IsEqualCLSID( &IID_IClassFactory, riid ) ) { + *ppv = (LPVOID)&DINPUT8_CF; + IClassFactory_AddRef((IClassFactory*)*ppv); + return S_OK; + } + FIXME("(%s,%s,%p): no interface found.\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); return CLASS_E_CLASSNOTAVAILABLE; }

1 0