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

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 8cd82dda1fe2ca4d663f7f9c53a25ecb90bbfcb6
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=8cd82dda1fe2ca4d663f7f9c53a25ecb90bbfcb6

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Fri Jan  9 18:09:03 2009 +0100

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

---

 dlls/shell32/tests/appbar.c    |    5 +++--
 dlls/shell32/tests/shlfileop.c |    4 +++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/dlls/shell32/tests/appbar.c b/dlls/shell32/tests/appbar.c
index d11a999..0d0c898 100644
--- a/dlls/shell32/tests/appbar.c
+++ b/dlls/shell32/tests/appbar.c
@@ -358,16 +358,17 @@ static void test_setpos(void)
 static void test_appbarget(void)
 {
     APPBARDATA abd;
-    HWND hwnd, foregnd;
+    HWND hwnd, foregnd, unset_hwnd;
     UINT_PTR ret;
 
     memset(&abd, 0xcc, sizeof(abd));
+    memset(&unset_hwnd, 0xcc, sizeof(unset_hwnd));
     abd.cbSize = sizeof(abd);
     abd.uEdge = ABE_BOTTOM;
 
     hwnd = (HWND)SHAppBarMessage(ABM_GETAUTOHIDEBAR, &abd);
     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)
     {
diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c
index 48e89fa..e6d3287 100644
--- a/dlls/shell32/tests/shlfileop.c
+++ b/dlls/shell32/tests/shlfileop.c
@@ -202,11 +202,13 @@ static void test_get_file_info(void)
 
     if (pSHGetFileInfoW)
     {
+        HANDLE unset_icon;
         /* Test whether fields of SHFILEINFOW are always cleared */
         memset(&shfiw, 0xcf, sizeof(shfiw));
+        memset(&unset_icon, 0xcf, sizeof(unset_icon));
         rc=pSHGetFileInfoW(NULL, 0, &shfiw, sizeof(shfiw), 0);
         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.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");