[akhaldi] 73945: [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.

Author: akhaldi
Date: Sun Feb 26 17:18:23 2017
New Revision: 73945

URL: http://svn.reactos.org/svn/reactos?rev=73945&view=rev
Log:
[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.

Modified:
    trunk/reactos/dll/win32/hhctrl.ocx/search.c
    trunk/reactos/dll/win32/hhctrl.ocx/stream.c
    trunk/reactos/media/doc/README.WINE

Modified: trunk/reactos/dll/win32/hhctrl.ocx/search.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/searc…
==============================================================================
--- trunk/reactos/dll/win32/hhctrl.ocx/search.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/hhctrl.ocx/search.c	[iso-8859-1] Sun Feb 26 17:18:23 2017
@@ -162,14 +162,14 @@
     }
     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);

Modified: trunk/reactos/dll/win32/hhctrl.ocx/stream.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/strea…
==============================================================================
--- trunk/reactos/dll/win32/hhctrl.ocx/stream.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/hhctrl.ocx/stream.c	[iso-8859-1] Sun Feb 26 17:18:23 2017
@@ -134,17 +134,6 @@
 
 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;

Modified: trunk/reactos/media/doc/README.WINE
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…
==============================================================================
--- trunk/reactos/media/doc/README.WINE	[iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE	[iso-8859-1] Sun Feb 26 17:18:23 2017
@@ -69,7 +69,7 @@
 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