[PATCH 13/25] dlls/shdocvw/tests: enable compilation with long types
Eric Pouech
eric.pouech at gmail.com
Sat Mar 5 05:07:49 CST 2022
Signed-off-by: Eric Pouech <eric.pouech at gmail.com>
---
dlls/shdocvw/tests/Makefile.in | 1 -
dlls/shdocvw/tests/shdocvw.c | 46 ++++++++++++++++++++--------------------
dlls/shdocvw/tests/shortcut.c | 12 +++++-----
3 files changed, 29 insertions(+), 30 deletions(-)
diff --git a/dlls/shdocvw/tests/Makefile.in b/dlls/shdocvw/tests/Makefile.in
index 7fb0f544025..4c415363e2d 100644
--- a/dlls/shdocvw/tests/Makefile.in
+++ b/dlls/shdocvw/tests/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
TESTDLL = shdocvw.dll
IMPORTS = shell32 ole32 oleaut32 advapi32
diff --git a/dlls/shdocvw/tests/shdocvw.c b/dlls/shdocvw/tests/shdocvw.c
index d54cf1613ac..fcfd4a644db 100644
--- a/dlls/shdocvw/tests/shdocvw.c
+++ b/dlls/shdocvw/tests/shdocvw.c
@@ -96,7 +96,7 @@ static void test_URLSubRegQueryA(void)
buffer[sizeof(buffer)-1] = '\0';
/* called by inetcpl.cpl */
hr = pURLSubRegQueryA(regpath_iemain, default_page_url, REG_SZ, buffer, INTERNET_MAX_URL_LENGTH, -1);
- ok(hr == E_FAIL || hr == S_OK, "got 0x%x (expected E_FAIL or S_OK)\n", hr);
+ ok(hr == E_FAIL || hr == S_OK, "got 0x%lx (expected E_FAIL or S_OK)\n", hr);
memset(buffer, '#', sizeof(buffer)-1);
buffer[sizeof(buffer)-1] = '\0';
@@ -104,7 +104,7 @@ static void test_URLSubRegQueryA(void)
hr = pURLSubRegQueryA(regpath_iemain, start_page, REG_SZ, buffer, INTERNET_MAX_URL_LENGTH, -1);
len = lstrlenA(buffer);
/* respect privacy: do not dump the url */
- ok(hr == S_OK, "got 0x%x and %d (expected S_OK)\n", hr, len);
+ ok(hr == S_OK, "got 0x%lx and %ld (expected S_OK)\n", hr, len);
/* test buffer length: just large enough */
memset(buffer, '#', sizeof(buffer)-1);
@@ -113,7 +113,7 @@ static void test_URLSubRegQueryA(void)
used = lstrlenA(buffer);
/* respect privacy: do not dump the url */
ok((hr == S_OK) && (used == len),
- "got 0x%x and %d (expected S_OK and %d)\n", hr, used, len);
+ "got 0x%lx and %ld (expected S_OK and %ld)\n", hr, used, len);
/* no space for terminating 0: result is truncated */
memset(buffer, '#', sizeof(buffer)-1);
@@ -121,7 +121,7 @@ static void test_URLSubRegQueryA(void)
hr = pURLSubRegQueryA(regpath_iemain, start_page, REG_SZ, buffer, len, -1);
used = lstrlenA(buffer);
ok((hr == S_OK) && (used == len - 1),
- "got 0x%x and %d (expected S_OK and %d)\n", hr, used, len - 1);
+ "got 0x%lx and %ld (expected S_OK and %ld)\n", hr, used, len - 1);
/* no space for the complete result: truncate another char */
if (len > 1) {
@@ -130,7 +130,7 @@ static void test_URLSubRegQueryA(void)
hr = pURLSubRegQueryA(regpath_iemain, start_page, REG_SZ, buffer, len-1, -1);
used = lstrlenA(buffer);
ok((hr == S_OK) && (used == (len - 2)),
- "got 0x%x and %d (expected S_OK and %d)\n", hr, used, len - 2);
+ "got 0x%lx and %ld (expected S_OK and %ld)\n", hr, used, len - 2);
}
/* only space for the terminating 0: function still succeeded */
@@ -139,7 +139,7 @@ static void test_URLSubRegQueryA(void)
hr = pURLSubRegQueryA(regpath_iemain, start_page, REG_SZ, buffer, 1, -1);
used = lstrlenA(buffer);
ok((hr == S_OK) && !used,
- "got 0x%x and %d (expected S_OK and 0)\n", hr, used);
+ "got 0x%lx and %ld (expected S_OK and 0)\n", hr, used);
/* size of buffer is 0, but the function still succeed.
buffer[0] is cleared in IE 5.01 and IE 5.5 (Buffer Overflow) */
@@ -149,23 +149,23 @@ static void test_URLSubRegQueryA(void)
used = lstrlenA(buffer);
ok( (hr == S_OK) &&
((used == INTERNET_MAX_URL_LENGTH - 1) || broken(used == 0)) ,
- "got 0x%x and %d (expected S_OK and INTERNET_MAX_URL_LENGTH - 1)\n",
+ "got 0x%lx and %ld (expected S_OK and INTERNET_MAX_URL_LENGTH - 1)\n",
hr, used);
/* still succeed without a buffer for the result */
hr = pURLSubRegQueryA(regpath_iemain, start_page, REG_SZ, NULL, 0, -1);
- ok(hr == S_OK, "got 0x%x (expected S_OK)\n", hr);
+ ok(hr == S_OK, "got 0x%lx (expected S_OK)\n", hr);
/* still succeed, when a length is given without a buffer */
hr = pURLSubRegQueryA(regpath_iemain, start_page, REG_SZ, NULL, INTERNET_MAX_URL_LENGTH, -1);
- ok(hr == S_OK, "got 0x%x (expected S_OK)\n", hr);
+ ok(hr == S_OK, "got 0x%lx (expected S_OK)\n", hr);
/* this value does not exist */
memset(buffer, '#', sizeof(buffer)-1);
buffer[sizeof(buffer)-1] = '\0';
hr = pURLSubRegQueryA(regpath_iemain, does_not_exist, REG_SZ, buffer, INTERNET_MAX_URL_LENGTH, -1);
/* random bytes are copied to the buffer */
- ok((hr == E_FAIL), "got 0x%x (expected E_FAIL)\n", hr);
+ ok((hr == E_FAIL), "got 0x%lx (expected E_FAIL)\n", hr);
/* the third parameter is ignored. Is it really a type? (data is REG_SZ) */
memset(buffer, '#', sizeof(buffer)-1);
@@ -173,20 +173,20 @@ static void test_URLSubRegQueryA(void)
hr = pURLSubRegQueryA(regpath_iemain, start_page, REG_DWORD, buffer, INTERNET_MAX_URL_LENGTH, -1);
used = lstrlenA(buffer);
ok((hr == S_OK) && (used == len),
- "got 0x%x and %d (expected S_OK and %d)\n", hr, used, len);
+ "got 0x%lx and %ld (expected S_OK and %ld)\n", hr, used, len);
/* the function works for HKCU and HKLM */
memset(buffer, '#', sizeof(buffer)-1);
buffer[sizeof(buffer)-1] = '\0';
hr = pURLSubRegQueryA(regpath_shellfolders, appdata, REG_SZ, buffer, INTERNET_MAX_URL_LENGTH, -1);
used = lstrlenA(buffer);
- ok(hr == S_OK, "got 0x%x and %d (expected S_OK)\n", hr, used);
+ ok(hr == S_OK, "got 0x%lx and %ld (expected S_OK)\n", hr, used);
memset(buffer, '#', sizeof(buffer)-1);
buffer[sizeof(buffer)-1] = '\0';
hr = pURLSubRegQueryA(regpath_shellfolders, common_appdata, REG_SZ, buffer, INTERNET_MAX_URL_LENGTH, -1);
used = lstrlenA(buffer);
- ok(hr == S_OK, "got 0x%x and %d (expected S_OK)\n", hr, used);
+ ok(hr == S_OK, "got 0x%lx and %ld (expected S_OK)\n", hr, used);
/* todo: what does the last parameter mean? */
}
@@ -217,7 +217,7 @@ static void test_ParseURLFromOutsideSourceA(void)
/* len does not include the terminating 0, when buffer is large enough */
ok( res != 0 && len == ParseURL_table[i].len &&
!lstrcmpA(buffer, ParseURL_table[i].newurl),
- "#%d: got %d and %d with '%s' (expected '!=0' and %d with '%s')\n",
+ "#%d: got %ld and %ld with '%s' (expected '!=0' and %ld with '%s')\n",
i, res, len, buffer, ParseURL_table[i].len, ParseURL_table[i].newurl);
@@ -233,7 +233,7 @@ static void test_ParseURLFromOutsideSourceA(void)
res = pParseURLFromOutsideSourceA(ParseURL_table[i].url, buffer, &len, &dummy);
ok( res != 0 && len == ParseURL_table[i].len &&
!lstrcmpA(buffer, ParseURL_table[i].newurl),
- "#%d (+1): got %d and %d with '%s' (expected '!=0' and %d with '%s')\n",
+ "#%d (+1): got %ld and %ld with '%s' (expected '!=0' and %ld with '%s')\n",
i, res, len, buffer, ParseURL_table[i].len, ParseURL_table[i].newurl);
memset(buffer, '#', sizeof(buffer)-1);
@@ -243,7 +243,7 @@ static void test_ParseURLFromOutsideSourceA(void)
res = pParseURLFromOutsideSourceA(ParseURL_table[i].url, buffer, &len, &dummy);
/* len includes the terminating 0, when the buffer is too small */
ok( res == 0 && len == ParseURL_table[i].len + 1,
- "#%d (==): got %d and %d (expected '0' and %d)\n",
+ "#%d (==): got %ld and %ld (expected '0' and %ld)\n",
i, res, len, ParseURL_table[i].len + 1);
memset(buffer, '#', sizeof(buffer)-1);
@@ -253,7 +253,7 @@ static void test_ParseURLFromOutsideSourceA(void)
res = pParseURLFromOutsideSourceA(ParseURL_table[i].url, buffer, &len, &dummy);
/* len includes the terminating 0 on XP SP1 and before, when the buffer is too small */
ok( res == 0 && (len == ParseURL_table[i].len || len == ParseURL_table[i].len + 1),
- "#%d (-1): got %d and %d (expected '0' and %d or %d)\n",
+ "#%d (-1): got %ld and %ld (expected '0' and %ld or %ld)\n",
i, res, len, ParseURL_table[i].len, ParseURL_table[i].len + 1);
memset(buffer, '#', sizeof(buffer)-1);
@@ -263,7 +263,7 @@ static void test_ParseURLFromOutsideSourceA(void)
res = pParseURLFromOutsideSourceA(ParseURL_table[i].url, NULL, &len, &dummy);
/* len does not include the terminating 0, when buffer is NULL */
ok( res == 0 && len == ParseURL_table[i].len,
- "#%d (buffer): got %d and %d (expected '0' and %d)\n",
+ "#%d (buffer): got %ld and %ld (expected '0' and %ld)\n",
i, res, len, ParseURL_table[i].len);
if (0) {
@@ -278,7 +278,7 @@ static void test_ParseURLFromOutsideSourceA(void)
res = pParseURLFromOutsideSourceA(ParseURL_table[i].url, buffer, &len, NULL);
ok( res != 0 && len == ParseURL_table[i].len &&
!lstrcmpA(buffer, ParseURL_table[i].newurl),
- "#%d (unknown): got %d and %d with '%s' (expected '!=0' and %d with '%s')\n",
+ "#%d (unknown): got %ld and %ld with '%s' (expected '!=0' and %ld with '%s')\n",
i, res, len, buffer, ParseURL_table[i].len, ParseURL_table[i].newurl);
}
}
@@ -312,7 +312,7 @@ static void test_ParseURLFromOutsideSourceW(void)
WideCharToMultiByte(CP_ACP, 0, bufferW, -1, bufferA, sizeof(bufferA), NULL, NULL);
ok( res != 0 && len == ParseURL_table[0].len &&
!lstrcmpA(bufferA, ParseURL_table[0].newurl),
- "got %d and %d with '%s' (expected '!=0' and %d with '%s')\n",
+ "got %ld and %ld with '%s' (expected '!=0' and %ld with '%s')\n",
res, len, bufferA, ParseURL_table[0].len, ParseURL_table[0].newurl);
@@ -328,7 +328,7 @@ static void test_ParseURLFromOutsideSourceW(void)
/* len does not include the terminating 0, when buffer is large enough */
ok( res != 0 && len == ParseURL_table[0].len &&
!lstrcmpA(bufferA, ParseURL_table[0].newurl),
- "+1: got %d and %d with '%s' (expected '!=0' and %d with '%s')\n",
+ "+1: got %ld and %ld with '%s' (expected '!=0' and %ld with '%s')\n",
res, len, bufferA, ParseURL_table[0].len, ParseURL_table[0].newurl);
len = maxlen;
@@ -336,7 +336,7 @@ static void test_ParseURLFromOutsideSourceW(void)
res = pParseURLFromOutsideSourceW(urlW, bufferW, &len, &dummy);
/* len includes the terminating 0, when the buffer is too small */
ok( res == 0 && len == ParseURL_table[0].len + 1,
- "==: got %d and %d (expected '0' and %d)\n",
+ "==: got %ld and %ld (expected '0' and %ld)\n",
res, len, ParseURL_table[0].len + 1);
len = maxlen - 1;
@@ -344,7 +344,7 @@ static void test_ParseURLFromOutsideSourceW(void)
res = pParseURLFromOutsideSourceW(urlW, bufferW, &len, &dummy);
/* len includes the terminating 0 on XP SP1 and before, when the buffer is too small */
ok( res == 0 && (len == ParseURL_table[0].len || len == ParseURL_table[0].len + 1),
- "-1: got %d and %d (expected '0' and %d or %d)\n",
+ "-1: got %ld and %ld (expected '0' and %ld or %ld)\n",
res, len, ParseURL_table[0].len, ParseURL_table[0].len + 1);
}
diff --git a/dlls/shdocvw/tests/shortcut.c b/dlls/shdocvw/tests/shortcut.c
index 5cf1c4bad7f..c744b01ca21 100644
--- a/dlls/shdocvw/tests/shortcut.c
+++ b/dlls/shdocvw/tests/shortcut.c
@@ -172,7 +172,7 @@ static void test_ShortcutFolder(void) {
register_keys(HKEY_CLASSES_ROOT, HKEY_CLASSES_ROOT_keys, 1);
hr = SHGetDesktopFolder(&pDesktopFolder);
- ok (SUCCEEDED(hr), "SHGetDesktopFolder failed! hr = %08x\n", hr);
+ ok (SUCCEEDED(hr), "SHGetDesktopFolder failed! hr = %08lx\n", hr);
if (FAILED(hr)) goto cleanup;
/* Convert the wszWineTestFolder string to an ITEMIDLIST. */
@@ -181,7 +181,7 @@ static void test_ShortcutFolder(void) {
todo_wine
{
ok (hr == HRESULT_FROM_WIN32(ERROR_INVALID_PARAMETER),
- "Expected %08x, got %08x\n", HRESULT_FROM_WIN32(ERROR_INVALID_PARAMETER), hr);
+ "Expected %08lx, got %08lx\n", HRESULT_FROM_WIN32(ERROR_INVALID_PARAMETER), hr);
}
if (FAILED(hr)) {
IShellFolder_Release(pDesktopFolder);
@@ -196,22 +196,22 @@ static void test_ShortcutFolder(void) {
(LPVOID*)&pWineTestFolder);
IShellFolder_Release(pDesktopFolder);
ILFree(pidlWineTestFolder);
- ok (SUCCEEDED(hr), "IShellFolder::BindToObject(WineTestFolder) failed! hr = %08x\n", hr);
+ ok (SUCCEEDED(hr), "IShellFolder::BindToObject(WineTestFolder) failed! hr = %08lx\n", hr);
if (FAILED(hr)) goto cleanup;
hr = IShellFolder_QueryInterface(pWineTestFolder, &IID_IPersistFolder3, (LPVOID*)&pWineTestPersistFolder);
- ok (SUCCEEDED(hr), "IShellFolder::QueryInterface(IPersistFolder3) failed! hr = %08x\n", hr);
+ ok (SUCCEEDED(hr), "IShellFolder::QueryInterface(IPersistFolder3) failed! hr = %08lx\n", hr);
IShellFolder_Release(pWineTestFolder);
if (FAILED(hr)) goto cleanup;
/* The resulting folder object has the FolderShortcut CLSID, instead of its own. */
hr = IPersistFolder3_GetClassID(pWineTestPersistFolder, &clsid);
- ok (SUCCEEDED(hr), "IPersist::GetClassID failed! hr = %08x\n", hr);
+ ok (SUCCEEDED(hr), "IPersist::GetClassID failed! hr = %08lx\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 = %08x\n", hr);
+ ok (SUCCEEDED(hr), "IPersistFolder3::GetCurFolder failed! hr = %08lx\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");
More information about the wine-devel
mailing list