March 2014 - Wine-Commits - list.winehq.org

Michael Stefaniuc : dmcompos: Remove the extraneous IUnknown from DirectMusicChordMap.
by Alexandre Julliard March 11, 2014

March 11, 2014

Module: wine Branch: master Commit: 90f1e180e1ab5cd83fad854de8af4d2260245992 URL: http://source.winehq.org/git/wine.git/?a=commit;h=90f1e180e1ab5cd83fad854de… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Mar 10 23:55:42 2014 +0100 dmcompos: Remove the extraneous IUnknown from DirectMusicChordMap. Also lock/unlock the module only on creation/destruction of the object. --- dlls/dmcompos/chordmap.c | 125 +++++++++++++++----------------------- dlls/dmcompos/dmcompos_private.h | 2 - 2 files changed, 49 insertions(+), 78 deletions(-) diff --git a/dlls/dmcompos/chordmap.c b/dlls/dmcompos/chordmap.c index 2d22f37..9d2d8a9 100644 --- a/dlls/dmcompos/chordmap.c +++ b/dlls/dmcompos/chordmap.c @@ -22,71 +22,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmcompos); WINE_DECLARE_DEBUG_CHANNEL(dmfile); -static ULONG WINAPI IDirectMusicChordMapImpl_IUnknown_AddRef (LPUNKNOWN iface); -static ULONG WINAPI IDirectMusicChordMapImpl_IDirectMusicObject_AddRef (LPDIRECTMUSICOBJECT iface); -static ULONG WINAPI IDirectMusicChordMapImpl_IPersistStream_AddRef (LPPERSISTSTREAM iface); - /***************************************************************************** * IDirectMusicChordMapImpl implementation */ -/* IDirectMusicChordMapImpl IUnknown part: */ -static HRESULT WINAPI IDirectMusicChordMapImpl_IUnknown_QueryInterface (LPUNKNOWN iface, REFIID riid, LPVOID *ppobj) { - ICOM_THIS_MULTI(IDirectMusicChordMapImpl, UnknownVtbl, iface); - TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj); - - if (IsEqualIID (riid, &IID_IUnknown)) { - *ppobj = &This->UnknownVtbl; - IDirectMusicChordMapImpl_IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl); - return S_OK; - } else if (IsEqualIID (riid, &IID_IDirectMusicChordMap)) { - *ppobj = &This->IDirectMusicChordMap_iface; - IDirectMusicChordMap_AddRef(&This->IDirectMusicChordMap_iface); - return S_OK; - } else if (IsEqualIID (riid, &IID_IDirectMusicObject)) { - *ppobj = &This->ObjectVtbl; - IDirectMusicChordMapImpl_IDirectMusicObject_AddRef ((LPDIRECTMUSICOBJECT)&This->ObjectVtbl); - return S_OK; - } else if (IsEqualIID (riid, &IID_IPersistStream)) { - *ppobj = &This->PersistStreamVtbl; - IDirectMusicChordMapImpl_IPersistStream_AddRef ((LPPERSISTSTREAM)&This->PersistStreamVtbl); - return S_OK; - } - - WARN("(%p, %s, %p): not found\n", This, debugstr_dmguid(riid), ppobj); - return E_NOINTERFACE; -} - -static ULONG WINAPI IDirectMusicChordMapImpl_IUnknown_AddRef (LPUNKNOWN iface) { - ICOM_THIS_MULTI(IDirectMusicChordMapImpl, UnknownVtbl, iface); - ULONG ref = InterlockedIncrement(&This->ref); - - TRACE("(%p): AddRef from %d\n", This, ref - 1); - - DMCOMPOS_LockModule(); - - return ref; -} - -static ULONG WINAPI IDirectMusicChordMapImpl_IUnknown_Release (LPUNKNOWN iface) { - ICOM_THIS_MULTI(IDirectMusicChordMapImpl, UnknownVtbl, iface); - ULONG ref = InterlockedDecrement(&This->ref); - - TRACE("(%p): ReleaseRef to %d\n", This, ref); - - if (ref == 0) { - HeapFree(GetProcessHeap(), 0, This); - } - - DMCOMPOS_UnlockModule(); - - return ref; -} - -static const IUnknownVtbl DirectMusicChordMap_Unknown_Vtbl = { - IDirectMusicChordMapImpl_IUnknown_QueryInterface, - IDirectMusicChordMapImpl_IUnknown_AddRef, - IDirectMusicChordMapImpl_IUnknown_Release -}; /* IDirectMusicChordMapImpl IDirectMusicChordMap part: */ static inline IDirectMusicChordMapImpl *impl_from_IDirectMusicChordMap(IDirectMusicChordMap *iface) @@ -95,22 +33,53 @@ static inline IDirectMusicChordMapImpl *impl_from_IDirectMusicChordMap(IDirectMu } static HRESULT WINAPI IDirectMusicChordMapImpl_QueryInterface(IDirectMusicChordMap *iface, - REFIID riid, void **ppobj) + REFIID riid, void **ret_iface) { IDirectMusicChordMapImpl *This = impl_from_IDirectMusicChordMap(iface); - return IDirectMusicChordMapImpl_IUnknown_QueryInterface ((LPUNKNOWN)&This->UnknownVtbl, riid, ppobj); + + TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ret_iface); + + *ret_iface = NULL; + + if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IDirectMusicChordMap)) + *ret_iface = iface; + else if (IsEqualIID(riid, &IID_IDirectMusicObject)) + *ret_iface = &This->ObjectVtbl; + else if (IsEqualIID(riid, &IID_IPersistStream)) + *ret_iface = &This->PersistStreamVtbl; + else { + WARN("(%p, %s, %p): not found\n", This, debugstr_dmguid(riid), ret_iface); + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ret_iface); + return S_OK; } static ULONG WINAPI IDirectMusicChordMapImpl_AddRef(IDirectMusicChordMap *iface) { IDirectMusicChordMapImpl *This = impl_from_IDirectMusicChordMap(iface); - return IDirectMusicChordMapImpl_IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl); + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + return ref; } static ULONG WINAPI IDirectMusicChordMapImpl_Release(IDirectMusicChordMap *iface) { IDirectMusicChordMapImpl *This = impl_from_IDirectMusicChordMap(iface); - return IDirectMusicChordMapImpl_IUnknown_Release ((LPUNKNOWN)&This->UnknownVtbl); + LONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + if (!ref) { + HeapFree(GetProcessHeap(), 0, This->pDesc); + HeapFree(GetProcessHeap(), 0, This); + DMCOMPOS_UnlockModule(); + } + + return ref; } static HRESULT WINAPI IDirectMusicChordMapImpl_GetScale(IDirectMusicChordMap *iface, @@ -131,17 +100,17 @@ static const IDirectMusicChordMapVtbl dmchordmap_vtbl = { /* IDirectMusicChordMapImpl IDirectMusicObject part: */ static HRESULT WINAPI IDirectMusicChordMapImpl_IDirectMusicObject_QueryInterface (LPDIRECTMUSICOBJECT iface, REFIID riid, LPVOID *ppobj) { ICOM_THIS_MULTI(IDirectMusicChordMapImpl, ObjectVtbl, iface); - return IDirectMusicChordMapImpl_IUnknown_QueryInterface ((LPUNKNOWN)&This->UnknownVtbl, riid, ppobj); + return IDirectMusicChordMap_QueryInterface(&This->IDirectMusicChordMap_iface, riid, ppobj); } static ULONG WINAPI IDirectMusicChordMapImpl_IDirectMusicObject_AddRef (LPDIRECTMUSICOBJECT iface) { ICOM_THIS_MULTI(IDirectMusicChordMapImpl, ObjectVtbl, iface); - return IDirectMusicChordMapImpl_IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl); + return IDirectMusicChordMap_AddRef(&This->IDirectMusicChordMap_iface); } static ULONG WINAPI IDirectMusicChordMapImpl_IDirectMusicObject_Release (LPDIRECTMUSICOBJECT iface) { ICOM_THIS_MULTI(IDirectMusicChordMapImpl, ObjectVtbl, iface); - return IDirectMusicChordMapImpl_IUnknown_Release ((LPUNKNOWN)&This->UnknownVtbl); + return IDirectMusicChordMap_Release(&This->IDirectMusicChordMap_iface); } static HRESULT WINAPI IDirectMusicChordMapImpl_IDirectMusicObject_GetDescriptor (LPDIRECTMUSICOBJECT iface, LPDMUS_OBJECTDESC pDesc) { @@ -346,17 +315,17 @@ static const IDirectMusicObjectVtbl DirectMusicChordMap_Object_Vtbl = { /* IDirectMusicChordMapImpl IPersistStream part: */ static HRESULT WINAPI IDirectMusicChordMapImpl_IPersistStream_QueryInterface (LPPERSISTSTREAM iface, REFIID riid, LPVOID *ppobj) { ICOM_THIS_MULTI(IDirectMusicChordMapImpl, PersistStreamVtbl, iface); - return IDirectMusicChordMapImpl_IUnknown_QueryInterface ((LPUNKNOWN)&This->UnknownVtbl, riid, ppobj); + return IDirectMusicChordMap_QueryInterface(&This->IDirectMusicChordMap_iface, riid, ppobj); } static ULONG WINAPI IDirectMusicChordMapImpl_IPersistStream_AddRef (LPPERSISTSTREAM iface) { ICOM_THIS_MULTI(IDirectMusicChordMapImpl, PersistStreamVtbl, iface); - return IDirectMusicChordMapImpl_IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl); + return IDirectMusicChordMap_AddRef(&This->IDirectMusicChordMap_iface); } static ULONG WINAPI IDirectMusicChordMapImpl_IPersistStream_Release (LPPERSISTSTREAM iface) { ICOM_THIS_MULTI(IDirectMusicChordMapImpl, PersistStreamVtbl, iface); - return IDirectMusicChordMapImpl_IUnknown_Release ((LPUNKNOWN)&This->UnknownVtbl); + return IDirectMusicChordMap_Release(&This->IDirectMusicChordMap_iface); } static HRESULT WINAPI IDirectMusicChordMapImpl_IPersistStream_GetClassID (LPPERSISTSTREAM iface, CLSID* pClassID) { @@ -537,13 +506,13 @@ static const IPersistStreamVtbl DirectMusicChordMap_PersistStream_Vtbl = { HRESULT WINAPI create_dmchordmap(REFIID lpcGUID, void **ppobj) { IDirectMusicChordMapImpl* obj; - + HRESULT hr; + obj = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicChordMapImpl)); if (NULL == obj) { *ppobj = NULL; return E_OUTOFMEMORY; } - obj->UnknownVtbl = &DirectMusicChordMap_Unknown_Vtbl; obj->IDirectMusicChordMap_iface.lpVtbl = &dmchordmap_vtbl; obj->ObjectVtbl = &DirectMusicChordMap_Object_Vtbl; obj->PersistStreamVtbl = &DirectMusicChordMap_PersistStream_Vtbl; @@ -551,7 +520,11 @@ HRESULT WINAPI create_dmchordmap(REFIID lpcGUID, void **ppobj) DM_STRUCT_INIT(obj->pDesc); obj->pDesc->dwValidData |= DMUS_OBJ_CLASS; obj->pDesc->guidClass = CLSID_DirectMusicChordMap; - obj->ref = 0; /* will be inited by QueryInterface */ + obj->ref = 1; + + DMCOMPOS_LockModule(); + hr = IDirectMusicChordMap_QueryInterface(&obj->IDirectMusicChordMap_iface, lpcGUID, ppobj); + IDirectMusicChordMap_Release(&obj->IDirectMusicChordMap_iface); - return IDirectMusicChordMapImpl_IUnknown_QueryInterface ((LPUNKNOWN)&obj->UnknownVtbl, lpcGUID, ppobj); + return hr; } diff --git a/dlls/dmcompos/dmcompos_private.h b/dlls/dmcompos/dmcompos_private.h index 6f680e5..d7113e5 100644 --- a/dlls/dmcompos/dmcompos_private.h +++ b/dlls/dmcompos/dmcompos_private.h @@ -61,8 +61,6 @@ extern HRESULT WINAPI create_dmsignposttrack(REFIID riid, void **ret_iface) DECL * IDirectMusicChordMapImpl implementation structure */ struct IDirectMusicChordMapImpl { - /* IUnknown fields */ - const IUnknownVtbl *UnknownVtbl; IDirectMusicChordMap IDirectMusicChordMap_iface; const IDirectMusicObjectVtbl *ObjectVtbl; const IPersistStreamVtbl *PersistStreamVtbl;

1 0

Frédéric Delanoy : cmd/tests: Don't use "@pwd@\" when expecting a full path.
by Alexandre Julliard March 11, 2014

March 11, 2014

Module: wine Branch: master Commit: e9eb86edfb50d83aa27453ef655f70a073306535 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9eb86edfb50d83aa27453ef6… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Mar 11 00:16:28 2014 +0100 cmd/tests: Don't use "@pwd@\" when expecting a full path. --- programs/cmd/tests/test_builtins.cmd.exp | 84 +++++++++++++++--------------- 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 1575984..828a651 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -263,8 +263,8 @@ foo @path@ @path@ ~dp0 should be directory containing batch file -(a)pwd@\ -(a)pwd@\ +(a)drive@@path@ +(a)drive@@path@ CD value @pwd@@or_broken(a)CD value(a)space@ % P @@ -299,8 +299,8 @@ C C 'A B'@or_broken@'' 'C'@or_broken@'' -(a)pwd@\C D(a)or_broken@%~ff -(a)pwd@\E(a)or_broken@%~ff +(a)drive@@path(a)C D(a)or_broken@%~ff +(a)drive@@path(a)E@or_broken@%~ff @drive@ @drive@ @path@@or_broken@%~pd @@ -335,8 +335,8 @@ N C 'A B'@or_broken@'' 'C'@or_broken@'' -(a)pwd@\C D -(a)pwd@\E +(a)drive@@path(a)C D +(a)drive@@path(a)E @drive@ @drive@ @path@ @@ -392,22 +392,22 @@ foo5 foo6(a)space@ @todo_wine(a)------------ Testing cd ------------ singleFile -Current dir: @pwd@\foobar(a)or_broken@Current dir:@space@ -(a)pwd@\foobar +Current dir: @drive@@path(a)foobar@or_broken(a)Current dir:@space@ +(a)drive@@path(a)foobar @pwd@ -(a)pwd@\foobar +(a)drive@@path(a)foobar @pwd@ -(a)pwd@\foobar +(a)drive@@path(a)foobar @pwd@ @pwd@ @pwd@ -(a)pwd@\foobar\bar bak -(a)pwd@\foobar\bar bak -(a)pwd@\foobar\bar bak -(a)pwd@\foobar\bar bak -(a)pwd@\foobar\bar bak +(a)drive@@path(a)foobar\bar bak +(a)drive@@path(a)foobar\bar bak +(a)drive@@path(a)foobar\bar bak +(a)drive@@path(a)foobar\bar bak +(a)drive@@path(a)foobar\bar bak @pwd@ -(a)pwd@\foobar +(a)drive@@path(a)foobar ------------ Testing type ------------ @pwd@>type foobaz(a)space@ @@ -1090,31 +1090,31 @@ bar\baz removed --- pushing non-existing dir @pwd@ --- basic behaviour -(a)pwd@\foobar +(a)drive@@path(a)foobar @pwd@ -(a)pwd@\foobar\baz -(a)pwd@\foobar -(a)pwd@\foobar +(a)drive@@path(a)foobar\baz +(a)drive@@path(a)foobar +(a)drive@@path(a)foobar @pwd@ -(a)pwd@\foobar +(a)drive@@path(a)foobar @pwd@ ------------ Testing attrib ------------ -A @pwd@\foobar\foo(a)or_broken@A @pwd@\foobar\foo(a)or_broken@A I @pwd@\foobar\foo +A @drive@@path(a)foobar\foo(a)or_broken@A @drive@@path(a)foobar\foo(a)or_broken@A I @drive@@path(a)foobar\foo --- read-only attribute -A R @pwd@\foobar\foo(a)or_broken@A R @pwd@\foobar\foo(a)or_broken@A R I @pwd@\foobar\foo +A R @drive@@path(a)foobar\foo(a)or_broken@A R @drive@@path(a)foobar\foo(a)or_broken@A R I @drive@@path(a)foobar\foo foo foo original contents Read-only file not deleted Read-only file forcibly deleted --- recursive behaviour -A @pwd@\foobar\baz\level2(a)or_broken@A @pwd@\foobar\baz\level2(a)or_broken@A I @pwd@\foobar\baz\level2 -A R @pwd@\foobar\level1(a)or_broken@A R @pwd@\foobar\level1(a)or_broken@A R I @pwd@\foobar\level1 -A R @pwd@\foobar\baz\level2(a)or_broken@A R @pwd@\foobar\baz\level2(a)or_broken@A R I @pwd@\foobar\baz\level2 -A @pwd@\foobar\bar(a)or_broken@A @pwd@\foobar\bar(a)or_broken@A I @pwd@\foobar\bar +A @drive@@path(a)foobar\baz\level2(a)or_broken@A @drive@@path(a)foobar\baz\level2(a)or_broken@A I @drive@@path(a)foobar\baz\level2 +A R @drive@@path(a)foobar\level1(a)or_broken@A R @drive@@path(a)foobar\level1(a)or_broken@A R I @drive@@path(a)foobar\level1 +A R @drive@@path(a)foobar\baz\level2(a)or_broken@A R @drive@@path(a)foobar\baz\level2(a)or_broken@A R I @drive@@path(a)foobar\baz\level2 +A @drive@@path(a)foobar\bar(a)or_broken@A @drive@@path(a)foobar\bar(a)or_broken@A I @drive@@path(a)foobar\bar --- folders processing - @pwd@\foobar(a)or_broken@ @pwd@\foobar(a)or_broken@ I @pwd@\foobar -(a)todo_wine@ R @pwd@\foobar\baz(a)or_broken@ R @pwd@\foobar\baz(a)or_broken@ @pwd@\foobar\baz(a)or_broken@ R I @pwd@\foobar\baz -A @pwd@\foobar\baz\toto(a)or_broken@A @pwd@\foobar\baz\toto(a)or_broken@A I @pwd@\foobar\baz\toto + @drive@@path(a)foobar@or_broken@ @drive@@path(a)foobar@or_broken@ I @drive@@path(a)foobar +(a)todo_wine@ R @drive@@path(a)foobar\baz(a)or_broken@ R @drive@@path(a)foobar\baz(a)or_broken@ @drive@@path(a)foobar\baz(a)or_broken@ R I @drive@@path(a)foobar\baz +A @drive@@path(a)foobar\baz\toto(a)or_broken@A @drive@@path(a)foobar\baz\toto(a)or_broken@A I @drive@@path(a)foobar\baz\toto toto lulu file created in read-only dir @@ -1251,17 +1251,17 @@ ErrLev: 0 --- setlocal with corresponding endlocal globalval localval -(a)pwd@\foobar\foobar2 +(a)drive@@path(a)foobar\foobar2 globalval -(a)pwd@\foobar +(a)drive@@path(a)foobar globalval -(a)pwd@\foobar +(a)drive@@path(a)foobar --- setlocal with no corresponding endlocal globalval localval -(a)pwd@\foobar\foobar2 +(a)drive@@path(a)foobar\foobar2 globalval -(a)pwd@\foobar +(a)drive@@path(a)foobar --- setlocal within same batch program Var1 ok 1 Var2 ok 2 @@ -1279,23 +1279,23 @@ Directory is ok 3 --- Extra setlocal in called batch value2 2set1endvalue1 -(a)pwd@\foobar\foodir3 +(a)drive@@path(a)foobar\foodir3 Finished: value2 -(a)pwd@\foobar\foodir2 +(a)drive@@path(a)foobar\foodir2 value1 -(a)pwd@\foobar +(a)drive@@path(a)foobar --- Extra endlocal in called batch value2 value2 -(a)pwd@\foobar\foodir2 +(a)drive@@path(a)foobar\foodir2 value2 -(a)pwd@\foobar\foodir2 +(a)drive@@path(a)foobar\foodir2 Finished: value2 -(a)pwd@\foobar\foodir2 +(a)drive@@path(a)foobar\foodir2 value1 -(a)pwd@\foobar +(a)drive@@path(a)foobar --- endlocal in called function rather than batch pgm is ineffective 2 2

1 0

Nikolay Sivov : scrrun: Initialize find handle for file collection.
by Alexandre Julliard March 11, 2014

March 11, 2014

Module: wine Branch: master Commit: 1e46f605c5f4d40f6eeb3839a75be7c40c75016a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e46f605c5f4d40f6eeb3839a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 11 08:13:53 2014 +0400 scrrun: Initialize find handle for file collection. --- dlls/scrrun/filesystem.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index 5daa5ce..a48b630 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -1062,6 +1062,7 @@ static HRESULT create_filecoll_enum(struct filecollection *collection, IUnknown This->IEnumVARIANT_iface.lpVtbl = &filecollenumvariantvtbl; This->ref = 1; + This->data.u.filecoll.find = NULL; This->data.u.filecoll.coll = collection; IFileCollection_AddRef(&collection->IFileCollection_iface);

1 0

Nikolay Sivov : wbemdisp: Specify default value for method arguments.
by Alexandre Julliard March 11, 2014

March 11, 2014

Module: wine Branch: master Commit: a8a753b49a65fd3938cf1582066cfe15f1803d46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8a753b49a65fd3938cf15820… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 11 16:07:29 2014 +0400 wbemdisp: Specify default value for method arguments. --- include/wbemdisp.idl | 430 +++++++++++++++++++++++++++++--------------------- 1 file changed, 254 insertions(+), 176 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a8a753b49a65fd3938cf1…

1 0

Hans Leidekker : shlwapi/tests: Fix test failures on Windows 8.
by Alexandre Julliard March 11, 2014

March 11, 2014

Module: wine Branch: master Commit: 3a72922e7f5427ea7ae2647fa32545aab9f6b32b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a72922e7f5427ea7ae2647fa… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Mar 11 13:24:42 2014 +0100 shlwapi/tests: Fix test failures on Windows 8. --- dlls/shlwapi/tests/assoc.c | 50 +++++++++++++++++++++++++++++++++----------- 1 file changed, 38 insertions(+), 12 deletions(-) diff --git a/dlls/shlwapi/tests/assoc.c b/dlls/shlwapi/tests/assoc.c index 389a9f5..cbc40ce 100644 --- a/dlls/shlwapi/tests/assoc.c +++ b/dlls/shlwapi/tests/assoc.c @@ -39,6 +39,8 @@ static const WCHAR invalid[] = { 'i','n','v','a','l','i','d',0 }; static void test_getstring_bad(void) { + static const WCHAR openwith[] = {'O','p','e','n','W','i','t','h','.','e','x','e',0}; + WCHAR buf[MAX_PATH]; HRESULT hr; DWORD len; @@ -48,47 +50,71 @@ static void test_getstring_bad(void) return; } + len = 0xdeadbeef; hr = pAssocQueryStringW(0, ASSOCSTR_EXECUTABLE, NULL, open, NULL, &len); expect_hr(E_INVALIDARG, hr); + ok(len == 0xdeadbeef, "got %u\n", len); + + len = 0xdeadbeef; hr = pAssocQueryStringW(0, ASSOCSTR_EXECUTABLE, badBad, open, NULL, &len); ok(hr == E_FAIL || hr == HRESULT_FROM_WIN32(ERROR_NO_ASSOCIATION), /* Win9x/WinMe/NT4/W2K/Vista/W2K8 */ "Unexpected result : %08x\n", hr); - hr = pAssocQueryStringW(0, ASSOCSTR_EXECUTABLE, dotBad, open, NULL, &len); + ok(len == 0xdeadbeef, "got %u\n", len); + + len = sizeof(buf)/sizeof(buf[0]); + hr = pAssocQueryStringW(0, ASSOCSTR_EXECUTABLE, dotBad, open, buf, &len); ok(hr == E_FAIL || - hr == HRESULT_FROM_WIN32(ERROR_NO_ASSOCIATION), /* Win9x/WinMe/NT4/W2K/Vista/W2K8 */ + hr == HRESULT_FROM_WIN32(ERROR_NO_ASSOCIATION) /* Win9x/WinMe/NT4/W2K/Vista/W2K8 */ || + hr == S_OK /* Win8 */, "Unexpected result : %08x\n", hr); - hr = pAssocQueryStringW(0, ASSOCSTR_EXECUTABLE, dotHtml, invalid, NULL, - &len); + if (hr == S_OK) + { + ok(len < sizeof(buf)/sizeof(buf[0]), "got %u\n", len); + ok(!lstrcmpiW(buf + len - sizeof(openwith)/sizeof(openwith[0]), openwith), "wrong data\n"); + } + + len = 0xdeadbeef; + hr = pAssocQueryStringW(0, ASSOCSTR_EXECUTABLE, dotHtml, invalid, NULL, &len); ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) || hr == HRESULT_FROM_WIN32(ERROR_NO_ASSOCIATION), /* Win9x/WinMe/NT4/W2K/Vista/W2K8 */ "Unexpected result : %08x\n", hr); + ok(len == 0xdeadbeef, "got %u\n", len); + hr = pAssocQueryStringW(0, ASSOCSTR_EXECUTABLE, dotHtml, open, NULL, NULL); ok(hr == E_UNEXPECTED || hr == E_INVALIDARG, /* Win9x/WinMe/NT4/W2K/Vista/W2K8 */ "Unexpected result : %08x\n", hr); + len = 0xdeadbeef; hr = pAssocQueryStringW(0, ASSOCSTR_FRIENDLYAPPNAME, NULL, open, NULL, &len); expect_hr(E_INVALIDARG, hr); - hr = pAssocQueryStringW(0, ASSOCSTR_FRIENDLYAPPNAME, badBad, open, NULL, - &len); + ok(len == 0xdeadbeef, "got %u\n", len); + + len = 0xdeadbeef; + hr = pAssocQueryStringW(0, ASSOCSTR_FRIENDLYAPPNAME, badBad, open, NULL, &len); ok(hr == E_FAIL || hr == HRESULT_FROM_WIN32(ERROR_NO_ASSOCIATION), /* Win9x/WinMe/NT4/W2K/Vista/W2K8 */ "Unexpected result : %08x\n", hr); - hr = pAssocQueryStringW(0, ASSOCSTR_FRIENDLYAPPNAME, dotBad, open, NULL, - &len); + ok(len == 0xdeadbeef, "got %u\n", len); + + len = 0xdeadbeef; + hr = pAssocQueryStringW(0, ASSOCSTR_FRIENDLYAPPNAME, dotBad, open, NULL, &len); ok(hr == E_FAIL || hr == HRESULT_FROM_WIN32(ERROR_NO_ASSOCIATION) /* Win9x/WinMe/NT4/W2K/Vista/W2K8 */ || hr == HRESULT_FROM_WIN32(ERROR_NOT_FOUND), /* Win8 */ "Unexpected result : %08x\n", hr); - hr = pAssocQueryStringW(0, ASSOCSTR_FRIENDLYAPPNAME, dotHtml, invalid, NULL, - &len); + ok(len == 0xdeadbeef, "got %u\n", len); + + len = 0xdeadbeef; + hr = pAssocQueryStringW(0, ASSOCSTR_FRIENDLYAPPNAME, dotHtml, invalid, NULL, &len); ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) || hr == HRESULT_FROM_WIN32(ERROR_NO_ASSOCIATION) || /* W2K/Vista/W2K8 */ hr == E_FAIL, /* Win9x/WinMe/NT4 */ "Unexpected result : %08x\n", hr); - hr = pAssocQueryStringW(0, ASSOCSTR_FRIENDLYAPPNAME, dotHtml, open, NULL, - NULL); + ok(len == 0xdeadbeef, "got %u\n", len); + + hr = pAssocQueryStringW(0, ASSOCSTR_FRIENDLYAPPNAME, dotHtml, open, NULL, NULL); ok(hr == E_UNEXPECTED || hr == E_INVALIDARG, /* Win9x/WinMe/NT4/W2K/Vista/W2K8 */ "Unexpected result : %08x\n", hr);

1 0

Ken Thomases : winemac: Make the window' s contentView its firstResponder again after changing its style.
by Alexandre Julliard March 11, 2014

March 11, 2014

Module: wine Branch: master Commit: 06f80d6542222df7c894695b703c2d74c125608d URL: http://source.winehq.org/git/wine.git/?a=commit;h=06f80d6542222df7c894695b7… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Mar 10 18:23:17 2014 -0500 winemac: Make the window's contentView its firstResponder again after changing its style. --- dlls/winemac.drv/cocoa_window.m | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 54cb8db..7ead126 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -713,6 +713,12 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif [self setStyleMask:newStyle ^ NSClosableWindowMask]; } [self setStyleMask:newStyle]; + + // -setStyleMask: resets the firstResponder to the window. Set it + // back to the content view. + if ([[self contentView] acceptsFirstResponder]) + [self makeFirstResponder:[self contentView]]; + [self adjustFullScreenBehavior:[self collectionBehavior]]; if ([[self title] length] == 0 && [title length] > 0)

1 0

Nikolay Sivov : widl: Fix duplicate typeinfo being written to typelib for enums.
by Alexandre Julliard March 11, 2014

March 11, 2014

Module: wine Branch: master Commit: 826980d7f414777b40128bb850165a635c90d8b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=826980d7f414777b40128bb85… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 11 00:34:45 2014 +0400 widl: Fix duplicate typeinfo being written to typelib for enums. --- tools/widl/write_msft.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index cc039dc..724be27 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -2101,6 +2101,9 @@ static void add_enum_typeinfo(msft_typelib_t *typelib, type_t *enumeration) var_t *cur; msft_typeinfo_t *msft_typeinfo; + if (-1 < enumeration->typelib_idx) + return; + enumeration->typelib_idx = typelib->typelib_header.nrtypeinfos; msft_typeinfo = create_msft_typeinfo(typelib, TKIND_ENUM, enumeration->name, enumeration->attrs); msft_typeinfo->typeinfo->size = 0;

1 0

Nikolay Sivov : scrrun: Remove unneeded forward interface definitions from idl.
by Alexandre Julliard March 11, 2014

March 11, 2014

Module: wine Branch: master Commit: 1510a11d8928cd88a7bb392f4e25a44c0d84ffed URL: http://source.winehq.org/git/wine.git/?a=commit;h=1510a11d8928cd88a7bb392f4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 11 00:23:08 2014 +0400 scrrun: Remove unneeded forward interface definitions from idl. --- dlls/scrrun/scrrun.idl | 376 +++++++++++++++++++++++------------------------- 1 file changed, 183 insertions(+), 193 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1510a11d8928cd88a7bb3…

1 0

Nikolay Sivov : scrrun: Implement Count() property for drive collection.
by Alexandre Julliard March 11, 2014

March 11, 2014

Module: wine Branch: master Commit: 863a761426fdf1e0f642c2a0f4256bd2c1aaa44f URL: http://source.winehq.org/git/wine.git/?a=commit;h=863a761426fdf1e0f642c2a0f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 11 00:21:03 2014 +0400 scrrun: Implement Count() property for drive collection. --- dlls/scrrun/filesystem.c | 16 +++++++++++++--- dlls/scrrun/tests/filesystem.c | 7 ++++--- 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index c052906..5daa5ce 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -54,6 +54,7 @@ struct drivecollection { IDriveCollection IDriveCollection_iface; LONG ref; DWORD drives; + LONG count; }; struct enumdata { @@ -1675,8 +1676,13 @@ static HRESULT WINAPI drivecoll_get__NewEnum(IDriveCollection *iface, IUnknown * static HRESULT WINAPI drivecoll_get_Count(IDriveCollection *iface, LONG *count) { struct drivecollection *This = impl_from_IDriveCollection(iface); - FIXME("(%p)->(%p): stub\n", This, count); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, count); + + if (!count) return E_POINTER; + + *count = This->count; + return S_OK; } static const IDriveCollectionVtbl drivecollectionvtbl = { @@ -1695,6 +1701,7 @@ static const IDriveCollectionVtbl drivecollectionvtbl = { static HRESULT create_drivecoll(IDriveCollection **drives) { struct drivecollection *This; + DWORD mask; *drives = NULL; @@ -1703,7 +1710,10 @@ static HRESULT create_drivecoll(IDriveCollection **drives) This->IDriveCollection_iface.lpVtbl = &drivecollectionvtbl; This->ref = 1; - This->drives = GetLogicalDrives(); + This->drives = mask = GetLogicalDrives(); + /* count set bits */ + for (This->count = 0; mask; This->count++) + mask &= mask - 1; *drives = &This->IDriveCollection_iface; return S_OK; diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index c14e846..8502934 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -1157,12 +1157,14 @@ static void test_DriveCollection(void) hr = IDriveCollection_get__NewEnum(drives, (IUnknown**)&enumvar); ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDriveCollection_get_Count(drives, NULL); + ok(hr == E_POINTER, "got 0x%08x\n", hr); + count = 0; hr = IDriveCollection_get_Count(drives, &count); -todo_wine { ok(hr == S_OK, "got 0x%08x\n", hr); ok(count > 0, "got %d\n", count); -} + V_VT(&var) = VT_EMPTY; fetched = -1; hr = IEnumVARIANT_Next(enumvar, 0, &var, &fetched); @@ -1176,7 +1178,6 @@ todo_wine { ok(hr == S_OK, "got 0x%08x\n", hr); hr = IEnumVARIANT_Skip(enumvar, 1); -todo_wine ok(hr == S_FALSE, "got 0x%08x\n", hr); IEnumVARIANT_Release(enumvar);

1 0

Nikolay Sivov : scrrun: Implement Skip() for drive collection.
by Alexandre Julliard March 11, 2014

March 11, 2014

Module: wine Branch: master Commit: a30a2abbc40ce984c28d95b30b53a47c81c440a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a30a2abbc40ce984c28d95b30… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 11 00:20:48 2014 +0400 scrrun: Implement Skip() for drive collection. --- dlls/scrrun/filesystem.c | 18 ++++++++++------- dlls/scrrun/tests/filesystem.c | 42 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+), 7 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index ccdb9ee..c052906 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -1103,16 +1103,18 @@ static HRESULT WINAPI drivecoll_enumvariant_Next(IEnumVARIANT *iface, ULONG celt { struct enumvariant *This = impl_from_IEnumVARIANT(iface); ULONG count = 0; - HRESULT hr; TRACE("(%p)->(%d %p %p)\n", This, celt, var, fetched); if (fetched) *fetched = 0; + if (!celt) return S_OK; + while (find_next_drive(This) == S_OK) { IDrive *drive; + HRESULT hr; hr = create_drive('A' + This->data.u.drivecoll.cur, &drive); if (FAILED(hr)) return hr; @@ -1123,22 +1125,24 @@ static HRESULT WINAPI drivecoll_enumvariant_Next(IEnumVARIANT *iface, ULONG celt if (++count >= celt) break; } - if (count < celt) - return S_FALSE; - if (fetched) *fetched = count; - return S_OK; + return (count < celt) ? S_FALSE : S_OK; } static HRESULT WINAPI drivecoll_enumvariant_Skip(IEnumVARIANT *iface, ULONG celt) { struct enumvariant *This = impl_from_IEnumVARIANT(iface); - FIXME("(%p)->(%d): stub\n", This, celt); + TRACE("(%p)->(%d)\n", This, celt); - return E_NOTIMPL; + if (!celt) return S_OK; + + while (celt && find_next_drive(This) == S_OK) + celt--; + + return celt ? S_FALSE : S_OK; } static HRESULT WINAPI drivecoll_enumvariant_Reset(IEnumVARIANT *iface) diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index a09d54b..c14e846 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -1142,6 +1142,47 @@ todo_wine IFileCollection_Release(files); } +static void test_DriveCollection(void) +{ + IDriveCollection *drives; + IEnumVARIANT *enumvar; + ULONG fetched; + VARIANT var; + HRESULT hr; + LONG count; + + hr = IFileSystem3_get_Drives(fs3, &drives); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDriveCollection_get__NewEnum(drives, (IUnknown**)&enumvar); + ok(hr == S_OK, "got 0x%08x\n", hr); + + count = 0; + hr = IDriveCollection_get_Count(drives, &count); +todo_wine { + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(count > 0, "got %d\n", count); +} + V_VT(&var) = VT_EMPTY; + fetched = -1; + hr = IEnumVARIANT_Next(enumvar, 0, &var, &fetched); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(fetched == 0, "got %d\n", fetched); + + hr = IEnumVARIANT_Skip(enumvar, 0); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IEnumVARIANT_Skip(enumvar, count); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IEnumVARIANT_Skip(enumvar, 1); +todo_wine + ok(hr == S_FALSE, "got 0x%08x\n", hr); + + IEnumVARIANT_Release(enumvar); + IDriveCollection_Release(drives); +} + START_TEST(filesystem) { HRESULT hr; @@ -1169,6 +1210,7 @@ START_TEST(filesystem) test_GetFolder(); test_FolderCollection(); test_FileCollection(); + test_DriveCollection(); IFileSystem3_Release(fs3);

1 0