ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

msvcr100/tests: Build without -DWINE_NO_LONG_TYPES. 

Signed-off-by: Piotr Caban <piotr@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Piotr Caban 2022-02-11 23:18:47 +01:00 committed by Alexandre Julliard
parent 61da3277c4
commit 52f7dcc555
2 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dlls/msvcr100/tests/Makefile.in
View File

@ -1,4 +1,3 @@
EXTRADEFS = -DWINE_NO_LONG_TYPES
TESTDLL = msvcr100.dll TESTDLL = msvcr100.dll
C_SRCS = \ C_SRCS = \

26
dlls/msvcr100/tests/msvcr100.c
View File

@ -66,7 +66,7 @@ static void __cdecl test_invalid_parameter_handler(const wchar_t *expression,
ok(function == NULL, "function is not NULL\n"); ok(function == NULL, "function is not NULL\n");
ok(file == NULL, "file is not NULL\n"); ok(file == NULL, "file is not NULL\n");
ok(line == 0, "line = %u\n", line); ok(line == 0, "line = %u\n", line);
ok(arg == 0, "arg = %lx\n", (UINT_PTR)arg); ok(arg == 0, "arg = %Ix\n", arg);
} }
#ifdef __i386__ #ifdef __i386__
@ -251,7 +251,7 @@ static BOOL init(void)
SetLastError(0xdeadbeef); SetLastError(0xdeadbeef);
hcrt = LoadLibraryA("msvcr100.dll"); hcrt = LoadLibraryA("msvcr100.dll");
if (!hcrt) { if (!hcrt) {
win_skip("msvcr100.dll not installed (got %d)\n", GetLastError()); win_skip("msvcr100.dll not installed (got %ld)\n", GetLastError());
return FALSE; return FALSE;
} }
@ -691,34 +691,34 @@ static void test__SpinWait(void)
CHECK_CALLED(yield_func); CHECK_CALLED(yield_func);
ul = call_func1(pSpinWait__NumberOfSpins, &sp); ul = call_func1(pSpinWait__NumberOfSpins, &sp);
ok(ul == 1, "_SpinWait::_NumberOfSpins returned %u\n", ul); ok(ul == 1, "_SpinWait::_NumberOfSpins returned %lu\n", ul);
sp.spin = 2; sp.spin = 2;
b = call_func1(pSpinWait__ShouldSpinAgain, &sp); b = call_func1(pSpinWait__ShouldSpinAgain, &sp);
ok(b, "_SpinWait::_ShouldSpinAgain returned %x\n", b); ok(b, "_SpinWait::_ShouldSpinAgain returned %x\n", b);
ok(sp.spin == 1, "sp.spin = %u\n", sp.spin); ok(sp.spin == 1, "sp.spin = %lu\n", sp.spin);
b = call_func1(pSpinWait__ShouldSpinAgain, &sp); b = call_func1(pSpinWait__ShouldSpinAgain, &sp);
ok(!b, "_SpinWait::_ShouldSpinAgain returned %x\n", b); ok(!b, "_SpinWait::_ShouldSpinAgain returned %x\n", b);
ok(sp.spin == 0, "sp.spin = %u\n", sp.spin); ok(sp.spin == 0, "sp.spin = %lu\n", sp.spin);
b = call_func1(pSpinWait__ShouldSpinAgain, &sp); b = call_func1(pSpinWait__ShouldSpinAgain, &sp);
ok(b, "_SpinWait::_ShouldSpinAgain returned %x\n", b); ok(b, "_SpinWait::_ShouldSpinAgain returned %x\n", b);
ok(sp.spin == -1, "sp.spin = %u\n", sp.spin); ok(sp.spin == -1, "sp.spin = %lu\n", sp.spin);
call_func2(pSpinWait__SetSpinCount, &sp, 2); call_func2(pSpinWait__SetSpinCount, &sp, 2);
b = call_func1(pSpinWait__SpinOnce, &sp); b = call_func1(pSpinWait__SpinOnce, &sp);
ok(b, "_SpinWait::_SpinOnce returned %x\n", b); ok(b, "_SpinWait::_SpinOnce returned %x\n", b);
ok(sp.spin == 1, "sp.spin = %u\n", sp.spin); ok(sp.spin == 1, "sp.spin = %lu\n", sp.spin);
b = call_func1(pSpinWait__SpinOnce, &sp); b = call_func1(pSpinWait__SpinOnce, &sp);
ok(b, "_SpinWait::_SpinOnce returned %x\n", b); ok(b, "_SpinWait::_SpinOnce returned %x\n", b);
ok(sp.spin == 0, "sp.spin = %u\n", sp.spin); ok(sp.spin == 0, "sp.spin = %lu\n", sp.spin);
SET_EXPECT(yield_func); SET_EXPECT(yield_func);
b = call_func1(pSpinWait__SpinOnce, &sp); b = call_func1(pSpinWait__SpinOnce, &sp);
ok(b, "_SpinWait::_SpinOnce returned %x\n", b); ok(b, "_SpinWait::_SpinOnce returned %x\n", b);
ok(sp.spin == 0, "sp.spin = %u\n", sp.spin); ok(sp.spin == 0, "sp.spin = %lu\n", sp.spin);
CHECK_CALLED(yield_func); CHECK_CALLED(yield_func);
b = call_func1(pSpinWait__SpinOnce, &sp); b = call_func1(pSpinWait__SpinOnce, &sp);
ok(!b, "_SpinWait::_SpinOnce returned %x\n", b); ok(!b, "_SpinWait::_SpinOnce returned %x\n", b);
ok(sp.spin==0 || sp.spin==4000, "sp.spin = %u\n", sp.spin); ok(sp.spin==0 || sp.spin==4000, "sp.spin = %lu\n", sp.spin);
call_func1(pSpinWait_dtor, &sp); call_func1(pSpinWait_dtor, &sp);
} }
@ -763,7 +763,7 @@ static void test_reader_writer_lock(void)
call_func1(preader_writer_lock_lock, rw_lock); call_func1(preader_writer_lock_lock, rw_lock);
thread = CreateThread(NULL, 0, lock_read_thread, rw_lock, 0, NULL); thread = CreateThread(NULL, 0, lock_read_thread, rw_lock, 0, NULL);
ok(thread != NULL, "CreateThread failed: %d\n", GetLastError()); ok(thread != NULL, "CreateThread failed: %ld\n", GetLastError());
WaitForSingleObject(thread, INFINITE); WaitForSingleObject(thread, INFINITE);
ok(GetExitCodeThread(thread, &d), "GetExitCodeThread failed\n"); ok(GetExitCodeThread(thread, &d), "GetExitCodeThread failed\n");
ok(!d, "reader_writer_lock::try_lock_read succeeded on already locked object\n"); ok(!d, "reader_writer_lock::try_lock_read succeeded on already locked object\n");
@ -772,7 +772,7 @@ static void test_reader_writer_lock(void)
call_func1(preader_writer_lock_lock_read, rw_lock); call_func1(preader_writer_lock_lock_read, rw_lock);
thread = CreateThread(NULL, 0, lock_read_thread, rw_lock, 0, NULL); thread = CreateThread(NULL, 0, lock_read_thread, rw_lock, 0, NULL);
ok(thread != NULL, "CreateThread failed: %d\n", GetLastError()); ok(thread != NULL, "CreateThread failed: %ld\n", GetLastError());
WaitForSingleObject(thread, INFINITE); WaitForSingleObject(thread, INFINITE);
ok(GetExitCodeThread(thread, &d), "GetExitCodeThread failed\n"); ok(GetExitCodeThread(thread, &d), "GetExitCodeThread failed\n");
ok(d, "reader_writer_lock::try_lock_read failed on object locked for reading\n"); ok(d, "reader_writer_lock::try_lock_read failed on object locked for reading\n");
@ -951,7 +951,7 @@ static void test_ExternalContextBase(void)
ok(id == 0, "Context::Id() = %u\n", id); ok(id == 0, "Context::Id() = %u\n", id);
thread = CreateThread(NULL, 0, external_context_thread, NULL, 0, NULL); thread = CreateThread(NULL, 0, external_context_thread, NULL, 0, NULL);
ok(thread != NULL, "CreateThread failed: %d\n", GetLastError()); ok(thread != NULL, "CreateThread failed: %ld\n", GetLastError());
WaitForSingleObject(thread, INFINITE); WaitForSingleObject(thread, INFINITE);
CloseHandle(thread); CloseHandle(thread);
} }