October 2014 - Wine-Commits

Jacek Caban : mshtml: Use IUri for script binding.
by Alexandre Julliard Oct. 9, 2014

Oct. 9, 2014

Module: wine Branch: master Commit: 8a9d4cf147ebdfbab807fbbcd5a5dfc041d7fea0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a9d4cf147ebdfbab807fbbcd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 9 16:08:31 2014 +0200 mshtml: Use IUri for script binding. --- dlls/mshtml/script.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index 790bac1..a4bd47f 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -826,17 +826,25 @@ static const BSCallbackVtbl ScriptBSCVtbl = { }; -static HRESULT bind_script_to_text(HTMLInnerWindow *window, IMoniker *mon, WCHAR **ret) +static HRESULT bind_script_to_text(HTMLInnerWindow *window, IUri *uri, WCHAR **ret) { ScriptBSC *bsc; + IMoniker *mon; WCHAR *text; HRESULT hres; + hres = CreateURLMonikerEx2(NULL, uri, &mon, URL_MK_UNIFORM); + if(FAILED(hres)) + return hres; + bsc = heap_alloc_zero(sizeof(*bsc)); - if(!bsc) + if(!bsc) { + IMoniker_Release(mon); return E_OUTOFMEMORY; + } init_bscallback(&bsc->bsc, &ScriptBSCVtbl, mon, 0); + IMoniker_Release(mon); bsc->hres = E_FAIL; hres = start_binding(window, &bsc->bsc, NULL); @@ -892,13 +900,12 @@ static HRESULT bind_script_to_text(HTMLInnerWindow *window, IMoniker *mon, WCHAR *ret = text; return S_OK; - } static void parse_extern_script(ScriptHost *script_host, const WCHAR *src) { - IMoniker *mon; WCHAR *text; + IUri *uri; HRESULT hres; static const WCHAR wine_schemaW[] = {'w','i','n','e',':'}; @@ -906,12 +913,12 @@ static void parse_extern_script(ScriptHost *script_host, const WCHAR *src) if(strlenW(src) > sizeof(wine_schemaW)/sizeof(WCHAR) && !memcmp(src, wine_schemaW, sizeof(wine_schemaW))) src += sizeof(wine_schemaW)/sizeof(WCHAR); - hres = CreateURLMoniker(NULL, src, &mon); + hres = create_uri(src, 0, &uri); if(FAILED(hres)) return; - hres = bind_script_to_text(script_host->window, mon, &text); - IMoniker_Release(mon); + hres = bind_script_to_text(script_host->window, uri, &text); + IUri_Release(uri); if(FAILED(hres) || !text) return;

1 0

Jacek Caban : mshtml: Moved BOM enum to binding.h.
by Alexandre Julliard Oct. 9, 2014

Oct. 9, 2014

Module: wine Branch: master Commit: 7e4db7df488f946406d920224bfc14f07c72050b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e4db7df488f946406d920224… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 9 16:07:33 2014 +0200 mshtml: Moved BOM enum to binding.h. --- dlls/mshtml/binding.h | 8 +++++++- dlls/mshtml/navigate.c | 8 ++------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/dlls/mshtml/binding.h b/dlls/mshtml/binding.h index 63ac882..764ae61 100644 --- a/dlls/mshtml/binding.h +++ b/dlls/mshtml/binding.h @@ -25,6 +25,12 @@ typedef enum { METHOD_POST } REQUEST_METHOD; +typedef enum { + BOM_NONE, + BOM_UTF8, + BOM_UTF16 +} binding_bom_t; + typedef struct { nsIHttpChannel nsIHttpChannel_iface; nsIUploadChannel nsIUploadChannel_iface; @@ -71,7 +77,7 @@ struct BSCallback { ULONG readed; DWORD bindf; BOOL bindinfo_ready; - int bom; + binding_bom_t bom; IMoniker *mon; IBinding *binding; diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 195f82e..8234c02 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -52,12 +52,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); static const WCHAR emptyW[] = {0}; static const WCHAR text_htmlW[] = {'t','e','x','t','/','h','t','m','l',0}; -enum { - BOM_NONE, - BOM_UTF8, - BOM_UTF16 -}; - struct nsProtocolStream { nsIInputStream nsIInputStream_iface; @@ -1203,6 +1197,8 @@ static HRESULT read_stream_data(nsChannelBSC *This, IStream *stream) break; case BOM_UTF16: This->nschannel->charset = heap_strdupA(UTF16_STR); + case BOM_NONE: + /* FIXME: Get charset from HTTP headers */; } if(!This->nschannel->content_type) {

1 0

Matteo Bruni : gdi32: Don't overflow the buffer in GetGlyphOutline.
by Alexandre Julliard Oct. 9, 2014

Oct. 9, 2014

Module: wine Branch: master Commit: 112a7f7f97168c7afe73f38351e9345bc2a7657a URL: http://source.winehq.org/git/wine.git/?a=commit;h=112a7f7f97168c7afe73f3835… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Oct 9 18:00:55 2014 +0200 gdi32: Don't overflow the buffer in GetGlyphOutline. --- dlls/gdi32/freetype.c | 401 ++++++++++++++++++++++++++++---------------------- 1 file changed, 229 insertions(+), 172 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=112a7f7f97168c7afe73f…

1 0

Jacek Caban : mshtml: Added support for onreadystatechange event for script elements.
by Alexandre Julliard Oct. 9, 2014

Oct. 9, 2014

Module: wine Branch: master Commit: d11abc0992053f3cda7b89263c5fcd95910956e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d11abc0992053f3cda7b89263… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 9 16:08:47 2014 +0200 mshtml: Added support for onreadystatechange event for script elements. --- dlls/mshtml/htmlscript.h | 1 + dlls/mshtml/script.c | 55 +++++++++++++++++++++++++++++++++++++++++------- 2 files changed, 48 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/htmlscript.h b/dlls/mshtml/htmlscript.h index 8a0c1e5..8698be8 100644 --- a/dlls/mshtml/htmlscript.h +++ b/dlls/mshtml/htmlscript.h @@ -24,6 +24,7 @@ typedef struct { nsIDOMHTMLScriptElement *nsscript; BOOL parsed; BOOL parse_on_bind; + READYSTATE readystate; } HTMLScriptElement; typedef struct { diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index a4bd47f..6630047 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -29,6 +29,7 @@ #include "ole2.h" #include "activscp.h" #include "activdbg.h" +#include "shlwapi.h" #include "wine/debug.h" @@ -701,7 +702,15 @@ static ScriptHost *create_script_host(HTMLInnerWindow *window, const GUID *guid) return ret; } -static void parse_text(ScriptHost *script_host, LPCWSTR text) +static void set_script_elem_readystate(HTMLScriptElement *script_elem, READYSTATE readystate) +{ + script_elem->readystate = readystate; + + if(readystate != READYSTATE_INTERACTIVE) + fire_event(script_elem->element.node.doc, EVENTID_READYSTATECHANGE, FALSE, script_elem->element.node.nsnode, NULL, NULL); +} + +static void parse_elem_text(ScriptHost *script_host, HTMLScriptElement *script_elem, LPCWSTR text) { EXCEPINFO excepinfo; VARIANT var; @@ -709,6 +718,8 @@ static void parse_text(ScriptHost *script_host, LPCWSTR text) TRACE("%s\n", debugstr_w(text)); + set_script_elem_readystate(script_elem, READYSTATE_INTERACTIVE); + VariantInit(&var); memset(&excepinfo, 0, sizeof(excepinfo)); TRACE(">>>\n"); @@ -725,6 +736,9 @@ static void parse_text(ScriptHost *script_host, LPCWSTR text) typedef struct { BSCallback bsc; + HTMLScriptElement *script_elem; + DWORD scheme; + DWORD size; char *buf; HRESULT hres; @@ -739,6 +753,11 @@ static void ScriptBSC_destroy(BSCallback *bsc) { ScriptBSC *This = impl_from_BSCallback(bsc); + if(This->script_elem) { + IHTMLScriptElement_Release(&This->script_elem->IHTMLScriptElement_iface); + This->script_elem = NULL; + } + heap_free(This->buf); heap_free(This); } @@ -750,6 +769,12 @@ static HRESULT ScriptBSC_init_bindinfo(BSCallback *bsc) static HRESULT ScriptBSC_start_binding(BSCallback *bsc) { + ScriptBSC *This = impl_from_BSCallback(bsc); + + /* FIXME: We should find a better to decide if 'loading' state is supposed to be used by the protocol. */ + if(This->scheme == URL_SCHEME_HTTPS || This->scheme == URL_SCHEME_HTTP) + set_script_elem_readystate(This->script_elem, READYSTATE_LOADING); + return S_OK; } @@ -759,13 +784,18 @@ static HRESULT ScriptBSC_stop_binding(BSCallback *bsc, HRESULT result) This->hres = result; - if(FAILED(result)) { + if(SUCCEEDED(result)) { + if(This->script_elem->readystate == READYSTATE_LOADING) + set_script_elem_readystate(This->script_elem, READYSTATE_LOADED); + }else { FIXME("binding failed %08x\n", result); heap_free(This->buf); This->buf = NULL; This->size = 0; } + IHTMLScriptElement_Release(&This->script_elem->IHTMLScriptElement_iface); + This->script_elem = NULL; return S_OK; } @@ -826,7 +856,7 @@ static const BSCallbackVtbl ScriptBSCVtbl = { }; -static HRESULT bind_script_to_text(HTMLInnerWindow *window, IUri *uri, WCHAR **ret) +static HRESULT bind_script_to_text(HTMLInnerWindow *window, IUri *uri, HTMLScriptElement *script_elem, WCHAR **ret) { ScriptBSC *bsc; IMoniker *mon; @@ -847,6 +877,13 @@ static HRESULT bind_script_to_text(HTMLInnerWindow *window, IUri *uri, WCHAR **r IMoniker_Release(mon); bsc->hres = E_FAIL; + hres = IUri_GetScheme(uri, &bsc->scheme); + if(FAILED(hres)) + bsc->scheme = URL_SCHEME_UNKNOWN; + + IHTMLScriptElement_AddRef(&script_elem->IHTMLScriptElement_iface); + bsc->script_elem = script_elem; + hres = start_binding(window, &bsc->bsc, NULL); if(SUCCEEDED(hres)) hres = bsc->hres; @@ -902,7 +939,7 @@ static HRESULT bind_script_to_text(HTMLInnerWindow *window, IUri *uri, WCHAR **r return S_OK; } -static void parse_extern_script(ScriptHost *script_host, const WCHAR *src) +static void parse_extern_script(ScriptHost *script_host, HTMLScriptElement *script_elem, LPCWSTR src) { WCHAR *text; IUri *uri; @@ -917,12 +954,12 @@ static void parse_extern_script(ScriptHost *script_host, const WCHAR *src) if(FAILED(hres)) return; - hres = bind_script_to_text(script_host->window, uri, &text); + hres = bind_script_to_text(script_host->window, uri, script_elem, &text); IUri_Release(uri); if(FAILED(hres) || !text) return; - parse_text(script_host, text); + parse_elem_text(script_host, script_elem, text); heap_free(text); } @@ -940,7 +977,7 @@ static void parse_inline_script(ScriptHost *script_host, HTMLScriptElement *scri if(NS_FAILED(nsres)) { ERR("GetText failed: %08x\n", nsres); }else if(*text) { - parse_text(script_host, text); + parse_elem_text(script_host, script_elem, text); } nsAString_Finish(&text_str); @@ -976,12 +1013,14 @@ static void parse_script_elem(ScriptHost *script_host, HTMLScriptElement *script ERR("GetSrc failed: %08x\n", nsres); }else if(*src) { script_elem->parsed = TRUE; - parse_extern_script(script_host, src); + parse_extern_script(script_host, script_elem, src); }else { parse_inline_script(script_host, script_elem); } nsAString_Finish(&src_str); + + set_script_elem_readystate(script_elem, READYSTATE_COMPLETE); } static GUID get_default_script_guid(HTMLInnerWindow *window)

1 0

Jacek Caban : mshtml: Moved script binding callback to script.c.
by Alexandre Julliard Oct. 9, 2014

Oct. 9, 2014

Module: wine Branch: master Commit: 87efdc304717936fca392c000b16838e2d31671b URL: http://source.winehq.org/git/wine.git/?a=commit;h=87efdc304717936fca392c000… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 9 16:08:01 2014 +0200 mshtml: Moved script binding callback to script.c. --- dlls/mshtml/binding.h | 16 ++++- dlls/mshtml/navigate.c | 182 +------------------------------------------------ dlls/mshtml/script.c | 177 ++++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 191 insertions(+), 184 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=87efdc304717936fca392…

1 0

Austin English : systeminfo: Add stub program.
by Alexandre Julliard Oct. 9, 2014

Oct. 9, 2014

Module: wine Branch: master Commit: cf7fa95980035f7af86e9ea656668e5c856f4aab URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf7fa95980035f7af86e9ea65… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Oct 7 14:00:57 2014 -0500 systeminfo: Add stub program. --- configure | 2 ++ configure.ac | 1 + programs/systeminfo/Makefile.in | 5 +++++ programs/systeminfo/main.c | 33 +++++++++++++++++++++++++++++++++ 4 files changed, 41 insertions(+) diff --git a/configure b/configure index 4125ac9..2228ce3 100755 --- a/configure +++ b/configure @@ -1364,6 +1364,7 @@ enable_services enable_spoolsv enable_start enable_svchost +enable_systeminfo enable_taskkill enable_tasklist enable_taskmgr @@ -17476,6 +17477,7 @@ wine_fn_config_test programs/services/tests services.exe_test wine_fn_config_program spoolsv enable_spoolsv install wine_fn_config_program start enable_start install,po wine_fn_config_program svchost enable_svchost install +wine_fn_config_program systeminfo enable_systeminfo install wine_fn_config_program taskkill enable_taskkill install,po wine_fn_config_program tasklist enable_tasklist install wine_fn_config_program taskmgr enable_taskmgr install,po diff --git a/configure.ac b/configure.ac index 6a3dc46..240ce29 100644 --- a/configure.ac +++ b/configure.ac @@ -3384,6 +3384,7 @@ WINE_CONFIG_TEST(programs/services/tests) WINE_CONFIG_PROGRAM(spoolsv,,[install]) WINE_CONFIG_PROGRAM(start,,[install,po]) WINE_CONFIG_PROGRAM(svchost,,[install]) +WINE_CONFIG_PROGRAM(systeminfo,,[install]) WINE_CONFIG_PROGRAM(taskkill,,[install,po]) WINE_CONFIG_PROGRAM(tasklist,,[install]) WINE_CONFIG_PROGRAM(taskmgr,,[install,po]) diff --git a/programs/systeminfo/Makefile.in b/programs/systeminfo/Makefile.in new file mode 100644 index 0000000..72e4791 --- /dev/null +++ b/programs/systeminfo/Makefile.in @@ -0,0 +1,5 @@ +MODULE = systeminfo.exe +APPMODE = -mconsole -municode + +C_SRCS = \ + main.c diff --git a/programs/systeminfo/main.c b/programs/systeminfo/main.c new file mode 100644 index 0000000..e7bb30e --- /dev/null +++ b/programs/systeminfo/main.c @@ -0,0 +1,33 @@ +/* + * Copyright 2014 Austin English + * + * 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 + */ + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(systeminfo); + +int wmain(int argc, WCHAR *argv[]) +{ + int i; + + WINE_FIXME("stub:"); + for (i = 0; i < argc; i++) + WINE_FIXME(" %s", wine_dbgstr_w(argv[i])); + WINE_FIXME("\n"); + + return 0; +}

1 0

Jacek Caban : mshtml: Moved READYSTATE to string conversion to separated function.
by Alexandre Julliard Oct. 9, 2014

Oct. 9, 2014

Module: wine Branch: master Commit: 845f5cccf039acaec939dd8dfc97e308c57490f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=845f5cccf039acaec939dd8df… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 9 16:08:15 2014 +0200 mshtml: Moved READYSTATE to string conversion to separated function. --- dlls/mshtml/htmldoc.c | 16 +--------------- dlls/mshtml/htmlelem.c | 21 +++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 1 + 3 files changed, 23 insertions(+), 15 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index a8d6d76..c91298f 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -592,27 +592,13 @@ static HRESULT WINAPI HTMLDocument_get_readyState(IHTMLDocument2 *iface, BSTR *p { HTMLDocument *This = impl_from_IHTMLDocument2(iface); - static const WCHAR wszUninitialized[] = {'u','n','i','n','i','t','i','a','l','i','z','e','d',0}; - static const WCHAR wszLoading[] = {'l','o','a','d','i','n','g',0}; - static const WCHAR wszLoaded[] = {'l','o','a','d','e','d',0}; - static const WCHAR wszInteractive[] = {'i','n','t','e','r','a','c','t','i','v','e',0}; - static const WCHAR wszComplete[] = {'c','o','m','p','l','e','t','e',0}; - - static const LPCWSTR readystate_str[] = { - wszUninitialized, - wszLoading, - wszLoaded, - wszInteractive, - wszComplete - }; TRACE("(%p)->(%p)\n", iface, p); if(!p) return E_POINTER; - *p = SysAllocString(readystate_str[This->window->readystate]); - return S_OK; + return get_readystate_string(This->window->readystate, p); } static HRESULT WINAPI HTMLDocument_get_frames(IHTMLDocument2 *iface, IHTMLFramesCollection2 **p) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 3037c10..2906581 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -218,6 +218,27 @@ HRESULT elem_string_attr_setter(HTMLElement *elem, const WCHAR *name, const WCHA return S_OK; } +HRESULT get_readystate_string(READYSTATE readystate, BSTR *p) +{ + static const WCHAR uninitializedW[] = {'u','n','i','n','i','t','i','a','l','i','z','e','d',0}; + static const WCHAR loadingW[] = {'l','o','a','d','i','n','g',0}; + static const WCHAR loadedW[] = {'l','o','a','d','e','d',0}; + static const WCHAR interactiveW[] = {'i','n','t','e','r','a','c','t','i','v','e',0}; + static const WCHAR completeW[] = {'c','o','m','p','l','e','t','e',0}; + + static const LPCWSTR readystate_strs[] = { + uninitializedW, + loadingW, + loadedW, + interactiveW, + completeW + }; + + assert(readystate <= READYSTATE_COMPLETE); + *p = SysAllocString(readystate_strs[readystate]); + return *p ? S_OK : E_OUTOFMEMORY; +} + typedef struct { DispatchEx dispex; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 78d61f0..31c08ad 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -851,6 +851,7 @@ void set_download_state(HTMLDocumentObj*,int) DECLSPEC_HIDDEN; void call_docview_84(HTMLDocumentObj*) DECLSPEC_HIDDEN; void set_ready_state(HTMLOuterWindow*,READYSTATE) DECLSPEC_HIDDEN; +HRESULT get_readystate_string(READYSTATE,BSTR*) DECLSPEC_HIDDEN; HRESULT HTMLSelectionObject_Create(HTMLDocumentNode*,nsISelection*,IHTMLSelectionObject**) DECLSPEC_HIDDEN; HRESULT HTMLTxtRange_Create(HTMLDocumentNode*,nsIDOMRange*,IHTMLTxtRange**) DECLSPEC_HIDDEN;

1 0

Aric Stewart : dwrite: Build non-system font collections as a list of font families.
by Alexandre Julliard Oct. 9, 2014

Oct. 9, 2014

Module: wine Branch: master Commit: 8a5707111a5ecda83374fd9e82f305518b55d976 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a5707111a5ecda83374fd9e8… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Oct 8 09:52:07 2014 -0500 dwrite: Build non-system font collections as a list of font families. --- dlls/dwrite/font.c | 167 ++++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 133 insertions(+), 34 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index a00b784..77121ec 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -55,6 +55,8 @@ struct dwrite_font_data { }; struct dwrite_fontfamily_data { + LONG ref; + IDWriteLocalizedStrings *familyname; struct dwrite_font_data **fonts; @@ -69,6 +71,10 @@ struct dwrite_fontcollection { WCHAR **families; UINT32 count; int alloc; + + struct dwrite_fontfamily_data **family_data; + DWORD data_count; + int data_alloc; }; struct dwrite_fontfamily { @@ -127,6 +133,7 @@ struct dwrite_fontfile { }; static HRESULT create_fontfamily(IDWriteLocalizedStrings *familyname, IDWriteFontFamily **family); +static HRESULT create_fontfamily_from_data(struct dwrite_fontfamily_data *data, IDWriteFontCollection *collection, IDWriteFontFamily **family); static HRESULT create_font_base(IDWriteFont **font); static HRESULT create_font_from_data(struct dwrite_font_data *data, IDWriteFont **font); @@ -201,6 +208,21 @@ static VOID _free_font_data(struct dwrite_font_data *data) heap_free(data); } +static VOID _free_fontfamily_data(struct dwrite_fontfamily_data *data) +{ + int i; + if (!data) + return; + i = InterlockedDecrement(&data->ref); + if (i > 0) + return; + for (i = 0; i < data->font_count; i++) + _free_font_data(data->fonts[i]); + heap_free(data->fonts); + IDWriteLocalizedStrings_Release(data->familyname); + heap_free(data); +} + static HRESULT WINAPI dwritefontface_QueryInterface(IDWriteFontFace *iface, REFIID riid, void **obj) { struct dwrite_fontface *This = impl_from_IDWriteFontFace(iface); @@ -746,15 +768,9 @@ static ULONG WINAPI dwritefontfamily_Release(IDWriteFontFamily *iface) if (!ref) { - int i; - IDWriteLocalizedStrings_Release(This->data->familyname); - if (This->collection) IDWriteFontCollection_Release(This->collection); - for (i = 0; i < This->data->font_count; i++) - _free_font_data(This->data->fonts[i]); - heap_free(This->data->fonts); - heap_free(This->data); + _free_fontfamily_data(This->data); heap_free(This); } @@ -909,6 +925,9 @@ static ULONG WINAPI dwritefontcollection_Release(IDWriteFontCollection *iface) for (i = 0; i < This->count; i++) heap_free(This->families[i]); heap_free(This->families); + for (i = 0; i < This->data_count; i++) + _free_fontfamily_data(This->family_data[i]); + heap_free(This->family_data); heap_free(This); } @@ -919,6 +938,8 @@ static UINT32 WINAPI dwritefontcollection_GetFontFamilyCount(IDWriteFontCollecti { struct dwrite_fontcollection *This = impl_from_IDWriteFontCollection(iface); TRACE("(%p)\n", This); + if (This->data_count) + return This->data_count; return This->count; } @@ -931,18 +952,31 @@ static HRESULT WINAPI dwritefontcollection_GetFontFamily(IDWriteFontCollection * TRACE("(%p)->(%u %p)\n", This, index, family); - if (index >= This->count) + if (This->data_count) { - *family = NULL; - return E_FAIL; + if (index >= This->data_count) + { + *family = NULL; + return E_FAIL; + } + else + return create_fontfamily_from_data(This->family_data[index], iface, family); } + else + { + if (index >= This->count) + { + *family = NULL; + return E_FAIL; + } - hr = create_localizedstrings(&familyname); - if (FAILED(hr)) - return hr; - add_localizedstring(familyname, enusW, This->families[index]); + hr = create_localizedstrings(&familyname); + if (FAILED(hr)) + return hr; + add_localizedstring(familyname, enusW, This->families[index]); - return create_fontfamily(familyname, family); + return create_fontfamily(familyname, family); + } } static HRESULT WINAPI dwritefontcollection_FindFamilyName(IDWriteFontCollection *iface, const WCHAR *name, UINT32 *index, BOOL *exists) @@ -952,16 +986,44 @@ static HRESULT WINAPI dwritefontcollection_FindFamilyName(IDWriteFontCollection TRACE("(%p)->(%s %p %p)\n", This, debugstr_w(name), index, exists); - for (i = 0; i < This->count; i++) - if (!strcmpW(This->families[i], name)) + if (This->data_count) + { + for (i = 0; i < This->data_count; i++) { - *index = i; - *exists = TRUE; - return S_OK; + HRESULT hr; + IDWriteLocalizedStrings *family_name = This->family_data[i]->familyname; + int j; + for (j = 0; j < IDWriteLocalizedStrings_GetCount(family_name); j ++) + { + WCHAR buffer[255]; + hr = IDWriteLocalizedStrings_GetString(family_name, j, buffer, 255); + if (SUCCEEDED(hr)) + { + if (!strcmpW(buffer, name)) + { + *index = i; + *exists = TRUE; + return S_OK; + } + } + } } + *index = (UINT32)-1; + *exists = FALSE; + } + else + { + for (i = 0; i < This->count; i++) + if (!strcmpW(This->families[i], name)) + { + *index = i; + *exists = TRUE; + return S_OK; + } - *index = (UINT32)-1; - *exists = FALSE; + *index = (UINT32)-1; + *exists = FALSE; + } return S_OK; } @@ -1023,6 +1085,20 @@ HRESULT get_system_fontcollection(IDWriteFontCollection **collection) This->alloc = 50; This->count = 0; This->families = heap_alloc(This->alloc*sizeof(WCHAR*)); + if (!This->families) + { + heap_free(This); + return E_OUTOFMEMORY; + } + This->data_count = 0; + This->data_alloc = 2; + This->family_data = heap_alloc(sizeof(*This->family_data)*2); + if (!This->family_data) + { + heap_free(This->families); + heap_free(This); + return E_OUTOFMEMORY; + } TRACE("building system font collection:\n"); @@ -1039,7 +1115,7 @@ HRESULT get_system_fontcollection(IDWriteFontCollection **collection) return S_OK; } -static HRESULT create_fontfamily(IDWriteLocalizedStrings *familyname, IDWriteFontFamily **family) +static HRESULT create_fontfamily_from_data(struct dwrite_fontfamily_data *data, IDWriteFontCollection *collection, IDWriteFontFamily **family) { struct dwrite_fontfamily *This; @@ -1047,26 +1123,49 @@ static HRESULT create_fontfamily(IDWriteLocalizedStrings *familyname, IDWriteFon This = heap_alloc(sizeof(struct dwrite_fontfamily)); if (!This) return E_OUTOFMEMORY; - This->data = heap_alloc(sizeof(struct dwrite_fontfamily_data)); - if (!This->data) - { - heap_free(This); - return E_OUTOFMEMORY; - } This->IDWriteFontFamily_iface.lpVtbl = &fontfamilyvtbl; This->ref = 1; - This->data->font_count = 0; - This->data->alloc = 2; - This->data->fonts = heap_alloc(sizeof(*This->data->fonts) * 2); - This->collection = NULL; - This->data->familyname = familyname; + This->collection = collection; + if (collection) + IDWriteFontCollection_AddRef(collection); + This->data = data; + InterlockedIncrement(&This->data->ref); *family = &This->IDWriteFontFamily_iface; return S_OK; } +static HRESULT create_fontfamily(IDWriteLocalizedStrings *familyname, IDWriteFontFamily **family) +{ + struct dwrite_fontfamily_data *data; + HRESULT ret; + + data = heap_alloc(sizeof(struct dwrite_fontfamily_data)); + if (!data) return E_OUTOFMEMORY; + + data->ref = 0; + data->font_count = 0; + data->alloc = 2; + data->fonts = heap_alloc(sizeof(*data->fonts) * 2); + if (!data->fonts) + { + heap_free(data); + return E_OUTOFMEMORY; + } + data->familyname = familyname; + + ret = create_fontfamily_from_data(data, NULL, family); + if (FAILED(ret)) + { + heap_free(data->fonts); + heap_free(data); + } + + return ret; +} + static HRESULT create_font_from_data(struct dwrite_font_data *data, IDWriteFont **font) { struct dwrite_font *This;

1 0

David Heidelberger : dbghelp: Implement DW_TAG_const_type in dwarf2_parse_udt_type.
by Alexandre Julliard Oct. 9, 2014

Oct. 9, 2014

Module: wine Branch: master Commit: df5ff98b073fd6554fe7399e68ce4c106e483d0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=df5ff98b073fd6554fe7399e6… Author: David Heidelberger <david.heidelberger(a)ixit.cz> Date: Sun Oct 5 16:26:09 2014 +0200 dbghelp: Implement DW_TAG_const_type in dwarf2_parse_udt_type. --- dlls/dbghelp/dwarf.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index e7c36b0..a89cf11 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -1453,6 +1453,9 @@ static struct symt* dwarf2_parse_udt_type(dwarf2_parse_context_t* ctx, case DW_TAG_subprogram: dwarf2_parse_subprogram(ctx, child); break; + case DW_TAG_const_type: + dwarf2_parse_const_type(ctx, child); + break; case DW_TAG_structure_type: case DW_TAG_class_type: case DW_TAG_union_type:

1 0

Henri Verbeet : d3d9/tests: Use create_device() in test_scissor_size().
by Alexandre Julliard Oct. 9, 2014

Oct. 9, 2014

Module: wine Branch: master Commit: 1bec6ab0bc0c16f3b580165f7cb337e9510cce3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1bec6ab0bc0c16f3b580165f7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 9 11:50:49 2014 +0200 d3d9/tests: Use create_device() in test_scissor_size(). --- dlls/d3d9/tests/device.c | 34 ++++++++-------------------------- 1 file changed, 8 insertions(+), 26 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 16a9177..02c8227 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -2938,6 +2938,7 @@ static void test_display_formats(void) static void test_scissor_size(void) { + struct device_desc device_desc; IDirect3D9 *d3d9_ptr; unsigned int i; static struct { @@ -2954,7 +2955,6 @@ static void test_scissor_size(void) for(i=0; i<sizeof(scts)/sizeof(scts[0]); i++) { IDirect3DDevice9 *device_ptr = 0; - D3DPRESENT_PARAMETERS present_parameters; HRESULT hr; HWND hwnd = 0; RECT scissorrect; @@ -2968,30 +2968,14 @@ static void test_scissor_size(void) scts[i].backy = screen_height; } - ZeroMemory(&present_parameters, sizeof(present_parameters)); - present_parameters.Windowed = scts[i].window; - present_parameters.hDeviceWindow = hwnd; - present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; - present_parameters.BackBufferWidth = scts[i].backx; - present_parameters.BackBufferHeight = scts[i].backy; - present_parameters.BackBufferFormat = D3DFMT_A8R8G8B8; - present_parameters.EnableAutoDepthStencil = TRUE; - present_parameters.AutoDepthStencilFormat = D3DFMT_D24S8; - - hr = IDirect3D9_CreateDevice(d3d9_ptr, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, present_parameters.hDeviceWindow, D3DCREATE_HARDWARE_VERTEXPROCESSING, &present_parameters, &device_ptr); - if(FAILED(hr)) { - present_parameters.AutoDepthStencilFormat = D3DFMT_D16; - hr = IDirect3D9_CreateDevice(d3d9_ptr, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, present_parameters.hDeviceWindow, D3DCREATE_HARDWARE_VERTEXPROCESSING, &present_parameters, &device_ptr); - if(FAILED(hr)) { - hr = IDirect3D9_CreateDevice(d3d9_ptr, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, present_parameters.hDeviceWindow, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &present_parameters, &device_ptr); - } - } - ok(hr == D3D_OK || hr == D3DERR_NOTAVAILABLE, "IDirect3D_CreateDevice returned: %08x\n", hr); - - if (!device_ptr) + device_desc.device_window = hwnd; + device_desc.width = scts[i].backx; + device_desc.height = scts[i].backy; + device_desc.windowed = scts[i].window; + if (!(device_ptr = create_device(d3d9_ptr, hwnd, &device_desc))) { + skip("Failed to create a 3D device, skipping test.\n"); DestroyWindow(hwnd); - skip("Creating the device failed\n"); goto err_out; } @@ -3001,9 +2985,7 @@ static void test_scissor_size(void) ok(scissorrect.right == scts[i].backx && scissorrect.bottom == scts[i].backy && scissorrect.top == 0 && scissorrect.left == 0, "Scissorrect missmatch (%d, %d) should be (%d, %d)\n", scissorrect.right, scissorrect.bottom, scts[i].backx, scts[i].backy); /* check the scissorrect values after a reset */ - present_parameters.BackBufferWidth = screen_width; - present_parameters.BackBufferHeight = screen_height; - hr = IDirect3DDevice9_Reset(device_ptr, &present_parameters); + hr = reset_device(device_ptr, hwnd, scts[i].window); ok(hr == D3D_OK, "IDirect3DDevice9_Reset failed with %08x\n", hr); hr = IDirect3DDevice9_TestCooperativeLevel(device_ptr); ok(hr == D3D_OK, "IDirect3DDevice9_TestCooperativeLevel after a successful reset returned %#x\n", hr);

1 0