January 2010 - Wine-commits

Michael Stefaniuc : user32: Avoid newlines inside FIXME messages.
by Alexandre Julliard 14 Jan '10

14 Jan '10

Module: wine Branch: master Commit: 31ef27ed576e19ff1e48b53df0aa7144c7ccf2c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=31ef27ed576e19ff1e48b53df… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jan 11 23:48:29 2010 +0100 user32: Avoid newlines inside FIXME messages. --- dlls/user32/misc.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/user32/misc.c b/dlls/user32/misc.c index 1dc2cb8..ca807f0 100644 --- a/dlls/user32/misc.c +++ b/dlls/user32/misc.c @@ -539,8 +539,8 @@ DWORD WINAPI RegisterTasklist (DWORD x) */ HDEVNOTIFY WINAPI RegisterDeviceNotificationA(HANDLE hnd, LPVOID notifyfilter, DWORD flags) { - FIXME("(hwnd=%p, filter=%p,flags=0x%08x),\n" - "\treturns a fake device notification handle!\n", hnd,notifyfilter,flags ); + FIXME("(hwnd=%p, filter=%p,flags=0x%08x) returns a fake device notification handle!\n", + hnd,notifyfilter,flags ); return (HDEVNOTIFY) 0xcafecafe; } @@ -569,8 +569,8 @@ HDEVNOTIFY WINAPI RegisterDeviceNotificationA(HANDLE hnd, LPVOID notifyfilter, D */ HDEVNOTIFY WINAPI RegisterDeviceNotificationW(HANDLE hRecepient, LPVOID pNotificationFilter, DWORD dwFlags) { - FIXME("(hwnd=%p, filter=%p,flags=0x%08x),\n" - "\treturns a fake device notification handle!\n", hRecepient,pNotificationFilter,dwFlags ); + FIXME("(hwnd=%p, filter=%p,flags=0x%08x) returns a fake device notification handle!\n", + hRecepient,pNotificationFilter,dwFlags ); return (HDEVNOTIFY) 0xcafeaffe; }

1 0

Michael Stefaniuc : objsel: Avoid newlines inside FIXME messages.
by Alexandre Julliard 14 Jan '10

14 Jan '10

Module: wine Branch: master Commit: c68f2148db713797bb326a83ee7d864a256d9a5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c68f2148db713797bb326a83e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jan 11 23:48:14 2010 +0100 objsel: Avoid newlines inside FIXME messages. --- dlls/objsel/factory.c | 2 +- dlls/objsel/objsel.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/objsel/factory.c b/dlls/objsel/factory.c index 11d81b9..090c126 100644 --- a/dlls/objsel/factory.c +++ b/dlls/objsel/factory.c @@ -50,7 +50,7 @@ static HRESULT WINAPI OBJSEL_IClassFactory_QueryInterface( return IClassFactory_CreateInstance(iface, NULL, riid, ppvObj); } - FIXME("- no interface\n\tIID:\t%s\n", debugstr_guid(riid)); + FIXME("- no interface IID: %s\n", debugstr_guid(riid)); return E_NOINTERFACE; } diff --git a/dlls/objsel/objsel.c b/dlls/objsel/objsel.c index 51e8d0b..8179ce5 100644 --- a/dlls/objsel/objsel.c +++ b/dlls/objsel/objsel.c @@ -55,7 +55,7 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv) if (IsEqualGUID(rclsid, &CLSID_DsObjectPicker)) return IClassFactory_QueryInterface((IClassFactory*)&OBJSEL_ClassFactory, iid, ppv); - FIXME("\n\tCLSID:\t%s,\n\tIID:\t%s\n",debugstr_guid(rclsid),debugstr_guid(iid)); + FIXME("CLSID: %s, IID: %s\n", debugstr_guid(rclsid), debugstr_guid(iid)); return CLASS_E_CLASSNOTAVAILABLE; } @@ -147,7 +147,7 @@ static HRESULT WINAPI OBJSEL_IDsObjectPicker_QueryInterface( return S_OK; } - FIXME("- no interface\n\tIID:\t%s\n", debugstr_guid(riid)); + FIXME("- no interface IID: %s\n", debugstr_guid(riid)); return E_NOINTERFACE; }

1 0

Michael Stefaniuc : ddraw: Simplify DllCanUnloadNow().
by Alexandre Julliard 14 Jan '10

14 Jan '10

Module: wine Branch: master Commit: a0789f611df26b81c1ab294aacf3864957fe8e41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0789f611df26b81c1ab294aa… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jan 12 00:25:24 2010 +0100 ddraw: Simplify DllCanUnloadNow(). --- dlls/ddraw/main.c | 9 +-------- 1 files changed, 1 insertions(+), 8 deletions(-) diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c index 24de0a2..ed4e7cd 100644 --- a/dlls/ddraw/main.c +++ b/dlls/ddraw/main.c @@ -743,14 +743,7 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) */ HRESULT WINAPI DllCanUnloadNow(void) { - HRESULT hr; - FIXME("(void): stub\n"); - - EnterCriticalSection(&ddraw_cs); - hr = S_FALSE; - LeaveCriticalSection(&ddraw_cs); - - return hr; + return S_FALSE; } /*******************************************************************************

1 0

Michael Stefaniuc : dmusic: Avoid newlines inside FIXME messages.
by Alexandre Julliard 14 Jan '10

14 Jan '10

Module: wine Branch: master Commit: bf0d0ac215feb84cf34000ab30f46c5a7de2ac2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf0d0ac215feb84cf34000ab3… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jan 11 23:47:45 2010 +0100 dmusic: Avoid newlines inside FIXME messages. --- dlls/dmusic/dmusic_main.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dmusic/dmusic_main.c b/dlls/dmusic/dmusic_main.c index 32171fa..9c0e78f 100644 --- a/dlls/dmusic/dmusic_main.c +++ b/dlls/dmusic/dmusic_main.c @@ -36,7 +36,7 @@ typedef struct { * DirectMusic ClassFactory */ static HRESULT WINAPI DirectMusicCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) { - FIXME("- no interface\n\tIID:\t%s\n", debugstr_guid(riid)); + FIXME("- no interface IID: %s\n", debugstr_guid(riid)); if (ppobj == NULL) return E_POINTER; @@ -85,7 +85,7 @@ static IClassFactoryImpl DirectMusic_CF = {&DirectMusicCF_Vtbl}; * DirectMusicCollection ClassFactory */ static HRESULT WINAPI CollectionCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) { - FIXME("- no interface\n\tIID:\t%s\n", debugstr_guid(riid)); + FIXME("- no interface IID: %s\n", debugstr_guid(riid)); if (ppobj == NULL) return E_POINTER;

1 0

Michael Stefaniuc : dmscript: Avoid newlines inside FIXME messages.
by Alexandre Julliard 14 Jan '10

14 Jan '10

Module: wine Branch: master Commit: b74c04372430ae26edb4425ed32f80ea99de349e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b74c04372430ae26edb4425ed… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jan 11 23:48:08 2010 +0100 dmscript: Avoid newlines inside FIXME messages. --- dlls/dmscript/dmscript_main.c | 36 ++++++++++++++++++------------------ 1 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/dmscript/dmscript_main.c b/dlls/dmscript/dmscript_main.c index bbecb7b..6c382ed 100644 --- a/dlls/dmscript/dmscript_main.c +++ b/dlls/dmscript/dmscript_main.c @@ -34,7 +34,7 @@ typedef struct { * DirectMusicScriptAutoImplSegment ClassFactory */ static HRESULT WINAPI ScriptAutoImplSegmentCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) { - FIXME("- no interface\n\tIID:\t%s\n", debugstr_guid(riid)); + FIXME("- no interface IID: %s\n", debugstr_guid(riid)); if (ppobj == NULL) return E_POINTER; @@ -54,7 +54,7 @@ static ULONG WINAPI ScriptAutoImplSegmentCF_Release(LPCLASSFACTORY iface) { } static HRESULT WINAPI ScriptAutoImplSegmentCF_CreateInstance(LPCLASSFACTORY iface, LPUNKNOWN pOuter, REFIID riid, LPVOID *ppobj) { - FIXME("- no interface\n\tIID:\t%s\n", debugstr_guid(riid)); + FIXME("- no interface IID: %s\n", debugstr_guid(riid)); if (ppobj == NULL) return E_POINTER; @@ -86,7 +86,7 @@ static IClassFactoryImpl ScriptAutoImplSegment_CF = {&ScriptAutoImplSegmentCF_Vt * DirectMusicScriptTrack ClassFactory */ static HRESULT WINAPI ScriptTrackCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) { - FIXME("- no interface\n\tIID:\t%s\n", debugstr_guid(riid)); + FIXME("- no interface IID: %s\n", debugstr_guid(riid)); if (ppobj == NULL) return E_POINTER; @@ -135,7 +135,7 @@ static IClassFactoryImpl ScriptTrack_CF = {&ScriptTrackCF_Vtbl}; * DirectMusicAudioVBScript ClassFactory */ static HRESULT WINAPI AudioVBScriptCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) { - FIXME("- no interface\n\tIID:\t%s\n", debugstr_guid(riid)); + FIXME("- no interface IID: %s\n", debugstr_guid(riid)); if (ppobj == NULL) return E_POINTER; @@ -155,7 +155,7 @@ static ULONG WINAPI AudioVBScriptCF_Release(LPCLASSFACTORY iface) { } static HRESULT WINAPI AudioVBScriptCF_CreateInstance(LPCLASSFACTORY iface, LPUNKNOWN pOuter, REFIID riid, LPVOID *ppobj) { - FIXME("- no interface\n\tIID:\t%s\n", debugstr_guid(riid)); + FIXME("- no interface IID: %s\n", debugstr_guid(riid)); if (ppobj == NULL) return E_POINTER; @@ -187,7 +187,7 @@ static IClassFactoryImpl AudioVBScript_CF = {&AudioVBScriptCF_Vtbl}; * DirectMusicScript ClassFactory */ static HRESULT WINAPI ScriptCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) { - FIXME("- no interface\n\tIID:\t%s\n", debugstr_guid(riid)); + FIXME("- no interface IID: %s\n", debugstr_guid(riid)); if (ppobj == NULL) return E_POINTER; @@ -237,7 +237,7 @@ static IClassFactoryImpl Script_CF = {&ScriptCF_Vtbl}; * DirectMusicScriptAutoImplPerformance ClassFactory */ static HRESULT WINAPI ScriptAutoImplPerformanceCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) { - FIXME("- no interface\n\tIID:\t%s\n", debugstr_guid(riid)); + FIXME("- no interface IID: %s\n", debugstr_guid(riid)); if (ppobj == NULL) return E_POINTER; @@ -257,7 +257,7 @@ static ULONG WINAPI ScriptAutoImplPerformanceCF_Release(LPCLASSFACTORY iface) { } static HRESULT WINAPI ScriptAutoImplPerformanceCF_CreateInstance(LPCLASSFACTORY iface, LPUNKNOWN pOuter, REFIID riid, LPVOID *ppobj) { - FIXME("- no interface\n\tIID:\t%s\n", debugstr_guid(riid)); + FIXME("- no interface IID: %s\n", debugstr_guid(riid)); if (ppobj == NULL) return E_POINTER; @@ -289,7 +289,7 @@ static IClassFactoryImpl ScriptAutoImplPerformance_CF = {&ScriptAutoImplPerforma * DirectMusicScriptSourceCodeLoader ClassFactory */ static HRESULT WINAPI ScriptSourceCodeLoaderCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) { - FIXME("- no interface\n\tIID:\t%s\n", debugstr_guid(riid)); + FIXME("- no interface IID: %s\n", debugstr_guid(riid)); if (ppobj == NULL) return E_POINTER; @@ -309,7 +309,7 @@ static ULONG WINAPI ScriptSourceCodeLoaderCF_Release(LPCLASSFACTORY iface) { } static HRESULT WINAPI ScriptSourceCodeLoaderCF_CreateInstance(LPCLASSFACTORY iface, LPUNKNOWN pOuter, REFIID riid, LPVOID *ppobj) { - FIXME("- no interface\n\tIID:\t%s\n", debugstr_guid(riid)); + FIXME("- no interface IID: %s\n", debugstr_guid(riid)); if (ppobj == NULL) return E_POINTER; @@ -341,7 +341,7 @@ static IClassFactoryImpl ScriptSourceCodeLoader_CF = {&ScriptSourceCodeLoaderCF_ * DirectMusicScriptAutoImplSegmentState ClassFactory */ static HRESULT WINAPI ScriptAutoImplSegmentStateCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) { - FIXME("- no interface\n\tIID:\t%s\n", debugstr_guid(riid)); + FIXME("- no interface IID: %s\n", debugstr_guid(riid)); if (ppobj == NULL) return E_POINTER; @@ -361,7 +361,7 @@ static ULONG WINAPI ScriptAutoImplSegmentStateCF_Release(LPCLASSFACTORY iface) { } static HRESULT WINAPI ScriptAutoImplSegmentStateCF_CreateInstance(LPCLASSFACTORY iface, LPUNKNOWN pOuter, REFIID riid, LPVOID *ppobj) { - FIXME("- no interface\n\tIID:\t%s\n", debugstr_guid(riid)); + FIXME("- no interface IID: %s\n", debugstr_guid(riid)); if (ppobj == NULL) return E_POINTER; @@ -393,7 +393,7 @@ static IClassFactoryImpl ScriptAutoImplSegmentState_CF = {&ScriptAutoImplSegment * DirectMusicScriptAutoImplAudioPathConfig ClassFactory */ static HRESULT WINAPI ScriptAutoImplAudioPathConfigCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) { - FIXME("- no interface\n\tIID:\t%s\n", debugstr_guid(riid)); + FIXME("- no interface IID: %s\n", debugstr_guid(riid)); if (ppobj == NULL) return E_POINTER; @@ -413,7 +413,7 @@ static ULONG WINAPI ScriptAutoImplAudioPathConfigCF_Release(LPCLASSFACTORY iface } static HRESULT WINAPI ScriptAutoImplAudioPathConfigCF_CreateInstance(LPCLASSFACTORY iface, LPUNKNOWN pOuter, REFIID riid, LPVOID *ppobj) { - FIXME("- no interface\n\tIID:\t%s\n", debugstr_guid(riid)); + FIXME("- no interface IID: %s\n", debugstr_guid(riid)); if (ppobj == NULL) return E_POINTER; @@ -445,7 +445,7 @@ static IClassFactoryImpl ScriptAutoImplAudioPathConfig_CF = {&ScriptAutoImplAudi * DirectMusicScriptAutoImplAudioPath ClassFactory */ static HRESULT WINAPI ScriptAutoImplAudioPathCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) { - FIXME("- no interface\n\tIID:\t%s\n", debugstr_guid(riid)); + FIXME("- no interface IID: %s\n", debugstr_guid(riid)); if (ppobj == NULL) return E_POINTER; @@ -465,7 +465,7 @@ static ULONG WINAPI ScriptAutoImplAudioPathCF_Release(LPCLASSFACTORY iface) { } static HRESULT WINAPI ScriptAutoImplAudioPathCF_CreateInstance(LPCLASSFACTORY iface, LPUNKNOWN pOuter, REFIID riid, LPVOID *ppobj) { - FIXME("- no interface\n\tIID:\t%s\n", debugstr_guid(riid)); + FIXME("- no interface IID: %s\n", debugstr_guid(riid)); if (ppobj == NULL) return E_POINTER; @@ -497,7 +497,7 @@ static IClassFactoryImpl ScriptAutoImplAudioPath_CF = {&ScriptAutoImplAudioPathC * DirectMusicScriptAutoImplSong ClassFactory */ static HRESULT WINAPI ScriptAutoImplSongCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) { - FIXME("- no interface\n\tIID:\t%s\n", debugstr_guid(riid)); + FIXME("- no interface IID: %s\n", debugstr_guid(riid)); if (ppobj == NULL) return E_POINTER; @@ -517,7 +517,7 @@ static ULONG WINAPI ScriptAutoImplSongCF_Release(LPCLASSFACTORY iface) { } static HRESULT WINAPI ScriptAutoImplSongCF_CreateInstance(LPCLASSFACTORY iface, LPUNKNOWN pOuter, REFIID riid, LPVOID *ppobj) { - FIXME("- no interface\n\tIID:\t%s\n", debugstr_guid(riid)); + FIXME("- no interface IID: %s\n", debugstr_guid(riid)); if (ppobj == NULL) return E_POINTER;

1 0

Michael Stefaniuc : dmstyle: Avoid newlines inside FIXME messages.
by Alexandre Julliard 14 Jan '10

14 Jan '10

Module: wine Branch: master Commit: 08f10365257eef2dce2869828d320a2358131e87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08f10365257eef2dce2869828… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jan 11 23:47:33 2010 +0100 dmstyle: Avoid newlines inside FIXME messages. --- dlls/dmstyle/dmstyle_main.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/dmstyle/dmstyle_main.c b/dlls/dmstyle/dmstyle_main.c index 4aa92f8..78a749e 100644 --- a/dlls/dmstyle/dmstyle_main.c +++ b/dlls/dmstyle/dmstyle_main.c @@ -31,7 +31,7 @@ typedef struct { * DirectMusicSection ClassFactory */ static HRESULT WINAPI SectionCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) { - FIXME("- no interface\n\tIID:\t%s\n", debugstr_guid(riid)); + FIXME("- no interface IID: %s\n", debugstr_guid(riid)); if (ppobj == NULL) return E_POINTER; @@ -84,7 +84,7 @@ static IClassFactoryImpl Section_CF = {&SectionCF_Vtbl}; * DirectMusicStyle ClassFactory */ static HRESULT WINAPI StyleCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) { - FIXME("- no interface\n\tIID:\t%s\n", debugstr_guid(riid)); + FIXME("- no interface IID: %s\n", debugstr_guid(riid)); if (ppobj == NULL) return E_POINTER; @@ -134,7 +134,7 @@ static IClassFactoryImpl Style_CF = {&StyleCF_Vtbl}; * DirectMusicChordTrack ClassFactory */ static HRESULT WINAPI ChordTrackCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) { - FIXME("- no interface\n\tIID:\t%s\n", debugstr_guid(riid)); + FIXME("- no interface IID: %s\n", debugstr_guid(riid)); if (ppobj == NULL) return E_POINTER; @@ -184,7 +184,7 @@ static IClassFactoryImpl ChordTrack_CF = {&ChordTrackCF_Vtbl}; * DirectMusicCommandTrack ClassFactory */ static HRESULT WINAPI CommandTrackCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) { - FIXME("- no interface\n\tIID:\t%s\n", debugstr_guid(riid)); + FIXME("- no interface IID: %s\n", debugstr_guid(riid)); if (ppobj == NULL) return E_POINTER; @@ -234,7 +234,7 @@ static IClassFactoryImpl CommandTrack_CF = {&CommandTrackCF_Vtbl}; * DirectMusicStyleTrack ClassFactory */ static HRESULT WINAPI StyleTrackCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) { - FIXME("- no interface\n\tIID:\t%s\n", debugstr_guid(riid)); + FIXME("- no interface IID: %s\n", debugstr_guid(riid)); if (ppobj == NULL) return E_POINTER; @@ -284,7 +284,7 @@ static IClassFactoryImpl StyleTrack_CF = {&StyleTrackCF_Vtbl}; * DirectMusicMotifTrack ClassFactory */ static HRESULT WINAPI MotifTrackCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) { - FIXME("- no interface\n\tIID:\t%s\n", debugstr_guid(riid)); + FIXME("- no interface IID: %s\n", debugstr_guid(riid)); if (ppobj == NULL) return E_POINTER; @@ -334,7 +334,7 @@ static IClassFactoryImpl MotifTrack_CF = {&MotifTrackCF_Vtbl}; * DirectMusicAuditionTrack ClassFactory */ static HRESULT WINAPI AuditionTrackCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) { - FIXME("- no interface\n\tIID:\t%s\n", debugstr_guid(riid)); + FIXME("- no interface IID: %s\n", debugstr_guid(riid)); if (ppobj == NULL) return E_POINTER; @@ -384,7 +384,7 @@ static IClassFactoryImpl AuditionTrack_CF = {&AuditionTrackCF_Vtbl}; * DirectMusicMuteTrack ClassFactory */ static HRESULT WINAPI MuteTrackCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) { - FIXME("- no interface\n\tIID:\t%s\n", debugstr_guid(riid)); + FIXME("- no interface IID: %s\n", debugstr_guid(riid)); if (ppobj == NULL) return E_POINTER;

1 0

Michael Stefaniuc : dmcompos: Avoid newlines inside FIXME messages.
by Alexandre Julliard 14 Jan '10

14 Jan '10

Module: wine Branch: master Commit: 9fb879a31345100e4e509bc4f058e8390ec2fa5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9fb879a31345100e4e509bc4f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jan 11 23:47:38 2010 +0100 dmcompos: Avoid newlines inside FIXME messages. --- dlls/dmcompos/dmcompos_main.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/dmcompos/dmcompos_main.c b/dlls/dmcompos/dmcompos_main.c index 74b1ab4..28a0922 100644 --- a/dlls/dmcompos/dmcompos_main.c +++ b/dlls/dmcompos/dmcompos_main.c @@ -34,8 +34,8 @@ typedef struct { * DirectMusicChordMap ClassFactory */ static HRESULT WINAPI ChordMapCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) { - FIXME("- no interface\n\tIID:\t%s\n", debugstr_guid(riid)); - + FIXME("- no interface IID: %s\n", debugstr_guid(riid)); + if (ppobj == NULL) return E_POINTER; return E_NOINTERFACE; @@ -84,8 +84,8 @@ static IClassFactoryImpl ChordMap_CF = {&ChordMapCF_Vtbl}; * DirectMusicComposer ClassFactory */ static HRESULT WINAPI ComposerCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) { - FIXME("- no interface\n\tIID:\t%s\n", debugstr_guid(riid)); - + FIXME("- no interface IID: %s\n", debugstr_guid(riid)); + if (ppobj == NULL) return E_POINTER; return E_NOINTERFACE; @@ -134,8 +134,8 @@ static IClassFactoryImpl Composer_CF = {&ComposerCF_Vtbl}; * DirectMusicChordMapTrack ClassFactory */ static HRESULT WINAPI ChordMapTrackCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) { - FIXME("- no interface\n\tIID:\t%s\n", debugstr_guid(riid)); - + FIXME("- no interface IID: %s\n", debugstr_guid(riid)); + if (ppobj == NULL) return E_POINTER; return E_NOINTERFACE; @@ -184,8 +184,8 @@ static IClassFactoryImpl ChordMapTrack_CF = {&ChordMapTrackCF_Vtbl}; * DirectMusicTemplate ClassFactory */ static HRESULT WINAPI TemplateCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) { - FIXME("- no interface\n\tIID:\t%s\n", debugstr_guid(riid)); - + FIXME("- no interface IID: %s\n", debugstr_guid(riid)); + if (ppobj == NULL) return E_POINTER; return E_NOINTERFACE; @@ -236,8 +236,8 @@ static IClassFactoryImpl Template_CF = {&TemplateCF_Vtbl}; * DirectMusicSignPostTrack ClassFactory */ static HRESULT WINAPI SignPostTrackCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) { - FIXME("- no interface\n\tIID:\t%s\n", debugstr_guid(riid)); - + FIXME("- no interface IID: %s\n", debugstr_guid(riid)); + if (ppobj == NULL) return E_POINTER; return E_NOINTERFACE;

1 0

Michael Stefaniuc : dmsynth: Avoid newlines inside FIXME messages.
by Alexandre Julliard 14 Jan '10

14 Jan '10

Module: wine Branch: master Commit: f6a34c4ece9b59898b892b5ab3ebb5f308bc819d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6a34c4ece9b59898b892b5ab… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jan 11 23:47:59 2010 +0100 dmsynth: Avoid newlines inside FIXME messages. --- dlls/dmsynth/dmsynth_main.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dmsynth/dmsynth_main.c b/dlls/dmsynth/dmsynth_main.c index 607b865..9cf4bc8 100644 --- a/dlls/dmsynth/dmsynth_main.c +++ b/dlls/dmsynth/dmsynth_main.c @@ -36,7 +36,7 @@ typedef struct { * DirectMusicSynth ClassFactory */ static HRESULT WINAPI SynthCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) { - FIXME("- no interface\n\tIID:\t%s\n", debugstr_guid(riid)); + FIXME("- no interface IID: %s\n", debugstr_guid(riid)); if (ppobj == NULL) return E_POINTER; @@ -85,7 +85,7 @@ static IClassFactoryImpl Synth_CF = {&SynthCF_Vtbl}; * DirectMusicSynthSink ClassFactory */ static HRESULT WINAPI SynthSinkCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) { - FIXME("- no interface\n\tIID:\t%s\n", debugstr_guid(riid)); + FIXME("- no interface IID: %s\n", debugstr_guid(riid)); if (ppobj == NULL) return E_POINTER;

1 0

Peter Dons Tychsen : user32: Do not allow a change of capture if the currently capture window is a menu unless explicitly specified .
by Alexandre Julliard 14 Jan '10

14 Jan '10

Module: wine Branch: master Commit: d21c131fb543cd3c43632821dc96df930cb8f84e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d21c131fb543cd3c43632821d… Author: Peter Dons Tychsen <donpedro(a)tdcadsl.dk> Date: Mon Jan 11 21:47:43 2010 +0100 user32: Do not allow a change of capture if the currently capture window is a menu unless explicitly specified. --- dlls/user32/input.c | 15 +++++--- dlls/user32/tests/win.c | 92 +++++++++++++++++++++++++++++++++++++++++++++++ server/queue.c | 6 +++ 3 files changed, 107 insertions(+), 6 deletions(-) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index bfe80c4..96c7038 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -101,12 +101,15 @@ BOOL set_capture_window( HWND hwnd, UINT gui_flags, HWND *prev_ret ) } SERVER_END_REQ; - USER_Driver->pSetCapture( hwnd, gui_flags ); + if (ret) + { + USER_Driver->pSetCapture( hwnd, gui_flags ); - if (previous && previous != hwnd) - SendMessageW( previous, WM_CAPTURECHANGED, 0, (LPARAM)hwnd ); + if (previous && previous != hwnd) + SendMessageW( previous, WM_CAPTURECHANGED, 0, (LPARAM)hwnd ); - if (prev_ret) *prev_ret = previous; + if (prev_ret) *prev_ret = previous; + } return ret; } @@ -226,7 +229,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH SetCursorPos( INT x, INT y ) */ HWND WINAPI DECLSPEC_HOTPATCH SetCapture( HWND hwnd ) { - HWND previous; + HWND previous = 0; set_capture_window( hwnd, 0, &previous ); return previous; @@ -241,7 +244,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH ReleaseCapture(void) BOOL ret = set_capture_window( 0, 0, NULL ); /* Somebody may have missed some mouse movements */ - mouse_event( MOUSEEVENTF_MOVE, 0, 0, 0, 0 ); + if (ret) mouse_event( MOUSEEVENTF_MOVE, 0, 0, 0, 0 ); return ret; } diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 24e6ac2..34ff9d0 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -2697,6 +2697,97 @@ static void test_capture_3(HWND hwnd1, HWND hwnd2) ok (ret, "releasecapture did not return TRUE after second try.\n"); } +static LRESULT CALLBACK test_capture_4_proc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) +{ + GUITHREADINFO gti; + HWND cap_wnd, cap_wnd2, set_cap_wnd; + BOOL status; + switch (msg) + { + case WM_CAPTURECHANGED: + + /* now try to release capture from menu. this should fail */ + memset(&gti, 0, sizeof(GUITHREADINFO)); + gti.cbSize = sizeof(GUITHREADINFO); + status = GetGUIThreadInfo(GetCurrentThreadId(), &gti); + ok(status, "GetGUIThreadInfo() failed!\n"); + cap_wnd = GetCapture(); + ok(gti.flags & GUI_INMENUMODE, "Thread info incorrect (flags=%08X)!\n", gti.flags); + + /* check that re-setting the capture for the menu fails */ + set_cap_wnd = SetCapture(cap_wnd); + ok(!set_cap_wnd, "SetCapture should have failed!\n"); + + /* check that SetCapture fails for another window and that it does not touch the error code */ + set_cap_wnd = SetCapture(hWnd); + ok(!set_cap_wnd, "ReleaseCapture should have failed!\n"); + + /* check that ReleaseCapture fails and does not touch the error code */ + status = ReleaseCapture(); + ok(!status, "ReleaseCapture should have failed!\n"); + + /* check that thread info did not change */ + memset(&gti, 0, sizeof(GUITHREADINFO)); + gti.cbSize = sizeof(GUITHREADINFO); + status = GetGUIThreadInfo(GetCurrentThreadId(), &gti); + ok(status, "GetGUIThreadInfo() failed!\n"); + ok(gti.flags & GUI_INMENUMODE, "Thread info incorrect (flags=%08X)!\n", gti.flags); + + /* verify that no capture change took place */ + cap_wnd2 = GetCapture(); + ok(cap_wnd2 == cap_wnd, "Capture changed!\n"); + + /* we are done. kill the window */ + DestroyWindow(hWnd); + break; + + default: + return( DefWindowProcA( hWnd, msg, wParam, lParam ) ); + } + return 0; +} + +/* Test that no-one can mess around with the current capture while a menu is open */ +static void test_capture_4(void) +{ + BOOL ret; + HMENU hmenu; + HWND hwnd; + WNDCLASSA wclass; + HINSTANCE hInstance = GetModuleHandleA( NULL ); + wclass.lpszClassName = "TestCapture4Class"; + wclass.style = CS_HREDRAW | CS_VREDRAW; + wclass.lpfnWndProc = test_capture_4_proc; + wclass.hInstance = hInstance; + wclass.hIcon = LoadIconA( 0, IDI_APPLICATION ); + wclass.hCursor = LoadCursorA( NULL, IDC_ARROW ); + wclass.hbrBackground = (HBRUSH)( COLOR_WINDOW + 1 ); + wclass.lpszMenuName = 0; + wclass.cbClsExtra = 0; + wclass.cbWndExtra = 0; + assert (RegisterClassA( &wclass )); + assert (hwnd = CreateWindowA( wclass.lpszClassName, "MenuTest", + WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, 0, + 400, 200, NULL, NULL, hInstance, NULL) ); + ok(hwnd != NULL, "CreateWindowEx failed with error %d\n", GetLastError()); + if (!hwnd) return; + hmenu = CreatePopupMenu(); + + ret = AppendMenuA( hmenu, MF_STRING, 1, "winetest2"); + ok( ret, "AppendMenA has failed!\n"); + + /* set main window to have initial capture */ + SetCapture(hwnd); + + /* create popup (it will self-destruct) */ + ret = TrackPopupMenu(hmenu, 0x100, 100,100, 0, hwnd, NULL); + ok( ret == 0, "TrackPopupMenu returned %d expected zero\n", ret); + + /* clean up */ + DestroyMenu(hmenu); + DestroyWindow(hwnd); +} + /* PeekMessage wrapper that ignores the messages we don't care about */ static BOOL peek_message( MSG *msg ) { @@ -5821,6 +5912,7 @@ START_TEST(win) test_capture_1(); test_capture_2(); test_capture_3(hwndMain, hwndMain2); + test_capture_4(); test_CreateWindow(); test_parent_owner(); diff --git a/server/queue.c b/server/queue.c index d880dff..cfe9818 100644 --- a/server/queue.c +++ b/server/queue.c @@ -2145,6 +2145,12 @@ DECL_HANDLER(set_capture_window) { struct thread_input *input = queue->input; + /* if in menu mode, reject all requests to change focus, except if the menu bit is set */ + if (input->menu_owner && !(req->flags & CAPTURE_MENU)) + { + set_error(STATUS_ACCESS_DENIED); + return; + } reply->previous = input->capture; input->capture = get_user_full_handle( req->handle ); input->menu_owner = (req->flags & CAPTURE_MENU) ? input->capture : 0;

1 0

Christian Costa : d3drm: Simplify declaration of VTable members ( spotted by Dmitry Timoshkov).
by Alexandre Julliard 14 Jan '10

14 Jan '10

Module: wine Branch: master Commit: 3ad04c18c074782a4f0c006660ff4bd2665549d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ad04c18c074782a4f0c00666… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Tue Jan 12 09:54:30 2010 +0100 d3drm: Simplify declaration of VTable members (spotted by Dmitry Timoshkov). --- dlls/d3drm/d3drm.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index a0d7d3f..4eed18b 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -34,7 +34,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3drm); typedef struct { - IDirect3DRM lpVtbl; + const IDirect3DRMVtbl *lpVtbl; LONG ref; } IDirect3DRMImpl; @@ -53,7 +53,7 @@ HRESULT Direct3DRM_create(LPDIRECT3DRM* ppDirect3DRM) return E_OUTOFMEMORY; } - object->lpVtbl.lpVtbl = &Direct3DRM_Vtbl; + object->lpVtbl = &Direct3DRM_Vtbl; object->ref = 1; *ppDirect3DRM = (IDirect3DRM*)object;

1 0