wine-commits November 2019

wine-commits@winehq.org

1 participants
895 discussions

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

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

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

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

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 : 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

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

13 Nov '19

Module: wine Branch: master Commit: a3c410d0a595534201a44078cc9c6fa6e89a1da3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a3c410d0a595534201a44078… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Nov 13 14:51:20 2019 +0100 oleaut32: 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> --- dlls/oleaut32/oleaut.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/oleaut32/oleaut.c b/dlls/oleaut32/oleaut.c index 28f796794a..9417969465 100644 --- a/dlls/oleaut32/oleaut.c +++ b/dlls/oleaut32/oleaut.c @@ -829,7 +829,7 @@ static BOOL actctx_get_typelib_module(REFIID iid, WCHAR *module, DWORD len) static HRESULT reg_get_typelib_module(REFIID iid, WCHAR *module, DWORD len) { REGSAM opposite = (sizeof(void*) == 8) ? KEY_WOW64_32KEY : KEY_WOW64_64KEY; - char tlguid[200], typelibkey[300], interfacekey[300], ver[100], tlfn[260]; + char tlguid[200], typelibkey[316], interfacekey[300], ver[100], tlfn[260]; DWORD tlguidlen, verlen, type; LONG tlfnlen, err; BOOL is_wow64;

1 0

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

13 Nov '19

Module: wine Branch: master Commit: 1c232557b81f237f966759511d50c83e18627499 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1c232557b81f237f96675951… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Nov 13 14:51:18 2019 +0100 dnsapi: 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> --- dlls/dnsapi/query.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dnsapi/query.c b/dlls/dnsapi/query.c index e601191c5d..f540662dfd 100644 --- a/dlls/dnsapi/query.c +++ b/dlls/dnsapi/query.c @@ -71,7 +71,7 @@ static const char *dns_section_to_str( ns_sect section ) case ns_s_ar: return "Additional"; default: { - static char tmp[5]; + static char tmp[11]; FIXME( "unknown section: 0x%02x\n", section ); sprintf( tmp, "0x%02x", section ); return tmp;

1 0

Jacek Caban : makedep: Use -Wl,-delayload on cross targets when supported by linker.
by Alexandre Julliard 13 Nov '19

13 Nov '19

Module: wine Branch: master Commit: 3d19efae72bf0f10acad7db6fea183b10017dc58 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3d19efae72bf0f10acad7db6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 13 17:49:42 2019 +0100 makedep: Use -Wl,-delayload on cross targets when supported by linker. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.in | 1 + configure | 28 ++++++++++++++++++++++++++++ configure.ac | 2 ++ tools/makedep.c | 22 +++++++++++++++++----- 4 files changed, 48 insertions(+), 5 deletions(-) diff --git a/Makefile.in b/Makefile.in index 193ecc59a4..dfe1c56c06 100644 --- a/Makefile.in +++ b/Makefile.in @@ -70,6 +70,7 @@ CROSSTARGET = @CROSSTARGET@ SUBDIRS = @SUBDIRS@ RUNTESTFLAGS = -q -P wine MAKEDEP = $(TOOLSDIR)/tools/makedep$(TOOLSEXT) +DELAYLOADFLAG = @DELAYLOADFLAG@ PACKAGE_VERSION = @PACKAGE_VERSION@ SED_CMD = LC_ALL=C sed -e 's,@bindir\@,${bindir},g' -e 's,@dlldir\@,${dlldir},g' -e 's,@srcdir\@,${srcdir},g' -e 's,@PACKAGE_STRING\@,@PACKAGE_STRING@,g' -e 's,@PACKAGE_VERSION\@,@PACKAGE_VERSION@,g' LDRPATH_INSTALL = @LDRPATH_INSTALL@ diff --git a/configure b/configure index e40850201b..f447e4ca07 100755 --- a/configure +++ b/configure @@ -706,6 +706,7 @@ X_PRE_LIBS X_CFLAGS XMKMF PTHREAD_LIBS +DELAYLOADFLAG EXTRACROSSCFLAGS CROSSCFLAGS CROSSCC @@ -10420,6 +10421,33 @@ fi ;; esac done + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wl,-delayload,autoconftest.dll" >&5 +$as_echo_n "checking whether the compiler supports -Wl,-delayload,autoconftest.dll... " >&6; } +if ${ac_cv_cflags__Wl__delayload_autoconftest_dll+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_wine_try_cflags_saved=$CFLAGS +CFLAGS="$CFLAGS -Wl,-delayload,autoconftest.dll" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int main(int argc, char **argv) { return 0; } +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_cflags__Wl__delayload_autoconftest_dll=yes +else + ac_cv_cflags__Wl__delayload_autoconftest_dll=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +CFLAGS=$ac_wine_try_cflags_saved +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__Wl__delayload_autoconftest_dll" >&5 +$as_echo "$ac_cv_cflags__Wl__delayload_autoconftest_dll" >&6; } +if test "x$ac_cv_cflags__Wl__delayload_autoconftest_dll" = xyes; then : + DELAYLOADFLAG="-Wl,-delayload," + +fi + if test "x$enable_maintainer_mode" = xyes then { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the cross-compiler supports -Werror" >&5 diff --git a/configure.ac b/configure.ac index c7768db9f9..64721e9644 100644 --- a/configure.ac +++ b/configure.ac @@ -1085,6 +1085,8 @@ then esac done + WINE_TRY_CFLAGS([-Wl,-delayload,autoconftest.dll], [AC_SUBST(DELAYLOADFLAG,["-Wl,-delayload,"])]) + if test "x$enable_maintainer_mode" = xyes then WINE_TRY_CROSSCFLAGS([-Werror]) diff --git a/tools/makedep.c b/tools/makedep.c index 65b36146ed..27b33eb276 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -164,6 +164,7 @@ static const char *dlltool; static const char *msgfmt; static const char *ln_s; static const char *sed_cmd; +static const char *delay_load_flag; struct makefile { @@ -2110,14 +2111,17 @@ static struct makefile *get_parent_makefile( struct makefile *make ) */ static int needs_cross_lib( const struct makefile *make ) { + const char *name; if (!crosstarget) return 0; - if (make->importlib) return strarray_exists( &cross_import_libs, make->importlib ); - if (make->staticlib) + if (make->importlib) name = make->importlib; + else if (make->staticlib) { - const char *name = replace_extension( make->staticlib, ".a", "" ); + name = replace_extension( make->staticlib, ".a", "" ); if (!strncmp( name, "lib", 3 )) name += 3; - return strarray_exists( &cross_import_libs, name ); } + else return 0; + if (strarray_exists( &cross_import_libs, name )) return 1; + if (delay_load_flag && strarray_exists( &delay_import_libs, name )) return 1; return 0; } @@ -2127,6 +2131,7 @@ static int needs_cross_lib( const struct makefile *make ) */ static int needs_delay_lib( const struct makefile *make ) { + if (delay_load_flag) return 0; if (*dll_ext && !crosstarget) return 0; if (!make->importlib) return 0; return strarray_exists( &delay_import_libs, make->importlib ); @@ -2207,7 +2212,7 @@ static struct strarray add_import_libs( const struct makefile *make, struct stra if (lib) { - if (delay) lib = replace_extension( lib, ".a", ".delay.a" ); + if (delay && !delay_load_flag) lib = replace_extension( lib, ".a", ".delay.a" ); else if (make->is_cross) lib = replace_extension( lib, ".a", ".cross.a" ); lib = top_obj_dir_path( make, lib ); strarray_add( deps, lib ); @@ -3212,6 +3217,12 @@ static void output_module( struct makefile *make ) if (make->is_cross) { + if (delay_load_flag) + { + for (i = 0; i < make->delayimports.count; i++) + strarray_add( &all_libs, strmake( "%s%s%s", delay_load_flag, make->delayimports.str[i], + strchr( make->delayimports.str[i], '.' ) ? "" : ".dll" )); + } strarray_add( &make->all_targets, strmake( "%s", make->module )); add_install_rule( make, make->module, strmake( "%s", make->module ), strmake( "c$(dlldir)/%s", make->module )); @@ -4357,6 +4368,7 @@ int main( int argc, char *argv[] ) lddll_flags = get_expanded_make_var_array( top_makefile, "LDDLLFLAGS" ); libs = get_expanded_make_var_array( top_makefile, "LIBS" ); enable_tests = get_expanded_make_var_array( top_makefile, "ENABLE_TESTS" ); + delay_load_flag = get_expanded_make_variable( top_makefile, "DELAYLOADFLAG" ); top_install_lib = get_expanded_make_var_array( top_makefile, "TOP_INSTALL_LIB" ); top_install_dev = get_expanded_make_var_array( top_makefile, "TOP_INSTALL_DEV" );

1 0

Paul Gofman : ddraw/tests: Backport test_surface_format_conversion_alpha() for ddraw4.
by Alexandre Julliard 13 Nov '19

13 Nov '19

Module: wine Branch: master Commit: cc53c1f77bedf01d56dff2a67a224b77d213acc4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cc53c1f77bedf01d56dff2a6… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Wed Nov 13 21:16:24 2019 +0330 ddraw/tests: Backport test_surface_format_conversion_alpha() for ddraw4. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw4.c | 316 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 316 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=cc53c1f77bedf01d56df…

1 0

← Newer
1
...
52
53
54
55
56
57
58
...
90
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2019