March 2020 - Wine-Devel - list.winehq.org

[PATCH 2/4] kernel32/tests: Fix initialization of parameters in Get[*]PreferredUILanguages tests.
by Dmitry Timoshkov March 2, 2020

March 2, 2020

This patch removes initialization of unsued parameters and uses - count = 0xdeadbeef; + count = 0; when after an API call 'count' is checked by ok(count, "Expected count > 0\n"); Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/kernel32/tests/locale.c | 44 ++++++++++++------------------------ 1 file changed, 15 insertions(+), 29 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 31add74e4e..8ff630a1eb 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -5318,7 +5318,7 @@ static void test_GetSystemPreferredUILanguages(void) } /* (in)valid first parameter */ - count = 0xdeadbeef; + count = 0; size = 0; SetLastError(0xdeadbeef); ret = pGetSystemPreferredUILanguages(0, &count, NULL, &size); @@ -5326,7 +5326,6 @@ static void test_GetSystemPreferredUILanguages(void) ok(count, "Expected count > 0\n"); ok(size % 6 == 1, "Expected size (%d) %% 6 == 1\n", size); - count = 0xdeadbeef; size = 0; SetLastError(0xdeadbeef); ret = pGetSystemPreferredUILanguages(MUI_FULL_LANGUAGE, &count, NULL, &size); @@ -5334,7 +5333,6 @@ static void test_GetSystemPreferredUILanguages(void) ok(ERROR_INVALID_PARAMETER == GetLastError(), "Expected error ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); - count = 0xdeadbeef; size = 0; SetLastError(0xdeadbeef); ret = pGetSystemPreferredUILanguages(MUI_LANGUAGE_ID | MUI_FULL_LANGUAGE, &count, NULL, &size); @@ -5342,7 +5340,6 @@ static void test_GetSystemPreferredUILanguages(void) ok(ERROR_INVALID_PARAMETER == GetLastError(), "Expected error ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); - count = 0xdeadbeef; size = 0; SetLastError(0xdeadbeef); ret = pGetSystemPreferredUILanguages(MUI_LANGUAGE_ID | MUI_LANGUAGE_NAME, &count, NULL, &size); @@ -5350,7 +5347,7 @@ static void test_GetSystemPreferredUILanguages(void) ok(ERROR_INVALID_PARAMETER == GetLastError(), "Expected error ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); - count = 0xdeadbeef; + count = 0; size = 0; SetLastError(0xdeadbeef); ret = pGetSystemPreferredUILanguages(MUI_LANGUAGE_ID | MUI_MACHINE_LANGUAGE_SETTINGS, &count, NULL, &size); @@ -5358,7 +5355,7 @@ static void test_GetSystemPreferredUILanguages(void) ok(count, "Expected count > 0\n"); ok(size % 5 == 1, "Expected size (%d) %% 5 == 1\n", size); - count = 0xdeadbeef; + count = 0; size = 0; SetLastError(0xdeadbeef); ret = pGetSystemPreferredUILanguages(MUI_LANGUAGE_NAME | MUI_MACHINE_LANGUAGE_SETTINGS, &count, NULL, &size); @@ -5372,7 +5369,6 @@ static void test_GetSystemPreferredUILanguages(void) */ /* invalid third parameter */ - count = 0xdeadbeef; size = 1; SetLastError(0xdeadbeef); ret = pGetSystemPreferredUILanguages(MUI_LANGUAGE_ID, &count, NULL, &size); @@ -5385,7 +5381,7 @@ static void test_GetSystemPreferredUILanguages(void) * -> unhandled exception c0000005 */ - count = 0xdeadbeef; + count = 0; size_id = 0; SetLastError(0xdeadbeef); ret = pGetSystemPreferredUILanguages(MUI_LANGUAGE_ID, &count, NULL, &size_id); @@ -5393,7 +5389,7 @@ static void test_GetSystemPreferredUILanguages(void) ok(count, "Expected count > 0\n"); ok(size_id % 5 == 1, "Expected size (%d) %% 5 == 1\n", size_id); - count = 0xdeadbeef; + count = 0; size_name = 0; SetLastError(0xdeadbeef); ret = pGetSystemPreferredUILanguages(MUI_LANGUAGE_NAME, &count, NULL, &size_name); @@ -5415,7 +5411,7 @@ static void test_GetSystemPreferredUILanguages(void) return; } - count = 0xdeadbeef; + count = 0; size = size_buffer; memset(buffer, 0x5a, size_buffer * sizeof(WCHAR)); SetLastError(0xdeadbeef); @@ -5428,7 +5424,7 @@ static void test_GetSystemPreferredUILanguages(void) "Expected last two WCHARs being empty, got 0x%x 0x%x\n", buffer[size -2], buffer[size -1]); - count = 0xdeadbeef; + count = 0; size = size_buffer; memset(buffer, 0x5a, size_buffer * sizeof(WCHAR)); SetLastError(0xdeadbeef); @@ -5441,7 +5437,7 @@ static void test_GetSystemPreferredUILanguages(void) "Expected last two WCHARs being empty, got 0x%x 0x%x\n", buffer[size -2], buffer[size -1]); - count = 0xdeadbeef; + count = 0; size = size_buffer; SetLastError(0xdeadbeef); ret = pGetSystemPreferredUILanguages(MUI_LANGUAGE_NAME, &count, buffer, &size); @@ -5453,7 +5449,7 @@ static void test_GetSystemPreferredUILanguages(void) "Expected last two WCHARs being empty, got 0x%x 0x%x\n", buffer[size -2], buffer[size -1]); - count = 0xdeadbeef; + count = 0; size = 0; SetLastError(0xdeadbeef); ret = pGetSystemPreferredUILanguages(MUI_MACHINE_LANGUAGE_SETTINGS, &count, NULL, &size); @@ -5465,7 +5461,6 @@ static void test_GetSystemPreferredUILanguages(void) "Expected last two WCHARs being empty, got 0x%x 0x%x\n", buffer[size -2], buffer[size -1]); - count = 0xdeadbeef; size = 1; SetLastError(0xdeadbeef); ret = pGetSystemPreferredUILanguages(MUI_LANGUAGE_ID, &count, buffer, &size); @@ -5473,7 +5468,6 @@ static void test_GetSystemPreferredUILanguages(void) ok(ERROR_INSUFFICIENT_BUFFER == GetLastError(), "Expected error ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); - count = 0xdeadbeef; size = size_id -1; memset(buffer, 0x5a, size_buffer * sizeof(WCHAR)); SetLastError(0xdeadbeef); @@ -5482,7 +5476,6 @@ static void test_GetSystemPreferredUILanguages(void) ok(ERROR_INSUFFICIENT_BUFFER == GetLastError(), "Expected error ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); - count = 0xdeadbeef; size = size_id -2; memset(buffer, 0x5a, size_buffer * sizeof(WCHAR)); SetLastError(0xdeadbeef); @@ -5526,14 +5519,12 @@ static void test_GetUserPreferredUILanguages(void) ULONG count, size, size_id, size_name, size_buffer; WCHAR *buffer; - if (!pGetUserPreferredUILanguages) { win_skip("GetUserPreferredUILanguages is not available.\n"); return; } - count = 0xdeadbeef; size = 0; SetLastError(0xdeadbeef); ret = pGetUserPreferredUILanguages(MUI_FULL_LANGUAGE, &count, NULL, &size); @@ -5541,7 +5532,6 @@ static void test_GetUserPreferredUILanguages(void) ok(ERROR_INVALID_PARAMETER == GetLastError(), "Expected error ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); - count = 0xdeadbeef; size = 0; SetLastError(0xdeadbeef); ret = pGetUserPreferredUILanguages(MUI_LANGUAGE_ID | MUI_FULL_LANGUAGE, &count, NULL, &size); @@ -5549,7 +5539,6 @@ static void test_GetUserPreferredUILanguages(void) ok(ERROR_INVALID_PARAMETER == GetLastError(), "Expected error ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); - count = 0xdeadbeef; size = 0; SetLastError(0xdeadbeef); ret = pGetUserPreferredUILanguages(MUI_LANGUAGE_ID | MUI_MACHINE_LANGUAGE_SETTINGS, &count, NULL, &size); @@ -5557,7 +5546,6 @@ static void test_GetUserPreferredUILanguages(void) ok(ERROR_INVALID_PARAMETER == GetLastError(), "Expected error ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); - count = 0xdeadbeef; size = 1; SetLastError(0xdeadbeef); ret = pGetUserPreferredUILanguages(MUI_LANGUAGE_ID, &count, NULL, &size); @@ -5565,7 +5553,7 @@ static void test_GetUserPreferredUILanguages(void) ok(ERROR_INVALID_PARAMETER == GetLastError(), "Expected error ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); - count = 0xdeadbeef; + count = 0; size_id = 0; SetLastError(0xdeadbeef); ret = pGetUserPreferredUILanguages(MUI_LANGUAGE_ID, &count, NULL, &size_id); @@ -5573,7 +5561,7 @@ static void test_GetUserPreferredUILanguages(void) ok(count, "Expected count > 0\n"); ok(size_id % 5 == 1, "Expected size (%d) %% 5 == 1\n", size_id); - count = 0xdeadbeef; + count = 0; size_name = 0; SetLastError(0xdeadbeef); ret = pGetUserPreferredUILanguages(MUI_LANGUAGE_NAME, &count, NULL, &size_name); @@ -5590,7 +5578,7 @@ static void test_GetUserPreferredUILanguages(void) buffer = HeapAlloc(GetProcessHeap(), 0, size_buffer * sizeof(WCHAR)); - count = 0xdeadbeef; + count = 0; size = size_buffer; memset(buffer, 0x5a, size_buffer * sizeof(WCHAR)); SetLastError(0xdeadbeef); @@ -5603,7 +5591,7 @@ static void test_GetUserPreferredUILanguages(void) "Expected last two WCHARs being empty, got 0x%x 0x%x\n", buffer[size -2], buffer[size -1]); - count = 0xdeadbeef; + count = 0; size = size_buffer; memset(buffer, 0x5a, size_buffer * sizeof(WCHAR)); SetLastError(0xdeadbeef); @@ -5616,7 +5604,7 @@ static void test_GetUserPreferredUILanguages(void) "Expected last two WCHARs being empty, got 0x%x 0x%x\n", buffer[size -2], buffer[size -1]); - count = 0xdeadbeef; + count = 0; size = size_buffer; SetLastError(0xdeadbeef); ret = pGetUserPreferredUILanguages(MUI_LANGUAGE_NAME, &count, buffer, &size); @@ -5628,7 +5616,6 @@ static void test_GetUserPreferredUILanguages(void) "Expected last two WCHARs being empty, got 0x%x 0x%x\n", buffer[size -2], buffer[size -1]); - count = 0xdeadbeef; size = 1; SetLastError(0xdeadbeef); ret = pGetUserPreferredUILanguages(MUI_LANGUAGE_ID, &count, buffer, &size); @@ -5636,7 +5623,6 @@ static void test_GetUserPreferredUILanguages(void) ok(ERROR_INSUFFICIENT_BUFFER == GetLastError(), "Expected error ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); - count = 0xdeadbeef; size = size_id -1; memset(buffer, 0x5a, size_buffer * sizeof(WCHAR)); SetLastError(0xdeadbeef); @@ -5645,7 +5631,7 @@ static void test_GetUserPreferredUILanguages(void) ok(ERROR_INSUFFICIENT_BUFFER == GetLastError(), "Expected error ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); - count = 0xdeadbeef; + count = 0; size = size_id -2; memset(buffer, 0x5a, size_buffer * sizeof(WCHAR)); SetLastError(0xdeadbeef); -- 2.20.1

1 0

[PATCH 1/4] kernel32/tests: Fix locale.c compilation with Visual Studio 14.0.
by Dmitry Timoshkov March 2, 2020

March 2, 2020

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/kernel32/tests/locale.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 1df3c0dcd6..31add74e4e 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -25,6 +25,8 @@ * the control panel i8n page), we will still get the expected results. */ +#define _CRT_NON_CONFORMING_WCSTOK + #include <assert.h> #include <stdlib.h> #include <stdarg.h> @@ -4197,7 +4199,7 @@ static void test_GetCPInfo(void) for (i = 0; i <= sizeof(buf); i++) { memset( wbuf, 0xcc, sizeof(wbuf) ); - RtlCustomCPToUnicodeN( &table, wbuf, sizeof(wbuf), &reslen, (char *)buf, i ); + pRtlCustomCPToUnicodeN( &table, wbuf, sizeof(wbuf), &reslen, (char *)buf, i ); for (j = 0; j < 4; j++) if (expect[i][j] == 0xcccc) break; ok( reslen == j * sizeof(WCHAR), "%u: wrong len %u\n", i, reslen ); for (j = 0; j < 4; j++) -- 2.20.1

1 0

[PATCH] include/sal.h: Add _Ret_writes_z_ for Visual Studio 14.0.
by Dmitry Timoshkov March 2, 2020

March 2, 2020

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- include/sal.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/sal.h b/include/sal.h index 81a828dd97..ca8b824f1b 100644 --- a/include/sal.h +++ b/include/sal.h @@ -217,6 +217,7 @@ #define _Ret_opt_z_cap_(count) #define _Ret_range_(exp,exp2) #define _Ret_writes_bytes_maybenull_(count) +#define _Ret_writes_z_(count) #define _Ret_z_ #define _Return_type_success_(count) -- 2.20.1

1 0

[PATCH] oledb32: Initialize all DBGUID values
by Alistair Leslie-Hughes March 2, 2020

March 2, 2020

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/oledb32/datainit.c | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/dlls/oledb32/datainit.c b/dlls/oledb32/datainit.c index 2acd23ea083..072bb1ece14 100644 --- a/dlls/oledb32/datainit.c +++ b/dlls/oledb32/datainit.c @@ -34,7 +34,26 @@ WINE_DEFAULT_DEBUG_CHANNEL(oledb); -DEFINE_GUID(DBPROPSET_DBINIT, 0xc8b522bc, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); +DEFINE_DBGUID(DB_NULLGUID, 0x00000000, 0x0000, 0x0000, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00); +DEFINE_DBGUID(DBGUID_SESSION, 0xc8b522f5, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); +DEFINE_DBGUID(DBGUID_ROWSET, 0xc8b522f6, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); +DEFINE_DBGUID(DBGUID_ROW, 0xc8b522f7, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); +DEFINE_DBGUID(DBGUID_STREAM, 0xc8b522f9, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); + +DEFINE_DBGUID(DBPROPSET_COLUMN, 0xc8b522b9, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); +DEFINE_DBGUID(DBPROPSET_DATASOURCE, 0xc8b522ba, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); +DEFINE_DBGUID(DBPROPSET_DATASOURCEINFO, 0xc8b522bb, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); +DEFINE_DBGUID(DBPROPSET_DBINIT, 0xc8b522bc, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); +DEFINE_DBGUID(DBPROPSET_INDEX, 0xc8b522bd, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); +DEFINE_DBGUID(DBPROPSET_ROWSET, 0xc8b522be, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); +DEFINE_DBGUID(DBPROPSET_TABLE, 0xc8b522bf, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); +DEFINE_DBGUID(DBPROPSET_DATASOURCEALL, 0xc8b522c0, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); +DEFINE_DBGUID(DBPROPSET_DATASOURCEINFOALL, 0xc8b522c1, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); +DEFINE_DBGUID(DBPROPSET_ROWSETALL, 0xc8b522c2, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); +DEFINE_DBGUID(DBPROPSET_SESSION, 0xc8b522c6, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); +DEFINE_DBGUID(DBPROPSET_SESSIONALL, 0xc8b522c7, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); +DEFINE_DBGUID(DBPROPSET_DBINITALL, 0xc8b522ca, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); +DEFINE_DBGUID(DBPROPSET_PROPERTIESINERROR, 0xc8b522d4, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); typedef struct datainit { -- 2.17.1

2 1

[PATCH 1/2] comctl32/tests: Add tests for alpha channel of imagelist.
by Ziqing Hui March 2, 2020

March 2, 2020

The test_alpha() is run under version 6 comctl32 because alpha channel is not supported in older version. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/comctl32/tests/imagelist.c | 79 +++++++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+)

1 1

[PATCH v2 2/2] comctl32/imagelist: Correctly handle alpha channel of 32bpp image.
by Ziqing Hui March 2, 2020

March 2, 2020

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/comctl32/imagelist.c | 24 ++++++++++-------------- dlls/comctl32/tests/imagelist.c | 2 -- 2 files changed, 10 insertions(+), 16 deletions(-)

1 0

[PATCH v2 1/2] comctl32/tests: Add tests for alpha channel of imagelist.
by Ziqing Hui March 2, 2020

March 2, 2020

v2: Fix some style problem in the first patch: * remove white space between "ok" and "(" * remove unnecessary ok() * use todo_wine_if(xxx) to replace if (xxx) todo_wine Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/comctl32/tests/imagelist.c | 70 +++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+)

1 0

[PATCH v2] wmvcore: Add semi-stub implementation for WMIsContentProtected
by Vijay Kiran Kamuju March 1, 2020

March 1, 2020

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48683 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH] wmvcore: Add semi-stub implementation for WMIsContentProtected
by Vijay Kiran Kamuju March 1, 2020

March 1, 2020

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48683 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

2 1