Commit 8cd82dda authored by Alexandre Julliard's avatar Alexandre Julliard

shell32/tests: Fix some uninitialized handle checks for Win64.

parent 450e9e3a
...@@ -358,16 +358,17 @@ static void test_setpos(void) ...@@ -358,16 +358,17 @@ static void test_setpos(void)
static void test_appbarget(void) static void test_appbarget(void)
{ {
APPBARDATA abd; APPBARDATA abd;
HWND hwnd, foregnd; HWND hwnd, foregnd, unset_hwnd;
UINT_PTR ret; UINT_PTR ret;
memset(&abd, 0xcc, sizeof(abd)); memset(&abd, 0xcc, sizeof(abd));
memset(&unset_hwnd, 0xcc, sizeof(unset_hwnd));
abd.cbSize = sizeof(abd); abd.cbSize = sizeof(abd);
abd.uEdge = ABE_BOTTOM; abd.uEdge = ABE_BOTTOM;
hwnd = (HWND)SHAppBarMessage(ABM_GETAUTOHIDEBAR, &abd); hwnd = (HWND)SHAppBarMessage(ABM_GETAUTOHIDEBAR, &abd);
ok(hwnd == NULL || IsWindow(hwnd), "ret %p which is not a window\n", hwnd); ok(hwnd == NULL || IsWindow(hwnd), "ret %p which is not a window\n", hwnd);
ok(abd.hWnd == (HWND)0xcccccccc, "hWnd overwritten\n"); ok(abd.hWnd == unset_hwnd, "hWnd overwritten %p\n",abd.hWnd);
if (!pMonitorFromWindow) if (!pMonitorFromWindow)
{ {
......
...@@ -202,11 +202,13 @@ static void test_get_file_info(void) ...@@ -202,11 +202,13 @@ static void test_get_file_info(void)
if (pSHGetFileInfoW) if (pSHGetFileInfoW)
{ {
HANDLE unset_icon;
/* Test whether fields of SHFILEINFOW are always cleared */ /* Test whether fields of SHFILEINFOW are always cleared */
memset(&shfiw, 0xcf, sizeof(shfiw)); memset(&shfiw, 0xcf, sizeof(shfiw));
memset(&unset_icon, 0xcf, sizeof(unset_icon));
rc=pSHGetFileInfoW(NULL, 0, &shfiw, sizeof(shfiw), 0); rc=pSHGetFileInfoW(NULL, 0, &shfiw, sizeof(shfiw), 0);
todo_wine ok(!rc, "SHGetFileInfoW(NULL | 0) should fail\n"); todo_wine ok(!rc, "SHGetFileInfoW(NULL | 0) should fail\n");
ok(shfiw.hIcon == (HANDLE) 0xcfcfcfcf, "SHGetFileInfoW(NULL | 0) should not clear hIcon\n"); ok(shfiw.hIcon == unset_icon, "SHGetFileInfoW(NULL | 0) should not clear hIcon\n");
todo_wine ok(shfiw.szDisplayName[0] == 0xcfcf, "SHGetFileInfoW(NULL | 0) should not clear szDisplayName[0]\n"); todo_wine ok(shfiw.szDisplayName[0] == 0xcfcf, "SHGetFileInfoW(NULL | 0) should not clear szDisplayName[0]\n");
todo_wine ok(shfiw.szTypeName[0] == 0xcfcf, "SHGetFileInfoW(NULL | 0) should not clear szTypeName[0]\n"); todo_wine ok(shfiw.szTypeName[0] == 0xcfcf, "SHGetFileInfoW(NULL | 0) should not clear szTypeName[0]\n");
todo_wine ok(shfiw.iIcon == 0xcfcfcfcf, "SHGetFileInfoW(NULL | 0) should not clear iIcon\n"); todo_wine ok(shfiw.iIcon == 0xcfcfcfcf, "SHGetFileInfoW(NULL | 0) should not clear iIcon\n");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment