May 2017 - Wine-Commits - list.winehq.org

Józef Kucia : wined3d: Handle tessellation shaders registers.
by Alexandre Julliard May 16, 2017

May 16, 2017

Module: wine Branch: master Commit: 0994528b8063861fc93bf1ba3bec2b2f792ca9da URL: http://source.winehq.org/git/wine.git/?a=commit;h=0994528b8063861fc93bf1ba3… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue May 16 15:00:23 2017 +0200 wined3d: Handle tessellation shaders registers. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 8b29dde..2105764 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2704,6 +2704,7 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * break; case WINED3DSPR_INPUT: + case WINED3DSPR_INCONTROLPOINT: if (version->type == WINED3D_SHADER_TYPE_VERTEX) { struct shader_glsl_ctx_priv *priv = ins->ctx->backend_data; @@ -2716,7 +2717,9 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * break; } - if (version->type == WINED3D_SHADER_TYPE_GEOMETRY) + if (version->type == WINED3D_SHADER_TYPE_HULL + || version->type == WINED3D_SHADER_TYPE_DOMAIN + || version->type == WINED3D_SHADER_TYPE_GEOMETRY) { if (reg->idx[0].rel_addr) { @@ -2978,7 +2981,10 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * break; case WINED3DSPR_PRIMID: - sprintf(register_name, "uint(gl_PrimitiveIDIn)"); + if (version->type == WINED3D_SHADER_TYPE_GEOMETRY) + sprintf(register_name, "uint(gl_PrimitiveIDIn)"); + else + sprintf(register_name, "uint(gl_PrimitiveID)"); break; case WINED3DSPR_IDXTEMP: @@ -2996,6 +3002,7 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * break; case WINED3DSPR_GSINSTID: + case WINED3DSPR_OUTPOINTID: if (gl_info->supported[ARB_SHADING_LANGUAGE_420PACK]) sprintf(register_name, "gl_InvocationID"); else @@ -3014,6 +3021,10 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * sprintf(register_name, "ivec3(gl_LocalInvocationID)"); break; + case WINED3DSPR_TESSCOORD: + sprintf(register_name, "gl_TessCoord"); + break; + default: FIXME("Unhandled register type %#x.\n", reg->type); sprintf(register_name, "unrecognized_register"); @@ -3167,6 +3178,7 @@ static void shader_glsl_add_src_param_ext(const struct wined3d_shader_instructio case WINED3DSPR_GSINSTID: case WINED3DSPR_LOCALTHREADID: case WINED3DSPR_LOCALTHREADINDEX: + case WINED3DSPR_OUTPOINTID: case WINED3DSPR_THREADGROUPID: case WINED3DSPR_THREADID: param_data_type = WINED3D_DATA_INT;

1 0

Józef Kucia : wined3d: Ignore dcl_index_range instruction in GLSL backend.
by Alexandre Julliard May 16, 2017

May 16, 2017

Module: wine Branch: master Commit: 45e50c3069470df670bbb663c0176889b8cce7e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45e50c3069470df670bbb663c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue May 16 15:00:21 2017 +0200 wined3d: Ignore dcl_index_range instruction in GLSL backend. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 4414495..8b29dde 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -10018,7 +10018,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_DCL_HS_JOIN_PHASE_INSTANCE_COUNT */ NULL, /* WINED3DSIH_DCL_HS_MAX_TESSFACTOR */ NULL, /* WINED3DSIH_DCL_IMMEDIATE_CONSTANT_BUFFER */ shader_glsl_nop, - /* WINED3DSIH_DCL_INDEX_RANGE */ NULL, + /* WINED3DSIH_DCL_INDEX_RANGE */ shader_glsl_nop, /* WINED3DSIH_DCL_INDEXABLE_TEMP */ shader_glsl_nop, /* WINED3DSIH_DCL_INPUT */ shader_glsl_nop, /* WINED3DSIH_DCL_INPUT_CONTROL_POINT_COUNT */ NULL,

1 0

Jacek Caban : rpcrt4: Always use winsock for networking.
by Alexandre Julliard May 16, 2017

May 16, 2017

Module: wine Branch: master Commit: e6215938b75f6ef9c476d68ec21e9ed2a0730f31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6215938b75f6ef9c476d68ec… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 16 17:47:50 2017 +0200 rpcrt4: Always use winsock for networking. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/Makefile.in | 3 +- dlls/rpcrt4/rpc_transport.c | 298 +++----------------------------------------- 2 files changed, 18 insertions(+), 283 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e6215938b75f6ef9c476d…

1 0

Józef Kucia : wined3d: Generate code for domain shaders.
by Alexandre Julliard May 16, 2017

May 16, 2017

Module: wine Branch: master Commit: b45a0d4f15870868e2c209125cb45f59ae0c7ea8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b45a0d4f15870868e2c209125… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue May 16 15:00:24 2017 +0200 wined3d: Generate code for domain shaders. 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/context.c | 4 +- dlls/wined3d/glsl_shader.c | 280 +++++++++++++++++++++++++++++++++++++++-- dlls/wined3d/shader.c | 39 ++++++ dlls/wined3d/wined3d_private.h | 25 ++++ 4 files changed, 338 insertions(+), 10 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b45a0d4f15870868e2c20…

1 0

Józef Kucia : wined3d: Add checkGLcall() to wined3d_unordered_access_view_clear_uint().
by Alexandre Julliard May 16, 2017

May 16, 2017

Module: wine Branch: master Commit: 4036cd1bbe0a6309afd2699731cc0057e4aeb478 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4036cd1bbe0a6309afd269973… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue May 16 15:00:20 2017 +0200 wined3d: Add checkGLcall() to wined3d_unordered_access_view_clear_uint(). 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/view.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index fce3ea2..adb43dd 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -895,6 +895,7 @@ void wined3d_unordered_access_view_clear_uint(struct wined3d_unordered_access_vi context_bind_bo(context, buffer->buffer_type_hint, buffer->buffer_object); GL_EXTCALL(glClearBufferSubData(buffer->buffer_type_hint, format->glInternal, offset, size, format->glFormat, format->glType, clear_value)); + checkGLcall("clear unordered access view"); } static void wined3d_unordered_access_view_cs_init(void *object)

1 0

Jacek Caban : rpcrt4: Use standard Wine list to store connections in RpcServerProtseq.
by Alexandre Julliard May 16, 2017

May 16, 2017

Module: wine Branch: master Commit: 2035294d0c47ddbb35bb7f10143f25cdf3367ccb URL: http://source.winehq.org/git/wine.git/?a=commit;h=2035294d0c47ddbb35bb7f101… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 16 17:48:01 2017 +0200 rpcrt4: Use standard Wine list to store connections in RpcServerProtseq. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/rpc_binding.h | 2 +- dlls/rpcrt4/rpc_server.c | 18 ++++--- dlls/rpcrt4/rpc_server.h | 2 +- dlls/rpcrt4/rpc_transport.c | 128 ++++++++++++++++---------------------------- 4 files changed, 59 insertions(+), 91 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2035294d0c47ddbb35bb7…

1 0

Akihiro Sagawa : midimap: Avoid using isdigit() for WCHARs.
by Alexandre Julliard May 16, 2017

May 16, 2017

Module: wine Branch: master Commit: 2b0d9b56535dadd118610b7a1d6734216f7e4820 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b0d9b56535dadd118610b7a1… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed May 17 00:00:10 2017 +0900 midimap: Avoid using isdigit() for WCHARs. Found with Coccinelle. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/midimap/midimap.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/midimap/midimap.c b/dlls/midimap/midimap.c index c7b8da3..64b4dc8 100644 --- a/dlls/midimap/midimap.c +++ b/dlls/midimap/midimap.c @@ -116,14 +116,15 @@ static BOOL MIDIMAP_FindPort(const WCHAR* name, unsigned* dev) return TRUE; } /* try the form #nnn */ - if (*name == '#' && isdigit(name[1])) + if (*name == '#' && name[1] >= '0' && name[1] <= '9') { const WCHAR* ptr = name + 1; *dev = 0; do { *dev = *dev * 10 + *ptr - '0'; - } while (isdigit(*++ptr)); + ptr++; + } while (*ptr >= '0' && *ptr <= '9'); if (*dev < numMidiOutPorts) return TRUE; }

1 0

Józef Kucia : d3d11: Make "offsets" optional in d3d11_immediate_context_SOSetTargets().
by Alexandre Julliard May 16, 2017

May 16, 2017

Module: wine Branch: master Commit: e4560cf9649c270f32d72b8e1bb5fca00c577f77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4560cf9649c270f32d72b8e1… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue May 16 15:00:22 2017 +0200 d3d11: Make "offsets" optional in d3d11_immediate_context_SOSetTargets(). 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/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 81da77b..f15192d 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -827,7 +827,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_SOSetTargets(ID3D11DeviceC struct d3d_buffer *buffer = unsafe_impl_from_ID3D11Buffer(buffers[i]); wined3d_device_set_stream_output(device->wined3d_device, i, - buffer ? buffer->wined3d_buffer : NULL, offsets[i]); + buffer ? buffer->wined3d_buffer : NULL, offsets ? offsets[i] : 0); } for (; i < D3D11_SO_BUFFER_SLOT_COUNT; ++i) {

1 0

Akihiro Sagawa : oleaut32: Fix parse error when converting non-ascii string to VT_DATE.
by Alexandre Julliard May 16, 2017

May 16, 2017

Module: wine Branch: master Commit: efc86ec175fa2f67c649299f48ac96d1af9a1fa9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=efc86ec175fa2f67c649299f4… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed May 17 00:00:07 2017 +0900 oleaut32: Fix parse error when converting non-ascii string to VT_DATE. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/vartype.c | 7 +++++++ dlls/oleaut32/vartype.c | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index ff495bd..0f39043 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -3410,6 +3410,8 @@ static void test_VarDateFromStr(void) SYSTEMTIME st; OLECHAR buff[128]; size_t i; + OLECHAR with_ideographic_spaceW[] = { '6','/','3','0','/','2','0','1','1',0x3000, + '1',':','2','0',':','3','4',0 }; lcid = MAKELCID(MAKELANGID(LANG_ENGLISH,SUBLANG_ENGLISH_US),SORT_DEFAULT); @@ -3533,6 +3535,11 @@ static void test_VarDateFromStr(void) DFS("6/30/2011 01:20:34 PM"); EXPECT_DBL(40724.55594907407); /* Native fails "1999 January 3, 9AM". I consider that a bug in native */ + /* test a data with ideographic space */ + out = 0.0; + hres = pVarDateFromStr(with_ideographic_spaceW, lcid, LOCALE_NOUSEROVERRIDE, &out); + EXPECT_DBL(40724.05594907407); + /* test a non-english data string */ DFS("02.01.1970"); EXPECT_MISMATCH; DFS("02.01.1970 00:00:00"); EXPECT_MISMATCH; diff --git a/dlls/oleaut32/vartype.c b/dlls/oleaut32/vartype.c index 2151fc9..aab4d33 100644 --- a/dlls/oleaut32/vartype.c +++ b/dlls/oleaut32/vartype.c @@ -7676,7 +7676,7 @@ HRESULT WINAPI VarDateFromStr(OLECHAR* strIn, LCID lcid, ULONG dwFlags, DATE* pd dp.dwCount++; strIn--; } - else if (isalpha(*strIn)) + else if (isalphaW(*strIn)) { BOOL bFound = FALSE;

1 0

Akihiro Sagawa : dbghelp: Avoid using isdigit() for WCHARs.
by Alexandre Julliard May 16, 2017

May 16, 2017

Module: wine Branch: master Commit: d47c07d0cffe974acc53098da87601dcb1ac0842 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d47c07d0cffe974acc53098da… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed May 17 00:00:11 2017 +0900 dbghelp: Avoid using isdigit() for WCHARs. Found with Coccinelle. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/module.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index 9df02df..c6c9d5e 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -461,7 +461,7 @@ enum module_type module_get_type_by_name(const WCHAR* name) { int i = len; - while (i && isdigit(name[i - 1])) i--; + while (i && name[i - 1] >= '0' && name[i - 1] <= '9') i--; if (i && name[i - 1] == '.') len = i - 1;

1 0