January 2017 - Wine-Commits

Józef Kucia : wined3d: Implement SM5 firstbit_* instructions.
by Alexandre Julliard Jan. 31, 2017

Jan. 31, 2017

Module: wine Branch: master Commit: ab6557fd9719b36092a39009eccbbd32bef72ce6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab6557fd9719b36092a39009e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sat Jan 28 17:14:11 2017 +0100 wined3d: Implement SM5 firstbit_* instructions. 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 | 3 +++ dlls/wined3d/glsl_shader.c | 9 +++++++++ dlls/wined3d/shader.c | 3 +++ dlls/wined3d/shader_sm4.c | 6 ++++++ dlls/wined3d/wined3d_private.h | 3 +++ 5 files changed, 24 insertions(+) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 0ab724c..3dbf584 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5109,6 +5109,9 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_F16TOF32 */ NULL, /* WINED3DSIH_F32TOF16 */ NULL, /* WINED3DSIH_FCALL */ NULL, + /* WINED3DSIH_FIRSTBIT_HI */ NULL, + /* WINED3DSIH_FIRSTBIT_LO */ NULL, + /* WINED3DSIH_FIRSTBIT_SHI */ NULL, /* WINED3DSIH_FRC */ shader_hw_map2gl, /* WINED3DSIH_FTOI */ NULL, /* WINED3DSIH_FTOU */ NULL, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index eaa903a..cdd440d 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3731,6 +3731,9 @@ static void shader_glsl_map2gl(const struct wined3d_shader_instruction *ins) case WINED3DSIH_DSY: instruction = "ycorrection.y * dFdy"; break; case WINED3DSIH_DSY_COARSE: instruction = "ycorrection.y * dFdyCoarse"; break; case WINED3DSIH_DSY_FINE: instruction = "ycorrection.y * dFdyFine"; break; + case WINED3DSIH_FIRSTBIT_HI: instruction = "findMSB"; break; + case WINED3DSIH_FIRSTBIT_LO: instruction = "findLSB"; break; + case WINED3DSIH_FIRSTBIT_SHI: instruction = "findMSB"; break; case WINED3DSIH_FRC: instruction = "fract"; break; case WINED3DSIH_IMAX: instruction = "max"; break; case WINED3DSIH_IMIN: instruction = "min"; break; @@ -3750,6 +3753,9 @@ static void shader_glsl_map2gl(const struct wined3d_shader_instruction *ins) write_mask = shader_glsl_append_dst(buffer, ins); + /* In D3D bits are numbered from the most significant bit. */ + if (ins->handler_idx == WINED3DSIH_FIRSTBIT_HI || ins->handler_idx == WINED3DSIH_FIRSTBIT_SHI) + shader_addline(buffer, "31 - "); shader_addline(buffer, "%s(", instruction); if (ins->src_count) @@ -8963,6 +8969,9 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_F16TOF32 */ shader_glsl_float16, /* WINED3DSIH_F32TOF16 */ shader_glsl_float16, /* WINED3DSIH_FCALL */ NULL, + /* WINED3DSIH_FIRSTBIT_HI */ shader_glsl_map2gl, + /* WINED3DSIH_FIRSTBIT_LO */ shader_glsl_map2gl, + /* WINED3DSIH_FIRSTBIT_SHI */ shader_glsl_map2gl, /* WINED3DSIH_FRC */ shader_glsl_map2gl, /* WINED3DSIH_FTOI */ shader_glsl_to_int, /* WINED3DSIH_FTOU */ shader_glsl_to_uint, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index a4e74fd..d3dbca3 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -134,6 +134,9 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_F16TOF32 */ "f16tof32", /* WINED3DSIH_F32TOF16 */ "f32tof16", /* WINED3DSIH_FCALL */ "fcall", + /* WINED3DSIH_FIRSTBIT_HI */ "firstbit_hi", + /* WINED3DSIH_FIRSTBIT_LO */ "firstbit_lo", + /* WINED3DSIH_FIRSTBIT_SHI */ "firstbit_shi", /* WINED3DSIH_FRC */ "frc", /* WINED3DSIH_FTOI */ "ftoi", /* WINED3DSIH_FTOU */ "ftou", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index a7adb64..bcb55af 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -234,6 +234,9 @@ enum wined3d_sm4_opcode WINED3D_SM5_OP_F32TOF16 = 0x82, WINED3D_SM5_OP_F16TOF32 = 0x83, WINED3D_SM5_OP_COUNTBITS = 0x86, + WINED3D_SM5_OP_FIRSTBIT_HI = 0x87, + WINED3D_SM5_OP_FIRSTBIT_LO = 0x88, + WINED3D_SM5_OP_FIRSTBIT_SHI = 0x89, WINED3D_SM5_OP_UBFE = 0x8a, WINED3D_SM5_OP_BFI = 0x8c, WINED3D_SM5_OP_BFREV = 0x8d, @@ -928,6 +931,9 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM5_OP_F32TOF16, WINED3DSIH_F32TOF16, "u", "f"}, {WINED3D_SM5_OP_F16TOF32, WINED3DSIH_F16TOF32, "f", "u"}, {WINED3D_SM5_OP_COUNTBITS, WINED3DSIH_COUNTBITS, "u", "u"}, + {WINED3D_SM5_OP_FIRSTBIT_HI, WINED3DSIH_FIRSTBIT_HI, "u", "u"}, + {WINED3D_SM5_OP_FIRSTBIT_LO, WINED3DSIH_FIRSTBIT_LO, "u", "u"}, + {WINED3D_SM5_OP_FIRSTBIT_SHI, WINED3DSIH_FIRSTBIT_SHI, "u", "i"}, {WINED3D_SM5_OP_UBFE, WINED3DSIH_UBFE, "u", "iiu"}, {WINED3D_SM5_OP_BFI, WINED3DSIH_BFI, "u", "iiuu"}, {WINED3D_SM5_OP_BFREV, WINED3DSIH_BFREV, "u", "u"}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ff8337d..436cade 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -664,6 +664,9 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_F16TOF32, WINED3DSIH_F32TOF16, WINED3DSIH_FCALL, + WINED3DSIH_FIRSTBIT_HI, + WINED3DSIH_FIRSTBIT_LO, + WINED3DSIH_FIRSTBIT_SHI, WINED3DSIH_FRC, WINED3DSIH_FTOI, WINED3DSIH_FTOU,

1 0

Guillaume Charifi : wined3d: Recognize SM5 dcl_resource_raw instruction.
by Alexandre Julliard Jan. 31, 2017

Jan. 31, 2017

Module: wine Branch: master Commit: 107c6f078264779ca0354003c2c43df27df0e266 URL: http://source.winehq.org/git/wine.git/?a=commit;h=107c6f078264779ca0354003c… Author: Guillaume Charifi <guillaume.charifi(a)sfr.fr> Date: Sun Jan 29 13:37:23 2017 +0100 wined3d: Recognize SM5 dcl_resource_raw instruction. Signed-off-by: Guillaume Charifi <guillaume.charifi(a)sfr.fr> 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 | 6 ++++++ dlls/wined3d/shader_sm4.c | 10 ++++++++++ dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 19 insertions(+) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 3dbf584..d433f8c 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5066,6 +5066,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_DCL_OUTPUT_CONTROL_POINT_COUNT */ NULL, /* WINED3DSIH_DCL_OUTPUT_SIV */ NULL, /* WINED3DSIH_DCL_OUTPUT_TOPOLOGY */ shader_hw_nop, + /* WINED3DSIH_DCL_RESOURCE_RAW */ NULL, /* WINED3DSIH_DCL_RESOURCE_STRUCTURED */ NULL, /* WINED3DSIH_DCL_SAMPLER */ NULL, /* WINED3DSIH_DCL_STREAM */ NULL, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index cdd440d..f0c19fc 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8926,6 +8926,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_DCL_OUTPUT_CONTROL_POINT_COUNT */ NULL, /* WINED3DSIH_DCL_OUTPUT_SIV */ shader_glsl_nop, /* WINED3DSIH_DCL_OUTPUT_TOPOLOGY */ shader_glsl_nop, + /* WINED3DSIH_DCL_RESOURCE_RAW */ NULL, /* WINED3DSIH_DCL_RESOURCE_STRUCTURED */ NULL, /* WINED3DSIH_DCL_SAMPLER */ shader_glsl_nop, /* WINED3DSIH_DCL_STREAM */ NULL, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index d3dbca3..0368ae1 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -91,6 +91,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_DCL_OUTPUT_CONTROL_POINT_COUNT */ "dcl_output_control_point_count", /* WINED3DSIH_DCL_OUTPUT_SIV */ "dcl_output_siv", /* WINED3DSIH_DCL_OUTPUT_TOPOLOGY */ "dcl_outputTopology", + /* WINED3DSIH_DCL_RESOURCE_RAW */ "dcl_resource_raw", /* WINED3DSIH_DCL_RESOURCE_STRUCTURED */ "dcl_resource_structured", /* WINED3DSIH_DCL_SAMPLER */ "dcl_sampler", /* WINED3DSIH_DCL_STREAM */ "dcl_stream", @@ -2442,6 +2443,11 @@ static void shader_trace_init(const struct wined3d_shader_frontend *fe, void *fe shader_opcode_names[ins.handler_idx], ins.declaration.fp.index, ins.declaration.fp.array_size, ins.declaration.fp.body_count); } + else if (ins.handler_idx == WINED3DSIH_DCL_RESOURCE_RAW) + { + shader_addline(&buffer, "%s ", shader_opcode_names[ins.handler_idx]); + shader_dump_dst_param(&buffer, &ins.declaration.dst, &shader_version); + } else if (ins.handler_idx == WINED3DSIH_DCL_RESOURCE_STRUCTURED) { shader_addline(&buffer, "%s ", shader_opcode_names[ins.handler_idx]); diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index bcb55af..9bd9b62 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -258,6 +258,7 @@ enum wined3d_sm4_opcode WINED3D_SM5_OP_DCL_UAV_STRUCTURED = 0x9e, WINED3D_SM5_OP_DCL_TGSM_RAW = 0x9f, WINED3D_SM5_OP_DCL_TGSM_STRUCTURED = 0xa0, + WINED3D_SM5_OP_DCL_RESOURCE_RAW = 0xa1, WINED3D_SM5_OP_DCL_RESOURCE_STRUCTURED = 0xa2, WINED3D_SM5_OP_LD_UAV_TYPED = 0xa3, WINED3D_SM5_OP_STORE_UAV_TYPED = 0xa4, @@ -774,6 +775,13 @@ static void shader_sm5_read_dcl_resource_structured(struct wined3d_shader_instru ins->declaration.structured_resource.byte_stride = *tokens; } +static void shader_sm5_read_dcl_resource_raw(struct wined3d_shader_instruction *ins, + DWORD opcode, DWORD opcode_token, const DWORD *tokens, unsigned int token_count, + struct wined3d_sm4_data *priv) +{ + shader_sm4_read_dst_param(priv, &tokens, WINED3D_DATA_RESOURCE, &ins->declaration.dst); +} + static void shader_sm5_read_sync(struct wined3d_shader_instruction *ins, DWORD opcode, DWORD opcode_token, const DWORD *tokens, unsigned int token_count, struct wined3d_sm4_data *priv) @@ -971,6 +979,8 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = shader_sm5_read_dcl_tgsm_raw}, {WINED3D_SM5_OP_DCL_TGSM_STRUCTURED, WINED3DSIH_DCL_TGSM_STRUCTURED, "", "", shader_sm5_read_dcl_tgsm_structured}, + {WINED3D_SM5_OP_DCL_RESOURCE_RAW, WINED3DSIH_DCL_RESOURCE_RAW, "", "", + shader_sm5_read_dcl_resource_raw}, {WINED3D_SM5_OP_DCL_RESOURCE_STRUCTURED, WINED3DSIH_DCL_RESOURCE_STRUCTURED, "", "", shader_sm5_read_dcl_resource_structured}, {WINED3D_SM5_OP_LD_UAV_TYPED, WINED3DSIH_LD_UAV_TYPED, "u", "iU"}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 436cade..d7f9081 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -621,6 +621,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_DCL_OUTPUT_CONTROL_POINT_COUNT, WINED3DSIH_DCL_OUTPUT_SIV, WINED3DSIH_DCL_OUTPUT_TOPOLOGY, + WINED3DSIH_DCL_RESOURCE_RAW, WINED3DSIH_DCL_RESOURCE_STRUCTURED, WINED3DSIH_DCL_SAMPLER, WINED3DSIH_DCL_STREAM,

1 0

André Hentschel : windowscodecs: Remove dead assignment (clang).
by Alexandre Julliard Jan. 31, 2017

Jan. 31, 2017

Module: wine Branch: master Commit: 376b0756f4cf7c26b742f8d0779ff331566feaa1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=376b0756f4cf7c26b742f8d07… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jan 30 23:11:03 2017 +0100 windowscodecs: Remove dead assignment (clang). Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/info.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/windowscodecs/info.c b/dlls/windowscodecs/info.c index 84b80bc..6ddfdda 100644 --- a/dlls/windowscodecs/info.c +++ b/dlls/windowscodecs/info.c @@ -2341,7 +2341,6 @@ HRESULT WINAPI WICConvertBitmapSource(REFWICPixelFormatGUID dstFormat, IWICBitma IWICFormatConverter_Release(converter); converter = NULL; } - res = S_OK; } }

1 0

André Hentschel : windowscodecs: Fix IWICImagingFactory_CreateDecoderFromFileHandle_Proxy spec file entry.
by Alexandre Julliard Jan. 31, 2017

Jan. 31, 2017

Module: wine Branch: master Commit: fdccccb14e043d947363758bf03d3f351868a84a URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdccccb14e043d947363758bf… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jan 30 23:10:58 2017 +0100 windowscodecs: Fix IWICImagingFactory_CreateDecoderFromFileHandle_Proxy spec file entry. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/windowscodecs.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/windowscodecs/windowscodecs.spec b/dlls/windowscodecs/windowscodecs.spec index 81a827e..37a3a67 100644 --- a/dlls/windowscodecs/windowscodecs.spec +++ b/dlls/windowscodecs/windowscodecs.spec @@ -72,7 +72,7 @@ @ stdcall IWICImagingFactory_CreateBitmapScaler_Proxy(ptr ptr) IWICImagingFactory_CreateBitmapScaler_Proxy_W @ stdcall IWICImagingFactory_CreateBitmap_Proxy(ptr long long ptr long ptr) IWICImagingFactory_CreateBitmap_Proxy_W @ stdcall IWICImagingFactory_CreateComponentInfo_Proxy(ptr ptr ptr) IWICImagingFactory_CreateComponentInfo_Proxy_W -@ stdcall IWICImagingFactory_CreateDecoderFromFileHandle_Proxy(ptr ptr ptr long ptr) IWICImagingFactory_CreateDecoderFromFileHandle_Proxy_W +@ stdcall IWICImagingFactory_CreateDecoderFromFileHandle_Proxy(ptr long ptr long ptr) IWICImagingFactory_CreateDecoderFromFileHandle_Proxy_W @ stdcall IWICImagingFactory_CreateDecoderFromFilename_Proxy(ptr wstr ptr long long ptr) IWICImagingFactory_CreateDecoderFromFilename_Proxy_W @ stdcall IWICImagingFactory_CreateDecoderFromStream_Proxy(ptr ptr ptr long ptr) IWICImagingFactory_CreateDecoderFromStream_Proxy_W @ stdcall IWICImagingFactory_CreateEncoder_Proxy(ptr ptr ptr ptr) IWICImagingFactory_CreateEncoder_Proxy_W

1 0

Józef Kucia : wined3d: Implement SM5 countbits instruction.
by Alexandre Julliard Jan. 31, 2017

Jan. 31, 2017

Module: wine Branch: master Commit: 8aed050396671d371a1a1a1f4a54f00d72e0ee59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8aed050396671d371a1a1a1f4… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sat Jan 28 17:14:10 2017 +0100 wined3d: Implement SM5 countbits 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 | 2 ++ dlls/wined3d/shader.c | 1 + dlls/wined3d/shader_sm4.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 7 insertions(+) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index db76d37..0ab724c 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5040,6 +5040,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_CMP */ pshader_hw_cmp, /* WINED3DSIH_CND */ pshader_hw_cnd, /* WINED3DSIH_CONTINUE */ NULL, + /* WINED3DSIH_COUNTBITS */ 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 785cd76..eaa903a 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3724,6 +3724,7 @@ static void shader_glsl_map2gl(const struct wined3d_shader_instruction *ins) { case WINED3DSIH_ABS: instruction = "abs"; break; case WINED3DSIH_BFREV: instruction = "bitfieldReverse"; break; + case WINED3DSIH_COUNTBITS: instruction = "bitCount"; break; case WINED3DSIH_DSX: instruction = "dFdx"; break; case WINED3DSIH_DSX_COARSE: instruction = "dFdxCoarse"; break; case WINED3DSIH_DSX_FINE: instruction = "dFdxFine"; break; @@ -8893,6 +8894,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_CMP */ shader_glsl_conditional_move, /* WINED3DSIH_CND */ shader_glsl_cnd, /* WINED3DSIH_CONTINUE */ shader_glsl_continue, + /* WINED3DSIH_COUNTBITS */ shader_glsl_map2gl, /* WINED3DSIH_CRS */ shader_glsl_cross, /* WINED3DSIH_CUT */ shader_glsl_cut, /* WINED3DSIH_CUT_STREAM */ shader_glsl_cut, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 32a000e..a4e74fd 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -65,6 +65,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_CMP */ "cmp", /* WINED3DSIH_CND */ "cnd", /* WINED3DSIH_CONTINUE */ "continue", + /* WINED3DSIH_COUNTBITS */ "countbits", /* 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 4b2c012..a7adb64 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -233,6 +233,7 @@ enum wined3d_sm4_opcode WINED3D_SM5_OP_RCP = 0x81, WINED3D_SM5_OP_F32TOF16 = 0x82, WINED3D_SM5_OP_F16TOF32 = 0x83, + WINED3D_SM5_OP_COUNTBITS = 0x86, WINED3D_SM5_OP_UBFE = 0x8a, WINED3D_SM5_OP_BFI = 0x8c, WINED3D_SM5_OP_BFREV = 0x8d, @@ -926,6 +927,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM5_OP_RCP, WINED3DSIH_RCP, "f", "f"}, {WINED3D_SM5_OP_F32TOF16, WINED3DSIH_F32TOF16, "u", "f"}, {WINED3D_SM5_OP_F16TOF32, WINED3DSIH_F16TOF32, "f", "u"}, + {WINED3D_SM5_OP_COUNTBITS, WINED3DSIH_COUNTBITS, "u", "u"}, {WINED3D_SM5_OP_UBFE, WINED3DSIH_UBFE, "u", "iiu"}, {WINED3D_SM5_OP_BFI, WINED3DSIH_BFI, "u", "iiuu"}, {WINED3D_SM5_OP_BFREV, WINED3DSIH_BFREV, "u", "u"}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 9c32f2f..ff8337d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -595,6 +595,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_CMP, WINED3DSIH_CND, WINED3DSIH_CONTINUE, + WINED3DSIH_COUNTBITS, WINED3DSIH_CRS, WINED3DSIH_CUT, WINED3DSIH_CUT_STREAM,

1 0

Zebediah Figura : regedit: When processing 3.1 ignore any lines that don' t begin with HKCR.
by Alexandre Julliard Jan. 31, 2017

Jan. 31, 2017

Module: wine Branch: master Commit: 679cc5019586e7ab4a40db2ec1d065595b20db58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=679cc5019586e7ab4a40db2ec… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jan 31 00:41:19 2017 -0600 regedit: When processing 3.1 ignore any lines that don't begin with HKCR. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index c055c10..25c0240 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -616,8 +616,9 @@ static void processRegEntry31(WCHAR *line) int res; static WCHAR empty[] = {0}; + static WCHAR hkcr[] = {'H','K','E','Y','_','C','L','A','S','S','E','S','_','R','O','O','T'}; - if (line[0] == '\0') return; + if (strncmpW(line, hkcr, sizeof(hkcr) / sizeof(WCHAR))) return; /* get key name */ while (line[key_end] && !isspaceW(line[key_end])) key_end++; @@ -769,11 +770,11 @@ static void processRegLinesA(FILE *in, char* first_chars) *s_eol = '\0'; /* Check if the line is a header string */ - if (!memcmp(line, header_31, sizeof(header_31))) { + if (!strcmp(line, header_31)) { version = REG_VERSION_31; - } else if (!memcmp(line, header_40, sizeof(header_40))) { + } else if (!strcmp(line, header_40)) { version = REG_VERSION_40; - } else if (!memcmp(line, header_50, sizeof(header_50))) { + } else if (!strcmp(line, header_50)) { version = REG_VERSION_50; } else { lineW = GetWideString(line);

1 0

André Hentschel : gdiplus: Fix some spec file entries.
by Alexandre Julliard Jan. 31, 2017

Jan. 31, 2017

Module: wine Branch: master Commit: 36bb9d905ae10713bcd197958fb71aa86930a505 URL: http://source.winehq.org/git/wine.git/?a=commit;h=36bb9d905ae10713bcd197958… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jan 29 21:59:05 2017 +0100 gdiplus: Fix some spec file entries. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/gdiplus.spec | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 40c19e6..98167af 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -172,8 +172,8 @@ 172 stdcall GdipDrawImagePointsRectI(ptr ptr ptr long long long long long long ptr ptr ptr) 173 stdcall GdipDrawImageRect(ptr ptr float float float float) 174 stdcall GdipDrawImageRectI(ptr ptr long long long long) -175 stdcall GdipDrawImageRectRect(ptr ptr float float float float float float float float long ptr long ptr) -176 stdcall GdipDrawImageRectRectI(ptr ptr long long long long long long long long long ptr long ptr) +175 stdcall GdipDrawImageRectRect(ptr ptr float float float float float float float float long ptr ptr ptr) +176 stdcall GdipDrawImageRectRectI(ptr ptr long long long long long long long long long ptr ptr ptr) 177 stdcall GdipDrawLine(ptr ptr float float float float) 178 stdcall GdipDrawLineI(ptr ptr long long long long) 179 stdcall GdipDrawLines(ptr ptr ptr long) @@ -189,7 +189,7 @@ 189 stdcall GdipDrawRectanglesI(ptr ptr ptr long) 190 stdcall GdipDrawString(ptr wstr long ptr ptr ptr ptr) 191 stdcall GdipEmfToWmfBits(ptr long ptr long long) -192 stdcall GdipEndContainer(ptr ptr) +192 stdcall GdipEndContainer(ptr long) 193 stdcall GdipEnumerateMetafileDestPoint(ptr ptr ptr ptr ptr ptr) 194 stdcall GdipEnumerateMetafileDestPointI(ptr ptr ptr ptr ptr ptr) 195 stub GdipEnumerateMetafileDestPoints @@ -563,7 +563,7 @@ 563 stdcall GdipSetPropertyItem(ptr ptr) 564 stdcall GdipSetRenderingOrigin(ptr long long) 565 stdcall GdipSetSmoothingMode(ptr long) -566 stdcall GdipSetSolidFillColor(ptr ptr) +566 stdcall GdipSetSolidFillColor(ptr long) 567 stdcall GdipSetStringFormatAlign(ptr long) 568 stdcall GdipSetStringFormatDigitSubstitution(ptr long long) 569 stdcall GdipSetStringFormatFlags(ptr long) @@ -604,8 +604,8 @@ 604 stdcall GdipWidenPath(ptr ptr ptr float) 605 stdcall GdipWindingModeOutline(ptr ptr float) 606 stdcall GdiplusNotificationHook(ptr) -607 stdcall GdiplusNotificationUnhook(ptr) -608 stdcall GdiplusShutdown(ptr) GdiplusShutdown_wrapper +607 stdcall GdiplusNotificationUnhook(long) +608 stdcall GdiplusShutdown(long) GdiplusShutdown_wrapper 609 stdcall GdiplusStartup(ptr ptr ptr) 610 stdcall GdipFindFirstImageItem(ptr ptr) 611 stub GdipFindNextImageItem

1 0

Józef Kucia : d3d11/tests: Add test for SM5 firstbit_* instructions.
by Alexandre Julliard Jan. 31, 2017

Jan. 31, 2017

Module: wine Branch: master Commit: 363d70aba2581e4715e59d4087081e80d6908696 URL: http://source.winehq.org/git/wine.git/?a=commit;h=363d70aba2581e4715e59d408… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sat Jan 28 17:14:12 2017 +0100 d3d11/tests: Add test for SM5 firstbit_* instructions. 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 | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 06f736e..758075a 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -10664,6 +10664,32 @@ static void test_uint_shader_instructions(void) 0x00000000, 0x00000000, 0x0500008d, 0x00102022, 0x00000000, 0x0010000a, 0x00000000, 0x05000036, 0x00102012, 0x00000000, 0x0010000a, 0x00000000, 0x0100003e, }; + static const DWORD ps_bits_code[] = + { +#if 0 + uint u; + int i; + + uint4 main() : SV_Target + { + return uint4(countbits(u), firstbitlow(u), firstbithigh(u), firstbithigh(i)); + } +#endif + 0x43425844, 0x23fee911, 0x145287d1, 0xea904419, 0x8aa59a6a, 0x00000001, 0x000001b4, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000001, 0x00000000, + 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x0000013c, 0x00000050, 0x0000004f, + 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, + 0x02000068, 0x00000001, 0x06000089, 0x00100012, 0x00000000, 0x0020801a, 0x00000000, 0x00000000, + 0x07000020, 0x00100022, 0x00000000, 0x0010000a, 0x00000000, 0x00004001, 0xffffffff, 0x0800001e, + 0x00100012, 0x00000000, 0x00004001, 0x0000001f, 0x8010000a, 0x00000041, 0x00000000, 0x09000037, + 0x00102082, 0x00000000, 0x0010001a, 0x00000000, 0x00004001, 0xffffffff, 0x0010000a, 0x00000000, + 0x06000087, 0x00100012, 0x00000000, 0x0020800a, 0x00000000, 0x00000000, 0x0800001e, 0x00100012, + 0x00000000, 0x00004001, 0x0000001f, 0x8010000a, 0x00000041, 0x00000000, 0x0a000037, 0x00102042, + 0x00000000, 0x0020800a, 0x00000000, 0x00000000, 0x0010000a, 0x00000000, 0x00004001, 0xffffffff, + 0x06000086, 0x00102012, 0x00000000, 0x0020800a, 0x00000000, 0x00000000, 0x06000088, 0x00102022, + 0x00000000, 0x0020800a, 0x00000000, 0x00000000, 0x0100003e, + }; static const DWORD ps_ftou_code[] = { #if 0 @@ -10742,6 +10768,7 @@ static void test_uint_shader_instructions(void) static const struct shader ps_bfi = {ps_bfi_code, sizeof(ps_bfi_code), D3D_FEATURE_LEVEL_11_0}; static const struct shader ps_ubfe = {ps_ubfe_code, sizeof(ps_ubfe_code), D3D_FEATURE_LEVEL_11_0}; static const struct shader ps_bfrev = {ps_bfrev_code, sizeof(ps_bfrev_code), D3D_FEATURE_LEVEL_11_0}; + static const struct shader ps_bits = {ps_bits_code, sizeof(ps_bits_code), D3D_FEATURE_LEVEL_11_0}; static const struct shader ps_ftou = {ps_ftou_code, sizeof(ps_ftou_code), D3D_FEATURE_LEVEL_10_0}; static const struct shader ps_f16tof32 = {ps_f16tof32_code, sizeof(ps_f16tof32_code), D3D_FEATURE_LEVEL_11_0}; static const struct shader ps_f32tof16 = {ps_f32tof16_code, sizeof(ps_f32tof16_code), D3D_FEATURE_LEVEL_11_0}; @@ -10786,6 +10813,19 @@ static void test_uint_shader_instructions(void) {&ps_bfrev, {0xffff0000}, {0x0000ffff, 0xffff0000, 0x00000000, 0xffff0000}}, {&ps_bfrev, {0xffffffff}, {0xffffffff, 0xffffffff, 0xffff0000, 0xffff0000}}, + {&ps_bits, { 0, 0}, { 0, ~0u, ~0u, ~0u}}, + {&ps_bits, { ~0u, ~0u}, {32, 0, 31, ~0u}}, + {&ps_bits, {0x7fffffff, 0x7fffffff}, {31, 0, 30, 30}}, + {&ps_bits, {0x80000000, 0x80000000}, { 1, 31, 31, 30}}, + {&ps_bits, {0x00000001, 0x00000001}, { 1, 0, 0, 0}}, + {&ps_bits, {0x80000001, 0x80000001}, { 2, 0, 31, 30}}, + {&ps_bits, {0x88888888, 0x88888888}, { 8, 3, 31, 30}}, + {&ps_bits, {0xcccccccc, 0xcccccccc}, {16, 2, 31, 29}}, + {&ps_bits, {0x11111111, 0x11111c11}, { 8, 0, 28, 28}}, + {&ps_bits, {0x0000000f, 0x0000000f}, { 4, 0, 3, 3}}, + {&ps_bits, {0x8000000f, 0x8000000f}, { 5, 0, 31, 30}}, + {&ps_bits, {0x00080000, 0x00080000}, { 1, 19, 19, 19}}, + {&ps_ftou, {BITS_NNAN}, { 0, 0}}, {&ps_ftou, {BITS_NAN}, { 0, 0}}, {&ps_ftou, {BITS_NINF}, { 0, ~0u}},

1 0

Louis Lenders : kernel32: Silence a noisy fixme.
by Alexandre Julliard Jan. 31, 2017

Jan. 31, 2017

Module: wine Branch: master Commit: 6f04cf0caa4354594d14a231b2f3a9e40290d347 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f04cf0caa4354594d14a231b… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Tue Jan 24 19:01:36 2017 +0100 kernel32: Silence a noisy fixme. Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/time.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/time.c b/dlls/kernel32/time.c index f4a1a35..09d06e8 100644 --- a/dlls/kernel32/time.c +++ b/dlls/kernel32/time.c @@ -1042,8 +1042,11 @@ int WINAPI GetCalendarInfoW(LCID Locale, CALID Calendar, CALTYPE CalType, int WINAPI GetCalendarInfoEx(LPCWSTR locale, CALID calendar, LPCWSTR lpReserved, CALTYPE caltype, LPWSTR data, int len, DWORD *value) { + static int once; + LCID lcid = LocaleNameToLCID(locale, 0); - FIXME("(%s, %d, %p, 0x%08x, %p, %d, %p): semi-stub\n", debugstr_w(locale), calendar, lpReserved, caltype, + if (!once++) + FIXME("(%s, %d, %p, 0x%08x, %p, %d, %p): semi-stub\n", debugstr_w(locale), calendar, lpReserved, caltype, data, len, value); return GetCalendarInfoW(lcid, calendar, caltype, data, len, value); }

1 0

Nikolay Sivov : include: Added GetThreadUILanguage() prototype.
by Alexandre Julliard Jan. 31, 2017

Jan. 31, 2017

Module: wine Branch: master Commit: 532926b5f70e1b772816e65994d0dd4d38b87748 URL: http://source.winehq.org/git/wine.git/?a=commit;h=532926b5f70e1b772816e6599… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 31 16:53:18 2017 +0300 include: Added GetThreadUILanguage() prototype. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winnls.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/winnls.h b/include/winnls.h index 96f60de..d6fcf6e 100644 --- a/include/winnls.h +++ b/include/winnls.h @@ -921,6 +921,7 @@ WINBASEAPI LANGID WINAPI GetSystemDefaultUILanguage(void); WINBASEAPI BOOL WINAPI GetSystemPreferredUILanguages(DWORD,ULONG*,WCHAR*,ULONG*); WINBASEAPI LCID WINAPI GetThreadLocale(void); WINBASEAPI BOOL WINAPI GetThreadPreferredUILanguages(DWORD,ULONG*,WCHAR*,ULONG*); +WINBASEAPI LANGID WINAPI GetThreadUILanguage(void); WINBASEAPI INT WINAPI GetTimeFormatA(LCID,DWORD,const SYSTEMTIME*,LPCSTR,LPSTR,INT); WINBASEAPI INT WINAPI GetTimeFormatEx(LPCWSTR,DWORD,const SYSTEMTIME*,LPCWSTR,LPWSTR,INT); WINBASEAPI INT WINAPI GetTimeFormatW(LCID,DWORD,const SYSTEMTIME*,LPCWSTR,LPWSTR,INT);

1 0