hhctrl.ocx: Also take basename of folders when searching.

Signed-off-by: Vincent Povirk <vincent@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

hhctrl.ocx: Also take basename of folders when searching.
a16344ca · Vincent Povirk · Alexandre Julliard · fedc26ec · a16344ca
Commit a16344ca authored Jan 25, 2017 by Vincent Povirk Committed by Alexandre Julliard Jan 25, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

search.c dlls/hhctrl.ocx/search.c +4 -4

No files found.
--- a/dlls/hhctrl.ocx/search.c
+++ b/dlls/hhctrl.ocx/search.c
@@ -167,14 +167,14 @@ static SearchItem *SearchCHM_Storage(SearchItem *item, IStorage *pStorage,
    }
    while (IEnumSTATSTG_Next(elem, 1, &entries, &retr) == NOERROR)
    {
+        filename = entries.pwcsName;
+        while(strchrW(filename, '/'))
+            filename = strchrW(filename, '/')+1;
        switch(entries.type) {
        case STGTY_STORAGE:
-            item = SearchCHM_Folder(item, pStorage, entries.pwcsName, needle);
+            item = SearchCHM_Folder(item, pStorage, filename, needle);
            break;
        case STGTY_STREAM:
-            filename = entries.pwcsName;
-            while(strchrW(filename, '/'))
-                filename = strchrW(filename, '/')+1;
            if(strstrW(filename, szHTMext))
            {
                WCHAR *title = SearchCHM_File(pStorage, filename, needle);