wscript/tests: Enable compilation with long types.

Signed-off-by: Eric Pouech <eric.pouech@gmail.com>
Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Eric Pouech 2022-02-03 12:04:46 +01:00 committed by Alexandre Julliard
parent 0f6184bf03
commit 63a9879aef
2 changed files with 7 additions and 8 deletions

View File

@ -1,4 +1,3 @@
EXTRADEFS = -DWINE_NO_LONG_TYPES
TESTDLL = wscript.exe TESTDLL = wscript.exe
IMPORTS = ole32 oleaut32 psapi advapi32 IMPORTS = ole32 oleaut32 psapi advapi32

View File

@ -260,7 +260,7 @@ static HRESULT WINAPI Dispatch_Invoke(IDispatch *iface, DISPID dispIdMember, REF
break; break;
} }
default: default:
ok(0, "unexpected dispIdMember %d\n", dispIdMember); ok(0, "unexpected dispIdMember %ld\n", dispIdMember);
return E_NOTIMPL; return E_NOTIMPL;
} }
@ -345,8 +345,8 @@ static void run_script_file(const char *file_name, DWORD expected_exit_code)
WaitForSingleObject(pi.hProcess, INFINITE); WaitForSingleObject(pi.hProcess, INFINITE);
bres = GetExitCodeProcess(pi.hProcess, &exit_code); bres = GetExitCodeProcess(pi.hProcess, &exit_code);
ok(bres, "GetExitCodeProcess failed: %u\n", GetLastError()); ok(bres, "GetExitCodeProcess failed: %lu\n", GetLastError());
ok(exit_code == expected_exit_code, "exit_code = %u, expected %u\n", exit_code, expected_exit_code); ok(exit_code == expected_exit_code, "exit_code = %lu, expected %lu\n", exit_code, expected_exit_code);
CloseHandle(pi.hThread); CloseHandle(pi.hThread);
CloseHandle(pi.hProcess); CloseHandle(pi.hProcess);
@ -371,13 +371,13 @@ static void run_script(const char *name, const char *script_data, size_t script_
file = CreateFileA(file_name, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, file = CreateFileA(file_name, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS,
FILE_ATTRIBUTE_NORMAL, NULL); FILE_ATTRIBUTE_NORMAL, NULL);
ok(file != INVALID_HANDLE_VALUE, "CreateFile failed: %u\n", GetLastError()); ok(file != INVALID_HANDLE_VALUE, "CreateFile failed: %lu\n", GetLastError());
if(file == INVALID_HANDLE_VALUE) if(file == INVALID_HANDLE_VALUE)
return; return;
res = WriteFile(file, script_data, script_size, &size, NULL); res = WriteFile(file, script_data, script_size, &size, NULL);
CloseHandle(file); CloseHandle(file);
ok(res, "Could not write to file: %u\n", GetLastError()); ok(res, "Could not write to file: %lu\n", GetLastError());
if(!res) if(!res)
return; return;
@ -400,7 +400,7 @@ static BOOL WINAPI test_enum_proc(HMODULE module, LPCSTR type, LPSTR name, LONG_
trace("running %s test...\n", name); trace("running %s test...\n", name);
src = FindResourceA(NULL, name, type); src = FindResourceA(NULL, name, type);
ok(src != NULL, "Could not find resource %s: %u\n", name, GetLastError()); ok(src != NULL, "Could not find resource %s: %lu\n", name, GetLastError());
if(!src) if(!src)
return TRUE; return TRUE;
@ -451,7 +451,7 @@ static BOOL register_activex(void)
hres = CoRegisterClassObject(&CLSID_TestObj, (IUnknown *)&testobj_cf, hres = CoRegisterClassObject(&CLSID_TestObj, (IUnknown *)&testobj_cf,
CLSCTX_SERVER, REGCLS_MULTIPLEUSE, &regid); CLSCTX_SERVER, REGCLS_MULTIPLEUSE, &regid);
ok(hres == S_OK, "Could not register script engine: %08x\n", hres); ok(hres == S_OK, "Could not register script engine: %08lx\n", hres);
return TRUE; return TRUE;
} }