ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

shell32/tests: Remove unused flag.

This commit is contained in:
Andrew Eikum 2015-03-11 12:12:04 -05:00 committed by Alexandre Julliard
parent dd275615db
commit 7a55f5461a
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dlls/shell32/tests/shellpath.c
View File

@ -887,7 +887,6 @@ if (0) { /* crashes */
/* Standard CSIDL values (and their flags) uses only two less-significant bytes */ /* Standard CSIDL values (and their flags) uses only two less-significant bytes */
#define NO_CSIDL 0x10000 #define NO_CSIDL 0x10000
#define CSIDL_TODO_WINE 0x20000
#define KNOWN_FOLDER(id, csidl, name, category, parent, relative_path, parsing_name, attributes, definitionFlags) \ #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__ } { &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; *current_known_folder_found = TRUE;
found = TRUE; found = TRUE;
/* verify CSIDL */ /* 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); hr = IKnownFolderManager_FolderIdToCsidl(mgr, folderId, &csidl);
ok_(__FILE__, known_folder->line)(hr == S_OK, "cannot retrieve CSIDL for folder %s\n", known_folder->sFolderId); 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) 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);
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);
} }
hr = IKnownFolderManager_GetFolder(mgr, folderId, &folder); hr = IKnownFolderManager_GetFolder(mgr, folderId, &folder);
@ -2028,7 +2025,6 @@ static void check_known_folder(IKnownFolderManager *mgr, KNOWNFOLDERID *folderId
} }
} }
#undef NO_CSIDL #undef NO_CSIDL
#undef CSIDL_TODO_WINE
static void test_knownFolders(void) static void test_knownFolders(void)
{ {