Commit 4f2ed594 authored by Eric Pouech's avatar Eric Pouech Committed by Alexandre Julliard

shdocvw/tests: Enable compilation with long types.

parent 9ed10e48
EXTRADEFS = -DWINE_NO_LONG_TYPES
TESTDLL = shdocvw.dll TESTDLL = shdocvw.dll
IMPORTS = shell32 ole32 oleaut32 advapi32 IMPORTS = shell32 ole32 oleaut32 advapi32
......
...@@ -172,7 +172,7 @@ static void test_ShortcutFolder(void) { ...@@ -172,7 +172,7 @@ static void test_ShortcutFolder(void) {
register_keys(HKEY_CLASSES_ROOT, HKEY_CLASSES_ROOT_keys, 1); register_keys(HKEY_CLASSES_ROOT, HKEY_CLASSES_ROOT_keys, 1);
hr = SHGetDesktopFolder(&pDesktopFolder); 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; if (FAILED(hr)) goto cleanup;
/* Convert the wszWineTestFolder string to an ITEMIDLIST. */ /* Convert the wszWineTestFolder string to an ITEMIDLIST. */
...@@ -181,7 +181,7 @@ static void test_ShortcutFolder(void) { ...@@ -181,7 +181,7 @@ static void test_ShortcutFolder(void) {
todo_wine todo_wine
{ {
ok (hr == HRESULT_FROM_WIN32(ERROR_INVALID_PARAMETER), 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)) { if (FAILED(hr)) {
IShellFolder_Release(pDesktopFolder); IShellFolder_Release(pDesktopFolder);
...@@ -196,22 +196,22 @@ static void test_ShortcutFolder(void) { ...@@ -196,22 +196,22 @@ static void test_ShortcutFolder(void) {
(LPVOID*)&pWineTestFolder); (LPVOID*)&pWineTestFolder);
IShellFolder_Release(pDesktopFolder); IShellFolder_Release(pDesktopFolder);
ILFree(pidlWineTestFolder); 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; if (FAILED(hr)) goto cleanup;
hr = IShellFolder_QueryInterface(pWineTestFolder, &IID_IPersistFolder3, (LPVOID*)&pWineTestPersistFolder); 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); IShellFolder_Release(pWineTestFolder);
if (FAILED(hr)) goto cleanup; if (FAILED(hr)) goto cleanup;
/* The resulting folder object has the FolderShortcut CLSID, instead of its own. */ /* The resulting folder object has the FolderShortcut CLSID, instead of its own. */
hr = IPersistFolder3_GetClassID(pWineTestPersistFolder, &clsid); 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"); ok (IsEqualCLSID(&CLSID_FolderShortcut, &clsid), "GetClassId returned wrong CLSID!\n");
pidlCurFolder = (LPITEMIDLIST)0xdeadbeef; pidlCurFolder = (LPITEMIDLIST)0xdeadbeef;
hr = IPersistFolder3_GetCurFolder(pWineTestPersistFolder, &pidlCurFolder); 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 && ok (pidlCurFolder->mkid.cb == 20 && ((LPSHITEMID)((BYTE*)pidlCurFolder+20))->cb == 0 &&
IsEqualCLSID(&CLSID_WineTest, (REFCLSID)((LPBYTE)pidlCurFolder+4)), IsEqualCLSID(&CLSID_WineTest, (REFCLSID)((LPBYTE)pidlCurFolder+4)),
"GetCurFolder returned unexpected pidl!\n"); "GetCurFolder returned unexpected pidl!\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