diff --git a/dlls/browseui/tests/Makefile.in b/dlls/browseui/tests/Makefile.in
index 61c86018ab2..70de3ab4785 100644
--- a/dlls/browseui/tests/Makefile.in
+++ b/dlls/browseui/tests/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
 TESTDLL   = browseui.dll
 IMPORTS   = ole32
 
diff --git a/dlls/browseui/tests/autocomplete.c b/dlls/browseui/tests/autocomplete.c
index 5ff274da729..ff1033fc6ff 100644
--- a/dlls/browseui/tests/autocomplete.c
+++ b/dlls/browseui/tests/autocomplete.c
@@ -34,7 +34,7 @@
 { \
     HRESULT res = (exp); \
     if (res != S_OK) \
-        ok(FALSE, #exp " failed: %x\n", res); \
+        ok(FALSE, #exp " failed: %#lx\n", res); \
 }
 
 static LPWSTR strdup_AtoW(LPCSTR str)
@@ -86,7 +86,7 @@ static TestACL *TestACL_Constructor(int limit, const char **strings)
 static ULONG STDMETHODCALLTYPE TestACL_AddRef(IEnumString *iface)
 {
     TestACL *This = impl_from_IEnumString(iface);
-    trace("ACL(%p): addref (%d)\n", This, This->ref+1);
+    trace("ACL(%p): addref (%ld)\n", This, This->ref+1);
     return InterlockedIncrement(&This->ref);
 }
 
@@ -96,7 +96,7 @@ static ULONG STDMETHODCALLTYPE TestACL_Release(IEnumString *iface)
     ULONG res;
 
     res = InterlockedDecrement(&This->ref);
-    trace("ACL(%p): release (%d)\n", This, res);
+    trace("ACL(%p): release (%ld)\n", This, res);
     return res;
 }
 
@@ -129,7 +129,7 @@ static HRESULT STDMETHODCALLTYPE TestACL_Next(IEnumString *iface, ULONG celt, LP
     TestACL *This = impl_from_IEnumString(iface);
     ULONG i;
 
-    trace("ACL(%p): read %d item(s)\n", This, celt);
+    trace("ACL(%p): read %ld item(s)\n", This, celt);
     for (i = 0; i < celt; i++)
     {
         if (This->pos >= This->limit)
@@ -215,14 +215,11 @@ IACListVtbl TestACL_ACListVtbl =
 #define expect_str(obj, str)  \
 { \
     ole_ok(IEnumString_Next(obj, 1, &wstr, &i)); \
-    ok(i == 1, "Expected i == 1, got %d\n", i); \
+    ok(i == 1, "Expected i == 1, got %ld\n", i); \
     ok(str[0] == wstr[0], "String mismatch\n"); \
     CoTaskMemFree(wstr); \
 }
 
-#define expect_end(obj) \
-    ok(IEnumString_Next(obj, 1, &wstr, &i) == S_FALSE, "Unexpected return from Next\n");
-
 static void test_ACLMulti(void)
 {
     const char *strings1[] = {"a", "c", "e"};
@@ -236,122 +233,124 @@ static void test_ACLMulti(void)
     IObjMgr *mgr;
     LPWSTR wstr;
     LPWSTR wstrtab[15];
+    ULONG ref, i;
     LPVOID tmp;
-    ULONG ref;
-    UINT i;
 
     hr = CoCreateInstance(&CLSID_ACLMulti, NULL, CLSCTX_INPROC, &IID_IEnumString, (void**)&obj);
-    ok(hr == S_OK, "failed to create ACLMulti instance, 0x%08x\n", hr);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
     if (hr != S_OK) return;
 
     hr = IEnumString_QueryInterface(obj, &IID_IACList, (void**)&acl);
-    ok(hr == S_OK, "got 0x%08x\n", hr);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
     hr = IEnumString_QueryInterface(obj, &IID_IACList2, &tmp);
-    ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr);
+    ok(hr == E_NOINTERFACE, "Unexpected hr %#lx.\n", hr);
     hr = IEnumString_QueryInterface(obj, &IID_IObjMgr, (void**)&mgr);
-    ok(hr == S_OK, "got 0x%08x\n", hr);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
 
     hr = IEnumString_QueryInterface(obj, &IID_IEnumACString, (LPVOID*)&unk);
     if (hr == E_NOINTERFACE)
         todo_wine win_skip("IEnumACString is not supported, skipping tests\n");
     else
     {
-        ok(hr == S_OK, "QueryInterface(IID_IEnumACString) failed: %x\n", hr);
+        ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
         if (unk != NULL)
             IEnumACString_Release(unk);
     }
 
     i = -1;
     hr = IEnumString_Next(obj, 1, (LPOLESTR *)&tmp, &i);
-    ok(hr == S_FALSE, "got 0x%08x\n", hr);
-    ok(i == 0, "Unexpected fetched value %d\n", i);
+    ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr);
+    ok(i == 0, "Unexpected fetched value %ld\n", i);
     hr = IEnumString_Next(obj, 44, (LPOLESTR *)&tmp, &i);
-    ok(hr == S_FALSE, "got 0x%08x\n", hr);
+    ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr);
     hr = IEnumString_Skip(obj, 1);
-    ok(hr == E_NOTIMPL, "got 0x%08x\n", hr);
+    ok(hr == E_NOTIMPL, "Unexpected hr %#lx.\n", hr);
     hr = IEnumString_Clone(obj, (IEnumString **)&tmp);
-    ok(hr == E_OUTOFMEMORY, "got 0x%08x\n", hr);
+    ok(hr == E_OUTOFMEMORY, "Unexpected hr %#lx.\n", hr);
     hr = IACList_Expand(acl, exp);
-    ok(hr == S_OK, "got 0x%08x\n", hr);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
 
     acl1 = TestACL_Constructor(3, strings1);
     acl2 = TestACL_Constructor(3, strings2);
     hr = IObjMgr_Append(mgr, (IUnknown *)&acl1->IACList_iface);
-    ok(hr == S_OK, "got 0x%08x\n", hr);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
     hr = IObjMgr_Append(mgr, (IUnknown *)&acl2->IACList_iface);
-    ok(hr == S_OK, "got 0x%08x\n", hr);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
     hr = IObjMgr_Append(mgr, NULL);
-    ok(hr == E_FAIL, "got 0x%08x\n", hr);
+    ok(hr == E_FAIL, "Unexpected hr %#lx.\n", hr);
     expect_str(obj, "a");
     expect_str(obj, "c");
     expect_str(obj, "e");
     expect_str(obj, "a");
     expect_str(obj, "b");
     expect_str(obj, "d");
-    expect_end(obj);
+    hr = IEnumString_Next(obj, 1, &wstr, &i);
+    ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr);
 
     hr = IEnumString_Reset(obj);
-    ok(hr == S_OK, "got 0x%08x\n", hr);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
     ok(acl1->pos == 0, "acl1 not reset\n");
     ok(acl2->pos == 0, "acl2 not reset\n");
 
     hr = IACList_Expand(acl, exp);
-    ok(hr == S_OK, "got 0x%08x\n", hr);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
     ok(acl1->expcount == 1, "expcount - expected 1, got %d\n", acl1->expcount);
     ok(acl2->expcount == 0 /* XP */ || acl2->expcount == 1 /* Vista */,
         "expcount - expected 0 or 1, got %d\n", acl2->expcount);
 
     hr = IEnumString_Next(obj, 15, wstrtab, &i);
-    ok(hr == S_OK, "got 0x%08x\n", hr);
-    ok(i == 1, "Expected i == 1, got %d\n", i);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    ok(i == 1, "Expected i == 1, got %ld\n", i);
     CoTaskMemFree(wstrtab[0]);
 
     hr = IEnumString_Next(obj, 15, wstrtab, &i);
-    ok(hr == S_OK, "got 0x%08x\n", hr);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
     CoTaskMemFree(wstrtab[0]);
 
     hr = IEnumString_Next(obj, 15, wstrtab, &i);
-    ok(hr == S_OK, "got 0x%08x\n", hr);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
     CoTaskMemFree(wstrtab[0]);
 
     hr = IEnumString_Next(obj, 15, wstrtab, &i);
-    ok(hr == S_OK, "got 0x%08x\n", hr);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
     CoTaskMemFree(wstrtab[0]);
 
     hr = IACList_Expand(acl, exp);
-    ok(hr == S_OK, "got 0x%08x\n", hr);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
     ok(acl1->expcount == 2, "expcount - expected 1, got %d\n", acl1->expcount);
     ok(acl2->expcount == 0 /* XP */ || acl2->expcount == 2 /* Vista */,
         "expcount - expected 0 or 2, got %d\n", acl2->expcount);
     acl1->expret = S_FALSE;
     hr = IACList_Expand(acl, exp);
-    ok(hr == S_OK, "got 0x%08x\n", hr);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
     ok(acl1->expcount == 3, "expcount - expected 1, got %d\n", acl1->expcount);
     ok(acl2->expcount == 1 /* XP */ || acl2->expcount == 3 /* Vista */,
         "expcount - expected 0 or 3, got %d\n", acl2->expcount);
     acl1->expret = E_NOTIMPL;
     hr = IACList_Expand(acl, exp);
-    ok(hr == S_OK, "got 0x%08x\n", hr);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
     ok(acl1->expcount == 4, "expcount - expected 1, got %d\n", acl1->expcount);
     ok(acl2->expcount == 2 /* XP */ || acl2->expcount == 4 /* Vista */,
         "expcount - expected 0 or 4, got %d\n", acl2->expcount);
     acl2->expret = E_OUTOFMEMORY;
     hr = IACList_Expand(acl, exp);
-    ok(hr == E_OUTOFMEMORY, "got 0x%08x\n", hr);
+    ok(hr == E_OUTOFMEMORY, "Unexpected hr %#lx.\n", hr);
     acl2->expret = E_FAIL;
     hr = IACList_Expand(acl, exp);
-    ok(hr == E_FAIL, "got 0x%08x\n", hr);
+    ok(hr == E_FAIL, "Unexpected hr %#lx.\n", hr);
 
     hr = IObjMgr_Remove(mgr, (IUnknown *)&acl1->IACList_iface);
-    ok(hr == S_OK, "got 0x%08x\n", hr);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
 
     ok(acl1->ref == 1, "acl1 not released\n");
-    expect_end(obj);
+    hr = IEnumString_Next(obj, 1, &wstr, &i);
+    ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr);
     IEnumString_Reset(obj);
     expect_str(obj, "a");
     expect_str(obj, "b");
     expect_str(obj, "d");
-    expect_end(obj);
+    hr = IEnumString_Next(obj, 1, &wstr, &i);
+    ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr);
 
     IEnumString_Release(obj);
     IACList_Release(acl);
@@ -371,13 +370,13 @@ static void test_ACListISF(void)
     HRESULT hr;
 
     hr = CoCreateInstance(&CLSID_ACListISF, NULL, CLSCTX_INPROC, &IID_IACList, (void**)&list);
-    ok(hr == S_OK, "failed to create ACListISF instance, 0x%08x\n", hr);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
 
     hr = IACList_QueryInterface(list, &IID_IEnumString, (void**)&enumstring);
-    ok(hr == S_OK, "got 0x%08x\n", hr);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
 
     hr = IEnumString_QueryInterface(enumstring, &IID_IACList, (void**)&list2);
-    ok(hr == S_OK, "got 0x%08x\n", hr);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
     ok(list == list2, "got %p, %p\n", list, list2);
     IACList_Release(list2);
 
diff --git a/dlls/browseui/tests/progressdlg.c b/dlls/browseui/tests/progressdlg.c
index 22037141d60..c8dec007ff1 100644
--- a/dlls/browseui/tests/progressdlg.c
+++ b/dlls/browseui/tests/progressdlg.c
@@ -33,26 +33,27 @@ static void test_IProgressDialog_QueryInterface(void)
     IUnknown *unk;
     HRESULT hr;
 
-    hr = CoCreateInstance(&CLSID_ProgressDialog, NULL, CLSCTX_INPROC_SERVER, &IID_IProgressDialog, (void*)&dlg);
-    if (FAILED(hr)) {
-        win_skip("CoCreateInstance for IProgressDialog returned 0x%x\n", hr);
+    hr = CoCreateInstance(&CLSID_ProgressDialog, NULL, CLSCTX_INPROC_SERVER, &IID_IProgressDialog, (void **)&dlg);
+    if (FAILED(hr))
+    {
+        win_skip("ProgressDialog is not supported, hr %#lx.\n", hr);
         return;
     }
 
     hr = IProgressDialog_QueryInterface(dlg, &IID_IUnknown, NULL);
-    ok(hr == E_POINTER, "got 0x%x (expected E_POINTER)\n", hr);
+    ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr);
 
     hr = IProgressDialog_QueryInterface(dlg, &IID_IUnknown, (void**)&unk);
-    ok(hr == S_OK, "QueryInterface (IUnknown) returned 0x%x\n", hr);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
     if (SUCCEEDED(hr)) {
         IUnknown_Release(unk);
     }
 
     hr = IProgressDialog_QueryInterface(dlg, &IID_IOleWindow, (void**)&olewindow);
-    ok(hr == S_OK, "QueryInterface (IOleWindow) returned 0x%x\n", hr);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
     if (SUCCEEDED(hr)) {
         hr = IOleWindow_QueryInterface(olewindow, &IID_IProgressDialog, (void**)&dlg2);
-        ok(hr == S_OK, "QueryInterface (IProgressDialog) returned 0x%x\n", hr);
+        ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
         if (SUCCEEDED(hr)) {
             IProgressDialog_Release(dlg2);
         }