July 2016 - Wine-Commits - list.winehq.org

Jacek Caban : mshtml: Set compatibility mode based on doctype.
by Alexandre Julliard July 6, 2016

July 6, 2016

Module: wine Branch: master Commit: 6614df04a8d502c1fc027d14b6b49f41ff0e184d URL: http://source.winehq.org/git/wine.git/?a=commit;h=6614df04a8d502c1fc027d14b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 5 22:47:33 2016 +0200 mshtml: Set compatibility mode based on doctype. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/mutation.c | 11 +++++++++++ dlls/mshtml/nsiface.idl | 15 ++++++++++++++- 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/mutation.c b/dlls/mshtml/mutation.c index dd3d119..a298ecb 100644 --- a/dlls/mshtml/mutation.c +++ b/dlls/mshtml/mutation.c @@ -729,6 +729,17 @@ static void NSAPI nsDocumentObserver_BindToDocument(nsIDocumentObserver *iface, return; } + if(This->document_mode == COMPAT_MODE_QUIRKS) { + nsIDOMDocumentType *nsdoctype; + nsres = nsIContent_QueryInterface(aContent, &IID_nsIDOMDocumentType, (void**)&nsdoctype); + if(NS_SUCCEEDED(nsres)) { + TRACE("doctype node\n"); + /* FIXME: We should set it to something higher for internet zone. */ + set_document_mode(This, COMPAT_MODE_IE7); + nsIDOMDocumentType_Release(nsdoctype); + } + } + nsres = nsIContent_QueryInterface(aContent, &IID_nsIDOMHTMLElement, (void**)&nselem); if(NS_FAILED(nsres)) return; diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index 1b6104a..e9c717d 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -134,7 +134,6 @@ typedef nsISupports nsISHistory; typedef nsISupports nsIWidget; typedef nsISupports nsIPrompt; typedef nsISupports nsIAuthPrompt; -typedef nsISupports nsIDOMDocumentType; typedef nsISupports nsIDOMDOMImplementation; typedef nsISupports nsIDOMCDATASection; typedef nsISupports nsIDOMProcessingInstruction; @@ -1201,6 +1200,20 @@ interface nsIDOMComment : nsIDOMCharacterData [ object, + uuid(cd7467b9-0f26-4787-a359-66e80ba8db92), + local +] +interface nsIDOMDocumentType : nsIDOMNode +{ + nsresult GetName(nsAString *aName); + nsresult GetPublicId(nsAString *aPublicId); + nsresult GetSystemId(nsAString *aSystemId); + nsresult GetInternalSubset(nsAString *aInternalSubset); + nsresult MozRemove(); +} + +[ + object, uuid(48eb8d72-95bb-402e-a8fc-f2b187abcbdb), local ]

1 0

Jacek Caban : mshtml: Store function buffer size in dispex_data_t.
by Alexandre Julliard July 6, 2016

July 6, 2016

Module: wine Branch: master Commit: 392a41060c4e195009666395766bdb4b168bb7d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=392a41060c4e1950096663957… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 5 22:46:11 2016 +0200 mshtml: Store function buffer size in dispex_data_t. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/dispex.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 7c40d47..09f0250 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -62,6 +62,7 @@ typedef struct { struct dispex_data_t { DWORD func_cnt; + DWORD func_size; func_info_t *funcs; func_info_t **name_table; DWORD func_disp_cnt; @@ -225,7 +226,7 @@ static BOOL is_arg_type_supported(VARTYPE vt) return FALSE; } -static void add_func_info(dispex_data_t *data, DWORD *size, tid_t tid, const FUNCDESC *desc, ITypeInfo *dti) +static void add_func_info(dispex_data_t *data, tid_t tid, const FUNCDESC *desc, ITypeInfo *dti) { func_info_t *info; HRESULT hres; @@ -239,8 +240,8 @@ static void add_func_info(dispex_data_t *data, DWORD *size, tid_t tid, const FUN } if(info == data->funcs+data->func_cnt) { - if(data->func_cnt == *size) - data->funcs = heap_realloc_zero(data->funcs, (*size <<= 1)*sizeof(func_info_t)); + if(data->func_cnt == data->func_size) + data->funcs = heap_realloc_zero(data->funcs, (data->func_size <<= 1)*sizeof(func_info_t)); info = data->funcs+data->func_cnt; hres = ITypeInfo_GetDocumentation(dti, desc->memid, &info->name, NULL, NULL, NULL); @@ -315,7 +316,7 @@ static void add_func_info(dispex_data_t *data, DWORD *size, tid_t tid, const FUN } } -static HRESULT process_interface(dispex_data_t *data, tid_t tid, ITypeInfo *disp_typeinfo, DWORD *size) +static HRESULT process_interface(dispex_data_t *data, tid_t tid, ITypeInfo *disp_typeinfo) { unsigned i = 7; /* skip IDispatch functions */ ITypeInfo *typeinfo; @@ -333,7 +334,7 @@ static HRESULT process_interface(dispex_data_t *data, tid_t tid, ITypeInfo *disp TRACE("adding...\n"); - add_func_info(data, size, tid, funcdesc, disp_typeinfo ? disp_typeinfo : typeinfo); + add_func_info(data, tid, funcdesc, disp_typeinfo ? disp_typeinfo : typeinfo); ITypeInfo_ReleaseFuncDesc(typeinfo, funcdesc); } @@ -354,7 +355,7 @@ static dispex_data_t *preprocess_dispex_data(DispatchEx *This) { const tid_t *tid; dispex_data_t *data; - DWORD size = 16, i; + DWORD i; ITypeInfo *dti; HRESULT hres; @@ -375,7 +376,8 @@ static dispex_data_t *preprocess_dispex_data(DispatchEx *This) } data->func_cnt = 0; data->func_disp_cnt = 0; - data->funcs = heap_alloc_zero(size*sizeof(func_info_t)); + data->func_size = 16; + data->funcs = heap_alloc_zero(data->func_size*sizeof(func_info_t)); if (!data->funcs) { heap_free (data); ERR("Out of memory\n"); @@ -384,18 +386,19 @@ static dispex_data_t *preprocess_dispex_data(DispatchEx *This) list_add_tail(&dispex_data_list, &data->entry); for(tid = This->data->iface_tids; *tid; tid++) { - hres = process_interface(data, *tid, dti, &size); + hres = process_interface(data, *tid, dti); if(FAILED(hres)) break; } if(This->data->additional_tid) - process_interface(data, This->data->additional_tid, NULL, &size); + process_interface(data, This->data->additional_tid, NULL); if(!data->func_cnt) { heap_free(data->funcs); data->name_table = NULL; data->funcs = NULL; + data->func_size = 0; return data; }

1 0

Thomas Faber : usp10: Avoid buffer overrun in ReplaceInsertChars.
by Alexandre Julliard July 6, 2016

July 6, 2016

Module: wine Branch: master Commit: 37845242658a25edef059f3e1c0230d1b4b6255d URL: http://source.winehq.org/git/wine.git/?a=commit;h=37845242658a25edef059f3e1… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Sun Jun 26 10:57:50 2016 +0200 usp10: Avoid buffer overrun in ReplaceInsertChars. Signed-off-by: Thomas Faber <thomas.faber(a)reactos.org> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/shape.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 3fdf84b..3ee412a 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -1596,7 +1596,7 @@ static void ReplaceInsertChars(HDC hdc, INT cWalk, INT* pcChars, WCHAR *pwOutCha cWalk=cWalk+1; /* Insert */ - for (i = 1; replacements[i] != 0x0000 && i < 3; i++) + for (i = 1; i < 3 && replacements[i] != 0x0000; i++) { int j; for (j = *pcChars; j > cWalk; j--)

1 0

Detlef Riekenberg : dsound: Mark a multiplication factor as float.
by Alexandre Julliard July 5, 2016

July 5, 2016

Module: wine Branch: master Commit: 443130c4cf198a4b63d5f9a15b83059cb3ec5bbd URL: http://source.winehq.org/git/wine.git/?a=commit;h=443130c4cf198a4b63d5f9a15… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Jul 3 22:33:21 2016 +0200 dsound: Mark a multiplication factor as float. Signed-off-by: Detlef Riekenberg <wine.dev(a)web.de> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsound/dsound_convert.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dsound/dsound_convert.c b/dlls/dsound/dsound_convert.c index d9ed637..0c9a34b 100644 --- a/dlls/dsound/dsound_convert.c +++ b/dlls/dsound/dsound_convert.c @@ -224,7 +224,7 @@ void put_surround512stereo(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD c break; case 0: /* front left */ - value *= 0.503; /* 1 / (sum of left volumes) */ + value *= 0.503f; /* 1 / (sum of left volumes) */ dsb->put_aux(dsb, pos, 0, value); break;

1 0

Józef Kucia : wined3d: Do not limit temporary register count to 32 in SM4+.
by Alexandre Julliard July 5, 2016

July 5, 2016

Module: wine Branch: master Commit: eb5c8d71fb31f5464457782182eb7772d06b8453 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb5c8d71fb31f546445778218… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jul 5 11:46:54 2016 +0200 wined3d: Do not limit temporary register count to 32 in SM4+. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 13 +++++++++++-- dlls/wined3d/shader.c | 4 ++++ dlls/wined3d/wined3d_private.h | 4 ++-- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index e06f47b..8b5af9e 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2168,9 +2168,18 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont shader_addline(buffer, "vec4 %s_out[%u];\n", prefix, shader->limits->packed_output); /* Declare temporary variables */ - for (i = 0, map = reg_maps->temporary; map; map >>= 1, ++i) + if (reg_maps->temporary_count) { - if (map & 1) shader_addline(buffer, "vec4 R%u;\n", i); + for (i = 0; i < reg_maps->temporary_count; ++i) + shader_addline(buffer, "vec4 R%u;\n", i); + } + else + { + for (i = 0, map = reg_maps->temporary; map; map >>= 1, ++i) + { + if (map & 1) + shader_addline(buffer, "vec4 R%u;\n", i); + } } /* Declare indexable temporary variables */ diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index ce301cc..9bf7164 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -982,6 +982,10 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st if (ins.flags & WINED3DSI_SAMPLER_COMPARISON_MODE) reg_maps->sampler_comparison_mode |= (1u << ins.declaration.dst.reg.idx[0].offset); } + else if (ins.handler_idx == WINED3DSIH_DCL_TEMPS) + { + reg_maps->temporary_count = ins.declaration.count; + } else if (ins.handler_idx == WINED3DSIH_DCL_VERTICES_OUT) { if (shader_version.type == WINED3D_SHADER_TYPE_GEOMETRY) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e8dc3fd..ec52b15 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -530,7 +530,6 @@ enum wined3d_shader_conditional_op /* TODO: Make this dynamic, based on shader limits ? */ #define MAX_ATTRIBS 16 #define MAX_REG_ADDR 1 -#define MAX_REG_TEMP 32 #define MAX_REG_TEXCRD 8 #define MAX_REG_INPUT 32 #define MAX_REG_OUTPUT 32 @@ -810,7 +809,8 @@ struct wined3d_shader_reg_maps BYTE texcoord; /* MAX_REG_TEXCRD, 8 */ BYTE address; /* MAX_REG_ADDR, 1 */ WORD labels; /* MAX_LABELS, 16 */ - DWORD temporary; /* MAX_REG_TEMP, 32 */ + DWORD temporary; /* 32 */ + unsigned int temporary_count; DWORD *constf; /* pixel, vertex */ struct list indexable_temps; const struct wined3d_shader_immediate_constant_buffer *icb;

1 0

Józef Kucia : wined3d: Implement SM4 continue instruction.
by Alexandre Julliard July 5, 2016

July 5, 2016

Module: wine Branch: master Commit: 57732599e5a5665daee958056d1dfb8bff154ad2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57732599e5a5665daee958056… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jul 5 11:46:53 2016 +0200 wined3d: Implement SM4 continue instruction. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 6 ++++++ dlls/wined3d/shader.c | 1 + dlls/wined3d/shader_sm4.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 11 insertions(+) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 6b53eba..deae1cc 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5224,6 +5224,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_CASE */ NULL, /* WINED3DSIH_CMP */ pshader_hw_cmp, /* WINED3DSIH_CND */ pshader_hw_cnd, + /* WINED3DSIH_CONTINUE */ NULL, /* WINED3DSIH_CRS */ shader_hw_map2gl, /* WINED3DSIH_CUT */ NULL, /* WINED3DSIH_CUT_STREAM */ NULL, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index ced7561..e06f47b 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4330,6 +4330,11 @@ static void shader_glsl_breakp(const struct wined3d_shader_instruction *ins) shader_addline(ins->ctx->buffer, "if (%s(%s)) break;\n", condition, src_param.param_str); } +static void shader_glsl_continue(const struct wined3d_shader_instruction *ins) +{ + shader_addline(ins->ctx->buffer, "continue;\n"); +} + static void shader_glsl_label(const struct wined3d_shader_instruction *ins) { shader_addline(ins->ctx->buffer, "}\n"); @@ -8576,6 +8581,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_CASE */ shader_glsl_case, /* WINED3DSIH_CMP */ shader_glsl_conditional_move, /* WINED3DSIH_CND */ shader_glsl_cnd, + /* WINED3DSIH_CONTINUE */ shader_glsl_continue, /* WINED3DSIH_CRS */ shader_glsl_cross, /* WINED3DSIH_CUT */ shader_glsl_cut, /* WINED3DSIH_CUT_STREAM */ NULL, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index cd52ad6..ce301cc 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -54,6 +54,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_CASE */ "case", /* WINED3DSIH_CMP */ "cmp", /* WINED3DSIH_CND */ "cnd", + /* WINED3DSIH_CONTINUE */ "continue", /* WINED3DSIH_CRS */ "crs", /* WINED3DSIH_CUT */ "cut", /* WINED3DSIH_CUT_STREAM */ "cut_stream", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 7f15a82..abfcf4f 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -112,6 +112,7 @@ enum wined3d_sm4_opcode WINED3D_SM4_OP_BREAK = 0x02, WINED3D_SM4_OP_BREAKC = 0x03, WINED3D_SM4_OP_CASE = 0x06, + WINED3D_SM4_OP_CONTINUE = 0x07, WINED3D_SM4_OP_CUT = 0x09, WINED3D_SM4_OP_DEFAULT = 0x0a, WINED3D_SM4_OP_DERIV_RTX = 0x0b, @@ -687,6 +688,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM4_OP_BREAKC, WINED3DSIH_BREAKP, "", "u", shader_sm4_read_conditional_op}, {WINED3D_SM4_OP_CASE, WINED3DSIH_CASE, "", "u"}, + {WINED3D_SM4_OP_CONTINUE, WINED3DSIH_CONTINUE, "", ""}, {WINED3D_SM4_OP_CUT, WINED3DSIH_CUT, "", ""}, {WINED3D_SM4_OP_DEFAULT, WINED3DSIH_DEFAULT, "", ""}, {WINED3D_SM4_OP_DERIV_RTX, WINED3DSIH_DSX, "f", "f"}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 1e0bb2f..e8dc3fd 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -570,6 +570,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_CASE, WINED3DSIH_CMP, WINED3DSIH_CND, + WINED3DSIH_CONTINUE, WINED3DSIH_CRS, WINED3DSIH_CUT, WINED3DSIH_CUT_STREAM,

1 0

Józef Kucia : wined3d: Recognize SM5 swapc opcode.
by Alexandre Julliard July 5, 2016

July 5, 2016

Module: wine Branch: master Commit: eab16f13109ec2ac4566705773b45185559212fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=eab16f13109ec2ac456670577… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jul 5 11:46:52 2016 +0200 wined3d: Recognize SM5 swapc opcode. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/shader.c | 1 + dlls/wined3d/shader_sm4.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 6 insertions(+) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index cd016e3..6b53eba 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5367,6 +5367,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_STORE_STRUCTURED */ NULL, /* WINED3DSIH_STORE_UAV_TYPED */ NULL, /* WINED3DSIH_SUB */ shader_hw_map2gl, + /* WINED3DSIH_SWAPC */ NULL, /* WINED3DSIH_SWITCH */ NULL, /* WINED3DSIH_TEX */ pshader_hw_tex, /* WINED3DSIH_TEXBEM */ pshader_hw_texbem, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index e0aeed8..ced7561 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8719,6 +8719,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_STORE_STRUCTURED */ NULL, /* WINED3DSIH_STORE_UAV_TYPED */ NULL, /* WINED3DSIH_SUB */ shader_glsl_binop, + /* WINED3DSIH_SWAPC */ NULL, /* WINED3DSIH_SWITCH */ shader_glsl_switch, /* WINED3DSIH_TEX */ shader_glsl_tex, /* WINED3DSIH_TEXBEM */ shader_glsl_texbem, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index a520744..cd52ad6 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -197,6 +197,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_STORE_STRUCTURED */ "store_structured", /* WINED3DSIH_STORE_UAV_TYPED */ "store_uav_typed", /* WINED3DSIH_SUB */ "sub", + /* WINED3DSIH_SWAPC */ "swapc", /* WINED3DSIH_SWITCH */ "switch", /* WINED3DSIH_TEX */ "texld", /* WINED3DSIH_TEXBEM */ "texbem", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 22012c7..7f15a82 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -215,6 +215,7 @@ enum wined3d_sm4_opcode WINED3D_SM5_OP_DERIV_RTY_FINE = 0x7d, WINED3D_SM5_OP_GATHER4_C = 0x7e, WINED3D_SM5_OP_BFI = 0x8c, + WINED3D_SM5_OP_SWAPC = 0x8e, WINED3D_SM5_OP_DCL_STREAM = 0x8f, WINED3D_SM5_OP_DCL_INPUT_CONTROL_POINT_COUNT = 0x93, WINED3D_SM5_OP_DCL_OUTPUT_CONTROL_POINT_COUNT = 0x94, @@ -808,6 +809,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM5_OP_DERIV_RTY_FINE, WINED3DSIH_DSY_FINE, "f", "f"}, {WINED3D_SM5_OP_GATHER4_C, WINED3DSIH_GATHER4_C, "f", "fRSf"}, {WINED3D_SM5_OP_BFI, WINED3DSIH_BFI, "u", "uuuu"}, + {WINED3D_SM5_OP_SWAPC, WINED3DSIH_SWAPC, "ff", "uff"}, {WINED3D_SM5_OP_DCL_STREAM, WINED3DSIH_DCL_STREAM, "", "f"}, {WINED3D_SM5_OP_DCL_INPUT_CONTROL_POINT_COUNT, WINED3DSIH_DCL_INPUT_CONTROL_POINT_COUNT, "", "", shader_sm5_read_control_point_count}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 6a3df61..1e0bb2f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -713,6 +713,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_STORE_STRUCTURED, WINED3DSIH_STORE_UAV_TYPED, WINED3DSIH_SUB, + WINED3DSIH_SWAPC, WINED3DSIH_SWITCH, WINED3DSIH_TEX, WINED3DSIH_TEXBEM,

1 0

Józef Kucia : d3d11/tests: Add test for creating unordered access views.
by Alexandre Julliard July 5, 2016

July 5, 2016

Module: wine Branch: master Commit: 4de5e9c0bfe1ed00218ea0572b065d1cec0bad1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4de5e9c0bfe1ed00218ea0572… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jul 5 11:46:50 2016 +0200 d3d11/tests: Add test for creating unordered access views. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 379 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 379 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4de5e9c0bfe1ed00218ea…

1 0

Aaryaman Vasishta : d3drm: Fix device not assigning width and height after creation.
by Alexandre Julliard July 5, 2016

July 5, 2016

Module: wine Branch: master Commit: 9729d15a1a8de61030b68436a1c2239290af90f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9729d15a1a8de61030b68436a… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Thu Jun 30 17:41:54 2016 +0530 d3drm: Fix device not assigning width and height after creation. Signed-off-by: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/device.c | 31 ++++++++++++++++++++++++++- dlls/d3drm/tests/d3drm.c | 54 ++++++++++++++++++++++++++++++++++++++++-------- 2 files changed, 75 insertions(+), 10 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9729d15a1a8de61030b68…

1 0

Francois Gouget : mmdevapi/tests: Fix typos in a few ok() messages.
by Alexandre Julliard July 5, 2016

July 5, 2016

Module: wine Branch: master Commit: 847868fc873387e0f873836086426d5d2fdc6ac9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=847868fc873387e0f87383608… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jul 2 11:58:20 2016 +0200 mmdevapi/tests: Fix typos in a few ok() messages. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mmdevapi/tests/capture.c | 4 ++-- dlls/mmdevapi/tests/render.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/mmdevapi/tests/capture.c b/dlls/mmdevapi/tests/capture.c index 2bb1e5a..e68c38d 100644 --- a/dlls/mmdevapi/tests/capture.c +++ b/dlls/mmdevapi/tests/capture.c @@ -414,7 +414,7 @@ static void test_capture(IAudioClient *ac, HANDLE handle, WAVEFORMATEX *wfx) sum += frames; } else if(hr == AUDCLNT_S_BUFFER_EMPTY){ - ok(!pad, "resetted GCP %u\n", pad); + ok(!pad, "reset GCP %u\n", pad); Sleep(180); } @@ -590,7 +590,7 @@ static void test_audioclient(void) ok(hr == S_OK, "SetEventHandle returns %08x\n", hr); hr = IAudioClient_Reset(ac); - ok(hr == S_OK, "Reset on a resetted stream returns %08x\n", hr); + ok(hr == S_OK, "Reset on an already reset stream returns %08x\n", hr); hr = IAudioClient_Stop(ac); ok(hr == S_FALSE, "Stop on a stopped stream returns %08x\n", hr); diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c index 5497681..9393f7b 100644 --- a/dlls/mmdevapi/tests/render.c +++ b/dlls/mmdevapi/tests/render.c @@ -361,7 +361,7 @@ static void test_audioclient(void) ok(hr == S_OK, "Reset on an initialized stream returns %08x\n", hr); hr = IAudioClient_Reset(ac); - ok(hr == S_OK, "Reset on a resetted stream returns %08x\n", hr); + ok(hr == S_OK, "Reset on an already reset stream returns %08x\n", hr); hr = IAudioClient_Stop(ac); ok(hr == S_FALSE, "Stop on a stopped stream returns %08x\n", hr); @@ -1090,7 +1090,7 @@ static void test_clock(int share) slept = sum = 0; hr = IAudioClient_Reset(ac); - ok(hr == S_OK, "Reset on a resetted stream returns %08x\n", hr); + ok(hr == S_OK, "Reset on an already reset stream returns %08x\n", hr); hr = IAudioClock_GetPosition(acl, &pos, &pcpos); ok(hr == S_OK, "GetPosition failed: %08x\n", hr); @@ -1164,7 +1164,7 @@ static void test_clock(int share) ok(QueryPerformanceCounter(&hpctime0), "PerfCounter unavailable\n"); hr = IAudioClient_Reset(ac); - ok(hr == S_OK, "Reset on a resetted stream returns %08x\n", hr); + ok(hr == S_OK, "Reset on an already reset stream returns %08x\n", hr); hr = IAudioClient_Start(ac); ok(hr == S_OK, "Start failed: %08x\n", hr);

1 0