wine-commits March 2020

wine-commits@winehq.org

1 participants
996 discussions

Nikolay Sivov : dwrite: Simplify LB22 rule according to Unicode 13.0 algorithm.
by Alexandre Julliard 13 Mar '20

13 Mar '20

Module: wine Branch: master Commit: 52a55f3e046cad58107fbe26f3b7d99e329945fd URL: https://source.winehq.org/git/wine.git/?a=commit;h=52a55f3e046cad58107fbe26… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 12 23:34:33 2020 +0300 dwrite: Simplify LB22 rule according to Unicode 13.0 algorithm. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index a418081d49..de8ac2ea3c 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -680,21 +680,7 @@ static HRESULT analyze_linebreaks(const WCHAR *text, UINT32 count, DWRITE_LINE_B break; /* LB22 */ case b_IN: - if (i > 0) - { - switch (break_class[i-1]) - { - case b_AL: - case b_HL: - case b_EX: - case b_ID: - case b_EB: - case b_EM: - case b_IN: - case b_NU: - set_break_condition(i, BreakConditionBefore, DWRITE_BREAK_CONDITION_MAY_NOT_BREAK, &state); - } - } + set_break_condition(i, BreakConditionBefore, DWRITE_BREAK_CONDITION_MAY_NOT_BREAK, &state); break; }

1 0

Jacek Caban : ucrtbase/tests: Directly use ucrtbase functions in scanf.c.
by Alexandre Julliard 12 Mar '20

12 Mar '20

Module: wine Branch: master Commit: c3165b4c96a021a96dc6dd8a0b8e1030682dd6e5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c3165b4c96a021a96dc6dd8a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 12 17:22:02 2020 +0100 ucrtbase/tests: Directly use ucrtbase functions in scanf.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ucrtbase/tests/scanf.c | 30 +++--------------------------- 1 file changed, 3 insertions(+), 27 deletions(-) diff --git a/dlls/ucrtbase/tests/scanf.c b/dlls/ucrtbase/tests/scanf.c index 794309e5c6..2d469d2b04 100644 --- a/dlls/ucrtbase/tests/scanf.c +++ b/dlls/ucrtbase/tests/scanf.c @@ -27,38 +27,16 @@ #include "wine/test.h" -static int (__cdecl *p_vsscanf)(unsigned __int64 options, const char *str, size_t len, const char *format, - void *locale, __ms_va_list valist); - -static BOOL init(void) -{ - HMODULE hmod = LoadLibraryA("ucrtbase.dll"); - - if (!hmod) - { - win_skip("ucrtbase.dll not installed\n"); - return FALSE; - } - - p_vsscanf = (void *)GetProcAddress(hmod, "__stdio_common_vsscanf"); - - return TRUE; -} - static int WINAPIV vsscanf_wrapper(unsigned __int64 options, const char *str, size_t len, const char *format, ...) { int ret; __ms_va_list valist; __ms_va_start(valist, format); - ret = p_vsscanf(options, str, len, format, NULL, valist); + ret = __stdio_common_vsscanf(options, str, len, format, NULL, valist); __ms_va_end(valist); return ret; } -#define UCRTBASE_SCANF_SECURECRT (0x0001) -#define UCRTBASE_SCANF_LEGACY_WIDE_SPECIFIERS (0x0002) -#define UCRTBASE_SCANF_LEGACY_MSVCRT_COMPATIBILITY (0x0004) - static void test_sscanf(void) { static const float float1 = -82.6267f, float2 = 27.76f; @@ -74,8 +52,8 @@ static void test_sscanf(void) static const unsigned int tests[] = { 0, - UCRTBASE_SCANF_LEGACY_WIDE_SPECIFIERS, - UCRTBASE_SCANF_LEGACY_MSVCRT_COMPATIBILITY, + _CRT_INTERNAL_SCANF_LEGACY_WIDE_SPECIFIERS, + _CRT_INTERNAL_SCANF_LEGACY_MSVCRT_COMPATIBILITY, }; for (i = 0; i < ARRAY_SIZE(tests); ++i) @@ -316,7 +294,5 @@ static void test_sscanf(void) START_TEST(scanf) { - if (!init()) return; - test_sscanf(); }

1 0

Jacek Caban : ucrtbase/tests: Directly use ucrtbase functions in printf.c.
by Alexandre Julliard 12 Mar '20

12 Mar '20

Module: wine Branch: master Commit: d6f5afdd3d66f61df86d52ef23afe0345cc02e3a URL: https://source.winehq.org/git/wine.git/?a=commit;h=d6f5afdd3d66f61df86d52ef… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 12 17:21:52 2020 +0100 ucrtbase/tests: Directly use ucrtbase functions in printf.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ucrtbase/tests/printf.c | 120 +++++++++++++++---------------------------- 1 file changed, 42 insertions(+), 78 deletions(-) diff --git a/dlls/ucrtbase/tests/printf.c b/dlls/ucrtbase/tests/printf.c index 3e0a9a7b4d..d6a1aa048e 100644 --- a/dlls/ucrtbase/tests/printf.c +++ b/dlls/ucrtbase/tests/printf.c @@ -58,10 +58,6 @@ DEFINE_EXPECT(invalid_parameter_handler); -/* make sure we use the correct errno */ -#undef errno -#define errno (*p_errno()) - static inline float __port_ind(void) { static const unsigned __ind_bytes = 0xffc00000; @@ -69,15 +65,6 @@ static inline float __port_ind(void) } #define IND __port_ind() -static FILE *(__cdecl *p_fopen)(const char *name, const char *mode); -static int (__cdecl *p_fclose)(FILE *file); -static long (__cdecl *p_ftell)(FILE *file); -static char *(__cdecl *p_fgets)(char *str, int size, FILE *file); -static wchar_t *(__cdecl *p_fgetws)(wchar_t *str, int size, FILE *file); - -static _invalid_parameter_handler (__cdecl *p_set_invalid_parameter_handler)(_invalid_parameter_handler); -static int* (__cdecl *p_errno)(void); - static void __cdecl test_invalid_parameter_handler(const wchar_t *expression, const wchar_t *function, const wchar_t *file, unsigned line, uintptr_t arg) @@ -90,27 +77,6 @@ static void __cdecl test_invalid_parameter_handler(const wchar_t *expression, ok(arg == 0, "arg = %lx\n", (UINT_PTR)arg); } -static BOOL init( void ) -{ - HMODULE hmod = LoadLibraryA("ucrtbase.dll"); - - if (!hmod) - { - win_skip("ucrtbase.dll not installed\n"); - return FALSE; - } - - p_fopen = (void *)GetProcAddress(hmod, "fopen"); - p_fclose = (void *)GetProcAddress(hmod, "fclose"); - p_ftell = (void *)GetProcAddress(hmod, "ftell"); - p_fgets = (void *)GetProcAddress(hmod, "fgets"); - p_fgetws = (void *)GetProcAddress(hmod, "fgetws"); - - p_set_invalid_parameter_handler = (void *)GetProcAddress(hmod, "_set_invalid_parameter_handler"); - p_errno = (void *)GetProcAddress(hmod, "_errno"); - return TRUE; -} - static int WINAPIV vsprintf_wrapper(unsigned __int64 options, char *str, size_t len, const char *format, ...) { @@ -276,61 +242,61 @@ static void test_fprintf(void) { static const char file_name[] = "fprintf.tst"; - FILE *fp = p_fopen(file_name, "wb"); + FILE *fp = fopen(file_name, "wb"); char buf[1024]; int ret; ret = vfprintf_wrapper(fp, "simple test\n"); ok(ret == 12, "ret = %d\n", ret); - ret = p_ftell(fp); + ret = ftell(fp); ok(ret == 12, "ftell returned %d\n", ret); ret = vfprintf_wrapper(fp, "contains%cnull\n", '\0'); ok(ret == 14, "ret = %d\n", ret); - ret = p_ftell(fp); + ret = ftell(fp); ok(ret == 26, "ftell returned %d\n", ret); - p_fclose(fp); + fclose(fp); - fp = p_fopen(file_name, "rb"); - p_fgets(buf, sizeof(buf), fp); - ret = p_ftell(fp); + fp = fopen(file_name, "rb"); + fgets(buf, sizeof(buf), fp); + ret = ftell(fp); ok(ret == 12, "ftell returned %d\n", ret); ok(!strcmp(buf, "simple test\n"), "buf = %s\n", buf); - p_fgets(buf, sizeof(buf), fp); - ret = p_ftell(fp); + fgets(buf, sizeof(buf), fp); + ret = ftell(fp); ok(ret == 26, "ret = %d\n", ret); ok(!memcmp(buf, "contains\0null\n", 14), "buf = %s\n", buf); - p_fclose(fp); + fclose(fp); - fp = p_fopen(file_name, "wt"); + fp = fopen(file_name, "wt"); ret = vfprintf_wrapper(fp, "simple test\n"); ok(ret == 12, "ret = %d\n", ret); - ret = p_ftell(fp); + ret = ftell(fp); ok(ret == 13, "ftell returned %d\n", ret); ret = vfprintf_wrapper(fp, "contains%cnull\n", '\0'); ok(ret == 14, "ret = %d\n", ret); - ret = p_ftell(fp); + ret = ftell(fp); ok(ret == 28, "ftell returned %d\n", ret); - p_fclose(fp); + fclose(fp); - fp = p_fopen(file_name, "rb"); - p_fgets(buf, sizeof(buf), fp); - ret = p_ftell(fp); + fp = fopen(file_name, "rb"); + fgets(buf, sizeof(buf), fp); + ret = ftell(fp); ok(ret == 13, "ftell returned %d\n", ret); ok(!strcmp(buf, "simple test\r\n"), "buf = %s\n", buf); - p_fgets(buf, sizeof(buf), fp); - ret = p_ftell(fp); + fgets(buf, sizeof(buf), fp); + ret = ftell(fp); ok(ret == 28, "ret = %d\n", ret); ok(!memcmp(buf, "contains\0null\r\n", 15), "buf = %s\n", buf); - p_fclose(fp); + fclose(fp); unlink(file_name); } @@ -352,65 +318,65 @@ static void test_fwprintf(void) static const WCHAR cont_fmt[] = {'c','o','n','t','a','i','n','s','%','c','n','u','l','l','\n',0}; static const WCHAR cont[] = {'c','o','n','t','a','i','n','s','\0','n','u','l','l','\n',0}; - FILE *fp = p_fopen(file_name, "wb"); + FILE *fp = fopen(file_name, "wb"); wchar_t bufw[1024]; char bufa[1024]; int ret; ret = vfwprintf_wrapper(fp, simple); ok(ret == 12, "ret = %d\n", ret); - ret = p_ftell(fp); + ret = ftell(fp); ok(ret == 24, "ftell returned %d\n", ret); ret = vfwprintf_wrapper(fp, cont_fmt, '\0'); ok(ret == 14, "ret = %d\n", ret); - ret = p_ftell(fp); + ret = ftell(fp); ok(ret == 52, "ftell returned %d\n", ret); - p_fclose(fp); + fclose(fp); - fp = p_fopen(file_name, "rb"); - p_fgetws(bufw, ARRAY_SIZE(bufw), fp); - ret = p_ftell(fp); + fp = fopen(file_name, "rb"); + fgetws(bufw, ARRAY_SIZE(bufw), fp); + ret = ftell(fp); ok(ret == 24, "ftell returned %d\n", ret); ok(!wcscmp(bufw, simple), "buf = %s\n", wine_dbgstr_w(bufw)); - p_fgetws(bufw, ARRAY_SIZE(bufw), fp); - ret = p_ftell(fp); + fgetws(bufw, ARRAY_SIZE(bufw), fp); + ret = ftell(fp); ok(ret == 52, "ret = %d\n", ret); ok(!memcmp(bufw, cont, 28), "buf = %s\n", wine_dbgstr_w(bufw)); - p_fclose(fp); + fclose(fp); - fp = p_fopen(file_name, "wt"); + fp = fopen(file_name, "wt"); ret = vfwprintf_wrapper(fp, simple); ok(ret == 12, "ret = %d\n", ret); - ret = p_ftell(fp); + ret = ftell(fp); ok(ret == 13, "ftell returned %d\n", ret); ret = vfwprintf_wrapper(fp, cont_fmt, '\0'); ok(ret == 14, "ret = %d\n", ret); - ret = p_ftell(fp); + ret = ftell(fp); ok(ret == 28, "ftell returned %d\n", ret); - p_fclose(fp); + fclose(fp); - fp = p_fopen(file_name, "rb"); - p_fgets(bufa, sizeof(bufa), fp); - ret = p_ftell(fp); + fp = fopen(file_name, "rb"); + fgets(bufa, sizeof(bufa), fp); + ret = ftell(fp); ok(ret == 13, "ftell returned %d\n", ret); ok(!strcmp(bufa, "simple test\r\n"), "buf = %s\n", bufa); - p_fgets(bufa, sizeof(bufa), fp); - ret = p_ftell(fp); + fgets(bufa, sizeof(bufa), fp); + ret = ftell(fp); ok(ret == 28, "ret = %d\n", ret); ok(!memcmp(bufa, "contains\0null\r\n", 15), "buf = %s\n", bufa); - p_fclose(fp); + fclose(fp); unlink(file_name); - ok(p_set_invalid_parameter_handler(test_invalid_parameter_handler) == NULL, + ok(_set_invalid_parameter_handler(test_invalid_parameter_handler) == NULL, "Invalid parameter handler was already set\n"); /* NULL format */ @@ -433,7 +399,7 @@ static void test_fwprintf(void) /* crashes on Windows */ /* ret = __stdio_common_vfwprintf(0, fp, cont_fmt, NULL, NULL); */ - ok(p_set_invalid_parameter_handler(NULL) == test_invalid_parameter_handler, + ok(_set_invalid_parameter_handler(NULL) == test_invalid_parameter_handler, "Cannot reset invalid parameter handler\n"); } @@ -662,8 +628,6 @@ static void test_printf_natural_string(void) START_TEST(printf) { - if (!init()) return; - test_snprintf(); test_swprintf(); test_fprintf();

1 0

Jacek Caban : ucrtbase/tests: Directly use __stdio_common_* functions.
by Alexandre Julliard 12 Mar '20

12 Mar '20

Module: wine Branch: master Commit: cd030f752f34c8ff21ae183114ee11268cf1ad22 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cd030f752f34c8ff21ae1831… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 12 17:21:41 2020 +0100 ucrtbase/tests: Directly use __stdio_common_* functions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ucrtbase/tests/printf.c | 37 +++++++------------------------------ 1 file changed, 7 insertions(+), 30 deletions(-) diff --git a/dlls/ucrtbase/tests/printf.c b/dlls/ucrtbase/tests/printf.c index e743397331..3e0a9a7b4d 100644 --- a/dlls/ucrtbase/tests/printf.c +++ b/dlls/ucrtbase/tests/printf.c @@ -69,21 +69,6 @@ static inline float __port_ind(void) } #define IND __port_ind() -static int (__cdecl *p_vfprintf)(unsigned __int64 options, FILE *file, const char *format, - void *locale, __ms_va_list valist); -static int (__cdecl *p_vfwprintf)(unsigned __int64 options, FILE *file, const wchar_t *format, - void *locale, __ms_va_list valist); -static int (__cdecl *p_vsprintf)(unsigned __int64 options, char *str, size_t len, const char *format, - void *locale, __ms_va_list valist); -static int (__cdecl *p_vsnprintf_s)(unsigned __int64 options, char *str, size_t sizeOfBuffer, size_t count, const char *format, - void *locale, __ms_va_list valist); -static int (__cdecl *p_vsprintf_s)(unsigned __int64 options, char *str, size_t count, const char *format, - void *locale, __ms_va_list valist); -static int (__cdecl *p_vswprintf)(unsigned __int64 options, wchar_t *str, size_t len, const wchar_t *format, - void *locale, __ms_va_list valist); -static int (__cdecl *p_vsnwprintf_s)(unsigned __int64 options, WCHAR *str, size_t sizeOfBuffer, size_t count, const WCHAR *format, - void *locale, __ms_va_list valist); - static FILE *(__cdecl *p_fopen)(const char *name, const char *mode); static int (__cdecl *p_fclose)(FILE *file); static long (__cdecl *p_ftell)(FILE *file); @@ -115,14 +100,6 @@ static BOOL init( void ) return FALSE; } - p_vfprintf = (void *)GetProcAddress(hmod, "__stdio_common_vfprintf"); - p_vfwprintf = (void *)GetProcAddress(hmod, "__stdio_common_vfwprintf"); - p_vsprintf = (void *)GetProcAddress(hmod, "__stdio_common_vsprintf"); - p_vsnprintf_s = (void *)GetProcAddress(hmod, "__stdio_common_vsnprintf_s"); - p_vsnwprintf_s = (void *)GetProcAddress(hmod, "__stdio_common_vsnwprintf_s"); - p_vsprintf_s = (void *)GetProcAddress(hmod, "__stdio_common_vsprintf_s"); - p_vswprintf = (void *)GetProcAddress(hmod, "__stdio_common_vswprintf"); - p_fopen = (void *)GetProcAddress(hmod, "fopen"); p_fclose = (void *)GetProcAddress(hmod, "fclose"); p_ftell = (void *)GetProcAddress(hmod, "ftell"); @@ -140,7 +117,7 @@ static int WINAPIV vsprintf_wrapper(unsigned __int64 options, char *str, int ret; __ms_va_list valist; __ms_va_start(valist, format); - ret = p_vsprintf(options, str, len, format, NULL, valist); + ret = __stdio_common_vsprintf(options, str, len, format, NULL, valist); __ms_va_end(valist); return ret; } @@ -209,7 +186,7 @@ static int WINAPIV vswprintf_wrapper(unsigned __int64 options, wchar_t *str, int ret; __ms_va_list valist; __ms_va_start(valist, format); - ret = p_vswprintf(options, str, len, format, NULL, valist); + ret = __stdio_common_vswprintf(options, str, len, format, NULL, valist); __ms_va_end(valist); return ret; } @@ -290,7 +267,7 @@ static int WINAPIV vfprintf_wrapper(FILE *file, int ret; __ms_va_list valist; __ms_va_start(valist, format); - ret = p_vfprintf(0, file, format, NULL, valist); + ret = __stdio_common_vfprintf(0, file, format, NULL, valist); __ms_va_end(valist); return ret; } @@ -363,7 +340,7 @@ static int WINAPIV vfwprintf_wrapper(FILE *file, int ret; __ms_va_list valist; __ms_va_start(valist, format); - ret = p_vfwprintf(0, file, format, NULL, valist); + ret = __stdio_common_vfwprintf(0, file, format, NULL, valist); __ms_va_end(valist); return ret; } @@ -454,7 +431,7 @@ static void test_fwprintf(void) /* format using % with NULL arglist*/ /* crashes on Windows */ - /* ret = p_vfwprintf(0, fp, cont_fmt, NULL, NULL); */ + /* ret = __stdio_common_vfwprintf(0, fp, cont_fmt, NULL, NULL); */ ok(p_set_invalid_parameter_handler(NULL) == test_invalid_parameter_handler, "Cannot reset invalid parameter handler\n"); @@ -466,7 +443,7 @@ static int WINAPIV _vsnprintf_s_wrapper(char *str, size_t sizeOfBuffer, int ret; __ms_va_list valist; __ms_va_start(valist, format); - ret = p_vsnprintf_s(0, str, sizeOfBuffer, count, format, NULL, valist); + ret = __stdio_common_vsnprintf_s(0, str, sizeOfBuffer, count, format, NULL, valist); __ms_va_end(valist); return ret; } @@ -518,7 +495,7 @@ static int WINAPIV _vsnwprintf_s_wrapper(WCHAR *str, size_t sizeOfBuffer, int ret; __ms_va_list valist; __ms_va_start(valist, format); - ret = p_vsnwprintf_s(0, str, sizeOfBuffer, count, format, NULL, valist); + ret = __stdio_common_vsnwprintf_s(0, str, sizeOfBuffer, count, format, NULL, valist); __ms_va_end(valist); return ret; }

1 0

Jacek Caban : ucrtbase/tests: Use public _CRT_INTERNAL_PRINTF_* defines.
by Alexandre Julliard 12 Mar '20

12 Mar '20

Module: wine Branch: master Commit: 01bc7e09bda1fdc719007f3fc1deda5883926fb5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=01bc7e09bda1fdc719007f3f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 12 17:21:35 2020 +0100 ucrtbase/tests: Use public _CRT_INTERNAL_PRINTF_* defines. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ucrtbase/tests/printf.c | 38 ++++++++++++++++---------------------- 1 file changed, 16 insertions(+), 22 deletions(-) diff --git a/dlls/ucrtbase/tests/printf.c b/dlls/ucrtbase/tests/printf.c index 9c6ece9808..e743397331 100644 --- a/dlls/ucrtbase/tests/printf.c +++ b/dlls/ucrtbase/tests/printf.c @@ -62,12 +62,6 @@ DEFINE_EXPECT(invalid_parameter_handler); #undef errno #define errno (*p_errno()) -#define UCRTBASE_PRINTF_LEGACY_VSPRINTF_NULL_TERMINATION (0x0001) -#define UCRTBASE_PRINTF_STANDARD_SNPRINTF_BEHAVIOUR (0x0002) -#define UCRTBASE_PRINTF_LEGACY_WIDE_SPECIFIERS (0x0004) -#define UCRTBASE_PRINTF_LEGACY_MSVCRT_COMPATIBILITY (0x0008) -#define UCRTBASE_PRINTF_LEGACY_THREE_DIGIT_EXPONENTS (0x0010) - static inline float __port_ind(void) { static const unsigned __ind_bytes = 0xffc00000; @@ -162,7 +156,7 @@ static void test_snprintf (void) for (i = 0; i < ARRAY_SIZE(tests); i++) { const char *fmt = tests[i]; const int expect = strlen(fmt) > bufsiz ? -1 : strlen(fmt); - const int n = vsprintf_wrapper (UCRTBASE_PRINTF_LEGACY_VSPRINTF_NULL_TERMINATION, buffer, bufsiz, fmt); + const int n = vsprintf_wrapper (_CRT_INTERNAL_PRINTF_LEGACY_VSPRINTF_NULL_TERMINATION, buffer, bufsiz, fmt); const int valid = n < 0 ? bufsiz : (n == bufsiz ? n : n+1); ok (n == expect, "\"%s\": expected %d, returned %d\n", @@ -175,7 +169,7 @@ static void test_snprintf (void) for (i = 0; i < ARRAY_SIZE(tests); i++) { const char *fmt = tests[i]; const int expect = strlen(fmt); - const int n = vsprintf_wrapper (UCRTBASE_PRINTF_STANDARD_SNPRINTF_BEHAVIOUR, buffer, bufsiz, fmt); + const int n = vsprintf_wrapper (_CRT_INTERNAL_PRINTF_STANDARD_SNPRINTF_BEHAVIOR, buffer, bufsiz, fmt); const int valid = n >= bufsiz ? bufsiz - 1 : n < 0 ? 0 : n; ok (n == expect, "\"%s\": expected %d, returned %d\n", @@ -201,9 +195,9 @@ static void test_snprintf (void) "\"%s\": Missing null termination (ret %d) - is %d\n", fmt, n, buffer[valid]); } - ok (vsprintf_wrapper (UCRTBASE_PRINTF_STANDARD_SNPRINTF_BEHAVIOUR, NULL, 0, "abcd") == 4, + ok (vsprintf_wrapper (_CRT_INTERNAL_PRINTF_STANDARD_SNPRINTF_BEHAVIOR, NULL, 0, "abcd") == 4, "Failure to snprintf to NULL\n"); - ok (vsprintf_wrapper (UCRTBASE_PRINTF_LEGACY_VSPRINTF_NULL_TERMINATION, NULL, 0, "abcd") == 4, + ok (vsprintf_wrapper (_CRT_INTERNAL_PRINTF_LEGACY_VSPRINTF_NULL_TERMINATION, NULL, 0, "abcd") == 4, "Failure to snprintf to NULL\n"); ok (vsprintf_wrapper (0, NULL, 0, "abcd") == 4, "Failure to snprintf to NULL\n"); @@ -237,7 +231,7 @@ static void test_swprintf (void) for (i = 0; i < ARRAY_SIZE(tests); i++) { const wchar_t *fmt = tests[i]; const int expect = wcslen(fmt) > bufsiz ? -1 : wcslen(fmt); - const int n = vswprintf_wrapper (UCRTBASE_PRINTF_LEGACY_VSPRINTF_NULL_TERMINATION, buffer, bufsiz, fmt); + const int n = vswprintf_wrapper (_CRT_INTERNAL_PRINTF_LEGACY_VSPRINTF_NULL_TERMINATION, buffer, bufsiz, fmt); const int valid = n < 0 ? bufsiz : (n == bufsiz ? n : n+1); WideCharToMultiByte (CP_ACP, 0, buffer, -1, narrow, sizeof(narrow), NULL, NULL); @@ -252,7 +246,7 @@ static void test_swprintf (void) for (i = 0; i < ARRAY_SIZE(tests); i++) { const wchar_t *fmt = tests[i]; const int expect = wcslen(fmt); - const int n = vswprintf_wrapper (UCRTBASE_PRINTF_STANDARD_SNPRINTF_BEHAVIOUR, buffer, bufsiz, fmt); + const int n = vswprintf_wrapper (_CRT_INTERNAL_PRINTF_STANDARD_SNPRINTF_BEHAVIOR, buffer, bufsiz, fmt); const int valid = n >= bufsiz ? bufsiz - 1 : n < 0 ? 0 : n; WideCharToMultiByte (CP_ACP, 0, buffer, -1, narrow, sizeof(narrow), NULL, NULL); @@ -282,9 +276,9 @@ static void test_swprintf (void) "\"%s\": Missing null termination (ret %d) - is %d\n", narrow_fmt, n, buffer[valid]); } - ok (vswprintf_wrapper (UCRTBASE_PRINTF_STANDARD_SNPRINTF_BEHAVIOUR, NULL, 0, str_short) == 5, + ok (vswprintf_wrapper (_CRT_INTERNAL_PRINTF_STANDARD_SNPRINTF_BEHAVIOR, NULL, 0, str_short) == 5, "Failure to swprintf to NULL\n"); - ok (vswprintf_wrapper (UCRTBASE_PRINTF_LEGACY_VSPRINTF_NULL_TERMINATION, NULL, 0, str_short) == 5, + ok (vswprintf_wrapper (_CRT_INTERNAL_PRINTF_LEGACY_VSPRINTF_NULL_TERMINATION, NULL, 0, str_short) == 5, "Failure to swprintf to NULL\n"); ok (vswprintf_wrapper (0, NULL, 0, str_short) == 5, "Failure to swprintf to NULL\n"); @@ -587,13 +581,13 @@ static void test_printf_legacy_wide(void) vsprintf_wrapper(0, buffer, sizeof(buffer), narrow_fmt, narrow, wide); ok(!strcmp(buffer, out), "buffer wrong, got=%s\n", buffer); - vsprintf_wrapper(UCRTBASE_PRINTF_LEGACY_WIDE_SPECIFIERS, buffer, sizeof(buffer), narrow_fmt, narrow, wide); + vsprintf_wrapper(_CRT_INTERNAL_PRINTF_LEGACY_WIDE_SPECIFIERS, buffer, sizeof(buffer), narrow_fmt, narrow, wide); ok(!strcmp(buffer, out), "buffer wrong, got=%s\n", buffer); vswprintf_wrapper(0, wbuffer, sizeof(wbuffer), std_wide_fmt, narrow, wide); WideCharToMultiByte(CP_ACP, 0, wbuffer, -1, buffer, sizeof(buffer), NULL, NULL); ok(!strcmp(buffer, out), "buffer wrong, got=%s\n", buffer); - vswprintf_wrapper(UCRTBASE_PRINTF_LEGACY_WIDE_SPECIFIERS, wbuffer, sizeof(wbuffer), legacy_wide_fmt, narrow, wide); + vswprintf_wrapper(_CRT_INTERNAL_PRINTF_LEGACY_WIDE_SPECIFIERS, wbuffer, sizeof(wbuffer), legacy_wide_fmt, narrow, wide); WideCharToMultiByte(CP_ACP, 0, wbuffer, -1, buffer, sizeof(buffer), NULL, NULL); ok(!strcmp(buffer, out), "buffer wrong, got=%s\n", buffer); } @@ -607,20 +601,20 @@ static void test_printf_legacy_msvcrt(void) * a length modifier. */ vsprintf_wrapper(0, buf, sizeof(buf), "%F", 1.23); ok(!strcmp(buf, "1.230000"), "buf = %s\n", buf); - vsprintf_wrapper(UCRTBASE_PRINTF_LEGACY_MSVCRT_COMPATIBILITY, buf, sizeof(buf), "%Fd %Nd", 123, 456); + vsprintf_wrapper(_CRT_INTERNAL_PRINTF_LEGACY_MSVCRT_COMPATIBILITY, buf, sizeof(buf), "%Fd %Nd", 123, 456); ok(!strcmp(buf, "123 456"), "buf = %s\n", buf); vsprintf_wrapper(0, buf, sizeof(buf), "%f %F %f %e %E %g %G", INFINITY, INFINITY, -INFINITY, INFINITY, INFINITY, INFINITY, INFINITY); ok(!strcmp(buf, "inf INF -inf inf INF inf INF"), "buf = %s\n", buf); - vsprintf_wrapper(UCRTBASE_PRINTF_LEGACY_MSVCRT_COMPATIBILITY, buf, sizeof(buf), "%f", INFINITY); + vsprintf_wrapper(_CRT_INTERNAL_PRINTF_LEGACY_MSVCRT_COMPATIBILITY, buf, sizeof(buf), "%f", INFINITY); ok(!strcmp(buf, "1.#INF00"), "buf = %s\n", buf); vsprintf_wrapper(0, buf, sizeof(buf), "%f %F", NAN, NAN); ok(!strcmp(buf, "nan NAN"), "buf = %s\n", buf); - vsprintf_wrapper(UCRTBASE_PRINTF_LEGACY_MSVCRT_COMPATIBILITY, buf, sizeof(buf), "%f", NAN); + vsprintf_wrapper(_CRT_INTERNAL_PRINTF_LEGACY_MSVCRT_COMPATIBILITY, buf, sizeof(buf), "%f", NAN); ok(!strcmp(buf, "1.#QNAN0"), "buf = %s\n", buf); vsprintf_wrapper(0, buf, sizeof(buf), "%f %F", IND, IND); ok(!strcmp(buf, "-nan(ind) -NAN(IND)"), "buf = %s\n", buf); - vsprintf_wrapper(UCRTBASE_PRINTF_LEGACY_MSVCRT_COMPATIBILITY, buf, sizeof(buf), "%f", IND); + vsprintf_wrapper(_CRT_INTERNAL_PRINTF_LEGACY_MSVCRT_COMPATIBILITY, buf, sizeof(buf), "%f", IND); ok(!strcmp(buf, "-1.#IND00"), "buf = %s\n", buf); } @@ -630,7 +624,7 @@ static void test_printf_legacy_three_digit_exp(void) vsprintf_wrapper(0, buf, sizeof(buf), "%E", 1.23); ok(!strcmp(buf, "1.230000E+00"), "buf = %s\n", buf); - vsprintf_wrapper(UCRTBASE_PRINTF_LEGACY_THREE_DIGIT_EXPONENTS, buf, sizeof(buf), "%E", 1.23); + vsprintf_wrapper(_CRT_INTERNAL_PRINTF_LEGACY_THREE_DIGIT_EXPONENTS, buf, sizeof(buf), "%E", 1.23); ok(!strcmp(buf, "1.230000E+000"), "buf = %s\n", buf); vsprintf_wrapper(0, buf, sizeof(buf), "%E", 1.23e+123); ok(!strcmp(buf, "1.230000E+123"), "buf = %s\n", buf); @@ -645,7 +639,7 @@ static void test_printf_c99(void) * as size_t size for integers. */ for (i = 0; i < 2; i++) { unsigned __int64 options = (i == 0) ? 0 : - UCRTBASE_PRINTF_LEGACY_MSVCRT_COMPATIBILITY; + _CRT_INTERNAL_PRINTF_LEGACY_MSVCRT_COMPATIBILITY; /* z modifier accepts size_t argument */ vsprintf_wrapper(options, buf, sizeof(buf), "%zx %d", SIZE_MAX, 1);

1 0

Jacek Caban : ucrtbase/tests: Link to ucrtbase.
by Alexandre Julliard 12 Mar '20

12 Mar '20

Module: wine Branch: master Commit: 6b52c24d2f4b67038352afa9ab3035fea1cf7863 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b52c24d2f4b67038352afa9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 12 17:21:24 2020 +0100 ucrtbase/tests: Link to ucrtbase. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ucrtbase/tests/Makefile.in | 1 + dlls/ucrtbase/tests/string.c | 12 ++++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/ucrtbase/tests/Makefile.in b/dlls/ucrtbase/tests/Makefile.in index 116bdcc7b6..126cafd66d 100644 --- a/dlls/ucrtbase/tests/Makefile.in +++ b/dlls/ucrtbase/tests/Makefile.in @@ -1,4 +1,5 @@ TESTDLL = ucrtbase.dll +IMPORTS = ucrtbase C_SRCS = \ cpp.c \ diff --git a/dlls/ucrtbase/tests/string.c b/dlls/ucrtbase/tests/string.c index c0b2336322..aff37efc6f 100644 --- a/dlls/ucrtbase/tests/string.c +++ b/dlls/ucrtbase/tests/string.c @@ -215,21 +215,21 @@ static void test__memicmp(void) errno = 0xdeadbeef; ret = p__memicmp(NULL, NULL, 1); ok(ret == _NLSCMPERROR, "got %d\n", ret); - ok(errno == 0xdeadbeef, "Unexpected errno = %d\n", errno); + ok(errno == EINVAL, "Unexpected errno = %d\n", errno); CHECK_CALLED(invalid_parameter_handler); SET_EXPECT(invalid_parameter_handler); errno = 0xdeadbeef; ret = p__memicmp(s1, NULL, 1); ok(ret == _NLSCMPERROR, "got %d\n", ret); - ok(errno == 0xdeadbeef, "Unexpected errno = %d\n", errno); + ok(errno == EINVAL, "Unexpected errno = %d\n", errno); CHECK_CALLED(invalid_parameter_handler); SET_EXPECT(invalid_parameter_handler); errno = 0xdeadbeef; ret = p__memicmp(NULL, s2, 1); ok(ret == _NLSCMPERROR, "got %d\n", ret); - ok(errno == 0xdeadbeef, "Unexpected errno = %d\n", errno); + ok(errno == EINVAL, "Unexpected errno = %d\n", errno); CHECK_CALLED(invalid_parameter_handler); ret = p__memicmp(s1, s2, 2); @@ -258,21 +258,21 @@ static void test__memicmp_l(void) errno = 0xdeadbeef; ret = p__memicmp_l(NULL, NULL, 1, NULL); ok(ret == _NLSCMPERROR, "got %d\n", ret); - ok(errno == 0xdeadbeef, "Unexpected errno = %d\n", errno); + ok(errno == EINVAL, "Unexpected errno = %d\n", errno); CHECK_CALLED(invalid_parameter_handler); SET_EXPECT(invalid_parameter_handler); errno = 0xdeadbeef; ret = p__memicmp_l(s1, NULL, 1, NULL); ok(ret == _NLSCMPERROR, "got %d\n", ret); - ok(errno == 0xdeadbeef, "Unexpected errno = %d\n", errno); + ok(errno == EINVAL, "Unexpected errno = %d\n", errno); CHECK_CALLED(invalid_parameter_handler); SET_EXPECT(invalid_parameter_handler); errno = 0xdeadbeef; ret = p__memicmp_l(NULL, s2, 1, NULL); ok(ret == _NLSCMPERROR, "got %d\n", ret); - ok(errno == 0xdeadbeef, "Unexpected errno = %d\n", errno); + ok(errno == EINVAL, "Unexpected errno = %d\n", errno); CHECK_CALLED(invalid_parameter_handler); ret = p__memicmp_l(s1, s2, 2, NULL);

1 0

Nikolay Sivov : mfplat: Add a stub for 2D system memory buffer object.
by Alexandre Julliard 12 Mar '20

12 Mar '20

Module: wine Branch: master Commit: 1fb20f67d8670a661c8a2904669dc233827eff9f URL: https://source.winehq.org/git/wine.git/?a=commit;h=1fb20f67d8670a661c8a2904… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 12 18:39:12 2020 +0300 mfplat: Add a stub for 2D system memory buffer object. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/buffer.c | 233 ++++++++++++++++++++++++++++++++++++++++--- dlls/mfplat/mediatype.c | 6 ++ dlls/mfplat/mfplat.spec | 1 + dlls/mfplat/mfplat_private.h | 2 + dlls/mfplat/tests/mfplat.c | 49 +++++++++ include/mfapi.h | 1 + include/mfobjects.idl | 26 +++++ 7 files changed, 306 insertions(+), 12 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1fb20f67d8670a661c8a…

1 0

Nikolay Sivov : mf/tests: Use wide string literals.
by Alexandre Julliard 12 Mar '20

12 Mar '20

Module: wine Branch: master Commit: 36543adbe72bbc1c46af7299e603b6557ef30348 URL: https://source.winehq.org/git/wine.git/?a=commit;h=36543adbe72bbc1c46af7299… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 12 18:39:11 2020 +0300 mf/tests: Use wide string literals. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/mf.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 8ebfd0ddee..d799446676 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -1230,8 +1230,6 @@ static const IMFSampleGrabberSinkCallbackVtbl test_grabber_callback_vtbl = static void test_topology_loader(void) { IMFSampleGrabberSinkCallback test_grabber_callback = { &test_grabber_callback_vtbl }; - static const WCHAR wavW[] = {'a','u','d','i','o','/','w','a','v',0}; - static const WCHAR nameW[] = {'t','e','s','t','.','w','a','v',0}; IMFTopology *topology, *topology2, *full_topology; IMFTopologyNode *src_node, *sink_node; IMFPresentationDescriptor *pd; @@ -1271,13 +1269,13 @@ todo_wine hr = MFCreateSourceResolver(&resolver); ok(hr == S_OK, "Failed to create source resolver, hr %#x.\n", hr); - filename = load_resource(nameW); + filename = load_resource(L"test.wav"); hr = MFCreateFile(MF_ACCESSMODE_READ, MF_OPENMODE_FAIL_IF_NOT_EXIST, MF_FILEFLAGS_NONE, filename, &stream); ok(hr == S_OK, "Failed to create file stream, hr %#x.\n", hr); IMFByteStream_QueryInterface(stream, &IID_IMFAttributes, (void **)&attr); - IMFAttributes_SetString(attr, &MF_BYTESTREAM_CONTENT_TYPE, wavW); + IMFAttributes_SetString(attr, &MF_BYTESTREAM_CONTENT_TYPE, L"audio/wav"); IMFAttributes_Release(attr); hr = IMFSourceResolver_CreateObjectFromByteStream(resolver, stream, NULL, MF_RESOLUTION_MEDIASOURCE, NULL,

1 0

Nikolay Sivov : mfplat: Add MFGetStrideForBitmapInfoHeader().
by Alexandre Julliard 12 Mar '20

12 Mar '20

Module: wine Branch: master Commit: d62f8f645a0a7a4b138b36a203916c00c4aa44ac URL: https://source.winehq.org/git/wine.git/?a=commit;h=d62f8f645a0a7a4b138b36a2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 12 18:39:10 2020 +0300 mfplat: Add MFGetStrideForBitmapInfoHeader(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/mediatype.c | 120 +++++++++++++++++++++++++++++++++++---------- dlls/mfplat/mfplat.spec | 2 +- dlls/mfplat/tests/mfplat.c | 73 +++++++++++++++++++++++++-- include/mfapi.h | 1 + 4 files changed, 166 insertions(+), 30 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d62f8f645a0a7a4b138b…

1 0

Jacek Caban : dbghelp: Use Windows API to map ELF files.
by Alexandre Julliard 12 Mar '20

12 Mar '20

Module: wine Branch: master Commit: a60b3985bf37827fd0b0f7583c31dcf52069b4a8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a60b3985bf37827fd0b0f758… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 12 16:18:39 2020 +0100 dbghelp: Use Windows API to map ELF files. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/elf_module.c | 168 ++++++++++++++++++++++++------------------- dlls/dbghelp/image_private.h | 2 +- 2 files changed, 94 insertions(+), 76 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a60b3985bf37827fd0b0…

1 0

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 March 2020