September 2014 - Wine-Commits

Aric Stewart : dwrite: Add face data to font data.
by Alexandre Julliard Sept. 2, 2014

Sept. 2, 2014

Module: wine Branch: master Commit: 8b2e666d3f94c5dcd3c3f336df82350bb7472f71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b2e666d3f94c5dcd3c3f336d… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Sep 2 10:19:36 2014 -0500 dwrite: Add face data to font data. --- dlls/dwrite/font.c | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 7c107db..07a8b86 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -126,6 +126,8 @@ typedef struct #define MS_POST_TAG MS_MAKE_TAG('p','o','s','t') struct dwrite_fontface_data { + LONG ref; + DWRITE_FONT_FACE_TYPE type; UINT32 file_count; IDWriteFontFile ** files; @@ -140,6 +142,8 @@ struct dwrite_font_data { DWRITE_FONT_SIMULATIONS simulations; DWRITE_FONT_METRICS metrics; + struct dwrite_fontface_data *face_data; + WCHAR *facename; }; @@ -247,6 +251,11 @@ static HRESULT _dwritefontfile_GetFontFileStream(IDWriteFontFile *iface, IDWrite static VOID _free_fontface_data(struct dwrite_fontface_data *data) { int i; + if (!data) + return; + i = InterlockedDecrement(&data->ref); + if (i > 0) + return; for (i = 0; i < data->file_count; i++) IDWriteFontFile_Release(data->files[i]); heap_free(data->files); @@ -607,6 +616,7 @@ static ULONG WINAPI dwritefont_Release(IDWriteFont *iface) if (This->face) IDWriteFontFace_Release(This->face); IDWriteFontFamily_Release(This->family); heap_free(This->data->facename); + _free_fontface_data(This->data->face_data); heap_free(This->data); heap_free(This); } @@ -711,11 +721,16 @@ static HRESULT WINAPI dwritefont_CreateFontFace(IDWriteFont *iface, IDWriteFontF else { TRACE("(%p)->(%p)\n", This, face); - if (This->face) + + if (!This->face) { - *face = This->face; - IDWriteFontFace_AddRef(*face); + HRESULT hr = font_create_fontface(NULL, This->data->face_data->type, This->data->face_data->file_count, This->data->face_data->files, This->data->face_data->index, This->data->face_data->simulations, &This->face); + if (FAILED(hr)) return hr; } + + *face = This->face; + IDWriteFontFace_AddRef(*face); + return S_OK; } } @@ -1150,6 +1165,7 @@ HRESULT create_font_from_logfont(const LOGFONTW *logfont, IDWriteFont **font) 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); + This->data->face_data = NULL; *font = &This->IDWriteFont_iface; @@ -1298,6 +1314,7 @@ HRESULT font_create_fontface(IDWriteFactory *iface, DWRITE_FONT_FACE_TYPE facety This->IDWriteFontFace_iface.lpVtbl = &dwritefontfacevtbl; This->ref = 1; + This->data->ref = 1; This->data->type = facetype; This->data->file_count = files_number; This->data->files = heap_alloc(sizeof(*This->data->files) * files_number);

1 0

Francois Gouget : winewrapper: In 64 bit trees the loader is called wine64.
by Alexandre Julliard Sept. 2, 2014

Sept. 2, 2014

Module: wine Branch: master Commit: 12aa347e129b431001a2c5318db6bf50acb36179 URL: http://source.winehq.org/git/wine.git/?a=commit;h=12aa347e129b431001a2c5318… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Sep 2 16:52:37 2014 +0200 winewrapper: In 64 bit trees the loader is called wine64. --- tools/winewrapper | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/winewrapper b/tools/winewrapper index b324daa..2206d7c 100755 --- a/tools/winewrapper +++ b/tools/winewrapper @@ -88,6 +88,8 @@ if [ -x "$topdir/loader/$name" ] then WINELOADER="$topdir/loader/$name" elif [ -x "$topdir/loader/wine" ] then WINELOADER="$topdir/loader/wine" +elif [ -x "$topdir/loader/wine64" ] +then WINELOADER="$topdir/loader/wine64" else echo "$name: could not find the Wine loader in $topdir" exit 1

1 0

Jactry Zeng : mshtml: Add IHTMLStyle5::minWidth property implementation.
by Alexandre Julliard Sept. 2, 2014

Sept. 2, 2014

Module: wine Branch: master Commit: 47f26eb9c0766cbc4b2597fdef846181bcf28935 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47f26eb9c0766cbc4b2597fde… Author: Jactry Zeng <wine(a)jactry.com> Date: Tue Sep 2 10:20:01 2014 +0800 mshtml: Add IHTMLStyle5::minWidth property implementation. --- dlls/mshtml/htmlstyle.c | 3 +++ dlls/mshtml/htmlstyle.h | 1 + dlls/mshtml/htmlstyle3.c | 12 ++++++---- dlls/mshtml/tests/style.c | 60 +++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 72 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index aa19da7..f098cb0 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -146,6 +146,8 @@ static const WCHAR attrMarginTop[] = {'m','a','r','g','i','n','-','t','o','p',0}; static const WCHAR attrMinHeight[] = {'m','i','n','-','h','e','i','g','h','t',0}; +static const WCHAR attrMinWidth[] = + {'m','i','n','-','w','i','d','t','h',0}; static const WCHAR attrOutline[] = {'o','u','t','l','i','n','e',0}; static const WCHAR attrOverflow[] = @@ -263,6 +265,7 @@ static const style_tbl_entry_t style_tbl[] = { {attrMarginRight, DISPID_IHTMLSTYLE_MARGINRIGHT}, {attrMarginTop, DISPID_IHTMLSTYLE_MARGINTOP}, {attrMinHeight, DISPID_IHTMLSTYLE4_MINHEIGHT}, + {attrMinWidth, DISPID_IHTMLSTYLE5_MINWIDTH}, {attrOutline, DISPID_IHTMLSTYLE6_OUTLINE}, {attrOverflow, DISPID_IHTMLSTYLE_OVERFLOW}, {attrOverflowX, DISPID_IHTMLSTYLE2_OVERFLOWX}, diff --git a/dlls/mshtml/htmlstyle.h b/dlls/mshtml/htmlstyle.h index 3c6bb6c..1ae8d8c 100644 --- a/dlls/mshtml/htmlstyle.h +++ b/dlls/mshtml/htmlstyle.h @@ -88,6 +88,7 @@ typedef enum { STYLEID_MARGIN_RIGHT, STYLEID_MARGIN_TOP, STYLEID_MIN_HEIGHT, + STYLEID_MIN_WIDTH, STYLEID_OUTLINE, STYLEID_OVERFLOW, STYLEID_OVERFLOW_X, diff --git a/dlls/mshtml/htmlstyle3.c b/dlls/mshtml/htmlstyle3.c index 1cff71b..c704f08 100644 --- a/dlls/mshtml/htmlstyle3.c +++ b/dlls/mshtml/htmlstyle3.c @@ -544,15 +544,19 @@ static HRESULT WINAPI HTMLStyle5_get_maxHeight(IHTMLStyle5 *iface, VARIANT *p) static HRESULT WINAPI HTMLStyle5_put_minWidth(IHTMLStyle5 *iface, VARIANT v) { HTMLStyle *This = impl_from_IHTMLStyle5(iface); - FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); + + return set_nsstyle_attr_var(This->nsstyle, STYLEID_MIN_WIDTH, &v, ATTR_FIX_PX); } static HRESULT WINAPI HTMLStyle5_get_minWidth(IHTMLStyle5 *iface, VARIANT *p) { HTMLStyle *This = impl_from_IHTMLStyle5(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_nsstyle_attr_var(This->nsstyle, STYLEID_MIN_WIDTH, p, 0); } static HRESULT WINAPI HTMLStyle5_put_maxWidth(IHTMLStyle5 *iface, VARIANT v) diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index 5297246..2204c5a 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -499,6 +499,57 @@ static void test_style4(IHTMLStyle4 *style4) VariantClear(&vdefault); } +static void test_style5(IHTMLStyle5 *style5) +{ + HRESULT hres; + VARIANT v; + VARIANT vdefault; + + /* minWidth */ + hres = IHTMLStyle5_get_minWidth(style5, &vdefault); + ok(hres == S_OK, "get_minWidth failed: %08x\n", hres); + + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = a2bstr("12px"); + hres = IHTMLStyle5_put_minWidth(style5, v); + ok(hres == S_OK, "put_minWidth failed: %08x\n", hres); + VariantClear(&v); + + hres = IHTMLStyle5_get_minWidth(style5, &v); + ok(hres == S_OK, "get_minWidth failed: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); + ok(!strcmp_wa(V_BSTR(&v), "12px"), "expect 12px got (%s)\n", wine_dbgstr_w(V_BSTR(&v))); + VariantClear(&v); + + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = a2bstr("10%"); + hres = IHTMLStyle5_put_minWidth(style5, v); + ok(hres == S_OK, "put_minWidth failed: %08x\n", hres); + VariantClear(&v); + + hres = IHTMLStyle5_get_minWidth(style5, &v); + ok(hres == S_OK, "get_minWidth failed: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); + ok(!strcmp_wa(V_BSTR(&v), "10%"), "expect 10%% got (%s)\n", wine_dbgstr_w(V_BSTR(&v))); + VariantClear(&v); + + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = a2bstr("10"); + hres = IHTMLStyle5_put_minWidth(style5, v); + ok(hres == S_OK, "put_minWidth failed: %08x\n", hres); + VariantClear(&v); + + hres = IHTMLStyle5_get_minWidth(style5, &v); + ok(hres == S_OK, "get_minWidth failed: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); + ok(!strcmp_wa(V_BSTR(&v), "10px"), "expect 10px got (%s)\n", wine_dbgstr_w(V_BSTR(&v))); + VariantClear(&v); + + hres = IHTMLStyle5_put_minWidth(style5, vdefault); + ok(hres == S_OK, "put_minWidth failed: %08x\n", hres); + VariantClear(&vdefault); +} + static void test_style6(IHTMLStyle6 *style) { BSTR str; @@ -544,6 +595,7 @@ static void test_body_style(IHTMLStyle *style) IHTMLStyle2 *style2; IHTMLStyle3 *style3; IHTMLStyle4 *style4; + IHTMLStyle5 *style5; IHTMLStyle6 *style6; VARIANT_BOOL b; VARIANT v; @@ -2249,6 +2301,14 @@ static void test_body_style(IHTMLStyle *style) IHTMLStyle4_Release(style4); } + hres = IHTMLStyle_QueryInterface(style, &IID_IHTMLStyle5, (void**)&style5); + if(SUCCEEDED(hres)) { + test_style5(style5); + IHTMLStyle5_Release(style5); + }else { + win_skip("IHTMLStyle5 not available\n"); + } + hres = IHTMLStyle_QueryInterface(style, &IID_IHTMLStyle6, (void**)&style6); if(SUCCEEDED(hres)) { test_style6(style6);

1 0

Alexandre Julliard : make_makefiles: Support the GIT_DIR environment variable.
by Alexandre Julliard Sept. 2, 2014

Sept. 2, 2014

Module: wine Branch: master Commit: b03606c5e61ff93bcb54d64bb012cea21139610c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b03606c5e61ff93bcb54d64bb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 2 20:54:24 2014 +0200 make_makefiles: Support the GIT_DIR environment variable. --- tools/make_makefiles | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/make_makefiles b/tools/make_makefiles index 649b434..f0b40c0 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -578,7 +578,8 @@ sub update_linguas(@) } -die "needs to be run from a git checkout" unless -d ".git"; +my $git_dir = $ENV{GIT_DIR} || ".git"; +die "needs to be run from a git checkout" unless -d $git_dir; my @all_files = split /\0/, `git ls-files -c -z`; @linguas = map { (my $ret = $_) =~ s/^po\/(.*)\.po/$1/; $ret; } grep /^po\/.*\.po$/, @all_files;

1 0

Piotr Caban : msvcr80: Throw bad_alloc exception when operator new fails.
by Alexandre Julliard Sept. 2, 2014

Sept. 2, 2014

Module: wine Branch: master Commit: 43be238331ba8cebd4c8bf93eb2d7be0e1339184 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43be238331ba8cebd4c8bf93e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Sep 2 17:06:06 2014 +0200 msvcr80: Throw bad_alloc exception when operator new fails. --- dlls/msvcrt/cpp.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcrt/heap.c | 3 +++ dlls/msvcrt/msvcrt.h | 5 ++++- 3 files changed, 52 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/cpp.c b/dlls/msvcrt/cpp.c index db48dcb..de9a9b4 100644 --- a/dlls/msvcrt/cpp.c +++ b/dlls/msvcrt/cpp.c @@ -696,6 +696,47 @@ DEFINE_EXCEPTION_TYPE_INFO( bad_typeid, 1, &exception_cxx_type_info, NULL ) DEFINE_EXCEPTION_TYPE_INFO( bad_cast, 1, &exception_cxx_type_info, NULL ) DEFINE_EXCEPTION_TYPE_INFO( __non_rtti_object, 2, &bad_typeid_cxx_type_info, &exception_cxx_type_info ) +#if _MSVCR_VER >= 80 +typedef exception bad_alloc; +extern const vtable_ptr MSVCRT_bad_alloc_vtable; + +static void bad_alloc_ctor(bad_alloc *this, const char **name) +{ + MSVCRT_exception_ctor(this, name); + this->vtable = &MSVCRT_bad_alloc_vtable; +} + +/* bad_alloc class implementation */ +DEFINE_THISCALL_WRAPPER(MSVCRT_bad_alloc_copy_ctor,8) +bad_alloc * __thiscall MSVCRT_bad_alloc_copy_ctor(bad_alloc * _this, const bad_alloc * rhs) +{ + TRACE("(%p %p)\n", _this, rhs); + MSVCRT_exception_copy_ctor(_this, rhs); + _this->vtable = &MSVCRT_bad_alloc_vtable; + return _this; +} + +DEFINE_THISCALL_WRAPPER(MSVCRT_bad_alloc_dtor,4) +void __thiscall MSVCRT_bad_alloc_dtor(bad_alloc * _this) +{ + TRACE("(%p)\n", _this); + MSVCRT_exception_dtor(_this); +} + +__ASM_VTABLE(bad_alloc, + VTABLE_ADD_FUNC(MSVCRT_exception_vector_dtor) + VTABLE_ADD_FUNC(MSVCRT_what_exception)); +DEFINE_RTTI_DATA1( bad_alloc, 0, &exception_rtti_base_descriptor, ".?AVbad_alloc(a)std@@" ) +DEFINE_EXCEPTION_TYPE_INFO( bad_alloc, 1, &exception_cxx_type_info, NULL ) + +void throw_bad_alloc(const char *str) +{ + bad_alloc e; + bad_alloc_ctor(&e, &str); + _CxxThrowException(&e, &bad_alloc_exception_type); +} +#endif + void msvcrt_init_exception(void *base) { #ifdef __x86_64__ @@ -703,6 +744,7 @@ void msvcrt_init_exception(void *base) init_exception_rtti(base); #if _MSVCR_VER >= 80 init_exception_old_rtti(base); + init_bad_alloc_rtti(base); #endif init_bad_typeid_rtti(base); init_bad_cast_rtti(base); @@ -712,6 +754,9 @@ void msvcrt_init_exception(void *base) init_bad_typeid_cxx(base); init_bad_cast_cxx(base); init___non_rtti_object_cxx(base); +#if _MSVCR_VER >= 80 + init_bad_alloc_cxx(base); +#endif #endif } diff --git a/dlls/msvcrt/heap.c b/dlls/msvcrt/heap.c index 432df86..bb265bf 100644 --- a/dlls/msvcrt/heap.c +++ b/dlls/msvcrt/heap.c @@ -150,6 +150,9 @@ void* CDECL MSVCRT_operator_new(MSVCRT_size_t size) } while(freed); TRACE("(%ld) out of memory\n", size); +#if _MSVCR_VER >= 80 + throw_bad_alloc("bad allocation"); +#endif return NULL; } diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 6c4e763..54cd11a 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -234,7 +234,10 @@ extern unsigned int MSVCRT___lc_codepage; extern int MSVCRT___lc_collate_cp; extern WORD MSVCRT__ctype [257]; -void msvcrt_set_errno(int) DECLSPEC_HIDDEN; +void msvcrt_set_errno(int) DECLSPEC_HIDDEN; +#if _MSVCR_VER >= 80 +void throw_bad_alloc(const char*) DECLSPEC_HIDDEN; +#endif void __cdecl _purecall(void); void __cdecl _amsg_exit(int errnum);

1 0

Aric Stewart : dwrite: Store fontface data in its own structure.
by Alexandre Julliard Sept. 2, 2014

Sept. 2, 2014

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

Jacek Caban : mshtml: Use debugstr_mshtml_guid in htmlhead.c.
by Alexandre Julliard Sept. 2, 2014

Sept. 2, 2014

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

Piotr Caban : msvcp90: Fix complex::operator*= implementation.
by Alexandre Julliard Sept. 2, 2014

Sept. 2, 2014

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

Austin English : advapi32: Add stub for WriteEncryptedFileRaw.
by Alexandre Julliard Sept. 2, 2014

Sept. 2, 2014

Module: wine Branch: master Commit: a98496a09a97a554a18c7f29fc63f0052537fd8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a98496a09a97a554a18c7f29f… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Aug 29 18:15:10 2014 -0500 advapi32: Add stub for WriteEncryptedFileRaw. --- dlls/advapi32/advapi32.spec | 2 +- dlls/advapi32/crypt.c | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index e61e983..d1ab64d 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -825,4 +825,4 @@ # @ stub WmiSetSingleItemA # @ stub WmiSetSingleItemW # @ stub Wow64Win32ApiEntry -# @ stub WriteEncryptedFileRaw +@ stdcall WriteEncryptedFileRaw(ptr ptr ptr) diff --git a/dlls/advapi32/crypt.c b/dlls/advapi32/crypt.c index f369ae3..f74dee4 100644 --- a/dlls/advapi32/crypt.c +++ b/dlls/advapi32/crypt.c @@ -2434,3 +2434,22 @@ NTSTATUS WINAPI SystemFunction041(PVOID memory, ULONG length, ULONG flags) FIXME("(%p, %x, %x): stub [RtlDecryptMemory]\n", memory, length, flags); return STATUS_SUCCESS; } + +/****************************************************************************** + * WriteEncryptedFileRaw (ADVAPI32.@) + * + * Import encrypted files + * + * PARAMS + * import [I] pointer to the import callback function + * callback [I] pointer to the application defined context + * context [I] pointer to the system context + * RETURNS + * Success: ERROR_SUCCESS + * Failure: NTSTATUS error code + */ +DWORD WINAPI WriteEncryptedFileRaw(PFE_IMPORT_FUNC import, PVOID callback, PVOID context) +{ + FIXME("(%p, %p, %p): stub\n", import, callback, context); + return ERROR_CALL_NOT_IMPLEMENTED; +}

1 0

Austin English : advapi32: Add stub for ReadEncryptedFileRaw.
by Alexandre Julliard Sept. 2, 2014

Sept. 2, 2014

Module: wine Branch: master Commit: 8ca36632e98c1e96c2df5189973ccc93d97bc280 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ca36632e98c1e96c2df51899… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Aug 29 18:12:59 2014 -0500 advapi32: Add stub for ReadEncryptedFileRaw. --- dlls/advapi32/advapi32.spec | 2 +- dlls/advapi32/crypt.c | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index 57d2c65..e61e983 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -566,7 +566,7 @@ @ stdcall QueryTraceW(int64 wstr ptr) # @ stub QueryUsersOnEncryptedFile @ stdcall QueryWindows31FilesMigration(long) -# @ stub ReadEncryptedFileRaw +@ stdcall ReadEncryptedFileRaw(ptr ptr ptr) @ stdcall ReadEventLogA (long long long ptr long ptr ptr) @ stdcall ReadEventLogW (long long long ptr long ptr ptr) @ stdcall RegCloseKey(long) diff --git a/dlls/advapi32/crypt.c b/dlls/advapi32/crypt.c index b41965d..f369ae3 100644 --- a/dlls/advapi32/crypt.c +++ b/dlls/advapi32/crypt.c @@ -2290,6 +2290,25 @@ DWORD WINAPI OpenEncryptedFileRawW(LPCWSTR filename, ULONG flags, PVOID *context } /****************************************************************************** + * ReadEncryptedFileRaw (ADVAPI32.@) + * + * Export encrypted files + * + * PARAMS + * export [I] pointer to the export callback function + * callback [I] pointer to the application defined context + * context [I] pointer to the system context + * RETURNS + * Success: ERROR_SUCCESS + * Failure: NTSTATUS error code + */ +DWORD WINAPI ReadEncryptedFileRaw(PFE_EXPORT_FUNC export, PVOID callback, PVOID context) +{ + FIXME("(%p, %p, %p): stub\n", export, callback, context); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +/****************************************************************************** * SystemFunction030 (ADVAPI32.@) * * Tests if two blocks of 16 bytes are equal

1 0