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

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

17 May '17

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

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

17 May '17

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 : shell32: Avoid using isspace() for WCHARs.
by Alexandre Julliard 17 May '17

17 May '17

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 : shlwapi: Use isalnumW() instead of isalnum() for WCHARs.
by Alexandre Julliard 17 May '17

17 May '17

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 : msstyles: Avoid using isspace() for WCHARs.
by Alexandre Julliard 17 May '17

17 May '17

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 : wordpad: Avoid using isspace() for WCHARs.
by Alexandre Julliard 17 May '17

17 May '17

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 : wininet: Use isspaceW() instead of isspace() for WCHARs.
by Alexandre Julliard 17 May '17

17 May '17

Module: wine Branch: master Commit: 05c23c95f83dcf271f13286e4b2ea595bbace2e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=05c23c95f83dcf271f13286e4… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed May 17 21:35:47 2017 +0900 wininet: 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/wininet/http.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 321d569..2172f5f 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -4295,7 +4295,7 @@ static BOOL HTTP_ParseDateAsAsctime(LPCWSTR value, FILETIME *ft) while (isspaceW(*ptr)) ptr++; - for (monthPtr = month; !isspace(*ptr) && + for (monthPtr = month; !isspaceW(*ptr) && monthPtr - month < sizeof(month) / sizeof(month[0]) - 1; monthPtr++, ptr++) *monthPtr = *ptr; @@ -4392,7 +4392,7 @@ static BOOL HTTP_ParseRfc1123Date(LPCWSTR value, FILETIME *ft) while (isspaceW(*ptr)) ptr++; - for (monthPtr = month; !isspace(*ptr) && + for (monthPtr = month; !isspaceW(*ptr) && monthPtr - month < sizeof(month) / sizeof(month[0]) - 1; monthPtr++, ptr++) *monthPtr = *ptr;

1 0

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

17 May '17

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

Sven Hesse : d3d11/tests: Add test for the SM4 instruction continuec.
by Alexandre Julliard 17 May '17

17 May '17

Module: wine Branch: master Commit: fc945ae4e6f0b57fa927a1293f16ba38e777e7f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc945ae4e6f0b57fa927a1293… Author: Sven Hesse <drmccoy(a)drmccoy.de> Date: Tue May 16 18:46:08 2017 +0200 d3d11/tests: Add test for the SM4 instruction continuec. To get fxc to output continuec_z/continuec_nz instead of an if-block with a normal continue inside, the shaders have been compiled with the /Gfa flag. Signed-off-by: Sven Hesse <drmccoy(a)drmccoy.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 117 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 117 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 5b85845..7db71d3 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -10789,6 +10789,122 @@ static void test_sm4_breakc_instruction(void) release_test_context(&test_context); } +static void test_sm4_continuec_instruction(void) +{ + struct d3d11_test_context test_context; + ID3D11DeviceContext *context; + ID3D11PixelShader *ps; + ID3D11Device *device; + HRESULT hr; + + /* To get fxc to output continuec_z/continuec_nz instead of an if-block + * with a normal continue inside, the shaders have been compiled with + * the /Gfa flag. */ + static const DWORD ps_continuec_nz_code[] = + { +#if 0 + float4 main() : SV_TARGET + { + uint counter = 0; + int i = -1; + + while (i < 255) { + ++i; + + if (i != 0) + continue; + + ++counter; + } + + if (counter == 1) + return float4(0.0f, 1.0f, 0.0f, 1.0f); + else + return float4(1.0f, 0.0f, 0.0f, 1.0f); + } +#endif + 0x43425844, 0xaadaac96, 0xbe00fdfb, 0x29356be0, 0x47e79bd6, 0x00000001, 0x00000208, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, + 0x0000000f, 0x545f5653, 0x45475241, 0xabab0054, 0x52444853, 0x00000190, 0x00000040, 0x00000064, + 0x03000065, 0x001020f2, 0x00000000, 0x02000068, 0x00000003, 0x08000036, 0x00100032, 0x00000000, + 0x00004002, 0x00000000, 0xffffffff, 0x00000000, 0x00000000, 0x01000030, 0x07000021, 0x00100042, + 0x00000000, 0x0010001a, 0x00000000, 0x00004001, 0x000000ff, 0x03040003, 0x0010002a, 0x00000000, + 0x0700001e, 0x00100022, 0x00000001, 0x0010001a, 0x00000000, 0x00004001, 0x00000001, 0x09000037, + 0x00100022, 0x00000002, 0x0010001a, 0x00000001, 0x0010001a, 0x00000001, 0x00004001, 0x00000000, + 0x05000036, 0x00100012, 0x00000002, 0x0010000a, 0x00000000, 0x05000036, 0x00100032, 0x00000000, + 0x00100046, 0x00000002, 0x05000036, 0x00100042, 0x00000000, 0x0010001a, 0x00000001, 0x03040008, + 0x0010002a, 0x00000000, 0x0700001e, 0x00100012, 0x00000001, 0x0010000a, 0x00000000, 0x00004001, + 0x00000001, 0x05000036, 0x00100032, 0x00000000, 0x00100046, 0x00000001, 0x01000016, 0x07000020, + 0x00100012, 0x00000000, 0x0010000a, 0x00000000, 0x00004001, 0x00000001, 0x08000036, 0x001020f2, + 0x00000000, 0x00004002, 0x00000000, 0x3f800000, 0x00000000, 0x3f800000, 0x0304003f, 0x0010000a, + 0x00000000, 0x08000036, 0x001020f2, 0x00000000, 0x00004002, 0x3f800000, 0x00000000, 0x00000000, + 0x3f800000, 0x0100003e, + + }; + static const DWORD ps_continuec_z_code[] = + { +#if 0 + float4 main() : SV_TARGET + { + uint counter = 0; + int i = -1; + + while (i < 255) { + ++i; + + if (i == 0) + continue; + + ++counter; + } + + if (counter == 255) + return float4(0.0f, 1.0f, 0.0f, 1.0f); + else + return float4(1.0f, 0.0f, 0.0f, 1.0f); + } +#endif + 0x43425844, 0x0322b23d, 0x52b25dc8, 0xa625f5f1, 0x271e3f46, 0x00000001, 0x000001d0, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, + 0x0000000f, 0x545f5653, 0x45475241, 0xabab0054, 0x52444853, 0x00000158, 0x00000040, 0x00000056, + 0x03000065, 0x001020f2, 0x00000000, 0x02000068, 0x00000002, 0x08000036, 0x00100032, 0x00000000, + 0x00004002, 0x00000000, 0xffffffff, 0x00000000, 0x00000000, 0x01000030, 0x07000021, 0x00100042, + 0x00000000, 0x0010001a, 0x00000000, 0x00004001, 0x000000ff, 0x03040003, 0x0010002a, 0x00000000, + 0x0700001e, 0x00100022, 0x00000001, 0x0010001a, 0x00000000, 0x00004001, 0x00000001, 0x05000036, + 0x00100042, 0x00000001, 0x0010000a, 0x00000000, 0x05000036, 0x00100072, 0x00000000, 0x00100966, + 0x00000001, 0x03000008, 0x0010002a, 0x00000000, 0x0700001e, 0x00100012, 0x00000001, 0x0010000a, + 0x00000000, 0x00004001, 0x00000001, 0x05000036, 0x00100032, 0x00000000, 0x00100046, 0x00000001, + 0x01000016, 0x07000020, 0x00100012, 0x00000000, 0x0010000a, 0x00000000, 0x00004001, 0x000000ff, + 0x08000036, 0x001020f2, 0x00000000, 0x00004002, 0x00000000, 0x3f800000, 0x00000000, 0x3f800000, + 0x0304003f, 0x0010000a, 0x00000000, 0x08000036, 0x001020f2, 0x00000000, 0x00004002, 0x3f800000, + 0x00000000, 0x00000000, 0x3f800000, 0x0100003e, + }; + + if (!init_test_context(&test_context, NULL)) + return; + + device = test_context.device; + context = test_context.immediate_context; + + hr = ID3D11Device_CreatePixelShader(device, ps_continuec_nz_code, sizeof(ps_continuec_nz_code), NULL, &ps); + ok(SUCCEEDED(hr), "Failed to create continuec_nz pixel shader, hr %#x.\n", hr); + ID3D11DeviceContext_PSSetShader(context, ps, NULL, 0); + draw_quad(&test_context); + check_texture_color(test_context.backbuffer, 0xff00ff00, 0); + ID3D11PixelShader_Release(ps); + + hr = ID3D11Device_CreatePixelShader(device, ps_continuec_z_code, sizeof(ps_continuec_z_code), NULL, &ps); + ok(SUCCEEDED(hr), "Failed to create continuec_z pixel shader, hr %#x.\n", hr); + ID3D11DeviceContext_PSSetShader(context, ps, NULL, 0); + draw_quad(&test_context); + check_texture_color(test_context.backbuffer, 0xff00ff00, 0); + ID3D11PixelShader_Release(ps); + + release_test_context(&test_context); +} + static void test_create_input_layout(void) { D3D11_INPUT_ELEMENT_DESC layout_desc[] = @@ -18316,6 +18432,7 @@ START_TEST(d3d11) test_shader_stage_input_output_matching(); test_sm4_if_instruction(); test_sm4_breakc_instruction(); + test_sm4_continuec_instruction(); test_create_input_layout(); test_input_assembler(); test_null_sampler();

1 0

Józef Kucia : wined3d: Invalidate domain shader state regardless of ARB_clip_control support.
by Alexandre Julliard 17 May '17

17 May '17

Module: wine Branch: master Commit: f6cbdd8a4c636628e7969c1eb96b64e53067f5f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6cbdd8a4c636628e7969c1eb… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed May 17 15:42:32 2017 +0200 wined3d: Invalidate domain shader state regardless of ARB_clip_control support. 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 78f8f94..89731e5 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2635,8 +2635,8 @@ static void context_set_render_offscreen(struct wined3d_context *context, BOOL o context_invalidate_state(context, STATE_FRONTFACE); context_invalidate_state(context, STATE_POINTSPRITECOORDORIGIN); context_invalidate_state(context, STATE_TRANSFORM(WINED3D_TS_PROJECTION)); - context_invalidate_state(context, STATE_SHADER(WINED3D_SHADER_TYPE_DOMAIN)); } + context_invalidate_state(context, STATE_SHADER(WINED3D_SHADER_TYPE_DOMAIN)); if (context->gl_info->supported[ARB_FRAGMENT_COORD_CONVENTIONS]) context_invalidate_state(context, STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL)); context->render_offscreen = offscreen;

1 0