October 2012 - Wine-Commits

Jacek Caban : jscript: Store regexp source as jsstr_t.
by Alexandre Julliard Oct. 11, 2012

Oct. 11, 2012

Module: wine Branch: master Commit: 3182852293d68af85b67bb904e35815ff1f828c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3182852293d68af85b67bb904… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 11 12:16:50 2012 +0200 jscript: Store regexp source as jsstr_t. --- dlls/jscript/engine.c | 8 ++++++- dlls/jscript/jscript.h | 2 +- dlls/jscript/regexp.c | 55 +++++++++++++++++++---------------------------- dlls/jscript/string.c | 2 +- 4 files changed, 31 insertions(+), 36 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index a76c291..66e2b92 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -1152,11 +1152,17 @@ static HRESULT interp_regexp(exec_ctx_t *ctx) const WCHAR *source = get_op_str(ctx, 0); const unsigned flags = get_op_uint(ctx, 1); jsdisp_t *regexp; + jsstr_t *src; HRESULT hres; TRACE("%s %x\n", debugstr_w(source), flags); - hres = create_regexp(ctx->script, source, strlenW(source), flags, &regexp); + src = jsstr_alloc(source); + if(!src) + return E_OUTOFMEMORY; + + hres = create_regexp(ctx->script, src, flags, &regexp); + jsstr_release(src); if(FAILED(hres)) return hres; diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 9972688..d779c7b 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -276,7 +276,7 @@ HRESULT throw_uri_error(script_ctx_t*,HRESULT,const WCHAR*) DECLSPEC_HIDDEN; HRESULT create_object(script_ctx_t*,jsdisp_t*,jsdisp_t**) DECLSPEC_HIDDEN; HRESULT create_math(script_ctx_t*,jsdisp_t**) DECLSPEC_HIDDEN; HRESULT create_array(script_ctx_t*,DWORD,jsdisp_t**) DECLSPEC_HIDDEN; -HRESULT create_regexp(script_ctx_t*,const WCHAR *,int,DWORD,jsdisp_t**) DECLSPEC_HIDDEN; +HRESULT create_regexp(script_ctx_t*,jsstr_t*,DWORD,jsdisp_t**) DECLSPEC_HIDDEN; HRESULT create_regexp_var(script_ctx_t*,jsval_t,jsval_t*,jsdisp_t**) DECLSPEC_HIDDEN; HRESULT create_string(script_ctx_t*,jsstr_t*,jsdisp_t**) DECLSPEC_HIDDEN; HRESULT create_bool(script_ctx_t*,BOOL,jsdisp_t**) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/regexp.c b/dlls/jscript/regexp.c index 4cb1a67..bdff445 100644 --- a/dlls/jscript/regexp.c +++ b/dlls/jscript/regexp.c @@ -74,7 +74,7 @@ typedef struct { size_t parenCount; /* number of parenthesized submatches */ size_t classCount; /* count [...] bitmaps */ RECharSet *classList; /* list of [...] bitmaps */ - BSTR source; /* locked source string, sans // */ + jsstr_t *source; /* locked source string, sans // */ jsbytecode program[1]; /* regular expression bytecode */ } JSRegExp; @@ -82,7 +82,7 @@ typedef struct { jsdisp_t dispex; JSRegExp *jsregexp; - BSTR str; + jsstr_t *str; INT last_index; jsval_t last_index_val; } RegExpInstance; @@ -2158,12 +2158,12 @@ ProcessCharSet(REGlobalData *gData, RECharSet *charSet) */ assert(1 <= charSet->u.src.startIndex); assert(charSet->u.src.startIndex - < SysStringLen(gData->regexp->source)); - assert(charSet->u.src.length <= SysStringLen(gData->regexp->source) + < jsstr_length(gData->regexp->source)); + assert(charSet->u.src.length <= jsstr_length(gData->regexp->source) - 1 - charSet->u.src.startIndex); charSet->converted = TRUE; - src = gData->regexp->source + charSet->u.src.startIndex; + src = gData->regexp->source->str + charSet->u.src.startIndex; end = src + charSet->u.src.length; @@ -2488,12 +2488,12 @@ SimpleMatch(REGlobalData *gData, REMatchState *x, REOp op, break; case REOP_FLAT: pc = ReadCompactIndex(pc, &offset); - assert(offset < SysStringLen(gData->regexp->source)); + assert(offset < jsstr_length(gData->regexp->source)); pc = ReadCompactIndex(pc, &length); assert(1 <= length); - assert(length <= SysStringLen(gData->regexp->source) - offset); + assert(length <= jsstr_length(gData->regexp->source) - offset); if (length <= (size_t)(gData->cpend - x->cp)) { - source = gData->regexp->source + offset; + source = gData->regexp->source->str + offset; TRACE("%s\n", debugstr_wn(source, length)); for (index = 0; index != length; index++) { if (source[index] != x->cp[index]) @@ -2513,11 +2513,11 @@ SimpleMatch(REGlobalData *gData, REMatchState *x, REOp op, break; case REOP_FLATi: pc = ReadCompactIndex(pc, &offset); - assert(offset < SysStringLen(gData->regexp->source)); + assert(offset < jsstr_length(gData->regexp->source)); pc = ReadCompactIndex(pc, &length); assert(1 <= length); - assert(length <= SysStringLen(gData->regexp->source) - offset); - source = gData->regexp->source; + assert(length <= jsstr_length(gData->regexp->source) - offset); + source = gData->regexp->source->str; result = FlatNIMatcher(gData, x, source + offset, length); break; case REOP_FLAT1i: @@ -3218,7 +3218,7 @@ js_DestroyRegExp(JSRegExp *re) } static JSRegExp * -js_NewRegExp(script_ctx_t *cx, BSTR str, UINT flags, BOOL flat) +js_NewRegExp(script_ctx_t *cx, jsstr_t *str, UINT flags, BOOL flat) { JSRegExp *re; jsheap_t *mark; @@ -3230,10 +3230,10 @@ js_NewRegExp(script_ctx_t *cx, BSTR str, UINT flags, BOOL flat) re = NULL; mark = jsheap_mark(&cx->tmp_heap); - len = SysStringLen(str); + len = jsstr_length(str); state.context = cx; - state.cp = str; + state.cp = str->str; if (!state.cp) goto out; state.cpbegin = state.cp; @@ -3508,10 +3508,7 @@ static HRESULT RegExp_source(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, uns switch(flags) { case DISPATCH_PROPERTYGET: { RegExpInstance *This = regexp_from_vdisp(jsthis); - jsstr_t *ret = jsstr_alloc(This->str); - if(!ret) - return E_OUTOFMEMORY; - *r = jsval_string(ret); + *r = jsval_string(jsstr_addref(This->str)); break; } default: @@ -3789,7 +3786,7 @@ static void RegExp_destructor(jsdisp_t *dispex) if(This->jsregexp) js_DestroyRegExp(This->jsregexp); jsval_release(This->last_index_val); - SysFreeString(This->str); + jsstr_release(This->str); heap_free(This); } @@ -3853,25 +3850,19 @@ static HRESULT alloc_regexp(script_ctx_t *ctx, jsdisp_t *object_prototype, RegEx return S_OK; } -HRESULT create_regexp(script_ctx_t *ctx, const WCHAR *exp, int len, DWORD flags, jsdisp_t **ret) +HRESULT create_regexp(script_ctx_t *ctx, jsstr_t *src, DWORD flags, jsdisp_t **ret) { RegExpInstance *regexp; HRESULT hres; - TRACE("%s %x\n", debugstr_wn(exp, len), flags); + TRACE("%s %x\n", debugstr_jsstr(src), flags); hres = alloc_regexp(ctx, NULL, &regexp); if(FAILED(hres)) return hres; - if(len == -1) - regexp->str = SysAllocString(exp); - else - regexp->str = SysAllocStringLen(exp, len); - if(!regexp->str) { - jsdisp_release(&regexp->dispex); - return E_OUTOFMEMORY; - } + regexp->str = jsstr_addref(src); + regexp->last_index_val = jsval_number(0); regexp->jsregexp = js_NewRegExp(ctx, regexp->str, flags, FALSE); if(!regexp->jsregexp) { @@ -3880,8 +3871,6 @@ HRESULT create_regexp(script_ctx_t *ctx, const WCHAR *exp, int len, DWORD flags, return E_FAIL; } - regexp->last_index_val = jsval_number(0); - *ret = &regexp->dispex; return S_OK; } @@ -3900,7 +3889,7 @@ HRESULT create_regexp_var(script_ctx_t *ctx, jsval_t src_arg, jsval_t *flags_arg if(is_class(obj, JSCLASS_REGEXP)) { RegExpInstance *regexp = (RegExpInstance*)obj; - hres = create_regexp(ctx, regexp->str, -1, regexp->jsregexp->flags, ret); + hres = create_regexp(ctx, regexp->str, regexp->jsregexp->flags, ret); jsdisp_release(obj); return hres; } @@ -3929,7 +3918,7 @@ HRESULT create_regexp_var(script_ctx_t *ctx, jsval_t src_arg, jsval_t *flags_arg if(FAILED(hres)) return hres; - return create_regexp(ctx, src->str, -1, flags, ret); + return create_regexp(ctx, src, flags, ret); } HRESULT regexp_string_match(script_ctx_t *ctx, jsdisp_t *re, jsstr_t *str, jsval_t *r) diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index 8fb6b07..5972061 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -577,7 +577,7 @@ static HRESULT String_match(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsi if(FAILED(hres)) return hres; - hres = create_regexp(ctx, match_str->str, jsstr_length(match_str), 0, &regexp); + hres = create_regexp(ctx, match_str, 0, &regexp); jsstr_release(match_str); if(FAILED(hres)) return hres;

1 0

Henri Verbeet : wined3d: Implement WINED3DSIH_XOR in the GLSL shader backend.
by Alexandre Julliard Oct. 11, 2012

Oct. 11, 2012

Module: wine Branch: master Commit: 4c4b224330ecb45c4f32a6f53e40de66f01778f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c4b224330ecb45c4f32a6f53… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 10 22:22:16 2012 +0200 wined3d: Implement WINED3DSIH_XOR in the GLSL shader backend. --- dlls/wined3d/glsl_shader.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 0c5ceb6..52298fa 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2205,6 +2205,7 @@ static void shader_glsl_binop(const struct wined3d_shader_instruction *ins) case WINED3DSIH_IADD: op = '+'; break; case WINED3DSIH_MUL: op = '*'; break; case WINED3DSIH_SUB: op = '-'; break; + case WINED3DSIH_XOR: op = '^'; break; default: op = ' '; FIXME("Opcode %#x not yet handled in GLSL\n", ins->handler_idx); @@ -5299,7 +5300,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_UDIV */ NULL, /* WINED3DSIH_USHR */ NULL, /* WINED3DSIH_UTOF */ NULL, - /* WINED3DSIH_XOR */ NULL, + /* WINED3DSIH_XOR */ shader_glsl_binop, }; static void shader_glsl_handle_instruction(const struct wined3d_shader_instruction *ins) {

1 0

Lucas Zawacki : Portuguese translation for release 1.5.13
by Jeremy Newman Oct. 11, 2012

Oct. 11, 2012

Module: website Branch: master Commit: 5ecc071831e9600303fe93409926331ca8ac530f URL: http://source.winehq.org/git/website.git/?a=commit;h=5ecc071831e9600303fe93… Author: Lucas Zawacki <lfzawacki(a)gmail.com> Date: Thu Oct 11 14:53:36 2012 -0300 Portuguese translation for release 1.5.13 --- news/pt/2012091401.xml | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/news/pt/2012091401.xml b/news/pt/2012091401.xml new file mode 100644 index 0000000..6b82387 --- /dev/null +++ b/news/pt/2012091401.xml @@ -0,0 +1,18 @@ +<news> +<date>14 de Setembro de 2012</date> +<title>Wine 1.5.13 lançado</title> +<body> + A versão de desenvolvimento 1.5.13 já está disponível. + <a href="{$root}/announce/1.5.13">Novidades</a> nesta versão: +<ul> + <li>Desenho de janelas em Client-side usando a DIB engine.</li> + <li>Suporte para Raw input do teclado e mouse.</li> + <li>Suporte a janelas com áreas transparentes usando color keying.</li> + <li>Suporte a C++ RTTI em processadores 64-bit.</li> + <li>Implementação de informações lógicas de processador.</li> + <li>Suporte a fontes com nomes localizados.</li> + <li>Várias correções de bugs.</li> +</ul> +O código fonte está <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.13.tar.bz2">disponível agora</a>. +Pacotes binários estão em processo de construção e em breve estarão em suas respectivas <a href="{$root}/download">sessões da área de downloads</a>. +</body></news>

1 0

Lucas Zawacki : Portuguese translation for 08/21 news
by Jeremy Newman Oct. 11, 2012

Oct. 11, 2012

Module: website Branch: master Commit: a77bcc56ff8015b73640965515f50aca8031ad11 URL: http://source.winehq.org/git/website.git/?a=commit;h=a77bcc56ff8015b7364096… Author: Lucas Zawacki <lfzawacki(a)gmail.com> Date: Thu Oct 11 14:53:34 2012 -0300 Portuguese translation for 08/21 news --- news/pt/2012082101.xml | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/news/pt/2012082101.xml b/news/pt/2012082101.xml new file mode 100644 index 0000000..4b99189 --- /dev/null +++ b/news/pt/2012082101.xml @@ -0,0 +1,5 @@ +<news> +<date>21 de Agosto de 2012</date> +<title>Doações do JIB</title> +<body> +O projeto <a href="http://jib.magicermine.com">Jinn in the Bottle</a> recentemente anunciou que estará doando 15% de suas vendas para o Wine.</body></news>

1 0

Lucas Zawacki : Portuguese translation for release 1.5.12
by Jeremy Newman Oct. 11, 2012

Oct. 11, 2012

Module: website Branch: master Commit: ed35cf50b54f77dce9dd6ba35895abfb6d2c8cd8 URL: http://source.winehq.org/git/website.git/?a=commit;h=ed35cf50b54f77dce9dd6b… Author: Lucas Zawacki <lfzawacki(a)gmail.com> Date: Thu Oct 11 14:53:35 2012 -0300 Portuguese translation for release 1.5.12 --- news/pt/2012083101.xml | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/news/pt/2012083101.xml b/news/pt/2012083101.xml new file mode 100644 index 0000000..7b4575e --- /dev/null +++ b/news/pt/2012083101.xml @@ -0,0 +1,15 @@ +<news> +<date>31 de Agosto de 2012</date> +<title>Wine 1.5.12 lançado</title> +<body> + A versão de desenvolvimento 1.5.12 já está disponível. + <a href="{$root}/announce/1.5.12">Novidades</a> nesta versão: +<ul> + <li>Possibilidade de desativar joysticks individualmente.</li> + <li>Melhor suporte às tabelas de constantes do D3DX9.</li> + <li>Algumas melhoras no XRandR.</li> + <li>Várias correções de bugs.</li> +</ul> +O código fonte está <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.12.tar.bz2">disponível agora</a>. +Pacotes binários estão em processo de construção e em breve estarão em suas respectivas <a href="{$root}/download">sessões da área de downloads</a>. +</body></news>

1 0

Lucas Zawacki : Portuguese translation for release 1.5.14
by Jeremy Newman Oct. 11, 2012

Oct. 11, 2012

Module: website Branch: master Commit: 0a0ee01f9c633eeacb86af50ed2e428823814665 URL: http://source.winehq.org/git/website.git/?a=commit;h=0a0ee01f9c633eeacb86af… Author: Lucas Zawacki <lfzawacki(a)gmail.com> Date: Thu Oct 11 14:53:37 2012 -0300 Portuguese translation for release 1.5.14 --- news/pt/2012092801.xml | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/news/pt/2012092801.xml b/news/pt/2012092801.xml new file mode 100644 index 0000000..64b6cd3 --- /dev/null +++ b/news/pt/2012092801.xml @@ -0,0 +1,16 @@ +<news> +<date>28 de Setembro de 2012</date> +<title>Wine 1.5.14 lançado</title> +<body> + A versão de desenvolvimento 1.5.14 já está disponível. + <a href="{$root}/announce/1.5.14">Novidades</a> nesta versão: +<ul> + <li>Grandes melhorias no comportamento da cache de URL.</li> + <li>Melhorias no suporte a imagens GIF.</li> + <li>Melhorias no analisador do compilador de shaders.</li> + <li>Otimizações do JavaScript.</li> + <li>Várias correções de bugs.</li> +</ul> +O código fonte está <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.14.tar.bz2">disponível agora</a>. +Pacotes binários estão em processo de construção e em breve estarão em suas respectivas <a href="{$root}/download">sessões da área de downloads</a>. +</body></news>

1 0

Matteo Bruni : d3dcompiler: Don' t raise a warning for an uninitialized uniform.
by Alexandre Julliard Oct. 10, 2012

Oct. 10, 2012

Module: wine Branch: master Commit: 1f876a670e60464b4a39de2382c533782179172f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f876a670e60464b4a39de238… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Oct 10 18:26:00 2012 +0200 d3dcompiler: Don't raise a warning for an uninitialized uniform. --- 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 afb12ec..a7d4c68 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -605,7 +605,7 @@ static struct list *declare_vars(struct hlsl_type *basic_type, DWORD modifiers, local = FALSE; } - if (var->modifiers & HLSL_MODIFIER_CONST && !v->initializer) + if (var->modifiers & HLSL_MODIFIER_CONST && !(var->modifiers & HLSL_STORAGE_UNIFORM) && !v->initializer) { hlsl_report_message(v->loc.file, v->loc.line, v->loc.col, HLSL_LEVEL_ERROR, "const variable without initializer");

1 0

Matteo Bruni : d3dcompiler/tests: Fix access to the test output for y > 0.
by Alexandre Julliard Oct. 10, 2012

Oct. 10, 2012

Module: wine Branch: master Commit: 71da1bac5d78d9d07ea6da1ea6379caa1d89a856 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71da1bac5d78d9d07ea6da1ea… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Oct 10 18:25:59 2012 +0200 d3dcompiler/tests: Fix access to the test output for y > 0. --- dlls/d3dcompiler_43/tests/hlsl.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dcompiler_43/tests/hlsl.c b/dlls/d3dcompiler_43/tests/hlsl.c index a528e80..1bc3641 100644 --- a/dlls/d3dcompiler_43/tests/hlsl.c +++ b/dlls/d3dcompiler_43/tests/hlsl.c @@ -269,7 +269,7 @@ static void compute_shader_probe9(IDirect3DDevice9 *device, IDirect3DVertexShade /* Now go through the probes and check each one */ for (i = 0; i < count; i++, probes++) { - int index = probes->x + (probes->y * lr.Pitch); + int index = probes->x + (probes->y * lr.Pitch / sizeof(D3DXCOLOR)); ok(colors_match(probes->c, pbits_data[index], probes->epsilon), "Line %d: At (%d, %d): %s: Expected (%.04f,%.04f,%.04f, %.04f), got " "(%.04f,%.04f,%.04f,%.04f)\n", line_number, probes->x, probes->y, probes->message,

1 0

Roman Dadkov : ole32: Fix dwClsContext parameter of a CoCreateInstance call in DefaultHandler_Run .
by Alexandre Julliard Oct. 10, 2012

Oct. 10, 2012

Module: wine Branch: master Commit: 9e145eebdfbaa0fee22ff8c4eb7c33da67040981 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e145eebdfbaa0fee22ff8c4e… Author: Roman Dadkov <romand(a)etersoft.ru> Date: Tue Oct 9 14:49:50 2012 +0400 ole32: Fix dwClsContext parameter of a CoCreateInstance call in DefaultHandler_Run. --- dlls/ole32/defaulthandler.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/defaulthandler.c b/dlls/ole32/defaulthandler.c index 577d976..b4e8203 100644 --- a/dlls/ole32/defaulthandler.c +++ b/dlls/ole32/defaulthandler.c @@ -1322,7 +1322,7 @@ static HRESULT WINAPI DefaultHandler_Run( release_delegates(This); - hr = CoCreateInstance(&This->clsid, NULL, CLSCTX_LOCAL_SERVER, + hr = CoCreateInstance(&This->clsid, NULL, CLSCTX_ALL, &IID_IOleObject, (void **)&This->pOleDelegate); if (FAILED(hr)) return hr;

1 0

Matteo Bruni : d3dcompiler: Fix "for" syntax.
by Alexandre Julliard Oct. 10, 2012

Oct. 10, 2012

Module: wine Branch: master Commit: f4eccde66d7942165d48375f9f9adce679f7169b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4eccde66d7942165d48375f9… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Oct 10 18:25:58 2012 +0200 d3dcompiler: Fix "for" syntax. --- dlls/d3dcompiler_43/hlsl.y | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index 8627e54..afb12ec 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -320,7 +320,7 @@ enum loop_type }; static struct list *create_loop(enum loop_type type, struct list *init, struct list *cond, - struct list *iter, struct list *body, struct source_location *loc) + struct hlsl_ir_node *iter, struct list *body, struct source_location *loc) { struct list *list = NULL; struct hlsl_ir_loop *loop = NULL; @@ -355,14 +355,13 @@ static struct list *create_loop(enum loop_type type, struct list *init, struct l list_move_tail(loop->body, body); if (iter) - list_move_tail(loop->body, iter); + list_add_tail(loop->body, &iter->entry); if (type == LOOP_DO_WHILE) list_add_tail(loop->body, &cond_jump->node.entry); d3dcompiler_free(init); d3dcompiler_free(cond); - d3dcompiler_free(iter); d3dcompiler_free(body); return list; @@ -375,7 +374,7 @@ oom: d3dcompiler_free(list); free_instr_list(init); free_instr_list(cond); - free_instr_list(iter); + free_instr(iter); free_instr_list(body); return NULL; } @@ -1651,7 +1650,7 @@ loop_statement: KW_WHILE '(' expr ')' statement set_location(&loc, &@1); $$ = create_loop(LOOP_DO_WHILE, NULL, cond, NULL, $2, &loc); } - | KW_FOR '(' scope_start expr_statement expr_statement expr_statement ')' statement + | KW_FOR '(' scope_start expr_statement expr_statement expr ')' statement { struct source_location loc; @@ -1659,7 +1658,7 @@ loop_statement: KW_WHILE '(' expr ')' statement $$ = create_loop(LOOP_FOR, $4, $5, $6, $8, &loc); pop_scope(&hlsl_ctx); } - | KW_FOR '(' scope_start declaration expr_statement expr_statement ')' statement + | KW_FOR '(' scope_start declaration expr_statement expr ')' statement { struct source_location loc;

1 0