September 2012 - Wine-commits

Francois Gouget : kernel32: There is no need to zero-fill the FormatMessage () temporary buffer.
by Alexandre Julliard 20 Sep '12

20 Sep '12

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 : wined3d: Remove an unwanted trailing '\n' in shader_dump_register().
by Alexandre Julliard 20 Sep '12

20 Sep '12

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

Francois Gouget : jscript: Make jsval_variant() static.
by Alexandre Julliard 20 Sep '12

20 Sep '12

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 : d3dcompiler_43: Make add_type_to_scope() static.
by Alexandre Julliard 20 Sep '12

20 Sep '12

Module: wine Branch: master Commit: e4ca67f7aaa9ea3a68812fba56889479c122fabc URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4ca67f7aaa9ea3a68812fba5… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Sep 19 20:12:17 2012 +0200 d3dcompiler_43: Make add_type_to_scope() static. --- dlls/d3dcompiler_43/hlsl.y | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index 5670586..eea49be 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -186,7 +186,7 @@ static BOOL check_type_modifiers(DWORD modifiers, struct source_location *loc) return TRUE; } -BOOL add_type_to_scope(struct hlsl_scope *scope, struct hlsl_type *def) +static BOOL add_type_to_scope(struct hlsl_scope *scope, struct hlsl_type *def) { if (get_type(scope, def->name, FALSE)) return FALSE;

1 0

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

20 Sep '12

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

Christian Costa : dmusic: Setup and free all DirectMusicSynth objects when creating and releasing Synth port .
by Alexandre Julliard 20 Sep '12

20 Sep '12

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

Christian Costa : dmusic: Implement SynthPortImpl_IDirectMusicPort_PlayBuffer.
by Alexandre Julliard 20 Sep '12

20 Sep '12

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

Christian Costa : dmusic: Add comments to Synth port vtables.
by Alexandre Julliard 20 Sep '12

20 Sep '12

Module: wine Branch: master Commit: 57e6d416d6390b46ac5cef09948465ebd95398e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57e6d416d6390b46ac5cef099… Author: Christian Costa <titan.costa(a)gmail.com> Date: Thu Sep 20 00:17:28 2012 +0200 dmusic: Add comments to Synth port vtables. --- dlls/dmusic/port.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/dmusic/port.c b/dlls/dmusic/port.c index 5a7776a..bc9c3e7 100644 --- a/dlls/dmusic/port.c +++ b/dlls/dmusic/port.c @@ -332,9 +332,11 @@ static HRESULT WINAPI SynthPortImpl_IDirectMusicPort_GetFormat(LPDIRECTMUSICPORT } static const IDirectMusicPortVtbl SynthPortImpl_DirectMusicPort_Vtbl = { + /**** IDirectMusicPort IUnknown part methods ***/ SynthPortImpl_IDirectMusicPort_QueryInterface, SynthPortImpl_IDirectMusicPort_AddRef, SynthPortImpl_IDirectMusicPort_Release, + /**** IDirectMusicPort methods ***/ SynthPortImpl_IDirectMusicPort_PlayBuffer, SynthPortImpl_IDirectMusicPort_SetReadNotificationHandle, SynthPortImpl_IDirectMusicPort_Read, @@ -441,9 +443,11 @@ static HRESULT WINAPI SynthPortImpl_IDirectMusicPortDownload_Unload(LPDIRECTMUSI } static const IDirectMusicPortDownloadVtbl SynthPortImpl_DirectMusicPortDownload_Vtbl = { + /*** IDirectMusicPortDownload IUnknown part methods ***/ SynthPortImpl_IDirectMusicPortDownload_QueryInterface, SynthPortImpl_IDirectMusicPortDownload_AddRef, SynthPortImpl_IDirectMusicPortDownload_Release, + /*** IDirectMusicPortDownload methods ***/ SynthPortImpl_IDirectMusicPortDownload_GetBuffer, SynthPortImpl_IDirectMusicPortDownload_AllocateBuffer, SynthPortImpl_IDirectMusicPortDownload_GetDLId, @@ -492,9 +496,11 @@ static HRESULT WINAPI SynthPortImpl_IDirectMusicThru_ThruChannel(LPDIRECTMUSICTH } static const IDirectMusicThruVtbl SynthPortImpl_DirectMusicThru_Vtbl = { + /*** IDirectMusicThru IUnknown part methods */ SynthPortImpl_IDirectMusicThru_QueryInterface, SynthPortImpl_IDirectMusicThru_AddRef, SynthPortImpl_IDirectMusicThru_Release, + /*** IDirectMusicThru methods ***/ SynthPortImpl_IDirectMusicThru_ThruChannel };

1 0

Matteo Bruni : d3dcompiler: Parse "if/else" statement.
by Alexandre Julliard 20 Sep '12

20 Sep '12

Module: wine Branch: master Commit: 79c6ce0a0ff295e40d2e627111c2734dcf96a155 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79c6ce0a0ff295e40d2e62711… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Sep 19 19:46:11 2012 +0200 d3dcompiler: Parse "if/else" statement. --- dlls/d3dcompiler_43/d3dcompiler_private.h | 21 +++++++++++ dlls/d3dcompiler_43/hlsl.y | 40 ++++++++++++++++++++++ dlls/d3dcompiler_43/utils.c | 52 ++++++++++++++++++++++------ 3 files changed, 102 insertions(+), 11 deletions(-) diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index eb75448..5171abe 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -706,6 +706,7 @@ enum hlsl_ir_node_type HLSL_IR_DEREF, HLSL_IR_EXPR, HLSL_IR_FUNCTION_DECL, + HLSL_IR_IF, HLSL_IR_JUMP, HLSL_IR_SWIZZLE, }; @@ -755,6 +756,14 @@ struct hlsl_ir_function_decl struct list *body; }; +struct hlsl_ir_if +{ + struct hlsl_ir_node node; + struct hlsl_ir_node *condition; + struct list *then_instrs; + struct list *else_instrs; +}; + struct hlsl_ir_assignment { struct hlsl_ir_node node; @@ -939,6 +948,12 @@ struct parse_variable_def struct list *initializer; }; +struct parse_if_body +{ + struct list *then_instrs; + struct list *else_instrs; +}; + enum parse_unary_op { UNARY_OP_PLUS, @@ -1043,6 +1058,12 @@ static inline struct hlsl_ir_constructor *constructor_from_node(const struct hls return CONTAINING_RECORD(node, struct hlsl_ir_constructor, node); } +static inline struct hlsl_ir_if *if_from_node(const struct hlsl_ir_node *node) +{ + assert(node->type == HLSL_IR_IF); + return CONTAINING_RECORD(node, struct hlsl_ir_if, node); +} + BOOL add_declaration(struct hlsl_scope *scope, struct hlsl_ir_var *decl, BOOL local_var) DECLSPEC_HIDDEN; struct hlsl_ir_var *get_variable(struct hlsl_scope *scope, const char *name) DECLSPEC_HIDDEN; void free_declaration(struct hlsl_ir_var *decl) DECLSPEC_HIDDEN; diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index 75b5741..97a1d62 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -358,6 +358,7 @@ static struct hlsl_ir_swizzle *get_swizzle(struct hlsl_ir_node *value, const cha %locations %error-verbose +%expect 1 %union { @@ -373,6 +374,7 @@ static struct hlsl_ir_swizzle *get_swizzle(struct hlsl_ir_node *value, const cha struct hlsl_ir_function_decl *function; struct parse_parameter parameter; struct parse_variable_def *variable_def; + struct parse_if_body if_body; enum parse_unary_op unary_op; enum parse_assign_op assign_op; } @@ -498,12 +500,14 @@ static struct hlsl_ir_swizzle *get_swizzle(struct hlsl_ir_node *value, const cha %type <list> statement_list %type <list> compound_statement %type <list> jump_statement +%type <list> selection_statement %type <function> func_declaration %type <function> func_prototype %type <parameter> parameter %type <name> semantic %type <variable_def> variable_def %type <list> variables_def +%type <if_body> if_body %type <instr> primary_expr %type <instr> postfix_expr %type <instr> unary_expr @@ -994,6 +998,7 @@ statement: declaration_statement | expr_statement | compound_statement | jump_statement + | selection_statement /* FIXME: add rule for return with no value */ jump_statement: KW_RETURN expr ';' @@ -1019,6 +1024,41 @@ jump_statement: KW_RETURN expr ';' list_add_tail($$, &jump->node.entry); } +selection_statement: KW_IF '(' expr ')' if_body + { + struct hlsl_ir_if *instr = d3dcompiler_alloc(sizeof(*instr)); + if (!instr) + { + ERR("Out of memory\n"); + return -1; + } + instr->node.type = HLSL_IR_IF; + set_location(&instr->node.loc, &@1); + instr->condition = $3; + instr->then_instrs = $5.then_instrs; + instr->else_instrs = $5.else_instrs; + if ($3->data_type->dimx > 1 || $3->data_type->dimy > 1) + { + hlsl_report_message(instr->node.loc.file, instr->node.loc.line, + instr->node.loc.col, HLSL_LEVEL_ERROR, + "if condition requires a scalar"); + } + $$ = d3dcompiler_alloc(sizeof(*$$)); + list_init($$); + list_add_head($$, &instr->node.entry); + } + +if_body: statement + { + $$.then_instrs = $1; + $$.else_instrs = NULL; + } + | statement KW_ELSE statement + { + $$.then_instrs = $1; + $$.else_instrs = $3; + } + expr_statement: ';' { $$ = d3dcompiler_alloc(sizeof(*$$)); diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index e0d351c..05f769c 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -1742,6 +1742,7 @@ static const char *debug_node_type(enum hlsl_ir_node_type type) "HLSL_IR_DEREF", "HLSL_IR_EXPR", "HLSL_IR_FUNCTION_DECL", + "HLSL_IR_IF", "HLSL_IR_JUMP", "HLSL_IR_SWIZZLE", }; @@ -1753,6 +1754,17 @@ static const char *debug_node_type(enum hlsl_ir_node_type type) static void debug_dump_instr(const struct hlsl_ir_node *instr); +static void debug_dump_instr_list(const struct list *list) +{ + struct hlsl_ir_node *instr; + + LIST_FOR_EACH_ENTRY(instr, list, struct hlsl_ir_node, entry) + { + debug_dump_instr(instr); + TRACE("\n"); + } +} + static void debug_dump_ir_var(const struct hlsl_ir_var *var) { if (var->modifiers) @@ -1997,6 +2009,21 @@ static void debug_dump_ir_jump(const struct hlsl_ir_jump *jump) } } +static void debug_dump_ir_if(const struct hlsl_ir_if *if_node) +{ + TRACE("if ("); + debug_dump_instr(if_node->condition); + TRACE(")\n{\n"); + debug_dump_instr_list(if_node->then_instrs); + TRACE("}\n"); + if (if_node->else_instrs) + { + TRACE("else\n{\n"); + debug_dump_instr_list(if_node->else_instrs); + TRACE("}\n"); + } +} + static void debug_dump_instr(const struct hlsl_ir_node *instr) { switch (instr->type) @@ -2022,22 +2049,14 @@ static void debug_dump_instr(const struct hlsl_ir_node *instr) case HLSL_IR_JUMP: debug_dump_ir_jump(jump_from_node(instr)); break; + case HLSL_IR_IF: + debug_dump_ir_if(if_from_node(instr)); + break; default: TRACE("No dump function for %s\n", debug_node_type(instr->type)); } } -static void debug_dump_instr_list(const struct list *list) -{ - struct hlsl_ir_node *instr; - - LIST_FOR_EACH_ENTRY(instr, list, struct hlsl_ir_node, entry) - { - debug_dump_instr(instr); - TRACE("\n"); - } -} - void debug_dump_ir_function(const struct hlsl_ir_function_decl *func) { struct hlsl_ir_var *param; @@ -2159,6 +2178,14 @@ static void free_ir_assignment(struct hlsl_ir_assignment *assignment) d3dcompiler_free(assignment); } +static void free_ir_if(struct hlsl_ir_if *if_node) +{ + free_instr(if_node->condition); + free_instr_list(if_node->then_instrs); + free_instr_list(if_node->else_instrs); + d3dcompiler_free(if_node); +} + static void free_ir_jump(struct hlsl_ir_jump *jump) { if (jump->type == HLSL_IR_JUMP_RETURN) @@ -2191,6 +2218,9 @@ void free_instr(struct hlsl_ir_node *node) case HLSL_IR_ASSIGNMENT: free_ir_assignment(assignment_from_node(node)); break; + case HLSL_IR_IF: + free_ir_if(if_from_node(node)); + break; case HLSL_IR_JUMP: free_ir_jump(jump_from_node(node)); break;

1 0

Matteo Bruni : d3dcompiler: Store data types in a RB tree for faster search .
by Alexandre Julliard 20 Sep '12

20 Sep '12

Module: wine Branch: master Commit: 8f60f8f34bf633004ddff60907eb8b90a451d17b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f60f8f34bf633004ddff6090… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Sep 19 19:46:12 2012 +0200 d3dcompiler: Store data types in a RB tree for faster search. --- dlls/d3dcompiler_43/d3dcompiler_private.h | 4 +- dlls/d3dcompiler_43/hlsl.y | 3 +- dlls/d3dcompiler_43/utils.c | 54 +++++++++++++++++++++++++---- 3 files changed, 51 insertions(+), 10 deletions(-) diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index 5171abe..fffb6c6 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -662,7 +662,7 @@ enum hlsl_matrix_majority struct hlsl_type { struct list entry; - struct list scope_entry; + struct wine_rb_entry scope_entry; enum hlsl_type_class type; enum hlsl_base_type base_type; enum hlsl_sampler_dim sampler_dim; @@ -924,7 +924,7 @@ struct hlsl_scope { struct list entry; struct list vars; - struct list types; + struct wine_rb_tree types; struct hlsl_scope *upper; }; diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index 97a1d62..486c9a8 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -180,7 +180,7 @@ BOOL add_type_to_scope(struct hlsl_scope *scope, struct hlsl_type *def) if (get_type(scope, def->name, FALSE)) return FALSE; - list_add_tail(&scope->types, &def->scope_entry); + wine_rb_put(&scope->types, def->name, &def->scope_entry); return TRUE; } @@ -1658,6 +1658,7 @@ struct bwriter_shader *parse_hlsl(enum shader_type type, DWORD major, DWORD mino { free_declaration(var); } + wine_rb_destroy(&scope->types, NULL, NULL); d3dcompiler_free(scope); } diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index 05f769c..8aaa675 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -860,13 +860,10 @@ struct hlsl_type *new_array_type(struct hlsl_type *basic_type, unsigned int arra struct hlsl_type *get_type(struct hlsl_scope *scope, const char *name, BOOL recursive) { - struct hlsl_type *type; + struct wine_rb_entry *entry = wine_rb_get(&scope->types, name); + if (entry) + return WINE_RB_ENTRY_VALUE(entry, struct hlsl_type, scope_entry); - LIST_FOR_EACH_ENTRY(type, &scope->types, struct hlsl_type, scope_entry) - { - if (strcmp(type->name, name) == 0) - return type; - } if (recursive && scope->upper) return get_type(scope->upper, name, recursive); return NULL; @@ -1599,6 +1596,44 @@ struct hlsl_ir_node *make_assignment(struct hlsl_ir_node *left, enum parse_assig return &assign->node; } +int compare_hlsl_types_rb(const void *key, const struct wine_rb_entry *entry) +{ + const char *name = (const char *)key; + const struct hlsl_type *type = WINE_RB_ENTRY_VALUE(entry, const struct hlsl_type, scope_entry); + + if (name == type->name) + return 0; + + if (!name || !type->name) + { + ERR("hlsl_type without a name in a scope?\n"); + return -1; + } + return strcmp(name, type->name); +} + +static inline void *d3dcompiler_alloc_rb(size_t size) +{ + return d3dcompiler_alloc(size); +} + +static inline void *d3dcompiler_realloc_rb(void *ptr, size_t size) +{ + return d3dcompiler_realloc(ptr, size); +} + +static inline void d3dcompiler_free_rb(void *ptr) +{ + d3dcompiler_free(ptr); +} +static const struct wine_rb_functions hlsl_type_rb_funcs = +{ + d3dcompiler_alloc_rb, + d3dcompiler_realloc_rb, + d3dcompiler_free_rb, + compare_hlsl_types_rb, +}; + void push_scope(struct hlsl_parse_ctx *ctx) { struct hlsl_scope *new_scope = d3dcompiler_alloc(sizeof(*new_scope)); @@ -1610,7 +1645,12 @@ void push_scope(struct hlsl_parse_ctx *ctx) } TRACE("Pushing a new scope\n"); list_init(&new_scope->vars); - list_init(&new_scope->types); + if (wine_rb_init(&new_scope->types, &hlsl_type_rb_funcs) == -1) + { + ERR("Failed to initialize types rbtree.\n"); + d3dcompiler_free(new_scope); + return; + } new_scope->upper = ctx->cur_scope; ctx->cur_scope = new_scope; list_add_tail(&ctx->scopes, &new_scope->entry);

1 0