December 2007 - Wine-commits

Kirill K. Smirnov : winhelp: Rewrite internal files lookup using B+ tree search. Add some sanity checks .
by Alexandre Julliard 03 Dec '07

03 Dec '07

Module: wine Branch: master Commit: 2c52f8883ddc3ef1d8973b272dbdb6596dd5bc45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c52f8883ddc3ef1d8973b272… Author: Kirill K. Smirnov <lich(a)math.spbu.ru> Date: Sat Dec 1 19:01:47 2007 +0300 winhelp: Rewrite internal files lookup using B+ tree search. Add some sanity checks. --- programs/winhelp/hlpfile.c | 96 +++++++++++++++++--------------------------- 1 files changed, 37 insertions(+), 59 deletions(-) diff --git a/programs/winhelp/hlpfile.c b/programs/winhelp/hlpfile.c index 27d5555..54ea5bd 100644 --- a/programs/winhelp/hlpfile.c +++ b/programs/winhelp/hlpfile.c @@ -51,6 +51,7 @@ static inline unsigned GET_UINT(const BYTE* buffer, unsigned i) static HLPFILE *first_hlpfile = 0; static BYTE *file_buffer; +static UINT file_buffer_size; static struct { @@ -1328,7 +1329,6 @@ static BOOL HLPFILE_ReadFont(HLPFILE* hlpfile) static BOOL HLPFILE_ReadFileToBuffer(HFILE hFile) { BYTE header[16], dummy[1]; - UINT size; if (_hread(hFile, header, 16) != 16) {WINE_WARN("header\n"); return FALSE;}; @@ -1336,87 +1336,65 @@ static BOOL HLPFILE_ReadFileToBuffer(HFILE hFile) if (GET_UINT(header, 0) != 0x00035F3F) {WINE_WARN("wrong header\n"); return FALSE;}; - size = GET_UINT(header, 12); - file_buffer = HeapAlloc(GetProcessHeap(), 0, size + 1); + file_buffer_size = GET_UINT(header, 12); + file_buffer = HeapAlloc(GetProcessHeap(), 0, file_buffer_size + 1); if (!file_buffer) return FALSE; memcpy(file_buffer, header, 16); - if (_hread(hFile, file_buffer + 16, size - 16) != size - 16) + if (_hread(hFile, file_buffer + 16, file_buffer_size - 16) != file_buffer_size - 16) {WINE_WARN("filesize1\n"); return FALSE;}; if (_hread(hFile, dummy, 1) != 0) WINE_WARN("filesize2\n"); - file_buffer[size] = '\0'; /* FIXME: was '0', sounds ackward to me */ + file_buffer[file_buffer_size] = '\0'; /* FIXME: was '0', sounds ackward to me */ return TRUE; } +/************************************************************************** + * comp_FindSubFile + * + * HLPFILE_BPTreeCompare function for HLPFILE directory. + * + */ +static int comp_FindSubFile(void *p, const void *key, + int leaf, void** next) +{ + *next = (char *)p+strlen(p)+(leaf?5:3); + WINE_TRACE("Comparing '%s' with '%s'\n", (char *)p, (char *)key); + return strcmp(p, key); +} + /*********************************************************************** * * HLPFILE_FindSubFile */ static BOOL HLPFILE_FindSubFile(LPCSTR name, BYTE **subbuf, BYTE **subend) { - BYTE *root = file_buffer + GET_UINT(file_buffer, 4); - BYTE *end = file_buffer + GET_UINT(file_buffer, 12); BYTE *ptr; - BYTE *bth; - - unsigned pgsize; - unsigned pglast; - unsigned nentries; - unsigned i, n; - bth = root + 9; - - /* FIXME: this should be using the EnumBTree functions from this file */ - pgsize = GET_USHORT(bth, 4); - WINE_TRACE("%s => pgsize=%u #pg=%u rootpg=%u #lvl=%u\n", - name, pgsize, GET_USHORT(bth, 30), GET_USHORT(bth, 26), GET_USHORT(bth, 32)); - - ptr = bth + 38 + GET_USHORT(bth, 26) * pgsize; - - for (n = 1; n < GET_USHORT(bth, 32); n++) + WINE_TRACE("looking for file '%s'\n", name); + ptr = HLPFILE_BPTreeSearch(file_buffer + GET_UINT(file_buffer, 4), + name, comp_FindSubFile); + if (!ptr) return FALSE; + *subbuf = file_buffer + GET_UINT(ptr, strlen(name)+1); + if (*subbuf >= file_buffer + file_buffer_size) { - nentries = GET_USHORT(ptr, 2); - pglast = GET_USHORT(ptr, 4); - WINE_TRACE("[%u]: #entries=%u next=%u\n", n, nentries, pglast); - - ptr += 6; - for (i = 0; i < nentries; i++) - { - char *str = (char*) ptr; - WINE_TRACE("<= %s\n", str); - if (strcmp(name, str) < 0) break; - ptr += strlen(str) + 1; - pglast = GET_USHORT(ptr, 0); - ptr += 2; - } - ptr = bth + 38 + pglast * pgsize; + WINE_ERR("internal file %s does not fit\n", name); + return FALSE; } - - nentries = GET_USHORT(ptr, 2); - ptr += 8; - for (i = 0; i < nentries; i++) + *subend = *subbuf + GET_UINT(*subbuf, 0); + if (*subend > file_buffer + file_buffer_size) { - char* fname = (char*)ptr; - ptr += strlen(fname) + 1; - WINE_TRACE("\\- %s\n", fname); - if (strcmp(fname, name) == 0) - { - *subbuf = file_buffer + GET_UINT(ptr, 0); - *subend = *subbuf + GET_UINT(*subbuf, 0); - if (file_buffer > *subbuf || *subbuf > *subend || *subend > end) - { - WINE_WARN("size mismatch\n"); - return FALSE; - } - return TRUE; - } - ptr += 4; + WINE_ERR("internal file %s does not fit\n", name); + return FALSE; } - - return FALSE; + if (GET_UINT(*subbuf, 0) < GET_UINT(*subbuf, 4) + 9) + { + WINE_ERR("invalid size provided for internal file %s\n", name); + return FALSE; + } + return TRUE; } /***********************************************************************

1 0

Kirill K. Smirnov : winhelp: Enlarge font size by 3 as native winhelp does.
by Alexandre Julliard 03 Dec '07

03 Dec '07

Module: wine Branch: master Commit: 33a05f088ea6cff1be632950a9a11a55c3578b41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33a05f088ea6cff1be632950a… Author: Kirill K. Smirnov <lich(a)math.spbu.ru> Date: Sat Dec 1 19:03:20 2007 +0300 winhelp: Enlarge font size by 3 as native winhelp does. --- programs/winhelp/hlpfile.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winhelp/hlpfile.c b/programs/winhelp/hlpfile.c index 54ea5bd..f9a6cc1 100644 --- a/programs/winhelp/hlpfile.c +++ b/programs/winhelp/hlpfile.c @@ -1266,7 +1266,7 @@ static BOOL HLPFILE_ReadFont(HLPFILE* hlpfile) flag = ref[dscr_offset + i * 11 + 0]; family = ref[dscr_offset + i * 11 + 2]; - hlpfile->fonts[i].LogFont.lfHeight = -ref[dscr_offset + i * 11 + 1] / 2; + hlpfile->fonts[i].LogFont.lfHeight = -ref[dscr_offset + i * 11 + 1] / 2 - 3; hlpfile->fonts[i].LogFont.lfWidth = 0; hlpfile->fonts[i].LogFont.lfEscapement = 0; hlpfile->fonts[i].LogFont.lfOrientation = 0;

1 0

Aric Stewart : uninstaller: Iterate keys in HKEY_CURRENT_USER also as some programs install their uninstall information there .
by Alexandre Julliard 03 Dec '07

03 Dec '07

Module: wine Branch: master Commit: 6312ccca556848baa62a83a1fe4500624503cc5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6312ccca556848baa62a83a1f… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Dec 3 12:07:31 2007 +0900 uninstaller: Iterate keys in HKEY_CURRENT_USER also as some programs install their uninstall information there. --- programs/uninstaller/main.c | 34 +++++++++++++++++++++++----------- 1 files changed, 23 insertions(+), 11 deletions(-) diff --git a/programs/uninstaller/main.c b/programs/uninstaller/main.c index 09b173c..72d62f0 100644 --- a/programs/uninstaller/main.c +++ b/programs/uninstaller/main.c @@ -32,6 +32,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(uninstaller); typedef struct { + HKEY root; WCHAR *key; WCHAR *descr; WCHAR *command; @@ -182,7 +183,7 @@ static int cmp_by_name(const void *a, const void *b) /** * Fetch information from the uninstall key. */ -static int FetchUninstallInformation(void) +static int FetchFromRootKey(HKEY root) { HKEY hkeyUninst, hkeyApp; int i; @@ -190,14 +191,9 @@ static int FetchUninstallInformation(void) WCHAR subKeyName[256]; WCHAR key_app[1024]; WCHAR *p; - - numentries = 0; - oldsel = -1; - if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, PathUninstallW, 0, KEY_READ, &hkeyUninst) != ERROR_SUCCESS) - return 0; - if (!entries) - entries = HeapAlloc(GetProcessHeap(), 0, sizeof(uninst_entry)); + if (RegOpenKeyExW(root, PathUninstallW, 0, KEY_READ, &hkeyUninst) != ERROR_SUCCESS) + return 0; lstrcpyW(key_app, PathUninstallW); lstrcatW(key_app, BackSlashW); @@ -207,12 +203,13 @@ static int FetchUninstallInformation(void) for (i=0; RegEnumKeyExW( hkeyUninst, i, subKeyName, &sizeOfSubKeyName, NULL, NULL, NULL, NULL ) != ERROR_NO_MORE_ITEMS; ++i) { lstrcpyW(p, subKeyName); - RegOpenKeyExW(HKEY_LOCAL_MACHINE, key_app, 0, KEY_READ, &hkeyApp); + RegOpenKeyExW(root, key_app, 0, KEY_READ, &hkeyApp); if ((RegQueryValueExW(hkeyApp, DisplayNameW, 0, 0, NULL, &displen) == ERROR_SUCCESS) && (RegQueryValueExW(hkeyApp, UninstallCommandlineW, 0, 0, NULL, &uninstlen) == ERROR_SUCCESS)) { numentries++; entries = HeapReAlloc(GetProcessHeap(), 0, entries, numentries*sizeof(uninst_entry)); + entries[numentries-1].root = root; entries[numentries-1].key = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(subKeyName)+1)*sizeof(WCHAR)); lstrcpyW(entries[numentries-1].key, subKeyName); entries[numentries-1].descr = HeapAlloc(GetProcessHeap(), 0, displen); @@ -228,11 +225,26 @@ static int FetchUninstallInformation(void) RegCloseKey(hkeyApp); sizeOfSubKeyName = 255; } - qsort(entries, numentries, sizeof(uninst_entry), cmp_by_name); RegCloseKey(hkeyUninst); return 1; + } +static int FetchUninstallInformation(void) +{ + int rc; + + numentries = 0; + oldsel = -1; + if (!entries) + entries = HeapAlloc(GetProcessHeap(), 0, sizeof(uninst_entry)); + + rc = FetchFromRootKey(HKEY_LOCAL_MACHINE); + rc |= FetchFromRootKey(HKEY_CURRENT_USER); + + qsort(entries, numentries, sizeof(uninst_entry), cmp_by_name); + return rc; +} static void UninstallProgram(void) { @@ -264,7 +276,7 @@ static void UninstallProgram(void) if(MessageBoxW(0, errormsg, sAppName, MB_YESNO | MB_ICONQUESTION)==IDYES) { /* delete the application's uninstall entry */ - RegOpenKeyExW(HKEY_LOCAL_MACHINE, PathUninstallW, 0, KEY_READ, &hkey); + RegOpenKeyExW(entries[i].root, PathUninstallW, 0, KEY_READ, &hkey); RegDeleteKeyW(hkey, entries[i].key); RegCloseKey(hkey); }

1 0

Detlef Riekenberg : wine.inf: Add more fake dlls.
by Alexandre Julliard 03 Dec '07

03 Dec '07

Module: wine Branch: master Commit: 14ac9c915d05839a19a1b2b6c8eae2fb19f60c4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=14ac9c915d05839a19a1b2b6c… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Dec 3 05:19:33 2007 +0100 wine.inf: Add more fake dlls. --- tools/wine.inf | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf b/tools/wine.inf index d4b2bed..37e8417 100644 --- a/tools/wine.inf +++ b/tools/wine.inf @@ -2234,6 +2234,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,msi.dll 11,,msiexec.exe 11,,msvcrt.dll +11,,msxml3.dll 11,,notepad.exe 11,,ntdll.dll 11,,ole32.dll @@ -2248,7 +2249,10 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,riched20.dll 11,,riched32.dll 11,,rpcrt4.dll +11,,rsabase.dll +11,,rsaenh.dll 11,,rundll32.exe +11,,schannel.dll 11,,setupapi.dll 11,,shdocvw.dll 11,,shell32.dll

1 0

Detlef Riekenberg : rsabase: Add version resource.
by Alexandre Julliard 03 Dec '07

03 Dec '07

Module: wine Branch: master Commit: 6c0f85c8a629f914dcce094c12af7ed9cb1abd14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c0f85c8a629f914dcce094c1… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Dec 3 05:41:33 2007 +0100 rsabase: Add version resource. --- .gitignore | 1 + dlls/rsabase/Makefile.in | 2 ++ dlls/rsabase/version.rc | 26 ++++++++++++++++++++++++++ 3 files changed, 29 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index b442c45..4cff5df 100644 --- a/.gitignore +++ b/.gitignore @@ -405,6 +405,7 @@ dlls/rpcrt4/version.res dlls/rsabase/tests/*.ok dlls/rsabase/tests/rsabase_crosstest.exe dlls/rsabase/tests/testlist.c +dlls/rsabase/version.res dlls/rsaenh/librsaenh.def dlls/rsaenh/tests/*.ok dlls/rsaenh/tests/rsaenh_crosstest.exe diff --git a/dlls/rsabase/Makefile.in b/dlls/rsabase/Makefile.in index 00c1dad..033c203 100644 --- a/dlls/rsabase/Makefile.in +++ b/dlls/rsabase/Makefile.in @@ -6,6 +6,8 @@ VPATH = @srcdir@ MODULE = rsabase.dll IMPORTS = rsaenh kernel32 +RC_SRCS = version.rc + @MAKE_DLL_RULES@ @DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/rsabase/version.rc b/dlls/rsabase/version.rc new file mode 100644 index 0000000..56c7502 --- /dev/null +++ b/dlls/rsabase/version.rc @@ -0,0 +1,26 @@ +/* + * Copyright (c) 2007 Detlef Riekenberg + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define WINE_FILEDESCRIPTION_STR "Wine rsabase" +#define WINE_FILENAME_STR "rsabase.dll" +#define WINE_FILEVERSION 5,1,2600,2180 +#define WINE_FILEVERSION_STR "5.1.2600.2180" +#define WINE_PRODUCTVERSION 5,1,2600,2180 +#define WINE_PRODUCTVERSION_STR "5.1.2600.2180" + +#include "wine/wine_common_ver.rc"

1 0

Detlef Riekenberg : schannel: Add version resource.
by Alexandre Julliard 03 Dec '07

03 Dec '07

Module: wine Branch: master Commit: b94ebc4ebf2b414853ac2588d79ac9d48bf8a0fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=b94ebc4ebf2b414853ac2588d… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Dec 3 05:42:06 2007 +0100 schannel: Add version resource. --- .gitignore | 1 + dlls/schannel/Makefile.in | 2 ++ dlls/schannel/version.rc | 26 ++++++++++++++++++++++++++ 3 files changed, 29 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index 4cff5df..86bba92 100644 --- a/.gitignore +++ b/.gitignore @@ -415,6 +415,7 @@ dlls/sane.ds/rsrc.res dlls/schannel/tests/*.ok dlls/schannel/tests/schannel_crosstest.exe dlls/schannel/tests/testlist.c +dlls/schannel/version.res dlls/secur32/libsecur32.def dlls/secur32/tests/*.ok dlls/secur32/tests/secur32_crosstest.exe diff --git a/dlls/schannel/Makefile.in b/dlls/schannel/Makefile.in index 3cf48ef..273aed2 100644 --- a/dlls/schannel/Makefile.in +++ b/dlls/schannel/Makefile.in @@ -10,6 +10,8 @@ C_SRCS = \ schannel_main.c \ usermode.c +RC_SRCS = version.rc + @MAKE_DLL_RULES@ @DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/schannel/version.rc b/dlls/schannel/version.rc new file mode 100644 index 0000000..0b41bd5 --- /dev/null +++ b/dlls/schannel/version.rc @@ -0,0 +1,26 @@ +/* + * Copyright (c) 2007 Detlef Riekenberg + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define WINE_FILEDESCRIPTION_STR "Wine schannel" +#define WINE_FILENAME_STR "schannel.dll" +#define WINE_FILEVERSION 5,1,2600,2180 +#define WINE_FILEVERSION_STR "5.1.2600.2180" +#define WINE_PRODUCTVERSION 5,1,2600,2180 +#define WINE_PRODUCTVERSION_STR "5.1.2600.2180" + +#include "wine/wine_common_ver.rc"

1 0

Kirill K. Smirnov : winhelp: Rewrite Context support using B+ tree search.
by Alexandre Julliard 03 Dec '07

03 Dec '07

Module: wine Branch: master Commit: f4023569b3cfcd5f29bedabf29ed8eb0e7ccca5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4023569b3cfcd5f29bedabf2… Author: Kirill K. Smirnov <lich(a)math.spbu.ru> Date: Sat Dec 1 19:01:25 2007 +0300 winhelp: Rewrite Context support using B+ tree search. --- programs/winhelp/hlpfile.c | 100 ++++++++++++------------------------------- programs/winhelp/hlpfile.h | 9 +---- 2 files changed, 29 insertions(+), 80 deletions(-) diff --git a/programs/winhelp/hlpfile.c b/programs/winhelp/hlpfile.c index af86690..27d5555 100644 --- a/programs/winhelp/hlpfile.c +++ b/programs/winhelp/hlpfile.c @@ -161,13 +161,32 @@ HLPFILE_PAGE *HLPFILE_PageByOffset(HLPFILE* hlpfile, LONG offset) return found; } +/************************************************************************** + * comp_PageByHash + * + * HLPFILE_BPTreeCompare function for '|CONTEXT' B+ tree file + * + */ +static int comp_PageByHash(void *p, const void *key, + int leaf, void** next) +{ + LONG lKey = (LONG)key; + LONG lTest = GET_UINT(p, 0); + + *next = (char *)p+(leaf?8:6); + WINE_TRACE("Comparing '%u' with '%u'\n", lKey, lTest); + if (lTest < lKey) return -1; + if (lTest > lKey) return 1; + return 0; +} + /*********************************************************************** * * HLPFILE_HlpFilePageByHash */ HLPFILE_PAGE *HLPFILE_PageByHash(HLPFILE* hlpfile, LONG lHash) { - unsigned int i; + BYTE *ptr; if (!hlpfile) return 0; @@ -177,14 +196,14 @@ HLPFILE_PAGE *HLPFILE_PageByHash(HLPFILE* hlpfile, LONG lHash) if (hlpfile->version <= 16) return HLPFILE_PageByNumber(hlpfile, lHash); - for (i = 0; i < hlpfile->wContextLen; i++) + ptr = HLPFILE_BPTreeSearch(hlpfile->Context, (void*)lHash, comp_PageByHash); + if (!ptr) { - if (hlpfile->Context[i].lHash == lHash) - return HLPFILE_PageByOffset(hlpfile, hlpfile->Context[i].offset); + WINE_ERR("Page of hash %x not found in file %s\n", lHash, hlpfile->lpszPath); + return NULL; } - WINE_ERR("Page of hash %x not found in file %s\n", lHash, hlpfile->lpszPath); - return NULL; + return HLPFILE_PageByOffset(hlpfile, GET_UINT(ptr, 4)); } /*********************************************************************** @@ -272,7 +291,6 @@ HLPFILE *HLPFILE_ReadHlpFile(LPCSTR lpszPath) hlpfile->lpszCopyright = NULL; hlpfile->first_page = NULL; hlpfile->first_macro = NULL; - hlpfile->wContextLen = 0; hlpfile->Context = NULL; hlpfile->wMapLen = 0; hlpfile->Map = NULL; @@ -1978,63 +1996,6 @@ static void* HLPFILE_BPTreeSearch(BYTE* buf, const void* key, return NULL; } -/****************************************************************** - * HLPFILE_EnumBTreeLeaves - * - * - */ -static void HLPFILE_EnumBTreeLeaves(const BYTE* buf, const BYTE* end, unsigned (*fn)(const BYTE*, void*), void* user) -{ - unsigned psize, pnext; - unsigned num, nlvl; - const BYTE* ptr; - - num = GET_UINT(buf, 9 + 34); - psize = GET_USHORT(buf, 9 + 4); - nlvl = GET_USHORT(buf, 9 + 32); - pnext = GET_USHORT(buf, 9 + 26); - - WINE_TRACE("BTree: #entries=%u pagSize=%u #levels=%u #pages=%u root=%u struct%16s\n", - num, psize, nlvl, GET_USHORT(buf, 9 + 30), pnext, buf + 9 + 6); - if (!num) return; - - while (--nlvl > 0) - { - ptr = (buf + 9 + 38) + pnext * psize; - WINE_TRACE("BTree: (index[%u]) unused=%u #entries=%u <%u\n", - pnext, GET_USHORT(ptr, 0), GET_USHORT(ptr, 2), GET_USHORT(ptr, 4)); - pnext = GET_USHORT(ptr, 4); - } - while (pnext != 0xFFFF) - { - const BYTE* node_page; - unsigned short limit; - - node_page = ptr = (buf + 9 + 38) + pnext * psize; - limit = GET_USHORT(ptr, 2); - WINE_TRACE("BTree: (leaf [%u]) unused=%u #entries=%u <%u >%u\n", - pnext, GET_USHORT(ptr, 0), limit, GET_USHORT(ptr, 4), GET_USHORT(ptr, 6)); - ptr += 8; - while (limit--) - ptr += (fn)(ptr, user); - pnext = GET_USHORT(node_page, 6); - } -} - -struct myfncb { - HLPFILE* hlpfile; - int i; -}; - -static unsigned myfn(const BYTE* ptr, void* user) -{ - struct myfncb* m = user; - - m->hlpfile->Context[m->i].lHash = GET_UINT(ptr, 0); - m->hlpfile->Context[m->i].offset = GET_UINT(ptr, 4); - m->i++; - return 8; -} /*********************************************************************** * @@ -2043,19 +2004,14 @@ static unsigned myfn(const BYTE* ptr, void* user) static BOOL HLPFILE_GetContext(HLPFILE *hlpfile) { BYTE *cbuf, *cend; - struct myfncb m; unsigned clen; if (!HLPFILE_FindSubFile("|CONTEXT", &cbuf, &cend)) {WINE_WARN("context0\n"); return FALSE;} - clen = GET_UINT(cbuf, 0x2b); - hlpfile->Context = HeapAlloc(GetProcessHeap(), 0, clen * sizeof(HLPFILE_CONTEXT)); + clen = cend - cbuf; + hlpfile->Context = HeapAlloc(GetProcessHeap(), 0, clen); if (!hlpfile->Context) return FALSE; - hlpfile->wContextLen = clen; - - m.hlpfile = hlpfile; - m.i = 0; - HLPFILE_EnumBTreeLeaves(cbuf, cend, myfn, &m); + memcpy(hlpfile->Context, cbuf, clen); return TRUE; } diff --git a/programs/winhelp/hlpfile.h b/programs/winhelp/hlpfile.h index 3c6b6b9..69cd604 100644 --- a/programs/winhelp/hlpfile.h +++ b/programs/winhelp/hlpfile.h @@ -104,12 +104,6 @@ typedef struct tagHlpFilePage typedef struct { - LONG lHash; - unsigned long offset; -} HLPFILE_CONTEXT; - -typedef struct -{ LONG lMap; unsigned long offset; } HLPFILE_MAP; @@ -128,8 +122,7 @@ typedef struct tagHlpFileFile LPSTR lpszCopyright; HLPFILE_PAGE* first_page; HLPFILE_MACRO* first_macro; - unsigned wContextLen; - HLPFILE_CONTEXT* Context; + BYTE* Context; unsigned wMapLen; HLPFILE_MAP* Map; unsigned long contents_start;

1 0

Kirill K. Smirnov : winhelp: Implement generic B+ tree search function.
by Alexandre Julliard 03 Dec '07

03 Dec '07

Module: wine Branch: master Commit: 6e002c59ce38a496ad27168defe26ad3ab50b031 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e002c59ce38a496ad27168de… Author: Kirill K. Smirnov <lich(a)math.spbu.ru> Date: Sat Dec 1 19:00:24 2007 +0300 winhelp: Implement generic B+ tree search function. --- programs/winhelp/hlpfile.c | 74 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 74 insertions(+), 0 deletions(-) diff --git a/programs/winhelp/hlpfile.c b/programs/winhelp/hlpfile.c index 8252446..af86690 100644 --- a/programs/winhelp/hlpfile.c +++ b/programs/winhelp/hlpfile.c @@ -75,6 +75,18 @@ static struct HLPFILE_LINK* link; } attributes; +/* + * Compare function type for HLPFILE_BPTreeSearch function. + * + * PARAMS + * p [I] pointer to testing block (key + data) + * key [I] pointer to key value to look for + * leaf [I] whether this function called for index of leaf page + * next [O] pointer to pointer to next block + */ +typedef int (*HLPFILE_BPTreeCompare)(void *p, const void *key, + int leaf, void **next); + static BOOL HLPFILE_DoReadHlpFile(HLPFILE*, LPCSTR); static BOOL HLPFILE_ReadFileToBuffer(HFILE); static BOOL HLPFILE_FindSubFile(LPCSTR name, BYTE**, BYTE**); @@ -93,6 +105,8 @@ static BOOL HLPFILE_Uncompress3(char*, const char*, const BYTE*, const BYTE*); static void HLPFILE_UncompressRLE(const BYTE* src, const BYTE* end, BYTE** dst, unsigned dstsz); static BOOL HLPFILE_ReadFont(HLPFILE* hlpfile); +static void* HLPFILE_BPTreeSearch(BYTE*, const void*, HLPFILE_BPTreeCompare); + /*********************************************************************** * * HLPFILE_PageByNumber @@ -1904,6 +1918,66 @@ static void HLPFILE_UncompressRLE(const BYTE* src, const BYTE* end, BYTE** dst, *dst - (sdst - dstsz), dstsz); } +/************************************************************************** + * HLPFILE_BPTreeSearch + * + * Searches for an element in B+ tree + * + * PARAMS + * buf [I] pointer to the embedded file structured as a B+ tree + * key [I] pointer to data to find + * comp [I] compare function + * + * RETURNS + * Pointer to block identified by key, or NULL if failure. + * + */ +static void* HLPFILE_BPTreeSearch(BYTE* buf, const void* key, + HLPFILE_BPTreeCompare comp) +{ + unsigned magic; + unsigned page_size; + unsigned cur_page; + unsigned level; + BYTE *pages, *ptr, *newptr; + int i, entries; + int ret; + + magic = GET_USHORT(buf, 9); + if (magic != 0x293B) + { + WINE_ERR("Invalid magic in B+ tree: 0x%x\n", magic); + return NULL; + } + page_size = GET_USHORT(buf, 9+4); + cur_page = GET_USHORT(buf, 9+26); + level = GET_USHORT(buf, 9+32); + pages = buf + 9 + 38; + while (--level > 0) + { + ptr = pages + cur_page*page_size; + entries = GET_SHORT(ptr, 2); + ptr += 6; + for (i = 0; i < entries; i++) + { + if (comp(ptr, key, 0, (void **)&newptr) > 0) break; + ptr = newptr; + } + cur_page = GET_USHORT(ptr-2, 0); + } + ptr = pages + cur_page*page_size; + entries = GET_SHORT(ptr, 2); + ptr += 8; + for (i = 0; i < entries; i++) + { + ret = comp(ptr, key, 1, (void **)&newptr); + if (ret == 0) return ptr; + if (ret > 0) return NULL; + ptr = newptr; + } + return NULL; +} + /****************************************************************** * HLPFILE_EnumBTreeLeaves *

1 0

Kirill K. Smirnov : winhelp: winhelp 3. 0 uses page numbers instead of hash values.
by Alexandre Julliard 03 Dec '07

03 Dec '07

Module: wine Branch: master Commit: bef9ab5dd517239d5e097eaa9eea47453b571b4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=bef9ab5dd517239d5e097eaa9… Author: Kirill K. Smirnov <lich(a)math.spbu.ru> Date: Sat Dec 1 18:59:56 2007 +0300 winhelp: winhelp 3.0 uses page numbers instead of hash values. --- programs/winhelp/hlpfile.c | 21 ++++++++++----------- 1 files changed, 10 insertions(+), 11 deletions(-) diff --git a/programs/winhelp/hlpfile.c b/programs/winhelp/hlpfile.c index 1b4fc58..8252446 100644 --- a/programs/winhelp/hlpfile.c +++ b/programs/winhelp/hlpfile.c @@ -93,27 +93,22 @@ static BOOL HLPFILE_Uncompress3(char*, const char*, const BYTE*, const BYTE*); static void HLPFILE_UncompressRLE(const BYTE* src, const BYTE* end, BYTE** dst, unsigned dstsz); static BOOL HLPFILE_ReadFont(HLPFILE* hlpfile); -#if 0 /*********************************************************************** * * HLPFILE_PageByNumber */ -static HLPFILE_PAGE *HLPFILE_PageByNumber(LPCSTR lpszPath, UINT wNum) +static HLPFILE_PAGE *HLPFILE_PageByNumber(HLPFILE* hlpfile, UINT wNum) { HLPFILE_PAGE *page; - HLPFILE *hlpfile = HLPFILE_ReadHlpFile(lpszPath); - - if (!hlpfile) return 0; - - WINE_TRACE("[%s/%u]\n", lpszPath, wNum); + UINT temp = wNum; - for (page = hlpfile->first_page; page && wNum; page = page->next) wNum--; - - /* HLPFILE_FreeHlpFile(lpszPath); */ + WINE_TRACE("<%s>[%u]\n", hlpfile->lpszPath, wNum); + for (page = hlpfile->first_page; page && temp; page = page->next) temp--; + if (!page) + WINE_ERR("Page of number %u not found in file %s\n", wNum, hlpfile->lpszPath); return page; } -#endif /* FIXME: * this finds the page containing the offset. The offset can either @@ -164,6 +159,10 @@ HLPFILE_PAGE *HLPFILE_PageByHash(HLPFILE* hlpfile, LONG lHash) WINE_TRACE("<%s>[%x]\n", hlpfile->lpszPath, lHash); + /* For win 3.0 files hash values are really page numbers */ + if (hlpfile->version <= 16) + return HLPFILE_PageByNumber(hlpfile, lHash); + for (i = 0; i < hlpfile->wContextLen; i++) { if (hlpfile->Context[i].lHash == lHash)

1 0

Kirill K. Smirnov : winhelp: Add support for winhelp 3.0 topics.
by Alexandre Julliard 03 Dec '07

03 Dec '07

Module: wine Branch: master Commit: ee863153cd2a159e8a058d401d0c97ed76627778 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee863153cd2a159e8a058d401… Author: Kirill K. Smirnov <lich(a)math.spbu.ru> Date: Sat Dec 1 18:59:41 2007 +0300 winhelp: Add support for winhelp 3.0 topics. --- programs/winhelp/hlpfile.c | 43 ++++++++++++++++++++++++++++++++++--------- 1 files changed, 34 insertions(+), 9 deletions(-) diff --git a/programs/winhelp/hlpfile.c b/programs/winhelp/hlpfile.c index e678a4a..1b4fc58 100644 --- a/programs/winhelp/hlpfile.c +++ b/programs/winhelp/hlpfile.c @@ -341,6 +341,13 @@ static BOOL HLPFILE_DoReadHlpFile(HLPFILE *hlpfile, LPCSTR lpszPath) index = (ref - 0x0C) / hlpfile->dsize; offset = (ref - 0x0C) % hlpfile->dsize; + if (hlpfile->version <= 16 && index != old_index && index != 0) + { + /* we jumped to the next block, adjust pointers */ + ref -= 12; + offset -= 12; + } + WINE_TRACE("ref=%08x => [%u/%u]\n", ref, index, offset); if (index >= topic.wMapLen) {WINE_WARN("maplen\n"); break;} @@ -355,11 +362,8 @@ static BOOL HLPFILE_DoReadHlpFile(HLPFILE *hlpfile, LPCSTR lpszPath) if (!HLPFILE_AddPage(hlpfile, buf, end, index * 0x8000L + offs)) return FALSE; break; + case 0x01: case 0x20: - if (!HLPFILE_AddParagraph(hlpfile, buf, end, &len)) return FALSE; - offs += len; - break; - case 0x23: if (!HLPFILE_AddParagraph(hlpfile, buf, end, &len)) return FALSE; offs += len; @@ -369,10 +373,18 @@ static BOOL HLPFILE_DoReadHlpFile(HLPFILE *hlpfile, LPCSTR lpszPath) WINE_ERR("buf[0x14] = %x\n", buf[0x14]); } - ref = GET_UINT(buf, 0xc); + if (hlpfile->version <= 16) + { + ref += GET_UINT(buf, 0xc); + if (GET_UINT(buf, 0xc) == 0) + break; + } + else + ref = GET_UINT(buf, 0xc); } while (ref != 0xffffffff); HLPFILE_GetMap(hlpfile); + if (hlpfile->version <= 16) return TRUE; return HLPFILE_GetContext(hlpfile); } @@ -388,7 +400,6 @@ static BOOL HLPFILE_AddPage(HLPFILE *hlpfile, BYTE *buf, BYTE *end, unsigned off char* ptr; HLPFILE_MACRO*macro; - if (buf + 0x31 > end) {WINE_WARN("page1\n"); return FALSE;}; title = buf + GET_UINT(buf, 0x10); if (title > end) {WINE_WARN("page2\n"); return FALSE;}; @@ -897,8 +908,12 @@ static BOOL HLPFILE_AddParagraph(HLPFILE *hlpfile, BYTE *buf, BYTE *end, unsigne format = buf + 0x15; format_end = buf + GET_UINT(buf, 0x10); - fetch_long(&format); - *len = fetch_ushort(&format); + if (buf[0x14] == 0x20 || buf[0x14] == 0x23) + { + fetch_long(&format); + *len = fetch_ushort(&format); + } + else *len = end-buf-15; if (buf[0x14] == 0x23) { @@ -918,7 +933,10 @@ static BOOL HLPFILE_AddParagraph(HLPFILE *hlpfile, BYTE *buf, BYTE *end, unsigne WINE_TRACE("looking for format at offset %u for column %d\n", format - (buf + 0x15), nc); if (buf[0x14] == 0x23) format += 5; - format += 4; + if (buf[0x14] == 0x01) + format += 6; + else + format += 4; bits = GET_USHORT(format, 0); format += 2; if (bits & 0x0001) fetch_long(&format); if (bits & 0x0002) fetch_short(&format); @@ -1108,6 +1126,13 @@ static BOOL HLPFILE_AddParagraph(HLPFILE *hlpfile, BYTE *buf, BYTE *end, unsigne case 0xE0: case 0xE1: WINE_WARN("jump topic 1 => %u\n", GET_UINT(format, 1)); + HLPFILE_FreeLink(attributes.link); + attributes.link = HLPFILE_AllocLink((*format & 1) ? hlp_link_link : hlp_link_popup, + hlpfile->lpszPath, + GET_UINT(format, 1)-16, + 1, -1); + + format += 5; break;

1 0