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

shell32/tests: Remove empty element from known_folders[]. 

Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Józef Kucia 2018-06-22 13:34:03 +02:00 committed by Alexandre Julliard
parent 0304a312ed
commit a8b0a822ff
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1306,10 +1306,9 @@ static const struct knownFolderDef known_folders[] = {
NULL, NULL,
0, 0,
0), 0),
{ 0 }
}; };
#undef KNOWN_FOLDER #undef KNOWN_FOLDER
BOOL known_folder_found[ARRAY_SIZE(known_folders)-1]; BOOL known_folder_found[ARRAY_SIZE(known_folders)];
static void test_parameters(void) static void test_parameters(void)
{ {
@ -1873,9 +1872,6 @@ if (0) { /* crashes */
{ {
const KNOWNFOLDERID *folder_id = known_folders[i].folderId; const KNOWNFOLDERID *folder_id = known_folders[i].folderId;
if (!folder_id)
continue;
path = NULL; path = NULL;
hr = pSHGetKnownFolderPath(folder_id, KF_FLAG_DEFAULT, NULL, &path); hr = pSHGetKnownFolderPath(folder_id, KF_FLAG_DEFAULT, NULL, &path);
if (FAILED(hr)) if (FAILED(hr))
@ -1968,19 +1964,20 @@ static BOOL is_in_strarray(const WCHAR *needle, const char *hay)
static void check_known_folder(IKnownFolderManager *mgr, KNOWNFOLDERID *folderId) static void check_known_folder(IKnownFolderManager *mgr, KNOWNFOLDERID *folderId)
{ {
HRESULT hr; HRESULT hr;
const struct knownFolderDef *known_folder = &known_folders[0];
int csidl, expectedCsidl, ret; int csidl, expectedCsidl, ret;
KNOWNFOLDER_DEFINITION kfd; KNOWNFOLDER_DEFINITION kfd;
IKnownFolder *folder; IKnownFolder *folder;
WCHAR sName[1024]; WCHAR sName[1024];
BOOL *current_known_folder_found = &known_folder_found[0];
BOOL found = FALSE; BOOL found = FALSE;
unsigned int i;
while(known_folder->folderId != NULL) for (i = 0; i < ARRAY_SIZE(known_folders); ++i)
{ {
const struct knownFolderDef *known_folder = &known_folders[i];
if(IsEqualGUID(known_folder->folderId, folderId)) if(IsEqualGUID(known_folder->folderId, folderId))
{ {
*current_known_folder_found = TRUE; known_folder_found[i] = TRUE;
found = TRUE; found = TRUE;
/* verify CSIDL */ /* verify CSIDL */
if(!(known_folder->csidl & NO_CSIDL)) if(!(known_folder->csidl & NO_CSIDL))
@ -2032,8 +2029,6 @@ static void check_known_folder(IKnownFolderManager *mgr, KNOWNFOLDERID *folderId
break; break;
} }
known_folder++;
current_known_folder_found++;
} }
if(!found) if(!found)