February 2022 - Wine-Commits

Eric Pouech : mprapi: Enable compilation with long types.
by Alexandre Julliard Feb. 14, 2022

Feb. 14, 2022

Module: wine Branch: master Commit: e0f64ccd5dbc82decda7b89f7857e0a29431f8b1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e0f64ccd5dbc82decda7b89f… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 14 09:28:26 2022 +0100 mprapi: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mprapi/Makefile.in | 1 - dlls/mprapi/mprapi.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/mprapi/Makefile.in b/dlls/mprapi/Makefile.in index fe164b39429..c97e316deb5 100644 --- a/dlls/mprapi/Makefile.in +++ b/dlls/mprapi/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = mprapi.dll IMPORTLIB = mprapi diff --git a/dlls/mprapi/mprapi.c b/dlls/mprapi/mprapi.c index b3d641fe108..8af9ebf0152 100644 --- a/dlls/mprapi/mprapi.c +++ b/dlls/mprapi/mprapi.c @@ -45,7 +45,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(mprapi); */ DWORD APIENTRY MprAdminGetErrorString(DWORD mprerror, LPWSTR *localstr) { - FIXME("(0x%x/%u, %p): stub!\n", mprerror, mprerror, localstr); + FIXME("(0x%lx/%lu, %p): stub!\n", mprerror, mprerror, localstr); *localstr = NULL; return ERROR_MR_MID_NOT_FOUND;

1 0

Eric Pouech : mciavi32: Enable compilation with long types.
by Alexandre Julliard Feb. 14, 2022

Feb. 14, 2022

Module: wine Branch: master Commit: 365b208fde30fb27ab7872c330c6410ba98c3b4d URL: https://source.winehq.org/git/wine.git/?a=commit;h=365b208fde30fb27ab7872c3… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 14 09:26:56 2022 +0100 mciavi32: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mciavi32/Makefile.in | 1 - dlls/mciavi32/info.c | 50 +++++++++---------- dlls/mciavi32/mciavi.c | 60 +++++++++++----------- dlls/mciavi32/mmoutput.c | 124 +++++++++++++++++++++++----------------------- dlls/mciavi32/wnd.c | 10 ++-- 5 files changed, 122 insertions(+), 123 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=365b208fde30fb27ab78…

1 0

Eric Pouech : mcicda: Enable compilation with long types.
by Alexandre Julliard Feb. 14, 2022

Feb. 14, 2022

Module: wine Branch: master Commit: dee729aea8858075a34a96a31465f74f96bee768 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dee729aea8858075a34a96a3… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 14 09:27:01 2022 +0100 mcicda: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mcicda/Makefile.in | 1 - dlls/mcicda/mcicda.c | 82 ++++++++++++++++++++++++------------------------- 2 files changed, 41 insertions(+), 42 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=dee729aea8858075a34a…

1 0

Eric Pouech : mciqtz32: Enable compilation with long types.
by Alexandre Julliard Feb. 14, 2022

Feb. 14, 2022

Module: wine Branch: master Commit: 99e8df6a370c56e484ba92b7bb142f24abc417f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=99e8df6a370c56e484ba92b7… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 14 09:27:07 2022 +0100 mciqtz32: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mciqtz32/Makefile.in | 1 - dlls/mciqtz32/mciqtz.c | 130 +++++++++++++++++++++++----------------------- 2 files changed, 65 insertions(+), 66 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=99e8df6a370c56e484ba…

1 0

Piotr Caban : msvcp140/tests: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard Feb. 14, 2022

Feb. 14, 2022

Module: wine Branch: master Commit: dc4126e8c6a174a010587483c1b9f393b5ee15d8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dc4126e8c6a174a010587483… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Feb 11 23:05:00 2022 +0100 msvcp140/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/msvcp140/tests/Makefile.in | 1 - dlls/msvcp140/tests/msvcp140.c | 12 ++++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/msvcp140/tests/Makefile.in b/dlls/msvcp140/tests/Makefile.in index 4c4f7688109..aa82d0cba06 100644 --- a/dlls/msvcp140/tests/Makefile.in +++ b/dlls/msvcp140/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = msvcp140.dll C_SRCS = \ diff --git a/dlls/msvcp140/tests/msvcp140.c b/dlls/msvcp140/tests/msvcp140.c index c79e425190b..b24c5e0f53d 100644 --- a/dlls/msvcp140/tests/msvcp140.c +++ b/dlls/msvcp140/tests/msvcp140.c @@ -301,7 +301,7 @@ static BOOL init(void) static void test_thrd(void) { ok(p__Thrd_id() == GetCurrentThreadId(), - "expected same id, got _Thrd_id %u GetCurrentThreadId %u\n", + "expected same id, got _Thrd_id %u GetCurrentThreadId %lu\n", p__Thrd_id(), GetCurrentThreadId()); } @@ -529,7 +529,7 @@ static void test_chore(void) ok(chore.callback == chore_callback, "chore.callback = %p, expected %p\n", chore.callback, chore_callback); ok(chore.arg == event, "chore.arg = %p, expected %p\n", chore.arg, event); wait = WaitForSingleObject(event, 500); - ok(wait == WAIT_OBJECT_0, "WaitForSingleObject returned %d\n", wait); + ok(wait == WAIT_OBJECT_0, "WaitForSingleObject returned %ld\n", wait); if(!GetProcAddress(GetModuleHandleA("kernel32"), "CreateThreadpoolWork")) { @@ -545,12 +545,12 @@ static void test_chore(void) ok(old_chore.work != chore.work, "new threadpool work was not created\n"); p__Release_chore(&old_chore); wait = WaitForSingleObject(event, 500); - ok(wait == WAIT_OBJECT_0, "WaitForSingleObject returned %d\n", wait); + ok(wait == WAIT_OBJECT_0, "WaitForSingleObject returned %ld\n", wait); ret = p__Reschedule_chore(&chore); ok(!ret, "_Reschedule_chore returned %d\n", ret); wait = WaitForSingleObject(event, 500); - ok(wait == WAIT_OBJECT_0, "WaitForSingleObject returned %d\n", wait); + ok(wait == WAIT_OBJECT_0, "WaitForSingleObject returned %ld\n", wait); p__Release_chore(&chore); ok(!chore.work, "chore.work != NULL\n"); @@ -1256,12 +1256,12 @@ static void test__Winerror_message(void) ret = p__Winerror_message(0, buf, sizeof(buf)); ok(ret == ret_fm || (ret_fm > 2 && buf_fm[ret_fm - 1] == '\n' && buf_fm[ret_fm - 2] == '\r' && ret + 2 == ret_fm), - "ret = %u, expected %u\n", ret, ret_fm); + "ret = %lu, expected %lu\n", ret, ret_fm); ok(!strncmp(buf, buf_fm, ret), "buf = %s, expected %s\n", buf, buf_fm); memset(buf, 'a', sizeof(buf)); ret = p__Winerror_message(0, buf, 2); - ok(!ret, "ret = %u\n", ret); + ok(!ret, "ret = %lu\n", ret); ok(buf[0] == 'a', "buf = %s\n", buf); }

1 0

Piotr Caban : msvcp140_atomic_wait/tests: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard Feb. 14, 2022

Feb. 14, 2022

Module: wine Branch: master Commit: 7bbb7042943c5dc080cfc74bc9d6cced7dc45dd3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7bbb7042943c5dc080cfc74b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Feb 11 23:04:52 2022 +0100 msvcp140_atomic_wait/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/msvcp140_atomic_wait/tests/Makefile.in | 1 - dlls/msvcp140_atomic_wait/tests/msvcp140_atomic_wait.c | 14 +++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/msvcp140_atomic_wait/tests/Makefile.in b/dlls/msvcp140_atomic_wait/tests/Makefile.in index 30f1c7c2f88..7f58d06d8f3 100644 --- a/dlls/msvcp140_atomic_wait/tests/Makefile.in +++ b/dlls/msvcp140_atomic_wait/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = msvcp140_atomic_wait.dll C_SRCS = \ diff --git a/dlls/msvcp140_atomic_wait/tests/msvcp140_atomic_wait.c b/dlls/msvcp140_atomic_wait/tests/msvcp140_atomic_wait.c index 3a971bb4ce3..42fefc4db03 100644 --- a/dlls/msvcp140_atomic_wait/tests/msvcp140_atomic_wait.c +++ b/dlls/msvcp140_atomic_wait/tests/msvcp140_atomic_wait.c @@ -56,7 +56,7 @@ static void test___std_parallel_algorithms_hw_threads(void) GetSystemInfo(&si); nthr = p___std_parallel_algorithms_hw_threads(); - ok(nthr == si.dwNumberOfProcessors, "expected %u, got %u\n", si.dwNumberOfProcessors, nthr); + ok(nthr == si.dwNumberOfProcessors, "expected %lu, got %u\n", si.dwNumberOfProcessors, nthr); } static PTP_WORK cb_work; @@ -102,7 +102,7 @@ static void test_threadpool_work(void) p___std_submit_threadpool_work(work); p___std_wait_for_threadpool_work_callbacks(work, FALSE); p___std_close_threadpool_work(work); - ok(workcalled == 1, "expected work to be called once, got %d\n", workcalled); + ok(workcalled == 1, "expected work to be called once, got %ld\n", workcalled); ok(cb_work == work, "expected %p, got %p\n", work, cb_work); ok(cb_context == &workcalled, "expected %p, got %p\n", &workcalled, cb_context); @@ -113,7 +113,7 @@ static void test_threadpool_work(void) p___std_bulk_submit_threadpool_work(work, 13); p___std_wait_for_threadpool_work_callbacks(work, FALSE); p___std_close_threadpool_work(work); - ok(workcalled == 13, "expected work to be called 13 times, got %d\n", workcalled); + ok(workcalled == 13, "expected work to be called 13 times, got %ld\n", workcalled); workcalled = 0; work = p___std_create_threadpool_work(threadpool_workcallback, &workcalled, NULL); @@ -121,7 +121,7 @@ static void test_threadpool_work(void) p___std_bulk_submit_threadpool_work(work, 0); p___std_wait_for_threadpool_work_callbacks(work, FALSE); p___std_close_threadpool_work(work); - ok(workcalled == 0, "expected no work, got %d\n", workcalled); + ok(workcalled == 0, "expected no work, got %ld\n", workcalled); /* test with environment */ cb_event = CreateEventW(NULL, TRUE, FALSE, NULL); @@ -136,7 +136,7 @@ static void test_threadpool_work(void) p___std_close_threadpool_work(work); ret = WaitForSingleObject(cb_event, 1000); ok(ret == WAIT_OBJECT_0, "expected finalization callback to be called\n"); - ok(workcalled == 2, "expected work to be called twice, got %d\n", workcalled); + ok(workcalled == 2, "expected work to be called twice, got %ld\n", workcalled); CloseHandle(cb_event); /* test with environment version 3 */ @@ -147,7 +147,7 @@ static void test_threadpool_work(void) work = p___std_create_threadpool_work(threadpool_workcallback, &workcalled, (TP_CALLBACK_ENVIRON *)&environment3); gle = GetLastError(); - ok(gle == 0xdeadbeef, "expected 0xdeadbeef, got %x\n", gle); + ok(gle == 0xdeadbeef, "expected 0xdeadbeef, got %lx\n", gle); ok(!!work, "failed to create threadpool_work\n"); p___std_close_threadpool_work(work); @@ -158,7 +158,7 @@ static void test_threadpool_work(void) work = p___std_create_threadpool_work(threadpool_workcallback, &workcalled, (TP_CALLBACK_ENVIRON *)&environment3); gle = GetLastError(); - ok(gle == ERROR_INVALID_PARAMETER, "expected %d, got %d\n", ERROR_INVALID_PARAMETER, gle); + ok(gle == ERROR_INVALID_PARAMETER, "expected %d, got %ld\n", ERROR_INVALID_PARAMETER, gle); ok(!work, "expected failure\n"); }

1 0

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

Feb. 14, 2022

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

Nikolay Sivov : oleaut32: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard Feb. 14, 2022

Feb. 14, 2022

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 : msvcr120/tests: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard Feb. 14, 2022

Feb. 14, 2022

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

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

Feb. 14, 2022

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