September 2012 - Wine-Commits

Francois Gouget : jscript: Make jsval_variant() static.
by Alexandre Julliard Sept. 20, 2012

Sept. 20, 2012

Module: wine Branch: master Commit: d75a4ba17f93fcd8a4a76be8731d2aef97ef42c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d75a4ba17f93fcd8a4a76be87… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Sep 19 20:11:53 2012 +0200 jscript: Make jsval_variant() static. --- dlls/jscript/jsutils.c | 2 +- dlls/jscript/jsval.h | 1 - 2 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index c76d09a..2f5d19c 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -234,7 +234,7 @@ void jsval_release(jsval_t val) } } -HRESULT jsval_variant(jsval_t *val, VARIANT *var) +static HRESULT jsval_variant(jsval_t *val, VARIANT *var) { VARIANT *v; HRESULT hres; diff --git a/dlls/jscript/jsval.h b/dlls/jscript/jsval.h index 9909de7..d355b5e 100644 --- a/dlls/jscript/jsval.h +++ b/dlls/jscript/jsval.h @@ -243,7 +243,6 @@ static inline BOOL get_bool(jsval_t v) HRESULT variant_to_jsval(VARIANT*,jsval_t*) DECLSPEC_HIDDEN; HRESULT jsval_to_variant(jsval_t,VARIANT*) DECLSPEC_HIDDEN; void jsval_release(jsval_t) DECLSPEC_HIDDEN; -HRESULT jsval_variant(jsval_t*,VARIANT*) DECLSPEC_HIDDEN; HRESULT jsval_copy(jsval_t,jsval_t*) DECLSPEC_HIDDEN; #endif

1 0

Francois Gouget : kernel32: There is no need to zero-fill the FormatMessage () temporary buffer.
by Alexandre Julliard Sept. 20, 2012

Sept. 20, 2012

Module: wine Branch: master Commit: 5a4f3b478cfc6f91225ecfcfe4294df2e14b9b99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a4f3b478cfc6f91225ecfcfe… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Sep 19 20:37:38 2012 +0200 kernel32: There is no need to zero-fill the FormatMessage() temporary buffer. --- dlls/kernel32/format_msg.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/format_msg.c b/dlls/kernel32/format_msg.c index a3cbab9..101c2fa 100644 --- a/dlls/kernel32/format_msg.c +++ b/dlls/kernel32/format_msg.c @@ -272,7 +272,7 @@ static void format_add_char(struct _format_message_data *fmd, WCHAR c) { *fmd->t++ = c; if ((DWORD)(fmd->t - fmd->formatted) == fmd->size) { - fmd->formatted = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, fmd->formatted, (fmd->size * 2) * sizeof(WCHAR)); + fmd->formatted = HeapReAlloc(GetProcessHeap(), 0, fmd->formatted, (fmd->size * 2) * sizeof(WCHAR)); fmd->t = fmd->formatted + fmd->size; fmd->size *= 2; } @@ -290,7 +290,7 @@ static LPWSTR format_message( BOOL unicode_caller, DWORD dwFlags, LPCWSTR fmtstr BOOL eos = FALSE; fmd.size = 100; - fmd.formatted = fmd.t = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, fmd.size * sizeof(WCHAR) ); + fmd.formatted = fmd.t = HeapAlloc( GetProcessHeap(), 0, fmd.size * sizeof(WCHAR) ); f = fmtstr; while (*f && !eos) {

1 0

Francois Gouget : kernel32/tests: Add more FormatMessage() line wrapping tests.
by Alexandre Julliard Sept. 20, 2012

Sept. 20, 2012

Module: wine Branch: master Commit: a273cac7474a6da1eef199642e97dbbac2e5b0e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a273cac7474a6da1eef199642… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Sep 19 20:36:49 2012 +0200 kernel32/tests: Add more FormatMessage() line wrapping tests. --- dlls/kernel32/tests/format_msg.c | 73 +++++++++++++++++++++++++++++++++++--- 1 files changed, 68 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/tests/format_msg.c b/dlls/kernel32/tests/format_msg.c index 50e13f4..cf711f6 100644 --- a/dlls/kernel32/tests/format_msg.c +++ b/dlls/kernel32/tests/format_msg.c @@ -1015,12 +1015,75 @@ static void test_message_wrap(void) todo_wine ok(ret == 16, "Expected FormatMessageW to return 16, got %d\n", ret); todo_wine ok(!strcmp("short long\r\nline", out),"failed out=[%s]\n",out); + /* Wrap the very last word */ + ret = FormatMessageA(FORMAT_MESSAGE_FROM_STRING | 20, + "short long long line", 0, 0, out, sizeof(out), NULL); + todo_wine ok(ret == 21, "Expected FormatMessageW to return 21, got %d\n", ret); + todo_wine ok(!strcmp("short long long\r\nline", out),"failed out=[%s]\n",out); + /* Strictly less than 10 characters per line! */ ret = FormatMessageA(FORMAT_MESSAGE_FROM_STRING | 10, "short long line", 0, 0, out, sizeof(out), NULL); todo_wine ok(ret == 16, "Expected FormatMessageW to return 16, got %d\n", ret); todo_wine ok(!strcmp("short\r\nlong line", out),"failed out=[%s]\n",out); + /* Handling of duplicate spaces */ + ret = FormatMessageA(FORMAT_MESSAGE_FROM_STRING | 16, + "short long line", 0, 0, out, sizeof(out), NULL); + todo_wine ok(ret == 16, "Expected FormatMessageW to return 16, got %d\n", ret); + todo_wine ok(!strcmp("short long\r\nline", out),"failed out=[%s]\n",out); + + ret = FormatMessageA(FORMAT_MESSAGE_FROM_STRING | 16, + "short long wordlongerthanaline", 0, 0, out, sizeof(out), NULL); + ok(ret == 33, "Expected FormatMessageW to return 33, got %d\n", ret); + todo_wine ok(!strcmp("short long\r\nwordlongerthanal\r\nine", out),"failed out=[%s]\n",out); + + /* Breaking in the middle of spaces */ + ret = FormatMessageA(FORMAT_MESSAGE_FROM_STRING | 12, + "short long line", 0, 0, out, sizeof(out), NULL); + ok(ret == 18, "Expected FormatMessageW to return 18, got %d\n", ret); + todo_wine ok(!strcmp("short long\r\n line", out),"failed out=[%s]\n",out); + + ret = FormatMessageA(FORMAT_MESSAGE_FROM_STRING | 12, + "short long wordlongerthanaline", 0, 0, out, sizeof(out), NULL); + todo_wine ok(ret == 35, "Expected FormatMessageW to return 35, got %d\n", ret); + todo_wine ok(!strcmp("short long\r\n\r\nwordlongerth\r\nanaline", out),"failed out=[%s]\n",out); + + /* Handling of start-of-string spaces */ + ret = FormatMessageA(FORMAT_MESSAGE_FROM_STRING | 15, + " short line", 0, 0, out, sizeof(out), NULL); + ok(ret == 13, "Expected FormatMessageW to return 13, got %d\n", ret); + ok(!strcmp(" short line", out),"failed out=[%s]\n",out); + + ret = FormatMessageA(FORMAT_MESSAGE_FROM_STRING | 11, + " shortlong line", 0, 0, out, sizeof(out), NULL); + ok(ret == 17, "Expected FormatMessageW to return 17, got %d\n", ret); + todo_wine ok(!strcmp("\r\nshortlong\r\nline", out),"failed out=[%s]\n",out); + + /* Handling of start-of-line spaces */ + ret = FormatMessageA(FORMAT_MESSAGE_FROM_STRING | 11, + "l1%n shortlong line", 0, 0, out, sizeof(out), NULL); + ok(ret == 21, "Expected FormatMessageW to return 21, got %d\n", ret); + todo_wine ok(!strcmp("l1\r\n\r\nshortlong\r\nline", out),"failed out=[%s]\n",out); + + /* Pure space wrapping */ + ret = FormatMessageA(FORMAT_MESSAGE_FROM_STRING | 5, + " ", 0, 0, out, sizeof(out), NULL); + todo_wine ok(ret == 7, "Expected FormatMessageW to return 7, got %d\n", ret); + todo_wine ok(!strcmp("\r\n\r\n\r\n ", out),"failed out=[%s]\n",out); + + /* Handling of trailing spaces */ + ret = FormatMessageA(FORMAT_MESSAGE_FROM_STRING | 5, + "l1 ", 0, 0, out, sizeof(out), NULL); + todo_wine ok(ret == 10, "Expected FormatMessageW to return 10, got %d\n", ret); + todo_wine ok(!strcmp("l1\r\n\r\n\r\n ", out),"failed out=[%s]\n",out); + + /* Word that just fills the line */ + ret = FormatMessageA(FORMAT_MESSAGE_FROM_STRING | 8, + "shortlon", 0, 0, out, sizeof(out), NULL); + todo_wine ok(ret == 10, "Expected FormatMessageW to return 10, got %d\n", ret); + todo_wine ok(!strcmp("shortlon\r\n", out),"failed out=[%s]\n",out); + /* Word longer than the line */ ret = FormatMessageA(FORMAT_MESSAGE_FROM_STRING | 8, "shortlongline", 0, 0, out, sizeof(out), NULL); @@ -1039,11 +1102,11 @@ static void test_message_wrap(void) todo_wine ok(ret == 16, "Expected FormatMessageW to return 16, got %d\n", ret); todo_wine ok(!strcmp("short long\r\nline", out),"failed out=[%s]\n",out); - /* '%n's are converted into line feeds */ - ret = FormatMessageA(FORMAT_MESSAGE_FROM_STRING | 11, - "short%n%nlong line", 0, 0, out, sizeof(out), NULL); - ok(ret == 18, "Expected FormatMessageW to return 18, got %d\n", ret); - ok(!strcmp("short\r\n\r\nlong line", out),"failed out=[%s]\n",out); + /* Wrap even before a '%n' */ + ret = FormatMessageA(FORMAT_MESSAGE_FROM_STRING | 8, + "shortlon%n", 0, 0, out, sizeof(out), NULL); + todo_wine ok(ret == 12, "Expected FormatMessageW to return 12, got %d\n", ret); + todo_wine ok(!strcmp("shortlon\r\n\r\n", out),"failed out=[%s]\n",out); /* '%n's count as starting a new line and combine with line wrapping */ ret = FormatMessageA(FORMAT_MESSAGE_FROM_STRING | 10,

1 0

Henri Verbeet : wined3d: Merge the glsl_vshader_private and glsl_pshader_private structures.
by Alexandre Julliard Sept. 20, 2012

Sept. 20, 2012

Module: wine Branch: master Commit: 00cdf1aaf1cdd65673984c48198eb97284a95297 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00cdf1aaf1cdd65673984c481… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 19 21:50:23 2012 +0200 wined3d: Merge the glsl_vshader_private and glsl_pshader_private structures. --- dlls/wined3d/glsl_shader.c | 155 ++++++++++++++++++++------------------------ 1 files changed, 70 insertions(+), 85 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=00cdf1aaf1cdd65673984…

1 0

Henri Verbeet : d3d10core: Add a missing return to d3d10_device_CreateGeometryShader().
by Alexandre Julliard Sept. 20, 2012

Sept. 20, 2012

Module: wine Branch: master Commit: 2f350a5a2d90f13596c3aafeff32e4f9fe43749c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f350a5a2d90f13596c3aafef… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 19 21:50:19 2012 +0200 d3d10core: Add a missing return to d3d10_device_CreateGeometryShader(). --- dlls/d3d10core/device.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index b6c29f4..00a34a9 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -947,6 +947,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateGeometryShader(ID3D10Device { WARN("Failed to initialize geometry shader, hr %#x.\n", hr); HeapFree(GetProcessHeap(), 0, object); + return hr; } TRACE("Created geometry shader %p.\n", object);

1 0

Christian Costa : dmusic: Implement SynthPortImpl_IDirectMusicPort_PlayBuffer.
by Alexandre Julliard Sept. 20, 2012

Sept. 20, 2012

Module: wine Branch: master Commit: b8aadbfbd9d1d50de9c606ccd0dabf11f5666173 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8aadbfbd9d1d50de9c606ccd… Author: Christian Costa <titan.costa(a)gmail.com> Date: Thu Sep 20 00:17:20 2012 +0200 dmusic: Implement SynthPortImpl_IDirectMusicPort_PlayBuffer. --- dlls/dmusic/port.c | 22 ++++++++++++++++++++-- 1 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/dmusic/port.c b/dlls/dmusic/port.c index a611641..5a7776a 100644 --- a/dlls/dmusic/port.c +++ b/dlls/dmusic/port.c @@ -104,10 +104,28 @@ static ULONG WINAPI SynthPortImpl_IDirectMusicPort_Release(LPDIRECTMUSICPORT ifa static HRESULT WINAPI SynthPortImpl_IDirectMusicPort_PlayBuffer(LPDIRECTMUSICPORT iface, LPDIRECTMUSICBUFFER buffer) { SynthPortImpl *This = impl_from_SynthPortImpl_IDirectMusicPort(iface); + HRESULT hr; + REFERENCE_TIME time; + LPBYTE data; + DWORD size; - FIXME("(%p/%p)->(%p): stub\n", iface, This, buffer); + TRACE("(%p/%p)->(%p)\n", iface, This, buffer); - return S_OK; + if (!buffer) + return E_POINTER; + + hr = IDirectMusicBuffer_GetStartTime(buffer, &time); + + if (SUCCEEDED(hr)) + hr = IDirectMusicBuffer_GetRawBufferPtr(buffer, &data); + + if (SUCCEEDED(hr)) + hr = IDirectMusicBuffer_GetUsedBytes(buffer, &size); + + if (SUCCEEDED(hr)) + hr = IDirectMusicSynth_PlayBuffer(This->synth, time, data, size); + + return hr; } static HRESULT WINAPI SynthPortImpl_IDirectMusicPort_SetReadNotificationHandle(LPDIRECTMUSICPORT iface, HANDLE event)

1 0

Francois Gouget : wined3d: Remove an unwanted trailing '\n' in shader_dump_register().
by Alexandre Julliard Sept. 20, 2012

Sept. 20, 2012

Module: wine Branch: master Commit: ea61d59651a7bf7109c8b2efdd448b0564b2950e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea61d59651a7bf7109c8b2efd… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Sep 19 20:43:15 2012 +0200 wined3d: Remove an unwanted trailing '\n' in shader_dump_register(). --- dlls/wined3d/shader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 3e309a6..bcff6b1 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1037,7 +1037,7 @@ static void shader_dump_register(const struct wined3d_shader_register *reg, reg->immconst_data[2], reg->immconst_data[3]); break; default: - TRACE("<unhandled data type %#x>\n", reg->data_type); + TRACE("<unhandled data type %#x>", reg->data_type); break; } break;

1 0

Henri Verbeet : wined3d: wined3d_device_get_scissor_rect() never fails.
by Alexandre Julliard Sept. 20, 2012

Sept. 20, 2012

Module: wine Branch: master Commit: de1ae1eb8a39b08944378bce89a567a34207776b URL: http://source.winehq.org/git/wine.git/?a=commit;h=de1ae1eb8a39b08944378bce8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 19 21:50:22 2012 +0200 wined3d: wined3d_device_get_scissor_rect() never fails. --- dlls/d3d9/device.c | 5 ++--- dlls/wined3d/device.c | 4 +--- include/wine/wined3d.h | 2 +- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 40bc169..06988f7 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1878,15 +1878,14 @@ static HRESULT WINAPI d3d9_device_SetScissorRect(IDirect3DDevice9Ex *iface, cons static HRESULT WINAPI d3d9_device_GetScissorRect(IDirect3DDevice9Ex *iface, RECT *rect) { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); - HRESULT hr; TRACE("iface %p, rect %p.\n", iface, rect); wined3d_mutex_lock(); - hr = wined3d_device_get_scissor_rect(device->wined3d_device, rect); + wined3d_device_get_scissor_rect(device->wined3d_device, rect); wined3d_mutex_unlock(); - return hr; + return D3D_OK; } static HRESULT WINAPI d3d9_device_SetSoftwareVertexProcessing(IDirect3DDevice9Ex *iface, BOOL software) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 6d85ff5..9daeb60 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2403,14 +2403,12 @@ void CDECL wined3d_device_set_scissor_rect(struct wined3d_device *device, const device_invalidate_state(device, STATE_SCISSORRECT); } -HRESULT CDECL wined3d_device_get_scissor_rect(const struct wined3d_device *device, RECT *rect) +void CDECL wined3d_device_get_scissor_rect(const struct wined3d_device *device, RECT *rect) { TRACE("device %p, rect %p.\n", device, rect); *rect = device->updateStateBlock->state.scissor_rect; TRACE("Returning rect %s.\n", wine_dbgstr_rect(rect)); - - return WINED3D_OK; } HRESULT CDECL wined3d_device_set_vertex_declaration(struct wined3d_device *device, diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index af88163..0d84adc 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2147,7 +2147,7 @@ HRESULT __cdecl wined3d_device_get_render_target(const struct wined3d_device *de UINT render_target_idx, struct wined3d_surface **render_target); DWORD __cdecl wined3d_device_get_sampler_state(const struct wined3d_device *device, UINT sampler_idx, enum wined3d_sampler_state state); -HRESULT __cdecl wined3d_device_get_scissor_rect(const struct wined3d_device *device, RECT *rect); +void __cdecl wined3d_device_get_scissor_rect(const struct wined3d_device *device, RECT *rect); BOOL __cdecl wined3d_device_get_software_vertex_processing(const struct wined3d_device *device); HRESULT __cdecl wined3d_device_get_stream_source(const struct wined3d_device *device, UINT stream_idx, struct wined3d_buffer **buffer, UINT *offset, UINT *stride);

1 0

Christian Costa : dmusic: Setup and free all DirectMusicSynth objects when creating and releasing Synth port .
by Alexandre Julliard Sept. 20, 2012

Sept. 20, 2012

Module: wine Branch: master Commit: b177ceff1e44084860c0f9a0d60b8ea751108946 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b177ceff1e44084860c0f9a0d… Author: Christian Costa <titan.costa(a)gmail.com> Date: Thu Sep 20 00:17:11 2012 +0200 dmusic: Setup and free all DirectMusicSynth objects when creating and releasing Synth port. --- dlls/dmusic/dmusic_private.h | 2 + dlls/dmusic/port.c | 49 ++++++++++++++++++++++++++++++++++++------ 2 files changed, 44 insertions(+), 7 deletions(-) diff --git a/dlls/dmusic/dmusic_private.h b/dlls/dmusic/dmusic_private.h index 4ef946f..3e625d6 100644 --- a/dlls/dmusic/dmusic_private.h +++ b/dlls/dmusic/dmusic_private.h @@ -160,6 +160,8 @@ struct SynthPortImpl { /* IDirectMusicPort fields */ IDirectSound* pDirectSound; IReferenceClock* pLatencyClock; + IDirectMusicSynth* synth; + IDirectMusicSynthSink* synth_sink; BOOL fActive; DMUS_PORTCAPS caps; DMUS_PORTPARAMS params; diff --git a/dlls/dmusic/port.c b/dlls/dmusic/port.c index ea5f6fd..a611641 100644 --- a/dlls/dmusic/port.c +++ b/dlls/dmusic/port.c @@ -2,6 +2,7 @@ * IDirectMusicPort Implementation * * Copyright (C) 2003-2004 Rok Mandeljc + * Copyright (C) 2012 Christian Costa * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -85,7 +86,14 @@ static ULONG WINAPI SynthPortImpl_IDirectMusicPort_Release(LPDIRECTMUSICPORT ifa TRACE("(%p)->(): new ref = %u\n", This, ref); if (!ref) + { + IDirectMusicSynth_Activate(This->synth, FALSE); + IDirectMusicSynth_Close(This->synth); + IDirectMusicSynth_Release(This->synth); + IDirectMusicSynthSink_Release(This->synth_sink); + IReferenceClock_Release(This->pLatencyClock); HeapFree(GetProcessHeap(), 0, This); + } DMUSIC_UnlockModule(); @@ -480,11 +488,11 @@ HRESULT DMUSIC_CreateSynthPortImpl(LPCGUID guid, LPVOID *object, LPUNKNOWN unkou TRACE("(%p,%p,%p,%p,%p%d)\n", guid, object, unkouter, port_params, port_caps, device); + *object = NULL; + obj = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(SynthPortImpl)); - if (!obj) { - *object = NULL; + if (!obj) return E_OUTOFMEMORY; - } obj->IDirectMusicPort_iface.lpVtbl = &SynthPortImpl_DirectMusicPort_Vtbl; obj->IDirectMusicPortDownload_iface.lpVtbl = &SynthPortImpl_DirectMusicPortDownload_Vtbl; @@ -493,16 +501,32 @@ HRESULT DMUSIC_CreateSynthPortImpl(LPCGUID guid, LPVOID *object, LPUNKNOWN unkou obj->fActive = FALSE; obj->params = *port_params; obj->caps = *port_caps; - obj->pDirectSound = NULL; - obj->pLatencyClock = NULL; + hr = DMUSIC_CreateReferenceClockImpl(&IID_IReferenceClock, (LPVOID*)&obj->pLatencyClock, NULL); if (hr != S_OK) { HeapFree(GetProcessHeap(), 0, obj); - *object = NULL; return hr; } + if (SUCCEEDED(hr)) + hr = CoCreateInstance(&CLSID_DirectMusicSynth, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicSynth, (void**)&obj->synth); + + if (SUCCEEDED(hr)) + hr = CoCreateInstance(&CLSID_DirectMusicSynthSink, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicSynthSink, (void**)&obj->synth_sink); + + if (SUCCEEDED(hr)) + hr = IDirectMusicSynth_SetMasterClock(obj->synth, obj->pLatencyClock); + + if (SUCCEEDED(hr)) + hr = IDirectMusicSynthSink_SetMasterClock(obj->synth_sink, obj->pLatencyClock); + + if (SUCCEEDED(hr)) + hr = IDirectMusicSynth_SetSynthSink(obj->synth, obj->synth_sink); + + if (SUCCEEDED(hr)) + hr = IDirectMusicSynth_Open(obj->synth, port_params); + if (0) { if (port_params->dwValidParams & DMUS_PORTPARAMS_CHANNELGROUPS) { @@ -530,7 +554,18 @@ HRESULT DMUSIC_CreateSynthPortImpl(LPCGUID guid, LPVOID *object, LPUNKNOWN unkou } } - return IDirectMusicPort_QueryInterface((LPDIRECTMUSICPORT)obj, guid, object); + if (SUCCEEDED(hr)) + return IDirectMusicPort_QueryInterface((LPDIRECTMUSICPORT)obj, guid, object); + + if (obj->synth) + IDirectMusicSynth_Release(obj->synth); + if (obj->synth_sink) + IDirectMusicSynthSink_Release(obj->synth_sink); + if (obj->pLatencyClock) + IReferenceClock_Release(obj->pLatencyClock); + HeapFree(GetProcessHeap(), 0, obj); + + return hr; } HRESULT DMUSIC_CreateMidiOutPortImpl(LPCGUID guid, LPVOID *object, LPUNKNOWN unkouter, LPDMUS_PORTPARAMS port_params, LPDMUS_PORTCAPS port_caps, DWORD device)

1 0

Francois Gouget : d3dcompiler_43: Remove an unwanted trailing '\n' in debug_dump_instr().
by Alexandre Julliard Sept. 20, 2012

Sept. 20, 2012

Module: wine Branch: master Commit: 0c9ee6663f650ffe6d071292d67421dc383c6f1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c9ee6663f650ffe6d071292d… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Sep 19 20:50:13 2012 +0200 d3dcompiler_43: Remove an unwanted trailing '\n' in debug_dump_instr(). --- dlls/d3dcompiler_43/utils.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index e0cac23..84443ae 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -2161,7 +2161,7 @@ static void debug_dump_instr(const struct hlsl_ir_node *instr) debug_dump_ir_if(if_from_node(instr)); break; default: - TRACE("No dump function for %s\n", debug_node_type(instr->type)); + TRACE("<No dump function for %s>", debug_node_type(instr->type)); } }

1 0