[ROSTESTS] Fix 64bit issues (#1261)

This commit is contained in:
Timo Kreuzer 2019-01-20 15:58:32 +01:00 committed by GitHub
parent efe4605177
commit bb9a5f6046
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
23 changed files with 101 additions and 81 deletions

View file

@ -14,6 +14,7 @@
// stolen from com_apitest.h
DEFINE_GUID(CLSID_FadeTask, 0x7EB5FBE4, 0x2100, 0x49E6, 0x85, 0x93, 0x17, 0xE1, 0x30, 0x12, 0x2F, 0x91);
#define INVALID_POINTER ((PVOID)(ULONG_PTR)0xdeadbeefdeadbeefULL)
typedef HRESULT (__stdcall *tShellDimScreen) (IUnknown** Unknown, HWND* hWindow);
@ -21,8 +22,8 @@ tShellDimScreen ShellDimScreen;
static void Test_Dim()
{
IUnknown* unk = (IUnknown*)0xdeadbeef;
HWND wnd = (HWND)0xdeadbeef;
IUnknown* unk = (IUnknown*)INVALID_POINTER;
HWND wnd = (HWND)INVALID_POINTER;
ULONG count;
HRESULT hr = ShellDimScreen(NULL, NULL);
@ -30,24 +31,24 @@ static void Test_Dim()
hr = ShellDimScreen(&unk, &wnd);
ok_hex(hr, S_OK);
ok(unk != ((IUnknown*)0xdeadbeef), "Expected a valid object\n");
ok(wnd != ((HWND)0xdeadbeef), "Expected a valid window ptr\n");
ok(unk != INVALID_POINTER, "Expected a valid object\n");
ok(wnd != INVALID_POINTER, "Expected a valid window ptr\n");
ok(IsWindow(wnd), "Expected a valid window\n");
ok(IsWindowVisible(wnd), "Expected the window to be visible\n");
if (unk != ((IUnknown*)0xdeadbeef) && unk)
if (unk != ((IUnknown*)INVALID_POINTER) && unk)
{
count = unk->Release();
ok(count == 0, "Expected count to be 0, was: %lu\n", count);
ok(!IsWindow(wnd), "Expected the window to be destroyed\n");
}
unk = (IUnknown*)0xdeadbeef;
wnd = (HWND)0xdeadbeef;
unk = (IUnknown*)INVALID_POINTER;
wnd = (HWND)INVALID_POINTER;
hr = ShellDimScreen(&unk, &wnd);
ok_hex(hr, S_OK);
ok(unk != ((IUnknown*)0xdeadbeef), "Expected a valid object\n");
ok(wnd != ((HWND)0xdeadbeef), "Expected a valid window ptr\n");
ok(unk != ((IUnknown*)INVALID_POINTER), "Expected a valid object\n");
ok(wnd != ((HWND)INVALID_POINTER), "Expected a valid window ptr\n");
ok(IsWindow(wnd), "Expected a valid window\n");
ok(IsWindowVisible(wnd), "Expected the window to be visible\n");
char classname[100] = {0};
@ -60,7 +61,7 @@ static void Test_Dim()
style = GetWindowLong(wnd, GWL_EXSTYLE);
ok(style == WS_EX_TOPMOST, "Expected exstyle to be %x, was %lx\n", WS_EX_TOPMOST, style);
if (unk != ((IUnknown*)0xdeadbeef) && unk)
if (unk != ((IUnknown*)INVALID_POINTER) && unk)
{
count = unk->AddRef();
ok(count == 2, "Expected count to be 2, was: %lu\n", count);
@ -92,7 +93,7 @@ static void Test_Dim()
ok((rc.right - rc.left) == GetSystemMetrics(SM_CXVIRTUALSCREEN), "Expected rc.left to be %u, was %lu\n", GetSystemMetrics(SM_CXVIRTUALSCREEN), (rc.right - rc.left));
ok((rc.bottom - rc.top) == GetSystemMetrics(SM_CYVIRTUALSCREEN), "Expected rc.top to be %u, was %lu\n", GetSystemMetrics(SM_CYVIRTUALSCREEN), (rc.bottom - rc.top));
if (unk != ((IUnknown*)0xdeadbeef) && unk)
if (unk != ((IUnknown*)INVALID_POINTER) && unk)
{
count = unk->Release();
ok(count == 0, "Expected count to be 0, was: %lu\n", count);