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

Michael Stefaniuc : avifil32/tests: Add some basic COM tests for AVIEditStream.
by Alexandre Julliard July 15, 2016

July 15, 2016

Module: wine Branch: master Commit: 06744904dddce9a9875aaeb91a04448481631a4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=06744904dddce9a9875aaeb91… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jul 14 10:25:00 2016 +0200 avifil32/tests: Add some basic COM tests for AVIEditStream. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/avifil32/tests/api.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/dlls/avifil32/tests/api.c b/dlls/avifil32/tests/api.c index 137062ad8..b3d822d 100644 --- a/dlls/avifil32/tests/api.c +++ b/dlls/avifil32/tests/api.c @@ -705,6 +705,35 @@ static void test_COM_wavfile(void) while (IAVIFile_Release(avif)); } +static void test_COM_editstream(void) +{ + IAVIEditStream *edit; + IAVIStream *stream; + IUnknown *unk; + ULONG refcount; + HRESULT hr; + + /* Same refcount for all AVIEditStream interfaces */ + hr = CreateEditableStream(&stream, NULL); + ok(hr == S_OK, "AVIEditStream create failed: %08x, expected S_OK\n", hr); + refcount = IAVIStream_AddRef(stream); + ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + + hr = IAVIStream_QueryInterface(stream, &IID_IAVIEditStream, (void**)&edit); + ok(hr == S_OK, "QueryInterface for IID_IAVIEditStream failed: %08x\n", hr); + refcount = IAVIEditStream_AddRef(edit); + ok(refcount == 4, "refcount == %u, expected 4\n", refcount); + refcount = IAVIEditStream_Release(edit); + + hr = IAVIEditStream_QueryInterface(edit, &IID_IUnknown, (void**)&unk); + ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr); + refcount = IUnknown_AddRef(unk); + ok(refcount == 5, "refcount == %u, expected 5\n", refcount); + IUnknown_Release(unk); + + while (IAVIEditStream_Release(edit)); +} + START_TEST(api) { @@ -717,6 +746,7 @@ START_TEST(api) test_ash1_corruption2(); test_COM(); test_COM_wavfile(); + test_COM_editstream(); AVIFileExit(); }

1 0

Aaryaman Vasishta : d3drm: Fix IDirect3DRMDevice{2-3}:: GetDirect3DDevice2 return values on failure.
by Alexandre Julliard July 15, 2016

July 15, 2016

Module: wine Branch: master Commit: 88fc3a3ef504bf95090533cc5a3c2aff353592dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=88fc3a3ef504bf95090533cc5… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Fri Jul 15 16:04:06 2016 +0530 d3drm: Fix IDirect3DRMDevice{2-3}::GetDirect3DDevice2 return values on failure. 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 | 8 ++++++-- dlls/d3drm/tests/d3drm.c | 8 ++++---- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/d3drm/device.c b/dlls/d3drm/device.c index b388b63..c5db652 100644 --- a/dlls/d3drm/device.c +++ b/dlls/d3drm/device.c @@ -1267,7 +1267,8 @@ static HRESULT WINAPI d3drm_device3_GetDirect3DDevice2(IDirect3DRMDevice3 *iface TRACE("iface %p, d3d_device %p.\n", iface, d3d_device); - IDirect3DDevice_QueryInterface(device->device, &IID_IDirect3DDevice2, (void**)d3d_device); + if (FAILED(IDirect3DDevice_QueryInterface(device->device, &IID_IDirect3DDevice2, (void**)d3d_device))) + return D3DRMERR_BADOBJECT; return D3DRM_OK; } @@ -1278,7 +1279,10 @@ static HRESULT WINAPI d3drm_device2_GetDirect3DDevice2(IDirect3DRMDevice2 *iface TRACE("iface %p, d3d_device %p.\n", iface, d3d_device); - return d3drm_device3_GetDirect3DDevice2(&device->IDirect3DRMDevice3_iface, d3d_device); + IDirect3DDevice_QueryInterface(device->device, &IID_IDirect3DDevice2, (void**)d3d_device); + + /* d3drm returns D3DRM_OK even if the call fails. */ + return D3DRM_OK; } static HRESULT WINAPI d3drm_device3_FindPreferredTextureFormat(IDirect3DRMDevice3 *iface, diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index e23f13f..5b5df66 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -3992,15 +3992,15 @@ static void test_create_device_from_d3d1(void) hr = IDirect3DRMDevice_QueryInterface(device1, &IID_IDirect3DRMDevice2, (void **)&device2); ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice2 Interface (hr = %x).\n", hr); hr = IDirect3DRMDevice2_GetDirect3DDevice2(device2, &d3ddevice2); - ok(SUCCEEDED(hr), "Expected hr == DD_OK, got %x).\n", hr); + ok(SUCCEEDED(hr), "Expected hr == D3DRM_OK, got %#x.\n", hr); ok(d3ddevice2 == NULL, "Expected d3ddevice2 == NULL, got %p.\n", d3ddevice2); IDirect3DRMDevice2_Release(device2); d3ddevice2 = (IDirect3DDevice2 *)0xdeadbeef; - hr = IDirect3DRMDevice_QueryInterface(device1, &IID_IDirect3DRMDevice2, (void **)&device3); - ok(hr == DD_OK, "Cannot get IDirect3DRMDevice2 Interface (hr = %x).\n", hr); + hr = IDirect3DRMDevice_QueryInterface(device1, &IID_IDirect3DRMDevice3, (void **)&device3); + ok(hr == DD_OK, "Cannot get IDirect3DRMDevice3 Interface (hr = %x).\n", hr); hr = IDirect3DRMDevice3_GetDirect3DDevice2(device3, &d3ddevice2); - ok(hr == DD_OK, "Expected hr == DD_OK, got %x).\n", hr); + ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr); ok(d3ddevice2 == NULL, "Expected d3ddevice2 == NULL, got %p.\n", d3ddevice2); IDirect3DRMDevice3_Release(device3);

1 0

Michael Stefaniuc : avifil32: Avoid casts from COM objects to ifaces.
by Alexandre Julliard July 15, 2016

July 15, 2016

Module: wine Branch: master Commit: d13dde18fa19a38bb4e66673d5c9d05cbd3e9492 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d13dde18fa19a38bb4e66673d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jul 14 10:26:16 2016 +0200 avifil32: Avoid casts from COM objects to ifaces. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/avifil32/editstream.c | 4 ++-- dlls/avifil32/tmpfile.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/avifil32/editstream.c b/dlls/avifil32/editstream.c index 815283b..2e0fa2f 100644 --- a/dlls/avifil32/editstream.c +++ b/dlls/avifil32/editstream.c @@ -404,11 +404,11 @@ static HRESULT WINAPI IAVIEditStream_fnCopy(IAVIEditStream*iface,LONG*plStart, if (pEdit == NULL) return AVIERR_MEMORY; - hr = IAVIEditStream_Paste((PAVIEDITSTREAM)pEdit, &start, plLength, &This->IAVIStream_iface, + hr = IAVIEditStream_Paste(&pEdit->IAVIEditStream_iface, &start, plLength, &This->IAVIStream_iface, *plStart, *plStart + *plLength); *plStart = start; if (FAILED(hr)) - IAVIEditStream_Release((PAVIEDITSTREAM)pEdit); + IAVIEditStream_Release(&pEdit->IAVIEditStream_iface); else *ppResult = &This->IAVIStream_iface; diff --git a/dlls/avifil32/tmpfile.c b/dlls/avifil32/tmpfile.c index 62d283b..ee7e772 100644 --- a/dlls/avifil32/tmpfile.c +++ b/dlls/avifil32/tmpfile.c @@ -274,5 +274,5 @@ PAVIFILE AVIFILE_CreateAVITempFile(int nStreams, const PAVISTREAM *ppStreams) } } - return (PAVIFILE)tmpFile; + return &tmpFile->IAVIFile_iface; }

1 0

Józef Kucia : wined3d: Recognize SM4.1 sampleinfo opcode.
by Alexandre Julliard July 15, 2016

July 15, 2016

Module: wine Branch: master Commit: f8a3124bf654516b3f94a9a97ddff66ec712eda3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8a3124bf654516b3f94a9a97… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jul 15 11:16:22 2016 +0200 wined3d: Recognize SM4.1 sampleinfo 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 | 12 ++++++++++-- dlls/wined3d/shader_sm4.c | 2 ++ dlls/wined3d/wined3d_private.h | 2 ++ 5 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index ab3c793..1760d6f 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5359,6 +5359,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_SAMPLE_C */ NULL, /* WINED3DSIH_SAMPLE_C_LZ */ NULL, /* WINED3DSIH_SAMPLE_GRAD */ NULL, + /* WINED3DSIH_SAMPLE_INFO */ NULL, /* WINED3DSIH_SAMPLE_LOD */ NULL, /* WINED3DSIH_SAMPLE_POS */ NULL, /* WINED3DSIH_SETP */ NULL, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 2099d6e..ef3adbd 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8777,6 +8777,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_SAMPLE_C */ shader_glsl_sample_c, /* WINED3DSIH_SAMPLE_C_LZ */ shader_glsl_sample_c, /* WINED3DSIH_SAMPLE_GRAD */ shader_glsl_sample, + /* WINED3DSIH_SAMPLE_INFO */ NULL, /* WINED3DSIH_SAMPLE_LOD */ shader_glsl_sample, /* WINED3DSIH_SAMPLE_POS */ NULL, /* WINED3DSIH_SETP */ NULL, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 5b6c22a..7ccc1d4 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -189,6 +189,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_SAMPLE_C */ "sample_c", /* WINED3DSIH_SAMPLE_C_LZ */ "sample_c_lz", /* WINED3DSIH_SAMPLE_GRAD */ "sample_d", + /* WINED3DSIH_SAMPLE_INFO */ "sample_info", /* WINED3DSIH_SAMPLE_LOD */ "sample_l", /* WINED3DSIH_SAMPLE_POS */ "sample_pos", /* WINED3DSIH_SETP */ "setp", @@ -2420,8 +2421,7 @@ static void shader_trace_init(const struct wined3d_shader_frontend *fe, void *fe { shader_addline(&buffer, "p"); } - else if (ins.handler_idx == WINED3DSIH_RESINFO - && ins.flags) + else if (ins.handler_idx == WINED3DSIH_RESINFO && ins.flags) { switch (ins.flags) { @@ -2430,6 +2430,14 @@ static void shader_trace_init(const struct wined3d_shader_frontend *fe, void *fe default: shader_addline(&buffer, "_unrecognized(%#x)", ins.flags); } } + else if (ins.handler_idx == WINED3DSIH_SAMPLE_INFO && ins.flags) + { + switch (ins.flags) + { + case WINED3DSI_SAMPLE_INFO_UINT: shader_addline(&buffer, "_uint"); break; + default: shader_addline(&buffer, "_unrecognized(%#x)", ins.flags); + } + } if (wined3d_shader_instruction_has_texel_offset(&ins)) shader_addline(&buffer, "(%d,%d,%d)", ins.texel_offset.u, ins.texel_offset.v, ins.texel_offset.w); diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 063770e..7b82bbb 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -206,6 +206,7 @@ enum wined3d_sm4_opcode WINED3D_SM4_OP_LOD = 0x6c, WINED3D_SM4_OP_GATHER4 = 0x6d, WINED3D_SM4_OP_SAMPLE_POS = 0x6e, + WINED3D_SM4_OP_SAMPLE_INFO = 0x6f, WINED3D_SM5_OP_HS_DECLS = 0x71, WINED3D_SM5_OP_HS_CONTROL_POINT_PHASE = 0x72, WINED3D_SM5_OP_HS_FORK_PHASE = 0x73, @@ -806,6 +807,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM4_OP_LOD, WINED3DSIH_LOD, "f", "fRS"}, {WINED3D_SM4_OP_GATHER4, WINED3DSIH_GATHER4, "u", "fRS"}, {WINED3D_SM4_OP_SAMPLE_POS, WINED3DSIH_SAMPLE_POS, "f", "Ru"}, + {WINED3D_SM4_OP_SAMPLE_INFO, WINED3DSIH_SAMPLE_INFO, "f", "R"}, {WINED3D_SM5_OP_HS_DECLS, WINED3DSIH_HS_DECLS, "", ""}, {WINED3D_SM5_OP_HS_CONTROL_POINT_PHASE, WINED3DSIH_HS_CONTROL_POINT_PHASE, "", ""}, {WINED3D_SM5_OP_HS_FORK_PHASE, WINED3DSIH_HS_FORK_PHASE, "", ""}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 0cbae86..0450181 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -495,6 +495,7 @@ enum wined3d_tessellator_partitioning #define WINED3DSI_INDEXED_DYNAMIC 0x4 #define WINED3DSI_RESINFO_RCP_FLOAT 0x1 #define WINED3DSI_RESINFO_UINT 0x2 +#define WINED3DSI_SAMPLE_INFO_UINT 0x1 #define WINED3DSI_SAMPLER_COMPARISON_MODE 0x1 enum wined3d_shader_rel_op @@ -705,6 +706,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_SAMPLE_C, WINED3DSIH_SAMPLE_C_LZ, WINED3DSIH_SAMPLE_GRAD, + WINED3DSIH_SAMPLE_INFO, WINED3DSIH_SAMPLE_LOD, WINED3DSIH_SAMPLE_POS, WINED3DSIH_SETP,

1 0

Iván Matellanes : msvcirt: Implement istream::ipfx.
by Alexandre Julliard July 15, 2016

July 15, 2016

Module: wine Branch: master Commit: eb91e1c677f95a8fc0d65d2204f57adefebf70cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb91e1c677f95a8fc0d65d220… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Fri Jul 15 10:26:55 2016 +0100 msvcirt: Implement istream::ipfx. Signed-off-by: Iván Matellanes <matellanes.ivan(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcirt/msvcirt.c | 26 +++++++++- dlls/msvcirt/tests/msvcirt.c | 117 ++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 140 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=eb91e1c677f95a8fc0d65…

1 0

Józef Kucia : wined3d: Recognize SM4.1 samplepos opcode.
by Alexandre Julliard July 15, 2016

July 15, 2016

Module: wine Branch: master Commit: f31994459e1b9bcbf555c33481bf73b0523b359e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f31994459e1b9bcbf555c3348… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jul 15 11:16:21 2016 +0200 wined3d: Recognize SM4.1 samplepos 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 21ee49e..ab3c793 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5360,6 +5360,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_SAMPLE_C_LZ */ NULL, /* WINED3DSIH_SAMPLE_GRAD */ NULL, /* WINED3DSIH_SAMPLE_LOD */ NULL, + /* WINED3DSIH_SAMPLE_POS */ NULL, /* WINED3DSIH_SETP */ NULL, /* WINED3DSIH_SGE */ shader_hw_map2gl, /* WINED3DSIH_SGN */ shader_hw_sgn, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 9cc3117..2099d6e 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8778,6 +8778,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_SAMPLE_C_LZ */ shader_glsl_sample_c, /* WINED3DSIH_SAMPLE_GRAD */ shader_glsl_sample, /* WINED3DSIH_SAMPLE_LOD */ shader_glsl_sample, + /* WINED3DSIH_SAMPLE_POS */ NULL, /* WINED3DSIH_SETP */ NULL, /* WINED3DSIH_SGE */ shader_glsl_compare, /* WINED3DSIH_SGN */ shader_glsl_sgn, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 914970e..5b6c22a 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -190,6 +190,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_SAMPLE_C_LZ */ "sample_c_lz", /* WINED3DSIH_SAMPLE_GRAD */ "sample_d", /* WINED3DSIH_SAMPLE_LOD */ "sample_l", + /* WINED3DSIH_SAMPLE_POS */ "sample_pos", /* WINED3DSIH_SETP */ "setp", /* WINED3DSIH_SGE */ "sge", /* WINED3DSIH_SGN */ "sgn", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index a000bb6..063770e 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -205,6 +205,7 @@ enum wined3d_sm4_opcode WINED3D_SM4_OP_DCL_GLOBAL_FLAGS = 0x6a, WINED3D_SM4_OP_LOD = 0x6c, WINED3D_SM4_OP_GATHER4 = 0x6d, + WINED3D_SM4_OP_SAMPLE_POS = 0x6e, WINED3D_SM5_OP_HS_DECLS = 0x71, WINED3D_SM5_OP_HS_CONTROL_POINT_PHASE = 0x72, WINED3D_SM5_OP_HS_FORK_PHASE = 0x73, @@ -804,6 +805,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = shader_sm4_read_dcl_global_flags}, {WINED3D_SM4_OP_LOD, WINED3DSIH_LOD, "f", "fRS"}, {WINED3D_SM4_OP_GATHER4, WINED3DSIH_GATHER4, "u", "fRS"}, + {WINED3D_SM4_OP_SAMPLE_POS, WINED3DSIH_SAMPLE_POS, "f", "Ru"}, {WINED3D_SM5_OP_HS_DECLS, WINED3DSIH_HS_DECLS, "", ""}, {WINED3D_SM5_OP_HS_CONTROL_POINT_PHASE, WINED3DSIH_HS_CONTROL_POINT_PHASE, "", ""}, {WINED3D_SM5_OP_HS_FORK_PHASE, WINED3DSIH_HS_FORK_PHASE, "", ""}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 904eb86..0cbae86 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -706,6 +706,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_SAMPLE_C_LZ, WINED3DSIH_SAMPLE_GRAD, WINED3DSIH_SAMPLE_LOD, + WINED3DSIH_SAMPLE_POS, WINED3DSIH_SETP, WINED3DSIH_SGE, WINED3DSIH_SGN,

1 0

Józef Kucia : wined3d: Recognize SM5 vocp register.
by Alexandre Julliard July 15, 2016

July 15, 2016

Module: wine Branch: master Commit: dee9d1403a4df348639454ed6ed57696af47f586 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dee9d1403a4df348639454ed6… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jul 15 11:16:18 2016 +0200 wined3d: Recognize SM5 vocp register. 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/shader.c | 4 ++++ dlls/wined3d/shader_sm4.c | 3 ++- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index d671ad0..6d4155b 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1779,6 +1779,10 @@ static void shader_dump_register(struct wined3d_string_buffer *buffer, shader_addline(buffer, "vicp"); break; + case WINED3DSPR_OUTCONTROLPOINT: + shader_addline(buffer, "vocp"); + break; + case WINED3DSPR_PATCHCONST: shader_addline(buffer, "vpc"); break; diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index c8fdb32..24af95d 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -259,6 +259,7 @@ enum wined3d_sm4_register_type WINED3D_SM5_RT_OUTPUT_CONTROL_POINT_ID = 0x16, WINED3D_SM5_RT_FORK_INSTANCE_ID = 0x17, WINED3D_SM5_RT_INPUT_CONTROL_POINT = 0x19, + WINED3D_SM5_RT_OUTPUT_CONTROL_POINT = 0x1a, WINED3D_SM5_RT_PATCH_CONSTANT_DATA = 0x1b, WINED3D_SM5_RT_DOMAIN_LOCATION = 0x1c, WINED3D_SM5_RT_UAV = 0x1e, @@ -877,7 +878,7 @@ static const enum wined3d_shader_register_type register_type_table[] = /* WINED3D_SM5_RT_FORK_INSTANCE_ID */ WINED3DSPR_FORKINSTID, /* UNKNOWN */ ~0u, /* WINED3D_SM5_RT_INPUT_CONTROL_POINT */ WINED3DSPR_INCONTROLPOINT, - /* UNKNOWN */ ~0u, + /* WINED3D_SM5_RT_OUTPUT_CONTROL_POINT */ WINED3DSPR_OUTCONTROLPOINT, /* WINED3D_SM5_RT_PATCH_CONSTANT_DATA */ WINED3DSPR_PATCHCONST, /* WINED3D_SM5_RT_DOMAIN_LOCATION */ WINED3DSPR_TESSCOORD, /* UNKNOWN */ ~0u, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 41c127b..b5c10a2 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -385,6 +385,7 @@ enum wined3d_shader_register_type WINED3DSPR_OUTPOINTID, WINED3DSPR_FORKINSTID, WINED3DSPR_INCONTROLPOINT, + WINED3DSPR_OUTCONTROLPOINT, WINED3DSPR_PATCHCONST, WINED3DSPR_TESSCOORD, WINED3DSPR_GROUPSHAREDMEM,

1 0

Nikolay Sivov : dwrite: Ignore fonts with dot-prefixed names.
by Alexandre Julliard July 15, 2016

July 15, 2016

Module: wine Branch: master Commit: 3fa7ff671cc2129d3a895537db81603ad026fa8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fa7ff671cc2129d3a895537d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jul 15 11:05:37 2016 +0300 dwrite: Ignore fonts with dot-prefixed names. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index a80861b..d1a04db 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -3593,6 +3593,14 @@ HRESULT create_font_collection(IDWriteFactory3 *factory, IDWriteFontFileEnumerat fontstrings_get_en_string(family_name, familyW, sizeof(familyW)/sizeof(WCHAR)); + /* ignore dot named faces */ + if (familyW[0] == '.') { + WARN("Ignoring face %s\n", debugstr_w(familyW)); + IDWriteLocalizedStrings_Release(family_name); + release_font_data(font_data); + continue; + } + index = collection_find_family(collection, familyW); if (index != ~0u) hr = fontfamily_add_font(collection->family_data[index], font_data);

1 0

Huw Davies : gdi32: Copy 1-bpp pixels one byte at a time.
by Alexandre Julliard July 15, 2016

July 15, 2016

Module: wine Branch: master Commit: 778faedbaecdab5bba377861ddece0d110eab747 URL: http://source.winehq.org/git/wine.git/?a=commit;h=778faedbaecdab5bba377861d… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Jul 15 08:59:29 2016 +0100 gdi32: Copy 1-bpp pixels one byte at a time. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dibdrv/primitives.c | 288 +++++++++++++++++++++++++++++++++++++---- dlls/gdi32/tests/dib.c | 42 +++--- 2 files changed, 292 insertions(+), 38 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=778faedbaecdab5bba377…

1 0

Iván Matellanes : msvcirt: Implement istream:: eatwhite.
by Alexandre Julliard July 15, 2016

July 15, 2016

Module: wine Branch: master Commit: 2f698f63926a4fac46995ad045efe4ed74c52820 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f698f63926a4fac46995ad04… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Fri Jul 15 10:26:53 2016 +0100 msvcirt: Implement istream::eatwhite. Signed-off-by: Iván Matellanes <matellanes.ivan(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcirt/msvcirt.c | 11 +++++++- dlls/msvcirt/tests/msvcirt.c | 61 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 71 insertions(+), 1 deletion(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 33d1b14..cffd0da 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -3040,7 +3040,16 @@ istream* __thiscall istream_scalar_dtor(ios *base, unsigned int flags) DEFINE_THISCALL_WRAPPER(istream_eatwhite, 4) void __thiscall istream_eatwhite(istream *this) { - FIXME("(%p) stub\n", this); + ios *base = istream_get_ios(this); + int c; + + TRACE("(%p)\n", this); + + ios_lockbuf(base); + for (c = streambuf_sgetc(base->sb); isspace(c); c = streambuf_snextc(base->sb)); + ios_unlockbuf(base); + if (c == EOF) + ios_clear(base, base->state | IOSTATE_eofbit); } /* ?gcount(a)istream@@QBEHXZ */ diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index bdbdbf0..fd32099 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -309,6 +309,7 @@ static void (*__thiscall p_istream_dtor)(ios*); static istream* (*__thiscall p_istream_assign_sb)(istream*, streambuf*); static istream* (*__thiscall p_istream_assign)(istream*, const istream*); static void (*__thiscall p_istream_vbase_dtor)(istream*); +static void (*__thiscall p_istream_eatwhite)(istream*); /* Emulate a __thiscall */ #ifdef __i386__ @@ -506,6 +507,7 @@ static BOOL init(void) SET(p_istream_assign_sb, "??4istream@@IEAAAEAV0(a)PEAVstreambuf@@@Z"); SET(p_istream_assign, "??4istream@@IEAAAEAV0(a)AEBV0@@Z"); SET(p_istream_vbase_dtor, "??_Distream@@QEAAXXZ"); + SET(p_istream_eatwhite, "?eatwhite(a)istream@@QEAAXXZ"); } else { p_operator_new = (void*)GetProcAddress(msvcrt, "??2(a)YAPAXI@Z"); p_operator_delete = (void*)GetProcAddress(msvcrt, "??3(a)YAXPAX@Z"); @@ -625,6 +627,7 @@ static BOOL init(void) SET(p_istream_assign_sb, "??4istream@@IAEAAV0(a)PAVstreambuf@@@Z"); SET(p_istream_assign, "??4istream@@IAEAAV0(a)ABV0@@Z"); SET(p_istream_vbase_dtor, "??_Distream@@QAEXXZ"); + SET(p_istream_eatwhite, "?eatwhite(a)istream@@QAEXXZ"); } SET(p_ios_static_lock, "?x_lockc(a)ios@@0U_CRT_CRITICAL_SECTION@@A"); SET(p_ios_lockc, "?lockc(a)ios@@KAXXZ"); @@ -3410,6 +3413,7 @@ static void test_istream(void) filebuf fb1, fb2, *pfb; const char filename1[] = "test1"; const char filename2[] = "test2"; + int ret; memset(&is1, 0xab, sizeof(istream)); memset(&is2, 0xab, sizeof(istream)); @@ -3556,6 +3560,63 @@ if (0) /* crashes on native */ ok(is2.base_ios.sb == &fb2.base, "expected %p got %p\n", &fb2.base, is2.base_ios.sb); ok(is2.base_ios.state == IOSTATE_goodbit, "expected %d got %d\n", IOSTATE_goodbit, is2.base_ios.state); + /* eatwhite */ + is1.extract_delim = is1.count = 0; +if (0) /* crashes on native */ + is1.base_ios.sb = NULL; + is1.base_ios.state = IOSTATE_badbit; + is1.base_ios.flags = 0; + call_func1(p_istream_eatwhite, &is1); + ok(is1.base_ios.state == (IOSTATE_badbit|IOSTATE_eofbit), "expected %d got %d\n", + IOSTATE_badbit|IOSTATE_eofbit, is1.base_ios.state); + is1.base_ios.state = IOSTATE_failbit; + call_func1(p_istream_eatwhite, &is1); + ok(is1.base_ios.state == (IOSTATE_failbit|IOSTATE_eofbit), "expected %d got %d\n", + IOSTATE_failbit|IOSTATE_eofbit, is1.base_ios.state); + is1.base_ios.state = IOSTATE_goodbit; + ret = (int) call_func3(p_streambuf_xsputn, &fb1.base, "And if \tyou ask\n\v\f\r me", 23); + ok(ret == 23, "expected 23 got %d\n", ret); + ok(fb1.base.pbase == fb1.base.base, "wrong put base, expected %p got %p\n", fb1.base.base, fb1.base.pbase); + ok(fb1.base.pptr == fb1.base.base + 23, "wrong put pointer, expected %p got %p\n", fb1.base.base + 23, fb1.base.pptr); + call_func1(p_istream_eatwhite, &is1); + ok(is1.base_ios.state == IOSTATE_eofbit, "expected %d got %d\n", IOSTATE_eofbit, is1.base_ios.state); + ok(fb1.base.pbase == NULL, "wrong put base, expected %p got %p\n", NULL, fb1.base.pbase); + ok(fb1.base.pptr == NULL, "wrong put pointer, expected %p got %p\n", NULL, fb1.base.pptr); + ok(fb1.base.epptr == NULL, "wrong put end, expected %p got %p\n", NULL, fb1.base.epptr); + is1.base_ios.state = IOSTATE_goodbit; + ret = (int) call_func4(p_filebuf_seekoff, &fb1, 0, SEEKDIR_beg, 0); + ok(ret == 0, "expected 0 got %d\n", ret); + call_func1(p_istream_eatwhite, &is1); + ok(is1.base_ios.state == IOSTATE_goodbit, "expected %d got %d\n", IOSTATE_goodbit, is1.base_ios.state); + ok(fb1.base.eback == fb1.base.base, "wrong get base, expected %p got %p\n", fb1.base.base, fb1.base.eback); + ok(fb1.base.gptr == fb1.base.base, "wrong get pointer, expected %p got %p\n", fb1.base.base, fb1.base.gptr); + ok(fb1.base.egptr == fb1.base.base + 23, "wrong get end, expected %p got %p\n", fb1.base.base + 23, fb1.base.egptr); + ret = (int) call_func4(p_filebuf_seekoff, &fb1, 3, SEEKDIR_beg, 0); + ok(ret == 3, "expected 3 got %d\n", ret); + call_func1(p_istream_eatwhite, &is1); + ok(is1.base_ios.state == IOSTATE_goodbit, "expected %d got %d\n", IOSTATE_goodbit, is1.base_ios.state); + ok(fb1.base.eback == fb1.base.base, "wrong get base, expected %p got %p\n", fb1.base.base, fb1.base.eback); + ok(fb1.base.gptr == fb1.base.base + 1, "wrong get pointer, expected %p got %p\n", fb1.base.base + 1, fb1.base.gptr); + ok(fb1.base.egptr == fb1.base.base + 20, "wrong get end, expected %p got %p\n", fb1.base.base + 20, fb1.base.egptr); + fb1.base.gptr += 2; + call_func1(p_istream_eatwhite, &is1); + ok(is1.base_ios.state == IOSTATE_goodbit, "expected %d got %d\n", IOSTATE_goodbit, is1.base_ios.state); + ok(fb1.base.eback == fb1.base.base, "wrong get base, expected %p got %p\n", fb1.base.base, fb1.base.eback); + ok(fb1.base.gptr == fb1.base.base + 5, "wrong get pointer, expected %p got %p\n", fb1.base.base + 5, fb1.base.gptr); + ok(fb1.base.egptr == fb1.base.base + 20, "wrong get end, expected %p got %p\n", fb1.base.base + 20, fb1.base.egptr); + fb1.base.gptr += 7; + call_func1(p_istream_eatwhite, &is1); + ok(is1.base_ios.state == IOSTATE_goodbit, "expected %d got %d\n", IOSTATE_goodbit, is1.base_ios.state); + ok(fb1.base.eback == fb1.base.base, "wrong get base, expected %p got %p\n", fb1.base.base, fb1.base.eback); + ok(fb1.base.gptr == fb1.base.base + 18, "wrong get pointer, expected %p got %p\n", fb1.base.base + 18, fb1.base.gptr); + ok(fb1.base.egptr == fb1.base.base + 20, "wrong get end, expected %p got %p\n", fb1.base.base + 20, fb1.base.egptr); + fb1.base.gptr += 9; + call_func1(p_istream_eatwhite, &is1); + ok(is1.base_ios.state == IOSTATE_eofbit, "expected %d got %d\n", IOSTATE_eofbit, is1.base_ios.state); + ok(fb1.base.eback == NULL, "wrong get base, expected %p got %p\n", NULL, fb1.base.eback); + ok(fb1.base.gptr == NULL, "wrong get pointer, expected %p got %p\n", NULL, fb1.base.gptr); + ok(fb1.base.egptr == NULL, "wrong get end, expected %p got %p\n", NULL, fb1.base.egptr); + call_func1(p_istream_vbase_dtor, &is1); call_func1(p_istream_vbase_dtor, &is2); call_func1(p_filebuf_dtor, &fb1);

1 0