From 2721d9f046a14da32cfd16214b0e810aab01f680 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Sun, 26 Feb 2017 17:18:23 +0000 Subject: [PATCH] [HHCTRL.OCX] Sync with Wine Staging 2.2. CORE-12823 89ca96d hhctrl.ocx: Don't skip a tag in next_node. a16344c hhctrl.ocx: Also take basename of folders when searching. svn path=/trunk/; revision=73945 --- reactos/dll/win32/hhctrl.ocx/search.c | 8 ++++---- reactos/dll/win32/hhctrl.ocx/stream.c | 11 ----------- reactos/media/doc/README.WINE | 2 +- 3 files changed, 5 insertions(+), 16 deletions(-) diff --git a/reactos/dll/win32/hhctrl.ocx/search.c b/reactos/dll/win32/hhctrl.ocx/search.c index c60879e1e60..874889071ba 100644 --- a/reactos/dll/win32/hhctrl.ocx/search.c +++ b/reactos/dll/win32/hhctrl.ocx/search.c @@ -162,14 +162,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); diff --git a/reactos/dll/win32/hhctrl.ocx/stream.c b/reactos/dll/win32/hhctrl.ocx/stream.c index 3cf810be028..226aa70184f 100644 --- a/reactos/dll/win32/hhctrl.ocx/stream.c +++ b/reactos/dll/win32/hhctrl.ocx/stream.c @@ -134,17 +134,6 @@ static BOOL find_node_end(stream_t *stream, strbuf_t *buf) BOOL next_node(stream_t *stream, strbuf_t *buf) { - strbuf_t tmpbuf; - - /* search through the end of the current node */ - strbuf_init(&tmpbuf); - if(!find_node_end(stream, &tmpbuf)) - { - strbuf_free(&tmpbuf); - return FALSE; - } - strbuf_free(&tmpbuf); - /* find the beginning of the next node */ if(!stream_chr(stream, NULL, '<')) return FALSE; diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE index a4c1a11d64b..c43eba9993b 100644 --- a/reactos/media/doc/README.WINE +++ b/reactos/media/doc/README.WINE @@ -69,7 +69,7 @@ reactos/dll/win32/faultrep # Synced to WineStaging-1.9.11 reactos/dll/win32/fontsub # Synced to WineStaging-1.9.13 reactos/dll/win32/fusion # Synced to WineStaging-1.9.23 reactos/dll/win32/gdiplus # Synced to WineStaging-1.9.23 -reactos/dll/win32/hhctrl.ocx # Synced to WineStaging-1.9.16 +reactos/dll/win32/hhctrl.ocx # Synced to WineStaging-2.2 reactos/dll/win32/hlink # Synced to WineStaging-1.9.16 reactos/dll/win32/hnetcfg # Synced to WineStaging-1.9.16 reactos/dll/win32/httpapi # Synced to WineStaging-1.9.11