Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-15 08:56:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

[HHCTRL.OCX] Sync with Wine Staging 2.2. CORE-12823

Browse source 
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
This commit is contained in:
Amine Khaldi 2017-02-26 17:18:23 +00:00
parent 1e842f0e63
commit 2721d9f046
3 changed files with 5 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
reactos/dll/win32/hhctrl.ocx/search.c
View file

@ -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);

11
reactos/dll/win32/hhctrl.ocx/stream.c
View file

@ -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;

2
reactos/media/doc/README.WINE
View file

@ -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