shdocvw: Win64 printf format warning fixes.

dlls/shdocvw/tests/Makefile.in

@@ -5,7 +5,6 @@ VPATH     = @srcdir@
 TESTDLL   = shdocvw.dll
 IMPORTS   = shell32 ole32 user32 advapi32 kernel32
 EXTRALIBS = -luuid
-EXTRADEFS = -DWINE_NO_LONG_AS_INT
 
 CTESTS = \
 	shortcut.c \

dlls/shdocvw/tests/shortcut.c

@@ -173,13 +173,13 @@ static void test_ShortcutFolder(void) {
     register_keys(HKEY_CLASSES_ROOT, HKEY_CLASSES_ROOT_keys, 1);
 
     hr = SHGetDesktopFolder(&pDesktopFolder);
-    ok (SUCCEEDED(hr), "SHGetDesktopFolder failed! hr = %08lx\n", hr);
+    ok (SUCCEEDED(hr), "SHGetDesktopFolder failed! hr = %08x\n", hr);
     if (FAILED(hr)) goto cleanup;
 
     /* Convert the wszWineTestFolder string to an ITEMIDLIST. */
     hr = IShellFolder_ParseDisplayName(pDesktopFolder, NULL, NULL, wszWineTestFolder, NULL, 
                                        &pidlWineTestFolder, NULL);
-    ok (SUCCEEDED(hr), "IShellFolder::ParseDisplayName failed! hr = %08lx\n", hr);
+    ok (SUCCEEDED(hr), "IShellFolder::ParseDisplayName failed! hr = %08x\n", hr);
     if (FAILED(hr)) {
         IShellFolder_Release(pDesktopFolder);
         goto cleanup;
@@ -191,22 +191,22 @@ static void test_ShortcutFolder(void) {
                                    (LPVOID*)&pWineTestFolder);
     IShellFolder_Release(pDesktopFolder);
     ILFree(pidlWineTestFolder);
-    ok (SUCCEEDED(hr), "IShellFolder::BindToObject(WineTestFolder) failed! hr = %08lx\n", hr);
+    ok (SUCCEEDED(hr), "IShellFolder::BindToObject(WineTestFolder) failed! hr = %08x\n", hr);
     if (FAILED(hr)) goto cleanup;
 
     hr = IShellFolder_QueryInterface(pWineTestFolder, &IID_IPersistFolder3, (LPVOID*)&pWineTestPersistFolder);
-    ok (SUCCEEDED(hr), "IShellFolder::QueryInterface(IPersistFolder3) failed! hr = %08lx\n", hr);
+    ok (SUCCEEDED(hr), "IShellFolder::QueryInterface(IPersistFolder3) failed! hr = %08x\n", hr);
     IShellFolder_Release(pWineTestFolder);
     if (FAILED(hr)) goto cleanup;
 
     /* The resulting folder object has the FolderShortcut CLSID, instead of it's own. */
     hr = IPersistFolder3_GetClassID(pWineTestPersistFolder, &clsid);
-    ok (SUCCEEDED(hr), "IPersist::GetClassID failed! hr = %08lx\n", hr);
+    ok (SUCCEEDED(hr), "IPersist::GetClassID failed! hr = %08x\n", hr);
     ok (IsEqualCLSID(&CLSID_FolderShortcut, &clsid), "GetClassId returned wrong CLSID!\n"); 
   
     pidlCurFolder = (LPITEMIDLIST)0xdeadbeef;
     hr = IPersistFolder3_GetCurFolder(pWineTestPersistFolder, &pidlCurFolder);
-    ok (SUCCEEDED(hr), "IPersistFolder3::GetCurFolder failed! hr = %08lx\n", hr);
+    ok (SUCCEEDED(hr), "IPersistFolder3::GetCurFolder failed! hr = %08x\n", hr);
     ok (pidlCurFolder->mkid.cb == 20 && ((LPSHITEMID)((BYTE*)pidlCurFolder+20))->cb == 0 && 
         IsEqualCLSID(&CLSID_WineTest, (REFCLSID)((LPBYTE)pidlCurFolder+4)), 
         "GetCurFolder returned unexpected pidl!\n");