wine-commits December 2014

wine-commits@winehq.org

2 participants
319 discussions

Alexandre Julliard : kernel32/tests: Allow the parent directory to receive a modified event.
by Alexandre Julliard 03 Dec '14

03 Dec '14

Module: wine Branch: master Commit: 0ab2311cd5c766fb14d8ce799cd02461c40c5aa0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ab2311cd5c766fb14d8ce799… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 3 21:32:46 2014 +0100 kernel32/tests: Allow the parent directory to receive a modified event. --- dlls/kernel32/tests/change.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/change.c b/dlls/kernel32/tests/change.c index ad22f18..19e55bb 100644 --- a/dlls/kernel32/tests/change.c +++ b/dlls/kernel32/tests/change.c @@ -554,9 +554,18 @@ static void test_readdirectorychanges(void) ok( r == WAIT_OBJECT_0, "should be ready\n" ); ok( (NTSTATUS)ov.Internal == STATUS_SUCCESS, "ov.Internal wrong\n"); - ok( ov.InternalHigh == 0x18, "ov.InternalHigh wrong\n"); + ok( ov.InternalHigh == 0x18 || ov.InternalHigh == 0x12 + 0x18, + "ov.InternalHigh wrong %lx\n", ov.InternalHigh); pfni = (PFILE_NOTIFY_INFORMATION) buffer; + if (pfni->NextEntryOffset) /* we may get a modified event on the parent dir */ + { + ok( pfni->NextEntryOffset == 0x12, "offset wrong %x\n", pfni->NextEntryOffset ); + ok( pfni->Action == FILE_ACTION_MODIFIED, "action wrong %d\n", pfni->Action ); + ok( pfni->FileNameLength == 3*sizeof(WCHAR), "len wrong\n" ); + ok( !memcmp(pfni->FileName,&szGa[1],3*sizeof(WCHAR)), "name wrong\n"); + pfni = (PFILE_NOTIFY_INFORMATION)((char *)pfni + pfni->NextEntryOffset); + } ok( pfni->NextEntryOffset == 0, "offset wrong\n" ); ok( pfni->Action == FILE_ACTION_ADDED, "action wrong\n" ); ok( pfni->FileNameLength == 6*sizeof(WCHAR), "len wrong\n" );

1 0

Alexandre Julliard : taskschd/tests: Don' t depend on the directory lookup order.
by Alexandre Julliard 03 Dec '14

03 Dec '14

Module: wine Branch: master Commit: f48a0d8ca30e8f39af17b531dcdedd6bb4d8cefc URL: http://source.winehq.org/git/wine.git/?a=commit;h=f48a0d8ca30e8f39af17b531d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 3 11:25:51 2014 +0100 taskschd/tests: Don't depend on the directory lookup order. --- dlls/taskschd/tests/scheduler.c | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index 74a5263..5e906ce 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -421,6 +421,7 @@ static void test_FolderCollection(void) IUnknown *unknown; IEnumVARIANT *enumvar; ULONG count, i; + BOOL is_first; VARIANT idx; static const int vt[] = { VT_I1, VT_I2, VT_I4, VT_I8, VT_UI1, VT_UI2, VT_UI4, VT_UI8, VT_INT, VT_UINT }; @@ -507,7 +508,8 @@ static void test_FolderCollection(void) hr = ITaskFolder_get_Path(subfolder, &bstr); ok(hr == S_OK, "get_Path error %#x\n", hr); - if (i == 1) + is_first = !lstrcmpW(bstr, Wine_Folder1); + if (is_first) ok(!lstrcmpW(bstr, Wine_Folder1), "expected \\Wine\\Folder1, got %s\n", wine_dbgstr_w(bstr)); else ok(!lstrcmpW(bstr, Wine_Folder2), "expected \\Wine\\Folder2, got %s\n", wine_dbgstr_w(bstr)); @@ -515,7 +517,7 @@ static void test_FolderCollection(void) hr = ITaskFolder_get_Name(subfolder, &bstr); ok(hr == S_OK, "get_Name error %#x\n", hr); - if (i == 1) + if (is_first) ok(!lstrcmpW(bstr, Folder1), "expected Folder1, got %s\n", wine_dbgstr_w(bstr)); else ok(!lstrcmpW(bstr, Folder2), "expected Folder2, got %s\n", wine_dbgstr_w(bstr)); @@ -530,7 +532,7 @@ static void test_FolderCollection(void) hr = ITaskFolder_get_Path(subfolder, &bstr); ok(hr == S_OK, "get_Path error %#x\n", hr); - if (i == 1) + if (is_first) ok(!lstrcmpW(bstr, Wine_Folder1), "expected \\Wine\\Folder1, got %s\n", wine_dbgstr_w(bstr)); else ok(!lstrcmpW(bstr, Wine_Folder2), "expected \\Wine\\Folder2, got %s\n", wine_dbgstr_w(bstr)); @@ -538,7 +540,7 @@ static void test_FolderCollection(void) hr = ITaskFolder_get_Name(subfolder, &bstr); ok(hr == S_OK, "get_Name error %#x\n", hr); - if (i == 1) + if (is_first) ok(!lstrcmpW(bstr, Folder1), "expected Folder1, got %s\n", wine_dbgstr_w(bstr)); else ok(!lstrcmpW(bstr, Folder2), "expected Folder2, got %s\n", wine_dbgstr_w(bstr)); @@ -591,11 +593,18 @@ static void test_FolderCollection(void) ok(count == 1, "expected 1, got %d\n", count); hr = ITaskFolder_get_Path((ITaskFolder *)V_DISPATCH(&var[0]), &bstr); ok(hr == S_OK, "get_Path error %#x\n", hr); - ok(!lstrcmpW(bstr, Wine_Folder2), "expected \\Wine\\Folder2, got %s\n", wine_dbgstr_w(bstr)); + is_first = !lstrcmpW(bstr, Wine_Folder1); + if (is_first) + ok(!lstrcmpW(bstr, Wine_Folder1), "expected \\Wine\\Folder1, got %s\n", wine_dbgstr_w(bstr)); + else + ok(!lstrcmpW(bstr, Wine_Folder2), "expected \\Wine\\Folder2, got %s\n", wine_dbgstr_w(bstr)); SysFreeString(bstr); hr = ITaskFolder_get_Name((ITaskFolder *)V_DISPATCH(&var[0]), &bstr); ok(hr == S_OK, "get_Name error %#x\n", hr); - ok(!lstrcmpW(bstr, Folder2), "expected Folder2, got %s\n", wine_dbgstr_w(bstr)); + if (is_first) + ok(!lstrcmpW(bstr, Folder1), "expected Folder1, got %s\n", wine_dbgstr_w(bstr)); + else + ok(!lstrcmpW(bstr, Folder2), "expected Folder2, got %s\n", wine_dbgstr_w(bstr)); IDispatch_Release(V_DISPATCH(&var[0])); memset(var, 0, sizeof(var)); @@ -628,7 +637,8 @@ static void test_FolderCollection(void) hr = ITaskFolder_get_Path(subfolder, &bstr); ok(hr == S_OK, "get_Path error %#x\n", hr); - if (i == 0) + is_first = !lstrcmpW(bstr, Wine_Folder1); + if (is_first) ok(!lstrcmpW(bstr, Wine_Folder1), "expected \\Wine\\Folder1, got %s\n", wine_dbgstr_w(bstr)); else ok(!lstrcmpW(bstr, Wine_Folder2), "expected \\Wine\\Folder2, got %s\n", wine_dbgstr_w(bstr)); @@ -636,7 +646,7 @@ static void test_FolderCollection(void) hr = ITaskFolder_get_Name(subfolder, &bstr); ok(hr == S_OK, "get_Name error %#x\n", hr); - if (i == 0) + if (is_first) ok(!lstrcmpW(bstr, Folder1), "expected Folder1, got %s\n", wine_dbgstr_w(bstr)); else ok(!lstrcmpW(bstr, Folder2), "expected Folder2, got %s\n", wine_dbgstr_w(bstr));

1 0

Henri Verbeet : wined3d: Take the resource data type into account in shader_glsl_gen_sample_code() .
by Alexandre Julliard 03 Dec '14

03 Dec '14

Module: wine Branch: master Commit: 5c3d52468cf9f33f816d2d67d7a0022eeeead9e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c3d52468cf9f33f816d2d67d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 3 10:28:12 2014 +0100 wined3d: Take the resource data type into account in shader_glsl_gen_sample_code(). --- dlls/wined3d/glsl_shader.c | 34 +++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index a351932..0ab591f 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -65,6 +65,7 @@ struct glsl_sample_function { const char *name; DWORD coord_mask; + enum wined3d_data_type data_type; }; enum heap_node_op @@ -1800,14 +1801,15 @@ static DWORD shader_glsl_add_dst_param(const struct wined3d_shader_instruction * /* Append the destination part of the instruction to the buffer, return the effective write mask */ static DWORD shader_glsl_append_dst_ext(struct wined3d_shader_buffer *buffer, - const struct wined3d_shader_instruction *ins, const struct wined3d_shader_dst_param *dst) + const struct wined3d_shader_instruction *ins, const struct wined3d_shader_dst_param *dst, + enum wined3d_data_type data_type) { struct glsl_dst_param glsl_dst; DWORD mask; if ((mask = shader_glsl_add_dst_param(ins, dst, &glsl_dst))) { - switch (dst->reg.data_type) + switch (data_type) { case WINED3D_DATA_FLOAT: shader_addline(buffer, "%s%s = %s(", @@ -1824,7 +1826,7 @@ static DWORD shader_glsl_append_dst_ext(struct wined3d_shader_buffer *buffer, glsl_dst.reg_name, glsl_dst.mask_str, shift_glsl_tab[dst->shift]); break; default: - FIXME("Unhandled data type %#x.\n", dst->reg.data_type); + FIXME("Unhandled data type %#x.\n", data_type); shader_addline(buffer, "%s%s = %s(", glsl_dst.reg_name, glsl_dst.mask_str, shift_glsl_tab[dst->shift]); break; @@ -1837,7 +1839,7 @@ static DWORD shader_glsl_append_dst_ext(struct wined3d_shader_buffer *buffer, /* Append the destination part of the instruction to the buffer, return the effective write mask */ static DWORD shader_glsl_append_dst(struct wined3d_shader_buffer *buffer, const struct wined3d_shader_instruction *ins) { - return shader_glsl_append_dst_ext(buffer, ins, &ins->dst[0]); + return shader_glsl_append_dst_ext(buffer, ins, &ins->dst[0], ins->dst[0].reg.data_type); } /** Process GLSL instruction modifiers */ @@ -1899,6 +1901,8 @@ static void shader_glsl_get_sample_function(const struct wined3d_shader_context BOOL lod = flags & WINED3D_GLSL_SAMPLE_LOD; BOOL grad = flags & WINED3D_GLSL_SAMPLE_GRAD; + sample_function->data_type = ctx->reg_maps->resource_info[resource_idx].data_type; + /* Note that there's no such thing as a projected cube texture. */ switch (resource_type) { @@ -2265,7 +2269,7 @@ static void PRINTF_ATTR(8, 9) shader_glsl_gen_sample_code(const struct wined3d_s fixup = COLOR_FIXUP_IDENTITY; /* FIXME: Vshader color fixup */ } - shader_glsl_append_dst(ins->ctx->buffer, ins); + shader_glsl_append_dst_ext(ins->ctx->buffer, ins, &ins->dst[0], sample_function->data_type); shader_addline(ins->ctx->buffer, "%s(%s_sampler%u, ", sample_function->name, shader_glsl_get_prefix(version->type), sampler); @@ -2397,7 +2401,7 @@ static void shader_glsl_imul(const struct wined3d_shader_instruction *ins) if (ins->dst[1].reg.type != WINED3DSPR_NULL) { - write_mask = shader_glsl_append_dst_ext(buffer, ins, &ins->dst[1]); + write_mask = shader_glsl_append_dst_ext(buffer, ins, &ins->dst[1], ins->dst[1].reg.data_type); shader_glsl_add_src_param(ins, &ins->src[0], write_mask, &src0_param); shader_glsl_add_src_param(ins, &ins->src[1], write_mask, &src1_param); @@ -2425,17 +2429,17 @@ static void shader_glsl_udiv(const struct wined3d_shader_instruction *ins) shader_addline(buffer, "tmp0%s = %s / %s;\n", dst_mask, src0_param.param_str, src1_param.param_str); - write_mask = shader_glsl_append_dst_ext(buffer, ins, &ins->dst[1]); + write_mask = shader_glsl_append_dst_ext(buffer, ins, &ins->dst[1], ins->dst[1].reg.data_type); shader_glsl_add_src_param(ins, &ins->src[0], write_mask, &src0_param); shader_glsl_add_src_param(ins, &ins->src[1], write_mask, &src1_param); shader_addline(buffer, "%s %% %s));\n", src0_param.param_str, src1_param.param_str); - shader_glsl_append_dst_ext(buffer, ins, &ins->dst[0]); + shader_glsl_append_dst_ext(buffer, ins, &ins->dst[0], ins->dst[0].reg.data_type); shader_addline(buffer, "tmp0%s);\n", dst_mask); } else { - write_mask = shader_glsl_append_dst_ext(buffer, ins, &ins->dst[0]); + write_mask = shader_glsl_append_dst_ext(buffer, ins, &ins->dst[0], ins->dst[0].reg.data_type); shader_glsl_add_src_param(ins, &ins->src[0], write_mask, &src0_param); shader_glsl_add_src_param(ins, &ins->src[1], write_mask, &src1_param); shader_addline(buffer, "%s / %s);\n", src0_param.param_str, src1_param.param_str); @@ -2443,7 +2447,7 @@ static void shader_glsl_udiv(const struct wined3d_shader_instruction *ins) } else if (ins->dst[1].reg.type != WINED3DSPR_NULL) { - write_mask = shader_glsl_append_dst_ext(buffer, ins, &ins->dst[1]); + write_mask = shader_glsl_append_dst_ext(buffer, ins, &ins->dst[1], ins->dst[1].reg.data_type); shader_glsl_add_src_param(ins, &ins->src[0], write_mask, &src0_param); shader_glsl_add_src_param(ins, &ins->src[1], write_mask, &src1_param); shader_addline(buffer, "%s %% %s);\n", src0_param.param_str, src1_param.param_str); @@ -2907,7 +2911,7 @@ static void shader_glsl_conditional_move(const struct wined3d_shader_instruction continue; shader_addline(ins->ctx->buffer, "tmp0%s = (", mask_char); } - else if (!(write_mask = shader_glsl_append_dst_ext(ins->ctx->buffer, ins, &dst))) + else if (!(write_mask = shader_glsl_append_dst_ext(ins->ctx->buffer, ins, &dst, dst.reg.data_type))) continue; shader_glsl_add_src_param(ins, &ins->src[0], cmp_channel, &src0_param); @@ -3185,23 +3189,23 @@ static void shader_glsl_sincos(const struct wined3d_shader_instruction *ins) shader_glsl_add_src_param(ins, &ins->src[0], write_mask, &src0_param); shader_addline(buffer, "tmp0%s = sin(%s);\n", dst_mask, src0_param.param_str); - write_mask = shader_glsl_append_dst_ext(buffer, ins, &ins->dst[1]); + write_mask = shader_glsl_append_dst_ext(buffer, ins, &ins->dst[1], ins->dst[1].reg.data_type); shader_glsl_add_src_param(ins, &ins->src[0], write_mask, &src0_param); shader_addline(buffer, "cos(%s));\n", src0_param.param_str); - shader_glsl_append_dst_ext(buffer, ins, &ins->dst[0]); + shader_glsl_append_dst_ext(buffer, ins, &ins->dst[0], ins->dst[0].reg.data_type); shader_addline(buffer, "tmp0%s);\n", dst_mask); } else { - write_mask = shader_glsl_append_dst_ext(buffer, ins, &ins->dst[0]); + write_mask = shader_glsl_append_dst_ext(buffer, ins, &ins->dst[0], ins->dst[0].reg.data_type); shader_glsl_add_src_param(ins, &ins->src[0], write_mask, &src0_param); shader_addline(buffer, "sin(%s));\n", src0_param.param_str); } } else if (ins->dst[1].reg.type != WINED3DSPR_NULL) { - write_mask = shader_glsl_append_dst_ext(buffer, ins, &ins->dst[1]); + write_mask = shader_glsl_append_dst_ext(buffer, ins, &ins->dst[1], ins->dst[1].reg.data_type); shader_glsl_add_src_param(ins, &ins->src[0], write_mask, &src0_param); shader_addline(buffer, "cos(%s));\n", src0_param.param_str); }

1 0

Henri Verbeet : wined3d: Record the data type of shader resources.
by Alexandre Julliard 03 Dec '14

03 Dec '14

Module: wine Branch: master Commit: 3aa9fe6bef7a3440845c7410c98e3e98a79eb70f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3aa9fe6bef7a3440845c7410c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 3 10:28:11 2014 +0100 wined3d: Record the data type of shader resources. --- dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/context.c | 32 +++++++++++----------- dlls/wined3d/glsl_shader.c | 16 +++++------ dlls/wined3d/shader.c | 56 ++++++++++++++++++++++++++++++--------- dlls/wined3d/shader_sm1.c | 1 + dlls/wined3d/shader_sm4.c | 36 +++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 11 +++++++- 7 files changed, 115 insertions(+), 39 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3aa9fe6bef7a3440845c7…

1 0

Henri Verbeet : wined3d: Handle SM4 resource declarations.
by Alexandre Julliard 03 Dec '14

03 Dec '14

Module: wine Branch: master Commit: f7e485dcf4971973a99ddb2be00d17e1e89e09c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7e485dcf4971973a99ddb2be… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 3 10:28:10 2014 +0100 wined3d: Handle SM4 resource declarations. --- dlls/wined3d/shader.c | 47 ++++++++++++++++++++++++++++++++++++++ dlls/wined3d/shader_sm4.c | 51 +++++++++++++++++++++++++++++++++++++++++- dlls/wined3d/wined3d_private.h | 5 +++++ 3 files changed, 102 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 39ac45e..b0aabd9 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -663,6 +663,7 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st break; case WINED3DSPR_SAMPLER: + case WINED3DSPR_RESOURCE: if (reg_idx >= ARRAY_SIZE(reg_maps->resource_type)) { ERR("Invalid resource index %u.\n", reg_idx); @@ -1017,6 +1018,52 @@ static void shader_dump_decl_usage(const struct wined3d_shader_semantic *semanti break; } } + else if (semantic->reg.reg.type == WINED3DSPR_RESOURCE) + { + TRACE("_resource_"); + switch (semantic->resource_type) + { + case WINED3D_SHADER_RESOURCE_BUFFER: + TRACE("buffer"); + break; + + case WINED3D_SHADER_RESOURCE_TEXTURE_1D: + TRACE("texture1d"); + break; + + case WINED3D_SHADER_RESOURCE_TEXTURE_2D: + TRACE("texture2d"); + break; + + case WINED3D_SHADER_RESOURCE_TEXTURE_2DMS: + TRACE("texture2dms"); + break; + + case WINED3D_SHADER_RESOURCE_TEXTURE_3D: + TRACE("texture3d"); + break; + + case WINED3D_SHADER_RESOURCE_TEXTURE_CUBE: + TRACE("texturecube"); + break; + + case WINED3D_SHADER_RESOURCE_TEXTURE_1DARRAY: + TRACE("texture1darray"); + break; + + case WINED3D_SHADER_RESOURCE_TEXTURE_2DARRAY: + TRACE("texture2darray"); + break; + + case WINED3D_SHADER_RESOURCE_TEXTURE_2DMSARRAY: + TRACE("texture2dmsarray"); + break; + + default: + TRACE("unknown"); + break; + } + } else { /* Pixel shaders 3.0 don't have usage semantics. */ diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index ac0fab5..b3bf156 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -29,6 +29,9 @@ WINE_DECLARE_DEBUG_CHANNEL(d3d_bytecode); #define WINED3D_SM4_INSTRUCTION_LENGTH_SHIFT 24 #define WINED3D_SM4_INSTRUCTION_LENGTH_MASK (0x1f << WINED3D_SM4_INSTRUCTION_LENGTH_SHIFT) +#define WINED3D_SM4_RESOURCE_TYPE_SHIFT 11 +#define WINED3D_SM4_RESOURCE_TYPE_MASK (0xf << WINED3D_SM4_RESOURCE_TYPE_SHIFT) + #define WINED3D_SM4_PRIMITIVE_TYPE_SHIFT 11 #define WINED3D_SM4_PRIMITIVE_TYPE_MASK (0x7 << WINED3D_SM4_PRIMITIVE_TYPE_SHIFT) @@ -121,6 +124,7 @@ enum wined3d_sm4_opcode WINED3D_SM4_OP_USHR = 0x55, WINED3D_SM4_OP_UTOF = 0x56, WINED3D_SM4_OP_XOR = 0x57, + WINED3D_SM4_OP_DCL_RESOURCE = 0x58, WINED3D_SM4_OP_DCL_CONSTANT_BUFFER = 0x59, WINED3D_SM4_OP_DCL_OUTPUT_TOPOLOGY = 0x5c, WINED3D_SM4_OP_DCL_INPUT_PRIMITIVE = 0x5d, @@ -134,6 +138,7 @@ enum wined3d_sm4_register_type WINED3D_SM4_RT_OUTPUT = 0x2, WINED3D_SM4_RT_IMMCONST = 0x4, WINED3D_SM4_RT_SAMPLER = 0x6, + WINED3D_SM4_RT_RESOURCE = 0x7, WINED3D_SM4_RT_CONSTBUFFER = 0x8, WINED3D_SM4_RT_PRIMID = 0xb, WINED3D_SM4_RT_NULL = 0xd, @@ -167,6 +172,19 @@ enum wined3d_sm4_immconst_type WINED3D_SM4_IMMCONST_VEC4 = 0x2, }; +enum wined3d_sm4_resource_type +{ + WINED3D_SM4_RESOURCE_BUFFER = 0x1, + WINED3D_SM4_RESOURCE_TEXTURE_1D = 0x2, + WINED3D_SM4_RESOURCE_TEXTURE_2D = 0x3, + WINED3D_SM4_RESOURCE_TEXTURE_2DMS = 0x4, + WINED3D_SM4_RESOURCE_TEXTURE_3D = 0x5, + WINED3D_SM4_RESOURCE_TEXTURE_CUBE = 0x6, + WINED3D_SM4_RESOURCE_TEXTURE_1DARRAY = 0x7, + WINED3D_SM4_RESOURCE_TEXTURE_2DARRAY = 0x8, + WINED3D_SM4_RESOURCE_TEXTURE_2DMSARRAY = 0x9, +}; + struct wined3d_shader_src_param_entry { struct list entry; @@ -264,6 +282,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM4_OP_USHR, WINED3DSIH_USHR, "U", "UU"}, {WINED3D_SM4_OP_UTOF, WINED3DSIH_UTOF, "F", "U"}, {WINED3D_SM4_OP_XOR, WINED3DSIH_XOR, "U", "UU"}, + {WINED3D_SM4_OP_DCL_RESOURCE, WINED3DSIH_DCL, "R", ""}, {WINED3D_SM4_OP_DCL_CONSTANT_BUFFER, WINED3DSIH_DCL_CONSTANT_BUFFER, "", ""}, {WINED3D_SM4_OP_DCL_OUTPUT_TOPOLOGY, WINED3DSIH_DCL_OUTPUT_TOPOLOGY, "", ""}, {WINED3D_SM4_OP_DCL_INPUT_PRIMITIVE, WINED3DSIH_DCL_INPUT_PRIMITIVE, "", ""}, @@ -323,6 +342,20 @@ static const struct sysval_map sysval_map[] = {WINED3D_SV_TARGET7, WINED3DSPR_COLOROUT, 7}, }; +static const enum wined3d_shader_resource_type resource_type_table[] = +{ + /* 0 */ WINED3D_SHADER_RESOURCE_NONE, + /* WINED3D_SM4_RESOURCE_BUFFER */ WINED3D_SHADER_RESOURCE_BUFFER, + /* WINED3D_SM4_RESOURCE_TEXTURE_1D */ WINED3D_SHADER_RESOURCE_TEXTURE_1D, + /* WINED3D_SM4_RESOURCE_TEXTURE_2D */ WINED3D_SHADER_RESOURCE_TEXTURE_2D, + /* WINED3D_SM4_RESOURCE_TEXTURE_2DMS */ WINED3D_SHADER_RESOURCE_TEXTURE_2DMS, + /* WINED3D_SM4_RESOURCE_TEXTURE_3D */ WINED3D_SHADER_RESOURCE_TEXTURE_3D, + /* WINED3D_SM4_RESOURCE_TEXTURE_CUBE */ WINED3D_SHADER_RESOURCE_TEXTURE_CUBE, + /* WINED3D_SM4_RESOURCE_TEXTURE_1DARRAY */ WINED3D_SHADER_RESOURCE_TEXTURE_1DARRAY, + /* WINED3D_SM4_RESOURCE_TEXTURE_2DARRAY */ WINED3D_SHADER_RESOURCE_TEXTURE_2DARRAY, + /* WINED3D_SM4_RESOURCE_TEXTURE_2DMSARRAY */ WINED3D_SHADER_RESOURCE_TEXTURE_2DMSARRAY, +}; + static BOOL shader_sm4_read_src_param(struct wined3d_sm4_data *priv, const DWORD **ptr, enum wined3d_data_type data_type, struct wined3d_shader_src_param *src_param); @@ -743,7 +776,23 @@ static void shader_sm4_read_instruction(void *data, const DWORD **ptr, struct wi FIXME("Skipping modifier 0x%08x.\n", modifier); } - if (opcode == WINED3D_SM4_OP_DCL_CONSTANT_BUFFER) + if (opcode == WINED3D_SM4_OP_DCL_RESOURCE) + { + enum wined3d_sm4_resource_type resource_type; + + resource_type = (opcode_token & WINED3D_SM4_RESOURCE_TYPE_MASK) >> WINED3D_SM4_RESOURCE_TYPE_SHIFT; + if (!resource_type || (resource_type >= ARRAY_SIZE(resource_type_table))) + { + FIXME("Unhandled resource type %#x.\n", resource_type); + ins->declaration.semantic.resource_type = WINED3D_SHADER_RESOURCE_NONE; + } + else + { + ins->declaration.semantic.resource_type = resource_type_table[resource_type]; + } + shader_sm4_read_dst_param(priv, &p, WINED3D_DATA_RESOURCE, &ins->declaration.semantic.reg); + } + else if (opcode == WINED3D_SM4_OP_DCL_CONSTANT_BUFFER) { shader_sm4_read_src_param(priv, &p, WINED3D_DATA_FLOAT, &ins->declaration.src); if (opcode_token & WINED3D_SM4_INDEX_TYPE_MASK) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 2020d78..a1e5dea 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -286,10 +286,15 @@ extern struct wined3d_settings wined3d_settings DECLSPEC_HIDDEN; enum wined3d_shader_resource_type { WINED3D_SHADER_RESOURCE_NONE, + WINED3D_SHADER_RESOURCE_BUFFER, WINED3D_SHADER_RESOURCE_TEXTURE_1D, WINED3D_SHADER_RESOURCE_TEXTURE_2D, + WINED3D_SHADER_RESOURCE_TEXTURE_2DMS, WINED3D_SHADER_RESOURCE_TEXTURE_3D, WINED3D_SHADER_RESOURCE_TEXTURE_CUBE, + WINED3D_SHADER_RESOURCE_TEXTURE_1DARRAY, + WINED3D_SHADER_RESOURCE_TEXTURE_2DARRAY, + WINED3D_SHADER_RESOURCE_TEXTURE_2DMSARRAY, }; #define WINED3D_SHADER_CONST_VS_F 0x00000001

1 0

Henri Verbeet : wined3d: Store resource types instead of sampler types in struct wined3d_shader_reg_maps.
by Alexandre Julliard 03 Dec '14

03 Dec '14

Module: wine Branch: master Commit: f5cef4373828a998507d4a02b0cc83d42a49606f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5cef4373828a998507d4a02b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 3 10:28:09 2014 +0100 wined3d: Store resource types instead of sampler types in struct wined3d_shader_reg_maps. The difference doesn't really matter for SM1-3 since resources and samplers are always tied together, but in SM4 they're separate. --- dlls/wined3d/arb_program_shader.c | 17 ++-- dlls/wined3d/context.c | 42 ++++----- dlls/wined3d/glsl_shader.c | 188 +++++++++++++++++++------------------- dlls/wined3d/shader.c | 64 +++++++------ dlls/wined3d/shader_sm1.c | 34 ++++++- dlls/wined3d/wined3d_private.h | 18 ++-- 6 files changed, 203 insertions(+), 160 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f5cef4373828a998507d4…

1 0

Henri Verbeet : wined3d: Validate register indices for WINED3DSIH_DCL instructions.
by Alexandre Julliard 03 Dec '14

03 Dec '14

Module: wine Branch: master Commit: 5ccda82acce206b72e681d0d7c5505e711df2465 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ccda82acce206b72e681d0d7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 3 10:28:08 2014 +0100 wined3d: Validate register indices for WINED3DSIH_DCL instructions. --- dlls/wined3d/shader.c | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 796a924..95ce397 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -634,26 +634,42 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st if (ins.handler_idx == WINED3DSIH_DCL) { struct wined3d_shader_semantic *semantic = &ins.declaration.semantic; + unsigned int reg_idx = semantic->reg.reg.idx[0].offset; switch (semantic->reg.reg.type) { /* Mark input registers used. */ case WINED3DSPR_INPUT: - reg_maps->input_registers |= 1 << semantic->reg.reg.idx[0].offset; - shader_signature_from_semantic(&input_signature[semantic->reg.reg.idx[0].offset], semantic); + if (reg_idx >= MAX_REG_INPUT) + { + ERR("Invalid input register index %u.\n", reg_idx); + break; + } + reg_maps->input_registers |= 1 << reg_idx; + shader_signature_from_semantic(&input_signature[reg_idx], semantic); break; /* Vertex shader: mark 3.0 output registers used, save token. */ case WINED3DSPR_OUTPUT: - reg_maps->output_registers |= 1 << semantic->reg.reg.idx[0].offset; - shader_signature_from_semantic(&output_signature[semantic->reg.reg.idx[0].offset], semantic); + if (reg_idx >= MAX_REG_OUTPUT) + { + ERR("Invalid output register index %u.\n", reg_idx); + break; + } + reg_maps->output_registers |= 1 << reg_idx; + shader_signature_from_semantic(&output_signature[reg_idx], semantic); if (semantic->usage == WINED3D_DECL_USAGE_FOG) reg_maps->fog = 1; break; /* Save sampler usage token. */ case WINED3DSPR_SAMPLER: - reg_maps->sampler_type[semantic->reg.reg.idx[0].offset] = semantic->sampler_type; + if (reg_idx >= ARRAY_SIZE(reg_maps->sampler_type)) + { + ERR("Invalid sampler index %u.\n", reg_idx); + break; + } + reg_maps->sampler_type[reg_idx] = semantic->sampler_type; break; default:

1 0

Vincent Povirk : cabinet: Accept hf == 0 in FDIIsCabinet.
by Alexandre Julliard 03 Dec '14

03 Dec '14

Module: wine Branch: master Commit: c97da4c944743b1f6871cb2e8db0651b8cbabb13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c97da4c944743b1f6871cb2e8… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Dec 2 16:28:59 2014 -0600 cabinet: Accept hf == 0 in FDIIsCabinet. --- dlls/cabinet/fdi.c | 5 ----- dlls/cabinet/tests/fdi.c | 2 -- 2 files changed, 7 deletions(-) diff --git a/dlls/cabinet/fdi.c b/dlls/cabinet/fdi.c index ae0576b..aedd972 100644 --- a/dlls/cabinet/fdi.c +++ b/dlls/cabinet/fdi.c @@ -702,11 +702,6 @@ BOOL __cdecl FDIIsCabinet(HFDI hfdi, INT_PTR hf, PFDICABINETINFO pfdici) if (!fdi) return FALSE; - if (!hf) { - SetLastError(ERROR_INVALID_HANDLE); - return FALSE; - } - if (!pfdici) { SetLastError(ERROR_BAD_ARGUMENTS); return FALSE; diff --git a/dlls/cabinet/tests/fdi.c b/dlls/cabinet/tests/fdi.c index fe9a2e3..b5bec38 100644 --- a/dlls/cabinet/tests/fdi.c +++ b/dlls/cabinet/tests/fdi.c @@ -727,14 +727,12 @@ static void test_FDIIsCabinet(void) ZeroMemory(&cabinfo, sizeof(FDICABINETINFO)); SetLastError(0xdeadbeef); ret = FDIIsCabinet(hfdi, 0, &cabinfo); -todo_wine { ok(ret == TRUE, "Expected TRUE, got %d\n", ret); ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", GetLastError()); ok(cabinfo.cFiles == 4, "Expected 4, got %d\n", cabinfo.cFiles); ok(cabinfo.cFolders == 1, "Expected 1, got %d\n", cabinfo.cFolders); ok(cabinfo.setID == 0xbeef, "Expected 0xbeef, got %d\n", cabinfo.setID); ok(cabinfo.cbCabinet == 182, "Expected 182, got %d\n", cabinfo.cbCabinet); -} ok(cabinfo.iCabinet == 0, "Expected 0, got %d\n", cabinfo.iCabinet); fdi_close(static_fdi_handle);

1 0

Vincent Povirk : cabinet/tests: Add test for calling FDIIsCabinet with hf == 0.
by Alexandre Julliard 03 Dec '14

03 Dec '14

Module: wine Branch: master Commit: 685c68ba61cb01f1ab4d68bd5f75fb9bed74bd3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=685c68ba61cb01f1ab4d68bd5… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Dec 2 16:27:46 2014 -0600 cabinet/tests: Add test for calling FDIIsCabinet with hf == 0. --- dlls/cabinet/tests/fdi.c | 57 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/dlls/cabinet/tests/fdi.c b/dlls/cabinet/tests/fdi.c index 4ed967a..fe9a2e3 100644 --- a/dlls/cabinet/tests/fdi.c +++ b/dlls/cabinet/tests/fdi.c @@ -187,6 +187,39 @@ static LONG CDECL fdi_seek(INT_PTR hf, LONG dist, int seektype) return SetFilePointer(handle, dist, NULL, seektype); } +/* Callbacks for testing FDIIsCabinet with hf == 0 */ +static INT_PTR static_fdi_handle; + +static INT_PTR CDECL fdi_open_static(char *pszFile, int oflag, int pmode) +{ + ok(0, "FDIIsCabinet shouldn't call pfnopen\n"); + return 1; +} + +static UINT CDECL fdi_read_static(INT_PTR hf, void *pv, UINT cb) +{ + ok(hf == 0, "unexpected hf %lx\n", hf); + return fdi_read(static_fdi_handle, pv, cb); +} + +static UINT CDECL fdi_write_static(INT_PTR hf, void *pv, UINT cb) +{ + ok(0, "FDIIsCabinet shouldn't call pfnwrite\n"); + return 0; +} + +static int CDECL fdi_close_static(INT_PTR hf) +{ + ok(0, "FDIIsCabinet shouldn't call pfnclose\n"); + return 0; +} + +static LONG CDECL fdi_seek_static(INT_PTR hf, LONG dist, int seektype) +{ + ok(hf == 0, "unexpected hf %lx\n", hf); + return fdi_seek(static_fdi_handle, dist, seektype); +} + static void test_FDICreate(void) { HFDI hfdi; @@ -683,6 +716,30 @@ static void test_FDIIsCabinet(void) fdi_close(fd); FDIDestroy(hfdi); + + hfdi = FDICreate(fdi_alloc, fdi_free, fdi_open_static, fdi_read_static, + fdi_write_static, fdi_close_static, fdi_seek_static, + cpuUNKNOWN, &erf); + ok(hfdi != NULL, "Expected non-NULL context\n"); + + /* FDIIsCabinet accepts hf == 0 even though it's not a valid result of pfnopen */ + static_fdi_handle = fdi_open(extract, 0, 0); + ZeroMemory(&cabinfo, sizeof(FDICABINETINFO)); + SetLastError(0xdeadbeef); + ret = FDIIsCabinet(hfdi, 0, &cabinfo); +todo_wine { + ok(ret == TRUE, "Expected TRUE, got %d\n", ret); + ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", GetLastError()); + ok(cabinfo.cFiles == 4, "Expected 4, got %d\n", cabinfo.cFiles); + ok(cabinfo.cFolders == 1, "Expected 1, got %d\n", cabinfo.cFolders); + ok(cabinfo.setID == 0xbeef, "Expected 0xbeef, got %d\n", cabinfo.setID); + ok(cabinfo.cbCabinet == 182, "Expected 182, got %d\n", cabinfo.cbCabinet); +} + ok(cabinfo.iCabinet == 0, "Expected 0, got %d\n", cabinfo.iCabinet); + + fdi_close(static_fdi_handle); + FDIDestroy(hfdi); + delete_test_files(); }

1 0

Martin Storsjo : api-ms-win-core-winrt-l1-1-0: Add stub dll.
by Alexandre Julliard 02 Dec '14

02 Dec '14

Module: wine Branch: master Commit: 77e061f7f139f5a447e62c4df7647065cb72c22e URL: http://source.winehq.org/git/wine.git/?a=commit;h=77e061f7f139f5a447e62c4df… Author: Martin Storsjo <martin(a)martin.st> Date: Mon Dec 1 12:27:06 2014 +0200 api-ms-win-core-winrt-l1-1-0: Add stub dll. --- configure | 2 + configure.ac | 1 + dlls/api-ms-win-core-winrt-l1-1-0/Makefile.in | 5 +++ .../api-ms-win-core-winrt-l1-1-0.spec | 9 ++++ dlls/api-ms-win-core-winrt-l1-1-0/main.c | 51 ++++++++++++++++++++++ 5 files changed, 68 insertions(+) diff --git a/configure b/configure index 3ddeb77..be06b95 100755 --- a/configure +++ b/configure @@ -889,6 +889,7 @@ enable_api_ms_win_core_timezone_l1_1_0 enable_api_ms_win_core_url_l1_1_0 enable_api_ms_win_core_util_l1_1_0 enable_api_ms_win_core_winrt_error_l1_1_0 +enable_api_ms_win_core_winrt_l1_1_0 enable_api_ms_win_core_winrt_string_l1_1_0 enable_api_ms_win_downlevel_advapi32_l1_1_0 enable_api_ms_win_downlevel_advapi32_l2_1_0 @@ -16806,6 +16807,7 @@ wine_fn_config_dll api-ms-win-core-timezone-l1-1-0 enable_api_ms_win_core_timezo wine_fn_config_dll api-ms-win-core-url-l1-1-0 enable_api_ms_win_core_url_l1_1_0 wine_fn_config_dll api-ms-win-core-util-l1-1-0 enable_api_ms_win_core_util_l1_1_0 wine_fn_config_dll api-ms-win-core-winrt-error-l1-1-0 enable_api_ms_win_core_winrt_error_l1_1_0 +wine_fn_config_dll api-ms-win-core-winrt-l1-1-0 enable_api_ms_win_core_winrt_l1_1_0 wine_fn_config_dll api-ms-win-core-winrt-string-l1-1-0 enable_api_ms_win_core_winrt_string_l1_1_0 wine_fn_config_dll api-ms-win-downlevel-advapi32-l1-1-0 enable_api_ms_win_downlevel_advapi32_l1_1_0 wine_fn_config_dll api-ms-win-downlevel-advapi32-l2-1-0 enable_api_ms_win_downlevel_advapi32_l2_1_0 diff --git a/configure.ac b/configure.ac index 61bc2ad..c33869e 100644 --- a/configure.ac +++ b/configure.ac @@ -2681,6 +2681,7 @@ WINE_CONFIG_DLL(api-ms-win-core-timezone-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-url-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-util-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-winrt-error-l1-1-0) +WINE_CONFIG_DLL(api-ms-win-core-winrt-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-winrt-string-l1-1-0) WINE_CONFIG_DLL(api-ms-win-downlevel-advapi32-l1-1-0) WINE_CONFIG_DLL(api-ms-win-downlevel-advapi32-l2-1-0) diff --git a/dlls/api-ms-win-core-winrt-l1-1-0/Makefile.in b/dlls/api-ms-win-core-winrt-l1-1-0/Makefile.in new file mode 100644 index 0000000..7ce8241 --- /dev/null +++ b/dlls/api-ms-win-core-winrt-l1-1-0/Makefile.in @@ -0,0 +1,5 @@ +MODULE = api-ms-win-core-winrt-l1-1-0.dll +IMPORTS = ole32 + +C_SRCS = \ + main.c diff --git a/dlls/api-ms-win-core-winrt-l1-1-0/api-ms-win-core-winrt-l1-1-0.spec b/dlls/api-ms-win-core-winrt-l1-1-0/api-ms-win-core-winrt-l1-1-0.spec new file mode 100644 index 0000000..344265a --- /dev/null +++ b/dlls/api-ms-win-core-winrt-l1-1-0/api-ms-win-core-winrt-l1-1-0.spec @@ -0,0 +1,9 @@ +@ stub RoActivateInstance +@ stub RoGetActivationFactory +@ stub RoGetApartmentIdentifier +@ stdcall RoInitialize(long) +@ stub RoRegisterActivationFactories +@ stub RoRegisterForApartmentShutdown +@ stub RoRevokeActivationFactories +@ stdcall RoUninitialize() +@ stub RoUnregisterForApartmentShutdown diff --git a/dlls/api-ms-win-core-winrt-l1-1-0/main.c b/dlls/api-ms-win-core-winrt-l1-1-0/main.c new file mode 100644 index 0000000..4cf1105 --- /dev/null +++ b/dlls/api-ms-win-core-winrt-l1-1-0/main.c @@ -0,0 +1,51 @@ +/* + * Copyright 2014 Martin Storsjo + * + * 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 "objbase.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(winrt); + +typedef enum +{ + RO_INIT_SINGLETHREADED = 0, + RO_INIT_MULTITHREADED = 1, +} RO_INIT_TYPE; + +/*********************************************************************** + * RoInitialize (api-ms-win-core-winrt-l1-1-0.@) + */ +HRESULT WINAPI RoInitialize(RO_INIT_TYPE type) +{ + switch (type) { + case RO_INIT_SINGLETHREADED: + return CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + default: + FIXME("type %d\n", type); + case RO_INIT_MULTITHREADED: + return CoInitializeEx(NULL, COINIT_MULTITHREADED); + } +} + +/*********************************************************************** + * RoUninitialize (api-ms-win-core-winrt-l1-1-0.@) + */ +void WINAPI RoUninitialize(void) +{ + CoUninitialize(); +}

1 0

← Newer
1
...
24
25
26
27
28
29
30
31
32
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2014