Andrew Eikum : shell32/tests: Remove unused flag.
Alexandre Julliard
julliard at wine.codeweavers.com
Thu Mar 12 10:48:18 CDT 2015
Module: wine
Branch: master
Commit: 7a55f5461aa02e7d8b7b3003d265320a4a1c0b01
URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a55f5461aa02e7d8b7b3003d265320a4a1c0b01
Author: Andrew Eikum <aeikum at codeweavers.com>
Date: Wed Mar 11 12:12:04 2015 -0500
shell32/tests: Remove unused flag.
---
dlls/shell32/tests/shellpath.c | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c
index b727e1d..2036b51 100644
--- a/dlls/shell32/tests/shellpath.c
+++ b/dlls/shell32/tests/shellpath.c
@@ -887,7 +887,6 @@ if (0) { /* crashes */
/* Standard CSIDL values (and their flags) uses only two less-significant bytes */
#define NO_CSIDL 0x10000
-#define CSIDL_TODO_WINE 0x20000
#define KNOWN_FOLDER(id, csidl, name, category, parent, relative_path, parsing_name, attributes, definitionFlags) \
{ &id, # id, csidl, # csidl, name, category, &parent, # parent, relative_path, parsing_name, attributes, definitionFlags, __LINE__ }
@@ -1940,17 +1939,15 @@ static void check_known_folder(IKnownFolderManager *mgr, KNOWNFOLDERID *folderId
*current_known_folder_found = TRUE;
found = TRUE;
/* verify CSIDL */
- if(known_folder->csidl != NO_CSIDL)
+ if(!(known_folder->csidl & NO_CSIDL))
{
- expectedCsidl = known_folder->csidl & (~CSIDL_TODO_WINE);
+ /* mask off winetest flags */
+ expectedCsidl = known_folder->csidl & 0xFFFF;
hr = IKnownFolderManager_FolderIdToCsidl(mgr, folderId, &csidl);
ok_(__FILE__, known_folder->line)(hr == S_OK, "cannot retrieve CSIDL for folder %s\n", known_folder->sFolderId);
- if(known_folder->csidl & CSIDL_TODO_WINE)
- todo_wine ok_(__FILE__, known_folder->line)(csidl == expectedCsidl, "invalid CSIDL retrieved for folder %s. %d (%s) expected, but %d found\n", known_folder->sFolderId, expectedCsidl, known_folder->sCsidl, csidl);
- else
- ok_(__FILE__, known_folder->line)(csidl == expectedCsidl, "invalid CSIDL retrieved for folder %s. %d (%s) expected, but %d found\n", known_folder->sFolderId, expectedCsidl, known_folder->sCsidl, csidl);
+ ok_(__FILE__, known_folder->line)(csidl == expectedCsidl, "invalid CSIDL retrieved for folder %s. %d (%s) expected, but %d found\n", known_folder->sFolderId, expectedCsidl, known_folder->sCsidl, csidl);
}
hr = IKnownFolderManager_GetFolder(mgr, folderId, &folder);
@@ -2028,7 +2025,6 @@ static void check_known_folder(IKnownFolderManager *mgr, KNOWNFOLDERID *folderId
}
}
#undef NO_CSIDL
-#undef CSIDL_TODO_WINE
static void test_knownFolders(void)
{
More information about the wine-cvs
mailing list