September 2014 - Wine-commits

Piotr Caban : msvcp90: Fix complex::operator*= implementation.
by Alexandre Julliard 02 Sep '14

02 Sep '14

Module: wine Branch: master Commit: f370017e6f2179e5a3bdae0b9ef7f25afa9deaab URL: http://source.winehq.org/git/wine.git/?a=commit;h=f370017e6f2179e5a3bdae0b9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Sep 2 11:38:45 2014 +0200 msvcp90: Fix complex::operator*= implementation. --- dlls/msvcp90/math.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/msvcp90/math.c b/dlls/msvcp90/math.c index 6c20b2c..ec0b4f8 100644 --- a/dlls/msvcp90/math.c +++ b/dlls/msvcp90/math.c @@ -1162,10 +1162,11 @@ complex_float* __thiscall complex_float_mult_assign_float(complex_float *this, c DEFINE_THISCALL_WRAPPER(complex_float_mult_assign, 8) complex_float* __thiscall complex_float_mult_assign(complex_float *this, const complex_float *r) { - complex_float tmp = *this; + complex_float tmp; - this->real = tmp.real*r->real - tmp.imag*r->imag; - this->imag = tmp.real*r->imag + tmp.imag*r->real; + tmp.real = this->real*r->real - this->imag*r->imag; + tmp.imag = this->real*r->imag + this->imag*r->real; + *this = tmp; return this; } @@ -1819,10 +1820,11 @@ complex_double* __thiscall complex_double_mult_assign_double(complex_double *thi DEFINE_THISCALL_WRAPPER(complex_double_mult_assign, 8) complex_double* __thiscall complex_double_mult_assign(complex_double *this, const complex_double *r) { - complex_double tmp = *this; + complex_double tmp; - this->real = tmp.real*r->real - tmp.imag*r->imag; - this->imag = tmp.real*r->imag + tmp.imag*r->real; + tmp.real = this->real*r->real - this->imag*r->imag; + tmp.imag = this->real*r->imag + this->imag*r->real; + *this = tmp; return this; }

1 0

Jacek Caban : mshtml: Use TID_LIST in debugstr_mshtml_guid.
by Alexandre Julliard 02 Sep '14

02 Sep '14

Module: wine Branch: master Commit: 8b0e62c42b50719c4883bc23cff2558cf3831986 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b0e62c42b50719c4883bc23c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 2 11:45:31 2014 +0200 mshtml: Use TID_LIST in debugstr_mshtml_guid. --- dlls/mshtml/main.c | 50 +++++--------------------------------------------- 1 file changed, 5 insertions(+), 45 deletions(-) diff --git a/dlls/mshtml/main.c b/dlls/mshtml/main.c index 8e11ce9..ce9222f 100644 --- a/dlls/mshtml/main.c +++ b/dlls/mshtml/main.c @@ -504,7 +504,6 @@ HRESULT WINAPI DllUnregisterServer(void) const char *debugstr_mshtml_guid(const GUID *iid) { #define X(x) if(IsEqualGUID(iid, &x)) return #x - X(DIID_DispHTMLDocument); X(DIID_HTMLDocumentEvents); X(DIID_HTMLDocumentEvents2); X(DIID_HTMLTableEvents); @@ -517,54 +516,10 @@ const char *debugstr_mshtml_guid(const GUID *iid) X(IID_IEnumConnections); X(IID_IEnumVARIANT); X(IID_IHlinkTarget); - X(IID_IHTMLAttributeCollection); - X(IID_IHTMLAttributeCollection2); - X(IID_IHTMLAttributeCollection3); - X(IID_IHTMLCurrentStyle); - X(IID_IHTMLCurrentStyle2); - X(IID_IHTMLCurrentStyle3); - X(IID_IHTMLCurrentStyle4); - X(IID_IHTMLDocument); - X(IID_IHTMLDocument2); - X(IID_IHTMLDocument3); - X(IID_IHTMLDocument4); - X(IID_IHTMLDocument5); X(IID_IHTMLDocument6); X(IID_IHTMLDocument7); - X(IID_IHTMLDOMAttribute); - X(IID_IHTMLDOMChildrenCollection); - X(IID_IHTMLDOMImplementation); - X(IID_IHTMLDOMNode); - X(IID_IHTMLDOMNode2); - X(IID_IHTMLElement); - X(IID_IHTMLElement2); - X(IID_IHTMLElement3); - X(IID_IHTMLElement4); - X(IID_IHTMLElementCollection); - X(IID_IHTMLEventObj); - X(IID_IHTMLFiltersCollection); X(IID_IHTMLFramesCollection2); - X(IID_IHTMLImageElementFactory); - X(IID_IHTMLLocation); - X(IID_IHTMLOptionElementFactory); X(IID_IHTMLPrivateWindow); - X(IID_IHTMLRect); - X(IID_IHTMLScreen); - X(IID_IHTMLStorage); - X(IID_IHTMLStyle); - X(IID_IHTMLStyle2); - X(IID_IHTMLStyle3); - X(IID_IHTMLStyle4); - X(IID_IHTMLStyle5); - X(IID_IHTMLStyle6); - X(IID_IHTMLStyleSheet); - X(IID_IHTMLStyleSheetRulesCollection); - X(IID_IHTMLStyleSheetsCollection); - X(IID_IHTMLWindow2); - X(IID_IHTMLWindow3); - X(IID_IHTMLWindow4); - X(IID_IHTMLWindow5); - X(IID_IHTMLWindow6); X(IID_IHtmlLoadOptions); X(IID_IInternetHostSecurityManager); X(IID_IMonikerProp); @@ -601,6 +556,11 @@ const char *debugstr_mshtml_guid(const GUID *iid) X(IID_IViewObjectEx); X(IID_nsCycleCollectionISupports); X(IID_nsXPCOMCycleCollectionParticipant); +#define XIID(x) X(IID_##x); +#define XDIID(x) X(DIID_##x); + TID_LIST +#undef XIID +#undef XDIID #undef X return debugstr_guid(iid);

1 0

Jacek Caban : mshtml: Use debugstr_mshtml_guid in htmlhead.c.
by Alexandre Julliard 02 Sep '14

02 Sep '14

Module: wine Branch: master Commit: ac2b2e5e58ee341a0ba93cc1b5f7535b5f016605 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac2b2e5e58ee341a0ba93cc1b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 2 11:45:36 2014 +0200 mshtml: Use debugstr_mshtml_guid in htmlhead.c. --- dlls/mshtml/htmlhead.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/htmlhead.c b/dlls/mshtml/htmlhead.c index a6a2a73..11bba8d 100644 --- a/dlls/mshtml/htmlhead.c +++ b/dlls/mshtml/htmlhead.c @@ -134,12 +134,12 @@ static HRESULT HTMLTitleElement_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) { HTMLTitleElement *This = HTMLTitleElement_from_HTMLDOMNode(iface); - if(IsEqualGUID(&IID_IHTMLTitleElement, riid)) { - TRACE("(%p)->(IID_IHTMLTitleElement %p)\n", This, ppv); + TRACE("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); + + if(IsEqualGUID(&IID_IHTMLTitleElement, riid)) *ppv = &This->IHTMLTitleElement_iface; - }else { + else return HTMLElement_QI(&This->element.node, riid, ppv); - } IUnknown_AddRef((IUnknown*)*ppv); return S_OK; @@ -294,12 +294,12 @@ static HRESULT HTMLHeadElement_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) { HTMLHeadElement *This = impl_from_HTMLDOMNode(iface); - if(IsEqualGUID(&IID_IHTMLHeadElement, riid)) { - TRACE("(%p)->(IID_IHTMLHeadElement %p)\n", This, ppv); + TRACE("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); + + if(IsEqualGUID(&IID_IHTMLHeadElement, riid)) *ppv = &This->IHTMLHeadElement_iface; - }else { + else return HTMLElement_QI(&This->element.node, riid, ppv); - } IUnknown_AddRef((IUnknown*)*ppv); return S_OK;

1 0

Johannes Brandstätter : wined3d: Fix trace output of emulated_textureram.
by Alexandre Julliard 02 Sep '14

02 Sep '14

Module: wine Branch: master Commit: de3cb3af6f19477ee32bc52e71846f6302ea1329 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de3cb3af6f19477ee32bc52e7… Author: Johannes Brandstätter <jbrandst(a)2ds.eu> Date: Tue Sep 2 13:35:00 2014 +0200 wined3d: Fix trace output of emulated_textureram. --- dlls/wined3d/directx.c | 3 ++- dlls/wined3d/wined3d_main.c | 6 +++--- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 9f00dcf..79b2590 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1521,7 +1521,8 @@ static void init_driver_info(struct wined3d_driver_info *driver_info, if (wined3d_settings.emulated_textureram) { - TRACE("Overriding amount of video memory with %u bytes.\n", wined3d_settings.emulated_textureram); + TRACE("Overriding amount of video memory with 0x%s bytes.\n", + wine_dbgstr_longlong(wined3d_settings.emulated_textureram)); driver_info->vram_bytes = wined3d_settings.emulated_textureram; } diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 7ab2448..758ba43 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -256,10 +256,10 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) int TmpVideoMemorySize = atoi(buffer); if(TmpVideoMemorySize > 0) { - wined3d_settings.emulated_textureram = TmpVideoMemorySize *1024*1024; - TRACE("Use %iMB = %d byte for emulated_textureram\n", + wined3d_settings.emulated_textureram = (UINT64)TmpVideoMemorySize *1024*1024; + TRACE("Use %iMiB = 0x%s bytes for emulated_textureram\n", TmpVideoMemorySize, - wined3d_settings.emulated_textureram); + wine_dbgstr_longlong(wined3d_settings.emulated_textureram)); } else ERR("VideoMemorySize is %i but must be >0\n", TmpVideoMemorySize); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e99a7b4..f55b118 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -257,7 +257,7 @@ struct wined3d_settings unsigned short pci_vendor_id; unsigned short pci_device_id; /* Memory tracking and object counting. */ - unsigned int emulated_textureram; + UINT64 emulated_textureram; char *logo; int allow_multisampling; BOOL strict_draw_ordering;

1 0

Piotr Caban : msvcrt: Add _strnset_s implementation.
by Alexandre Julliard 02 Sep '14

02 Sep '14

Module: wine Branch: master Commit: 53869e19ebb0d74909b9efb81a54a4571b5460b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53869e19ebb0d74909b9efb81… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Sep 2 13:50:44 2014 +0200 msvcrt: Add _strnset_s implementation. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/string.c | 24 ++++++++++++++++++++++++ dlls/msvcrt/tests/string.c | 33 +++++++++++++++++++++++++++++++++ 7 files changed, 62 insertions(+), 5 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 7135638..f8062f9 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1350,7 +1350,7 @@ @ cdecl _strnicoll(str str long) MSVCRT__strnicoll @ cdecl _strnicoll_l(str str long ptr) MSVCRT__strnicoll_l @ cdecl _strnset(str long long) MSVCRT__strnset -@ stub _strnset_s +@ cdecl _strnset_s(str long long long) MSVCRT__strnset_s @ cdecl _strrev(str) MSVCRT__strrev @ cdecl _strset(str long) @ stub _strset_s diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 39ad037..6a328eb 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1708,7 +1708,7 @@ @ cdecl _strnicoll(str str long) MSVCRT__strnicoll @ cdecl _strnicoll_l(str str long ptr) MSVCRT__strnicoll_l @ cdecl _strnset(str long long) MSVCRT__strnset -@ stub _strnset_s +@ cdecl _strnset_s(str long long long) MSVCRT__strnset_s @ cdecl _strrev(str) MSVCRT__strrev @ cdecl _strset(str long) @ stub _strset_s diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 302abe5..3902c85 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1030,7 +1030,7 @@ @ cdecl _strnicoll(str str long) MSVCRT__strnicoll @ cdecl _strnicoll_l(str str long ptr) MSVCRT__strnicoll_l @ cdecl _strnset(str long long) MSVCRT__strnset -@ stub _strnset_s +@ cdecl _strnset_s(str long long long) MSVCRT__strnset_s @ cdecl _strrev(str) MSVCRT__strrev @ cdecl _strset(str long) @ stub _strset_s diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 28d37d1..fa19f40 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1005,7 +1005,7 @@ @ cdecl _strnicoll(str str long) MSVCRT__strnicoll @ cdecl _strnicoll_l(str str long ptr) MSVCRT__strnicoll_l @ cdecl _strnset(str long long) MSVCRT__strnset -@ stub _strnset_s +@ cdecl _strnset_s(str long long long) MSVCRT__strnset_s @ cdecl _strrev(str) MSVCRT__strrev @ cdecl _strset(str long) @ stub _strset_s diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 2349580..01788e1 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -971,7 +971,7 @@ @ cdecl _strnicoll(str str long) MSVCRT__strnicoll @ cdecl _strnicoll_l(str str long ptr) MSVCRT__strnicoll_l @ cdecl _strnset(str long long) MSVCRT__strnset -# stub _strnset_s(str long long long) +@ cdecl _strnset_s(str long long long) MSVCRT__strnset_s @ cdecl _strrev(str) MSVCRT__strrev @ cdecl _strset(str long) # stub _strset_s(str long long) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 60e00c9..bacab00 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -174,6 +174,30 @@ char* CDECL MSVCRT__strupr(char *str) } /********************************************************************* + * _strnset_s (MSVCRT.@) + */ +int CDECL MSVCRT__strnset_s(char *str, MSVCRT_size_t size, int c, MSVCRT_size_t count) +{ + MSVCRT_size_t i; + + if(!str && !size && !count) return 0; + if(!MSVCRT_CHECK_PMT(str != NULL)) return MSVCRT_EINVAL; + if(!MSVCRT_CHECK_PMT(size > 0)) return MSVCRT_EINVAL; + + for(i=0; i<size-1 && i<count; i++) { + if(!str[i]) return 0; + str[i] = c; + } + for(; i<size; i++) + if(!str[i]) return 0; + + str[0] = 0; + MSVCRT__invalid_parameter(NULL, NULL, NULL, 0, 0); + *MSVCRT__errno() = MSVCRT_EINVAL; + return MSVCRT_EINVAL; +} + +/********************************************************************* * _strnset (MSVCRT.@) */ char* CDECL MSVCRT__strnset(char* str, int value, MSVCRT_size_t len) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 6604819..5b9d951 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -89,6 +89,7 @@ static int (__cdecl *p_tolower)(int); static size_t (__cdecl *p_mbrlen)(const char*, size_t, mbstate_t*); static size_t (__cdecl *p_mbrtowc)(wchar_t*, const char*, size_t, mbstate_t*); static int (__cdecl *p__atodbl_l)(_CRT_DOUBLE*,char*,_locale_t); +static int (__cdecl *p__strnset_s)(char*,size_t,int,size_t); #define SETNOFAIL(x,y) x = (void*)GetProcAddress(hMsvcrt,y) #define SET(x,y) SETNOFAIL(x,y); ok(x != NULL, "Export '%s' not found\n", y) @@ -2716,6 +2717,36 @@ static void test_strxfrm(void) setlocale(LC_ALL, "C"); } +static void test__strnset_s(void) +{ + char buf[5] = {0}; + int r; + + if(!p__strnset_s) { + win_skip("_strnset_s not available\n"); + return; + } + + r = p__strnset_s(NULL, 0, 'a', 0); + ok(r == 0, "r = %d\n", r); + + buf[0] = buf[1] = buf[2] = 'b'; + r = p__strnset_s(buf, sizeof(buf), 'a', 2); + ok(r == 0, "r = %d\n", r); + ok(!strcmp(buf, "aab"), "buf = %s\n", buf); + + r = p__strnset_s(buf, 0, 'a', 0); + ok(r == EINVAL, "r = %d\n", r); + + r = p__strnset_s(NULL, 0, 'a', 1); + ok(r == EINVAL, "r = %d\n", r); + + buf[3] = 'b'; + r = p__strnset_s(buf, sizeof(buf)-1, 'c', 2); + ok(r == EINVAL, "r = %d\n", r); + ok(!buf[0] && buf[1]=='c' && buf[2]=='b', "buf = %s\n", buf); +} + START_TEST(string) { char mem[100]; @@ -2763,6 +2794,7 @@ START_TEST(string) p_mbrtowc = (void*)GetProcAddress(hMsvcrt, "mbrtowc"); p_mbsrtowcs = (void*)GetProcAddress(hMsvcrt, "mbsrtowcs"); p__atodbl_l = (void*)GetProcAddress(hMsvcrt, "_atodbl_l"); + p__strnset_s = (void*)GetProcAddress(hMsvcrt, "_strnset_s"); /* MSVCRT memcpy behaves like memmove for overlapping moves, MFC42 CString::Insert seems to rely on that behaviour */ @@ -2816,4 +2848,5 @@ START_TEST(string) test_atoi(); test_strncpy(); test_strxfrm(); + test__strnset_s(); }

1 0

Aric Stewart : dwrite: Add the system font collection to the dwrite factory object.
by Alexandre Julliard 02 Sep '14

02 Sep '14

Module: wine Branch: master Commit: f49c740907d6a87fd58c1205818835a7e7ca4e87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f49c740907d6a87fd58c12058… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Sep 2 07:17:57 2014 -0500 dwrite: Add the system font collection to the dwrite factory object. --- dlls/dwrite/dwrite_private.h | 1 - dlls/dwrite/font.c | 95 ++++++++++++++++++++------------------------ dlls/dwrite/layout.c | 11 +---- dlls/dwrite/main.c | 28 ++++++++++--- 4 files changed, 69 insertions(+), 66 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 8fda71e..e78f9bf 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -92,7 +92,6 @@ extern HRESULT get_gdiinterop(IDWriteGdiInterop**) DECLSPEC_HIDDEN; extern HRESULT create_localizedstrings(IDWriteLocalizedStrings**) DECLSPEC_HIDDEN; extern HRESULT add_localizedstring(IDWriteLocalizedStrings*,const WCHAR*,const WCHAR*) DECLSPEC_HIDDEN; extern HRESULT get_system_fontcollection(IDWriteFontCollection**) DECLSPEC_HIDDEN; -extern void release_system_fontcollection(void) DECLSPEC_HIDDEN; extern HRESULT get_textanalyzer(IDWriteTextAnalyzer**) DECLSPEC_HIDDEN; extern HRESULT create_font_file(IDWriteFontFileLoader *loader, const void *reference_key, UINT32 key_size, IDWriteFontFile **font_file) DECLSPEC_HIDDEN; extern HRESULT create_localfontfileloader(IDWriteLocalFontFileLoader** iface) DECLSPEC_HIDDEN; diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index c835ff4..5be7c83 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -127,14 +127,13 @@ typedef struct struct dwrite_fontcollection { IDWriteFontCollection IDWriteFontCollection_iface; + LONG ref; WCHAR **families; UINT32 count; int alloc; }; -static IDWriteFontCollection *system_collection; - struct dwrite_fontfamily { IDWriteFontFamily IDWriteFontFamily_iface; LONG ref; @@ -844,14 +843,30 @@ static HRESULT WINAPI dwritefontcollection_QueryInterface(IDWriteFontCollection return E_NOINTERFACE; } -static ULONG WINAPI dwritesysfontcollection_AddRef(IDWriteFontCollection *iface) +static ULONG WINAPI dwritefontcollection_AddRef(IDWriteFontCollection *iface) { - return 2; + struct dwrite_fontcollection *This = impl_from_IDWriteFontCollection(iface); + ULONG ref = InterlockedIncrement(&This->ref); + TRACE("(%p)->(%d)\n", This, ref); + return ref; } -static ULONG WINAPI dwritesysfontcollection_Release(IDWriteFontCollection *iface) +static ULONG WINAPI dwritefontcollection_Release(IDWriteFontCollection *iface) { - return 1; + unsigned int i; + struct dwrite_fontcollection *This = impl_from_IDWriteFontCollection(iface); + ULONG ref = InterlockedDecrement(&This->ref); + TRACE("(%p)->(%d)\n", This, ref); + + if (!ref) + { + for (i = 0; i < This->count; i++) + heap_free(This->families[i]); + heap_free(This->families); + heap_free(This); + } + + return ref; } static UINT32 WINAPI dwritefontcollection_GetFontFamilyCount(IDWriteFontCollection *iface) @@ -904,10 +919,10 @@ static HRESULT WINAPI dwritefontcollection_GetFontFromFontFace(IDWriteFontCollec return E_NOTIMPL; } -static const IDWriteFontCollectionVtbl systemfontcollectionvtbl = { +static const IDWriteFontCollectionVtbl fontcollectionvtbl = { dwritefontcollection_QueryInterface, - dwritesysfontcollection_AddRef, - dwritesysfontcollection_Release, + dwritefontcollection_AddRef, + dwritefontcollection_Release, dwritefontcollection_GetFontFamilyCount, dwritefontcollection_GetFontFamily, dwritefontcollection_FindFamilyName, @@ -938,56 +953,34 @@ static INT CALLBACK enum_font_families(const LOGFONTW *lf, const TEXTMETRICW *tm return add_family_syscollection(collection, lf->lfFaceName) == S_OK; } -static void release_font_collection(IDWriteFontCollection *iface) -{ - struct dwrite_fontcollection *This = impl_from_IDWriteFontCollection(iface); - unsigned int i; - - for (i = 0; i < This->count; i++) - heap_free(This->families[i]); - heap_free(This->families); - heap_free(This); -} - -void release_system_fontcollection(void) -{ - if (system_collection) - release_font_collection(system_collection); -} - HRESULT get_system_fontcollection(IDWriteFontCollection **collection) { - if (!system_collection) - { - struct dwrite_fontcollection *This; - LOGFONTW lf; - HDC hdc; - - *collection = NULL; + struct dwrite_fontcollection *This; + LOGFONTW lf; + HDC hdc; - This = heap_alloc(sizeof(struct dwrite_fontcollection)); - if (!This) return E_OUTOFMEMORY; + *collection = NULL; - This->IDWriteFontCollection_iface.lpVtbl = &systemfontcollectionvtbl; - This->alloc = 50; - This->count = 0; - This->families = heap_alloc(This->alloc*sizeof(WCHAR*)); + This = heap_alloc(sizeof(struct dwrite_fontcollection)); + if (!This) return E_OUTOFMEMORY; - TRACE("building system font collection:\n"); + This->IDWriteFontCollection_iface.lpVtbl = &fontcollectionvtbl; + This->ref = 1; + This->alloc = 50; + This->count = 0; + This->families = heap_alloc(This->alloc*sizeof(WCHAR*)); - hdc = CreateCompatibleDC(0); - memset(&lf, 0, sizeof(lf)); - lf.lfCharSet = DEFAULT_CHARSET; - lf.lfPitchAndFamily = DEFAULT_PITCH; - lf.lfFaceName[0] = 0; - EnumFontFamiliesExW(hdc, &lf, enum_font_families, (LPARAM)This, 0); - DeleteDC(hdc); + TRACE("building system font collection:\n"); - if (InterlockedCompareExchangePointer((void**)&system_collection, &This->IDWriteFontCollection_iface, NULL)) - release_font_collection(&This->IDWriteFontCollection_iface); - } + hdc = CreateCompatibleDC(0); + memset(&lf, 0, sizeof(lf)); + lf.lfCharSet = DEFAULT_CHARSET; + lf.lfPitchAndFamily = DEFAULT_PITCH; + lf.lfFaceName[0] = 0; + EnumFontFamiliesExW(hdc, &lf, enum_font_families, (LPARAM)This, 0); + DeleteDC(hdc); - *collection = system_collection; + *collection = &This->IDWriteFontCollection_iface; return S_OK; } diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index a2da73b..82525d8 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -229,7 +229,7 @@ static struct layout_range *alloc_layout_range(struct dwrite_textlayout *layout, range->strikethrough = FALSE; range->collection = layout->format.collection; if (range->collection) - IDWriteFontCollection_Release(range->collection); + IDWriteFontCollection_AddRef(range->collection); return range; } @@ -1781,14 +1781,7 @@ HRESULT create_textformat(const WCHAR *family_name, IDWriteFontCollection *colle IDWriteFontCollection_AddRef(collection); } else - { - HRESULT hr = get_system_fontcollection(&This->format.collection); - if (hr != S_OK) - { - IDWriteTextFormat_Release(&This->IDWriteTextFormat_iface); - return hr; - } - } + ERR("Collection should always be set\n"); *format = &This->IDWriteTextFormat_iface; diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index 83f705b..01394dc 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -43,10 +43,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD reason, LPVOID reserved) case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls( hinstDLL ); break; - case DLL_PROCESS_DETACH: - if (reserved) break; - release_system_fontcollection(); - break; } return TRUE; } @@ -364,6 +360,7 @@ struct dwritefactory{ LONG ref; IDWriteLocalFontFileLoader* localfontfileloader; + IDWriteFontCollection *system_collection; IDWriteFontCollectionLoader **loaders; LONG loader_count; @@ -422,6 +419,8 @@ static ULONG WINAPI dwritefactory_Release(IDWriteFactory *iface) if (This->file_loaders[i]) IDWriteFontFileLoader_Release(This->file_loaders[i]); heap_free(This->file_loaders); + if (This->system_collection) + IDWriteFontCollection_Release(This->system_collection); heap_free(This); } @@ -431,13 +430,22 @@ static ULONG WINAPI dwritefactory_Release(IDWriteFactory *iface) static HRESULT WINAPI dwritefactory_GetSystemFontCollection(IDWriteFactory *iface, IDWriteFontCollection **collection, BOOL check_for_updates) { + HRESULT hr = S_OK; struct dwritefactory *This = impl_from_IDWriteFactory(iface); TRACE("(%p)->(%p %d)\n", This, collection, check_for_updates); if (check_for_updates) FIXME("checking for system font updates not implemented\n"); - return get_system_fontcollection(collection); + if (!This->system_collection) + hr = get_system_fontcollection(&This->system_collection); + + if (SUCCEEDED(hr)) + IDWriteFontCollection_AddRef(This->system_collection); + + *collection = This->system_collection; + + return hr; } static HRESULT WINAPI dwritefactory_CreateCustomFontCollection(IDWriteFactory *iface, @@ -642,6 +650,15 @@ static HRESULT WINAPI dwritefactory_CreateTextFormat(IDWriteFactory *iface, WCHA struct dwritefactory *This = impl_from_IDWriteFactory(iface); TRACE("(%p)->(%s %p %d %d %d %f %s %p)\n", This, debugstr_w(family_name), collection, weight, style, stretch, size, debugstr_w(locale), format); + + if (!collection) + { + HRESULT hr = IDWriteFactory_GetSystemFontCollection(iface, &collection, FALSE); + if (hr != S_OK) + return hr; + /* Our ref count is 1 too many, since we will add ref in create_textformat */ + IDWriteFontCollection_Release(This->system_collection); + } return create_textformat(family_name, collection, weight, style, stretch, size, locale, format); } @@ -759,6 +776,7 @@ HRESULT WINAPI DWriteCreateFactory(DWRITE_FACTORY_TYPE type, REFIID riid, IUnkno This->loaders = heap_alloc_zero(sizeof(*This->loaders) * 2); This->file_loader_count = 2; This->file_loaders = heap_alloc_zero(sizeof(*This->file_loaders) * 2); + This->system_collection = NULL; *factory = (IUnknown*)&This->IDWriteFactory_iface;

1 0

Aric Stewart : dwrite: Store font data in its own structure.
by Alexandre Julliard 02 Sep '14

02 Sep '14

Module: wine Branch: master Commit: daef5061e8ceb84b2e49dbf9cfa1333c86948221 URL: http://source.winehq.org/git/wine.git/?a=commit;h=daef5061e8ceb84b2e49dbf9c… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Sep 2 10:19:25 2014 -0500 dwrite: Store font data in its own structure. --- dlls/dwrite/font.c | 88 ++++++++++++++++++++++++++++++++---------------------- 1 file changed, 53 insertions(+), 35 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 5be7c83..8cb8413 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -125,6 +125,16 @@ typedef struct #define MS_OS2_TAG MS_MAKE_TAG('O','S','/','2') #define MS_POST_TAG MS_MAKE_TAG('p','o','s','t') +struct dwrite_font_data { + DWRITE_FONT_STYLE style; + DWRITE_FONT_STRETCH stretch; + DWRITE_FONT_WEIGHT weight; + DWRITE_FONT_SIMULATIONS simulations; + DWRITE_FONT_METRICS metrics; + + WCHAR *facename; +}; + struct dwrite_fontcollection { IDWriteFontCollection IDWriteFontCollection_iface; LONG ref; @@ -148,11 +158,8 @@ struct dwrite_font { BOOL is_system; IDWriteFontFamily *family; IDWriteFontFace *face; - DWRITE_FONT_STYLE style; - DWRITE_FONT_STRETCH stretch; - DWRITE_FONT_WEIGHT weight; - DWRITE_FONT_METRICS metrics; - WCHAR *facename; + + struct dwrite_font_data *data; }; #define DWRITE_FONTTABLE_MAGIC 0xededfafa @@ -528,10 +535,10 @@ static HRESULT create_system_fontface(struct dwrite_font *font, IDWriteFontFace This->is_system = TRUE; memset(&This->logfont, 0, sizeof(This->logfont)); - This->logfont.lfItalic = font->style == DWRITE_FONT_STYLE_ITALIC; + This->logfont.lfItalic = font->data->style == DWRITE_FONT_STYLE_ITALIC; /* weight values from DWRITE_FONT_WEIGHT match values used for LOGFONT */ - This->logfont.lfWeight = font->weight; - strcpyW(This->logfont.lfFaceName, font->facename); + This->logfont.lfWeight = font->data->weight; + strcpyW(This->logfont.lfFaceName, font->data->facename); *face = &This->IDWriteFontFace_iface; @@ -583,7 +590,8 @@ static ULONG WINAPI dwritefont_Release(IDWriteFont *iface) { if (This->face) IDWriteFontFace_Release(This->face); IDWriteFontFamily_Release(This->family); - heap_free(This->facename); + heap_free(This->data->facename); + heap_free(This->data); heap_free(This); } @@ -604,21 +612,21 @@ static DWRITE_FONT_WEIGHT WINAPI dwritefont_GetWeight(IDWriteFont *iface) { struct dwrite_font *This = impl_from_IDWriteFont(iface); TRACE("(%p)\n", This); - return This->weight; + return This->data->weight; } static DWRITE_FONT_STRETCH WINAPI dwritefont_GetStretch(IDWriteFont *iface) { struct dwrite_font *This = impl_from_IDWriteFont(iface); TRACE("(%p)\n", This); - return This->stretch; + return This->data->stretch; } static DWRITE_FONT_STYLE WINAPI dwritefont_GetStyle(IDWriteFont *iface) { struct dwrite_font *This = impl_from_IDWriteFont(iface); TRACE("(%p)\n", This); - return This->style; + return This->data->style; } static BOOL WINAPI dwritefont_IsSymbolFont(IDWriteFont *iface) @@ -646,8 +654,8 @@ static HRESULT WINAPI dwritefont_GetInformationalStrings(IDWriteFont *iface, static DWRITE_FONT_SIMULATIONS WINAPI dwritefont_GetSimulations(IDWriteFont *iface) { struct dwrite_font *This = impl_from_IDWriteFont(iface); - FIXME("(%p): stub\n", This); - return DWRITE_FONT_SIMULATIONS_NONE; + TRACE("(%p)\n", This); + return This->data->simulations; } static void WINAPI dwritefont_GetMetrics(IDWriteFont *iface, DWRITE_FONT_METRICS *metrics) @@ -655,7 +663,7 @@ static void WINAPI dwritefont_GetMetrics(IDWriteFont *iface, DWRITE_FONT_METRICS struct dwrite_font *This = impl_from_IDWriteFont(iface); TRACE("(%p)->(%p)\n", This, metrics); - *metrics = This->metrics; + *metrics = This->data->metrics; } static HRESULT WINAPI dwritefont_HasCharacter(IDWriteFont *iface, UINT32 value, BOOL *exists) @@ -1011,10 +1019,10 @@ static void get_font_properties(struct dwrite_font *font, HDC hdc) LONG size; /* default stretch and weight to normal */ - font->stretch = DWRITE_FONT_STRETCH_NORMAL; - font->weight = DWRITE_FONT_WEIGHT_NORMAL; + font->data->stretch = DWRITE_FONT_STRETCH_NORMAL; + font->data->weight = DWRITE_FONT_WEIGHT_NORMAL; - memset(&font->metrics, 0, sizeof(font->metrics)); + memset(&font->data->metrics, 0, sizeof(font->data->metrics)); size = GetFontData(hdc, MS_OS2_TAG, 0, NULL, 0); if (size != GDI_ERROR) @@ -1026,31 +1034,31 @@ static void get_font_properties(struct dwrite_font *font, HDC hdc) /* DWRITE_FONT_STRETCH enumeration values directly match font data values */ if (GET_BE_WORD(tt_os2.usWidthClass) <= DWRITE_FONT_STRETCH_ULTRA_EXPANDED) - font->stretch = GET_BE_WORD(tt_os2.usWidthClass); - - font->weight = GET_BE_WORD(tt_os2.usWeightClass); - TRACE("stretch=%d, weight=%d\n", font->stretch, font->weight); - - font->metrics.ascent = GET_BE_WORD(tt_os2.sTypoAscender); - font->metrics.descent = GET_BE_WORD(tt_os2.sTypoDescender); - font->metrics.lineGap = GET_BE_WORD(tt_os2.sTypoLineGap); - font->metrics.capHeight = GET_BE_WORD(tt_os2.sCapHeight); - font->metrics.xHeight = GET_BE_WORD(tt_os2.sxHeight); - font->metrics.strikethroughPosition = GET_BE_WORD(tt_os2.yStrikeoutPosition); - font->metrics.strikethroughThickness = GET_BE_WORD(tt_os2.yStrikeoutSize); + font->data->stretch = GET_BE_WORD(tt_os2.usWidthClass); + + font->data->weight = GET_BE_WORD(tt_os2.usWeightClass); + TRACE("stretch=%d, weight=%d\n", font->data->stretch, font->data->weight); + + font->data->metrics.ascent = GET_BE_WORD(tt_os2.sTypoAscender); + font->data->metrics.descent = GET_BE_WORD(tt_os2.sTypoDescender); + font->data->metrics.lineGap = GET_BE_WORD(tt_os2.sTypoLineGap); + font->data->metrics.capHeight = GET_BE_WORD(tt_os2.sCapHeight); + font->data->metrics.xHeight = GET_BE_WORD(tt_os2.sxHeight); + font->data->metrics.strikethroughPosition = GET_BE_WORD(tt_os2.yStrikeoutPosition); + font->data->metrics.strikethroughThickness = GET_BE_WORD(tt_os2.yStrikeoutSize); } memset(&tt_head, 0, sizeof(tt_head)); if (GetFontData(hdc, MS_HEAD_TAG, 0, &tt_head, sizeof(tt_head)) != GDI_ERROR) { - font->metrics.designUnitsPerEm = GET_BE_WORD(tt_head.unitsPerEm); + font->data->metrics.designUnitsPerEm = GET_BE_WORD(tt_head.unitsPerEm); } memset(&tt_post, 0, sizeof(tt_post)); if (GetFontData(hdc, MS_POST_TAG, 0, &tt_post, sizeof(tt_post)) != GDI_ERROR) { - font->metrics.underlinePosition = GET_BE_WORD(tt_post.underlinePosition); - font->metrics.underlineThickness = GET_BE_WORD(tt_post.underlineThickness); + font->data->metrics.underlinePosition = GET_BE_WORD(tt_post.underlinePosition); + font->data->metrics.underlineThickness = GET_BE_WORD(tt_post.underlineThickness); } } @@ -1069,10 +1077,17 @@ HRESULT create_font_from_logfont(const LOGFONTW *logfont, IDWriteFont **font) This = heap_alloc(sizeof(struct dwrite_font)); if (!This) return E_OUTOFMEMORY; + This->data = heap_alloc(sizeof(struct dwrite_font_data)); + if (!This->data) + { + heap_free(This); + return E_OUTOFMEMORY; + } hfont = CreateFontIndirectW(logfont); if (!hfont) { + heap_free(This->data); heap_free(This); return DWRITE_E_NOFONT; } @@ -1084,6 +1099,7 @@ HRESULT create_font_from_logfont(const LOGFONTW *logfont, IDWriteFont **font) otm = heap_alloc(ret); if (!otm) { + heap_free(This->data); heap_free(This); DeleteDC(hdc); DeleteObject(hfont); @@ -1105,6 +1121,7 @@ HRESULT create_font_from_logfont(const LOGFONTW *logfont, IDWriteFont **font) heap_free(otm); if (hr != S_OK) { + heap_free(This->data); heap_free(This); return hr; } @@ -1114,8 +1131,9 @@ HRESULT create_font_from_logfont(const LOGFONTW *logfont, IDWriteFont **font) This->face = NULL; This->is_system = TRUE; This->family = family; - This->style = logfont->lfItalic ? DWRITE_FONT_STYLE_ITALIC : DWRITE_FONT_STYLE_NORMAL; - This->facename = heap_strdupW(logfont->lfFaceName); + This->data->simulations = DWRITE_FONT_SIMULATIONS_NONE; + This->data->style = logfont->lfItalic ? DWRITE_FONT_STYLE_ITALIC : DWRITE_FONT_STYLE_NORMAL; + This->data->facename = heap_strdupW(logfont->lfFaceName); *font = &This->IDWriteFont_iface;

1 0

Aric Stewart : dwrite: Store fontface data in its own structure.
by Alexandre Julliard 02 Sep '14

02 Sep '14

Module: wine Branch: master Commit: e707bb6bcd78ba3676072818abd6ad9d1799defa URL: http://source.winehq.org/git/wine.git/?a=commit;h=e707bb6bcd78ba3676072818a… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Sep 2 10:19:31 2014 -0500 dwrite: Store fontface data in its own structure. --- dlls/dwrite/font.c | 93 ++++++++++++++++++++++++++++++++++-------------------- 1 file changed, 58 insertions(+), 35 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 8cb8413..7c107db 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -125,6 +125,14 @@ typedef struct #define MS_OS2_TAG MS_MAKE_TAG('O','S','/','2') #define MS_POST_TAG MS_MAKE_TAG('p','o','s','t') +struct dwrite_fontface_data { + DWRITE_FONT_FACE_TYPE type; + UINT32 file_count; + IDWriteFontFile ** files; + DWRITE_FONT_SIMULATIONS simulations; + UINT32 index; +}; + struct dwrite_font_data { DWRITE_FONT_STYLE style; DWRITE_FONT_STRETCH stretch; @@ -174,11 +182,7 @@ struct dwrite_fontface { IDWriteFontFace IDWriteFontFace_iface; LONG ref; - DWRITE_FONT_FACE_TYPE type; - UINT32 file_count; - IDWriteFontFile ** files; - DWRITE_FONT_SIMULATIONS simulations; - UINT32 index; + struct dwrite_fontface_data *data; BOOL is_system; LOGFONTW logfont; @@ -240,6 +244,15 @@ static HRESULT _dwritefontfile_GetFontFileStream(IDWriteFontFile *iface, IDWrite return E_FAIL; } +static VOID _free_fontface_data(struct dwrite_fontface_data *data) +{ + int i; + for (i = 0; i < data->file_count; i++) + IDWriteFontFile_Release(data->files[i]); + heap_free(data->files); + heap_free(data); +} + static HRESULT WINAPI dwritefontface_QueryInterface(IDWriteFontFace *iface, REFIID riid, void **obj) { struct dwrite_fontface *This = impl_from_IDWriteFontFace(iface); @@ -274,10 +287,7 @@ static ULONG WINAPI dwritefontface_Release(IDWriteFontFace *iface) if (!ref) { - int i; - for (i = 0; i < This->file_count; i++) - IDWriteFontFile_Release(This->files[i]); - heap_free(This->files); + _free_fontface_data(This->data); heap_free(This); } @@ -288,7 +298,7 @@ static DWRITE_FONT_FACE_TYPE WINAPI dwritefontface_GetType(IDWriteFontFace *ifac { struct dwrite_fontface *This = impl_from_IDWriteFontFace(iface); TRACE("(%p)\n", This); - return This->type; + return This->data->type; } static HRESULT WINAPI dwritefontface_GetFiles(IDWriteFontFace *iface, UINT32 *number_of_files, @@ -299,16 +309,16 @@ static HRESULT WINAPI dwritefontface_GetFiles(IDWriteFontFace *iface, UINT32 *nu TRACE("(%p)->(%p %p)\n", This, number_of_files, fontfiles); if (fontfiles == NULL) { - *number_of_files = This->file_count; + *number_of_files = This->data->file_count; return S_OK; } - if (*number_of_files < This->file_count) + if (*number_of_files < This->data->file_count) return E_INVALIDARG; - for (i = 0; i < This->file_count; i++) + for (i = 0; i < This->data->file_count; i++) { - IDWriteFontFile_AddRef(This->files[i]); - fontfiles[i] = This->files[i]; + IDWriteFontFile_AddRef(This->data->files[i]); + fontfiles[i] = This->data->files[i]; } return S_OK; @@ -318,14 +328,14 @@ static UINT32 WINAPI dwritefontface_GetIndex(IDWriteFontFace *iface) { struct dwrite_fontface *This = impl_from_IDWriteFontFace(iface); TRACE("(%p)\n", This); - return This->index; + return This->data->index; } static DWRITE_FONT_SIMULATIONS WINAPI dwritefontface_GetSimulations(IDWriteFontFace *iface) { struct dwrite_fontface *This = impl_from_IDWriteFontFace(iface); TRACE("(%p)\n", This); - return This->simulations; + return This->data->simulations; } static BOOL WINAPI dwritefontface_IsSymbolFont(IDWriteFontFace *iface) @@ -417,15 +427,15 @@ static HRESULT WINAPI dwritefontface_TryGetFontTable(IDWriteFontFace *iface, UIN return E_OUTOFMEMORY; *exists = FALSE; - for (i = 0; i < This->file_count && !(*exists); i++) + for (i = 0; i < This->data->file_count && !(*exists); i++) { IDWriteFontFileStream *stream; - hr = _dwritefontfile_GetFontFileStream(This->files[i], &stream); + hr = _dwritefontfile_GetFontFileStream(This->data->files[i], &stream); if (FAILED(hr)) continue; table->file_index = i; - hr = find_font_table(stream, This->index, table_tag, table_data, &table->context, table_size, exists); + hr = find_font_table(stream, This->data->index, table_tag, table_data, &table->context, table_size, exists); IDWriteFontFileStream_Release(stream); } @@ -451,7 +461,7 @@ static void WINAPI dwritefontface_ReleaseFontTable(IDWriteFontFace *iface, void return; } - hr = _dwritefontfile_GetFontFileStream(This->files[table->file_index], &stream); + hr = _dwritefontfile_GetFontFileStream(This->data->files[table->file_index], &stream); if (FAILED(hr)) return; IDWriteFontFileStream_ReleaseFileFragment(stream, table->context); @@ -524,14 +534,20 @@ static HRESULT create_system_fontface(struct dwrite_font *font, IDWriteFontFace This = heap_alloc(sizeof(struct dwrite_fontface)); if (!This) return E_OUTOFMEMORY; + This->data = heap_alloc(sizeof(struct dwrite_fontface_data)); + if (!This->data) + { + heap_free(This); + return E_OUTOFMEMORY; + } This->IDWriteFontFace_iface.lpVtbl = &dwritefontfacevtbl; This->ref = 1; - This->type = DWRITE_FONT_FACE_TYPE_UNKNOWN; - This->file_count = 0; - This->files = NULL; - This->index = 0; - This->simulations = DWRITE_FONT_SIMULATIONS_NONE; + This->data->type = DWRITE_FONT_FACE_TYPE_UNKNOWN; + This->data->file_count = 0; + This->data->files = NULL; + This->data->index = 0; + This->data->simulations = DWRITE_FONT_SIMULATIONS_NONE; This->is_system = TRUE; memset(&This->logfont, 0, sizeof(This->logfont)); @@ -1273,14 +1289,20 @@ HRESULT font_create_fontface(IDWriteFactory *iface, DWRITE_FONT_FACE_TYPE facety This = heap_alloc(sizeof(struct dwrite_fontface)); if (!This) return E_OUTOFMEMORY; + This->data = heap_alloc(sizeof(struct dwrite_fontface_data)); + if (!This) + { + heap_free(This); + return E_OUTOFMEMORY; + } This->IDWriteFontFace_iface.lpVtbl = &dwritefontfacevtbl; This->ref = 1; - This->type = facetype; - This->file_count = files_number; - This->files = heap_alloc(sizeof(*This->files) * files_number); + This->data->type = facetype; + This->data->file_count = files_number; + This->data->files = heap_alloc(sizeof(*This->data->files) * files_number); /* Verify font file streams */ - for (i = 0; i < This->file_count && SUCCEEDED(hr); i++) + for (i = 0; i < This->data->file_count && SUCCEEDED(hr); i++) { IDWriteFontFileStream *stream; hr = _dwritefontfile_GetFontFileStream(font_files[i], &stream); @@ -1289,18 +1311,19 @@ HRESULT font_create_fontface(IDWriteFactory *iface, DWRITE_FONT_FACE_TYPE facety } if (FAILED(hr)) { - heap_free(This->files); + heap_free(This->data->files); + heap_free(This->data); heap_free(This); return hr; } - for (i = 0; i < This->file_count; i++) + for (i = 0; i < This->data->file_count; i++) { - This->files[i] = font_files[i]; + This->data->files[i] = font_files[i]; IDWriteFontFile_AddRef(font_files[i]); } - This->index = index; - This->simulations = sim_flags; + This->data->index = index; + This->data->simulations = sim_flags; This->is_system = FALSE; *font_face = &This->IDWriteFontFace_iface;

1 0

Nikolay Sivov : ntdll: NtWaitForMultipleObjects()'s third arguments means 'wait_any', not 'wait_all'.
by Alexandre Julliard 02 Sep '14

02 Sep '14

Module: wine Branch: master Commit: 7b7d8374a40ddae124cdd089e2eedb32e11b9f03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b7d8374a40ddae124cdd089e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Sep 1 10:40:42 2014 +0400 ntdll: NtWaitForMultipleObjects()'s third arguments means 'wait_any', not 'wait_all'. --- dlls/kernel32/sync.c | 2 +- dlls/kernel32/tests/sync.c | 28 +++++++++++++++++++++++++--- dlls/ntdll/sync.c | 4 ++-- dlls/ntdll/threadpool.c | 2 +- 4 files changed, 29 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c index 8379c1d..d399b82 100644 --- a/dlls/kernel32/sync.c +++ b/dlls/kernel32/sync.c @@ -185,7 +185,7 @@ DWORD WINAPI WaitForMultipleObjectsEx( DWORD count, const HANDLE *handles, } } - status = NtWaitForMultipleObjects( count, hloc, wait_all, alertable, + status = NtWaitForMultipleObjects( count, hloc, !wait_all, alertable, get_nt_timeout( &time, timeout ) ); if (HIWORD(status)) /* is it an error code? */ diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index 2381302..cbe0acb 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -24,6 +24,7 @@ #include <stdio.h> #include <windef.h> #include <winbase.h> +#include <winternl.h> #include "wine/test.h" @@ -55,6 +56,7 @@ static VOID (WINAPI *pReleaseSRWLockExclusive)(PSRWLOCK); static VOID (WINAPI *pReleaseSRWLockShared)(PSRWLOCK); static BOOLEAN (WINAPI *pTryAcquireSRWLockExclusive)(PSRWLOCK); static BOOLEAN (WINAPI *pTryAcquireSRWLockShared)(PSRWLOCK); +static NTSTATUS (WINAPI *pNtWaitForMultipleObjects)(ULONG,const HANDLE*,BOOLEAN,BOOLEAN,const LARGE_INTEGER*); static void test_signalandwait(void) { @@ -1153,15 +1155,32 @@ static void test_WaitForMultipleObjects(void) } /* a manual-reset event remains signaled, an auto-reset event is cleared */ - r = WaitForMultipleObjects(MAXIMUM_WAIT_OBJECTS, maxevents, 0, 0); + r = WaitForMultipleObjects(MAXIMUM_WAIT_OBJECTS, maxevents, FALSE, 0); ok( r == WAIT_OBJECT_0, "should signal lowest handle first, got %d\n", r); - r = WaitForMultipleObjects(MAXIMUM_WAIT_OBJECTS, maxevents, 0, 0); + r = WaitForMultipleObjects(MAXIMUM_WAIT_OBJECTS, maxevents, FALSE, 0); ok( r == WAIT_OBJECT_0, "should signal handle #0 first, got %d\n", r); ok(ResetEvent(maxevents[0]), "ResetEvent\n"); for (i=1; i<MAXIMUM_WAIT_OBJECTS; i++) { /* the lowest index is checked first and remaining events are untouched */ - r = WaitForMultipleObjects(MAXIMUM_WAIT_OBJECTS, maxevents, 0, 0); + r = WaitForMultipleObjects(MAXIMUM_WAIT_OBJECTS, maxevents, FALSE, 0); + ok( r == WAIT_OBJECT_0+i, "should signal handle #%d first, got %d\n", i, r); + } + + /* run same test with Nt* call */ + for (i=0; i<MAXIMUM_WAIT_OBJECTS; i++) + SetEvent(maxevents[i]); + + /* a manual-reset event remains signaled, an auto-reset event is cleared */ + r = pNtWaitForMultipleObjects(MAXIMUM_WAIT_OBJECTS, maxevents, TRUE, FALSE, NULL); + ok( r == WAIT_OBJECT_0, "should signal lowest handle first, got %d\n", r); + r = pNtWaitForMultipleObjects(MAXIMUM_WAIT_OBJECTS, maxevents, TRUE, FALSE, NULL); + ok( r == WAIT_OBJECT_0, "should signal handle #0 first, got %d\n", r); + ok(ResetEvent(maxevents[0]), "ResetEvent\n"); + for (i=1; i<MAXIMUM_WAIT_OBJECTS; i++) + { + /* the lowest index is checked first and remaining events are untouched */ + r = pNtWaitForMultipleObjects(MAXIMUM_WAIT_OBJECTS, maxevents, TRUE, FALSE, NULL); ok( r == WAIT_OBJECT_0+i, "should signal handle #%d first, got %d\n", i, r); } @@ -2287,6 +2306,8 @@ static void test_srwlock_example(void) START_TEST(sync) { HMODULE hdll = GetModuleHandleA("kernel32.dll"); + HMODULE hntdll = GetModuleHandleA("ntdll.dll"); + pChangeTimerQueueTimer = (void*)GetProcAddress(hdll, "ChangeTimerQueueTimer"); pCreateTimerQueue = (void*)GetProcAddress(hdll, "CreateTimerQueue"); pCreateTimerQueueTimer = (void*)GetProcAddress(hdll, "CreateTimerQueueTimer"); @@ -2312,6 +2333,7 @@ START_TEST(sync) pReleaseSRWLockShared = (void *)GetProcAddress(hdll, "ReleaseSRWLockShared"); pTryAcquireSRWLockExclusive = (void *)GetProcAddress(hdll, "TryAcquireSRWLockExclusive"); pTryAcquireSRWLockShared = (void *)GetProcAddress(hdll, "TryAcquireSRWLockShared"); + pNtWaitForMultipleObjects = (void *)GetProcAddress(hntdll, "NtWaitForMultipleObjects"); test_signalandwait(); test_mutex(); diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index 7c9d5e8..08fab44 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -849,7 +849,7 @@ NTSTATUS WINAPI NtSetTimerResolution(IN ULONG resolution, * NtWaitForMultipleObjects (NTDLL.@) */ NTSTATUS WINAPI NtWaitForMultipleObjects( DWORD count, const HANDLE *handles, - BOOLEAN wait_all, BOOLEAN alertable, + BOOLEAN wait_any, BOOLEAN alertable, const LARGE_INTEGER *timeout ) { select_op_t select_op; @@ -858,7 +858,7 @@ NTSTATUS WINAPI NtWaitForMultipleObjects( DWORD count, const HANDLE *handles, if (!count || count > MAXIMUM_WAIT_OBJECTS) return STATUS_INVALID_PARAMETER_1; if (alertable) flags |= SELECT_ALERTABLE; - select_op.wait.op = wait_all ? SELECT_WAIT_ALL : SELECT_WAIT; + select_op.wait.op = wait_any ? SELECT_WAIT : SELECT_WAIT_ALL; for (i = 0; i < count; i++) select_op.wait.handles[i] = wine_server_obj_handle( handles[i] ); return server_select( &select_op, offsetof( select_op_t, wait.handles[count] ), flags, timeout ); } diff --git a/dlls/ntdll/threadpool.c b/dlls/ntdll/threadpool.c index f66f6ab..fef26fe 100644 --- a/dlls/ntdll/threadpool.c +++ b/dlls/ntdll/threadpool.c @@ -322,7 +322,7 @@ static DWORD CALLBACK wait_thread_proc(LPVOID Arg) while (TRUE) { - status = NtWaitForMultipleObjects( 2, handles, FALSE, alertable, + status = NtWaitForMultipleObjects( 2, handles, TRUE, alertable, get_nt_timeout( &timeout, wait_work_item->Milliseconds ) ); if (status == STATUS_WAIT_0 || status == STATUS_TIMEOUT) {

1 0

Francois Gouget : dwrite: Remove a space before a '\n'.
by Alexandre Julliard 02 Sep '14

02 Sep '14

Module: wine Branch: master Commit: 466f9790de746aa6eee5e774d0e7e626b7df078f URL: http://source.winehq.org/git/wine.git/?a=commit;h=466f9790de746aa6eee5e774d… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Sep 1 12:12:35 2014 +0200 dwrite: Remove a space before a '\n'. --- dlls/dwrite/font.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 6c3d162..c835ff4 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -1515,7 +1515,7 @@ static HRESULT WINAPI localfontfileloader_GetFilePathFromKey(IDWriteLocalFontFil static HRESULT WINAPI localfontfileloader_GetLastWriteTimeFromKey(IDWriteLocalFontFileLoader *iface, void const *key, UINT32 key_size, FILETIME *writetime) { struct dwrite_localfontfileloader *This = impl_from_IDWriteLocalFontFileLoader(iface); - FIXME("(%p)->(%p, %i, %p):stub \n",This, key, key_size, writetime); + FIXME("(%p)->(%p, %i, %p):stub\n",This, key, key_size, writetime); return E_NOTIMPL; }

1 0