- Wine-Devel - list.winehq.org

[PATCH 1/4] kernelbase: Allow the two initial slashes to be backslashes in UrlGetPart().
by Zebediah Figura Feb. 17, 2022

Feb. 17, 2022

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/kernelbase/path.c | 8 +++++++- dlls/shlwapi/tests/url.c | 8 ++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index e29ee585123..befdf237c5e 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -4191,6 +4191,11 @@ static const WCHAR *parse_url_element( const WCHAR *url, const WCHAR *separators return url + wcslen( url ); } +static BOOL is_slash( char c ) +{ + return c == '/' || c == '\\'; +} + static void parse_url( const WCHAR *url, struct parsed_url *pl ) { const WCHAR *work; @@ -4200,7 +4205,8 @@ static void parse_url( const WCHAR *url, struct parsed_url *pl ) work = scan_url(pl->scheme, &pl->scheme_len, SCHEME); if (!*work || (*work != ':')) return; work++; - if ((*work != '/') || (*(work+1) != '/')) return; + if (!is_slash( work[0] ) || !is_slash( work[1] )) + return; pl->username = work + 2; work = parse_url_element( pl->username, L":@/\\?#" ); diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index 18af0906e08..ae0d0738195 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -661,12 +661,12 @@ static void test_UrlGetPart(void) {"http:/localhost/index.html", URL_PART_HOSTNAME, 0, E_FAIL, .todo_hr = TRUE}, {"http://localhost\\index.html", URL_PART_HOSTNAME, 0, S_OK, "localhost"}, - {"http:/\\localhost/index.html", URL_PART_HOSTNAME, 0, S_OK, "localhost", .todo_hr = TRUE}, - {"http:\\/localhost/index.html", URL_PART_HOSTNAME, 0, S_OK, "localhost", .todo_hr = TRUE}, + {"http:/\\localhost/index.html", URL_PART_HOSTNAME, 0, S_OK, "localhost"}, + {"http:\\/localhost/index.html", URL_PART_HOSTNAME, 0, S_OK, "localhost"}, {"ftp://localhost\\index.html", URL_PART_HOSTNAME, 0, S_OK, "localhost"}, - {"ftp:/\\localhost/index.html", URL_PART_HOSTNAME, 0, S_OK, "localhost", .todo_hr = TRUE}, - {"ftp:\\/localhost/index.html", URL_PART_HOSTNAME, 0, S_OK, "localhost", .todo_hr = TRUE}, + {"ftp:/\\localhost/index.html", URL_PART_HOSTNAME, 0, S_OK, "localhost"}, + {"ftp:\\/localhost/index.html", URL_PART_HOSTNAME, 0, S_OK, "localhost"}, {"http://host?a:b(a)c:d", URL_PART_HOSTNAME, 0, S_OK, "host"}, {"http://host?a:b(a)c:d", URL_PART_QUERY, 0, S_OK, "a:b(a)c:d"}, -- 2.34.1

1 3

[PATCH 1/6] ncrypt: Fix null pointer.
by Santino Mazza Feb. 17, 2022

Feb. 17, 2022

Signed-off-by: Santino Mazza <mazzasantino1206(a)gmail.com> --- dlls/ncrypt/main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ncrypt/main.c b/dlls/ncrypt/main.c index 6b1a87ea785..22e2e9089ef 100644 --- a/dlls/ncrypt/main.c +++ b/dlls/ncrypt/main.c @@ -322,6 +322,7 @@ static SECURITY_STATUS set_object_property(struct object *object, const WCHAR *n ERR("Error allocating memory."); return NTE_NO_MEMORY; } + property = &object->properties[object->num_properties]; object->num_properties++; } else -- 2.32.0

1 5

[PATCH 1/3] vcomp: Add tests for _vcomp_for_dynamic_init_i8()
by David Koller Feb. 17, 2022

Feb. 17, 2022

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52012 Signed-off-by: David Koller <dk(a)cs.stanford.edu> --- dlls/vcomp/tests/vcomp.c | 247 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 247 insertions(+) diff --git a/dlls/vcomp/tests/vcomp.c b/dlls/vcomp/tests/vcomp.c index a229e0198f7..19d56820450 100644 --- a/dlls/vcomp/tests/vcomp.c +++ b/dlls/vcomp/tests/vcomp.c @@ -87,7 +87,10 @@ static void (CDECL *p_vcomp_enter_critsect)(CRITICAL_SECTION **critsect); static void (CDECL *p_vcomp_flush)(void); static void (CDECL *p_vcomp_for_dynamic_init)(unsigned int flags, unsigned int first, unsigned int last, int step, unsigned int chunksize); +static void (CDECL *p_vcomp_for_dynamic_init_i8)(unsigned int flags, ULONG64 first, ULONG64 last, + LONG64 step, ULONG64 chunksize); static int (CDECL *p_vcomp_for_dynamic_next)(unsigned int *begin, unsigned int *end); +static int (CDECL *p_vcomp_for_dynamic_next_i8)(ULONG64 *begin, ULONG64 *end); static void (CDECL *p_vcomp_for_static_end)(void); static void (CDECL *p_vcomp_for_static_init)(int first, int last, int step, int chunksize, unsigned int *loops, int *begin, int *end, int *next, int *lastchunk); @@ -329,7 +332,9 @@ static BOOL init_vcomp(void) VCOMP_GET_PROC(_vcomp_enter_critsect); VCOMP_GET_PROC(_vcomp_flush); VCOMP_GET_PROC(_vcomp_for_dynamic_init); + VCOMP_GET_PROC(_vcomp_for_dynamic_init_i8); VCOMP_GET_PROC(_vcomp_for_dynamic_next); + VCOMP_GET_PROC(_vcomp_for_dynamic_next_i8); VCOMP_GET_PROC(_vcomp_for_static_end); VCOMP_GET_PROC(_vcomp_for_static_init); VCOMP_GET_PROC(_vcomp_for_static_init_i8); @@ -1546,6 +1551,60 @@ static void CDECL for_dynamic_static_cb(void) ok(ret == FALSE, "expected ret == FALSE, got %d\n", ret); } +static void CDECL for_dynamic_static_i8_cb(void) +{ + ULONG64 my_begin, my_end, begin, end; + int ret; + + begin = end = 0xdeadbeef; + my_for_static_simple_init_i8(TRUE, 0, 1000, 7, TRUE, &my_begin, &my_end); + p_vcomp_for_dynamic_init_i8(VCOMP_DYNAMIC_FLAGS_STATIC | VCOMP_DYNAMIC_FLAGS_INCREMENT, 0, 1000, 7, 1); + ret = p_vcomp_for_dynamic_next_i8(&begin, &end); + ok(ret == TRUE, "expected ret == TRUE, got %d\n", ret); + ok(begin == my_begin, "expected begin == %s, got %s\n", wine_dbgstr_longlong(my_begin), + wine_dbgstr_longlong(begin)); + ok(end == my_end, "expected end == %s, got %s\n", wine_dbgstr_longlong(my_end), + wine_dbgstr_longlong(end)); + ret = p_vcomp_for_dynamic_next_i8(&begin, &end); + ok(ret == FALSE, "expected ret == FALSE, got %d\n", ret); + + begin = end = 0xdeadbeef; + my_for_static_simple_init_i8(TRUE, 1000, 0, 7, FALSE, &my_begin, &my_end); + p_vcomp_for_dynamic_init_i8(VCOMP_DYNAMIC_FLAGS_STATIC, 1000, 0, 7, 1); + ret = p_vcomp_for_dynamic_next_i8(&begin, &end); + ok(ret == TRUE, "expected ret == TRUE, got %d\n", ret); + ok(begin == my_begin, "expected begin == %s, got %s\n", wine_dbgstr_longlong(my_begin), + wine_dbgstr_longlong(begin)); + ok(end == my_end, "expected end == %s, got %s\n", wine_dbgstr_longlong(my_end), + wine_dbgstr_longlong(end)); + ret = p_vcomp_for_dynamic_next_i8(&begin, &end); + ok(ret == FALSE, "expected ret == FALSE, got %d\n", ret); + + begin = end = 0xdeadbeef; + my_for_static_simple_init_i8(TRUE, 0, 1000, 7, TRUE, &my_begin, &my_end); + p_vcomp_for_dynamic_init_i8(VCOMP_DYNAMIC_FLAGS_STATIC | VCOMP_DYNAMIC_FLAGS_INCREMENT, 0, 1000, 7, 5); + ret = p_vcomp_for_dynamic_next_i8(&begin, &end); + ok(ret == TRUE, "expected ret == TRUE, got %d\n", ret); + ok(begin == my_begin, "expected begin == %s, got %s\n", wine_dbgstr_longlong(my_begin), + wine_dbgstr_longlong(begin)); + ok(end == my_end, "expected end == %s, got %s\n", wine_dbgstr_longlong(my_end), + wine_dbgstr_longlong(end)); + ret = p_vcomp_for_dynamic_next_i8(&begin, &end); + ok(ret == FALSE, "expected ret == FALSE, got %d\n", ret); + + begin = end = 0xdeadbeef; + my_for_static_simple_init_i8(TRUE, 1000, 0, 7, FALSE, &my_begin, &my_end); + p_vcomp_for_dynamic_init_i8(VCOMP_DYNAMIC_FLAGS_STATIC, 1000, 0, 7, 5); + ret = p_vcomp_for_dynamic_next_i8(&begin, &end); + ok(ret == TRUE, "expected ret == TRUE, got %d\n", ret); + ok(begin == my_begin, "expected begin == %s, got %s\n", wine_dbgstr_longlong(my_begin), + wine_dbgstr_longlong(begin)); + ok(end == my_end, "expected end == %s, got %s\n", wine_dbgstr_longlong(my_end), + wine_dbgstr_longlong(end)); + ret = p_vcomp_for_dynamic_next_i8(&begin, &end); + ok(ret == FALSE, "expected ret == FALSE, got %d\n", ret); +} + static void CDECL for_dynamic_chunked_cb(LONG *a, LONG *b, LONG *c, LONG *d) { unsigned int begin, end; @@ -1583,6 +1642,47 @@ static void CDECL for_dynamic_chunked_cb(LONG *a, LONG *b, LONG *c, LONG *d) } } +static void CDECL for_dynamic_chunked_i8_cb(LONG64 *a, LONG64 *b, LONG64 *c, LONG64 *d) +{ + ULONG64 begin, end; + + p_vcomp_for_dynamic_init_i8(VCOMP_DYNAMIC_FLAGS_CHUNKED | VCOMP_DYNAMIC_FLAGS_INCREMENT, 0, 1000, 7, 1); + while (p_vcomp_for_dynamic_next_i8(&begin, &end)) + { + if (begin == 994) ok(end == 1000, "expected end == 1000, got %s\n", wine_dbgstr_longlong(end)); + else ok(begin == end, "expected begin == end, got %s and %s\n", wine_dbgstr_longlong(begin), + wine_dbgstr_longlong(end)); + InterlockedExchangeAdd64(a, begin); + } + + p_vcomp_for_dynamic_init_i8(VCOMP_DYNAMIC_FLAGS_CHUNKED, 1000, 0, 7, 1); + while (p_vcomp_for_dynamic_next_i8(&begin, &end)) + { + if (begin == 6) ok(end == 0, "expected end == 0, got %s\n", wine_dbgstr_longlong(end)); + else ok(begin == end, "expected begin == end, got %s and %s\n", wine_dbgstr_longlong(begin), + wine_dbgstr_longlong(end)); + InterlockedExchangeAdd64(b, begin); + } + + p_vcomp_for_dynamic_init_i8(VCOMP_DYNAMIC_FLAGS_CHUNKED | VCOMP_DYNAMIC_FLAGS_INCREMENT, 0, 1000, 7, 5); + while (p_vcomp_for_dynamic_next_i8(&begin, &end)) + { + if (begin == 980) ok(end == 1000, "expected end == 1000, got %s\n", wine_dbgstr_longlong(end)); + else ok(begin + 28 == end, "expected begin + 28 == end, got %s and %s\n", + wine_dbgstr_longlong(begin + 28), wine_dbgstr_longlong(end)); + InterlockedExchangeAdd64(c, begin); + } + + p_vcomp_for_dynamic_init_i8(VCOMP_DYNAMIC_FLAGS_CHUNKED, 1000, 0, 7, 5); + while (p_vcomp_for_dynamic_next_i8(&begin, &end)) + { + if (begin == 20) ok(end == 0, "expected end == 0, got %s\n", wine_dbgstr_longlong(end)); + else ok(begin - 28 == end, "expected begin - 28 == end, got %s and %s\n", + wine_dbgstr_longlong(begin - 28), wine_dbgstr_longlong(end)); + InterlockedExchangeAdd64(d, begin); + } +} + static void CDECL for_dynamic_guided_cb(unsigned int flags, LONG *a, LONG *b, LONG *c, LONG *d) { int num_threads = pomp_get_num_threads(); @@ -1621,6 +1721,48 @@ static void CDECL for_dynamic_guided_cb(unsigned int flags, LONG *a, LONG *b, LO } } +static void CDECL for_dynamic_guided_i8_cb(unsigned int flags, LONG64 *a, LONG64 *b, LONG64 *c, LONG64 *d) +{ + int num_threads = pomp_get_num_threads(); + ULONG64 begin, end; + + p_vcomp_for_dynamic_init_i8(flags | VCOMP_DYNAMIC_FLAGS_INCREMENT, 0, 1000, 7, 1); + while (p_vcomp_for_dynamic_next_i8(&begin, &end)) + { + ok(num_threads != 1 || (begin == 0 && end == 1000), + "expected begin == 0 and end == 1000, got %s and %s\n", wine_dbgstr_longlong(begin), + wine_dbgstr_longlong(end)); + InterlockedExchangeAdd64(a, begin); + } + + p_vcomp_for_dynamic_init_i8(flags, 1000, 0, 7, 1); + while (p_vcomp_for_dynamic_next_i8(&begin, &end)) + { + ok(num_threads != 1 || (begin == 1000 && end == 0), + "expected begin == 1000 and end == 0, got %s and %s\n", wine_dbgstr_longlong(begin), + wine_dbgstr_longlong(end)); + InterlockedExchangeAdd64(b, begin); + } + + p_vcomp_for_dynamic_init_i8(flags | VCOMP_DYNAMIC_FLAGS_INCREMENT, 0, 1000, 7, 5); + while (p_vcomp_for_dynamic_next_i8(&begin, &end)) + { + ok(num_threads != 1 || (begin == 0 && end == 1000), + "expected begin == 0 and end == 1000, got %s and %s\n", wine_dbgstr_longlong(begin), + wine_dbgstr_longlong(end)); + InterlockedExchangeAdd64(c, begin); + } + + p_vcomp_for_dynamic_init_i8(flags, 1000, 0, 7, 5); + while (p_vcomp_for_dynamic_next_i8(&begin, &end)) + { + ok(num_threads != 1 || (begin == 1000 && end == 0), + "expected begin == 1000 and end == 0, got %s and %s\n", wine_dbgstr_longlong(begin), + wine_dbgstr_longlong(end)); + InterlockedExchangeAdd64(d, begin); + } +} + static void test_vcomp_for_dynamic_init(void) { static const int guided_a[] = {0, 6041, 9072, 11179}; @@ -1725,6 +1867,110 @@ static void test_vcomp_for_dynamic_init(void) pomp_set_num_threads(max_threads); } +static void test_vcomp_for_dynamic_init_i8(void) +{ + static const int guided_a[] = {0, 6041, 9072, 11179}; + static const int guided_b[] = {1000, 1959, 2928, 3821}; + static const int guided_c[] = {0, 4067, 6139, 7273}; + static const int guided_d[] = {1000, 1933, 2861, 3727}; + LONG64 a, b, c, d; + int max_threads = pomp_get_max_threads(); + int i; + + /* test static scheduling */ + for_dynamic_static_i8_cb(); + + for (i = 1; i <= 4; i++) + { + pomp_set_num_threads(i); + p_vcomp_fork(TRUE, 0, for_dynamic_static_i8_cb); + p_vcomp_fork(FALSE, 0, for_dynamic_static_i8_cb); + } + + /* test chunked scheduling */ + a = b = c = d = 0; + for_dynamic_chunked_i8_cb(&a, &b, &c, &d); + ok(a == 71071, "expected a == 71071, got %s\n", wine_dbgstr_longlong(a)); + ok(b == 71929, "expected b == 71929, got %s\n", wine_dbgstr_longlong(b)); + ok(c == 14210, "expected c == 14210, got %s\n", wine_dbgstr_longlong(c)); + ok(d == 14790, "expected d == 14790, got %s\n", wine_dbgstr_longlong(d)); + + for (i = 1; i <= 4; i++) + { + pomp_set_num_threads(i); + + a = b = c = d = 0; + p_vcomp_fork(TRUE, 4, for_dynamic_chunked_i8_cb, &a, &b, &c, &d); + ok(a == 71071, "expected a == 71071, got %s\n", wine_dbgstr_longlong(a)); + ok(b == 71929, "expected b == 71929, got %s\n", wine_dbgstr_longlong(b)); + ok(c == 14210, "expected c == 14210, got %s\n", wine_dbgstr_longlong(c)); + ok(d == 14790, "expected d == 14790, got %s\n", wine_dbgstr_longlong(d)); + + a = b = c = d = 0; + p_vcomp_fork(FALSE, 4, for_dynamic_chunked_i8_cb, &a, &b, &c, &d); + ok(a == 71071, "expected a == 71071, got %s\n", wine_dbgstr_longlong(a)); + ok(b == 71929, "expected b == 71929, got %s\n", wine_dbgstr_longlong(b)); + ok(c == 14210, "expected c == 14210, got %s\n", wine_dbgstr_longlong(c)); + ok(d == 14790, "expected d == 14790, got %s\n", wine_dbgstr_longlong(d)); + } + + /* test guided scheduling */ + a = b = c = d = 0; + for_dynamic_guided_i8_cb(VCOMP_DYNAMIC_FLAGS_GUIDED, &a, &b, &c, &d); + ok(a == guided_a[0], "expected a == %d, got %s\n", guided_a[0], wine_dbgstr_longlong(a)); + ok(b == guided_b[0], "expected b == %d, got %s\n", guided_b[0], wine_dbgstr_longlong(b)); + ok(c == guided_c[0], "expected c == %d, got %s\n", guided_c[0], wine_dbgstr_longlong(c)); + ok(d == guided_d[0], "expected d == %d, got %s\n", guided_d[0], wine_dbgstr_longlong(d)); + + for (i = 1; i <= 4; i++) + { + pomp_set_num_threads(i); + + a = b = c = d = 0; + p_vcomp_fork(TRUE, 5, for_dynamic_guided_i8_cb, VCOMP_DYNAMIC_FLAGS_GUIDED, &a, &b, &c, &d); + ok(a == guided_a[i - 1], "expected a == %d, got %s\n", guided_a[i - 1], wine_dbgstr_longlong(a)); + ok(b == guided_b[i - 1], "expected b == %d, got %s\n", guided_b[i - 1], wine_dbgstr_longlong(b)); + ok(c == guided_c[i - 1], "expected c == %d, got %s\n", guided_c[i - 1], wine_dbgstr_longlong(c)); + ok(d == guided_d[i - 1], "expected d == %d, got %s\n", guided_d[i - 1], wine_dbgstr_longlong(d)); + + a = b = c = d = 0; + p_vcomp_fork(FALSE, 5, for_dynamic_guided_i8_cb, VCOMP_DYNAMIC_FLAGS_GUIDED, &a, &b, &c, &d); + ok(a == guided_a[0], "expected a == %d, got %s\n", guided_a[0], wine_dbgstr_longlong(a)); + ok(b == guided_b[0], "expected b == %d, got %s\n", guided_b[0], wine_dbgstr_longlong(b)); + ok(c == guided_c[0], "expected c == %d, got %s\n", guided_c[0], wine_dbgstr_longlong(c)); + ok(d == guided_d[0], "expected d == %d, got %s\n", guided_d[0], wine_dbgstr_longlong(d)); + } + + /* test with empty flags */ + a = b = c = d = 0; + for_dynamic_guided_i8_cb(0, &a, &b, &c, &d); + ok(a == guided_a[0], "expected a == %d, got %s\n", guided_a[0], wine_dbgstr_longlong(a)); + ok(b == guided_b[0], "expected b == %d, got %s\n", guided_b[0], wine_dbgstr_longlong(b)); + ok(c == guided_c[0], "expected c == %d, got %s\n", guided_c[0], wine_dbgstr_longlong(c)); + ok(d == guided_d[0], "expected d == %d, got %s\n", guided_d[0], wine_dbgstr_longlong(d)); + + for (i = 1; i <= 4; i++) + { + pomp_set_num_threads(i); + + a = b = c = d = 0; + p_vcomp_fork(TRUE, 5, for_dynamic_guided_i8_cb, 0, &a, &b, &c, &d); + ok(a == guided_a[i - 1], "expected a == %d, got %s\n", guided_a[i - 1], wine_dbgstr_longlong(a)); + ok(b == guided_b[i - 1], "expected b == %d, got %s\n", guided_b[i - 1], wine_dbgstr_longlong(b)); + ok(c == guided_c[i - 1], "expected c == %d, got %s\n", guided_c[i - 1], wine_dbgstr_longlong(c)); + ok(d == guided_d[i - 1], "expected d == %d, got %s\n", guided_d[i - 1], wine_dbgstr_longlong(d)); + + a = b = c = d = 0; + p_vcomp_fork(FALSE, 5, for_dynamic_guided_i8_cb, 0, &a, &b, &c, &d); + ok(a == guided_a[0], "expected a == %d, got %s\n", guided_a[0], wine_dbgstr_longlong(a)); + ok(b == guided_b[0], "expected b == %d, got %s\n", guided_b[0], wine_dbgstr_longlong(b)); + ok(c == guided_c[0], "expected c == %d, got %s\n", guided_c[0], wine_dbgstr_longlong(c)); + ok(d == guided_d[0], "expected d == %d, got %s\n", guided_d[0], wine_dbgstr_longlong(d)); + } + + pomp_set_num_threads(max_threads); +} + static void CDECL master_cb(HANDLE semaphore) { int num_threads = pomp_get_num_threads(); @@ -2644,6 +2890,7 @@ START_TEST(vcomp) test_vcomp_for_static_simple_init(); test_vcomp_for_static_init(); test_vcomp_for_dynamic_init(); + test_vcomp_for_dynamic_init_i8(); test_vcomp_master_begin(); test_vcomp_single_begin(); test_vcomp_enter_critsect(); -- 2.25.1

2 4

[PATCH 1/2] user32: Test Get/SetWindowPlacement with invalid length.
by Esme Povirk Feb. 16, 2022

Feb. 16, 2022

Signed-off-by: Esme Povirk <esme(a)codeweavers.com> --- dlls/user32/tests/win.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index cb6b61e59c0..b1ef97c01d6 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -12086,6 +12086,17 @@ static void test_window_placement(void) GetWindowRect(hwnd, &rect); ok(EqualRect(&rect, &orig), "got window rect %s\n", wine_dbgstr_rect(&rect)); + ret = SetWindowPlacement(hwnd, &wp); + ok(ret, "failed to set window placement, error %u\n", GetLastError()); + + wp.length = 0; + SetLastError(0xdeadbeef); + ret = SetWindowPlacement(hwnd, &wp); +todo_wine { + ok(!ret, "SetWindowPlacement should have failed\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError()); +} + DestroyWindow(hwnd); } @@ -12245,7 +12256,7 @@ static void test_arrange_iconic_windows(void) static void other_process_proc(HWND hwnd) { HANDLE window_ready_event, test_done_event; - WINDOWPLACEMENT wp; + WINDOWPLACEMENT wp = {0}; DWORD ret; window_ready_event = OpenEventA(EVENT_ALL_ACCESS, FALSE, "test_opw_window"); -- 2.30.2

3 4

[PATCH v3 1/5] winegstreamer: Remove unnecessary DECLSPEC_HIDDEN qualifier.
by Rémi Bernon Feb. 16, 2022

Feb. 16, 2022

On PE internal functions. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51931 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52391 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v3: Remove DECLSPEC_HIDDEN and add a patch first to make it consistent. Reorder patches and improve error handling, prefer NTSTATUS values for error codes. dlls/winegstreamer/gst_private.h | 64 ++++++++++++++++---------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index 222bce3b2c7..3584f465218 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -39,7 +39,7 @@ #include "unixlib.h" -bool array_reserve(void **elements, size_t *capacity, size_t count, size_t size) DECLSPEC_HIDDEN; +bool array_reserve(void **elements, size_t *capacity, size_t count, size_t size); static inline const char *debugstr_time(REFERENCE_TIME time) { @@ -64,60 +64,60 @@ static inline const char *debugstr_time(REFERENCE_TIME time) #define MEDIATIME_FROM_BYTES(x) ((LONGLONG)(x) * 10000000) -struct wg_parser *wg_parser_create(enum wg_parser_type type, bool unlimited_buffering) DECLSPEC_HIDDEN; -void wg_parser_destroy(struct wg_parser *parser) DECLSPEC_HIDDEN; +struct wg_parser *wg_parser_create(enum wg_parser_type type, bool unlimited_buffering); +void wg_parser_destroy(struct wg_parser *parser); -HRESULT wg_parser_connect(struct wg_parser *parser, uint64_t file_size) DECLSPEC_HIDDEN; -void wg_parser_disconnect(struct wg_parser *parser) DECLSPEC_HIDDEN; +HRESULT wg_parser_connect(struct wg_parser *parser, uint64_t file_size); +void wg_parser_disconnect(struct wg_parser *parser); -void wg_parser_begin_flush(struct wg_parser *parser) DECLSPEC_HIDDEN; -void wg_parser_end_flush(struct wg_parser *parser) DECLSPEC_HIDDEN; +void wg_parser_begin_flush(struct wg_parser *parser); +void wg_parser_end_flush(struct wg_parser *parser); -bool wg_parser_get_next_read_offset(struct wg_parser *parser, uint64_t *offset, uint32_t *size) DECLSPEC_HIDDEN; -void wg_parser_push_data(struct wg_parser *parser, const void *data, uint32_t size) DECLSPEC_HIDDEN; +bool wg_parser_get_next_read_offset(struct wg_parser *parser, uint64_t *offset, uint32_t *size); +void wg_parser_push_data(struct wg_parser *parser, const void *data, uint32_t size); -uint32_t wg_parser_get_stream_count(struct wg_parser *parser) DECLSPEC_HIDDEN; -struct wg_parser_stream *wg_parser_get_stream(struct wg_parser *parser, uint32_t index) DECLSPEC_HIDDEN; +uint32_t wg_parser_get_stream_count(struct wg_parser *parser); +struct wg_parser_stream *wg_parser_get_stream(struct wg_parser *parser, uint32_t index); -void wg_parser_stream_get_preferred_format(struct wg_parser_stream *stream, struct wg_format *format) DECLSPEC_HIDDEN; -void wg_parser_stream_enable(struct wg_parser_stream *stream, const struct wg_format *format) DECLSPEC_HIDDEN; -void wg_parser_stream_disable(struct wg_parser_stream *stream) DECLSPEC_HIDDEN; +void wg_parser_stream_get_preferred_format(struct wg_parser_stream *stream, struct wg_format *format); +void wg_parser_stream_enable(struct wg_parser_stream *stream, const struct wg_format *format); +void wg_parser_stream_disable(struct wg_parser_stream *stream); -bool wg_parser_stream_get_event(struct wg_parser_stream *stream, struct wg_parser_event *event) DECLSPEC_HIDDEN; +bool wg_parser_stream_get_event(struct wg_parser_stream *stream, struct wg_parser_event *event); bool wg_parser_stream_copy_buffer(struct wg_parser_stream *stream, - void *data, uint32_t offset, uint32_t size) DECLSPEC_HIDDEN; -void wg_parser_stream_release_buffer(struct wg_parser_stream *stream) DECLSPEC_HIDDEN; + void *data, uint32_t offset, uint32_t size); +void wg_parser_stream_release_buffer(struct wg_parser_stream *stream); void wg_parser_stream_notify_qos(struct wg_parser_stream *stream, - bool underflow, double proportion, int64_t diff, uint64_t timestamp) DECLSPEC_HIDDEN; + bool underflow, double proportion, int64_t diff, uint64_t timestamp); /* Returns the duration in 100-nanosecond units. */ -uint64_t wg_parser_stream_get_duration(struct wg_parser_stream *stream) DECLSPEC_HIDDEN; +uint64_t wg_parser_stream_get_duration(struct wg_parser_stream *stream); /* start_pos and stop_pos are in 100-nanosecond units. */ void wg_parser_stream_seek(struct wg_parser_stream *stream, double rate, - uint64_t start_pos, uint64_t stop_pos, DWORD start_flags, DWORD stop_flags) DECLSPEC_HIDDEN; + uint64_t start_pos, uint64_t stop_pos, DWORD start_flags, DWORD stop_flags); unsigned int wg_format_get_max_size(const struct wg_format *format); -HRESULT avi_splitter_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; -HRESULT decodebin_parser_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; -HRESULT mpeg_splitter_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; -HRESULT wave_parser_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; -HRESULT wma_decoder_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; +HRESULT avi_splitter_create(IUnknown *outer, IUnknown **out); +HRESULT decodebin_parser_create(IUnknown *outer, IUnknown **out); +HRESULT mpeg_splitter_create(IUnknown *outer, IUnknown **out); +HRESULT wave_parser_create(IUnknown *outer, IUnknown **out); +HRESULT wma_decoder_create(IUnknown *outer, IUnknown **out); bool amt_from_wg_format(AM_MEDIA_TYPE *mt, const struct wg_format *format, bool wm); bool amt_to_wg_format(const AM_MEDIA_TYPE *mt, struct wg_format *format); -BOOL init_gstreamer(void) DECLSPEC_HIDDEN; +BOOL init_gstreamer(void); -extern HRESULT mfplat_get_class_object(REFCLSID rclsid, REFIID riid, void **obj) DECLSPEC_HIDDEN; -extern HRESULT mfplat_DllRegisterServer(void) DECLSPEC_HIDDEN; +extern HRESULT mfplat_get_class_object(REFCLSID rclsid, REFIID riid, void **obj); +extern HRESULT mfplat_DllRegisterServer(void); -IMFMediaType *mf_media_type_from_wg_format(const struct wg_format *format) DECLSPEC_HIDDEN; -void mf_media_type_to_wg_format(IMFMediaType *type, struct wg_format *format) DECLSPEC_HIDDEN; +IMFMediaType *mf_media_type_from_wg_format(const struct wg_format *format); +void mf_media_type_to_wg_format(IMFMediaType *type, struct wg_format *format); -HRESULT winegstreamer_stream_handler_create(REFIID riid, void **obj) DECLSPEC_HIDDEN; +HRESULT winegstreamer_stream_handler_create(REFIID riid, void **obj); -HRESULT audio_converter_create(REFIID riid, void **ret) DECLSPEC_HIDDEN; +HRESULT audio_converter_create(REFIID riid, void **ret); struct wm_stream { -- 2.34.1

2 9

[tools 1/2] testbot/SetWinLocale: Add an 'info LOCALE' action to the Powershell script.
by Francois Gouget Feb. 16, 2022

Feb. 16, 2022

It returns Windows' 'canonical' locale identifier as well as the default keyboard layout. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/SetWinLocale.ps1 | 50 ++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/testbot/bin/SetWinLocale.ps1 b/testbot/bin/SetWinLocale.ps1 index ed8fa29ee1..26bd03fdfd 100644 --- a/testbot/bin/SetWinLocale.ps1 +++ b/testbot/bin/SetWinLocale.ps1 @@ -103,6 +103,52 @@ function ShowSettings() exit 0 } +function GetLocaleInfo($Locale) +{ + $LInfo= New-WinUserLanguageList $Locale + $LInfo = $LInfo[0] + + # Window synthesizes an Autonym for unknown/uninstalled locales (e.g. fr-DE), + # but cannot recommend a keyboard layout. + # Note also that installing a locale (e.g. fr-FR) typically also installs + # (at least the core functionality of) related locales (e.g. fr-BE), even + # though those are not shown as installed in the GUI. + if ($LInfo.InputMethodTips[0] -eq $null) + { + return $null + } + + # 'Canonicalize' the LanguageTag by picking the matching entry from the + # installed languages list. + $List = Get-WinUserLanguageList + foreach ($L in $List) + { + if ($LInfo.Autonym -eq $L.Autonym) + { + return $L + } + } + return $LInfo +} + + +function ShowLocaleInfo($Argv) +{ + $Locale = $Argv[1] +GetLocaleInfo($Locale) + $LInfo = GetLocaleInfo($Locale) + if ($LInfo -eq $null) + { + echo "$Name0:error: unknown locale $Locale. Is it installed?" + exit 1 + } + + Write-Output "LanguageTag=$($LInfo.LanguageTag)" + Write-Output "Autonym=$($LInfo.Autonym)" + Write-Output "LocalizedName=$($LInfo.LocalizedName)" + Write-Output "InputMethodTips=$($LInfo.InputMethodTips)" + exit 0 +} # # Modify the Windows locales settings through intl.cpl @@ -309,6 +355,7 @@ function SetLocales($Argv) function ShowUsage() { Write-Output "Usage: $Name0 settings" + Write-Output "or $Name0 info LOCALE" Write-Output "or $Name0 intlconfig LOCALE COUNTRYID SYSTEM UTF8 MUI KEYBOARDID SYSCOPY DEFCOPY" Write-Output "or $Name0 locales LOCALE COUNTRYID SYSTEM UTF8 MUI KEYBOARDID SYSCOPY DEFCOPY USEINTLCPL" Write-Output "or $Name0 -?" @@ -317,6 +364,8 @@ function ShowUsage() Write-Output "" Write-Output "Where:" Write-Output " settings Show the current Windows locale settings." + Write-Output " info Show information about the specified locale. In particular it" + Write-Output " shows Windows' 'canonical' locale identifier." Write-Output " intlconfig Generates an XML configuration file for intl.cpl." Write-Output " locales Modifies the locales either through the Powershell APIs or" Write-Output " intl.cpl." @@ -341,6 +390,7 @@ function ShowUsage() $Action = $args[0] if ($Action -eq "settings") { ShowSettings } +if ($Action -eq "info") { ShowLocaleInfo $args } if ($Action -eq "intlconfig") { ShowIntlConfig $args } if ($Action -eq "locales") { SetLocales $args } $Rc = 0 -- 2.30.2

1 1

[tools 1/2] testbot/LibvirtTool: Reorganize the snapshot creation.
by Francois Gouget Feb. 16, 2022

Feb. 16, 2022

WaitForBoot() is responsible for establishing the first connection after the VM boots, which can take longer than usual. PrepareVM() replaces SetupTestAgentd() and performs all the tasks needed to make the VM ready for the tests. CreateSnapshot() now also configures the VM before creating the Libvirt snapshot. And CheckBootCount() verifies that the VM did not crash at some point during the process. It is now systematically called before creating snapshots or declaring the VM fit for duty. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/LibvirtTool.pl | 228 ++++++++++++++++++++++--------------- 1 file changed, 135 insertions(+), 93 deletions(-) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index cfdb251694..aecca4b534 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -454,6 +454,21 @@ sub CheckOff() return ChangeStatus("dirty", "off", "done"); } +sub WaitForBoot($) +{ + my ($TA) = @_; + + Debug(Elapsed($Start), " Waiting for the VM to boot\n"); + LogMsg "Waiting for $VMKey to boot\n"; + my $MinTimeout = $TA->SetConnectTimeout(undef, undef, $WaitForBoot); + if (!$TA->GetVersion()) + { + my $ErrMessage = $TA->GetLastError(); + FatalError("Could not connect to the $VMKey TestAgent: $ErrMessage\n"); + } + $TA->SetConnectTimeout(undef, undef, $MinTimeout); +} + sub WaitForSession($) { my ($TA) = @_; @@ -478,14 +493,33 @@ sub WaitForSession($) } } -sub SetupTestAgentd($$$) +sub CheckBootCount($) +{ + my ($TA) = @_; + + # Check that TestAgentd is not displaying the "Has Windows rebooted?" warning. + my $Count = $TA->GetProperties("start.count"); + if (defined $Count and $Count > 1) + { + FatalError("$VMKey has been rebooted too many times: start.count=$Count > 1\n"); + } +} + +sub ResetBootCount($) +{ + my ($TA) = @_; + + # Check the boot count before resetting it + CheckBootCount($TA); + $TA->SetProperty("start.count", 0); +} + +sub PrepareVM($) { - my ($Booting, $UpgradeTestAgentd, $ResetStartCount) = @_; + my ($TA) = @_; Debug(Elapsed($Start), " Setting up the $VMKey TestAgent server\n"); LogMsg "Setting up the $VMKey TestAgent server\n"; - my $TA = $VM->GetAgent(); - $TA->SetConnectTimeout(undef, undef, $WaitForBoot) if ($Booting); my $Version = $TA->GetVersion(); if (!$Version) { @@ -493,9 +527,58 @@ sub SetupTestAgentd($$$) FatalError("Could not connect to the $VMKey TestAgent: $ErrMessage\n"); } - # Upgrade TestAgentd - if ($UpgradeTestAgentd and ($VM->Type eq "win32" or $VM->Type eq "win64")) + # Always update the guest's system time + # This is needed not only for the tests (date is important when checking + # HTTPS certificates), but also for the build (if the time moves forward + # during the build some ccache versions will return a compilation error). + my $PTA = GetPrivilegedTA($TA); + FatalError("$VMKey has no privileged TestAgent server\n") if (!$PTA); + if (!$PTA->SetTime()) + { + FatalError("Setting the $VMKey system time failed: ". $PTA->GetLastError() ."\n"); + } +} + +sub GetSnapshotConfig($) +{ + my ($Config) = @_; + + # Don't stack snapshots. For instance assume the snapshot name is + # 'test-live-fr-FR-tsign' and that 'test-live-fr-FR' already exists + # (typically because it is used by another VM): + # - It's probably better if snapshots are independent from each other. + # - Applying the 'tsign' flag on top of the existing snapshot requires a + # Windows reboot. But format locale changes may not stick across reboots. + # - Stopping the snapshot name parsing when finding an existing snapshot name + # would lose the 'live' flag resulting in an error (or the wrong type of + # snapshot. Avoiding this issue would result in more complexity. + # - Finally snapshot stacking does not seem that useful. + # - A consequence is that the base snapshot should be called 'test' and not + # 'test-live'. + while (1) + { + if ($Config->{base} =~ s/-([a-z]{2}-[A-Z]{2})$//) + { + $Config->{locale} ||= $1; # take only the last match + } + elsif ($Config->{base} =~ s/-(live)$//) + { + $Config->{$1} = 1; + } + else + { + last; + } + } +} + +sub CreateSnapshot($$$$) +{ + my ($Domain, $TA, $Config, $Booting) = @_; + + if ($VM->Type =~ /^win(?:32|64)$/) { + my $Version = $TA->GetVersion(); Debug(Elapsed($Start), " Upgrading the $VMKey TestAgent server from $Version\n"); LogMsg "Upgrading the $VMKey TestAgent server from $Version\n"; if ($Version !~ / ([0-9]+)\.([0-9]+)$/) @@ -532,76 +615,41 @@ sub SetupTestAgentd($$$) # A side effect is that it will force TestAgentd.exe.old to stay around. } - # Always update the guest's system time - # This is needed not only for the tests (date is important when checking - # HTTPS certificates), but also for the build (if the time moves forward - # during the build some ccache versions will return a compilation error). - my $PTA = GetPrivilegedTA($TA); - FatalError("Cannot set the $VMKey VM system time\n") if (!$PTA); - if (!$PTA->SetTime()) + if ($Config->{locale}) { - FatalError("Setting the $VMKey VM system time failed: ". $PTA->GetLastError() ."\n"); - } - - WaitForSession($TA) if ($Booting); + Debug(Elapsed($Start), " Setting up the $Config->{locale} locale on $VMKey\n"); + # SetWinLocale --default performs a reboot and WaitForBoot() + ResetBootCount($TA); + $TA->Disconnect(); + $Booting = 1; - if ($ResetStartCount) - { - # If SetProperty() is not supported neither is --show-restarts. - # So it all works out. - $TA->SetProperty("start.count", 0); - } - elsif ($Booting) - { - # Check that TestAgentd is not displaying the "Has Windows rebooted?" - # warning. - my $Count = $TA->GetProperties("start.count"); - if (defined $Count and $Count > 1) + my @Cmd = ("$BinDir/SetWinLocale", $VM->Hostname, "--default", $Config->{locale}); + push @Cmd, "--debug" if ($Debug); + Debug("Running: ", join(" ", @Cmd), "\n"); + if (system(@Cmd)) { - FatalError("$VMKey has been rebooted too many times: start.count=$Count > 1"); + FatalError("Could not set the $VMKey locale to $Config->{locale}\n"); } } - $PTA->Disconnect(); - $TA->Disconnect(); -} - -sub GetSnapshotConfig($) -{ - my ($Config) = @_; - while (1) + if ($Booting) { - if ($Config->{base} =~ s/-([a-z]{2}-[A-Z]{2})$//) - { - $Config->{locale} = $1; - } - elsif ($Config->{base} =~ s/-(live)$//) - { - $Config->{$1} = 1; - } - else + WaitForSession($TA); + if ($SleepAfterBoot) { - last; + Debug(Elapsed($Start), " Sleeping ${SleepAfterBoot}s for the $Config->{snapshot} snapshot\n"); + LogMsg "Letting $VMKey settle down for the $Config->{snapshot} snapshot\n"; + sleep($SleepAfterBoot); } } -} - -sub CreateSnapshot($$) -{ - my ($Domain, $SnapshotName) = @_; - - if ($SleepAfterBoot != 0) - { - Debug(Elapsed($Start), " Sleeping ${SleepAfterBoot}s for the $SnapshotName snapshot\n"); - LogMsg "Letting $VMKey settle down for the $SnapshotName snapshot\n"; - sleep($SleepAfterBoot); - } + CheckBootCount($TA); - Debug(Elapsed($Start), " Creating the $SnapshotName snapshot\n"); - my $ErrMessage = $Domain->CreateSnapshot($SnapshotName); + $TA->Disconnect(); # disconnect before taking the snapshot + Debug(Elapsed($Start), " Creating the $Config->{snapshot} snapshot\n"); + my $ErrMessage = $Domain->CreateSnapshot($Config->{snapshot}); if (defined $ErrMessage) { - FatalError("Could not recreate the $SnapshotName snapshot on $VMKey: $ErrMessage\n"); + FatalError("Could not create the $Config->{snapshot} snapshot on $VMKey: $ErrMessage\n"); } } @@ -613,13 +661,17 @@ sub Revert() return 1; } $CurrentStatus = "reverting"; - my $Config = { base => $VM->IdleSnapshot }; + my $Config = { + base => $VM->IdleSnapshot, + snapshot => $VM->IdleSnapshot, + }; my $Domain = $VM->GetDomain(); if (!$Domain->HasSnapshot($Config->{base})) { $Config->{create} = 1; GetSnapshotConfig($Config); + Debug(join(" ", Elapsed($Start), "Config:", map { "$_=$Config->{$_}" } sort keys %$Config), "\n"); if ($Config->{locale} and $VM->Type !~ /^win(?:32|64)$/) { FatalError("Creating locale snapshots ($Config->{locale}) is not supported for ". $VM->Type ." VMs ($VMKey)\n"); @@ -655,8 +707,8 @@ sub Revert() if (defined $ErrMessage) { # Libvirt/QEmu is buggy and cannot revert a running VM from one hardware - # configuration to another. So try again after powering off the VM, though - # this can be much slower. + # configuration to another. So try again after forcefully powering off + # the VM, though this can be much slower. Debug(Elapsed($Start), " Powering off the VM\n"); $ErrMessage = $Domain->PowerOff(); if (defined $ErrMessage) @@ -672,33 +724,22 @@ sub Revert() FatalError("Could not revert $VMKey to $Config->{base}: $ErrMessage\n"); } - # Mark the VM as sleeping which allows the scheduler to abort the revert in - # favor of higher priority tasks. But don't allow interruptions in the - # middle of snapshot creation! if (!$Config->{create}) { + # Mark the VM as sleeping which allows the scheduler to abort the revert in + # favor of higher priority tasks. But don't allow interruptions in the + # middle of snapshot creation! return 1 if (ChangeStatus("reverting", "sleeping")); } - # Set up the TestAgent server. Note that setting the locale will require a - # reboot so reset start.count in that case. - SetupTestAgentd($Booting, $Config->{create}, $Config->{locale}); - - # Set up the VM locale - if ($Config->{locale}) - { - Debug(Elapsed($Start), " Setting up the $Config->{locale} locale on $VMKey\n"); - my @Cmd = ("$BinDir/SetWinLocale", $VM->Hostname, "--default", $Config->{locale}); - push @Cmd, "--debug" if ($Debug); - if (system(@Cmd)) - { - FatalError("Could not set the $VMKey locale to $Config->{locale}\n"); - } - } + my $TA = $VM->GetAgent(); + WaitForBoot($TA) if ($Booting); + PrepareVM($TA); if ($Config->{create}) { - CreateSnapshot($Domain, $VM->IdleSnapshot); + CreateSnapshot($Domain, $TA, $Config, $Booting); + $Booting = 0; if ($VM->Type eq "build" or $VM->Type eq "wine") { @@ -721,15 +762,16 @@ sub Revert() # The activity monitor does not like it when VMs skip the sleeping step return 1 if (ChangeStatus("reverting", "sleeping")); } - else - { - my $Sleep = ($Booting and $SleepAfterBoot > $SleepAfterRevert) ? - $SleepAfterBoot : $SleepAfterRevert; - Debug(Elapsed($Start), " Sleeping ${Sleep}s\n"); - LogMsg "Letting $VMKey settle down for ${Sleep}s\n"; - sleep($Sleep); - } + WaitForSession($TA) if ($Booting); + + my $Sleep = ($Booting and $SleepAfterBoot > $SleepAfterRevert) ? + $SleepAfterBoot : $SleepAfterRevert; + Debug(Elapsed($Start), " Sleeping ${Sleep}s\n"); + LogMsg "Letting $VMKey settle down for ${Sleep}s\n"; + sleep($Sleep); + + CheckBootCount($TA); return ChangeStatus($CurrentStatus, "idle", "done"); } -- 2.30.2

1 1

[tools] testbot/SetWinLocale: Simplify sending the Powershell script.
by Francois Gouget Feb. 16, 2022

Feb. 16, 2022

Converting the line endings to CR+LF is not needed. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- Also it's a Powershell script, not a batch file. testbot/bin/SetWinLocale | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/testbot/bin/SetWinLocale b/testbot/bin/SetWinLocale index 29b57b30f8..94e2f49404 100755 --- a/testbot/bin/SetWinLocale +++ b/testbot/bin/SetWinLocale @@ -663,20 +663,9 @@ sub RegGetValue($;$) # Show the host's locale settings # -if (open(my $fh, "<", "$0.ps1")) +if (!$TA->SendFile("$0.ps1", "$name0.ps1", 0)) { - my $Script = join("", <$fh>); - close($fh); - - $Script =~ s~\n~\r\n~g; - if (!$TA->SendFileFromString($Script, "$name0.ps1", 0)) - { - FatalError("could not send the batch file:", $TA->GetLastError(), "\n"); - } -} -else -{ - FatalError("could not open '$0.ps1' for reading: $!\n"); + FatalError("could not send the Powershell script:", $TA->GetLastError(), "\n"); } sub GetWinSettings() -- 2.30.2

1 0

[PATCH 01/24] dlls/msacm32: enable compilation with long types
by Eric Pouech Feb. 16, 2022

Feb. 16, 2022

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/msacm32/Makefile.in | 1 - dlls/msacm32/driver.c | 26 +++++++++++++------------- dlls/msacm32/filter.c | 12 ++++++------ dlls/msacm32/format.c | 26 +++++++++++++------------- dlls/msacm32/internal.c | 14 +++++++------- dlls/msacm32/msacm32_main.c | 4 ++-- dlls/msacm32/pcmconverter.c | 24 ++++++++++++------------ dlls/msacm32/stream.c | 24 ++++++++++++------------ 8 files changed, 65 insertions(+), 66 deletions(-) diff --git a/dlls/msacm32/Makefile.in b/dlls/msacm32/Makefile.in index a6da7428749..be2136d78f7 100644 --- a/dlls/msacm32/Makefile.in +++ b/dlls/msacm32/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = msacm32.dll IMPORTLIB = msacm32 IMPORTS = winmm user32 advapi32 diff --git a/dlls/msacm32/driver.c b/dlls/msacm32/driver.c index 036461800b1..c01872d636a 100644 --- a/dlls/msacm32/driver.c +++ b/dlls/msacm32/driver.c @@ -49,7 +49,7 @@ MMRESULT WINAPI acmDriverAddA(PHACMDRIVERID phadid, HINSTANCE hinstModule, WCHAR * driverW = NULL; LPARAM lParamW = lParam; - TRACE("(%p, %p, %08lx, %08x, %08x)\n", + TRACE("(%p, %p, %08Ix, %08lx, %08lx)\n", phadid, hinstModule, lParam, dwPriority, fdwAdd); if (!phadid) { @@ -98,7 +98,7 @@ MMRESULT WINAPI acmDriverAddW(PHACMDRIVERID phadid, HINSTANCE hinstModule, { PWINE_ACMLOCALDRIVER pLocalDrv = NULL; - TRACE("(%p, %p, %08lx, %08x, %08x)\n", + TRACE("(%p, %p, %08Ix, %08lx, %08lx)\n", phadid, hinstModule, lParam, dwPriority, fdwAdd); if (!phadid) { @@ -165,7 +165,7 @@ MMRESULT WINAPI acmDriverAddW(PHACMDRIVERID phadid, HINSTANCE hinstModule, } break; default: - ERR("invalid flag value 0x%08x for fdwAdd\n", fdwAdd); + ERR("invalid flag value 0x%08lx for fdwAdd\n", fdwAdd); return MMSYSERR_INVALFLAG; } @@ -182,7 +182,7 @@ MMRESULT WINAPI acmDriverClose(HACMDRIVER had, DWORD fdwClose) PWINE_ACMDRIVERID padid; PWINE_ACMDRIVER* tpad; - TRACE("(%p, %08x)\n", had, fdwClose); + TRACE("(%p, %08lx)\n", had, fdwClose); if (fdwClose) { WARN("invalid flag\n"); @@ -225,7 +225,7 @@ MMRESULT WINAPI acmDriverDetailsA(HACMDRIVERID hadid, PACMDRIVERDETAILSA padd, D MMRESULT mmr; ACMDRIVERDETAILSW addw; - TRACE("(%p, %p, %08x)\n", hadid, padd, fdwDetails); + TRACE("(%p, %p, %08lx)\n", hadid, padd, fdwDetails); if (!padd) { WARN("invalid parameter\n"); @@ -276,7 +276,7 @@ MMRESULT WINAPI acmDriverDetailsW(HACMDRIVERID hadid, PACMDRIVERDETAILSW padd, D HACMDRIVER acmDrvr; MMRESULT mmr; - TRACE("(%p, %p, %08x)\n", hadid, padd, fdwDetails); + TRACE("(%p, %p, %08lx)\n", hadid, padd, fdwDetails); if (!padd) { WARN("invalid parameter\n"); @@ -318,7 +318,7 @@ MMRESULT WINAPI acmDriverEnum(ACMDRIVERENUMCB fnCallback, DWORD_PTR dwInstance, PWINE_ACMDRIVERID padid; DWORD fdwSupport; - TRACE("(%p, %08lx, %08x)\n", fnCallback, dwInstance, fdwEnum); + TRACE("(%p, %08Ix, %08lx)\n", fnCallback, dwInstance, fdwEnum); if (!fnCallback) { WARN("invalid parameter\n"); @@ -353,7 +353,7 @@ MMRESULT WINAPI acmDriverID(HACMOBJ hao, PHACMDRIVERID phadid, DWORD fdwDriverID { PWINE_ACMOBJ pao; - TRACE("(%p, %p, %08x)\n", hao, phadid, fdwDriverID); + TRACE("(%p, %p, %08lx)\n", hao, phadid, fdwDriverID); if (fdwDriverID) { WARN("invalid flag\n"); @@ -391,7 +391,7 @@ MMRESULT WINAPI acmDriverID(HACMOBJ hao, PHACMDRIVERID phadid, DWORD fdwDriverID */ LRESULT WINAPI acmDriverMessage(HACMDRIVER had, UINT uMsg, LPARAM lParam1, LPARAM lParam2) { - TRACE("(%p, %04x, %08lx, %08lx\n", had, uMsg, lParam1, lParam2); + TRACE("(%p, %04x, %08Ix, %08Ix\n", had, uMsg, lParam1, lParam2); if ((uMsg >= ACMDM_USER && uMsg < ACMDM_RESERVED_LOW) || uMsg == ACMDM_DRIVER_ABOUT || @@ -492,7 +492,7 @@ MMRESULT WINAPI acmDriverOpen(PHACMDRIVER phad, HACMDRIVERID hadid, DWORD fdwOpe PWINE_ACMDRIVER pad = NULL; MMRESULT ret; - TRACE("(%p, %p, %08u)\n", phad, hadid, fdwOpen); + TRACE("(%p, %p, %08lu)\n", phad, hadid, fdwOpen); if (!phad) { WARN("invalid parameter\n"); @@ -605,7 +605,7 @@ MMRESULT WINAPI acmDriverOpen(PHACMDRIVER phad, HACMDRIVERID hadid, DWORD fdwOpe MMRESULT WINAPI acmDriverPriority(HACMDRIVERID hadid, DWORD dwPriority, DWORD fdwPriority) { - TRACE("(%p, %08x, %08x)\n", hadid, dwPriority, fdwPriority); + TRACE("(%p, %08lx, %08lx)\n", hadid, dwPriority, fdwPriority); /* Check for unknown flags */ if (fdwPriority & @@ -679,7 +679,7 @@ MMRESULT WINAPI acmDriverPriority(HACMDRIVERID hadid, DWORD dwPriority, DWORD fd return MMSYSERR_NOTSUPPORTED; } if (dwPriority != 1 && dwPriority != (DWORD)-1) { - FIXME("unexpected priority %d, using sign only\n", dwPriority); + FIXME("unexpected priority %ld, using sign only\n", dwPriority); if ((signed)dwPriority < 0) dwPriority = (DWORD)-1; if (dwPriority > 0) dwPriority = 1; } @@ -746,7 +746,7 @@ MMRESULT WINAPI acmDriverRemove(HACMDRIVERID hadid, DWORD fdwRemove) PWINE_ACMDRIVERID padid; PWINE_ACMNOTIFYWND panwnd; - TRACE("(%p, %08x)\n", hadid, fdwRemove); + TRACE("(%p, %08lx)\n", hadid, fdwRemove); padid = MSACM_GetDriverID(hadid); panwnd = MSACM_GetNotifyWnd(hadid); diff --git a/dlls/msacm32/filter.c b/dlls/msacm32/filter.c index 8d5abced9d9..bacb9c0abcf 100644 --- a/dlls/msacm32/filter.c +++ b/dlls/msacm32/filter.c @@ -91,7 +91,7 @@ MMRESULT WINAPI acmFilterDetailsW(HACMDRIVER had, PACMFILTERDETAILSW pafd, MMRESULT mmr; ACMFILTERTAGDETAILSA aftd; - TRACE("(%p, %p, %d)\n", had, pafd, fdwDetails); + TRACE("(%p, %p, %ld)\n", had, pafd, fdwDetails); memset(&aftd, 0, sizeof(aftd)); aftd.cbStruct = sizeof(aftd); @@ -127,7 +127,7 @@ MMRESULT WINAPI acmFilterDetailsW(HACMDRIVER had, PACMFILTERDETAILSW pafd, mmr = MSACM_Message(had, ACMDM_FILTER_DETAILS, (LPARAM)pafd, fdwDetails); break; default: - WARN("Unknown fdwDetails %08x\n", fdwDetails); + WARN("Unknown fdwDetails %08lx\n", fdwDetails); mmr = MMSYSERR_INVALFLAG; break; } @@ -228,7 +228,7 @@ MMRESULT WINAPI acmFilterEnumW(HACMDRIVER had, PACMFILTERDETAILSW pafd, PWINE_ACMDRIVERID padid; BOOL ret; - TRACE("(%p, %p, %p, %ld, %d)\n", + TRACE("(%p, %p, %p, %Id, %ld)\n", had, pafd, fnCallback, dwInstance, fdwEnum); if (pafd->cbStruct < sizeof(*pafd)) return MMSYSERR_INVALPARAM; @@ -294,7 +294,7 @@ MMRESULT WINAPI acmFilterTagDetailsW(HACMDRIVER had, PACMFILTERTAGDETAILSW paftd PWINE_ACMDRIVERID padid; MMRESULT mmr; - TRACE("(%p, %p, %d)\n", had, paftd, fdwDetails); + TRACE("(%p, %p, %ld)\n", had, paftd, fdwDetails); if (fdwDetails & ~(ACM_FILTERTAGDETAILSF_FILTERTAG|ACM_FILTERTAGDETAILSF_INDEX| ACM_FILTERTAGDETAILSF_LARGESTSIZE)) @@ -355,7 +355,7 @@ MMRESULT WINAPI acmFilterTagDetailsW(HACMDRIVER had, PACMFILTERTAGDETAILSW paftd break; default: - WARN("Unsupported fdwDetails=%08x\n", fdwDetails); + WARN("Unsupported fdwDetails=%08lx\n", fdwDetails); mmr = MMSYSERR_ERROR; } @@ -427,7 +427,7 @@ MMRESULT WINAPI acmFilterTagEnumW(HACMDRIVER had, PACMFILTERTAGDETAILSW paftd, PWINE_ACMDRIVERID padid; unsigned int i; - TRACE("(%p, %p, %p, %ld, %d)\n", + TRACE("(%p, %p, %p, %Id, %ld)\n", had, paftd, fnCallback, dwInstance, fdwEnum); if (paftd->cbStruct < sizeof(*paftd)) return MMSYSERR_INVALPARAM; diff --git a/dlls/msacm32/format.c b/dlls/msacm32/format.c index 536fa42e767..6aab538fffb 100644 --- a/dlls/msacm32/format.c +++ b/dlls/msacm32/format.c @@ -217,7 +217,7 @@ static INT_PTR CALLBACK FormatChooseDlgProc(HWND hWnd, UINT msg, { ACMFORMATCHOOSEW *afc = (ACMFORMATCHOOSEW *)GetPropW(hWnd, L"acmprop"); - TRACE("hwnd=%p msg=%i 0x%08lx 0x%08lx\n", hWnd, msg, wParam, lParam); + TRACE("hwnd=%p msg=%i 0x%08Ix 0x%08Ix\n", hWnd, msg, wParam, lParam); switch (msg) { case WM_INITDIALOG: @@ -230,7 +230,7 @@ static INT_PTR CALLBACK FormatChooseDlgProc(HWND hWnd, UINT msg, ACMFORMATCHOOSE_STYLEF_INITTOWFXSTRUCT| ACMFORMATCHOOSE_STYLEF_ENABLETEMPLATEHANDLE| ACMFORMATCHOOSE_STYLEF_ENABLETEMPLATE)) != 0) - FIXME("Unsupported style %08x\n", afc->fdwStyle); + FIXME("Unsupported style %08lx\n", afc->fdwStyle); if (!(afc->fdwStyle & ACMFORMATCHOOSE_STYLEF_SHOWHELP)) ShowWindow(GetDlgItem(hWnd, IDD_ACMFORMATCHOOSE_BTN_HELP), SW_HIDE); return TRUE; @@ -249,7 +249,7 @@ static INT_PTR CALLBACK FormatChooseDlgProc(HWND hWnd, UINT msg, MSACM_FillFormat(hWnd, afc); break; default: - TRACE("Dropped dlgNotif (fmtTag): 0x%08x 0x%08lx\n", + TRACE("Dropped dlgNotif (fmtTag): 0x%08x 0x%08Ix\n", HIWORD(wParam), lParam); break; } @@ -261,7 +261,7 @@ static INT_PTR CALLBACK FormatChooseDlgProc(HWND hWnd, UINT msg, break; default: - TRACE("Dropped dlgCmd: ctl=%d ntf=0x%04x 0x%08lx\n", + TRACE("Dropped dlgCmd: ctl=%d ntf=0x%04x 0x%08Ix\n", LOWORD(wParam), HIWORD(wParam), lParam); break; } @@ -281,7 +281,7 @@ static INT_PTR CALLBACK FormatChooseDlgProc(HWND hWnd, UINT msg, break; #endif default: - TRACE("Dropped dlgMsg: hwnd=%p msg=%i 0x%08lx 0x%08lx\n", + TRACE("Dropped dlgMsg: hwnd=%p msg=%i 0x%08Ix 0x%08Ix\n", hWnd, msg, wParam, lParam ); break; } @@ -430,7 +430,7 @@ MMRESULT WINAPI acmFormatDetailsW(HACMDRIVER had, PACMFORMATDETAILSW pafd, DWORD MMRESULT mmr; ACMFORMATTAGDETAILSW aftd = {0}; - TRACE("(%p, %p, %d)\n", had, pafd, fdwDetails); + TRACE("(%p, %p, %ld)\n", had, pafd, fdwDetails); if (!pafd) return MMSYSERR_INVALPARAM; @@ -486,7 +486,7 @@ MMRESULT WINAPI acmFormatDetailsW(HACMDRIVER had, PACMFORMATDETAILSW pafd, DWORD mmr = MSACM_Message(had, ACMDM_FORMAT_DETAILS, (LPARAM)pafd, fdwDetails); break; default: - WARN("Unknown fdwDetails %08x\n", fdwDetails); + WARN("Unknown fdwDetails %08lx\n", fdwDetails); mmr = MMSYSERR_INVALFLAG; break; } @@ -673,7 +673,7 @@ MMRESULT WINAPI acmFormatEnumW(HACMDRIVER had, PACMFORMATDETAILSW pafd, DWORD cbwfxMax; MMRESULT mmr; - TRACE("(%p, %p, %p, %ld, %d)\n", + TRACE("(%p, %p, %p, %Id, %ld)\n", had, pafd, fnCallback, dwInstance, fdwEnum); if (!pafd) @@ -705,7 +705,7 @@ MMRESULT WINAPI acmFormatEnumW(HACMDRIVER had, PACMFORMATDETAILSW pafd, return MMSYSERR_INVALPARAM; if (fdwEnum & (ACM_FORMATENUMF_CONVERT|ACM_FORMATENUMF_INPUT|ACM_FORMATENUMF_OUTPUT)) - FIXME("Unsupported fdwEnum values %08x\n", fdwEnum); + FIXME("Unsupported fdwEnum values %08lx\n", fdwEnum); mmr = acmMetrics((HACMOBJ)had, ACM_METRIC_MAX_SIZE_FORMAT, &cbwfxMax); if (mmr != MMSYSERR_NOERROR) @@ -745,7 +745,7 @@ MMRESULT WINAPI acmFormatSuggest(HACMDRIVER had, PWAVEFORMATEX pwfxSrc, ACMDRVFORMATSUGGEST adfg; MMRESULT mmr; - TRACE("(%p, %p, %p, %d, %d)\n", + TRACE("(%p, %p, %p, %ld, %ld)\n", had, pwfxSrc, pwfxDst, cbwfxDst, fdwSuggest); if (!pwfxSrc || !pwfxDst) @@ -850,7 +850,7 @@ MMRESULT WINAPI acmFormatTagDetailsW(HACMDRIVER had, PACMFORMATTAGDETAILSW paftd PWINE_ACMDRIVERID padid; MMRESULT mmr = ACMERR_NOTPOSSIBLE; - TRACE("(%p, %p, %d)\n", had, paftd, fdwDetails); + TRACE("(%p, %p, %ld)\n", had, paftd, fdwDetails); if (fdwDetails & ~(ACM_FORMATTAGDETAILSF_FORMATTAG|ACM_FORMATTAGDETAILSF_INDEX| ACM_FORMATTAGDETAILSF_LARGESTSIZE)) @@ -917,7 +917,7 @@ MMRESULT WINAPI acmFormatTagDetailsW(HACMDRIVER had, PACMFORMATTAGDETAILSW paftd break; default: - WARN("Unsupported fdwDetails=%08x\n", fdwDetails); + WARN("Unsupported fdwDetails=%08lx\n", fdwDetails); mmr = MMSYSERR_ERROR; } @@ -999,7 +999,7 @@ MMRESULT WINAPI acmFormatTagEnumW(HACMDRIVER had, PACMFORMATTAGDETAILSW paftd, unsigned int i; BOOL bPcmDone = FALSE; - TRACE("(%p, %p, %p, %ld, %d)\n", + TRACE("(%p, %p, %p, %Id, %ld)\n", had, paftd, fnCallback, dwInstance, fdwEnum); if (!paftd) diff --git a/dlls/msacm32/internal.c b/dlls/msacm32/internal.c index e83f1f5c215..7c2d3b5bf9e 100644 --- a/dlls/msacm32/internal.c +++ b/dlls/msacm32/internal.c @@ -74,12 +74,12 @@ PWINE_ACMDRIVERID MSACM_RegisterDriverFromRegistry(LPCWSTR pszRegEntry) if (0 == wcsnicmp(pszRegEntry, msacmW, ARRAY_SIZE(msacmW))) { lRet = RegOpenKeyExW(HKEY_LOCAL_MACHINE, drvkey, 0, KEY_QUERY_VALUE, &hKey); if (lRet != ERROR_SUCCESS) { - WARN("unable to open registry key - 0x%08x\n", lRet); + WARN("unable to open registry key - 0x%08lx\n", lRet); } else { bufLen = sizeof(buf); lRet = RegQueryValueExW(hKey, pszRegEntry, NULL, NULL, (LPBYTE)buf, &bufLen); if (lRet != ERROR_SUCCESS) { - WARN("unable to query requested subkey %s - 0x%08x\n", debugstr_w(pszRegEntry), lRet); + WARN("unable to query requested subkey %s - 0x%08lx\n", debugstr_w(pszRegEntry), lRet); } else { MSACM_RegisterDriver(pszRegEntry, buf, 0); } @@ -403,7 +403,7 @@ PWINE_ACMNOTIFYWND MSACM_RegisterNotificationWindow(HWND hNotifyWnd, DWORD dwNot { PWINE_ACMNOTIFYWND panwnd; - TRACE("(%p,0x%08x)\n", hNotifyWnd, dwNotifyMsg); + TRACE("(%p,0x%08lx)\n", hNotifyWnd, dwNotifyMsg); panwnd = HeapAlloc(MSACM_hHeap, 0, sizeof(WINE_ACMNOTIFYWND)); panwnd->obj.dwType = WINE_ACMOBJ_NOTIFYWND; @@ -654,13 +654,13 @@ void MSACM_WriteCurrentPriorities(void) /* Delete ACM priority key and create it anew */ lError = RegDeleteKeyW(HKEY_CURRENT_USER, basePriorityKey); if (lError != ERROR_SUCCESS && lError != ERROR_FILE_NOT_FOUND) { - ERR("unable to remove current key %s (0x%08x) - priority changes won't persist past application end.\n", + ERR("unable to remove current key %s (0x%08lx) - priority changes won't persist past application end.\n", debugstr_w(basePriorityKey), lError); return; } lError = RegCreateKeyW(HKEY_CURRENT_USER, basePriorityKey, &hPriorityKey); if (lError != ERROR_SUCCESS) { - ERR("unable to create key %s (0x%08x) - priority changes won't persist past application end.\n", + ERR("unable to create key %s (0x%08lx) - priority changes won't persist past application end.\n", debugstr_w(basePriorityKey), lError); return; } @@ -680,7 +680,7 @@ void MSACM_WriteCurrentPriorities(void) lError = RegSetValueExW(hPriorityKey, szSubKey, 0, REG_SZ, (BYTE *)szBuffer, (lstrlenW(szBuffer) + 1) * sizeof(WCHAR)); if (lError != ERROR_SUCCESS) { - ERR("unable to write value for %s under key %s (0x%08x)\n", + ERR("unable to write value for %s under key %s (0x%08lx)\n", debugstr_w(padid->pszDriverAlias), debugstr_w(basePriorityKey), lError); } } @@ -694,7 +694,7 @@ void MSACM_WriteCurrentPriorities(void) lError = RegSetValueExW(hPriorityKey, szSubKey, 0, REG_SZ, (BYTE *)szBuffer, (lstrlenW(szBuffer) + 1) * sizeof(WCHAR)); if (lError != ERROR_SUCCESS) { - ERR("unable to write value for Internal PCM Converter under key %s (0x%08x)\n", + ERR("unable to write value for Internal PCM Converter under key %s (0x%08lx)\n", debugstr_w(basePriorityKey), lError); } RegCloseKey(hPriorityKey); diff --git a/dlls/msacm32/msacm32_main.c b/dlls/msacm32/msacm32_main.c index efe58af309a..ad33c88d85a 100644 --- a/dlls/msacm32/msacm32_main.c +++ b/dlls/msacm32/msacm32_main.c @@ -44,7 +44,7 @@ HINSTANCE MSACM_hInstance32 = 0; */ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpvReserved) { - TRACE("%p 0x%x %p\n", hInstDLL, fdwReason, lpvReserved); + TRACE("%p 0x%lx %p\n", hInstDLL, fdwReason, lpvReserved); switch (fdwReason) { case DLL_PROCESS_ATTACH: @@ -87,7 +87,7 @@ DWORD WINAPI acmGetVersion(void) case VER_PLATFORM_WIN32s: return 0x02010000; /* 2.1 */ default: - FIXME("%x not supported\n", version.dwPlatformId); + FIXME("%lx not supported\n", version.dwPlatformId); /* fall through */ case VER_PLATFORM_WIN32_WINDOWS: return 0x04030000; /* 4.3.0 */ diff --git a/dlls/msacm32/pcmconverter.c b/dlls/msacm32/pcmconverter.c index d528a6d35fb..0b9724ba5e1 100644 --- a/dlls/msacm32/pcmconverter.c +++ b/dlls/msacm32/pcmconverter.c @@ -65,7 +65,7 @@ static DWORD PCM_drvOpen(LPCSTR str, PACMDRVOPENDESCW adod) */ static DWORD PCM_drvClose(DWORD dwDevID) { - TRACE("(%d)\n", dwDevID); + TRACE("(%ld)\n", dwDevID); return 1; } @@ -1001,7 +1001,7 @@ static LRESULT PCM_DriverDetails(PACMDRIVERDETAILSW add) */ static LRESULT PCM_FormatTagDetails(PACMFORMATTAGDETAILSW aftd, DWORD dwQuery) { - TRACE("(%p, %08x)\n", aftd, dwQuery); + TRACE("(%p, %08lx)\n", aftd, dwQuery); switch (dwQuery) { case ACM_FORMATTAGDETAILSF_INDEX: @@ -1024,7 +1024,7 @@ static LRESULT PCM_FormatTagDetails(PACMFORMATTAGDETAILSW aftd, DWORD dwQuery) } break; default: - WARN("Unsupported query %08x\n", dwQuery); + WARN("Unsupported query %08lx\n", dwQuery); return MMSYSERR_NOTSUPPORTED; } @@ -1044,7 +1044,7 @@ static LRESULT PCM_FormatTagDetails(PACMFORMATTAGDETAILSW aftd, DWORD dwQuery) */ static LRESULT PCM_FormatDetails(PACMFORMATDETAILSW afd, DWORD dwQuery) { - TRACE("(%p, %08x)\n", afd, dwQuery); + TRACE("(%p, %08lx)\n", afd, dwQuery); switch (dwQuery) { case ACM_FORMATDETAILSF_FORMAT: @@ -1068,7 +1068,7 @@ static LRESULT PCM_FormatDetails(PACMFORMATDETAILSW afd, DWORD dwQuery) afd->pwfx->nSamplesPerSec * afd->pwfx->nBlockAlign; break; default: - WARN("Unsupported query %08x\n", dwQuery); + WARN("Unsupported query %08lx\n", dwQuery); return MMSYSERR_NOTSUPPORTED; } @@ -1260,7 +1260,7 @@ static LRESULT PCM_StreamSize(PACMDRVSTREAMINSTANCE adsi, PACMDRVSTREAMSIZE adss adsi->pwfxSrc->nAvgBytesPerSec) & dstMask; break; default: - WARN("Unsupported query %08x\n", adss->fdwSize); + WARN("Unsupported query %08lx\n", adss->fdwSize); return MMSYSERR_NOTSUPPORTED; } return MMSYSERR_NOERROR; @@ -1278,12 +1278,12 @@ static LRESULT PCM_StreamConvert(PACMDRVSTREAMINSTANCE adsi, PACMDRVSTREAMHEADER TRACE("(%p, %p)\n", adsi, adsh); - TRACE("nsrc=%d,adsh->cbSrcLength=%d\n", nsrc, adsh->cbSrcLength); - TRACE("ndst=%d,adsh->cbDstLength=%d\n", ndst, adsh->cbDstLength); - TRACE("src [wFormatTag=%u, nChannels=%u, nSamplesPerSec=%u, nAvgBytesPerSec=%u, nBlockAlign=%u, wBitsPerSample=%u, cbSize=%u]\n", + TRACE("nsrc=%ld,adsh->cbSrcLength=%ld\n", nsrc, adsh->cbSrcLength); + TRACE("ndst=%ld,adsh->cbDstLength=%ld\n", ndst, adsh->cbDstLength); + TRACE("src [wFormatTag=%u, nChannels=%u, nSamplesPerSec=%lu, nAvgBytesPerSec=%lu, nBlockAlign=%u, wBitsPerSample=%u, cbSize=%u]\n", adsi->pwfxSrc->wFormatTag, adsi->pwfxSrc->nChannels, adsi->pwfxSrc->nSamplesPerSec, adsi->pwfxSrc->nAvgBytesPerSec, adsi->pwfxSrc->nBlockAlign, adsi->pwfxSrc->wBitsPerSample, adsi->pwfxSrc->cbSize); - TRACE("dst [wFormatTag=%u, nChannels=%u, nSamplesPerSec=%u, nAvgBytesPerSec=%u, nBlockAlign=%u, wBitsPerSample=%u, cbSize=%u]\n", + TRACE("dst [wFormatTag=%u, nChannels=%u, nSamplesPerSec=%lu, nAvgBytesPerSec=%lu, nBlockAlign=%u, wBitsPerSample=%u, cbSize=%u]\n", adsi->pwfxDst->wFormatTag, adsi->pwfxDst->nChannels, adsi->pwfxDst->nSamplesPerSec, adsi->pwfxDst->nAvgBytesPerSec, adsi->pwfxDst->nBlockAlign, adsi->pwfxDst->wBitsPerSample, adsi->pwfxDst->cbSize); @@ -1291,7 +1291,7 @@ static LRESULT PCM_StreamConvert(PACMDRVSTREAMINSTANCE adsi, PACMDRVSTREAMHEADER ~(ACM_STREAMCONVERTF_BLOCKALIGN| ACM_STREAMCONVERTF_END| ACM_STREAMCONVERTF_START)) { - FIXME("Unsupported fdwConvert (%08x), ignoring it\n", adsh->fdwConvert); + FIXME("Unsupported fdwConvert (%08lx), ignoring it\n", adsh->fdwConvert); } /* ACM_STREAMCONVERTF_BLOCKALIGN * currently all conversions are block aligned, so do nothing for this flag @@ -1325,7 +1325,7 @@ static LRESULT PCM_StreamConvert(PACMDRVSTREAMINSTANCE adsi, PACMDRVSTREAMHEADER LRESULT CALLBACK PCM_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, LPARAM dwParam1, LPARAM dwParam2) { - TRACE("(%08lx %p %u %08lx %08lx);\n", + TRACE("(%08Ix %p %u %08Ix %08Ix);\n", dwDevID, hDriv, wMsg, dwParam1, dwParam2); switch (wMsg) { diff --git a/dlls/msacm32/stream.c b/dlls/msacm32/stream.c index e06503abfe4..1fcd2e39066 100644 --- a/dlls/msacm32/stream.c +++ b/dlls/msacm32/stream.c @@ -67,7 +67,7 @@ MMRESULT WINAPI acmStreamClose(HACMSTREAM has, DWORD fdwClose) PWINE_ACMSTREAM was; MMRESULT ret; - TRACE("(%p, %d)\n", has, fdwClose); + TRACE("(%p, %ld)\n", has, fdwClose); if ((was = ACM_GetStream(has)) == NULL) { WARN("invalid handle\n"); @@ -93,7 +93,7 @@ MMRESULT WINAPI acmStreamConvert(HACMSTREAM has, PACMSTREAMHEADER pash, MMRESULT ret = MMSYSERR_NOERROR; PACMDRVSTREAMHEADER padsh; - TRACE("(%p, %p, %d)\n", has, pash, fdwConvert); + TRACE("(%p, %p, %ld)\n", has, pash, fdwConvert); if ((was = ACM_GetStream(has)) == NULL) { WARN("invalid handle\n"); @@ -138,7 +138,7 @@ MMRESULT WINAPI acmStreamConvert(HACMSTREAM has, PACMSTREAMHEADER pash, MMRESULT WINAPI acmStreamMessage(HACMSTREAM has, UINT uMsg, LPARAM lParam1, LPARAM lParam2) { - FIXME("(%p, %u, %ld, %ld): stub\n", has, uMsg, lParam1, lParam2); + FIXME("(%p, %u, %Id, %Id): stub\n", has, uMsg, lParam1, lParam2); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return MMSYSERR_ERROR; } @@ -158,7 +158,7 @@ MMRESULT WINAPI acmStreamOpen(PHACMSTREAM phas, HACMDRIVER had, int wfxDstSize; WAVEFORMATEX wfxSrc, wfxDst; - TRACE("(%p, %p, %p, %p, %p, %ld, %ld, %d)\n", + TRACE("(%p, %p, %p, %p, %p, %Id, %Id, %ld)\n", phas, had, pwfxSrc, pwfxDst, pwfltr, dwCallback, dwInstance, fdwOpen); /* NOTE: pwfxSrc and/or pwfxDst can point to a structure smaller than @@ -177,11 +177,11 @@ MMRESULT WINAPI acmStreamOpen(PHACMSTREAM phas, HACMDRIVER had, pwfxDst = &wfxDst; } - TRACE("src [wFormatTag=%u, nChannels=%u, nSamplesPerSec=%u, nAvgBytesPerSec=%u, nBlockAlign=%u, wBitsPerSample=%u, cbSize=%u]\n", + TRACE("src [wFormatTag=%u, nChannels=%u, nSamplesPerSec=%lu, nAvgBytesPerSec=%lu, nBlockAlign=%u, wBitsPerSample=%u, cbSize=%u]\n", pwfxSrc->wFormatTag, pwfxSrc->nChannels, pwfxSrc->nSamplesPerSec, pwfxSrc->nAvgBytesPerSec, pwfxSrc->nBlockAlign, pwfxSrc->wBitsPerSample, pwfxSrc->cbSize); - TRACE("dst [wFormatTag=%u, nChannels=%u, nSamplesPerSec=%u, nAvgBytesPerSec=%u, nBlockAlign=%u, wBitsPerSample=%u, cbSize=%u]\n", + TRACE("dst [wFormatTag=%u, nChannels=%u, nSamplesPerSec=%lu, nAvgBytesPerSec=%lu, nBlockAlign=%u, wBitsPerSample=%u, cbSize=%u]\n", pwfxDst->wFormatTag, pwfxDst->nChannels, pwfxDst->nSamplesPerSec, pwfxDst->nAvgBytesPerSec, pwfxDst->nBlockAlign, pwfxDst->wBitsPerSample, pwfxDst->cbSize); @@ -303,7 +303,7 @@ MMRESULT WINAPI acmStreamPrepareHeader(HACMSTREAM has, PACMSTREAMHEADER pash, MMRESULT ret = MMSYSERR_NOERROR; PACMDRVSTREAMHEADER padsh; - TRACE("(%p, %p, %d)\n", has, pash, fdwPrepare); + TRACE("(%p, %p, %ld)\n", has, pash, fdwPrepare); if ((was = ACM_GetStream(has)) == NULL) { WARN("invalid handle\n"); @@ -320,7 +320,7 @@ MMRESULT WINAPI acmStreamPrepareHeader(HACMSTREAM has, PACMSTREAMHEADER pash, if ((was->drvInst.pwfxSrc->wFormatTag == WAVE_FORMAT_ADPCM || was->drvInst.pwfxSrc->wFormatTag == WAVE_FORMAT_PCM) && pash->cbSrcLength < was->drvInst.pwfxSrc->nBlockAlign) { - WARN("source smaller than block align (%d < %d)\n", + WARN("source smaller than block align (%ld < %d)\n", pash->cbSrcLength, was->drvInst.pwfxSrc->nBlockAlign); return pash->cbSrcLength ? ACMERR_NOTPOSSIBLE : MMSYSERR_INVALPARAM; } @@ -373,7 +373,7 @@ MMRESULT WINAPI acmStreamReset(HACMSTREAM has, DWORD fdwReset) PWINE_ACMSTREAM was; MMRESULT ret = MMSYSERR_NOERROR; - TRACE("(%p, %d)\n", has, fdwReset); + TRACE("(%p, %ld)\n", has, fdwReset); if (fdwReset) { WARN("invalid flag\n"); @@ -398,7 +398,7 @@ MMRESULT WINAPI acmStreamSize(HACMSTREAM has, DWORD cbInput, ACMDRVSTREAMSIZE adss; MMRESULT ret; - TRACE("(%p, %d, %p, %d)\n", has, cbInput, pdwOutputBytes, fdwSize); + TRACE("(%p, %ld, %p, %ld)\n", has, cbInput, pdwOutputBytes, fdwSize); if ((was = ACM_GetStream(has)) == NULL) { WARN("invalid handle\n"); @@ -439,7 +439,7 @@ MMRESULT WINAPI acmStreamSize(HACMSTREAM has, DWORD cbInput, break; } } - TRACE("=> (%d) [%u]\n", ret, *pdwOutputBytes); + TRACE("=> (%d) [%lu]\n", ret, *pdwOutputBytes); return ret; } @@ -453,7 +453,7 @@ MMRESULT WINAPI acmStreamUnprepareHeader(HACMSTREAM has, PACMSTREAMHEADER pash, MMRESULT ret = MMSYSERR_NOERROR; PACMDRVSTREAMHEADER padsh; - TRACE("(%p, %p, %d)\n", has, pash, fdwUnprepare); + TRACE("(%p, %p, %ld)\n", has, pash, fdwUnprepare); if ((was = ACM_GetStream(has)) == NULL) { WARN("invalid handle\n");

4 29

User handles changes
by Jacek Caban Feb. 16, 2022

Feb. 16, 2022

Hi all, I've been recently looking at user handle handling in win32u and how it should be split from user32 (and PE world in general). In general, having something similar to how we handle gdi handles now would be nice. We're able to expose DC_ATTR struct (and possibly others in the future), allowing simple functions like an attribute getter, to avoid any syscalls, while keeping internal 'kernel' part private to win32u. Unlike gdi handles, user handles need to be really interprocess, which makes things more tricky. Having it working only for current process would not buy us much, because we'd need to expose the fallback part from win32u anyway. I also considered avoiding the problem and simply expose additional Wine-specific functions from win32u. That could work, but such differences in handles capabilities from Windows quickly add up and the number of cases where it would affect design decisions convinced me to just try to make shared memory work. We were talking about extending shared memory usage for wineserver communication anyway. I created a branch with my prototype of implementation: https://github.com/jacekcw/wine/tree/user-handles I think that this is enough to get a sense of how I think it could work. Those patches still need some work and testing, but it's close enough. It implements user handle table using shared memory that is writeable from server, but read-only for clients. Using shared memory for the handles table alone is enough to reimplement things like IsWindow() and GetWindowThreadProcessId(). Handle table entry contains three objects: - server object, not much changes here - client 'kernel' object. Using windows as an example, this is WND struct. We will want to make it private to win32u (instead of user32), but other than that its mechanism can stay mostly unchanged, except we will need to more careful to match server state closely - shared struct representing current state of the object. This replaces some fields of above types, but will also be accessible from PE code. user-handles branch reimplements GetWindowLong* on top of shared memory (mostly, it's not complete there, but remaining cases will be similar once complete). This also seems to match how it works on Windows: win32u exposes NtUserSetWindowLong, but no Get* equivalent. The getter can be lock-free because the only race it needs to worry about is if the handle was closed and memory reused (in which case we'd read a garbage). To avoid that, we simply need to recheck the handle after reading the memory. Also note that guarantees of user_section lock still hold. Although this memory is modified on server side, it's always initiated by a server call call from proper thread when SetWindowLong* holds the lock. There are some similarities to Huw's and Rémi's shared memory patches that are used in Proton, but this patchset touches different areas. user-handles branch also doesn't need locking mechanisms because thread safety is guaranteed by other means. We may need something like serial number-based synchronization when we will need a way to read multiple fields who's integrity cannot be guaranteed differently, but that doesn't seem necessary for cases that I needed so far. Anyway, I believe that those patches can be adopted to use mechanisms from my series, but the overlap is small at this point. Any feedback is appreciated. Thanks, Jacek

2 2