wine-commits February 2022

wine-commits@winehq.org

2 participants
1495 discussions

Zebediah Figura : kernelbase: Also parse hostnames for news schemes in UrlGetPart().
by Alexandre Julliard 14 Feb '22

14 Feb '22

Module: wine Branch: master Commit: 0df41c35357ba9eef4324c1f05f3e07d69ffa57b URL: https://source.winehq.org/git/wine.git/?a=commit;h=0df41c35357ba9eef4324c1f… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Feb 13 12:44:02 2022 -0600 kernelbase: Also parse hostnames for news schemes in UrlGetPart(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/path.c | 9 ++++++--- dlls/shlwapi/tests/url.c | 15 +++++++-------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index c3d3e734cf7..7d145e5198e 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -4347,12 +4347,15 @@ HRESULT WINAPI UrlGetPartW(const WCHAR *url, WCHAR *out, DWORD *out_len, DWORD p case URL_PART_HOSTNAME: switch (scheme) { + case URL_SCHEME_FILE: case URL_SCHEME_FTP: - case URL_SCHEME_HTTP: case URL_SCHEME_GOPHER: - case URL_SCHEME_TELNET: - case URL_SCHEME_FILE: + case URL_SCHEME_HTTP: case URL_SCHEME_HTTPS: + case URL_SCHEME_TELNET: + case URL_SCHEME_NEWS: + case URL_SCHEME_NNTP: + case URL_SCHEME_SNEWS: break; default: *out_len = 0; diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index 4fb4e36c3b6..6a312ecff87 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -728,11 +728,11 @@ static void test_UrlGetPart(void) {"local://hostname/", URL_PART_HOSTNAME, 0, E_FAIL}, {"mailto://hostname/", URL_PART_HOSTNAME, 0, E_FAIL}, {"mk://hostname/", URL_PART_HOSTNAME, 0, E_FAIL}, - {"news://hostname/", URL_PART_HOSTNAME, 0, S_OK, "hostname", .todo_hr = TRUE}, - {"nntp://hostname/", URL_PART_HOSTNAME, 0, S_OK, "hostname", .todo_hr = TRUE}, + {"news://hostname/", URL_PART_HOSTNAME, 0, S_OK, "hostname"}, + {"nntp://hostname/", URL_PART_HOSTNAME, 0, S_OK, "hostname"}, {"res://hostname/", URL_PART_HOSTNAME, 0, E_FAIL}, {"shell://hostname/", URL_PART_HOSTNAME, 0, E_FAIL}, - {"snews://hostname/", URL_PART_HOSTNAME, 0, S_OK, "hostname", .todo_hr = TRUE}, + {"snews://hostname/", URL_PART_HOSTNAME, 0, S_OK, "hostname"}, {"telnet://hostname/", URL_PART_HOSTNAME, 0, S_OK, "hostname"}, {"vbscript://hostname/", URL_PART_HOSTNAME, 0, E_FAIL}, {"wais://hostname/", URL_PART_HOSTNAME, 0, E_FAIL}, @@ -742,9 +742,9 @@ static void test_UrlGetPart(void) {"gopher://hostname/", URL_PART_HOSTNAME, URL_PARTFLAG_KEEPSCHEME, S_OK, "gopher:hostname"}, {"http://hostname/", URL_PART_HOSTNAME, URL_PARTFLAG_KEEPSCHEME, S_OK, "http:hostname"}, {"https://hostname/", URL_PART_HOSTNAME, URL_PARTFLAG_KEEPSCHEME, S_OK, "https:hostname"}, - {"news://hostname/", URL_PART_HOSTNAME, URL_PARTFLAG_KEEPSCHEME, S_OK, "news:hostname", .todo_hr = TRUE}, - {"nntp://hostname/", URL_PART_HOSTNAME, URL_PARTFLAG_KEEPSCHEME, S_OK, "nntp:hostname", .todo_hr = TRUE}, - {"snews://hostname/", URL_PART_HOSTNAME, URL_PARTFLAG_KEEPSCHEME, S_OK, "snews:hostname", .todo_hr = TRUE}, + {"news://hostname/", URL_PART_HOSTNAME, URL_PARTFLAG_KEEPSCHEME, S_OK, "news:hostname"}, + {"nntp://hostname/", URL_PART_HOSTNAME, URL_PARTFLAG_KEEPSCHEME, S_OK, "nntp:hostname"}, + {"snews://hostname/", URL_PART_HOSTNAME, URL_PARTFLAG_KEEPSCHEME, S_OK, "snews:hostname"}, {"telnet://hostname/", URL_PART_HOSTNAME, URL_PARTFLAG_KEEPSCHEME, S_OK, "telnet:hostname"}, }; @@ -876,8 +876,7 @@ static void test_UrlGetPart(void) { ok(size == wcslen(bufferW), "Got size %u.\n", size); MultiByteToWideChar(CP_ACP, 0, buffer, -1, expectW, ARRAY_SIZE(expectW)); - todo_wine_if (strstr(url, "news") || strstr(url, "nntp")) - ok(!wcscmp(bufferW, expectW), "Got result %s.\n", debugstr_w(bufferW)); + ok(!wcscmp(bufferW, expectW), "Got result %s.\n", debugstr_w(bufferW)); } else {

1 0

Zebediah Figura : kernelbase: Ignore URL_PARTFLAG_KEEPSCHEME for file URLs.
by Alexandre Julliard 14 Feb '22

14 Feb '22

Module: wine Branch: master Commit: 05e82ba113a4f8cc7fbb87c42ab556cd028d6eba URL: https://source.winehq.org/git/wine.git/?a=commit;h=05e82ba113a4f8cc7fbb87c4… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Feb 13 12:44:01 2022 -0600 kernelbase: Ignore URL_PARTFLAG_KEEPSCHEME for file URLs. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/path.c | 2 +- dlls/shlwapi/tests/url.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index e716351b0bc..c3d3e734cf7 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -4420,7 +4420,7 @@ HRESULT WINAPI UrlGetPartW(const WCHAR *url, WCHAR *out, DWORD *out_len, DWORD p return E_INVALIDARG; } - if (flags == URL_PARTFLAG_KEEPSCHEME) + if (flags == URL_PARTFLAG_KEEPSCHEME && scheme != URL_SCHEME_FILE) { if (!pl.scheme || !pl.scheme_len) { diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index b2b20b94b1b..4fb4e36c3b6 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -683,7 +683,7 @@ static void test_UrlGetPart(void) {"http:///index.html", URL_PART_HOSTNAME, 0, S_FALSE, ""}, {"http:///index.html", URL_PART_HOSTNAME, URL_PARTFLAG_KEEPSCHEME, S_OK, "http:", .todo_hr = TRUE}, {"file://h o s t/c:/windows/file", URL_PART_HOSTNAME, 0, S_OK, "h o s t"}, - {"file://h o s t/c:/windows/file", URL_PART_HOSTNAME, URL_PARTFLAG_KEEPSCHEME, S_OK, "h o s t", .todo_result = TRUE}, + {"file://h o s t/c:/windows/file", URL_PART_HOSTNAME, URL_PARTFLAG_KEEPSCHEME, S_OK, "h o s t"}, {"file://foo:bar@localhost:21/file?query=x", URL_PART_USERNAME, 0, E_FAIL, .todo_hr = TRUE}, {"file://foo:bar@localhost:21/file?query=x", URL_PART_PASSWORD, 0, E_FAIL, .todo_hr = TRUE}, {"file://foo:bar@localhost:21/file?query=x", URL_PART_HOSTNAME, 0, S_OK, "foo:bar@localhost:21", .todo_result = TRUE}, @@ -737,7 +737,7 @@ static void test_UrlGetPart(void) {"vbscript://hostname/", URL_PART_HOSTNAME, 0, E_FAIL}, {"wais://hostname/", URL_PART_HOSTNAME, 0, E_FAIL}, - {"file://hostname/", URL_PART_HOSTNAME, URL_PARTFLAG_KEEPSCHEME, S_OK, "hostname", .todo_result = TRUE}, + {"file://hostname/", URL_PART_HOSTNAME, URL_PARTFLAG_KEEPSCHEME, S_OK, "hostname"}, {"ftp://hostname/", URL_PART_HOSTNAME, URL_PARTFLAG_KEEPSCHEME, S_OK, "ftp:hostname"}, {"gopher://hostname/", URL_PART_HOSTNAME, URL_PARTFLAG_KEEPSCHEME, S_OK, "gopher:hostname"}, {"http://hostname/", URL_PART_HOSTNAME, URL_PARTFLAG_KEEPSCHEME, S_OK, "http:hostname"},

1 0

Zebediah Figura : kernelbase: Ignore URL_PARTFLAG_KEEPSCHEME when used with URL_PART_SCHEME or URL_PART_QUERY.
by Alexandre Julliard 14 Feb '22

14 Feb '22

Module: wine Branch: master Commit: 2db68d819183a5c90f1d00b2051e7339d7523291 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2db68d819183a5c90f1d00b2… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Feb 13 12:44:00 2022 -0600 kernelbase: Ignore URL_PARTFLAG_KEEPSCHEME when used with URL_PART_SCHEME or URL_PART_QUERY. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/path.c | 2 ++ dlls/shlwapi/tests/url.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index 15280a7ea4b..e716351b0bc 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -4334,6 +4334,7 @@ HRESULT WINAPI UrlGetPartW(const WCHAR *url, WCHAR *out, DWORD *out_len, DWORD p switch (part) { case URL_PART_SCHEME: + flags &= ~URL_PARTFLAG_KEEPSCHEME; if (!pl.scheme_len) { *out_len = 0; @@ -4404,6 +4405,7 @@ HRESULT WINAPI UrlGetPartW(const WCHAR *url, WCHAR *out, DWORD *out_len, DWORD p break; case URL_PART_QUERY: + flags &= ~URL_PARTFLAG_KEEPSCHEME; if (!pl.query_len) { *out_len = 0; diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index b4b66aec2f1..b2b20b94b1b 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -614,7 +614,7 @@ static void test_UrlGetPart(void) {"http://foo:bar@localhost:21/internal.php?query=x&return=y", URL_PART_PORT, 0, S_OK, "21"}, {"http://foo:bar@localhost:21/internal.php?query=x&return=y", URL_PART_QUERY, 0, S_OK, "query=x&return=y", .todo_result = TRUE}, {"http://foo:bar@localhost:21/internal.php#anchor", URL_PART_QUERY, 0, S_FALSE, ""}, - {"http://foo:bar@localhost:21/internal.php?query=x&return=y", URL_PART_SCHEME, URL_PARTFLAG_KEEPSCHEME, S_OK, "http", .todo_result = TRUE}, + {"http://foo:bar@localhost:21/internal.php?query=x&return=y", URL_PART_SCHEME, URL_PARTFLAG_KEEPSCHEME, S_OK, "http"}, {"http://foo:bar@localhost:21/internal.php?query=x&return=y", URL_PART_USERNAME, URL_PARTFLAG_KEEPSCHEME, S_OK, "http:foo"}, {"http://foo:bar@localhost:21/internal.php?query=x&return=y", URL_PART_PASSWORD, URL_PARTFLAG_KEEPSCHEME, S_OK, "http:bar"}, {"http://foo:bar@localhost:21/internal.php?query=x&return=y", URL_PART_HOSTNAME, URL_PARTFLAG_KEEPSCHEME, S_OK, "http:localhost"},

1 0

Zebediah Figura : kernelbase: Include the null terminator in the length passed to WideCharToMultiByte() in UrlGetPartA().
by Alexandre Julliard 14 Feb '22

14 Feb '22

Module: wine Branch: master Commit: 149b6869a26d0efd0c272566d050f392ebd3952c URL: https://source.winehq.org/git/wine.git/?a=commit;h=149b6869a26d0efd0c272566… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Feb 13 12:43:59 2022 -0600 kernelbase: Include the null terminator in the length passed to WideCharToMultiByte() in UrlGetPartA(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/path.c | 4 ++-- dlls/shlwapi/tests/url.c | 8 +++----- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index 7cfff358fdb..15280a7ea4b 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -4148,10 +4148,10 @@ HRESULT WINAPI UrlGetPartA(const char *url, char *out, DWORD *out_len, DWORD par return hr; } - len2 = WideCharToMultiByte(CP_ACP, 0, outW, len, NULL, 0, NULL, NULL); + len2 = WideCharToMultiByte(CP_ACP, 0, outW, len + 1, NULL, 0, NULL, NULL); if (len2 > *out_len) { - *out_len = len2 + 1; + *out_len = len2; heap_free(inW); return E_POINTER; } diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index 212ee039a0b..b4b66aec2f1 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -782,7 +782,7 @@ static void test_UrlGetPart(void) size = 1; strcpy(buffer, "x"); hr = UrlGetPartA(url, buffer, &size, part, flags); - todo_wine_if (tests[i].todo_hr || !strcmp(url, "http://host?a:b@c:d")) + todo_wine_if (tests[i].todo_hr) { if (tests[i].hr == S_OK) ok(hr == E_POINTER, "Got hr %#x.\n", hr); @@ -807,11 +807,9 @@ static void test_UrlGetPart(void) } else { - todo_wine_if (hr == S_OK) - ok(size == 1, "Got size %u.\n", size); + ok(size == 1, "Got size %u.\n", size); } - todo_wine_if (hr == S_OK) - ok(!strcmp(buffer, "x"), "Got result %s.\n", debugstr_a(buffer)); + ok(!strcmp(buffer, "x"), "Got result %s.\n", debugstr_a(buffer)); } size = sizeof(buffer);

1 0

Nikolay Sivov : oleaut32: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard 14 Feb '22

14 Feb '22

Module: wine Branch: master Commit: c0a131f9d9d0826e4a0aa06ff1cdea66b73e222f URL: https://source.winehq.org/git/wine.git/?a=commit;h=c0a131f9d9d0826e4a0aa06f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Feb 12 16:34:59 2022 +0300 oleaut32: Build without -DWINE_NO_LONG_TYPES. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/Makefile.in | 2 +- dlls/oleaut32/connpt.c | 120 +++----------------- dlls/oleaut32/dispatch.c | 13 ++- dlls/oleaut32/hash.c | 4 +- dlls/oleaut32/oleaut.c | 10 +- dlls/oleaut32/olefont.c | 53 +++------ dlls/oleaut32/olepicture.c | 79 +++++--------- dlls/oleaut32/olepropframe.c | 10 +- dlls/oleaut32/recinfo.c | 23 ++-- dlls/oleaut32/safearray.c | 20 ++-- dlls/oleaut32/typelib.c | 254 +++++++++++++++++++------------------------ dlls/oleaut32/usrmarshal.c | 97 +++++++++-------- dlls/oleaut32/varformat.c | 36 +++--- dlls/oleaut32/variant.c | 40 +++---- dlls/oleaut32/vartype.c | 24 ++-- 15 files changed, 312 insertions(+), 473 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c0a131f9d9d0826e4a0a…

1 0

Piotr Caban : ucrtbase/tests: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard 14 Feb '22

14 Feb '22

Module: wine Branch: master Commit: 066dba13307d866ba45d9473dffd389e2d912a3c URL: https://source.winehq.org/git/wine.git/?a=commit;h=066dba13307d866ba45d9473… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Feb 11 23:47:45 2022 +0100 ucrtbase/tests: Build without -DWINE_NO_LONG_TYPES. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ucrtbase/tests/Makefile.in | 2 +- dlls/ucrtbase/tests/misc.c | 20 ++++++++++---------- dlls/ucrtbase/tests/printf.c | 4 ++-- dlls/ucrtbase/tests/string.c | 2 +- dlls/ucrtbase/tests/thread.c | 36 ++++++++++++++++++------------------ 5 files changed, 32 insertions(+), 32 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=066dba13307d866ba45d…

1 0

Piotr Caban : msvcrt/tests: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard 14 Feb '22

14 Feb '22

Module: wine Branch: master Commit: d81afa52ec121c999922683a3292aa10a72c50a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d81afa52ec121c999922683a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Feb 11 23:41:50 2022 +0100 msvcrt/tests: Build without -DWINE_NO_LONG_TYPES. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/Makefile.in | 1 - dlls/msvcrt/tests/data.c | 10 +++++----- dlls/msvcrt/tests/file.c | 42 +++++++++++++++++++++--------------------- dlls/msvcrt/tests/locale.c | 6 +++--- dlls/msvcrt/tests/misc.c | 22 +++++++++++----------- dlls/msvcrt/tests/string.c | 26 +++++++++++++------------- dlls/msvcrt/tests/time.c | 14 +++++++------- 7 files changed, 60 insertions(+), 61 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d81afa52ec121c999922…

1 0

Piotr Caban : msvcr90/tests: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard 14 Feb '22

14 Feb '22

Module: wine Branch: master Commit: 0fc71d4440fc75c886bfc9d84450e60ba5a6b9a4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0fc71d4440fc75c886bfc9d8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Feb 11 23:41:38 2022 +0100 msvcr90/tests: Build without -DWINE_NO_LONG_TYPES. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr90/tests/Makefile.in | 1 - dlls/msvcr90/tests/msvcr90.c | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/msvcr90/tests/Makefile.in b/dlls/msvcr90/tests/Makefile.in index 9da4bd99c4f..9db8275e020 100644 --- a/dlls/msvcr90/tests/Makefile.in +++ b/dlls/msvcr90/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = msvcr90.dll C_SRCS = \ diff --git a/dlls/msvcr90/tests/msvcr90.c b/dlls/msvcr90/tests/msvcr90.c index 99b0766acb7..63a2254d187 100644 --- a/dlls/msvcr90/tests/msvcr90.c +++ b/dlls/msvcr90/tests/msvcr90.c @@ -339,7 +339,7 @@ static void __cdecl test_invalid_parameter_handler(const wchar_t *expression, ok(function == NULL, "function is not NULL\n"); ok(file == NULL, "file is not NULL\n"); ok(line == 0, "line = %u\n", line); - ok(arg == 0, "arg = %lx\n", (UINT_PTR)arg); + ok(arg == 0, "arg = %Ix\n", arg); ok(errno != 0xdeadbeef, "errno not set\n"); } @@ -353,7 +353,7 @@ static BOOL init(void) SetLastError(0xdeadbeef); hcrt = LoadLibraryA("msvcr90.dll"); if (!hcrt) { - win_skip("msvcr90.dll not installed (got %d)\n", GetLastError()); + win_skip("msvcr90.dll not installed (got %ld)\n", GetLastError()); return FALSE; } @@ -1181,7 +1181,7 @@ static void test_getptd(void) int dec, sign; void *mbcinfo, *locinfo; - ok(ptd->tid == tid, "ptd->tid = %x, expected %x\n", ptd->tid, tid); + ok(ptd->tid == tid, "ptd->tid = %lx, expected %lx\n", ptd->tid, tid); ok(ptd->handle == INVALID_HANDLE_VALUE, "ptd->handle = %p\n", ptd->handle); ok(p_errno() == &ptd->thread_errno, "ptd->thread_errno is different then _errno()\n"); ok(p_doserrno() == &ptd->thread_doserrno, "ptd->thread_doserrno is different then __doserrno()\n"); @@ -1258,7 +1258,7 @@ struct block_file_arg FILE *write; HANDLE init; HANDLE finish; - int deadlock_test; + LONG deadlock_test; }; static DWORD WINAPI block_file(void *arg)

1 0

Piotr Caban : msvcrtd/tests: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard 14 Feb '22

14 Feb '22

Module: wine Branch: master Commit: 2c8b49f41532e9be93a416847d01028b5a61fa86 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2c8b49f41532e9be93a41684… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Feb 11 23:41:30 2022 +0100 msvcrtd/tests: Build without -DWINE_NO_LONG_TYPES. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrtd/tests/Makefile.in | 1 - dlls/msvcrtd/tests/debug.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/msvcrtd/tests/Makefile.in b/dlls/msvcrtd/tests/Makefile.in index e518e950905..d72b1d6a16d 100644 --- a/dlls/msvcrtd/tests/Makefile.in +++ b/dlls/msvcrtd/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = msvcrtd.dll C_SRCS = \ diff --git a/dlls/msvcrtd/tests/debug.c b/dlls/msvcrtd/tests/debug.c index 2a232de4a49..50059ce1cb2 100644 --- a/dlls/msvcrtd/tests/debug.c +++ b/dlls/msvcrtd/tests/debug.c @@ -42,7 +42,7 @@ static BOOL init_functions(void) HMODULE hModule = LoadLibraryA("msvcrtd.dll"); if (!hModule) { - win_skip("LoadLibraryA failed to load msvcrtd.dll with GLE=%d\n", GetLastError()); + win_skip("LoadLibraryA failed to load msvcrtd.dll with GLE=%ld\n", GetLastError()); return FALSE; }

1 0

Piotr Caban : msvcr120/tests: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard 14 Feb '22

14 Feb '22

Module: wine Branch: master Commit: 8116b4cc2f8bd41b3fd70d29a2fa6089c193342d URL: https://source.winehq.org/git/wine.git/?a=commit;h=8116b4cc2f8bd41b3fd70d29… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Feb 11 23:41:21 2022 +0100 msvcr120/tests: Build without -DWINE_NO_LONG_TYPES. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr120/tests/Makefile.in | 1 - dlls/msvcr120/tests/msvcr120.c | 22 +++++++++++----------- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/dlls/msvcr120/tests/Makefile.in b/dlls/msvcr120/tests/Makefile.in index d68249f9f79..9898cbae117 100644 --- a/dlls/msvcr120/tests/Makefile.in +++ b/dlls/msvcr120/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = msvcr120.dll C_SRCS = \ diff --git a/dlls/msvcr120/tests/msvcr120.c b/dlls/msvcr120/tests/msvcr120.c index ecb26a3efd7..a3161266db4 100644 --- a/dlls/msvcr120/tests/msvcr120.c +++ b/dlls/msvcr120/tests/msvcr120.c @@ -540,7 +540,7 @@ static void test__GetConcurrency(void) GetSystemInfo(&si); c = (*p__GetConcurrency)(); - ok(c == si.dwNumberOfProcessors, "expected %u, got %u\n", si.dwNumberOfProcessors, c); + ok(c == si.dwNumberOfProcessors, "expected %lu, got %u\n", si.dwNumberOfProcessors, c); } static void test_gettnames(void* (CDECL *p_gettnames)(void)) @@ -587,7 +587,7 @@ static void test_gettnames(void* (CDECL *p_gettnames)(void)) ok(ret->str[42] + strlen(ret->str[42]) + 1 == (char*)ret->wstr[0] || ret->str[42] + strlen(ret->str[42]) + 2 == (char*)ret->wstr[0], - "ret->str[42] = %p len = %d, ret->wstr[0] = %p\n", + "ret->str[42] = %p len = %Id, ret->wstr[0] = %p\n", ret->str[42], strlen(ret->str[42]), ret->wstr[0]); p_free(ret); @@ -749,11 +749,11 @@ static void test_critical_section(void) thread = (HANDLE)_beginthreadex(NULL, 0, test_critical_section_lock, NULL, 0, NULL); ok(thread != INVALID_HANDLE_VALUE, "_beginthread failed (%d)\n", errno); ret = WaitForSingleObject(thread, 100); - ok(ret == WAIT_TIMEOUT, "WaitForSingleObject returned %d\n", ret); + ok(ret == WAIT_TIMEOUT, "WaitForSingleObject returned %ld\n", ret); enter_flag = 1; call_func1(p_critical_section_unlock, &cs); ret = WaitForSingleObject(thread, INFINITE); - ok(ret == WAIT_OBJECT_0, "WaitForSingleObject returned %d\n", ret); + ok(ret == WAIT_OBJECT_0, "WaitForSingleObject returned %ld\n", ret); ret = CloseHandle(thread); ok(ret, "CloseHandle failed\n"); @@ -762,7 +762,7 @@ static void test_critical_section(void) thread = (HANDLE)_beginthreadex(NULL, 0, test_critical_section_try_lock, NULL, 0, NULL); ok(thread != INVALID_HANDLE_VALUE, "_beginthread failed (%d)\n", errno); ret = WaitForSingleObject(thread, INFINITE); - ok(ret == WAIT_OBJECT_0, "WaitForSingleObject returned %d\n", ret); + ok(ret == WAIT_OBJECT_0, "WaitForSingleObject returned %ld\n", ret); ret = CloseHandle(thread); ok(ret, "CloseHandle failed\n"); call_func1(p_critical_section_unlock, &cs); @@ -773,7 +773,7 @@ static void test_critical_section(void) thread = (HANDLE)_beginthreadex(NULL, 0, test_critical_section_try_lock, NULL, 0, NULL); ok(thread != INVALID_HANDLE_VALUE, "_beginthread failed (%d)\n", errno); ret = WaitForSingleObject(thread, INFINITE); - ok(ret == WAIT_OBJECT_0, "WaitForSingleObject returned %d\n", ret); + ok(ret == WAIT_OBJECT_0, "WaitForSingleObject returned %ld\n", ret); ret = CloseHandle(thread); ok(ret, "CloseHandle failed\n"); thread = (HANDLE)_beginthreadex(NULL, 0, test_critical_section_try_lock_for, NULL, 0, NULL); @@ -782,7 +782,7 @@ static void test_critical_section(void) Sleep(10); call_func1(p_critical_section_unlock, &cs); ret = WaitForSingleObject(thread, INFINITE); - ok(ret == WAIT_OBJECT_0, "WaitForSingleObject returned %d\n", ret); + ok(ret == WAIT_OBJECT_0, "WaitForSingleObject returned %ld\n", ret); ret = CloseHandle(thread); ok(ret, "CloseHandle failed\n"); @@ -791,11 +791,11 @@ static void test_critical_section(void) thread = (HANDLE)_beginthreadex(NULL, 0, test_critical_section_scoped_lock, NULL, 0, NULL); ok(thread != INVALID_HANDLE_VALUE, "_beginthread failed (%d)\n", errno); ret = WaitForSingleObject(thread, 100); - ok(ret == WAIT_TIMEOUT, "WaitForSingleObject returned %d\n", ret); + ok(ret == WAIT_TIMEOUT, "WaitForSingleObject returned %ld\n", ret); enter_flag = 1; call_func1(p_critical_section_unlock, &cs); ret = WaitForSingleObject(thread, INFINITE); - ok(ret == WAIT_OBJECT_0, "WaitForSingleObject returned %d\n", ret); + ok(ret == WAIT_OBJECT_0, "WaitForSingleObject returned %ld\n", ret); ret = CloseHandle(thread); ok(ret, "CloseHandle failed\n"); call_func1(p_critical_section_dtor, &cs); @@ -1063,10 +1063,10 @@ static void test__Condition_variable(void) call_func1(p__Condition_variable_notify_one, &cv); ret = WaitForSingleObject(threads[1], 500); - ok(ret == WAIT_OBJECT_0, "WaitForSingleObject returned %d\n", ret); + ok(ret == WAIT_OBJECT_0, "WaitForSingleObject returned %ld\n", ret); call_func1(p__Condition_variable_notify_one, &cv); ret = WaitForSingleObject(threads[0], 500); - ok(ret == WAIT_OBJECT_0, "WaitForSingleObject returned %d\n", ret); + ok(ret == WAIT_OBJECT_0, "WaitForSingleObject returned %ld\n", ret); CloseHandle(threads[0]); CloseHandle(threads[1]);

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 February 2022