January 2014 - Wine-commits

Frédéric Delanoy : comctl32: Avoid TRUE: FALSE conditional expressions.
by Alexandre Julliard 16 Jan '14

16 Jan '14

Module: wine Branch: master Commit: 3684578a9f64b497b49d8b44151e8a3bf5b1278c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3684578a9f64b497b49d8b441… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Jan 15 23:58:17 2014 +0100 comctl32: Avoid TRUE:FALSE conditional expressions. --- dlls/comctl32/comboex.c | 2 +- dlls/comctl32/rebar.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/comboex.c b/dlls/comctl32/comboex.c index f1acc7d..31762b1 100644 --- a/dlls/comctl32/comboex.c +++ b/dlls/comctl32/comboex.c @@ -1590,7 +1590,7 @@ static LRESULT COMBOEX_NotifyFormat (COMBOEX_INFO *infoPtr, LPARAM lParam) if (lParam == NF_REQUERY) { INT i = SendMessageW(infoPtr->hwndNotify, WM_NOTIFYFORMAT, (WPARAM)infoPtr->hwndSelf, NF_QUERY); - infoPtr->NtfUnicode = (i == NFR_UNICODE) ? 1 : 0; + infoPtr->NtfUnicode = (i == NFR_UNICODE); } return infoPtr->NtfUnicode ? NFR_UNICODE : NFR_ANSI; } diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c index 4a3b7d4..becfe20 100644 --- a/dlls/comctl32/rebar.c +++ b/dlls/comctl32/rebar.c @@ -3385,7 +3385,7 @@ REBAR_NotifyFormat (REBAR_INFO *infoPtr, LPARAM cmd) ERR("wrong response to WM_NOTIFYFORMAT (%d), assuming ANSI\n", i); i = NFR_ANSI; } - infoPtr->bUnicode = (i == NFR_UNICODE) ? 1 : 0; + infoPtr->bUnicode = (i == NFR_UNICODE); return (LRESULT)i; } return (LRESULT)((infoPtr->bUnicode) ? NFR_UNICODE : NFR_ANSI);

1 0

Michael Stefaniuc : dmcompos: Use a better error for an unimplemented COM class.
by Alexandre Julliard 16 Jan '14

16 Jan '14

Module: wine Branch: master Commit: 4f3931eb1537f315112386732ce42e61ac11a688 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f3931eb1537f315112386732… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 16 00:42:52 2014 +0100 dmcompos: Use a better error for an unimplemented COM class. --- dlls/dmcompos/dmcompos_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dmcompos/dmcompos_main.c b/dlls/dmcompos/dmcompos_main.c index b9f1444..e40c6ea 100644 --- a/dlls/dmcompos/dmcompos_main.c +++ b/dlls/dmcompos/dmcompos_main.c @@ -37,7 +37,7 @@ static HRESULT WINAPI create_direct_music_template(REFIID riid, void **ppv, IUnk { FIXME("(%p, %s, %p) stub\n", pUnkOuter, debugstr_dmguid(riid), ppv); - return E_NOINTERFACE; + return CLASS_E_CLASSNOTAVAILABLE; } /******************************************************************

1 0

Michael Stefaniuc : dmcompos: None of the COM classes support aggregation.
by Alexandre Julliard 16 Jan '14

16 Jan '14

Module: wine Branch: master Commit: 434842e13d716debf712a6f97bfc1aef8bf3fdcd URL: http://source.winehq.org/git/wine.git/?a=commit;h=434842e13d716debf712a6f97… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 16 00:45:17 2014 +0100 dmcompos: None of the COM classes support aggregation. --- dlls/dmcompos/chordmap.c | 3 ++- dlls/dmcompos/chordmaptrack.c | 3 ++- dlls/dmcompos/composer.c | 3 ++- dlls/dmcompos/dmcompos_main.c | 23 +++++++++++++---------- dlls/dmcompos/dmcompos_private.h | 8 ++++---- dlls/dmcompos/signposttrack.c | 3 ++- 6 files changed, 25 insertions(+), 18 deletions(-) diff --git a/dlls/dmcompos/chordmap.c b/dlls/dmcompos/chordmap.c index ea751af..21849b8 100644 --- a/dlls/dmcompos/chordmap.c +++ b/dlls/dmcompos/chordmap.c @@ -524,7 +524,8 @@ static const IPersistStreamVtbl DirectMusicChordMap_PersistStream_Vtbl = { }; /* for ClassFactory */ -HRESULT WINAPI DMUSIC_CreateDirectMusicChordMapImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) { +HRESULT WINAPI create_dmchordmap(REFIID lpcGUID, void **ppobj) +{ IDirectMusicChordMapImpl* obj; obj = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicChordMapImpl)); diff --git a/dlls/dmcompos/chordmaptrack.c b/dlls/dmcompos/chordmaptrack.c index 6d8f326..cac652c 100644 --- a/dlls/dmcompos/chordmaptrack.c +++ b/dlls/dmcompos/chordmaptrack.c @@ -269,7 +269,8 @@ static const IPersistStreamVtbl DirectMusicChordMapTrack_PersistStream_Vtbl = { }; /* for ClassFactory */ -HRESULT WINAPI DMUSIC_CreateDirectMusicChordMapTrack (LPCGUID lpcGUID, LPVOID *ppobj, LPUNKNOWN pUnkOuter) { +HRESULT WINAPI create_dmchordmaptrack(REFIID lpcGUID, void **ppobj) +{ IDirectMusicChordMapTrack* track; track = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicChordMapTrack)); diff --git a/dlls/dmcompos/composer.c b/dlls/dmcompos/composer.c index d122e97..2d91f5e 100644 --- a/dlls/dmcompos/composer.c +++ b/dlls/dmcompos/composer.c @@ -112,7 +112,8 @@ static const IDirectMusicComposerVtbl DirectMusicComposer_Vtbl = { }; /* for ClassFactory */ -HRESULT WINAPI DMUSIC_CreateDirectMusicComposerImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) { +HRESULT WINAPI create_dmcomposer(REFIID lpcGUID, void **ppobj) +{ IDirectMusicComposerImpl* obj; obj = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicComposerImpl)); diff --git a/dlls/dmcompos/dmcompos_main.c b/dlls/dmcompos/dmcompos_main.c index e40c6ea..240cc9d 100644 --- a/dlls/dmcompos/dmcompos_main.c +++ b/dlls/dmcompos/dmcompos_main.c @@ -30,12 +30,12 @@ LONG DMCOMPOS_refCount = 0; typedef struct { IClassFactory IClassFactory_iface; - HRESULT WINAPI (*fnCreateInstance)(REFIID riid, void **ppv, IUnknown *pUnkOuter); + HRESULT WINAPI (*fnCreateInstance)(REFIID riid, void **ret_iface); } IClassFactoryImpl; -static HRESULT WINAPI create_direct_music_template(REFIID riid, void **ppv, IUnknown *pUnkOuter) +static HRESULT WINAPI create_direct_music_template(REFIID riid, void **ret_iface) { - FIXME("(%p, %s, %p) stub\n", pUnkOuter, debugstr_dmguid(riid), ppv); + FIXME("(%s, %p) stub\n", debugstr_dmguid(riid), ret_iface); return CLASS_E_CLASSNOTAVAILABLE; } @@ -89,7 +89,12 @@ static HRESULT WINAPI ClassFactory_CreateInstance(IClassFactory *iface, IUnknown TRACE ("(%p, %s, %p)\n", pUnkOuter, debugstr_dmguid(riid), ppv); - return This->fnCreateInstance(riid, ppv, pUnkOuter); + if (pUnkOuter) { + *ppv = NULL; + return CLASS_E_NOAGGREGATION; + } + + return This->fnCreateInstance(riid, ppv); } static HRESULT WINAPI ClassFactory_LockServer(IClassFactory *iface, BOOL dolock) @@ -112,13 +117,11 @@ static const IClassFactoryVtbl classfactory_vtbl = { ClassFactory_LockServer }; -static IClassFactoryImpl ChordMap_CF = {{&classfactory_vtbl}, DMUSIC_CreateDirectMusicChordMapImpl}; -static IClassFactoryImpl Composer_CF = {{&classfactory_vtbl}, DMUSIC_CreateDirectMusicComposerImpl}; -static IClassFactoryImpl ChordMapTrack_CF = {{&classfactory_vtbl}, - DMUSIC_CreateDirectMusicChordMapTrack}; +static IClassFactoryImpl ChordMap_CF = {{&classfactory_vtbl}, create_dmchordmap}; +static IClassFactoryImpl Composer_CF = {{&classfactory_vtbl}, create_dmcomposer}; +static IClassFactoryImpl ChordMapTrack_CF = {{&classfactory_vtbl}, create_dmchordmaptrack}; static IClassFactoryImpl Template_CF = {{&classfactory_vtbl}, create_direct_music_template}; -static IClassFactoryImpl SignPostTrack_CF = {{&classfactory_vtbl}, - DMUSIC_CreateDirectMusicSignPostTrack}; +static IClassFactoryImpl SignPostTrack_CF = {{&classfactory_vtbl}, create_dmsignposttrack}; /****************************************************************** * DllMain diff --git a/dlls/dmcompos/dmcompos_private.h b/dlls/dmcompos/dmcompos_private.h index 5e9a9f1..d6d252c 100644 --- a/dlls/dmcompos/dmcompos_private.h +++ b/dlls/dmcompos/dmcompos_private.h @@ -53,10 +53,10 @@ typedef struct IDirectMusicSignPostTrack IDirectMusicSignPostTrack; /***************************************************************************** * ClassFactory */ -extern HRESULT WINAPI DMUSIC_CreateDirectMusicChordMapImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN; -extern HRESULT WINAPI DMUSIC_CreateDirectMusicComposerImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN; -extern HRESULT WINAPI DMUSIC_CreateDirectMusicChordMapTrack (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN; -extern HRESULT WINAPI DMUSIC_CreateDirectMusicSignPostTrack (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN; +extern HRESULT WINAPI create_dmchordmap(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN; +extern HRESULT WINAPI create_dmcomposer(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN; +extern HRESULT WINAPI create_dmchordmaptrack(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN; +extern HRESULT WINAPI create_dmsignposttrack(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN; /***************************************************************************** * IDirectMusicChordMapImpl implementation structure diff --git a/dlls/dmcompos/signposttrack.c b/dlls/dmcompos/signposttrack.c index 15ff599..586c085 100644 --- a/dlls/dmcompos/signposttrack.c +++ b/dlls/dmcompos/signposttrack.c @@ -267,7 +267,8 @@ static const IPersistStreamVtbl DirectMusicSignPostTrack_PersistStream_Vtbl = }; /* for ClassFactory */ -HRESULT WINAPI DMUSIC_CreateDirectMusicSignPostTrack (LPCGUID lpcGUID, LPVOID *ppobj, LPUNKNOWN pUnkOuter) { +HRESULT WINAPI create_dmsignposttrack(REFIID lpcGUID, void **ppobj) +{ IDirectMusicSignPostTrack* track; track = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicSignPostTrack));

1 0

Michael Stefaniuc : dmcompos/tests: Add COM tests for IDirectMusicComposer.
by Alexandre Julliard 16 Jan '14

16 Jan '14

Module: wine Branch: master Commit: 6c22a6ad5632e7d53989933c9daea5c3b7625703 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c22a6ad5632e7d53989933c9… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 16 00:47:38 2014 +0100 dmcompos/tests: Add COM tests for IDirectMusicComposer. --- configure | 1 + configure.ac | 1 + dlls/dmcompos/tests/Makefile.in | 5 +++ dlls/dmcompos/tests/dmcompos.c | 91 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 98 insertions(+) diff --git a/configure b/configure index 48f12f1..c59d934 100755 --- a/configure +++ b/configure @@ -16665,6 +16665,7 @@ wine_fn_config_dll display.drv16 enable_win16 wine_fn_config_dll dmband enable_dmband clean wine_fn_config_test dlls/dmband/tests dmband_test wine_fn_config_dll dmcompos enable_dmcompos clean +wine_fn_config_test dlls/dmcompos/tests dmcompos_test wine_fn_config_dll dmime enable_dmime clean wine_fn_config_test dlls/dmime/tests dmime_test wine_fn_config_dll dmloader enable_dmloader clean diff --git a/configure.ac b/configure.ac index 75faadf..4f51909 100644 --- a/configure.ac +++ b/configure.ac @@ -2789,6 +2789,7 @@ WINE_CONFIG_DLL(display.drv16,enable_win16) WINE_CONFIG_DLL(dmband,,[clean]) WINE_CONFIG_TEST(dlls/dmband/tests) WINE_CONFIG_DLL(dmcompos,,[clean]) +WINE_CONFIG_TEST(dlls/dmcompos/tests) WINE_CONFIG_DLL(dmime,,[clean]) WINE_CONFIG_TEST(dlls/dmime/tests) WINE_CONFIG_DLL(dmloader,,[clean]) diff --git a/dlls/dmcompos/tests/Makefile.in b/dlls/dmcompos/tests/Makefile.in new file mode 100644 index 0000000..b794d4d --- /dev/null +++ b/dlls/dmcompos/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = dmcompos.dll +IMPORTS = ole32 + +C_SRCS = \ + dmcompos.c diff --git a/dlls/dmcompos/tests/dmcompos.c b/dlls/dmcompos/tests/dmcompos.c new file mode 100644 index 0000000..329d65e --- /dev/null +++ b/dlls/dmcompos/tests/dmcompos.c @@ -0,0 +1,91 @@ +/* + * Copyright 2014 Michael Stefaniuc + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define COBJMACROS + +#include <stdarg.h> +#include <windef.h> +#include <initguid.h> +#include <wine/test.h> +#include <dmusici.h> + + +static BOOL missing_dmcompos(void) +{ + IDirectMusicComposer *dmc; + HRESULT hr = CoCreateInstance(&CLSID_DirectMusicComposer, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicComposer, (void**)&dmc); + + if (hr == S_OK && dmc) + { + IDirectMusicComposer_Release(dmc); + return FALSE; + } + return TRUE; +} + +static void test_COM(void) +{ + IDirectMusicComposer *dmc = (IDirectMusicComposer*)0xdeadbeef; + IUnknown *unk; + ULONG refcount; + HRESULT hr; + + /* COM aggregation */ + hr = CoCreateInstance(&CLSID_DirectMusicComposer, (IUnknown*)&dmc, CLSCTX_INPROC_SERVER, + &IID_IUnknown, (void**)&dmc); + ok(hr == CLASS_E_NOAGGREGATION, + "DirectMusicComposer create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr); + ok(!dmc, "dmc = %p\n", dmc); + + /* Invalid RIID */ + hr = CoCreateInstance(&CLSID_DirectMusicComposer, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicObject, (void**)&dmc); + ok(hr == E_NOINTERFACE, + "DirectMusicComposer create failed: %08x, expected E_NOINTERFACE\n", hr); + + /* Same refcount for all DirectMusicComposer interfaces */ + hr = CoCreateInstance(&CLSID_DirectMusicComposer, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicComposer, (void**)&dmc); + ok(hr == S_OK, "DirectMusicComposer create failed: %08x, expected S_OK\n", hr); + refcount = IDirectMusicComposer_AddRef(dmc); + ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + + hr = IDirectMusicComposer_QueryInterface(dmc, &IID_IUnknown, (void**)&unk); + ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr); + refcount = IUnknown_AddRef(unk); + ok(refcount == 4, "refcount == %u, expected 4\n", refcount); + refcount = IUnknown_Release(unk); + + while (IDirectMusicComposer_Release(dmc)); +} + +START_TEST(dmcompos) +{ + CoInitialize(NULL); + + if (missing_dmcompos()) + { + skip("dmcompos not available\n"); + CoUninitialize(); + return; + } + test_COM(); + + CoUninitialize(); +}

1 0

Michael Stefaniuc : dmcompos/tests: Add COM tests for IDirectMusicChordMap.
by Alexandre Julliard 16 Jan '14

16 Jan '14

Module: wine Branch: master Commit: ad52929b178981427ff56103fc6dc1a268102d8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad52929b178981427ff56103f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 16 00:49:19 2014 +0100 dmcompos/tests: Add COM tests for IDirectMusicChordMap. --- dlls/dmcompos/tests/dmcompos.c | 51 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/dlls/dmcompos/tests/dmcompos.c b/dlls/dmcompos/tests/dmcompos.c index 329d65e..6ff663a 100644 --- a/dlls/dmcompos/tests/dmcompos.c +++ b/dlls/dmcompos/tests/dmcompos.c @@ -75,6 +75,56 @@ static void test_COM(void) while (IDirectMusicComposer_Release(dmc)); } +static void test_COM_chordmap(void) +{ + IDirectMusicChordMap *dmcm = (IDirectMusicChordMap*)0xdeadbeef; + IDirectMusicObject *dmo; + IPersistStream *ps; + IUnknown *unk; + ULONG refcount; + HRESULT hr; + + /* COM aggregation */ + hr = CoCreateInstance(&CLSID_DirectMusicChordMap, (IUnknown*)&dmcm, CLSCTX_INPROC_SERVER, + &IID_IUnknown, (void**)&dmcm); + ok(hr == CLASS_E_NOAGGREGATION, + "DirectMusicChordMap create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr); + ok(!dmcm, "dmcm = %p\n", dmcm); + + /* Invalid RIID */ + hr = CoCreateInstance(&CLSID_DirectMusicChordMap, NULL, CLSCTX_INPROC_SERVER, + &IID_IClassFactory, (void**)&dmcm); + ok(hr == E_NOINTERFACE, + "DirectMusicChordMap create failed: %08x, expected E_NOINTERFACE\n", hr); + + /* Same refcount for all DirectMusicChordMap interfaces */ + hr = CoCreateInstance(&CLSID_DirectMusicChordMap, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicChordMap, (void**)&dmcm); + ok(hr == S_OK, "DirectMusicChordMap create failed: %08x, expected S_OK\n", hr); + refcount = IDirectMusicChordMap_AddRef(dmcm); + ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + + hr = IDirectMusicChordMap_QueryInterface(dmcm, &IID_IDirectMusicObject, (void**)&dmo); + ok(hr == S_OK, "QueryInterface for IID_IDirectMusicObject failed: %08x\n", hr); + refcount = IDirectMusicObject_AddRef(dmo); + ok(refcount == 4, "refcount == %u, expected 4\n", refcount); + refcount = IDirectMusicObject_Release(dmo); + + hr = IDirectMusicChordMap_QueryInterface(dmcm, &IID_IPersistStream, (void**)&ps); + ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); + refcount = IPersistStream_AddRef(ps); + ok(refcount == 5, "refcount == %u, expected 5\n", refcount); + refcount = IPersistStream_Release(ps); + + hr = IDirectMusicChordMap_QueryInterface(dmcm, &IID_IUnknown, (void**)&unk); + ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr); + refcount = IUnknown_AddRef(unk); + ok(refcount == 6, "refcount == %u, expected 6\n", refcount); + refcount = IUnknown_Release(unk); + + while (IDirectMusicChordMap_Release(dmcm)); +} + START_TEST(dmcompos) { CoInitialize(NULL); @@ -86,6 +136,7 @@ START_TEST(dmcompos) return; } test_COM(); + test_COM_chordmap(); CoUninitialize(); }

1 0

Michael Stefaniuc : dmcompos/tests: COM tests for the different DirectMusic*Tracks.
by Alexandre Julliard 16 Jan '14

16 Jan '14

Module: wine Branch: master Commit: 7c7c427c423104e630986d04d672a2b4cd6a90f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c7c427c423104e630986d04d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 16 00:52:57 2014 +0100 dmcompos/tests: COM tests for the different DirectMusic*Tracks. --- dlls/dmcompos/tests/dmcompos.c | 66 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) diff --git a/dlls/dmcompos/tests/dmcompos.c b/dlls/dmcompos/tests/dmcompos.c index 6ff663a..ba07305 100644 --- a/dlls/dmcompos/tests/dmcompos.c +++ b/dlls/dmcompos/tests/dmcompos.c @@ -24,6 +24,7 @@ #include <wine/test.h> #include <dmusici.h> +#define ARRAY_SIZE(a) (sizeof(a)/sizeof((a)[0])) static BOOL missing_dmcompos(void) { @@ -125,6 +126,70 @@ static void test_COM_chordmap(void) while (IDirectMusicChordMap_Release(dmcm)); } +static void test_COM_track(void) +{ + IDirectMusicTrack8 *dmt8; + IPersistStream *ps; + IUnknown *unk; + ULONG refcount; + HRESULT hr; +#define X(class) &CLSID_ ## class, #class + const struct { + REFCLSID clsid; + const char *name; + } class[] = { + { X(DirectMusicChordMapTrack) }, + { X(DirectMusicSignPostTrack) }, + }; +#undef X + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(class); i++) { + /* COM aggregation */ + dmt8 = (IDirectMusicTrack8*)0xdeadbeef; + hr = CoCreateInstance(class[i].clsid, (IUnknown*)&dmt8, CLSCTX_INPROC_SERVER, &IID_IUnknown, + (void**)&dmt8); + if (hr == REGDB_E_CLASSNOTREG) { + win_skip("%s not registered\n", class[i].name); + continue; + } + ok(hr == CLASS_E_NOAGGREGATION, + "%s create failed: %08x, expected CLASS_E_NOAGGREGATION\n", class[i].name, hr); + ok(!dmt8, "dmt8 = %p\n", dmt8); + + /* Invalid RIID */ + hr = CoCreateInstance(class[i].clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicObject, + (void**)&dmt8); + ok(hr == E_NOINTERFACE, "%s create failed: %08x, expected E_NOINTERFACE\n", + class[i].name, hr); + + /* Same refcount for all DirectMusicTrack interfaces */ + hr = CoCreateInstance(class[i].clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicTrack8, + (void**)&dmt8); + if (hr == E_NOINTERFACE && !dmt8) { + skip("%s not created with CoCreateInstance()\n", class[i].name); + continue; + } + ok(hr == S_OK, "%s create failed: %08x, expected S_OK\n", class[i].name, hr); + refcount = IDirectMusicTrack8_AddRef(dmt8); + ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + + hr = IDirectMusicTrack8_QueryInterface(dmt8, &IID_IPersistStream, (void**)&ps); + ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); + refcount = IPersistStream_AddRef(ps); + ok(refcount == 4, "refcount == %u, expected 4\n", refcount); + refcount = IPersistStream_Release(ps); + + hr = IDirectMusicTrack8_QueryInterface(dmt8, &IID_IUnknown, (void**)&unk); + ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr); + refcount = IUnknown_AddRef(unk); + ok(refcount == 5, "refcount == %u, expected 5\n", refcount); + refcount = IUnknown_Release(unk); + + while (IDirectMusicTrack8_Release(dmt8)); + } +} + START_TEST(dmcompos) { CoInitialize(NULL); @@ -137,6 +202,7 @@ START_TEST(dmcompos) } test_COM(); test_COM_chordmap(); + test_COM_track(); CoUninitialize(); }

1 0

Michael Stefaniuc : dmcompos/tests: Add COM tests for DirectMusicTemplate.
by Alexandre Julliard 16 Jan '14

16 Jan '14

Module: wine Branch: master Commit: d3a3deb6605164f29e5ddd4a568c3f5c707a4485 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3a3deb6605164f29e5ddd4a5… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 16 00:54:08 2014 +0100 dmcompos/tests: Add COM tests for DirectMusicTemplate. --- dlls/dmcompos/tests/dmcompos.c | 41 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/dlls/dmcompos/tests/dmcompos.c b/dlls/dmcompos/tests/dmcompos.c index ba07305..ecb7745 100644 --- a/dlls/dmcompos/tests/dmcompos.c +++ b/dlls/dmcompos/tests/dmcompos.c @@ -126,6 +126,46 @@ static void test_COM_chordmap(void) while (IDirectMusicChordMap_Release(dmcm)); } +static void test_COM_template(void) +{ + IPersistStream *ps = (IPersistStream*)0xdeadbeef; + IUnknown *unk; + ULONG refcount; + HRESULT hr; + + /* COM aggregation */ + hr = CoCreateInstance(&CLSID_DirectMusicTemplate, (IUnknown*)&ps, CLSCTX_INPROC_SERVER, + &IID_IUnknown, (void**)&ps); + ok(hr == CLASS_E_NOAGGREGATION, + "DirectMusicTemplate create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr); + ok(!ps, "ps = %p\n", ps); + + /* Invalid RIID */ + hr = CoCreateInstance(&CLSID_DirectMusicTemplate, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicObject, (void**)&ps); + todo_wine ok(hr == E_NOINTERFACE, + "DirectMusicTemplate create failed: %08x, expected E_NOINTERFACE\n", hr); + + /* Same refcount for all DirectMusicTemplate interfaces */ + hr = CoCreateInstance(&CLSID_DirectMusicTemplate, NULL, CLSCTX_INPROC_SERVER, + &IID_IPersistStream, (void**)&ps); + todo_wine ok(hr == S_OK, "DirectMusicTemplate create failed: %08x, expected S_OK\n", hr); + if (hr != S_OK) { + skip("DirectMusicTemplate not implemented\n"); + return; + } + refcount = IPersistStream_AddRef(ps); + ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + + hr = IPersistStream_QueryInterface(ps, &IID_IUnknown, (void**)&unk); + ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr); + refcount = IUnknown_AddRef(unk); + ok(refcount == 4, "refcount == %u, expected 4\n", refcount); + refcount = IUnknown_Release(unk); + + while (IPersistStream_Release(ps)); +} + static void test_COM_track(void) { IDirectMusicTrack8 *dmt8; @@ -202,6 +242,7 @@ START_TEST(dmcompos) } test_COM(); test_COM_chordmap(); + test_COM_template(); test_COM_track(); CoUninitialize();

1 0

Nikolay Sivov : po: Update Russian translation.
by Alexandre Julliard 16 Jan '14

16 Jan '14

Module: wine Branch: master Commit: 16ecf3c84aa548c80069a0666293855bc3b9c72f URL: http://source.winehq.org/git/wine.git/?a=commit;h=16ecf3c84aa548c80069a0666… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 16 11:14:39 2014 +0400 po: Update Russian translation. --- po/ru.po | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/po/ru.po b/po/ru.po index 2103b9b..d5843b6 100644 --- a/po/ru.po +++ b/po/ru.po @@ -10084,7 +10084,7 @@ msgstr "Приглашение командной строки Wine" #: cmd.rc:351 msgid "Microsoft Windows %1!S!\n" -msgstr "" +msgstr "Microsoft Windows %1!S!\n" #: cmd.rc:352 msgid "More? " @@ -10153,10 +10153,8 @@ msgid "Wine Explorer" msgstr "Проводник Wine" #: explorer.rc:33 -#, fuzzy -#| msgid "StartUp" msgid "Start" -msgstr "Автозагрузка" +msgstr "Пуск" #: explorer.rc:34 winefile.rc:36 msgid "&Run..." @@ -12742,10 +12740,8 @@ msgid "Select Drive Letter" msgstr "Выберите букву диска" #: winecfg.rc:226 -#, fuzzy -#| msgid "Wine configuration" msgid "Drive configuration" -msgstr "Настройка Wine" +msgstr "Настройка дисков" #: winecfg.rc:227 msgid "" @@ -13024,10 +13020,8 @@ msgid "Letter" msgstr "Диск" #: winecfg.rc:78 -#, fuzzy -#| msgid "New Folder" msgid "Target folder" -msgstr "Новая папка" +msgstr "Путь" #: winecfg.rc:79 msgid ""

1 0

Dmitry Timoshkov : taskschd: Treat VT_BSTR/NULL or empty variant as NULL.
by Alexandre Julliard 16 Jan '14

16 Jan '14

Module: wine Branch: master Commit: 006aadd3d2185c5d0d888fa623bf42999f424995 URL: http://source.winehq.org/git/wine.git/?a=commit;h=006aadd3d2185c5d0d888fa62… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jan 16 18:01:59 2014 +0900 taskschd: Treat VT_BSTR/NULL or empty variant as NULL. --- dlls/taskschd/task.c | 3 ++- dlls/taskschd/tests/scheduler.c | 16 ++++++++++++---- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index 5ff3761..c8f8fdf 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -131,7 +131,8 @@ static HRESULT WINAPI TaskService_NewTask(ITaskService *iface, DWORD flags, ITas static inline BOOL is_variant_null(const VARIANT *var) { - return V_VT(var) == VT_EMPTY || V_VT(var) == VT_NULL; + return V_VT(var) == VT_EMPTY || V_VT(var) == VT_NULL || + (V_VT(var) == VT_BSTR && (V_BSTR(var) == NULL || !*V_BSTR(var))); } static HRESULT WINAPI TaskService_Connect(ITaskService *iface, VARIANT server, VARIANT user, VARIANT domain, VARIANT password) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index 12c89b6..152dd69 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -30,6 +30,7 @@ static void test_Connect(void) { + static WCHAR empty[] = { 0 }; static const WCHAR deadbeefW[] = { '0','.','0','.','0','.','0',0 }; WCHAR comp_name[MAX_COMPUTERNAME_LENGTH + 1]; DWORD len; @@ -75,13 +76,13 @@ static void test_Connect(void) hr = ITaskService_Connect(service, v_comp, v_null, v_null, v_null); ok(hr == S_OK || hr == E_ACCESSDENIED /* not an administrator */, "Connect error %#x\n", hr); was_connected = hr == S_OK; - SysFreeString(V_BSTR(&v_comp)); - V_BSTR(&v_comp) = SysAllocString(deadbeefW); + V_BSTR(&v_comp) = SysAllocString(deadbeefW); hr = ITaskService_Connect(service, v_comp, v_null, v_null, v_null); todo_wine ok(hr == HRESULT_FROM_WIN32(RPC_S_INVALID_NET_ADDR), "expected RPC_S_INVALID_NET_ADDR, got %#x\n", hr); + SysFreeString(V_BSTR(&v_comp)); vbool = 0xdead; hr = ITaskService_get_Connected(service, &vbool); @@ -89,6 +90,15 @@ todo_wine ok(vbool == VARIANT_FALSE || (was_connected && vbool == VARIANT_TRUE), "Connect shouldn't trash an existing connection, got %d (was connected %d)\n", vbool, was_connected); + V_BSTR(&v_comp) = SysAllocString(empty); + hr = ITaskService_Connect(service, v_comp, v_null, v_null, v_null); + ok(hr == S_OK, "Connect error %#x\n", hr); + SysFreeString(V_BSTR(&v_comp)); + + V_BSTR(&v_comp) = NULL; + hr = ITaskService_Connect(service, v_comp, v_null, v_null, v_null); + ok(hr == S_OK, "Connect error %#x\n", hr); + hr = ITaskService_Connect(service, v_null, v_null, v_null, v_null); ok(hr == S_OK, "Connect error %#x\n", hr); @@ -102,8 +112,6 @@ todo_wine ok(!lstrcmpW(comp_name, bstr), "compname %s != server name %s\n", wine_dbgstr_w(comp_name), wine_dbgstr_w(bstr)); SysFreeString(bstr); - SysFreeString(V_BSTR(&v_comp)); - ITaskService_Release(service); }

1 0

Dmitry Timoshkov : taskschd/tests: Add more task folder tests.
by Alexandre Julliard 16 Jan '14

16 Jan '14

Module: wine Branch: master Commit: 7341996f5d6ce20b8914dba79e2901aef900ac57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7341996f5d6ce20b8914dba79… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jan 16 18:02:25 2014 +0900 taskschd/tests: Add more task folder tests. --- dlls/taskschd/tests/scheduler.c | 83 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 81 insertions(+), 2 deletions(-) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index 152dd69..63b5730 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -118,19 +118,21 @@ todo_wine static void test_GetFolder(void) { static WCHAR dot[] = { '.',0 }; + static WCHAR empty[] = { 0 }; static WCHAR slash[] = { '/',0 }; static WCHAR bslash[] = { '\\',0 }; static WCHAR Wine[] = { '\\','W','i','n','e',0 }; static WCHAR Wine_Folder1[] = { '\\','W','i','n','e','\\','F','o','l','d','e','r','1',0 }; static WCHAR Wine_Folder1_[] = { '\\','W','i','n','e','\\','F','o','l','d','e','r','1','\\',0 }; static WCHAR Wine_Folder1_Folder2[] = { '\\','W','i','n','e','\\','F','o','l','d','e','r','1','\\','F','o','l','d','e','r','2',0 }; + static WCHAR Folder1_Folder2[] = { '\\','F','o','l','d','e','r','1','\\','F','o','l','d','e','r','2',0 }; static const WCHAR Folder1[] = { 'F','o','l','d','e','r','1',0 }; static const WCHAR Folder2[] = { 'F','o','l','d','e','r','2',0 }; HRESULT hr; BSTR bstr; VARIANT v_null; ITaskService *service; - ITaskFolder *folder, *subfolder; + ITaskFolder *folder, *subfolder, *subfolder2; hr = CoCreateInstance(&CLSID_TaskScheduler, NULL, CLSCTX_INPROC_SERVER, &IID_ITaskService, (void **)&service); if (hr != S_OK) @@ -162,6 +164,12 @@ todo_wine todo_wine ok(hr == E_POINTER, "expected E_POINTER, got %#x\n", hr); + hr = ITaskService_GetFolder(service, empty, &folder); +todo_wine + ok(hr == S_OK, "GetFolder error %#x\n", hr); + if (hr == S_OK) + ITaskFolder_Release(folder); + hr = ITaskService_GetFolder(service, NULL, &folder); todo_wine ok(hr == S_OK, "GetFolder error %#x\n", hr); @@ -198,6 +206,9 @@ todo_wine hr = ITaskFolder_CreateFolder(folder, slash, v_null, &subfolder); ok(hr == HRESULT_FROM_WIN32(ERROR_INVALID_NAME), "expected ERROR_INVALID_NAME, got %#x\n", hr); + hr = ITaskService_GetFolder(service, Wine_Folder1_Folder2, &subfolder); + ok(hr == HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND), "expected ERROR_PATH_NOT_FOUND, got %#x\n", hr); + hr = ITaskFolder_CreateFolder(folder, bslash, v_null, &subfolder); ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr); @@ -266,8 +277,76 @@ todo_wine SysFreeString(bstr); hr = ITaskFolder_get_Path(subfolder, &bstr); ok(hr == S_OK, "get_Path error %#x\n", hr); - ok(!lstrcmpW(bstr, Wine_Folder1), "expected Wine\\Folder1, got %s\n", wine_dbgstr_w(bstr)); + ok(!lstrcmpW(bstr, Wine_Folder1), "expected \\Wine\\Folder1, got %s\n", wine_dbgstr_w(bstr)); + SysFreeString(bstr); + ITaskFolder_Release(subfolder); + + hr = ITaskService_GetFolder(service, Wine, &subfolder); + ok(hr == S_OK, "GetFolder error %#x\n", hr); + hr = ITaskFolder_get_Name(subfolder, &bstr); + ok (hr == S_OK, "get_Name error %#x\n", hr); + ok(!lstrcmpW(bstr, Wine+1), "expected Wine, got %s\n", wine_dbgstr_w(bstr)); + SysFreeString(bstr); + hr = ITaskFolder_get_Path(subfolder, &bstr); + ok(hr == S_OK, "get_Path error %#x\n", hr); + ok(!lstrcmpW(bstr, Wine), "expected \\Wine, got %s\n", wine_dbgstr_w(bstr)); + SysFreeString(bstr); + ITaskFolder_Release(subfolder); + + hr = ITaskService_GetFolder(service, Wine+1, &subfolder); + ok(hr == S_OK, "GetFolder error %#x\n", hr); + hr = ITaskFolder_get_Name(subfolder, &bstr); + ok (hr == S_OK, "get_Name error %#x\n", hr); + ok(!lstrcmpW(bstr, Wine+1), "expected Wine, got %s\n", wine_dbgstr_w(bstr)); + SysFreeString(bstr); + hr = ITaskFolder_get_Path(subfolder, &bstr); + ok(hr == S_OK, "get_Path error %#x\n", hr); + ok(!lstrcmpW(bstr, Wine+1), "expected Wine, got %s\n", wine_dbgstr_w(bstr)); + SysFreeString(bstr); + + hr = ITaskFolder_GetFolder(subfolder, bslash, &subfolder2); + ok(hr == HRESULT_FROM_WIN32(ERROR_INVALID_NAME), "expected ERROR_INVALID_NAME, got %#x\n", hr); + + hr = ITaskFolder_GetFolder(subfolder, NULL, &subfolder2); + ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr); + + hr = ITaskFolder_GetFolder(subfolder, empty, &subfolder2); + ok(hr == S_OK, "GetFolder error %#x\n", hr); + hr = ITaskFolder_get_Name(subfolder2, &bstr); + ok (hr == S_OK, "get_Name error %#x\n", hr); + ok(!lstrcmpW(bstr, Wine+1), "expected Wine, got %s\n", wine_dbgstr_w(bstr)); + SysFreeString(bstr); + hr = ITaskFolder_get_Path(subfolder2, &bstr); + ok(hr == S_OK, "get_Path error %#x\n", hr); + ok(!lstrcmpW(bstr, Wine+1), "expected Wine, got %s\n", wine_dbgstr_w(bstr)); + SysFreeString(bstr); + ITaskFolder_Release(subfolder2); + + hr = ITaskFolder_GetFolder(subfolder, Folder1_Folder2, &subfolder2); + ok(hr == S_OK, "GetFolder error %#x\n", hr); + hr = ITaskFolder_get_Name(subfolder2, &bstr); + ok (hr == S_OK, "get_Name error %#x\n", hr); + ok(!lstrcmpW(bstr, Folder2), "expected Folder2, got %s\n", wine_dbgstr_w(bstr)); SysFreeString(bstr); + hr = ITaskFolder_get_Path(subfolder2, &bstr); + ok(hr == S_OK, "get_Path error %#x\n", hr); + ok(!lstrcmpW(bstr, Wine_Folder1_Folder2+1), "expected Wine\\Folder1\\Folder2, got %s\n", wine_dbgstr_w(bstr)); + SysFreeString(bstr); + ITaskFolder_Release(subfolder2); + + hr = ITaskFolder_GetFolder(subfolder, Folder1_Folder2+1, &subfolder2); + ok(hr == S_OK, "GetFolder error %#x\n", hr); + + hr = ITaskFolder_get_Name(subfolder2, &bstr); + ok (hr == S_OK, "get_Name error %#x\n", hr); + ok(!lstrcmpW(bstr, Folder2), "expected Folder2, got %s\n", wine_dbgstr_w(bstr)); + SysFreeString(bstr); + hr = ITaskFolder_get_Path(subfolder2, &bstr); + ok(hr == S_OK, "get_Path error %#x\n", hr); + ok(!lstrcmpW(bstr, Wine_Folder1_Folder2+1), "expected Wine\\Folder1\\Folder2, got %s\n", wine_dbgstr_w(bstr)); + SysFreeString(bstr); + ITaskFolder_Release(subfolder2); + ITaskFolder_Release(subfolder); hr = ITaskFolder_DeleteFolder(folder, Wine_Folder1_Folder2, 0);

1 0