February 2012 - Wine-commits

Jacek Caban : ieframe: Make get_typeinfo implementation thread safe and more generic.
by Alexandre Julliard 11 Feb '12

11 Feb '12

Module: wine Branch: master Commit: 770f864af492cf84b1e4d7427b1b04538dfaf754 URL: http://source.winehq.org/git/wine.git/?a=commit;h=770f864af492cf84b1e4d7427… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 10 12:36:29 2012 +0100 ieframe: Make get_typeinfo implementation thread safe and more generic. --- dlls/ieframe/ieframe.h | 12 +++++++- dlls/ieframe/ieframe_main.c | 70 +++++++++++++++++++++++++++++++++--------- dlls/ieframe/webbrowser.c | 6 ++-- 3 files changed, 69 insertions(+), 19 deletions(-) diff --git a/dlls/ieframe/ieframe.h b/dlls/ieframe/ieframe.h index 2953841..ac3e34d 100644 --- a/dlls/ieframe/ieframe.h +++ b/dlls/ieframe/ieframe.h @@ -283,7 +283,17 @@ void released_obj(void) DECLSPEC_HIDDEN; void register_iewindow_class(void) DECLSPEC_HIDDEN; void unregister_iewindow_class(void) DECLSPEC_HIDDEN; -HRESULT get_typeinfo(ITypeInfo**) DECLSPEC_HIDDEN; +#define TID_LIST \ + XIID(IWebBrowser2) + +typedef enum { +#define XIID(iface) iface ## _tid, +TID_LIST +#undef XIID + LAST_tid +} tid_t; + +HRESULT get_typeinfo(tid_t,ITypeInfo**) DECLSPEC_HIDDEN; HRESULT register_class_object(BOOL) DECLSPEC_HIDDEN; HRESULT WINAPI CUrlHistory_Create(IClassFactory*,IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; diff --git a/dlls/ieframe/ieframe_main.c b/dlls/ieframe/ieframe_main.c index cb810cc..cbdff92 100644 --- a/dlls/ieframe/ieframe_main.c +++ b/dlls/ieframe/ieframe_main.c @@ -54,31 +54,72 @@ const char *debugstr_variant(const VARIANT *v) } } -static ITypeInfo *wb_typeinfo = NULL; +static ITypeLib *typelib; +static ITypeInfo *typeinfos[LAST_tid]; -HRESULT get_typeinfo(ITypeInfo **typeinfo) +static REFIID tid_ids[] = { +#define XIID(iface) &IID_ ## iface, +TID_LIST +#undef XIID +}; + +static HRESULT load_typelib(void) { - ITypeLib *typelib; HRESULT hres; + ITypeLib *tl; - if(wb_typeinfo) { - *typeinfo = wb_typeinfo; - return S_OK; - } - - hres = LoadRegTypeLib(&LIBID_SHDocVw, 1, 1, LOCALE_SYSTEM_DEFAULT, &typelib); + hres = LoadRegTypeLib(&LIBID_SHDocVw, 1, 1, LOCALE_SYSTEM_DEFAULT, &tl); if(FAILED(hres)) { ERR("LoadRegTypeLib failed: %08x\n", hres); return hres; } - hres = ITypeLib_GetTypeInfoOfGuid(typelib, &IID_IWebBrowser2, &wb_typeinfo); - ITypeLib_Release(typelib); - - *typeinfo = wb_typeinfo; + if(InterlockedCompareExchangePointer((void**)&typelib, tl, NULL)) + ITypeLib_Release(tl); return hres; } +HRESULT get_typeinfo(tid_t tid, ITypeInfo **typeinfo) +{ + HRESULT hres; + + if(!typelib) + hres = load_typelib(); + if(!typelib) + return hres; + + if(!typeinfos[tid]) { + ITypeInfo *ti; + + hres = ITypeLib_GetTypeInfoOfGuid(typelib, tid_ids[tid], &ti); + if(FAILED(hres)) { + ERR("GetTypeInfoOfGuid(%s) failed: %08x\n", debugstr_guid(tid_ids[tid]), hres); + return hres; + } + + if(InterlockedCompareExchangePointer((void**)(typeinfos+tid), ti, NULL)) + ITypeInfo_Release(ti); + } + + *typeinfo = typeinfos[tid]; + return S_OK; +} + +static void release_typelib(void) +{ + unsigned i; + + if(!typelib) + return; + + for(i=0; i < sizeof(typeinfos)/sizeof(*typeinfos); i++) { + if(typeinfos[i]) + ITypeInfo_Release(typeinfos[i]); + } + + ITypeLib_Release(typelib); +} + static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID riid, void **ppv) { *ppv = NULL; @@ -186,8 +227,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) break; case DLL_PROCESS_DETACH: unregister_iewindow_class(); - if(wb_typeinfo) - ITypeInfo_Release(wb_typeinfo); + release_typelib(); } return TRUE; diff --git a/dlls/ieframe/webbrowser.c b/dlls/ieframe/webbrowser.c index 4846207..033cda8 100644 --- a/dlls/ieframe/webbrowser.c +++ b/dlls/ieframe/webbrowser.c @@ -200,7 +200,7 @@ static HRESULT WINAPI WebBrowser_GetTypeInfo(IWebBrowser2 *iface, UINT iTInfo, L TRACE("(%p)->(%d %d %p)\n", This, iTInfo, lcid, ppTInfo); - hres = get_typeinfo(&typeinfo); + hres = get_typeinfo(IWebBrowser2_tid, &typeinfo); if(FAILED(hres)) return hres; @@ -220,7 +220,7 @@ static HRESULT WINAPI WebBrowser_GetIDsOfNames(IWebBrowser2 *iface, REFIID riid, TRACE("(%p)->(%s %p %d %d %p)\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); - hres = get_typeinfo(&typeinfo); + hres = get_typeinfo(IWebBrowser2_tid, &typeinfo); if(FAILED(hres)) return hres; @@ -239,7 +239,7 @@ static HRESULT WINAPI WebBrowser_Invoke(IWebBrowser2 *iface, DISPID dispIdMember TRACE("(%p)->(%d %s %d %08x %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExepInfo, puArgErr); - hres = get_typeinfo(&typeinfo); + hres = get_typeinfo(IWebBrowser2_tid, &typeinfo); if(FAILED(hres)) return hres;

1 0

Jacek Caban : ieframe: Added IProvideClassInfo::GetClassInfo implementation .
by Alexandre Julliard 11 Feb '12

11 Feb '12

Module: wine Branch: master Commit: c6a8e9a5b8e4bf5327034025a430853cf46d1988 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6a8e9a5b8e4bf5327034025a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 10 12:36:53 2012 +0100 ieframe: Added IProvideClassInfo::GetClassInfo implementation. --- dlls/ieframe/classinfo.c | 14 +++++++++++--- dlls/ieframe/ieframe.h | 4 ++++ dlls/ieframe/ieframe_main.c | 2 ++ 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/dlls/ieframe/classinfo.c b/dlls/ieframe/classinfo.c index 30b8871..72798d6 100644 --- a/dlls/ieframe/classinfo.c +++ b/dlls/ieframe/classinfo.c @@ -52,11 +52,19 @@ static ULONG WINAPI ProvideClassInfo_Release(IProvideClassInfo2 *iface) return IWebBrowser_Release(&This->IWebBrowser2_iface); } -static HRESULT WINAPI ProvideClassInfo_GetClassInfo(IProvideClassInfo2 *iface, LPTYPEINFO *ppTI) +static HRESULT WINAPI ProvideClassInfo_GetClassInfo(IProvideClassInfo2 *iface, ITypeInfo **ppTI) { WebBrowser *This = impl_from_IProvideClassInfo2(iface); - FIXME("(%p)->(%p)\n", This, ppTI); - return E_NOTIMPL; + HRESULT hres; + + TRACE("(%p)->(%p)\n", This, ppTI); + + hres = get_typeinfo(This->version > 1 ? WebBrowser_tid : WebBrowser_V1_tid, ppTI); + if(FAILED(hres)) + return hres; + + ITypeInfo_AddRef(*ppTI); + return S_OK; } static HRESULT WINAPI ProvideClassInfo_GetGUID(IProvideClassInfo2 *iface, diff --git a/dlls/ieframe/ieframe.h b/dlls/ieframe/ieframe.h index ac3e34d..ae787a9 100644 --- a/dlls/ieframe/ieframe.h +++ b/dlls/ieframe/ieframe.h @@ -284,12 +284,16 @@ void register_iewindow_class(void) DECLSPEC_HIDDEN; void unregister_iewindow_class(void) DECLSPEC_HIDDEN; #define TID_LIST \ + XCLSID(WebBrowser) \ + XCLSID(WebBrowser_V1) \ XIID(IWebBrowser2) typedef enum { #define XIID(iface) iface ## _tid, +#define XCLSID(class) class ## _tid, TID_LIST #undef XIID +#undef XCLSID LAST_tid } tid_t; diff --git a/dlls/ieframe/ieframe_main.c b/dlls/ieframe/ieframe_main.c index cbdff92..56cd663 100644 --- a/dlls/ieframe/ieframe_main.c +++ b/dlls/ieframe/ieframe_main.c @@ -59,8 +59,10 @@ static ITypeInfo *typeinfos[LAST_tid]; static REFIID tid_ids[] = { #define XIID(iface) &IID_ ## iface, +#define XCLSID(class) &CLSID_ ## class, TID_LIST #undef XIID +#undef XCLSID }; static HRESULT load_typelib(void)

1 0

Jacek Caban : urlmon: Added more mk: combining tests.
by Alexandre Julliard 09 Feb '12

09 Feb '12

Module: wine Branch: master Commit: 2ce15be5fad42667ed81a02fbf2ba7285050768c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ce15be5fad42667ed81a02fb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 9 15:16:51 2012 +0100 urlmon: Added more mk: combining tests. --- dlls/urlmon/tests/uri.c | 162 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 162 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index 4b0e788..3d140ca 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -6695,6 +6695,168 @@ static const uri_combine_test uri_combine_tests[] = { {URLZONE_INVALID,E_NOTIMPL} } }, + { "mk:@MSITSTORE:C:\\dir\\file.chm::/subdir/file.txt",0, + "/relative/path.txt",Uri_CREATE_ALLOW_RELATIVE, + 0,S_OK,FALSE, + { + {"mk:@MSITSTORE:C:\\dir\\file.chm::/relative/path.txt",S_OK}, + {"",S_FALSE}, + {"mk:@MSITSTORE:C:\\dir\\file.chm::/relative/path.txt",S_OK}, + {"",S_FALSE}, + {".txt",S_OK}, + {"",S_FALSE}, + {"",S_FALSE}, + {"",S_FALSE}, + {"@MSITSTORE:C:\\dir\\file.chm::/relative/path.txt",S_OK}, + {"@MSITSTORE:C:\\dir\\file.chm::/relative/path.txt",S_OK}, + {"",S_FALSE}, + {"mk:@MSITSTORE:C:\\dir\\file.chm::/relative/path.txt",S_OK}, + {"mk",S_OK}, + {"",S_FALSE}, + {"",S_FALSE} + }, + { + {Uri_HOST_UNKNOWN,S_OK}, + {0,S_FALSE}, + {URL_SCHEME_MK,S_OK}, + {URLZONE_INVALID,E_NOTIMPL} + } + }, + { "mk:MSITSTORE:C:\\dir\\file.chm::/subdir/file.txt",0, + "/relative/path.txt",Uri_CREATE_ALLOW_RELATIVE, + 0,S_OK,FALSE, + { + {"mk:MSITSTORE:C:\\dir\\file.chm::/relative/path.txt",S_OK}, + {"",S_FALSE}, + {"mk:MSITSTORE:C:\\dir\\file.chm::/relative/path.txt",S_OK}, + {"",S_FALSE}, + {".txt",S_OK}, + {"",S_FALSE}, + {"",S_FALSE}, + {"",S_FALSE}, + {"MSITSTORE:C:\\dir\\file.chm::/relative/path.txt",S_OK}, + {"MSITSTORE:C:\\dir\\file.chm::/relative/path.txt",S_OK}, + {"",S_FALSE}, + {"mk:MSITSTORE:C:\\dir\\file.chm::/relative/path.txt",S_OK}, + {"mk",S_OK}, + {"",S_FALSE}, + {"",S_FALSE} + }, + { + {Uri_HOST_UNKNOWN,S_OK}, + {0,S_FALSE}, + {URL_SCHEME_MK,S_OK}, + {URLZONE_INVALID,E_NOTIMPL} + } + }, + { "mk:@MSITSTORE:C:\\dir\\file.chm::/subdir/../../file.txt",0, + "/relative/path.txt",Uri_CREATE_ALLOW_RELATIVE, + 0,S_OK,FALSE, + { + {"mk:@MSITSTORE:/relative/path.txt",S_OK}, + {"",S_FALSE}, + {"mk:@MSITSTORE:/relative/path.txt",S_OK}, + {"",S_FALSE}, + {".txt",S_OK}, + {"",S_FALSE}, + {"",S_FALSE}, + {"",S_FALSE}, + {"@MSITSTORE:/relative/path.txt",S_OK}, + {"@MSITSTORE:/relative/path.txt",S_OK}, + {"",S_FALSE}, + {"mk:@MSITSTORE:/relative/path.txt",S_OK}, + {"mk",S_OK}, + {"",S_FALSE}, + {"",S_FALSE} + }, + { + {Uri_HOST_UNKNOWN,S_OK}, + {0,S_FALSE}, + {URL_SCHEME_MK,S_OK}, + {URLZONE_INVALID,E_NOTIMPL} + } + }, + { "mk:@xxx:C:\\dir\\file.chm::/subdir/../../file.txt",0, + "/relative/path.txt",Uri_CREATE_ALLOW_RELATIVE, + 0,S_OK,FALSE, + { + {"mk:@xxx:/relative/path.txt",S_OK}, + {"",S_FALSE}, + {"mk:@xxx:/relative/path.txt",S_OK}, + {"",S_FALSE}, + {".txt",S_OK}, + {"",S_FALSE}, + {"",S_FALSE}, + {"",S_FALSE}, + {"@xxx:/relative/path.txt",S_OK}, + {"@xxx:/relative/path.txt",S_OK}, + {"",S_FALSE}, + {"mk:@xxx:/relative/path.txt",S_OK}, + {"mk",S_OK}, + {"",S_FALSE}, + {"",S_FALSE} + }, + { + {Uri_HOST_UNKNOWN,S_OK}, + {0,S_FALSE}, + {URL_SCHEME_MK,S_OK}, + {URLZONE_INVALID,E_NOTIMPL} + } + }, + { "mk:xxx:C:\\dir\\file.chm::/subdir/../../file.txt",0, + "/relative/path.txt",Uri_CREATE_ALLOW_RELATIVE, + 0,S_OK,FALSE, + { + {"mk:/relative/path.txt",S_OK}, + {"",S_FALSE}, + {"mk:/relative/path.txt",S_OK}, + {"",S_FALSE}, + {".txt",S_OK}, + {"",S_FALSE}, + {"",S_FALSE}, + {"",S_FALSE}, + {"/relative/path.txt",S_OK}, + {"/relative/path.txt",S_OK}, + {"",S_FALSE}, + {"mk:/relative/path.txt",S_OK}, + {"mk",S_OK}, + {"",S_FALSE}, + {"",S_FALSE} + }, + { + {Uri_HOST_UNKNOWN,S_OK}, + {0,S_FALSE}, + {URL_SCHEME_MK,S_OK}, + {URLZONE_INVALID,E_NOTIMPL} + } + }, + { "ml:@MSITSTORE:C:\\dir\\file.chm::/subdir/file.txt",0, + "/relative/path.txt",Uri_CREATE_ALLOW_RELATIVE, + 0,S_OK,FALSE, + { + {"ml:/relative/path.txt",S_OK}, + {"",S_FALSE}, + {"ml:/relative/path.txt",S_OK}, + {"",S_FALSE}, + {".txt",S_OK}, + {"",S_FALSE}, + {"",S_FALSE}, + {"",S_FALSE}, + {"/relative/path.txt",S_OK}, + {"/relative/path.txt",S_OK}, + {"",S_FALSE}, + {"ml:/relative/path.txt",S_OK}, + {"ml",S_OK}, + {"",S_FALSE}, + {"",S_FALSE} + }, + { + {Uri_HOST_UNKNOWN,S_OK}, + {0,S_FALSE}, + {URL_SCHEME_UNKNOWN,S_OK}, + {URLZONE_INVALID,E_NOTIMPL} + } + }, { "http://winehq.org/dir/test?querystring",0, "//winehq.com/#hash",Uri_CREATE_ALLOW_RELATIVE, 0,S_OK,FALSE,

1 0

Nikolay Sivov : comctl32: A test for auto-set TBSTYLE_TRANSPARENT style.
by Alexandre Julliard 09 Feb '12

09 Feb '12

Module: wine Branch: master Commit: e630e4997d8f704bc75fe29e6804c10e388bbb66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e630e4997d8f704bc75fe29e6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 9 08:54:59 2012 +0300 comctl32: A test for auto-set TBSTYLE_TRANSPARENT style. --- dlls/comctl32/tests/toolbar.c | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index f1579b7..386511a 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -1825,6 +1825,19 @@ static void test_create(void) DestroyWindow(hwnd); UnhookWindowsHook(WH_CBT, cbt_hook_proc); + + /* TBSTYLE_TRANSPARENT */ + hwnd = CreateWindowExA(0, TOOLBARCLASSNAME, NULL, + WS_CHILD|WS_VISIBLE|WS_CLIPSIBLINGS|TBSTYLE_FLAT|TBSTYLE_TOOLTIPS|TBSTYLE_GROUP, + 0, 0, 0, 0, hMainWnd, (HMENU)5, GetModuleHandle(NULL), NULL); + + style = GetWindowLongA(hwnd, GWL_STYLE); + ok((style & TBSTYLE_TRANSPARENT) == TBSTYLE_TRANSPARENT, "got 0x%08x\n", style); + + style = SendMessageA(hwnd, TB_GETSTYLE, 0, 0); + ok((style & TBSTYLE_TRANSPARENT) == TBSTYLE_TRANSPARENT, "got 0x%08x\n", style); + + DestroyWindow(hwnd); } START_TEST(toolbar)

1 0

Jacek Caban : t2embapi.h: Added some missing declarations.
by Alexandre Julliard 09 Feb '12

09 Feb '12

Module: wine Branch: master Commit: 846c0e365d864e62ac926a006a425a8f543128f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=846c0e365d864e62ac926a006… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 7 16:00:05 2012 +0100 t2embapi.h: Added some missing declarations. --- include/t2embapi.h | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/include/t2embapi.h b/include/t2embapi.h index b07359e..16d68f3 100644 --- a/include/t2embapi.h +++ b/include/t2embapi.h @@ -23,6 +23,19 @@ extern "C" { #endif +#define CHARSET_UNICODE 1 +#define CHARSET_DEFAULT 1 +#define CHARSET_SYMBOL 2 +#define CHARSET_GLYPHIDX 3 + +#define LICENSE_INSTALLABLE 0x0000 +#define LICENSE_DEFAULT 0x0000 +#define LICENSE_NOEMBEDDING 0x0002 +#define LICENSE_PREVIEWPRINT 0x0004 +#define LICENSE_EDITABLE 0x0008 + +#define TTLOAD_PRIVATE 0x0001 + /* Possible return values. */ #define E_NONE __MSABI_LONG(0x0000) #define E_API_NOTIMPL __MSABI_LONG(0x0001) @@ -46,6 +59,7 @@ typedef struct LONG WINAPI TTLoadEmbeddedFont(HANDLE*,ULONG,ULONG*,ULONG,ULONG*,READEMBEDPROC, LPVOID,LPWSTR,LPSTR,TTLOADINFO*); +LONG WINAPI TTDeleteEmbeddedFont(HANDLE,ULONG,ULONG*); /* embedding privileges */ #define EMBED_PREVIEWPRINT 1

1 0

Alistair Leslie-Hughes : mshtml/tests: Interface ITravelLogClient may not be supported.
by Alexandre Julliard 09 Feb '12

09 Feb '12

Module: wine Branch: master Commit: 4d962da7b06cd1d3460a8d58b9f7cda799989bfa URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d962da7b06cd1d3460a8d58b… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Feb 5 15:45:22 2012 +1100 mshtml/tests: Interface ITravelLogClient may not be supported. --- dlls/mshtml/tests/dom.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 8df47cc..674d0a3 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -254,7 +254,6 @@ static const IID * const window_iids[] = { &IID_IHTMLWindow3, &IID_IDispatchEx, &IID_IServiceProvider, - &IID_ITravelLogClient, NULL }; @@ -4419,6 +4418,12 @@ static void test_window(IHTMLDocument2 *doc) hres = IHTMLDocument2_get_parentWindow(doc, &window); ok(hres == S_OK, "get_parentWindow failed: %08x\n", hres); test_ifaces((IUnknown*)window, window_iids); + hres = IDispatch_QueryInterface(window, &IID_ITravelLogClient, (void**)&unk); + if(hres == S_OK) + IUnknown_Release(unk); + else + win_skip("IID_ITravelLogClient not supported\n"); + test_disp((IUnknown*)window, &DIID_DispHTMLWindow2, "[object]"); hres = IHTMLWindow2_get_document(window, &doc2);

1 0

Erich Hoover : hhctrl.ocx: Fix searching for Index and TOC file.
by Alexandre Julliard 09 Feb '12

09 Feb '12

Module: wine Branch: master Commit: 4c908dd8dae7092734be67514d3aec1c79096f9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c908dd8dae7092734be67514… Author: Erich Hoover <ehoover(a)mines.edu> Date: Fri Feb 3 14:28:47 2012 -0700 hhctrl.ocx: Fix searching for Index and TOC file. --- dlls/hhctrl.ocx/chm.c | 59 ++++++++++++++++++++++++++++++++++++++------- dlls/hhctrl.ocx/hhctrl.h | 1 + 2 files changed, 50 insertions(+), 10 deletions(-) diff --git a/dlls/hhctrl.ocx/chm.c b/dlls/hhctrl.ocx/chm.c index 51d1685..e6f955d 100644 --- a/dlls/hhctrl.ocx/chm.c +++ b/dlls/hhctrl.ocx/chm.c @@ -138,6 +138,8 @@ static BOOL ReadChmSystem(CHMInfo *chm) break; case 0x6: TRACE("Compiled file is %s\n", debugstr_an(buf, entry.len)); + heap_free(chm->compiledFile); + chm->compiledFile = strdupnAtoW(buf, entry.len); break; case 0x9: TRACE("Version is %s\n", debugstr_an(buf, entry.len)); @@ -209,6 +211,32 @@ LPWSTR FindContextAlias(CHMInfo *chm, DWORD index) return strdupAtoW(ret); } +/* + * Tests if the file <chmfile>.<ext> exists, used for loading Indicies, Table of Contents, etc. + * when these files are not available from the HH_WINTYPE structure. + */ +static WCHAR *FindHTMLHelpSetting(HHInfo *info, const WCHAR *extW) +{ + static const WCHAR periodW[] = {'.',0}; + IStorage *pStorage = info->pCHMInfo->pStorage; + IStream *pStream; + WCHAR *filename; + HRESULT hr; + + filename = heap_alloc(strlenW(info->pCHMInfo->compiledFile)+strlenW(periodW)+strlenW(extW)+1); + strcpyW(filename, info->pCHMInfo->compiledFile); + strcatW(filename, periodW); + strcatW(filename, extW); + hr = IStorage_OpenStream(pStorage, filename, NULL, STGM_READ, 0, &pStream); + if (FAILED(hr)) + { + heap_free(filename); + return strdupAtoW(""); + } + IStream_Release(pStream); + return filename; +} + /* Loads the HH_WINTYPE data from the CHM file * * FIXME: There may be more than one window type in the file, so @@ -222,6 +250,8 @@ BOOL LoadWinTypeFromCHM(HHInfo *info) HRESULT hr; DWORD cbRead; + static const WCHAR toc_extW[] = {'h','h','c',0}; + static const WCHAR index_extW[] = {'h','h','k',0}; static const WCHAR windowsW[] = {'#','W','I','N','D','O','W','S',0}; hr = IStorage_OpenStream(pStorage, windowsW, NULL, STGM_READ, 0, &pStream); @@ -258,16 +288,24 @@ BOOL LoadWinTypeFromCHM(HHInfo *info) if (FAILED(hr)) goto done; /* convert the #STRINGS offsets to actual strings */ - info->WinType.pszType = info->pszType = strdupAtoW(GetChmString(info->pCHMInfo, (DWORD_PTR)info->WinType.pszType)); - info->WinType.pszCaption = info->pszCaption = strdupAtoW(GetChmString(info->pCHMInfo, (DWORD_PTR)info->WinType.pszCaption)); - info->WinType.pszToc = info->pszToc = strdupAtoW(GetChmString(info->pCHMInfo, (DWORD_PTR)info->WinType.pszToc)); - info->WinType.pszIndex = info->pszIndex = strdupAtoW(GetChmString(info->pCHMInfo, (DWORD_PTR)info->WinType.pszIndex)); - info->WinType.pszFile = info->pszFile = strdupAtoW(GetChmString(info->pCHMInfo, (DWORD_PTR)info->WinType.pszFile)); - info->WinType.pszHome = info->pszHome = strdupAtoW(GetChmString(info->pCHMInfo, (DWORD_PTR)info->WinType.pszHome)); - info->WinType.pszJump1 = info->pszJump1 = strdupAtoW(GetChmString(info->pCHMInfo, (DWORD_PTR)info->WinType.pszJump1)); - info->WinType.pszJump2 = info->pszJump2 = strdupAtoW(GetChmString(info->pCHMInfo, (DWORD_PTR)info->WinType.pszJump2)); - info->WinType.pszUrlJump1 = info->pszUrlJump1 = strdupAtoW(GetChmString(info->pCHMInfo, (DWORD_PTR)info->WinType.pszUrlJump1)); - info->WinType.pszUrlJump2 = info->pszUrlJump2 = strdupAtoW(GetChmString(info->pCHMInfo, (DWORD_PTR)info->WinType.pszUrlJump2)); + + info->WinType.pszType = info->pszType = strdupAtoW(GetChmString(info->pCHMInfo, (DWORD_PTR)info->WinType.pszType)); + info->WinType.pszCaption = info->pszCaption = strdupAtoW(GetChmString(info->pCHMInfo, (DWORD_PTR)info->WinType.pszCaption)); + info->WinType.pszFile = info->pszFile = strdupAtoW(GetChmString(info->pCHMInfo, (DWORD_PTR)info->WinType.pszFile)); + info->WinType.pszHome = info->pszHome = strdupAtoW(GetChmString(info->pCHMInfo, (DWORD_PTR)info->WinType.pszHome)); + info->WinType.pszJump1 = info->pszJump1 = strdupAtoW(GetChmString(info->pCHMInfo, (DWORD_PTR)info->WinType.pszJump1)); + info->WinType.pszJump2 = info->pszJump2 = strdupAtoW(GetChmString(info->pCHMInfo, (DWORD_PTR)info->WinType.pszJump2)); + info->WinType.pszUrlJump1 = info->pszUrlJump1 = strdupAtoW(GetChmString(info->pCHMInfo, (DWORD_PTR)info->WinType.pszUrlJump1)); + info->WinType.pszUrlJump2 = info->pszUrlJump2 = strdupAtoW(GetChmString(info->pCHMInfo, (DWORD_PTR)info->WinType.pszUrlJump2)); + + if (info->WinType.pszToc) + info->WinType.pszToc = info->pszToc = strdupAtoW(GetChmString(info->pCHMInfo, (DWORD_PTR)info->WinType.pszToc)); + else + info->WinType.pszToc = info->pszToc = FindHTMLHelpSetting(info, toc_extW); + if (info->WinType.pszIndex) + info->WinType.pszIndex = info->pszIndex = strdupAtoW(GetChmString(info->pCHMInfo, (DWORD_PTR)info->WinType.pszIndex)); + else + info->WinType.pszIndex = info->pszIndex = FindHTMLHelpSetting(info, index_extW); /* FIXME: pszCustomTabs is a list of multiple zero-terminated strings so ReadString won't * work in this case @@ -431,6 +469,7 @@ CHMInfo *CloseCHM(CHMInfo *chm) heap_free(chm->defTopic); heap_free(chm->defToc); heap_free(chm->szFile); + heap_free(chm->compiledFile); heap_free(chm); return NULL; diff --git a/dlls/hhctrl.ocx/hhctrl.h b/dlls/hhctrl.ocx/hhctrl.h index 3e496f9..cbbcb70 100644 --- a/dlls/hhctrl.ocx/hhctrl.h +++ b/dlls/hhctrl.ocx/hhctrl.h @@ -102,6 +102,7 @@ typedef struct CHMInfo char **strings; DWORD strings_size; + WCHAR *compiledFile; WCHAR *defTopic; WCHAR *defTitle; WCHAR *defToc;

1 0

Akihiro Sagawa : gdi32/tests: Reorder tests to avoid side-effects.
by Alexandre Julliard 09 Feb '12

09 Feb '12

Module: wine Branch: master Commit: 39f748f083d3c311e288a6ee8630f42426c830dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=39f748f083d3c311e288a6ee8… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Feb 10 01:39:27 2012 +0900 gdi32/tests: Reorder tests to avoid side-effects. --- dlls/gdi32/tests/font.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 307493b..d004cf4 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -4275,11 +4275,11 @@ START_TEST(font) test_CreateFontIndirectEx(); test_oemcharset(); test_fullname(); - - test_vertical_font(); test_east_asian_font_selection(); - /* CreateScalableFontResource should be last test until RemoveFontResource + + /* These tests should be last test until RemoveFontResource * is properly implemented. */ + test_vertical_font(); test_CreateScalableFontResource(); }

1 0

Aric Stewart : gdi32: Load fonts from default Mac external font paths.
by Alexandre Julliard 09 Feb '12

09 Feb '12

Module: wine Branch: master Commit: 85a71387dac1ca3ad47970800c8c01743681b528 URL: http://source.winehq.org/git/wine.git/?a=commit;h=85a71387dac1ca3ad47970800… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Feb 9 09:57:03 2012 -0600 gdi32: Load fonts from default Mac external font paths. --- dlls/gdi32/freetype.c | 17 ++++++++++++++++- 1 files changed, 16 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 5e6a952..8bf397b 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -3120,6 +3120,7 @@ static void init_font_list(void) DWORD valuelen, datalen, i = 0, type, dlen, vlen; WCHAR windowsdir[MAX_PATH]; char *unixname; + const char *home; const char *data_dir; delete_external_font_keys(); @@ -3225,7 +3226,6 @@ static void init_font_list(void) ptr = valueA; while (ptr) { - const char* home; LPSTR next = strchr( ptr, ':' ); if (next) *next++ = 0; if (ptr[0] == '~' && ptr[1] == '/' && (home = getenv( "HOME" )) && @@ -3246,6 +3246,21 @@ static void init_font_list(void) } RegCloseKey(hkey); } + +#ifdef __APPLE__ + /* Mac default font locations. */ + ReadFontDir( "/Library/Fonts", TRUE ); + ReadFontDir( "/Network/Library/Fonts", TRUE ); + ReadFontDir( "/System/Library/Fonts", TRUE ); + if ((home = getenv( "HOME" ))) + { + unixname = HeapAlloc( GetProcessHeap(), 0, strlen(home)+15 ); + strcpy( unixname, home ); + strcat( unixname, "/Library/Fonts" ); + ReadFontDir( unixname, TRUE); + HeapFree( GetProcessHeap(), 0, unixname ); + } +#endif } static BOOL move_to_front(const WCHAR *name)

1 0

Austin English : advapi32: Sync specfile to win7.
by Alexandre Julliard 09 Feb '12

09 Feb '12

Module: wine Branch: master Commit: 797a6ae066d2faf7558bacafe14be76ae3746938 URL: http://source.winehq.org/git/wine.git/?a=commit;h=797a6ae066d2faf7558bacafe… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Feb 3 21:50:48 2012 -0600 advapi32: Sync specfile to win7. --- dlls/advapi32/advapi32.spec | 133 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 133 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=797a6ae066d2faf7558ba…

1 0