March 2012 - Wine-commits - list.winehq.org

Jacek Caban : vbscript: Init destination before passing it to VariantCopy in add_dynamic_var.
by Alexandre Julliard 26 Mar '12

26 Mar '12

Module: wine Branch: master Commit: 434700bf6b57bfabc86af20bc9a3f430ed84e36a URL: http://source.winehq.org/git/wine.git/?a=commit;h=434700bf6b57bfabc86af20bc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 26 11:52:47 2012 +0200 vbscript: Init destination before passing it to VariantCopy in add_dynamic_var. --- dlls/vbscript/interp.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index df30e0e..82e3724 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -229,6 +229,7 @@ static HRESULT add_dynamic_var(exec_ctx_t *ctx, const WCHAR *name, BOOL is_const if(own_val) { new_var->v = *val; }else { + V_VT(&new_var->v) = VT_EMPTY; hres = VariantCopy(&new_var->v, val); if(FAILED(hres)) return hres;

1 0

Francois Gouget : winapi: Add support for the arm architecture.
by Alexandre Julliard 26 Mar '12

26 Mar '12

Module: wine Branch: master Commit: 2c23697ccdaa1b9a8106ab5f0a5b6f969f24b6fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c23697ccdaa1b9a8106ab5f0… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Mar 17 10:17:08 2012 +0100 winapi: Add support for the arm architecture. --- tools/winapi/winapi.pm | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/winapi/winapi.pm b/tools/winapi/winapi.pm index 4a8d101..04d52a1 100644 --- a/tools/winapi/winapi.pm +++ b/tools/winapi/winapi.pm @@ -279,7 +279,7 @@ sub parse_spec_file($$) { } my $ordinal; - my $ARCHES="alpha|i386|powerpc|sparc|win32|win64|x86_64"; + my $ARCHES="alpha|arm|i386|powerpc|sparc|win32|win64|x86_64"; if(/^(\d+|@)\s+ (cdecl|pascal|stdcall|varargs|thiscall)\s+ ((?:(?:-arch=(?:$ARCHES)(?:,(?:$ARCHES))*|-noname|-norelay|-ordinal|-i386|-ret16|-ret64|-register|-interrupt|-private)\s+)*)(\S+)\s*$\s*(.*?)\s*$\s*(\S*)$/x)

1 0

André Hentschel : msvcrt: Fix a typo.
by Alexandre Julliard 26 Mar '12

26 Mar '12

Module: wine Branch: master Commit: 36217c208f6f15de023871a9648d3ace3b8e403b URL: http://source.winehq.org/git/wine.git/?a=commit;h=36217c208f6f15de023871a96… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Mar 18 19:19:01 2012 +0100 msvcrt: Fix a typo. --- dlls/msvcrt/printf.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/printf.h b/dlls/msvcrt/printf.h index b1cb53f..a60ba74 100644 --- a/dlls/msvcrt/printf.h +++ b/dlls/msvcrt/printf.h @@ -510,7 +510,7 @@ int FUNC_NAME(pf_printf)(FUNC_NAME(puts_clbk) pf_puts, void *puts_ctx, const API APICHAR *tmp = buf; int max_len; - /* 0 padding is added after '0x' in Alternate flag is in use */ + /* 0 padding is added after '0x' if Alternate flag is in use */ if((flags.Format=='x' || flags.Format=='X') && flags.PadZero && flags.Alternate && !flags.LeftAlign && flags.Precision<flags.FieldLength-2) flags.Precision = flags.FieldLength - 2;

1 0

André Hentschel : msi: Allow ARM installations.
by Alexandre Julliard 26 Mar '12

26 Mar '12

Module: wine Branch: master Commit: c000cbaf496f1bfdc493bfea4fc88079d2d1c34e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c000cbaf496f1bfdc493bfea4… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Mar 18 19:26:50 2012 +0100 msi: Allow ARM installations. --- dlls/msi/msipriv.h | 4 +++- dlls/msi/package.c | 8 ++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 0591050..cd16baf 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -338,7 +338,8 @@ enum platform { PLATFORM_INTEL, PLATFORM_INTEL64, - PLATFORM_X64 + PLATFORM_X64, + PLATFORM_ARM }; enum clr_version @@ -1148,6 +1149,7 @@ static const WCHAR szIntel[] = {'I','n','t','e','l',0}; static const WCHAR szIntel64[] = {'I','n','t','e','l','6','4',0}; static const WCHAR szX64[] = {'x','6','4',0}; static const WCHAR szAMD64[] = {'A','M','D','6','4',0}; +static const WCHAR szARM[] = {'A','r','m',0}; static const WCHAR szWow6432NodeCLSID[] = {'W','o','w','6','4','3','2','N','o','d','e','\\','C','L','S','I','D',0}; static const WCHAR szWow6432Node[] = {'W','o','w','6','4','3','2','N','o','d','e',0}; static const WCHAR szStreams[] = {'_','S','t','r','e','a','m','s',0}; diff --git a/dlls/msi/package.c b/dlls/msi/package.c index dd11374..25d00b4 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -1297,6 +1297,8 @@ static UINT msi_parse_summary( MSISUMMARYINFO *si, MSIPACKAGE *package ) package->platform = PLATFORM_INTEL64; else if (!strcmpW( template, szX64 ) || !strcmpW( template, szAMD64 )) package->platform = PLATFORM_X64; + else if (!strcmpW( template, szARM )) + package->platform = PLATFORM_ARM; else { WARN("unknown platform %s\n", debugstr_w(template)); @@ -1341,9 +1343,11 @@ static UINT validate_package( MSIPACKAGE *package ) UINT i; if (package->platform == PLATFORM_INTEL64) - { return ERROR_INSTALL_PLATFORM_UNSUPPORTED; - } +#ifndef __arm__ + if (package->platform == PLATFORM_ARM) + return ERROR_INSTALL_PLATFORM_UNSUPPORTED; +#endif IsWow64Process( GetCurrentProcess(), &is_wow64 ); if (package->platform == PLATFORM_X64) {

1 0

Michael Stefaniuc : hlink: Use the standard COM aggregation struct field names.
by Alexandre Julliard 26 Mar '12

26 Mar '12

Module: wine Branch: master Commit: 04305e7f381ca0eda21400c346b5e69da089befa URL: http://source.winehq.org/git/wine.git/?a=commit;h=04305e7f381ca0eda21400c34… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Mar 19 00:29:07 2012 +0100 hlink: Use the standard COM aggregation struct field names. --- dlls/hlink/extserv.c | 40 ++++++++++++++++++++-------------------- 1 files changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/hlink/extserv.c b/dlls/hlink/extserv.c index 7f1d565..670bac2 100644 --- a/dlls/hlink/extserv.c +++ b/dlls/hlink/extserv.c @@ -24,13 +24,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(hlink); typedef struct { - IUnknown IUnknown_iface; + IUnknown IUnknown_inner; IAuthenticate IAuthenticate_iface; IHttpNegotiate IHttpNegotiate_iface; IExtensionServices IExtensionServices_iface; + IUnknown *outer_unk; LONG ref; - IUnknown *outer; HWND hwnd; LPWSTR username; @@ -40,7 +40,7 @@ typedef struct { static inline ExtensionService *impl_from_IUnknown(IUnknown *iface) { - return CONTAINING_RECORD(iface, ExtensionService, IUnknown_iface); + return CONTAINING_RECORD(iface, ExtensionService, IUnknown_inner); } static HRESULT WINAPI ExtServUnk_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) @@ -51,7 +51,7 @@ static HRESULT WINAPI ExtServUnk_QueryInterface(IUnknown *iface, REFIID riid, vo if(IsEqualGUID(&IID_IUnknown, riid)) { TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); - *ppv = &This->IUnknown_iface; + *ppv = &This->IUnknown_inner; }else if(IsEqualGUID(&IID_IAuthenticate, riid)) { TRACE("(%p)->(IID_IAuthenticate %p)\n", This, ppv); *ppv = &This->IAuthenticate_iface; @@ -113,19 +113,19 @@ static inline ExtensionService *impl_from_IAuthenticate(IAuthenticate *iface) static HRESULT WINAPI Authenticate_QueryInterface(IAuthenticate *iface, REFIID riid, void **ppv) { ExtensionService *This = impl_from_IAuthenticate(iface); - return IUnknown_QueryInterface(This->outer, riid, ppv); + return IUnknown_QueryInterface(This->outer_unk, riid, ppv); } static ULONG WINAPI Authenticate_AddRef(IAuthenticate *iface) { ExtensionService *This = impl_from_IAuthenticate(iface); - return IUnknown_AddRef(This->outer); + return IUnknown_AddRef(This->outer_unk); } static ULONG WINAPI Authenticate_Release(IAuthenticate *iface) { ExtensionService *This = impl_from_IAuthenticate(iface); - return IUnknown_Release(This->outer); + return IUnknown_Release(This->outer_unk); } static HRESULT WINAPI Authenticate_Authenticate(IAuthenticate *iface, @@ -160,19 +160,19 @@ static inline ExtensionService *impl_from_IHttpNegotiate(IHttpNegotiate *iface) static HRESULT WINAPI HttpNegotiate_QueryInterface(IHttpNegotiate *iface, REFIID riid, void **ppv) { ExtensionService *This = impl_from_IHttpNegotiate(iface); - return IUnknown_QueryInterface(This->outer, riid, ppv); + return IUnknown_QueryInterface(This->outer_unk, riid, ppv); } static ULONG WINAPI HttpNegotiate_AddRef(IHttpNegotiate *iface) { ExtensionService *This = impl_from_IHttpNegotiate(iface); - return IUnknown_AddRef(This->outer); + return IUnknown_AddRef(This->outer_unk); } static ULONG WINAPI HttpNegotiate_Release(IHttpNegotiate *iface) { ExtensionService *This = impl_from_IHttpNegotiate(iface); - return IUnknown_Release(This->outer); + return IUnknown_Release(This->outer_unk); } static HRESULT WINAPI HttpNegotiate_BeginningTransaction(IHttpNegotiate *iface, @@ -218,19 +218,19 @@ static inline ExtensionService *impl_from_IExtensionServices(IExtensionServices static HRESULT WINAPI ExtServ_QueryInterface(IExtensionServices *iface, REFIID riid, void **ppv) { ExtensionService *This = impl_from_IExtensionServices(iface); - return IUnknown_QueryInterface(This->outer, riid, ppv); + return IUnknown_QueryInterface(This->outer_unk, riid, ppv); } static ULONG WINAPI ExtServ_AddRef(IExtensionServices *iface) { ExtensionService *This = impl_from_IExtensionServices(iface); - return IUnknown_AddRef(This->outer); + return IUnknown_AddRef(This->outer_unk); } static ULONG WINAPI ExtServ_Release(IExtensionServices *iface) { ExtensionService *This = impl_from_IExtensionServices(iface); - return IUnknown_Release(This->outer); + return IUnknown_Release(This->outer_unk); } static HRESULT ExtServ_ImplSetAdditionalHeaders(ExtensionService* This, LPCWSTR pwzAdditionalHeaders) @@ -311,7 +311,7 @@ HRESULT WINAPI HlinkCreateExtensionServices(LPCWSTR pwzAdditionalHeaders, ret = heap_alloc(sizeof(*ret)); - ret->IUnknown_iface.lpVtbl = &ExtServUnkVtbl; + ret->IUnknown_inner.lpVtbl = &ExtServUnkVtbl; ret->IAuthenticate_iface.lpVtbl = &AuthenticateVtbl; ret->IHttpNegotiate_iface.lpVtbl = &HttpNegotiateVtbl; ret->IExtensionServices_iface.lpVtbl = &ExtServVtbl; @@ -325,14 +325,14 @@ HRESULT WINAPI HlinkCreateExtensionServices(LPCWSTR pwzAdditionalHeaders, ExtServ_ImplSetAdditionalHeaders(ret, pwzAdditionalHeaders); if(!punkOuter) { - ret->outer = &ret->IUnknown_iface; - hres = IUnknown_QueryInterface(&ret->IUnknown_iface, riid, ppv); - IUnknown_Release(&ret->IUnknown_iface); + ret->outer_unk = &ret->IUnknown_inner; + hres = IUnknown_QueryInterface(&ret->IUnknown_inner, riid, ppv); + IUnknown_Release(&ret->IUnknown_inner); }else if(IsEqualGUID(&IID_IUnknown, riid)) { - ret->outer = punkOuter; - *ppv = &ret->IUnknown_iface; + ret->outer_unk = punkOuter; + *ppv = &ret->IUnknown_inner; }else { - IUnknown_Release(&ret->IUnknown_iface); + IUnknown_Release(&ret->IUnknown_inner); hres = E_INVALIDARG; }

1 0

Alessandro Pignotti : atl: Send OLE_CLOSE command to control on detach.
by Alexandre Julliard 26 Mar '12

26 Mar '12

Module: wine Branch: master Commit: aaf99d8ef050d957a0fe37fd556016f087c607bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=aaf99d8ef050d957a0fe37fd5… Author: Alessandro Pignotti <a.pignotti(a)sssup.it> Date: Mon Feb 13 12:12:17 2012 +0100 atl: Send OLE_CLOSE command to control on detach. --- dlls/atl/atl_ax.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/atl/atl_ax.c b/dlls/atl/atl_ax.c index c1b74f7..3b0abea5 100644 --- a/dlls/atl/atl_ax.c +++ b/dlls/atl/atl_ax.c @@ -800,6 +800,7 @@ static HRESULT IOCS_Detach( IOCS *This ) /* remove subclassing */ IOleObject *control = This->control; This->control = NULL; + IOleObject_Close( control, OLECLOSE_NOSAVE ); IOleObject_SetClientSite( control, NULL ); IOleObject_Release( control ); }

1 0

Andrew Eikum : dmusic: Return more accurate error codes in IDirectMusicSegment::Load.
by Alexandre Julliard 26 Mar '12

26 Mar '12

Module: wine Branch: master Commit: 760a318882ece7ace80d3c5d61eb3295d36c0852 URL: http://source.winehq.org/git/wine.git/?a=commit;h=760a318882ece7ace80d3c5d6… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Mar 19 07:35:10 2012 -0500 dmusic: Return more accurate error codes in IDirectMusicSegment::Load. --- dlls/dmime/segment.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c index 82ea753..6dd5e02 100644 --- a/dlls/dmime/segment.c +++ b/dlls/dmime/segment.c @@ -1204,7 +1204,11 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_IPersistStream_Load (LPPERSISTSTR LARGE_INTEGER liMove; /* used when skipping chunks */ TRACE("(%p, %p): Loading\n", This, pStm); - IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL); + hr = IStream_Read (pStm, &Chunk, sizeof(Chunk), NULL); + if(hr != S_OK){ + WARN("IStream_Read failed: %08x\n", hr); + return DMUS_E_UNSUPPORTED_STREAM; + } TRACE_(dmfile)(": %s chunk (size = %d)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); switch (Chunk.fccID) { case FOURCC_RIFF: { @@ -1246,7 +1250,7 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_IPersistStream_Load (LPPERSISTSTR TRACE_(dmfile)(": unexpected chunk (loading failed)\n"); liMove.QuadPart = StreamSize; IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL); /* skip the rest of the chunk */ - return E_FAIL; + return DMUS_E_UNSUPPORTED_STREAM; } } TRACE_(dmfile)(": reading finished\n"); @@ -1254,9 +1258,7 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_IPersistStream_Load (LPPERSISTSTR } default: { TRACE_(dmfile)(": unexpected chunk; loading failed)\n"); - liMove.QuadPart = Chunk.dwSize; - IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL); /* skip the rest of the chunk */ - return E_FAIL; + return DMUS_E_UNSUPPORTED_STREAM; } }

1 0

Andrew Eikum : dmloader: Don't claim partial success when loading fails.
by Alexandre Julliard 26 Mar '12

26 Mar '12

Module: wine Branch: master Commit: 5e522a1d1c7c84a4c89f67770ff391f05662d35b URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e522a1d1c7c84a4c89f67770… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Mar 19 07:35:17 2012 -0500 dmloader: Don't claim partial success when loading fails. --- dlls/dmloader/loader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dmloader/loader.c b/dlls/dmloader/loader.c index 868f4e0..1c25435 100644 --- a/dlls/dmloader/loader.c +++ b/dlls/dmloader/loader.c @@ -304,7 +304,7 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_IDirectMusicLoader_GetObject (LPDIR result = IPersistStream_Load (pPersistStream, pStream); if (result != S_OK) { WARN(": failed to (completely) load object (%s)\n", debugstr_dmreturn(result)); - ret = DMUS_S_PARTIALLOAD /*result*/; + return result; } /* get descriptor */ DM_STRUCT_INIT(&GotDesc);

1 0

Andrew Eikum : dmloader: Add simple playing test.
by Alexandre Julliard 26 Mar '12

26 Mar '12

Module: wine Branch: master Commit: b235edb01423c169db85ca024754a564d5aebae6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b235edb01423c169db85ca024… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Mar 19 07:35:22 2012 -0500 dmloader: Add simple playing test. --- dlls/dmloader/tests/loader.c | 91 ++++++++++++++++++++++++++++++++++++++---- 1 files changed, 83 insertions(+), 8 deletions(-) diff --git a/dlls/dmloader/tests/loader.c b/dlls/dmloader/tests/loader.c index 18e86e4..ea5edca 100644 --- a/dlls/dmloader/tests/loader.c +++ b/dlls/dmloader/tests/loader.c @@ -22,34 +22,109 @@ #include "dmusici.h" #include "wine/test.h" +static unsigned char mp3file[] = "\xFF\xFB\x92\x04"; /* MP3 header */ +static unsigned char rifffile[8+4+8+16+8+256] = "RIFF\x24\x01\x00\x00WAVE" /* header: 4 ("WAVE") + (8 + 16) (format segment) + (8 + 256) (data segment) = 0x124 */ + "fmt \x10\x00\x00\x00\x01\x00\x20\x00\xAC\x44\x00\x00\x10\xB1\x02\x00\x04\x00\x10\x00" /* format segment: PCM, 2 chan, 44100 Hz, 16 bits */ + "data\x00\x01\x00\x00"; /* 256 byte data segment (silence) */ + static void test_release_object(void) { HRESULT hr; IDirectMusicLoader8* loader = NULL; - hr = CoInitialize(NULL); + hr = CoCreateInstance(&CLSID_DirectMusicLoader, NULL, CLSCTX_INPROC, &IID_IDirectMusicLoader8, (void**)&loader); if ( FAILED(hr) ) { - skip("CoInitialize failed.\n"); + skip("CoCreateInstance failed.\n"); return; } - hr = CoCreateInstance(&CLSID_DirectMusicLoader, NULL, CLSCTX_INPROC, &IID_IDirectMusicLoader8, (void**)&loader); + hr = IDirectMusicLoader_ReleaseObject(loader, NULL); + ok(hr == E_POINTER, "Expected E_POINTER, received %#x\n", hr); + + IDirectMusicLoader_Release(loader); +} + +static void test_simple_playing(void) +{ + IDirectMusic *music = NULL; + IDirectMusicLoader8 *loader; + IDirectMusicPerformance8 *perf; + IDirectMusicAudioPath8 *path = NULL; + IDirectMusicSegment8 *segment = NULL; + IDirectMusicSegmentState *state = NULL; + IDirectSound *dsound = NULL; + DMUS_OBJECTDESC desc = {0}; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_DirectMusicPerformance, NULL, + CLSCTX_INPROC_SERVER, &IID_IDirectMusicPerformance8, + (void**)&perf); if ( FAILED(hr) ) { skip("CoCreateInstance failed.\n"); - CoUninitialize(); return; } - hr = IDirectMusicLoader_ReleaseObject(loader, NULL); - ok(hr == E_POINTER, "Expected E_POINTER, received %#x\n", hr); + hr = CoCreateInstance(&CLSID_DirectMusicLoader, NULL, + CLSCTX_INPROC_SERVER, &IID_IDirectMusicLoader8, + (void**)&loader); + ok(hr == S_OK, "Couldn't create Loader %08x\n", hr); - IDirectMusicLoader_Release(loader); - CoUninitialize(); + hr = IDirectMusicPerformance8_InitAudio(perf, &music, &dsound, NULL, + DMUS_APATH_DYNAMIC_STEREO, 64, DMUS_AUDIOF_ALL, NULL); + ok(hr == S_OK, "InitAudio failed: %08x\n", hr); + ok(music != NULL, "Didn't get IDirectMusic pointer\n"); + ok(dsound != NULL, "Didn't get IDirectSound pointer\n"); + + hr = IDirectMusicPerformance8_CreateStandardAudioPath(perf, + DMUS_APATH_DYNAMIC_STEREO, 64, TRUE, &path); + ok(hr == S_OK, "CreateStandardAudioPath failed: %08x\n", hr); + ok(path != NULL, "Didn't get IDirectMusicAudioPath pointer\n"); + + desc.dwSize = sizeof(DMUS_OBJECTDESC); + desc.dwValidData = DMUS_OBJ_CLASS | DMUS_OBJ_MEMORY; + desc.guidClass = CLSID_DirectMusicSegment; + desc.pbMemData = mp3file; + desc.llMemLength = sizeof(mp3file); + hr = IDirectMusicLoader8_GetObject(loader, &desc, &IID_IDirectMusicSegment8, + (void**)&segment); + ok(hr == DMUS_E_UNSUPPORTED_STREAM, "GetObject gave wrong error: %08x\n", hr); + ok(segment == NULL, "Didn't get NULL IDirectMusicSegment pointer\n"); + + desc.pbMemData = rifffile; + desc.llMemLength = sizeof(rifffile); + hr = IDirectMusicLoader8_GetObject(loader, &desc, &IID_IDirectMusicSegment8, + (void**)&segment); + ok(hr == S_OK, "GetObject failed: %08x\n", hr); + ok(segment != NULL, "Didn't get IDirectMusicSegment pointer\n"); + + hr = IDirectMusicSegment8_Download(segment, (IUnknown*)path); + ok(hr == S_OK, "Download failed: %08x\n", hr); + + hr = IDirectMusicSegment8_SetRepeats(segment, 1); + ok(hr == S_OK, "SetRepeats failed: %08x\n", hr); + + hr = IDirectMusicPerformance8_PlaySegmentEx(perf, (IUnknown*)segment, + NULL, NULL, DMUS_SEGF_SECONDARY, 0, &state, NULL, (IUnknown*)path); + ok(hr == S_OK, "PlaySegmentEx failed: %08x\n", hr); + ok(state != NULL, "Didn't get IDirectMusicSegmentState pointer\n"); + + hr = IDirectMusicPerformance8_CloseDown(perf); + ok(hr == S_OK, "CloseDown failed: %08x\n", hr); + + IDirectSound_Release(dsound); + IDirectMusicSegmentState_Release(state); + IDirectMusicSegment8_Release(segment); + IDirectMusic_Release(music); + IDirectMusicPerformance8_Release(perf); + IDirectMusicLoader8_Release(loader); } START_TEST(loader) { + CoInitialize(NULL); test_release_object(); + test_simple_playing(); + CoUninitialize(); }

1 0

Thomas Faber : xmllite/tests: Fix build with MSVC.
by Alexandre Julliard 26 Mar '12

26 Mar '12

Module: wine Branch: master Commit: 4cd00f2b5ed377575678ebbee85e1f649e0f860f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4cd00f2b5ed377575678ebbee… Author: Thomas Faber <thfabba(a)gmx.de> Date: Mon Mar 19 17:01:19 2012 +0100 xmllite/tests: Fix build with MSVC. --- dlls/xmllite/tests/reader.c | 4 ++-- dlls/xmllite/tests/writer.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index ec47453..1f1b2ec 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -33,8 +33,8 @@ DEFINE_GUID(IID_IXmlReaderInput, 0x0b3ccc9b, 0x9214, 0x428b, 0xa2, 0xae, 0xef, 0x3a, 0xa8, 0x71, 0xaf, 0xda); -static HRESULT WINAPI (*pCreateXmlReader)(REFIID riid, void **ppvObject, IMalloc *pMalloc); -static HRESULT WINAPI (*pCreateXmlReaderInputWithEncodingName)(IUnknown *stream, +static HRESULT (WINAPI *pCreateXmlReader)(REFIID riid, void **ppvObject, IMalloc *pMalloc); +static HRESULT (WINAPI *pCreateXmlReaderInputWithEncodingName)(IUnknown *stream, IMalloc *pMalloc, LPCWSTR encoding, BOOL hint, diff --git a/dlls/xmllite/tests/writer.c b/dlls/xmllite/tests/writer.c index e98db7b..af4e1a8 100644 --- a/dlls/xmllite/tests/writer.c +++ b/dlls/xmllite/tests/writer.c @@ -28,7 +28,7 @@ #include "xmllite.h" #include "wine/test.h" -static HRESULT WINAPI (*pCreateXmlWriter)(REFIID riid, void **ppvObject, IMalloc *pMalloc); +static HRESULT (WINAPI *pCreateXmlWriter)(REFIID riid, void **ppvObject, IMalloc *pMalloc); static void test_writer_create(void) {

1 0