November 2019 - Wine-commits

Rémi Bernon : winevdm: Increase buffer size to fix format-overflow warning.
by Alexandre Julliard 13 Nov '19

13 Nov '19

Module: wine Branch: master Commit: f3bccae11a483903a99b1dd327a067fe9b3e5b43 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f3bccae11a483903a99b1dd3… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Nov 13 14:51:21 2019 +0100 winevdm: Increase buffer size to fix format-overflow warning. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winevdm/winevdm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/winevdm/winevdm.c b/programs/winevdm/winevdm.c index 4852e5fc72..64750db135 100644 --- a/programs/winevdm/winevdm.c +++ b/programs/winevdm/winevdm.c @@ -305,7 +305,7 @@ static VOID pif_cmd( char *filename, char *cmdline) { HANDLE hFile; char progpath[MAX_PATH]; - char buf[128]; + char buf[308]; char progname[64]; char title[31]; char optparams[65];

1 0

Piotr Caban : ucrtbase: Set invalid parameter handler for all misc tests.
by Alexandre Julliard 13 Nov '19

13 Nov '19

Module: wine Branch: master Commit: f63138d04991ce87722424f959279f03cbb29c09 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f63138d04991ce87722424f9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 13 22:07:31 2019 +0100 ucrtbase: Set invalid parameter handler for all misc tests. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ucrtbase/tests/misc.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index 3a1598fee2..fb81cf220e 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -430,6 +430,9 @@ static void test_invalid_parameter_handler(void) ret = p__set_invalid_parameter_handler(NULL); ok(ret == global_invalid_parameter_handler, "ret = %p\n", ret); + + ret = p__set_invalid_parameter_handler(global_invalid_parameter_handler); + ok(!ret, "ret != NULL\n"); } static void test__get_narrow_winmain_command_line(char *path) @@ -539,8 +542,6 @@ static void test__sopen_dispatch(void) p__close(fd); unlink(tempf); - p__set_invalid_parameter_handler(global_invalid_parameter_handler); - SET_EXPECT(global_invalid_parameter_handler); fd = 0; ret = p_sopen_dispatch(tempf, _O_CREAT, _SH_DENYWR, 0xff, &fd, 1); @@ -553,8 +554,6 @@ static void test__sopen_dispatch(void) unlink(tempf); } - p__set_invalid_parameter_handler(NULL); - free(tempf); } @@ -578,8 +577,6 @@ static void test__sopen_s(void) p__close(fd); unlink(tempf); - p__set_invalid_parameter_handler(global_invalid_parameter_handler); - /* _sopen_s() invokes invalid parameter handler on invalid pmode */ SET_EXPECT(global_invalid_parameter_handler); fd = 0; @@ -587,7 +584,6 @@ static void test__sopen_s(void) ok(ret == EINVAL, "got %d\n", ret); ok(fd == -1, "got fd %d\n", fd); CHECK_CALLED(global_invalid_parameter_handler); - p__set_invalid_parameter_handler(NULL); free(tempf); }

1 0

Rémi Bernon : opencl: Define CL_TARGET_OPENCL_VERSION 220 to fix a header warning.
by Alexandre Julliard 13 Nov '19

13 Nov '19

Module: wine Branch: master Commit: 97e47fe0668add38dbcee327a4a0a26e20be4891 URL: https://source.winehq.org/git/wine.git/?a=commit;h=97e47fe0668add38dbcee327… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Nov 13 14:51:24 2019 +0100 opencl: Define CL_TARGET_OPENCL_VERSION 220 to fix a header warning. This is going to be the value used anyway, as we didn't specify it. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opencl/opencl.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/opencl/opencl.c b/dlls/opencl/opencl.c index 2d145bf25c..7e680ba057 100644 --- a/dlls/opencl/opencl.c +++ b/dlls/opencl/opencl.c @@ -34,6 +34,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(opencl); #define CL_USE_DEPRECATED_OPENCL_1_1_APIS #define CL_USE_DEPRECATED_OPENCL_1_2_APIS #define CL_USE_DEPRECATED_OPENCL_2_0_APIS +#define CL_TARGET_OPENCL_VERSION 220 #include <CL/cl.h> #elif defined(HAVE_OPENCL_OPENCL_H) #include <OpenCL/opencl.h>

1 0

Jeff Smith : ucrtbase: Strftime returns 4-digit timezone for %z.
by Alexandre Julliard 13 Nov '19

13 Nov '19

Module: wine Branch: master Commit: d4e2b0584b9c0cf7bf123dba136c29e91ece4c82 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d4e2b0584b9c0cf7bf123dba… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Wed Nov 13 22:07:42 2019 +0100 ucrtbase: Strftime returns 4-digit timezone for %z. Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/time.c | 30 ++++++++++++++++++++++++++++++ dlls/ucrtbase/tests/misc.c | 6 ++++++ 2 files changed, 36 insertions(+) diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index 9787d18e3f..faff48221e 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -1033,6 +1033,30 @@ static inline BOOL strftime_time(char *str, MSVCRT_size_t *pos, MSVCRT_size_t ma return TRUE; } +static inline BOOL strftime_tzdiff(char *str, MSVCRT_size_t *pos, MSVCRT_size_t max, BOOL is_dst) +{ + MSVCRT_long tz = MSVCRT___timezone + (is_dst ? MSVCRT__dstbias : 0); + MSVCRT_size_t len; + char sign; + + if(tz < 0) { + sign = '+'; + tz = -tz; + }else { + sign = '-'; + } + + len = MSVCRT__snprintf(str+*pos, max-*pos, "%c%02u%02u", sign, tz/60/60, tz/60%60); + if(len == -1) { + *str = 0; + *MSVCRT__errno() = MSVCRT_ERANGE; + return FALSE; + } + + *pos += len; + return TRUE; +} + static inline BOOL strftime_str(char *str, MSVCRT_size_t *pos, MSVCRT_size_t max, char *src) { MSVCRT_size_t len = strlen(src); @@ -1300,6 +1324,12 @@ static MSVCRT_size_t strftime_helper(char *str, MSVCRT_size_t max, const char *f return 0; break; case 'z': +#if _MSVCR_VER>=140 + MSVCRT__tzset(); + if(!strftime_tzdiff(str, &ret, max, mstm->tm_isdst)) + return 0; + break; +#endif case 'Z': MSVCRT__tzset(); if(MSVCRT__get_tzname(&tmp, str+ret, max-ret, mstm->tm_isdst ? 1 : 0)) diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index fb81cf220e..cee37fc426 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -1001,6 +1001,12 @@ static void test_strftime(void) todo_wine ok(retA == 2, "expected 2, got %d\n", (int)retA); todo_wine ok(!strcmp(bufA, "53"), "got %s\n", bufA); + retA = p_strftime(bufA, sizeof(bufA), "%z", &tm2); + ok(retA == 5, "expected 5, got %d\n", (int)retA); + ok((bufA[0] == '+' || bufA[0] == '-') && + isdigit(bufA[1]) && isdigit(bufA[2]) && + isdigit(bufA[3]) && isdigit(bufA[4]), "got %s\n", bufA); + for(i=0; i<14; i++) { __time32_t t = (365*2 + i - 7) * 24 * 60 * 60;

1 0

Piotr Caban : ucrtbase: Clean up strftime tests.
by Alexandre Julliard 13 Nov '19

13 Nov '19

Module: wine Branch: master Commit: 7b60dcbefa4ff9a307231e465bca16980c958ba9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7b60dcbefa4ff9a307231e46… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 13 22:07:50 2019 +0100 ucrtbase: Clean up strftime tests. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ucrtbase/tests/misc.c | 180 ++++++++++++++------------------------------- 1 file changed, 56 insertions(+), 124 deletions(-) diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index cee37fc426..3095d9ed01 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -898,134 +898,66 @@ static void test_asctime(void) static void test_strftime(void) { - const struct tm epoch = { 0, 0, 0, 1, 0, 70, 4, 0, 0 }; - const struct tm tm1 = { 0, 0, 0, 1, 0, 117, 0, 0, 0 }; - const struct tm tm2 = { 0, 0, 14, 1, 0, 121, 6, 0, 0 }; - char bufA[256]; - size_t retA; - int i; - - retA = p_strftime(bufA, sizeof(bufA), "%C", &epoch); - ok(retA == 2, "expected 2, got %d\n", (int)retA); - ok(!strcmp(bufA, "19"), "got %s\n", bufA); - - retA = p_strftime(bufA, sizeof(bufA), "%D", &epoch); - ok(retA == 8, "expected 8, got %d\n", (int)retA); - ok(!strcmp(bufA, "01/01/70"), "got %s\n", bufA); - - retA = p_strftime(bufA, sizeof(bufA), "%#D", &epoch); - ok(retA == 6, "expected 6, got %d\n", (int)retA); - ok(!strcmp(bufA, "1/1/70"), "got %s\n", bufA); - - retA = p_strftime(bufA, sizeof(bufA), "%e", &epoch); - ok(retA == 2, "expected 2, got %d\n", (int)retA); - ok(!strcmp(bufA, " 1"), "got %s\n", bufA); - - retA = p_strftime(bufA, sizeof(bufA), "%#e", &epoch); - ok(retA == 1, "expected 1, got %d\n", (int)retA); - ok(!strcmp(bufA, "1"), "got %s\n", bufA); - - retA = p_strftime(bufA, sizeof(bufA), "%F", &epoch); - ok(retA == 10, "expected 10, got %d\n", (int)retA); - ok(!strcmp(bufA, "1970-01-01"), "got %s\n", bufA); - - retA = p_strftime(bufA, sizeof(bufA), "%#F", &epoch); - ok(retA == 8, "expected 8, got %d\n", (int)retA); - ok(!strcmp(bufA, "1970-1-1"), "got %s\n", bufA); - - retA = p_strftime(bufA, sizeof(bufA), "%R", &epoch); - ok(retA == 5, "expected 5, got %d\n", (int)retA); - ok(!strcmp(bufA, "00:00"), "got %s\n", bufA); - - retA = p_strftime(bufA, sizeof(bufA), "%#R", &epoch); - ok(retA == 3, "expected 3, got %d\n", (int)retA); - ok(!strcmp(bufA, "0:0"), "got %s\n", bufA); - - retA = p_strftime(bufA, sizeof(bufA), "%T", &epoch); - ok(retA == 8, "expected 8, got %d\n", (int)retA); - ok(!strcmp(bufA, "00:00:00"), "got %s\n", bufA); - - retA = p_strftime(bufA, sizeof(bufA), "%#T", &epoch); - ok(retA == 5, "expected 5, got %d\n", (int)retA); - ok(!strcmp(bufA, "0:0:0"), "got %s\n", bufA); - - retA = p_strftime(bufA, sizeof(bufA), "%u", &tm1); - ok(retA == 1, "expected 1, got %d\n", (int)retA); - ok(!strcmp(bufA, "7"), "got %s\n", bufA); - - retA = p_strftime(bufA, sizeof(bufA), "%h", &epoch); - ok(retA == 3, "expected 3, got %d\n", (int)retA); - ok(!strcmp(bufA, "Jan"), "got %s\n", bufA); - - retA = p_strftime(bufA, sizeof(bufA), "%n", &epoch); - ok(retA == 1, "expected 1, got %d\n", (int)retA); - ok(!strcmp(bufA, "\n"), "got %s\n", bufA); - - retA = p_strftime(bufA, sizeof(bufA), "%r", &epoch); - todo_wine ok(retA == 11, "expected 11, got %d\n", (int)retA); - todo_wine ok(!strcmp(bufA, "12:00:00 AM"), "got %s\n", bufA); - - retA = p_strftime(bufA, sizeof(bufA), "%r", &tm2); - todo_wine ok(retA == 11, "expected 11, got %d\n", (int)retA); - todo_wine ok(!strcmp(bufA, "02:00:00 PM"), "got %s\n", bufA); - - retA = p_strftime(bufA, sizeof(bufA), "%t", &epoch); - ok(retA == 1, "expected 1, got %d\n", (int)retA); - ok(!strcmp(bufA, "\t"), "got %s\n", bufA); - - retA = p_strftime(bufA, sizeof(bufA), "%g", &epoch); - ok(retA == 2, "expected 2, got %d\n", (int)retA); - ok(!strcmp(bufA, "70"), "got %s\n", bufA); - - retA = p_strftime(bufA, sizeof(bufA), "%g", &tm1); - ok(retA == 2, "expected 2, got %d\n", (int)retA); - ok(!strcmp(bufA, "16"), "got %s\n", bufA); - - retA = p_strftime(bufA, sizeof(bufA), "%G", &epoch); - ok(retA == 4, "expected 4, got %d\n", (int)retA); - ok(!strcmp(bufA, "1970"), "got %s\n", bufA); - - retA = p_strftime(bufA, sizeof(bufA), "%G", &tm1); - ok(retA == 4, "expected 4, got %d\n", (int)retA); - ok(!strcmp(bufA, "2016"), "got %s\n", bufA); - - retA = p_strftime(bufA, sizeof(bufA), "%V", &epoch); - todo_wine ok(retA == 2, "expected 2, got %d\n", (int)retA); - todo_wine ok(!strcmp(bufA, "01"), "got %s\n", bufA); - - retA = p_strftime(bufA, sizeof(bufA), "%V", &tm1); - todo_wine ok(retA == 2, "expected 2, got %d\n", (int)retA); - todo_wine ok(!strcmp(bufA, "52"), "got %s\n", bufA); - - retA = p_strftime(bufA, sizeof(bufA), "%V", &tm2); - todo_wine ok(retA == 2, "expected 2, got %d\n", (int)retA); - todo_wine ok(!strcmp(bufA, "53"), "got %s\n", bufA); + const struct { + const char *format; + const char *ret; + struct tm tm; + BOOL todo; + } tests[] = { + {"%C", "19", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, + {"%D", "01/01/70", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, + {"%#D", "1/1/70", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, + {"%e", " 1", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, + {"%#e", "1", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, + {"%F", "1970-01-01", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, + {"%#F", "1970-1-1", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, + {"%R", "00:00", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, + {"%#R", "0:0", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, + {"%T", "00:00:00", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, + {"%#T", "0:0:0", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, + {"%u", "7", { 0, 0, 0, 1, 0, 117, 0, 0, 0 }}, + {"%h", "Jan", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, + {"%n", "\n", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, + {"%r", "12:00:00 AM", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }, TRUE}, + {"%r", "02:00:00 PM", { 0, 0, 14, 1, 0, 121, 6, 0, 0 }, TRUE}, + {"%t", "\t", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, + {"%g", "70", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, + {"%g", "16", { 0, 0, 0, 1, 0, 117, 0, 0, 0 }}, + {"%G", "1970", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, + {"%G", "2016", { 0, 0, 0, 1, 0, 117, 0, 0, 0 }}, + {"%V", "01", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }, TRUE}, + {"%V", "52", { 0, 0, 0, 1, 0, 117, 0, 0, 0 }, TRUE}, + {"%V", "53", { 0, 0, 14, 1, 0, 121, 6, 0, 0 }, TRUE}, + {"%g", "71", { 0, 0, 0, 2, 0, 72, 0, 1, 0 }}, + {"%g", "72", { 0, 0, 0, 3, 0, 72, 1, 2, 0 }}, + {"%G", "1971", { 0, 0, 0, 2, 0, 72, 0, 1, 0 }}, + {"%G", "1972", { 0, 0, 0, 3, 0, 72, 1, 2, 0 }}, + }; - retA = p_strftime(bufA, sizeof(bufA), "%z", &tm2); - ok(retA == 5, "expected 5, got %d\n", (int)retA); - ok((bufA[0] == '+' || bufA[0] == '-') && - isdigit(bufA[1]) && isdigit(bufA[2]) && - isdigit(bufA[3]) && isdigit(bufA[4]), "got %s\n", bufA); + const struct tm epoch = { 0, 0, 0, 1, 0, 70, 4, 0, 0 }; + char buf[256]; + int i, ret; - for(i=0; i<14; i++) + for (i=0; i<ARRAY_SIZE(tests); i++) { - __time32_t t = (365*2 + i - 7) * 24 * 60 * 60; - struct tm tm = *p__gmtime32(&t); - - retA = p_strftime(bufA, sizeof(bufA), "%g", &tm); - ok(retA == 2, "%d) retA = %d\n", i, (int)retA); - if (i <= 8) - ok(!strcmp(bufA, "71"), "%d) got %s, expected 71\n", i, bufA); - else - ok(!strcmp(bufA, "72"), "%d) got %s, expected 72\n", i, bufA); - - retA = p_strftime(bufA, sizeof(bufA), "%G", &tm); - ok(retA == 4, "%d) retA = %d\n", i, (int)retA); - if (i <= 8) - ok(!strcmp(bufA, "1971"), "%d) got %s, expected 1971\n", i, bufA); - else - ok(!strcmp(bufA, "1972"), "%d) got %s, expected 1972\n", i, bufA); + todo_wine_if(tests[i].todo) { + if (!tests[i].ret[0]) + SET_EXPECT(global_invalid_parameter_handler); + ret = p_strftime(buf, sizeof(buf), tests[i].format, &tests[i].tm); + if (!tests[i].ret[0]) + CHECK_CALLED(global_invalid_parameter_handler); + + ok(ret == strlen(tests[i].ret), "%d) ret = %d\n", i, ret); + ok(!strcmp(buf, tests[i].ret), "%d) buf = \"%s\", expected \"%s\"\n", + i, buf, tests[i].ret); + } } + + ret = p_strftime(buf, sizeof(buf), "%z", &epoch); + ok(ret == 5, "expected 5, got %d\n", ret); + ok((buf[0] == '+' || buf[0] == '-') && + isdigit(buf[1]) && isdigit(buf[2]) && + isdigit(buf[3]) && isdigit(buf[4]), "got %s\n", buf); } static LONG* get_failures_counter(HANDLE *map)

1 0

Piotr Caban : msvcrt: Call invalid parameter handler in strftime.
by Alexandre Julliard 13 Nov '19

13 Nov '19

Module: wine Branch: master Commit: d0277873ea4776c7b008437a17f0b530dd13bccd URL: https://source.winehq.org/git/wine.git/?a=commit;h=d0277873ea4776c7b008437a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 13 22:07:57 2019 +0100 msvcrt: Call invalid parameter handler in strftime. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/time.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index faff48221e..142a96aca1 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -1116,7 +1116,8 @@ static MSVCRT_size_t strftime_helper(char *str, MSVCRT_size_t max, const char *f if(MSVCRT__isleadbyte_l((unsigned char)*format, loc)) { str[ret++] = *(format++); if(ret == max) continue; - if(!str[ret]) goto einval_error; + if(!MSVCRT_CHECK_PMT(str[ret])) + goto einval_error; } str[ret++] = *format; continue; @@ -1130,7 +1131,7 @@ static MSVCRT_size_t strftime_helper(char *str, MSVCRT_size_t max, const char *f alternate = FALSE; } - if(!mstm) + if(!MSVCRT_CHECK_PMT(mstm)) goto einval_error; switch(*format) { @@ -1151,13 +1152,13 @@ static MSVCRT_size_t strftime_helper(char *str, MSVCRT_size_t max, const char *f return 0; break; case 'a': - if(mstm->tm_wday<0 || mstm->tm_wday>6) + if(!MSVCRT_CHECK_PMT(mstm->tm_wday>=0 && mstm->tm_wday<=6)) goto einval_error; if(!strftime_str(str, &ret, max, time_data->str.names.short_wday[mstm->tm_wday])) return 0; break; case 'A': - if(mstm->tm_wday<0 || mstm->tm_wday>6) + if(!MSVCRT_CHECK_PMT(mstm->tm_wday>=0 && mstm->tm_wday<=6)) goto einval_error; if(!strftime_str(str, &ret, max, time_data->str.names.wday[mstm->tm_wday])) return 0; @@ -1166,13 +1167,13 @@ static MSVCRT_size_t strftime_helper(char *str, MSVCRT_size_t max, const char *f #if _MSVCR_VER>=140 case 'h': #endif - if(mstm->tm_mon<0 || mstm->tm_mon>11) + if(!MSVCRT_CHECK_PMT(mstm->tm_mon>=0 && mstm->tm_mon<=11)) goto einval_error; if(!strftime_str(str, &ret, max, time_data->str.names.short_mon[mstm->tm_mon])) return 0; break; case 'B': - if(mstm->tm_mon<0 || mstm->tm_mon>11) + if(!MSVCRT_CHECK_PMT(mstm->tm_mon>=0 && mstm->tm_mon<=11)) goto einval_error; if(!strftime_str(str, &ret, max, time_data->str.names.mon[mstm->tm_mon])) return 0; @@ -1268,7 +1269,7 @@ static MSVCRT_size_t strftime_helper(char *str, MSVCRT_size_t max, const char *f break; #endif case 'p': - if(mstm->tm_hour<0 || mstm->tm_hour>23) + if(!MSVCRT_CHECK_PMT(mstm->tm_hour>=0 && mstm->tm_hour<=23)) goto einval_error; if(!strftime_str(str, &ret, max, mstm->tm_hour<12 ? time_data->str.names.am : time_data->str.names.pm)) @@ -1338,7 +1339,9 @@ static MSVCRT_size_t strftime_helper(char *str, MSVCRT_size_t max, const char *f break; case 'U': case 'W': - if(mstm->tm_wday<0 || mstm->tm_wday>6 || mstm->tm_yday<0 || mstm->tm_yday>365) + if(!MSVCRT_CHECK_PMT(mstm->tm_wday>=0 && mstm->tm_wday<=6)) + goto einval_error; + if(!MSVCRT_CHECK_PMT(mstm->tm_yday>=0 && mstm->tm_yday<=365)) goto einval_error; if(*format == 'U') tmp = mstm->tm_wday; @@ -1356,6 +1359,7 @@ static MSVCRT_size_t strftime_helper(char *str, MSVCRT_size_t max, const char *f break; default: WARN("unknown format %c\n", *format); + MSVCRT_INVALID_PMT("unknown format", MSVCRT_EINVAL); goto einval_error; } } @@ -1372,7 +1376,6 @@ static MSVCRT_size_t strftime_helper(char *str, MSVCRT_size_t max, const char *f einval_error: *str = 0; - *MSVCRT__errno() = MSVCRT_EINVAL; return 0; }

1 0

Jeff Smith : ucrtbase: Strftime %y works for years 0 to 9999.
by Alexandre Julliard 13 Nov '19

13 Nov '19

Module: wine Branch: master Commit: 5725ed3b46309b62469e4f305cb0b5a9b292dd43 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5725ed3b46309b62469e4f30… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Wed Nov 13 22:08:03 2019 +0100 ucrtbase: Strftime %y works for years 0 to 9999. Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/time.c | 9 ++++++++- dlls/ucrtbase/tests/misc.c | 6 +++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index 142a96aca1..ae6fcc8b7a 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -1316,7 +1316,14 @@ static MSVCRT_size_t strftime_helper(char *str, MSVCRT_size_t max, const char *f return 0; break; case 'y': - if(!strftime_int(str, &ret, max, mstm->tm_year%100, alternate ? 0 : 2, 0, 99)) +#if _MSVCR_VER>=140 + if(!MSVCRT_CHECK_PMT(mstm->tm_year>=-1900 && mstm->tm_year<=8099)) + goto einval_error; + tmp = (mstm->tm_year+1900)%100; +#else + tmp = mstm->tm_year%100; +#endif + if(!strftime_int(str, &ret, max, tmp, alternate ? 0 : 2, 0, 99)) return 0; break; case 'Y': diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index 3095d9ed01..fb138a0fa4 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -379,7 +379,7 @@ static void __cdecl global_invalid_parameter_handler( const wchar_t *expression, const wchar_t *function, const wchar_t *file, unsigned line, uintptr_t arg) { - CHECK_EXPECT(global_invalid_parameter_handler); + CHECK_EXPECT2(global_invalid_parameter_handler); } static void __cdecl thread_invalid_parameter_handler( @@ -928,6 +928,10 @@ static void test_strftime(void) {"%V", "01", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }, TRUE}, {"%V", "52", { 0, 0, 0, 1, 0, 117, 0, 0, 0 }, TRUE}, {"%V", "53", { 0, 0, 14, 1, 0, 121, 6, 0, 0 }, TRUE}, + {"%y", "", { 0, 0, 0, 0, 0, -1901, 0, 0, 0 }}, + {"%y", "00", { 0, 0, 0, 0, 0, -1900, 0, 0, 0 }}, + {"%y", "99", { 0, 0, 0, 0, 0, 8099, 0, 0, 0 }}, + {"%y", "", { 0, 0, 0, 0, 0, 8100, 0, 0, 0 }}, {"%g", "71", { 0, 0, 0, 2, 0, 72, 0, 1, 0 }}, {"%g", "72", { 0, 0, 0, 3, 0, 72, 1, 2, 0 }}, {"%G", "1971", { 0, 0, 0, 2, 0, 72, 0, 1, 0 }},

1 0

Connor McAdams : d3dcompiler: Implement d3d10 reflection Get{Input, Output}ParameterDesc() methods.
by Alexandre Julliard 13 Nov '19

13 Nov '19

Module: wine Branch: master Commit: d8ff297052f26ffd27b8d8caa2eabd5fbaec4409 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d8ff297052f26ffd27b8d8ca… Author: Connor McAdams <conmanx360(a)gmail.com> Date: Wed Nov 13 16:27:22 2019 +0100 d3dcompiler: Implement d3d10 reflection Get{Input, Output}ParameterDesc() methods. Signed-off-by: Connor McAdams <conmanx360(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/reflection.c | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index f480c72986..7a27811482 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -1930,17 +1930,37 @@ static HRESULT STDMETHODCALLTYPE d3d10_shader_reflection_GetResourceBindingDesc( static HRESULT STDMETHODCALLTYPE d3d10_shader_reflection_GetInputParameterDesc(ID3D10ShaderReflection *iface, UINT index, D3D10_SIGNATURE_PARAMETER_DESC *desc) { - FIXME("iface %p, index %u, desc %p stub!\n", iface, index, desc); + struct d3dcompiler_shader_reflection *reflection = impl_from_ID3D10ShaderReflection(iface); - return E_NOTIMPL; + TRACE("iface %p, index %u, desc %p.\n", iface, index, desc); + + if (!desc || !reflection->isgn || index >= reflection->isgn->element_count) + { + WARN("Invalid argument specified.\n"); + return E_INVALIDARG; + } + + memcpy(desc, &reflection->isgn->elements[index], sizeof(*desc)); + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d10_shader_reflection_GetOutputParameterDesc(ID3D10ShaderReflection *iface, UINT index, D3D10_SIGNATURE_PARAMETER_DESC *desc) { - FIXME("iface %p, index %u, desc %p stub!\n", iface, index, desc); + struct d3dcompiler_shader_reflection *reflection = impl_from_ID3D10ShaderReflection(iface); - return E_NOTIMPL; + TRACE("iface %p, index %u, desc %p.\n", iface, index, desc); + + if (!desc || !reflection->osgn || index >= reflection->osgn->element_count) + { + WARN("Invalid argument specified.\n"); + return E_INVALIDARG; + } + + memcpy(desc, &reflection->osgn->elements[index], sizeof(*desc)); + + return S_OK; } static const struct ID3D10ShaderReflectionVtbl d3d10_shader_reflection_vtbl =

1 0

Connor McAdams : d3dcompiler: Implement d3d10 reflection GetResourceBindingDesc() method.
by Alexandre Julliard 13 Nov '19

13 Nov '19

Module: wine Branch: master Commit: 6b6f8d5c2f59d17b37f6e17c9ccf84d5a6096719 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b6f8d5c2f59d17b37f6e17c… Author: Connor McAdams <conmanx360(a)gmail.com> Date: Wed Nov 13 16:27:23 2019 +0100 d3dcompiler: Implement d3d10 reflection GetResourceBindingDesc() method. Signed-off-by: Connor McAdams <conmanx360(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/reflection.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index 7a27811482..02210df7d5 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -1922,9 +1922,19 @@ static struct ID3D10ShaderReflectionConstantBuffer * STDMETHODCALLTYPE d3d10_sha static HRESULT STDMETHODCALLTYPE d3d10_shader_reflection_GetResourceBindingDesc(ID3D10ShaderReflection *iface, UINT index, D3D10_SHADER_INPUT_BIND_DESC *desc) { - FIXME("iface %p, index %u, desc %p stub!\n", iface, index, desc); + struct d3dcompiler_shader_reflection *reflection = impl_from_ID3D10ShaderReflection(iface); - return E_NOTIMPL; + TRACE("iface %p, index %u, desc %p.\n", iface, index, desc); + + if (!desc || index >= reflection->bound_resource_count) + { + WARN("Invalid argument specified.\n"); + return E_INVALIDARG; + } + + memcpy(desc, &reflection->bound_resources[index], sizeof(*desc)); + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d10_shader_reflection_GetInputParameterDesc(ID3D10ShaderReflection *iface,

1 0

Connor McAdams : d3dcompiler: Partially implement ID3D10ShaderReflectionConstantBuffer.
by Alexandre Julliard 13 Nov '19

13 Nov '19

Module: wine Branch: master Commit: 14002a796d658479aa8353fe5a960b10e01430cb URL: https://source.winehq.org/git/wine.git/?a=commit;h=14002a796d658479aa8353fe… Author: Connor McAdams <conmanx360(a)gmail.com> Date: Wed Nov 13 16:27:24 2019 +0100 d3dcompiler: Partially implement ID3D10ShaderReflectionConstantBuffer. Signed-off-by: Connor McAdams <conmanx360(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/reflection.c | 87 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 83 insertions(+), 4 deletions(-) diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index 02210df7d5..6bad13e3a0 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -44,6 +44,7 @@ struct d3dcompiler_shader_signature struct d3dcompiler_shader_reflection_type { ID3D11ShaderReflectionType ID3D11ShaderReflectionType_iface; + ID3D10ShaderReflectionType ID3D10ShaderReflectionType_iface; DWORD id; struct wine_rb_entry entry; @@ -65,6 +66,7 @@ struct d3dcompiler_shader_reflection_type_member struct d3dcompiler_shader_reflection_variable { ID3D11ShaderReflectionVariable ID3D11ShaderReflectionVariable_iface; + ID3D10ShaderReflectionVariable ID3D10ShaderReflectionVariable_iface; struct d3dcompiler_shader_reflection_constant_buffer *constant_buffer; struct d3dcompiler_shader_reflection_type *type; @@ -79,6 +81,7 @@ struct d3dcompiler_shader_reflection_variable struct d3dcompiler_shader_reflection_constant_buffer { ID3D11ShaderReflectionConstantBuffer ID3D11ShaderReflectionConstantBuffer_iface; + ID3D10ShaderReflectionConstantBuffer ID3D10ShaderReflectionConstantBuffer_iface; struct d3dcompiler_shader_reflection *reflection; @@ -147,11 +150,28 @@ static const struct ID3D11ShaderReflectionConstantBufferVtbl d3dcompiler_shader_ static const struct ID3D11ShaderReflectionVariableVtbl d3dcompiler_shader_reflection_variable_vtbl; static const struct ID3D11ShaderReflectionTypeVtbl d3dcompiler_shader_reflection_type_vtbl; +static const struct ID3D10ShaderReflectionConstantBufferVtbl d3d10_shader_reflection_constant_buffer_vtbl; +static const struct ID3D10ShaderReflectionVariableVtbl d3d10_shader_reflection_variable_vtbl; +static const struct ID3D10ShaderReflectionTypeVtbl d3d10_shader_reflection_type_vtbl; + /* null objects - needed for invalid calls */ -static struct d3dcompiler_shader_reflection_constant_buffer null_constant_buffer = {{&d3dcompiler_shader_reflection_constant_buffer_vtbl}}; -static struct d3dcompiler_shader_reflection_type null_type = {{&d3dcompiler_shader_reflection_type_vtbl}}; -static struct d3dcompiler_shader_reflection_variable null_variable = {{&d3dcompiler_shader_reflection_variable_vtbl}, - &null_constant_buffer, &null_type}; +static struct d3dcompiler_shader_reflection_constant_buffer null_constant_buffer = +{ + {&d3dcompiler_shader_reflection_constant_buffer_vtbl}, + {&d3d10_shader_reflection_constant_buffer_vtbl} +}; +static struct d3dcompiler_shader_reflection_type null_type = +{ + {&d3dcompiler_shader_reflection_type_vtbl}, + {&d3d10_shader_reflection_type_vtbl} +}; +static struct d3dcompiler_shader_reflection_variable null_variable = +{ + {&d3dcompiler_shader_reflection_variable_vtbl}, + {&d3d10_shader_reflection_variable_vtbl}, + &null_constant_buffer, + &null_type +}; static BOOL copy_name(const char *ptr, char **name) { @@ -1507,6 +1527,7 @@ static HRESULT d3dcompiler_parse_rdef(struct d3dcompiler_shader_reflection *r, c struct d3dcompiler_shader_reflection_constant_buffer *cb = &constant_buffers[i]; cb->ID3D11ShaderReflectionConstantBuffer_iface.lpVtbl = &d3dcompiler_shader_reflection_constant_buffer_vtbl; + cb->ID3D10ShaderReflectionConstantBuffer_iface.lpVtbl = &d3d10_shader_reflection_constant_buffer_vtbl; cb->reflection = r; read_dword(&ptr, &offset); @@ -1986,6 +2007,64 @@ static const struct ID3D10ShaderReflectionVtbl d3d10_shader_reflection_vtbl = d3d10_shader_reflection_GetOutputParameterDesc, }; +static inline struct d3dcompiler_shader_reflection_constant_buffer *impl_from_ID3D10ShaderReflectionConstantBuffer( + ID3D10ShaderReflectionConstantBuffer *iface) +{ + return CONTAINING_RECORD(iface, struct d3dcompiler_shader_reflection_constant_buffer, + ID3D10ShaderReflectionConstantBuffer_iface); +} + +static HRESULT STDMETHODCALLTYPE d3d10_shader_reflection_constant_buffer_GetDesc( + ID3D10ShaderReflectionConstantBuffer *iface, D3D10_SHADER_BUFFER_DESC *desc) +{ + struct d3dcompiler_shader_reflection_constant_buffer *cb = impl_from_ID3D10ShaderReflectionConstantBuffer(iface); + + TRACE("iface %p, desc %p.\n", iface, desc); + + if (cb == &null_constant_buffer) + { + WARN("Null constant buffer specified.\n"); + return E_FAIL; + } + + if (!desc) + { + WARN("Invalid argument specified.\n"); + return E_FAIL; + } + + desc->Name = cb->name; + desc->Type = cb->type; + desc->Variables = cb->variable_count; + desc->Size = cb->size; + desc->uFlags = cb->flags; + + return S_OK; +} + +static ID3D10ShaderReflectionVariable * STDMETHODCALLTYPE d3d10_shader_reflection_constant_buffer_GetVariableByIndex( + ID3D10ShaderReflectionConstantBuffer *iface, UINT index) +{ + FIXME("iface %p, index %d stub!\n", iface, index); + + return &null_variable.ID3D10ShaderReflectionVariable_iface; +} + +static ID3D10ShaderReflectionVariable * STDMETHODCALLTYPE d3d10_shader_reflection_constant_buffer_GetVariableByName( + ID3D10ShaderReflectionConstantBuffer *iface, const char *name) +{ + FIXME("iface %p, name %s stub!\n", iface, name); + + return &null_variable.ID3D10ShaderReflectionVariable_iface; +} + +static const struct ID3D10ShaderReflectionConstantBufferVtbl d3d10_shader_reflection_constant_buffer_vtbl = +{ + d3d10_shader_reflection_constant_buffer_GetDesc, + d3d10_shader_reflection_constant_buffer_GetVariableByIndex, + d3d10_shader_reflection_constant_buffer_GetVariableByName, +}; + HRESULT WINAPI D3D10ReflectShader(const void *data, SIZE_T data_size, ID3D10ShaderReflection **reflector) { struct d3dcompiler_shader_reflection *object;

1 0