wine-commits March 2014

wine-commits@winehq.org

2 participants
530 discussions

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

11 Mar '14

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

Ken Thomases : winex11: Don' t leak client window and colormap when pixel format is changed.
by Alexandre Julliard 11 Mar '14

11 Mar '14

Module: wine Branch: master Commit: eef81f5ecc27cac8bc2bf4eacdc0934cb7e30c61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eef81f5ecc27cac8bc2bf4eac… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Mar 10 18:23:13 2014 -0500 winex11: Don't leak client window and colormap when pixel format is changed. --- dlls/winex11.drv/window.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 4da361a..2ca5ec2 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1378,6 +1378,13 @@ Window create_client_window( struct x11drv_win_data *data, const XVisualInfo *vi int cx = min( max( 1, data->client_rect.right - data->client_rect.left ), 65535 ); int cy = min( max( 1, data->client_rect.bottom - data->client_rect.top ), 65535 ); + if (data->client_window) + { + XDeleteContext( data->display, data->client_window, winContext ); + XDestroyWindow( data->display, data->client_window ); + } + + if (data->colormap) XFreeColormap( data->display, data->colormap ); data->colormap = XCreateColormap( data->display, root_window, visual->visual, (visual->class == PseudoColor || visual->class == GrayScale ||

1 0

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

11 Mar '14

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 -@pwd@\ -@pwd@\ +@drive@@path@ +@drive@@path@ CD value @pwd@@or_broken@CD value@space@ % P @@ -299,8 +299,8 @@ C C 'A B'@or_broken@'' 'C'@or_broken@'' -@pwd@\C D@or_broken@%~ff -@pwd@\E@or_broken@%~ff +@drive@@path@C D@or_broken@%~ff +@drive@@path@E@or_broken@%~ff @drive@ @drive@ @path@@or_broken@%~pd @@ -335,8 +335,8 @@ N C 'A B'@or_broken@'' 'C'@or_broken@'' -@pwd@\C D -@pwd@\E +@drive@@path@C D +@drive@@path@E @drive@ @drive@ @path@ @@ -392,22 +392,22 @@ foo5 foo6@space@ @todo_wine@------------ Testing cd ------------ singleFile -Current dir: @pwd@\foobar@or_broken@Current dir:@space@ -@pwd@\foobar +Current dir: @drive@@path@foobar@or_broken@Current dir:@space@ +@drive@@path@foobar @pwd@ -@pwd@\foobar +@drive@@path@foobar @pwd@ -@pwd@\foobar +@drive@@path@foobar @pwd@ @pwd@ @pwd@ -@pwd@\foobar\bar bak -@pwd@\foobar\bar bak -@pwd@\foobar\bar bak -@pwd@\foobar\bar bak -@pwd@\foobar\bar bak +@drive@@path@foobar\bar bak +@drive@@path@foobar\bar bak +@drive@@path@foobar\bar bak +@drive@@path@foobar\bar bak +@drive@@path@foobar\bar bak @pwd@ -@pwd@\foobar +@drive@@path@foobar ------------ Testing type ------------ @pwd@>type foobaz@space@ @@ -1090,31 +1090,31 @@ bar\baz removed --- pushing non-existing dir @pwd@ --- basic behaviour -@pwd@\foobar +@drive@@path@foobar @pwd@ -@pwd@\foobar\baz -@pwd@\foobar -@pwd@\foobar +@drive@@path@foobar\baz +@drive@@path@foobar +@drive@@path@foobar @pwd@ -@pwd@\foobar +@drive@@path@foobar @pwd@ ------------ Testing attrib ------------ -A @pwd@\foobar\foo@or_broken@A @pwd@\foobar\foo@or_broken@A I @pwd@\foobar\foo +A @drive@@path@foobar\foo@or_broken@A @drive@@path@foobar\foo@or_broken@A I @drive@@path@foobar\foo --- read-only attribute -A R @pwd@\foobar\foo@or_broken@A R @pwd@\foobar\foo@or_broken@A R I @pwd@\foobar\foo +A R @drive@@path@foobar\foo@or_broken@A R @drive@@path@foobar\foo@or_broken@A R I @drive@@path@foobar\foo foo foo original contents Read-only file not deleted Read-only file forcibly deleted --- recursive behaviour -A @pwd@\foobar\baz\level2@or_broken@A @pwd@\foobar\baz\level2@or_broken@A I @pwd@\foobar\baz\level2 -A R @pwd@\foobar\level1@or_broken@A R @pwd@\foobar\level1@or_broken@A R I @pwd@\foobar\level1 -A R @pwd@\foobar\baz\level2@or_broken@A R @pwd@\foobar\baz\level2@or_broken@A R I @pwd@\foobar\baz\level2 -A @pwd@\foobar\bar@or_broken@A @pwd@\foobar\bar@or_broken@A I @pwd@\foobar\bar +A @drive@@path@foobar\baz\level2@or_broken@A @drive@@path@foobar\baz\level2@or_broken@A I @drive@@path@foobar\baz\level2 +A R @drive@@path@foobar\level1@or_broken@A R @drive@@path@foobar\level1@or_broken@A R I @drive@@path@foobar\level1 +A R @drive@@path@foobar\baz\level2@or_broken@A R @drive@@path@foobar\baz\level2@or_broken@A R I @drive@@path@foobar\baz\level2 +A @drive@@path@foobar\bar@or_broken@A @drive@@path@foobar\bar@or_broken@A I @drive@@path@foobar\bar --- folders processing - @pwd@\foobar@or_broken@ @pwd@\foobar@or_broken@ I @pwd@\foobar -@todo_wine@ R @pwd@\foobar\baz@or_broken@ R @pwd@\foobar\baz@or_broken@ @pwd@\foobar\baz@or_broken@ R I @pwd@\foobar\baz -A @pwd@\foobar\baz\toto@or_broken@A @pwd@\foobar\baz\toto@or_broken@A I @pwd@\foobar\baz\toto + @drive@@path@foobar@or_broken@ @drive@@path@foobar@or_broken@ I @drive@@path@foobar +@todo_wine@ R @drive@@path@foobar\baz@or_broken@ R @drive@@path@foobar\baz@or_broken@ @drive@@path@foobar\baz@or_broken@ R I @drive@@path@foobar\baz +A @drive@@path@foobar\baz\toto@or_broken@A @drive@@path@foobar\baz\toto@or_broken@A I @drive@@path@foobar\baz\toto toto lulu file created in read-only dir @@ -1251,17 +1251,17 @@ ErrLev: 0 --- setlocal with corresponding endlocal globalval localval -@pwd@\foobar\foobar2 +@drive@@path@foobar\foobar2 globalval -@pwd@\foobar +@drive@@path@foobar globalval -@pwd@\foobar +@drive@@path@foobar --- setlocal with no corresponding endlocal globalval localval -@pwd@\foobar\foobar2 +@drive@@path@foobar\foobar2 globalval -@pwd@\foobar +@drive@@path@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 -@pwd@\foobar\foodir3 +@drive@@path@foobar\foodir3 Finished: value2 -@pwd@\foobar\foodir2 +@drive@@path@foobar\foodir2 value1 -@pwd@\foobar +@drive@@path@foobar --- Extra endlocal in called batch value2 value2 -@pwd@\foobar\foodir2 +@drive@@path@foobar\foodir2 value2 -@pwd@\foobar\foodir2 +@drive@@path@foobar\foodir2 Finished: value2 -@pwd@\foobar\foodir2 +@drive@@path@foobar\foodir2 value1 -@pwd@\foobar +@drive@@path@foobar --- endlocal in called function rather than batch pgm is ineffective 2 2

1 0

Frédéric Delanoy : cmd/tests: Correctly determine script path for root directories.
by Alexandre Julliard 11 Mar '14

11 Mar '14

Module: wine Branch: master Commit: f80dd2469f0560714710f6f4e1d4905b17abb8bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=f80dd2469f0560714710f6f4e… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Mar 11 00:16:27 2014 +0100 cmd/tests: Correctly determine script path for root directories. --- programs/cmd/tests/batch.c | 10 ++++++++-- programs/cmd/tests/test_builtins.cmd | 7 +++++++ programs/cmd/tests/test_builtins.cmd.exp | 3 +++ 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/programs/cmd/tests/batch.c b/programs/cmd/tests/batch.c index c011d70..9df0bc5 100644 --- a/programs/cmd/tests/batch.c +++ b/programs/cmd/tests/batch.c @@ -459,8 +459,14 @@ START_TEST(batch) drive[0] = workdir[0]; drive[1] = workdir[1]; /* Should be ':' */ memcpy(path, workdir + drive_len, (workdir_len - drive_len) * sizeof(drive[0])); - path[workdir_len - drive_len] = '\\'; - path_len = workdir_len - drive_len + 1; + + /* Only add trailing backslash to 'path' for non-root directory */ + if (workdir_len - drive_len > 1) { + path[workdir_len - drive_len] = '\\'; + path_len = workdir_len - drive_len + 1; + } else { + path_len = 1; /* \ */ + } shortpath_len = GetShortPathNameA(path, shortpath, sizeof(shortpath)/sizeof(shortpath[0])); diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 1d1eea4..16fdd43 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -308,6 +308,13 @@ set WINE_FOO= echo ------------ Testing variable expansion ------------ call :setError 0 +echo ~p0 should be path containing batch file +echo %~p0 +mkdir dummydir +cd dummydir +echo %~p0 +cd .. +rmdir dummydir echo ~dp0 should be directory containing batch file echo %~dp0 mkdir dummydir diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 7380185..1575984 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -259,6 +259,9 @@ foo 'jim' 'apple"banana"grape' ------------ Testing variable expansion ------------ +~p0 should be path containing batch file +@path@ +@path@ ~dp0 should be directory containing batch file @pwd@\ @pwd@\

1 0

Michael Stefaniuc : dmcompos: Remove the extraneous IUnknown from DirectMusicChordMap.
by Alexandre Julliard 11 Mar '14

11 Mar '14

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

Michael Stefaniuc : dmcompos: COM cleanup for the IDirectMusicChordMap iface.
by Alexandre Julliard 11 Mar '14

11 Mar '14

Module: wine Branch: master Commit: 4f03d5d1aebc0c828f3083b92b69cf5d8c77ca90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f03d5d1aebc0c828f3083b92… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Mar 10 23:53:11 2014 +0100 dmcompos: COM cleanup for the IDirectMusicChordMap iface. --- dlls/dmcompos/chordmap.c | 48 +++++++++++++++++++++++--------------- dlls/dmcompos/dmcompos_private.h | 2 +- 2 files changed, 30 insertions(+), 20 deletions(-) diff --git a/dlls/dmcompos/chordmap.c b/dlls/dmcompos/chordmap.c index 21849b8..2d22f37 100644 --- a/dlls/dmcompos/chordmap.c +++ b/dlls/dmcompos/chordmap.c @@ -23,7 +23,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmcompos); WINE_DECLARE_DEBUG_CHANNEL(dmfile); static ULONG WINAPI IDirectMusicChordMapImpl_IUnknown_AddRef (LPUNKNOWN iface); -static ULONG WINAPI IDirectMusicChordMapImpl_IDirectMusicChordMap_AddRef (LPDIRECTMUSICCHORDMAP iface); static ULONG WINAPI IDirectMusicChordMapImpl_IDirectMusicObject_AddRef (LPDIRECTMUSICOBJECT iface); static ULONG WINAPI IDirectMusicChordMapImpl_IPersistStream_AddRef (LPPERSISTSTREAM iface); @@ -40,8 +39,8 @@ static HRESULT WINAPI IDirectMusicChordMapImpl_IUnknown_QueryInterface (LPUNKNOW IDirectMusicChordMapImpl_IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl); return S_OK; } else if (IsEqualIID (riid, &IID_IDirectMusicChordMap)) { - *ppobj = &This->ChordMapVtbl; - IDirectMusicChordMapImpl_IDirectMusicChordMap_AddRef ((LPDIRECTMUSICCHORDMAP)&This->ChordMapVtbl); + *ppobj = &This->IDirectMusicChordMap_iface; + IDirectMusicChordMap_AddRef(&This->IDirectMusicChordMap_iface); return S_OK; } else if (IsEqualIID (riid, &IID_IDirectMusicObject)) { *ppobj = &This->ObjectVtbl; @@ -90,32 +89,43 @@ static const IUnknownVtbl DirectMusicChordMap_Unknown_Vtbl = { }; /* IDirectMusicChordMapImpl IDirectMusicChordMap part: */ -static HRESULT WINAPI IDirectMusicChordMapImpl_IDirectMusicChordMap_QueryInterface (LPDIRECTMUSICCHORDMAP iface, REFIID riid, LPVOID *ppobj) { - ICOM_THIS_MULTI(IDirectMusicChordMapImpl, ChordMapVtbl, iface); +static inline IDirectMusicChordMapImpl *impl_from_IDirectMusicChordMap(IDirectMusicChordMap *iface) +{ + return CONTAINING_RECORD(iface, IDirectMusicChordMapImpl, IDirectMusicChordMap_iface); +} + +static HRESULT WINAPI IDirectMusicChordMapImpl_QueryInterface(IDirectMusicChordMap *iface, + REFIID riid, void **ppobj) +{ + IDirectMusicChordMapImpl *This = impl_from_IDirectMusicChordMap(iface); return IDirectMusicChordMapImpl_IUnknown_QueryInterface ((LPUNKNOWN)&This->UnknownVtbl, riid, ppobj); } -static ULONG WINAPI IDirectMusicChordMapImpl_IDirectMusicChordMap_AddRef (LPDIRECTMUSICCHORDMAP iface) { - ICOM_THIS_MULTI(IDirectMusicChordMapImpl, ChordMapVtbl, iface); +static ULONG WINAPI IDirectMusicChordMapImpl_AddRef(IDirectMusicChordMap *iface) +{ + IDirectMusicChordMapImpl *This = impl_from_IDirectMusicChordMap(iface); return IDirectMusicChordMapImpl_IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl); } -static ULONG WINAPI IDirectMusicChordMapImpl_IDirectMusicChordMap_Release (LPDIRECTMUSICCHORDMAP iface) { - ICOM_THIS_MULTI(IDirectMusicChordMapImpl, ChordMapVtbl, iface); +static ULONG WINAPI IDirectMusicChordMapImpl_Release(IDirectMusicChordMap *iface) +{ + IDirectMusicChordMapImpl *This = impl_from_IDirectMusicChordMap(iface); return IDirectMusicChordMapImpl_IUnknown_Release ((LPUNKNOWN)&This->UnknownVtbl); } -static HRESULT WINAPI IDirectMusicChordMapImpl_IDirectMusicChordMap_GetScale (LPDIRECTMUSICCHORDMAP iface, DWORD* pdwScale) { - ICOM_THIS_MULTI(IDirectMusicChordMapImpl, ChordMapVtbl, iface); - FIXME("(%p, %p): stub\n", This, pdwScale); - return S_OK; +static HRESULT WINAPI IDirectMusicChordMapImpl_GetScale(IDirectMusicChordMap *iface, + DWORD *pdwScale) +{ + IDirectMusicChordMapImpl *This = impl_from_IDirectMusicChordMap(iface); + FIXME("(%p, %p): stub\n", This, pdwScale); + return S_OK; } -static const IDirectMusicChordMapVtbl DirectMusicChordMap_ChordMap_Vtbl = { - IDirectMusicChordMapImpl_IDirectMusicChordMap_QueryInterface, - IDirectMusicChordMapImpl_IDirectMusicChordMap_AddRef, - IDirectMusicChordMapImpl_IDirectMusicChordMap_Release, - IDirectMusicChordMapImpl_IDirectMusicChordMap_GetScale +static const IDirectMusicChordMapVtbl dmchordmap_vtbl = { + IDirectMusicChordMapImpl_QueryInterface, + IDirectMusicChordMapImpl_AddRef, + IDirectMusicChordMapImpl_Release, + IDirectMusicChordMapImpl_GetScale }; /* IDirectMusicChordMapImpl IDirectMusicObject part: */ @@ -534,7 +544,7 @@ HRESULT WINAPI create_dmchordmap(REFIID lpcGUID, void **ppobj) return E_OUTOFMEMORY; } obj->UnknownVtbl = &DirectMusicChordMap_Unknown_Vtbl; - obj->ChordMapVtbl = &DirectMusicChordMap_ChordMap_Vtbl; + obj->IDirectMusicChordMap_iface.lpVtbl = &dmchordmap_vtbl; obj->ObjectVtbl = &DirectMusicChordMap_Object_Vtbl; obj->PersistStreamVtbl = &DirectMusicChordMap_PersistStream_Vtbl; obj->pDesc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DMUS_OBJECTDESC)); diff --git a/dlls/dmcompos/dmcompos_private.h b/dlls/dmcompos/dmcompos_private.h index 34ca422..6f680e5 100644 --- a/dlls/dmcompos/dmcompos_private.h +++ b/dlls/dmcompos/dmcompos_private.h @@ -63,7 +63,7 @@ extern HRESULT WINAPI create_dmsignposttrack(REFIID riid, void **ret_iface) DECL struct IDirectMusicChordMapImpl { /* IUnknown fields */ const IUnknownVtbl *UnknownVtbl; - const IDirectMusicChordMapVtbl *ChordMapVtbl; + IDirectMusicChordMap IDirectMusicChordMap_iface; const IDirectMusicObjectVtbl *ObjectVtbl; const IPersistStreamVtbl *PersistStreamVtbl; LONG ref;

1 0

Nikolay Sivov : widl: Fix duplicate typeinfo being written to typelib for enums.
by Alexandre Julliard 11 Mar '14

11 Mar '14

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 11 Mar '14

11 Mar '14

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 11 Mar '14

11 Mar '14

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 11 Mar '14

11 Mar '14

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

← Newer
1
...
33
34
35
36
37
38
39
...
53
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2014