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

Akihiro Sagawa : msstyles: Avoid using isspace() for WCHARs.
by Alexandre Julliard May 17, 2017

May 17, 2017

Module: wine Branch: master Commit: 9abd3b9622c1102934a57eb5196a774dbf2c8d33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9abd3b9622c1102934a57eb51… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed May 17 21:35:46 2017 +0900 msstyles: Avoid using isspace() 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/uxtheme/msstyles.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/uxtheme/msstyles.c b/dlls/uxtheme/msstyles.c index e62b95d..16cfbf5 100644 --- a/dlls/uxtheme/msstyles.c +++ b/dlls/uxtheme/msstyles.c @@ -1175,19 +1175,24 @@ static BOOL MSSTYLES_GetNextInteger(LPCWSTR lpStringStart, LPCWSTR lpStringEnd, return TRUE; } +static inline BOOL isSpace(WCHAR c) +{ + return c == ' ' || c == '\f' || c == '\n' || c == '\r' || c == '\t' || c == '\v'; +} + static BOOL MSSTYLES_GetNextToken(LPCWSTR lpStringStart, LPCWSTR lpStringEnd, LPCWSTR *lpValEnd, LPWSTR lpBuff, DWORD buffSize) { LPCWSTR cur = lpStringStart; LPCWSTR start; LPCWSTR end; - while(cur < lpStringEnd && (isspace(*cur) || *cur == ',')) cur++; + while(cur < lpStringEnd && (isSpace(*cur) || *cur == ',')) cur++; if(cur >= lpStringEnd) { return FALSE; } start = cur; while(cur < lpStringEnd && *cur != ',') cur++; end = cur; - while(isspace(*end)) end--; + while(isSpace(*end)) end--; lstrcpynW(lpBuff, start, min(buffSize, end-start+1));

1 0

Akihiro Sagawa : secur32: Use isspaceW() instead of isspace() for WCHARs.
by Alexandre Julliard May 17, 2017

May 17, 2017

Module: wine Branch: master Commit: b7ed8760210f497cf9b0c81a9e4684d862726bc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7ed8760210f497cf9b0c81a9… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed May 17 21:35:40 2017 +0900 secur32: Use isspaceW() instead of isspace() 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/secur32/secur32.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/secur32.c b/dlls/secur32/secur32.c index d3cbb9b..1e12f3c 100644 --- a/dlls/secur32/secur32.c +++ b/dlls/secur32/secur32.c @@ -593,8 +593,8 @@ static void SECUR32_initializeProviders(void) ; if (*comma == ',') *comma = '\0'; - for (; *ptr && isspace(*ptr) && ptr < securityPkgNames + size; - ptr++) + for (; *ptr && isspaceW(*ptr) && ptr < securityPkgNames + size; + ptr++) ; if (*ptr) _tryLoadProvider(ptr);

1 0

Akihiro Sagawa : shlwapi: Use isalnumW() instead of isalnum() for WCHARs.
by Alexandre Julliard May 17, 2017

May 17, 2017

Module: wine Branch: master Commit: 98d0fa99da488b84d3e6238a447308cd7227c34c URL: http://source.winehq.org/git/wine.git/?a=commit;h=98d0fa99da488b84d3e6238a4… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed May 17 21:35:44 2017 +0900 shlwapi: Use isalnumW() instead of isalnum() for WCHARs. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/url.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shlwapi/url.c b/dlls/shlwapi/url.c index 89d5a5d..bda4eb2 100644 --- a/dlls/shlwapi/url.c +++ b/dlls/shlwapi/url.c @@ -809,7 +809,7 @@ HRESULT WINAPI UrlCombineW(LPCWSTR pszBase, LPCWSTR pszRelative, process_case = 1; break; } - if (isalnum(*mrelative) && (*(mrelative + 1) == ':')) { + if (isalnumW(*mrelative) && (*(mrelative + 1) == ':')) { /* case that becomes "file:///" */ strcpyW(preliminary, myfilestr); process_case = 1;

1 0

Akihiro Sagawa : shell32: Avoid using isspace() for WCHARs.
by Alexandre Julliard May 17, 2017

May 17, 2017

Module: wine Branch: master Commit: 255fd46eeb3158474c9b665d6d7ff84b6f1cf55d URL: http://source.winehq.org/git/wine.git/?a=commit;h=255fd46eeb3158474c9b665d6… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed May 17 21:35:42 2017 +0900 shell32: Avoid using isspace() 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/shell32/shlexec.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index 474a1bc..c0ef53a 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -62,6 +62,10 @@ static const WCHAR wszEmpty[] = {0}; typedef UINT_PTR (*SHELL_ExecuteW32)(const WCHAR *lpCmd, WCHAR *env, BOOL shWait, const SHELLEXECUTEINFOW *sei, LPSHELLEXECUTEINFOW sei_out); +static inline BOOL isSpace(WCHAR c) +{ + return c == ' ' || c == '\f' || c == '\n' || c == '\r' || c == '\t' || c == '\v'; +} /*********************************************************************** * SHELL_ArgifyW [Internal] @@ -135,7 +139,7 @@ static BOOL SHELL_ArgifyW(WCHAR* out, int len, const WCHAR* fmt, const WCHAR* lp } else { - while(*args && !isspace(*args)) + while(*args && !isSpace(*args)) { used++; if (used < len) @@ -144,7 +148,7 @@ static BOOL SHELL_ArgifyW(WCHAR* out, int len, const WCHAR* fmt, const WCHAR* lp args++; } - while(isspace(*args)) + while(isSpace(*args)) ++args; } break;

1 0

Akihiro Sagawa : wordpad: Avoid using isspace() for WCHARs.
by Alexandre Julliard May 17, 2017

May 17, 2017

Module: wine Branch: master Commit: 2532b1476a41e9d6edc8e576b0b2348e3b6d60d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2532b1476a41e9d6edc8e576b… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed May 17 21:35:51 2017 +0900 wordpad: Avoid using isspace() for WCHARs. Found with Coccinelle. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wordpad/wordpad.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index f91274d..904867f 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -1171,7 +1171,7 @@ static void HandleCommandLine(LPWSTR cmdline) while (*cmdline) { - while (isspace(*cmdline)) cmdline++; + while (*cmdline == ' ' || *cmdline == '\t') cmdline++; if (*cmdline == '-' || *cmdline == '/') {

1 0

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

May 17, 2017

Module: wine Branch: master Commit: ea6e51744fa533e64d9c8257f1cc892ff43c741e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea6e51744fa533e64d9c8257f… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed May 17 21:35:39 2017 +0900 ntdll: 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/ntdll/printf.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/printf.c b/dlls/ntdll/printf.c index 65dc62d..b6b8b6c 100644 --- a/dlls/ntdll/printf.c +++ b/dlls/ntdll/printf.c @@ -410,6 +410,11 @@ static void pf_fixup_exponent( char *buf ) } } +static inline BOOL isDigit(WCHAR c) +{ + return c >= '0' && c <= '9'; +} + /********************************************************************* * pf_vsnprintf (INTERNAL) * @@ -490,7 +495,7 @@ static int pf_vsnprintf( pf_output *out, const WCHAR *format, __ms_va_list valis } p++; } - else while( isdigit(*p) ) + else while( isDigit(*p) ) { flags.FieldLength *= 10; flags.FieldLength += *p++ - '0'; @@ -507,7 +512,7 @@ static int pf_vsnprintf( pf_output *out, const WCHAR *format, __ms_va_list valis flags.Precision = va_arg( valist, int ); p++; } - else while( isdigit(*p) ) + else while( isDigit(*p) ) { flags.Precision *= 10; flags.Precision += *p++ - '0'; @@ -531,7 +536,7 @@ static int pf_vsnprintf( pf_output *out, const WCHAR *format, __ms_va_list valis } else if( *(p+1) == '3' && *(p+2) == '2' ) p += 3; - else if( isdigit(*(p+1)) || *(p+1) == 0 ) + else if( isDigit(*(p+1)) || *(p+1) == 0 ) break; else p++;

1 0

Józef Kucia : wined3d: Generate rasterizer setup in domain shaders only when necessary.
by Alexandre Julliard May 17, 2017

May 17, 2017

Module: wine Branch: master Commit: 553282a0ff09a31c6fc93b488621bbb9e39ec2a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=553282a0ff09a31c6fc93b488… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed May 17 15:42:35 2017 +0200 wined3d: Generate rasterizer setup in domain shaders only when necessary. 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 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 76ec6f7..6f51939 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -7465,10 +7465,11 @@ static GLuint shader_glsl_generate_domain_shader(const struct wined3d_context *c shader_addline(buffer, "in shader_in_out { vec4 reg[%u]; } shader_in[];\n", shader->limits->packed_input); - if (!gl_info->supported[ARB_CLIP_CONTROL]) + if (args->next_shader_type == WINED3D_SHADER_TYPE_PIXEL && !gl_info->supported[ARB_CLIP_CONTROL]) shader_addline(buffer, "uniform vec4 pos_fixup;\n"); - shader_glsl_generate_sm4_output_setup(priv, shader, args->output_count, gl_info, TRUE); + shader_glsl_generate_sm4_output_setup(priv, shader, args->output_count, gl_info, + args->next_shader_type == WINED3D_SHADER_TYPE_PIXEL); shader_addline(buffer, "void main()\n{\n"); if (FAILED(shader_generate_main(shader, buffer, reg_maps, &priv_ctx)))

1 0

Józef Kucia : wined3d: Handle dcl_output_control_point_count instruction.
by Alexandre Julliard May 17, 2017

May 17, 2017

Module: wine Branch: master Commit: b0d2cf8e3f0d5f79d60acc0e72ffaf72fbe5fa6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0d2cf8e3f0d5f79d60acc0e7… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed May 17 15:42:34 2017 +0200 wined3d: Handle dcl_output_control_point_count 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/glsl_shader.c | 2 +- dlls/wined3d/shader.c | 7 +++++++ dlls/wined3d/wined3d_private.h | 13 +++++++------ 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index ce96085..76ec6f7 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -10290,7 +10290,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_DCL_INPUT_SIV */ shader_glsl_nop, /* WINED3DSIH_DCL_INTERFACE */ NULL, /* WINED3DSIH_DCL_OUTPUT */ shader_glsl_nop, - /* WINED3DSIH_DCL_OUTPUT_CONTROL_POINT_COUNT */ NULL, + /* WINED3DSIH_DCL_OUTPUT_CONTROL_POINT_COUNT */ shader_glsl_nop, /* WINED3DSIH_DCL_OUTPUT_SIV */ shader_glsl_nop, /* WINED3DSIH_DCL_OUTPUT_TOPOLOGY */ shader_glsl_nop, /* WINED3DSIH_DCL_RESOURCE_RAW */ shader_glsl_nop, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 7ee867d..bbd6718 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1053,6 +1053,13 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st FIXME("Invalid instruction %#x for shader type %#x.\n", ins.handler_idx, shader_version.type); } + else if (ins.handler_idx == WINED3DSIH_DCL_OUTPUT_CONTROL_POINT_COUNT) + { + if (shader_version.type == WINED3D_SHADER_TYPE_HULL) + shader->u.hs.output_vertex_count = ins.declaration.count; + else + FIXME("Invalid instruction %#x for shader type %#x.\n", ins.handler_idx, shader_version.type); + } else if (ins.handler_idx == WINED3DSIH_DCL_OUTPUT_TOPOLOGY) { if (shader_version.type == WINED3D_SHADER_TYPE_GEOMETRY) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 57c2a96..70dd8ed 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3708,17 +3708,18 @@ struct wined3d_vertex_shader struct wined3d_shader_attribute attributes[MAX_ATTRIBS]; }; -struct wined3d_domain_shader -{ - enum wined3d_tessellator_domain tessellator_domain; -}; - struct wined3d_hull_shader { + unsigned int output_vertex_count; enum wined3d_tessellator_output_primitive tessellator_output_primitive; enum wined3d_tessellator_partitioning tessellator_partitioning; }; +struct wined3d_domain_shader +{ + enum wined3d_tessellator_domain tessellator_domain; +}; + struct wined3d_geometry_shader { enum wined3d_primitive_type input_type; @@ -3782,8 +3783,8 @@ struct wined3d_shader union { struct wined3d_vertex_shader vs; - struct wined3d_domain_shader ds; struct wined3d_hull_shader hs; + struct wined3d_domain_shader ds; struct wined3d_geometry_shader gs; struct wined3d_pixel_shader ps; struct wined3d_compute_shader cs;

1 0

Józef Kucia : wined3d: Fill whole structure in find_ds_compile_args().
by Alexandre Julliard May 17, 2017

May 17, 2017

Module: wine Branch: master Commit: ab27a5902d53dc3ab3b3712ec2d9a8d94a3b8da1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab27a5902d53dc3ab3b3712ec… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed May 17 15:42:33 2017 +0200 wined3d: Fill whole structure in find_ds_compile_args(). 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 | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 3 insertions(+) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 1dd8e6d..7ee867d 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -3523,6 +3523,8 @@ void find_ds_compile_args(const struct wined3d_state *state, const struct wined3 : WINED3D_SHADER_TYPE_PIXEL; args->render_offscreen = context->render_offscreen; + + args->padding = 0; } void find_gs_compile_args(const struct wined3d_state *state, const struct wined3d_shader *shader, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f376d41..57c2a96 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1336,6 +1336,7 @@ struct ds_compile_args unsigned int output_count : 16; unsigned int next_shader_type : 3; unsigned int render_offscreen : 1; + unsigned int padding : 12; }; struct gs_compile_args

1 0

Józef Kucia : d3d11/tests: Port test_clear_state() from d3d10core.
by Alexandre Julliard May 17, 2017

May 17, 2017

Module: wine Branch: master Commit: 25e69d6645e15ab13d31f54ceadf18a415a5aa2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=25e69d6645e15ab13d31f54ce… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed May 17 15:42:31 2017 +0200 d3d11/tests: Port test_clear_state() from d3d10core. 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 | 1254 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 1254 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=25e69d6645e15ab13d31f…

1 0