May 2012 - Wine-Commits - list.winehq.org

Vincent Povirk : windowscodecs: Add wrapper functions for IWICFastMetadataEncoder.
by Alexandre Julliard May 9, 2012

May 9, 2012

Module: wine Branch: master Commit: 661e443ad7b550a71649d74e42bf3f6237ad4bdf URL: http://source.winehq.org/git/wine.git/?a=commit;h=661e443ad7b550a71649d74e4… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue May 8 10:20:23 2012 -0500 windowscodecs: Add wrapper functions for IWICFastMetadataEncoder. --- dlls/windowscodecs/proxy.c | 11 +++++++++++ dlls/windowscodecs/windowscodecs.spec | 4 ++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/proxy.c b/dlls/windowscodecs/proxy.c index 6494a37..4df14c7 100644 --- a/dlls/windowscodecs/proxy.c +++ b/dlls/windowscodecs/proxy.c @@ -36,6 +36,17 @@ WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); +HRESULT WINAPI IWICFastMetadataEncoder_Commit_Proxy_W(IWICFastMetadataEncoder *iface) +{ + return IWICFastMetadataEncoder_Commit(iface); +} + +HRESULT WINAPI IWICFastMetadataEncoder_GetMetadataQueryWriter_Proxy_W(IWICFastMetadataEncoder *iface, + IWICMetadataQueryWriter **ppIMetadataQueryWriter) +{ + return IWICFastMetadataEncoder_GetMetadataQueryWriter(iface, ppIMetadataQueryWriter); +} + HRESULT WINAPI IWICImagingFactory_CreateBitmapClipper_Proxy_W(IWICImagingFactory *pFactory, IWICBitmapClipper **ppIBitmapClipper) { diff --git a/dlls/windowscodecs/windowscodecs.spec b/dlls/windowscodecs/windowscodecs.spec index c239910..31b41d2 100644 --- a/dlls/windowscodecs/windowscodecs.spec +++ b/dlls/windowscodecs/windowscodecs.spec @@ -60,8 +60,8 @@ @ stub IWICComponentInfo_GetFriendlyName_Proxy @ stub IWICComponentInfo_GetSpecVersion_Proxy @ stub IWICComponentInfo_GetVersion_Proxy -@ stub IWICFastMetadataEncoder_Commit_Proxy -@ stub IWICFastMetadataEncoder_GetMetadataQueryWriter_Proxy +@ stdcall IWICFastMetadataEncoder_Commit_Proxy(ptr) IWICFastMetadataEncoder_Commit_Proxy_W +@ stdcall IWICFastMetadataEncoder_GetMetadataQueryWriter_Proxy(ptr ptr) IWICFastMetadataEncoder_GetMetadataQueryWriter_Proxy_W @ stub IWICFormatConverter_Initialize_Proxy @ stdcall IWICImagingFactory_CreateBitmapClipper_Proxy(ptr ptr) IWICImagingFactory_CreateBitmapClipper_Proxy_W @ stdcall IWICImagingFactory_CreateBitmapFlipRotator_Proxy(ptr ptr) IWICImagingFactory_CreateBitmapFlipRotator_Proxy_W

1 0

Vincent Povirk : windowscodecs: Implement WICCreateImagingFactory_Proxy.
by Alexandre Julliard May 9, 2012

May 9, 2012

Module: wine Branch: master Commit: bb2df245a76ce0d0f0631ad0890e19efa7a114c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb2df245a76ce0d0f0631ad08… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue May 8 09:43:23 2012 -0500 windowscodecs: Implement WICCreateImagingFactory_Proxy. --- dlls/windowscodecs/Makefile.in | 1 + dlls/windowscodecs/proxy.c | 44 +++++++++++++++++++++++++++++++++ dlls/windowscodecs/windowscodecs.spec | 2 +- 3 files changed, 46 insertions(+), 1 deletions(-) diff --git a/dlls/windowscodecs/Makefile.in b/dlls/windowscodecs/Makefile.in index bcb7a8a..28b5852 100644 --- a/dlls/windowscodecs/Makefile.in +++ b/dlls/windowscodecs/Makefile.in @@ -22,6 +22,7 @@ C_SRCS = \ palette.c \ pngformat.c \ propertybag.c \ + proxy.c \ regsvr.c \ stream.c \ tgaformat.c \ diff --git a/dlls/windowscodecs/proxy.c b/dlls/windowscodecs/proxy.c new file mode 100644 index 0000000..24c479a --- /dev/null +++ b/dlls/windowscodecs/proxy.c @@ -0,0 +1,44 @@ +/* + * Misleadingly named convenience functions for accessing WIC. + * + * Copyright 2012 Vincent Povirk for CodeWeavers + * + * 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 + */ + +#include "config.h" + +#include <stdarg.h> + +#define COBJMACROS +#define NONAMELESSUNION + +#include "windef.h" +#include "winbase.h" +#include "objbase.h" +#include "wincodec.h" + +#include "wincodecs_private.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); + +HRESULT WINAPI WICCreateImagingFactory_Proxy(UINT SDKVersion, IWICImagingFactory **ppIImagingFactory) +{ + TRACE("%x, %p\n", SDKVersion, ppIImagingFactory); + + return ImagingFactory_CreateInstance(NULL, &IID_IWICImagingFactory, (void**)ppIImagingFactory); +} diff --git a/dlls/windowscodecs/windowscodecs.spec b/dlls/windowscodecs/windowscodecs.spec index 71022cb..fac0f9d7 100644 --- a/dlls/windowscodecs/windowscodecs.spec +++ b/dlls/windowscodecs/windowscodecs.spec @@ -107,7 +107,7 @@ @ stdcall WICConvertBitmapSource(ptr ptr ptr) @ stub WICCreateBitmapFromSection @ stub WICCreateColorContext_Proxy -@ stub WICCreateImagingFactory_Proxy +@ stdcall WICCreateImagingFactory_Proxy(long ptr) @ stub WICGetMetadataContentSize @ stub WICMapGuidToShortName @ stub WICMapSchemaToName

1 0

Vincent Povirk : windowscodecs: Add wrapper functions for IWICImagingFactory methods.
by Alexandre Julliard May 9, 2012

May 9, 2012

Module: wine Branch: master Commit: b0e9548e3fe9c08d30913f0707ff12a9b7b37cc4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0e9548e3fe9c08d30913f070… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue May 8 10:10:35 2012 -0500 windowscodecs: Add wrapper functions for IWICImagingFactory methods. --- dlls/windowscodecs/proxy.c | 128 +++++++++++++++++++++++++++++++++ dlls/windowscodecs/windowscodecs.spec | 40 +++++----- 2 files changed, 148 insertions(+), 20 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b0e9548e3fe9c08d30913…

1 0

Eric Pouech : winedbg: Fix printing of fp registers for x86_64 CPU.
by Alexandre Julliard May 9, 2012

May 9, 2012

Module: wine Branch: master Commit: 721a3c910a74ba310e51a0325d738aa276624057 URL: http://source.winehq.org/git/wine.git/?a=commit;h=721a3c910a74ba310e51a0325… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue May 8 19:52:34 2012 +0200 winedbg: Fix printing of fp registers for x86_64 CPU. --- programs/winedbg/be_x86_64.c | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diff --git a/programs/winedbg/be_x86_64.c b/programs/winedbg/be_x86_64.c index 0dd11c2..dde30f3 100644 --- a/programs/winedbg/be_x86_64.c +++ b/programs/winedbg/be_x86_64.c @@ -70,6 +70,14 @@ static void be_x86_64_single_step(CONTEXT* ctx, unsigned enable) else ctx->EFlags &= ~STEP_FLAG; } +static inline long double m128a_to_longdouble(const M128A m) +{ + /* gcc uses the same IEEE-754 representation as M128A for long double + * but 16 byte aligned (hence only the first 10 bytes out of the 16 are used) + */ + return *(long double*)&m; +} + static void be_x86_64_print_context(HANDLE hThread, const CONTEXT* ctx, int all_regs) { @@ -144,16 +152,12 @@ static void be_x86_64_print_context(HANDLE hThread, const CONTEXT* ctx, for (i = 0; i < 4; i++) { - long double st; - memcpy(&st, &ctx->u.FltSave.FloatRegisters[i * 10], 10); - dbg_printf(" st%u:%-16Lg ", i, st); + dbg_printf(" st%u:%-16Lg ", i, m128a_to_longdouble(ctx->u.FltSave.FloatRegisters[i])); } dbg_printf("\n"); for (i = 4; i < 8; i++) { - long double st; - memcpy(&st, &ctx->u.FltSave.FloatRegisters[i * 10], 10); - dbg_printf(" st%u:%-16Lg ", i, st); + dbg_printf(" st%u:%-16Lg ", i, m128a_to_longdouble(ctx->u.FltSave.FloatRegisters[i])); } dbg_printf("\n");

1 0

Christian Costa : dmsynth: Create default clock for SynthSink object and assign it to Synth object when callink SetSynthSink .
by Alexandre Julliard May 8, 2012

May 8, 2012

Module: wine Branch: master Commit: 0ce9eb7ba5cc8c886cebd23fd29627c476ad649c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ce9eb7ba5cc8c886cebd23fd… Author: Christian Costa <titan.costa(a)gmail.com> Date: Thu May 3 23:05:33 2012 +0200 dmsynth: Create default clock for SynthSink object and assign it to Synth object when callink SetSynthSink. --- dlls/dmsynth/dmsynth_private.h | 1 + dlls/dmsynth/synth.c | 18 ++++++++++--- dlls/dmsynth/synthsink.c | 57 ++++++++++++++++++++++++++++++---------- dlls/dmsynth/tests/dmsynth.c | 18 +++++++----- 4 files changed, 69 insertions(+), 25 deletions(-) diff --git a/dlls/dmsynth/dmsynth_private.h b/dlls/dmsynth/dmsynth_private.h index 1cc24ac..aec547a 100644 --- a/dlls/dmsynth/dmsynth_private.h +++ b/dlls/dmsynth/dmsynth_private.h @@ -76,6 +76,7 @@ struct IDirectMusicSynthSinkImpl { LONG ref; /* IDirectMusicSynthSinkImpl fields */ + IReferenceClock* latency_clock; }; /********************************************************************** diff --git a/dlls/dmsynth/synth.c b/dlls/dmsynth/synth.c index 952bb62..aadb72f 100644 --- a/dlls/dmsynth/synth.c +++ b/dlls/dmsynth/synth.c @@ -64,6 +64,8 @@ static ULONG WINAPI IDirectMusicSynth8Impl_Release(LPDIRECTMUSICSYNTH8 iface) TRACE("(%p)->(ref before=%u)\n", This, refCount + 1); if (!refCount) { + if (This->pLatencyClock) + IReferenceClock_Release(This->pLatencyClock); HeapFree(GetProcessHeap(), 0, This); } @@ -160,9 +162,16 @@ static HRESULT WINAPI IDirectMusicSynth8Impl_GetLatencyClock(LPDIRECTMUSICSYNTH8 { IDirectMusicSynth8Impl *This = impl_from_IDirectMusicSynth8(iface); - TRACE("(%p)->(%p)\n", This, clock); + TRACE("(%p)->(%p)\n", iface, clock); + + if (!clock) + return E_POINTER; + + if (!This->pSynthSink) + return DMUS_E_NOSYNTHSINK; *clock = This->pLatencyClock; + IReferenceClock_AddRef(This->pLatencyClock); return S_OK; } @@ -182,10 +191,13 @@ static HRESULT WINAPI IDirectMusicSynth8Impl_SetSynthSink(LPDIRECTMUSICSYNTH8 if { IDirectMusicSynth8Impl *This = impl_from_IDirectMusicSynth8(iface); - TRACE("(%p)->(%p)\n", This, synth_sink); + TRACE("(%p)->(%p)\n", iface, synth_sink); This->pSynthSink = (IDirectMusicSynthSinkImpl*)synth_sink; + if (synth_sink) + return IDirectMusicSynthSink_GetLatencyClock(synth_sink, &This->pLatencyClock); + return S_OK; } @@ -337,8 +349,6 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicSynthImpl (LPCGUID lpcGUID, LPVOID* ppobj obj->pCaps.dwMaxAudioChannels = 2; obj->pCaps.dwEffectFlags = DMUS_EFFECT_REVERB; MultiByteToWideChar (CP_ACP, 0, "Microsoft Synthesizer", -1, obj->pCaps.wszDescription, sizeof(obj->pCaps.wszDescription)/sizeof(WCHAR)); - /* assign latency clock */ - /*DMUSIC_CreateReferenceClockImpl (&IID_IReferenceClock, (LPVOID*)&This->pLatencyClock, NULL); */ return IDirectMusicSynth8Impl_QueryInterface ((LPDIRECTMUSICSYNTH8)obj, lpcGUID, ppobj); } diff --git a/dlls/dmsynth/synthsink.c b/dlls/dmsynth/synthsink.c index 82ed894..268f6e8 100644 --- a/dlls/dmsynth/synthsink.c +++ b/dlls/dmsynth/synthsink.c @@ -19,6 +19,8 @@ */ #include "dmsynth_private.h" +#include "initguid.h" +#include "uuids.h" WINE_DEFAULT_DEBUG_CHANNEL(dmsynth); @@ -63,6 +65,8 @@ static ULONG WINAPI IDirectMusicSynthSinkImpl_Release(LPDIRECTMUSICSYNTHSINK ifa TRACE("(%p)->(ref before=%u)\n", This, refCount + 1); if (!refCount) { + if (This->latency_clock) + IReferenceClock_Release(This->latency_clock); HeapFree(GetProcessHeap(), 0, This); } @@ -94,7 +98,13 @@ static HRESULT WINAPI IDirectMusicSynthSinkImpl_GetLatencyClock(LPDIRECTMUSICSYN { IDirectMusicSynthSinkImpl *This = impl_from_IDirectMusicSynthSink(iface); - FIXME("(%p)->(%p): stub\n", This, clock); + TRACE("(%p)->(%p)\n", iface, clock); + + if (!clock) + return E_POINTER; + + *clock = This->latency_clock; + IReferenceClock_AddRef(This->latency_clock); return S_OK; } @@ -159,17 +169,36 @@ static const IDirectMusicSynthSinkVtbl DirectMusicSynthSink_Vtbl = { }; /* for ClassFactory */ -HRESULT WINAPI DMUSIC_CreateDirectMusicSynthSinkImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) { - IDirectMusicSynthSinkImpl *obj; - - TRACE("(%p,%p,%p)\n", lpcGUID, ppobj, pUnkOuter); - obj = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicSynthSinkImpl)); - if (NULL == obj) { - *ppobj = NULL; - return E_OUTOFMEMORY; - } - obj->IDirectMusicSynthSink_iface.lpVtbl = &DirectMusicSynthSink_Vtbl; - obj->ref = 0; - - return IDirectMusicSynthSinkImpl_QueryInterface((LPDIRECTMUSICSYNTHSINK)obj, lpcGUID, ppobj); +HRESULT WINAPI DMUSIC_CreateDirectMusicSynthSinkImpl(LPCGUID riid, LPVOID* ret_iface, LPUNKNOWN unkouter) +{ + IDirectMusicSynthSinkImpl *obj; + HRESULT hr; + + TRACE("(%p,%p,%p)\n", riid, ret_iface, unkouter); + + *ret_iface = NULL; + + obj = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicSynthSinkImpl)); + if (!obj) + return E_OUTOFMEMORY; + + obj->IDirectMusicSynthSink_iface.lpVtbl = &DirectMusicSynthSink_Vtbl; + obj->ref = 0; + + hr = CoCreateInstance(&CLSID_SystemClock, NULL, CLSCTX_INPROC_SERVER, &IID_IReferenceClock, (LPVOID*)&obj->latency_clock); + if (FAILED(hr)) + { + HeapFree(GetProcessHeap(), 0, obj); + return hr; + } + + hr = IDirectMusicSynthSinkImpl_QueryInterface((LPDIRECTMUSICSYNTHSINK)obj, riid, ret_iface); + if (FAILED(hr)) + { + IReferenceClock_Release(obj->latency_clock); + HeapFree(GetProcessHeap(), 0, obj); + return hr; + } + + return S_OK; } diff --git a/dlls/dmsynth/tests/dmsynth.c b/dlls/dmsynth/tests/dmsynth.c index 161018e..df67cd4 100644 --- a/dlls/dmsynth/tests/dmsynth.c +++ b/dlls/dmsynth/tests/dmsynth.c @@ -33,7 +33,7 @@ static void test_dmsynth(void) { IDirectMusicSynth *dmsynth = NULL; IDirectMusicSynthSink *dmsynth_sink = NULL; - IReferenceClock* clock = NULL; + IReferenceClock* clock_synth = NULL; IReferenceClock* clock_sink = NULL; HRESULT hr; @@ -48,24 +48,28 @@ static void test_dmsynth(void) ok(hr == S_OK, "CoCreateInstance returned: %x\n", hr); /* Synth has no default clock */ - hr = IDirectMusicSynth_GetLatencyClock(dmsynth, &clock); - todo_wine ok(hr == DMUS_E_NOSYNTHSINK, "IDirectMusicSynth_GetLatencyClock returned: %x\n", hr); + hr = IDirectMusicSynth_GetLatencyClock(dmsynth, &clock_synth); + ok(hr == DMUS_E_NOSYNTHSINK, "IDirectMusicSynth_GetLatencyClock returned: %x\n", hr); /* SynthSink has a default clock */ hr = IDirectMusicSynthSink_GetLatencyClock(dmsynth_sink, &clock_sink); ok(hr == S_OK, "IDirectMusicSynth_GetLatencyClock returned: %x\n", hr); - todo_wine ok(clock_sink != NULL, "No clock returned\n"); + ok(clock_sink != NULL, "No clock returned\n"); /* This will set clock to Synth */ hr = IDirectMusicSynth_SetSynthSink(dmsynth, dmsynth_sink); ok(hr == S_OK, "IDirectMusicSynth_SetSynthSink returned: %x\n", hr); /* Check clocks are the same */ - hr = IDirectMusicSynth_GetLatencyClock(dmsynth, &clock); + hr = IDirectMusicSynth_GetLatencyClock(dmsynth, &clock_synth); ok(hr == S_OK, "IDirectMusicSynth_GetLatencyClock returned: %x\n", hr); - todo_wine ok(clock != NULL, "No clock returned\n"); - ok(clock == clock_sink, "Synth and SynthSink clocks are not the same\n"); + ok(clock_synth != NULL, "No clock returned\n"); + ok(clock_synth == clock_sink, "Synth and SynthSink clocks are not the same\n"); + if (clock_synth) + IReferenceClock_Release(clock_synth); + if (clock_sink) + IReferenceClock_Release(clock_sink); if (dmsynth_sink) IDirectMusicSynthSink_Release(dmsynth_sink); IDirectMusicSynth_Release(dmsynth);

1 0

Matteo Bruni : d3dcompiler: Remove shader_type typedef.
by Alexandre Julliard May 8, 2012

May 8, 2012

Module: wine Branch: master Commit: 167612aea9a80fe661372d303ac4b61791aed086 URL: http://source.winehq.org/git/wine.git/?a=commit;h=167612aea9a80fe661372d303… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue May 8 16:17:29 2012 +0200 d3dcompiler: Remove shader_type typedef. --- dlls/d3dcompiler_43/d3dcompiler_private.h | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index 8c63dec..5e00d3e 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -44,11 +44,11 @@ const char *debug_d3dcompiler_d3d_blob_part(D3D_BLOB_PART part) DECLSPEC_HIDDEN; const char *debug_d3dcompiler_shader_variable_class(D3D_SHADER_VARIABLE_CLASS c) DECLSPEC_HIDDEN; const char *debug_d3dcompiler_shader_variable_type(D3D_SHADER_VARIABLE_TYPE t) DECLSPEC_HIDDEN; -/* Shader assembler definitions */ -typedef enum _shader_type { +enum shader_type +{ ST_VERTEX, ST_PIXEL, -} shader_type; +}; typedef enum BWRITER_COMPARISON_TYPE { BWRITER_COMPARISON_NONE, @@ -111,7 +111,7 @@ struct samplerdecl { #define INSTRARRAY_INITIAL_SIZE 8 struct bwriter_shader { - shader_type type; + enum shader_type type; /* Shader version selected */ DWORD version;

1 0

Matteo Bruni : d3dcompiler: Generalize message reporting function.
by Alexandre Julliard May 8, 2012

May 8, 2012

Module: wine Branch: master Commit: e2866d6fa1ed4937850d927eb245311690497bef URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2866d6fa1ed4937850d927eb… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue May 8 16:17:31 2012 +0200 d3dcompiler: Generalize message reporting function. --- dlls/d3dcompiler_43/asmshader.y | 65 ++++++++-------------------- dlls/d3dcompiler_43/d3dcompiler_private.h | 15 +++++-- dlls/d3dcompiler_43/utils.c | 43 +++++++++++++++++++ 3 files changed, 73 insertions(+), 50 deletions(-) diff --git a/dlls/d3dcompiler_43/asmshader.y b/dlls/d3dcompiler_43/asmshader.y index cf50bc9..5294fa9 100644 --- a/dlls/d3dcompiler_43/asmshader.y +++ b/dlls/d3dcompiler_43/asmshader.y @@ -26,49 +26,17 @@ #include "d3dcompiler_private.h" -#include <stdio.h> - WINE_DEFAULT_DEBUG_CHANNEL(asmshader); struct asm_parser asm_ctx; -/* Error reporting function */ -void asmparser_message(struct asm_parser *ctx, const char *fmt, ...) { +void asmparser_message(struct asm_parser *ctx, const char *fmt, ...) +{ va_list args; - char* newbuffer; - int rc, newsize; - - if(ctx->messagecapacity == 0) { - ctx->messages = asm_alloc(MESSAGEBUFFER_INITIAL_SIZE); - if(ctx->messages == NULL) { - ERR("Error allocating memory for parser messages\n"); - return; - } - ctx->messagecapacity = MESSAGEBUFFER_INITIAL_SIZE; - } - - while(1) { - va_start(args, fmt); - rc = vsnprintf(ctx->messages + ctx->messagesize, - ctx->messagecapacity - ctx->messagesize, fmt, args); - va_end(args); - if (rc < 0 || /* C89 */ - rc >= ctx->messagecapacity - ctx->messagesize) { /* C99 */ - /* Resize the buffer */ - newsize = ctx->messagecapacity * 2; - newbuffer = asm_realloc(ctx->messages, newsize); - if(newbuffer == NULL){ - ERR("Error reallocating memory for parser messages\n"); - return; - } - ctx->messages = newbuffer; - ctx->messagecapacity = newsize; - } else { - ctx->messagesize += rc; - return; - } - } + va_start(args, fmt); + compilation_message(&ctx->messages, fmt, args); + va_end(args); } static void asmshader_error(char const *s) { @@ -1704,32 +1672,37 @@ predicate: '(' REG_PREDICATE swizzle ')' %% -struct bwriter_shader *parse_asm_shader(char **messages) { +struct bwriter_shader *parse_asm_shader(char **messages) +{ struct bwriter_shader *ret = NULL; asm_ctx.shader = NULL; asm_ctx.status = PARSE_SUCCESS; - asm_ctx.messagesize = asm_ctx.messagecapacity = 0; + asm_ctx.messages.size = asm_ctx.messages.capacity = 0; asm_ctx.line_no = 1; asmshader_parse(); - if(asm_ctx.status != PARSE_ERR) ret = asm_ctx.shader; - else if(asm_ctx.shader) SlDeleteShader(asm_ctx.shader); + if (asm_ctx.status != PARSE_ERR) + ret = asm_ctx.shader; + else if (asm_ctx.shader) + SlDeleteShader(asm_ctx.shader); - if(messages) { - if(asm_ctx.messagesize) { + if (messages) + { + if (asm_ctx.messages.size) + { /* Shrink the buffer to the used size */ - *messages = asm_realloc(asm_ctx.messages, asm_ctx.messagesize + 1); + *messages = asm_realloc(asm_ctx.messages.string, asm_ctx.messages.size + 1); if(!*messages) { ERR("Out of memory, no messages reported\n"); - asm_free(asm_ctx.messages); + asm_free(asm_ctx.messages.string); } } else { *messages = NULL; } } else { - if(asm_ctx.messagecapacity) asm_free(asm_ctx.messages); + if(asm_ctx.messages.capacity) asm_free(asm_ctx.messages.string); } return ret; diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index 74ed379..c953e7f 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -216,7 +216,15 @@ enum parse_status PARSE_ERR = 2 }; -struct asm_parser { +struct compilation_messages +{ + char *string; + unsigned int size; + unsigned int capacity; +}; + +struct asm_parser +{ /* The function table of the parser implementation */ const struct asmparser_backend *funcs; @@ -225,9 +233,7 @@ struct asm_parser { unsigned int m3x3pad_count; enum parse_status status; - char *messages; - unsigned int messagesize; - unsigned int messagecapacity; + struct compilation_messages messages; unsigned int line_no; }; @@ -255,6 +261,7 @@ struct bwriter_shader *parse_asm_shader(char **messages) DECLSPEC_HIDDEN; #define PRINTF_ATTR(fmt,args) #endif +void compilation_message(struct compilation_messages *msg, const char *fmt, va_list args) DECLSPEC_HIDDEN; void asmparser_message(struct asm_parser *ctx, const char *fmt, ...) PRINTF_ATTR(2,3) DECLSPEC_HIDDEN; static inline void set_parse_status(enum parse_status *current, enum parse_status update) { diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index 94264e4..bc4f6fc 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -23,6 +23,8 @@ #include "config.h" #include "wine/port.h" +#include <stdio.h> + #include "d3dcompiler_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3dcompiler); @@ -715,3 +717,44 @@ HRESULT dxbc_write_blob(struct dxbc *dxbc, ID3DBlob **blob) return S_OK; } + +void compilation_message(struct compilation_messages *msg, const char *fmt, va_list args) +{ + char* buffer; + int rc, size; + + if (msg->capacity == 0) + { + msg->string = asm_alloc(MESSAGEBUFFER_INITIAL_SIZE); + if (msg->string == NULL) + { + ERR("Error allocating memory for parser messages\n"); + return; + } + msg->capacity = MESSAGEBUFFER_INITIAL_SIZE; + } + + while (1) + { + rc = vsnprintf(msg->string + msg->size, + msg->capacity - msg->size, fmt, args); + + if (rc < 0 || rc >= msg->capacity - msg->size) + { + size = msg->capacity * 2; + buffer = asm_realloc(msg->string, size); + if (buffer == NULL) + { + ERR("Error reallocating memory for parser messages\n"); + return; + } + msg->string = buffer; + msg->capacity = size; + } + else + { + msg->size += rc; + return; + } + } +}

1 0

Matteo Bruni : d3dcompiler: Rename asm_alloc/realloc/ free functions to more generic names.
by Alexandre Julliard May 8, 2012

May 8, 2012

Module: wine Branch: master Commit: 491d0e9d6b192bc4953f71e494eeede520518551 URL: http://source.winehq.org/git/wine.git/?a=commit;h=491d0e9d6b192bc4953f71e49… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue May 8 16:17:32 2012 +0200 d3dcompiler: Rename asm_alloc/realloc/free functions to more generic names. --- dlls/d3dcompiler_43/asmparser.c | 26 +++++----- dlls/d3dcompiler_43/asmshader.y | 20 +++++--- dlls/d3dcompiler_43/bytecodewriter.c | 84 ++++++++++++++-------------- dlls/d3dcompiler_43/d3dcompiler_private.h | 10 +++- dlls/d3dcompiler_43/utils.c | 4 +- 5 files changed, 77 insertions(+), 67 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=491d0e9d6b192bc4953f7…

1 0

Christian Costa : dmsynth: Add stubbed IKsControl interface to DirectMusicSynth object.
by Alexandre Julliard May 8, 2012

May 8, 2012

Module: wine Branch: master Commit: 1f3d99a2e4cb2a0c512744465a1b6bbd983f0c3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f3d99a2e4cb2a0c512744465… Author: Christian Costa <titan.costa(a)gmail.com> Date: Thu May 3 23:05:51 2012 +0200 dmsynth: Add stubbed IKsControl interface to DirectMusicSynth object. --- dlls/dmsynth/dmsynth_private.h | 18 +++++---- dlls/dmsynth/synth.c | 76 +++++++++++++++++++++++++++++++++++++++- dlls/dmsynth/tests/dmsynth.c | 2 +- 3 files changed, 86 insertions(+), 10 deletions(-) diff --git a/dlls/dmsynth/dmsynth_private.h b/dlls/dmsynth/dmsynth_private.h index aec547a..86606bb 100644 --- a/dlls/dmsynth/dmsynth_private.h +++ b/dlls/dmsynth/dmsynth_private.h @@ -39,6 +39,7 @@ #include "dmusici.h" #include "dmusicf.h" #include "dmusics.h" +#include "dmksctrl.h" /***************************************************************************** * Interfaces @@ -56,15 +57,16 @@ extern HRESULT WINAPI DMUSIC_CreateDirectMusicSynthSinkImpl (LPCGUID lpcGUID, LP * IDirectMusicSynth8Impl implementation structure */ struct IDirectMusicSynth8Impl { - /* IUnknown fields */ - IDirectMusicSynth8 IDirectMusicSynth8_iface; - LONG ref; - - /* IDirectMusicSynth8 fields */ - DMUS_PORTCAPS pCaps; - BOOL fActive; - IReferenceClock* pLatencyClock; - IDirectMusicSynthSinkImpl* pSynthSink; + /* IUnknown fields */ + IDirectMusicSynth8 IDirectMusicSynth8_iface; + IKsControl IKsControl_iface; + LONG ref; + + /* IDirectMusicSynth8 fields */ + DMUS_PORTCAPS pCaps; + BOOL fActive; + IReferenceClock* pLatencyClock; + IDirectMusicSynthSinkImpl* pSynthSink; }; /***************************************************************************** diff --git a/dlls/dmsynth/synth.c b/dlls/dmsynth/synth.c index aadb72f..9c088af 100644 --- a/dlls/dmsynth/synth.c +++ b/dlls/dmsynth/synth.c @@ -1,4 +1,5 @@ -/* IDirectMusicSynth8 Implementation +/* + * IDirectMusicSynth8 Implementation * * Copyright (C) 2003-2004 Rok Mandeljc * @@ -17,6 +18,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define COBJMACROS + +#include "objbase.h" +#include "initguid.h" +#include "dmksctrl.h" + #include "dmsynth_private.h" WINE_DEFAULT_DEBUG_CHANNEL(dmsynth); @@ -40,6 +47,12 @@ static HRESULT WINAPI IDirectMusicSynth8Impl_QueryInterface(LPDIRECTMUSICSYNTH8 *ppobj = This; return S_OK; } + else if (IsEqualIID(riid, &IID_IKsControl)) { + IUnknown_AddRef(iface); + *ppobj = &This->IKsControl_iface; + return S_OK; + } + WARN("(%p, %s, %p): not found\n", This, debugstr_dmguid(riid), ppobj); return E_NOINTERFACE; } @@ -324,6 +337,66 @@ static const IDirectMusicSynth8Vtbl DirectMusicSynth8_Vtbl = { IDirectMusicSynth8Impl_AssignChannelToBuses }; +static inline IDirectMusicSynth8Impl *impl_from_IKsControl(IKsControl *iface) +{ + return CONTAINING_RECORD(iface, IDirectMusicSynth8Impl, IKsControl_iface); +} + +static HRESULT WINAPI DMSynthImpl_IKsControl_QueryInterface(IKsControl* iface, REFIID riid, LPVOID *ppobj) +{ + IDirectMusicSynth8Impl *This = impl_from_IKsControl(iface); + + return IDirectMusicSynth8Impl_QueryInterface(&This->IDirectMusicSynth8_iface, riid, ppobj); +} + +static ULONG WINAPI DMSynthImpl_IKsControl_AddRef(IKsControl* iface) +{ + IDirectMusicSynth8Impl *This = impl_from_IKsControl(iface); + + return IDirectMusicSynth8Impl_AddRef(&This->IDirectMusicSynth8_iface); +} + +static ULONG WINAPI DMSynthImpl_IKsControl_Release(IKsControl* iface) +{ + IDirectMusicSynth8Impl *This = impl_from_IKsControl(iface); + + return IDirectMusicSynth8Impl_Release(&This->IDirectMusicSynth8_iface); +} + +static HRESULT WINAPI DMSynthImpl_IKsControl_KsProperty(IKsControl* iface, PKSPROPERTY Property, ULONG PropertyLength, LPVOID PropertyData, + ULONG DataLength, ULONG* BytesReturned) +{ + FIXME("(%p)->(%p, %u, %p, %u, %p): stub\n", iface, Property, PropertyLength, PropertyData, DataLength, BytesReturned); + + return E_NOTIMPL; +} + +static HRESULT WINAPI DMSynthImpl_IKsControl_KsMethod(IKsControl* iface, PKSMETHOD Method, ULONG MethodLength, LPVOID MethodData, + ULONG DataLength, ULONG* BytesReturned) +{ + FIXME("(%p)->(%p, %u, %p, %u, %p): stub\n", iface, Method, MethodLength, MethodData, DataLength, BytesReturned); + + return E_NOTIMPL; +} + +static HRESULT WINAPI DMSynthImpl_IKsControl_KsEvent(IKsControl* iface, PKSEVENT Event, ULONG EventLength, LPVOID EventData, + ULONG DataLength, ULONG* BytesReturned) +{ + FIXME("(%p)->(%p, %u, %p, %u, %p): stub\n", iface, Event, EventLength, EventData, DataLength, BytesReturned); + + return E_NOTIMPL; +} + + +static const IKsControlVtbl DMSynthImpl_IKsControl_Vtbl = { + DMSynthImpl_IKsControl_QueryInterface, + DMSynthImpl_IKsControl_AddRef, + DMSynthImpl_IKsControl_Release, + DMSynthImpl_IKsControl_KsProperty, + DMSynthImpl_IKsControl_KsMethod, + DMSynthImpl_IKsControl_KsEvent +}; + /* for ClassFactory */ HRESULT WINAPI DMUSIC_CreateDirectMusicSynthImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) { @@ -336,6 +409,7 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicSynthImpl (LPCGUID lpcGUID, LPVOID* ppobj return E_OUTOFMEMORY; } obj->IDirectMusicSynth8_iface.lpVtbl = &DirectMusicSynth8_Vtbl; + obj->IKsControl_iface.lpVtbl = &DMSynthImpl_IKsControl_Vtbl; obj->ref = 0; /* fill in caps */ obj->pCaps.dwSize = sizeof(DMUS_PORTCAPS); diff --git a/dlls/dmsynth/tests/dmsynth.c b/dlls/dmsynth/tests/dmsynth.c index 66da1fb..3a53900 100644 --- a/dlls/dmsynth/tests/dmsynth.c +++ b/dlls/dmsynth/tests/dmsynth.c @@ -51,7 +51,7 @@ static void test_dmsynth(void) ok(hr == S_OK, "CoCreateInstance returned: %x\n", hr); hr = IDirectMusicSynth_QueryInterface(dmsynth, &IID_IKsControl, (LPVOID*)&control_synth); - todo_wine ok(hr == S_OK, "IDirectMusicSynth_QueryInterface returned: %x\n", hr); + ok(hr == S_OK, "IDirectMusicSynth_QueryInterface returned: %x\n", hr); hr = IDirectMusicSynthSink_QueryInterface(dmsynth_sink, &IID_IKsControl, (LPVOID*)&control_sink); todo_wine ok(hr == S_OK, "IDirectMusicSynthSink_QueryInterface returned: %x\n", hr);

1 0

Christian Costa : dmsynth: Add tests for querying IKsControl for Synth and SynthSink objects.
by Alexandre Julliard May 8, 2012

May 8, 2012

Module: wine Branch: master Commit: 42d18a3279efc9eca9b4cf1c44cba665ae540f62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42d18a3279efc9eca9b4cf1c4… Author: Christian Costa <titan.costa(a)gmail.com> Date: Thu May 3 23:05:42 2012 +0200 dmsynth: Add tests for querying IKsControl for Synth and SynthSink objects. --- dlls/dmsynth/tests/dmsynth.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/dmsynth/tests/dmsynth.c b/dlls/dmsynth/tests/dmsynth.c index df67cd4..66da1fb 100644 --- a/dlls/dmsynth/tests/dmsynth.c +++ b/dlls/dmsynth/tests/dmsynth.c @@ -28,6 +28,7 @@ #include "initguid.h" #include "dmusics.h" #include "dmusici.h" +#include "dmksctrl.h" static void test_dmsynth(void) { @@ -35,6 +36,8 @@ static void test_dmsynth(void) IDirectMusicSynthSink *dmsynth_sink = NULL; IReferenceClock* clock_synth = NULL; IReferenceClock* clock_sink = NULL; + IKsControl* control_synth = NULL; + IKsControl* control_sink = NULL; HRESULT hr; hr = CoCreateInstance(&CLSID_DirectMusicSynth, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicSynth, (LPVOID*)&dmsynth); @@ -47,6 +50,11 @@ static void test_dmsynth(void) hr = CoCreateInstance(&CLSID_DirectMusicSynthSink, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicSynthSink, (LPVOID*)&dmsynth_sink); ok(hr == S_OK, "CoCreateInstance returned: %x\n", hr); + hr = IDirectMusicSynth_QueryInterface(dmsynth, &IID_IKsControl, (LPVOID*)&control_synth); + todo_wine ok(hr == S_OK, "IDirectMusicSynth_QueryInterface returned: %x\n", hr); + hr = IDirectMusicSynthSink_QueryInterface(dmsynth_sink, &IID_IKsControl, (LPVOID*)&control_sink); + todo_wine ok(hr == S_OK, "IDirectMusicSynthSink_QueryInterface returned: %x\n", hr); + /* Synth has no default clock */ hr = IDirectMusicSynth_GetLatencyClock(dmsynth, &clock_synth); ok(hr == DMUS_E_NOSYNTHSINK, "IDirectMusicSynth_GetLatencyClock returned: %x\n", hr); @@ -66,6 +74,10 @@ static void test_dmsynth(void) ok(clock_synth != NULL, "No clock returned\n"); ok(clock_synth == clock_sink, "Synth and SynthSink clocks are not the same\n"); + if (control_synth) + IDirectMusicSynth_Release(control_synth); + if (control_sink) + IDirectMusicSynth_Release(control_sink); if (clock_synth) IReferenceClock_Release(clock_synth); if (clock_sink)

1 0