wine-commits July 2016

wine-commits@winehq.org

2 participants
680 discussions

Hugh McMaster : reg: Free szValue after deleting all registry values ( Coverity).
by Alexandre Julliard 05 Jul '16

05 Jul '16

Module: wine Branch: master Commit: 2885170057aa2a1f5b65aa2d04497c3b1570f985 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2885170057aa2a1f5b65aa2d0… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Jun 28 11:35:01 2016 +0000 reg: Free szValue after deleting all registry values (Coverity). Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/reg.c | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 38861f8..0d6bec4 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -481,6 +481,7 @@ static int reg_delete(HKEY root, WCHAR *path, WCHAR *key_name, WCHAR *value_name } else break; } + HeapFree(GetProcessHeap(), 0, szValue); } else if (value_name || value_empty) {

1 0

Nikolay Sivov : dwrite: Fix recently added script properties.
by Alexandre Julliard 05 Jul '16

05 Jul '16

Module: wine Branch: master Commit: cedd95e2a8ed449222521fbf8b87f22b2a7a3375 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cedd95e2a8ed449222521fbf8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jul 5 12:55:56 2016 +0300 dwrite: Fix recently added script properties. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 62 +++++++++++++++++++++++++------------------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 5e53a54..81052f9 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -45,7 +45,7 @@ struct dwritescript_properties { static const struct dwritescript_properties dwritescripts_properties[Script_LastId+1] = { { /* Zzzz */ { 0x7a7a7a5a, 999, 15, 0x0020, 0, 0, 0, 0, 0, 0, 0 } }, { /* Zyyy */ { 0x7979795a, 998, 1, 0x0020, 0, 1, 1, 0, 0, 0, 0 } }, - { /* Zinh */ { 0x686e695a, 994, 1, 0x0020, 0, 1, 1, 0, 0, 0, 0 } }, + { /* Zinh */ { 0x686e695a, 994, 15, 0x0020, 1, 0, 0, 0, 0, 0, 0 } }, { /* Arab */ { 0x62617241, 160, 8, 0x0640, 0, 1, 0, 0, 0, 1, 1 }, _OT('a','r','a','b'), 0, TRUE }, { /* Armn */ { 0x6e6d7241, 230, 1, 0x0020, 0, 1, 1, 0, 0, 0, 0 }, _OT('a','r','m','n') }, { /* Avst */ { 0x74737641, 134, 8, 0x0020, 0, 1, 1, 0, 0, 0, 0 }, _OT('a','v','s','t') }, @@ -139,36 +139,36 @@ static const struct dwritescript_properties dwritescripts_properties[Script_Last { /* Ugar */ { 0x72616755, 40, 1, 0x0020, 0, 0, 1, 1, 0, 0, 0 }, _OT('u','g','a','r') }, { /* Vaii */ { 0x69696156, 470, 1, 0x0020, 0, 1, 1, 0, 0, 0, 0 }, _OT('v','a','i',' '), 0, TRUE }, { /* Yiii */ { 0x69696959, 460, 1, 0x0020, 0, 0, 1, 1, 0, 0, 0 }, _OT('y','i',' ',' '), 0, TRUE }, - { /* Cakm */ { 0x6d6b6143, 349, 1, 0x0020, 0, 0, 0, 0, 0, 0, 0 }, _OT('c','a','k','m') }, - { /* Merc */ { 0x6372654d, 101, 1, 0x0020, 0, 0, 0, 0, 0, 0, 0 }, _OT('m','e','r','c') }, - { /* Mero */ { 0x6f72654d, 100, 1, 0x0020, 0, 0, 0, 0, 0, 0, 0 }, _OT('m','e','r','o') }, - { /* Plrd */ { 0x64726c50, 282, 1, 0x0020, 0, 0, 0, 0, 0, 0, 0 } }, - { /* Shrd */ { 0x64726853, 319, 1, 0x0020, 0, 0, 0, 0, 0, 0, 0 }, _OT('s','h','r','d') }, - { /* Sora */ { 0x61726f53, 398, 1, 0x0020, 0, 0, 0, 0, 0, 0, 0 }, _OT('s','o','r','a') }, - { /* Takr */ { 0x726b6154, 321, 1, 0x0020, 0, 0, 0, 0, 0, 0, 0 }, _OT('t','a','k','r') }, - { /* Bass */ { 0x73736142, 259, 1, 0x0020, 0, 0, 0, 0, 0, 0, 0 } }, - { /* Aghb */ { 0x62686741, 239, 1, 0x0020, 0, 0, 0, 0, 0, 0, 0 } }, - { /* Dupl */ { 0x6c707544, 755, 1, 0x0020, 0, 0, 0, 0, 0, 0, 0 } }, - { /* Elba */ { 0x61626c45, 226, 1, 0x0020, 0, 0, 0, 0, 0, 0, 0 } }, - { /* Gran */ { 0x6e617247, 343, 1, 0x0020, 0, 0, 0, 0, 0, 0, 0 } }, - { /* Khoj */ { 0x6a6f684b, 322, 1, 0x0020, 0, 0, 0, 0, 0, 0, 0 } }, - { /* Sind */ { 0x646e6953, 318, 1, 0x0020, 0, 0, 0, 0, 0, 0, 0 } }, - { /* Lina */ { 0x616e694c, 400, 1, 0x0020, 0, 0, 0, 0, 0, 0, 0 } }, - { /* Mahj */ { 0x6a68614d, 314, 1, 0x0020, 0, 0, 0, 0, 0, 0, 0 } }, - { /* Mani */ { 0x696e614d, 139, 1, 0x0020, 0, 0, 0, 0, 0, 0, 0 } }, - { /* Mend */ { 0x646e654d, 438, 1, 0x0020, 0, 0, 0, 0, 0, 0, 0 } }, - { /* Modi */ { 0x69646f4d, 324, 1, 0x0020, 0, 0, 0, 0, 0, 0, 0 } }, - { /* Mroo */ { 0x6f6f724d, 199, 1, 0x0020, 0, 0, 0, 0, 0, 0, 0 } }, - { /* Nbat */ { 0x7461624e, 159, 1, 0x0020, 0, 0, 0, 0, 0, 0, 0 } }, - { /* Narb */ { 0x6272614e, 106, 1, 0x0020, 0, 0, 0, 0, 0, 0, 0 } }, - { /* Perm */ { 0x6d726550, 227, 1, 0x0020, 0, 0, 0, 0, 0, 0, 0 } }, - { /* Hmng */ { 0x676e6d48, 450, 1, 0x0020, 0, 0, 0, 0, 0, 0, 0 } }, - { /* Palm */ { 0x6d6c6150, 126, 1, 0x0020, 0, 0, 0, 0, 0, 0, 0 } }, - { /* Pauc */ { 0x63756150, 263, 1, 0x0020, 0, 0, 0, 0, 0, 0, 0 } }, - { /* Phlp */ { 0x706c6850, 132, 1, 0x0020, 0, 0, 0, 0, 0, 0, 0 } }, - { /* Sidd */ { 0x64646953, 302, 1, 0x0020, 0, 0, 0, 0, 0, 0, 0 } }, - { /* Tirh */ { 0x68726954, 326, 1, 0x0020, 0, 0, 0, 0, 0, 0, 0 } }, - { /* Wara */ { 0x61726157, 262, 1, 0x0020, 0, 0, 0, 0, 0, 0, 0 } }, + { /* Cakm */ { 0x6d6b6143, 349, 8, 0x0020, 1, 1, 1, 0, 0, 0, 0 }, _OT('c','a','k','m') }, + { /* Merc */ { 0x6372654d, 101, 1, 0x0020, 0, 1, 1, 0, 0, 0, 0 }, _OT('m','e','r','c') }, + { /* Mero */ { 0x6f72654d, 100, 1, 0x0020, 0, 1, 1, 1, 0, 0, 0 }, _OT('m','e','r','o') }, + { /* Plrd */ { 0x64726c50, 282, 8, 0x0020, 1, 0, 1, 0, 0, 0, 0 } }, + { /* Shrd */ { 0x64726853, 319, 8, 0x0020, 1, 1, 1, 0, 0, 0, 0 }, _OT('s','h','r','d') }, + { /* Sora */ { 0x61726f53, 398, 8, 0x0020, 1, 1, 1, 0, 0, 0, 0 }, _OT('s','o','r','a') }, + { /* Takr */ { 0x726b6154, 321, 8, 0x0020, 1, 1, 1, 0, 0, 0, 0 }, _OT('t','a','k','r') }, + { /* Bass */ { 0x73736142, 259, 8, 0x0020, 0, 1, 1, 0, 0, 0, 0 } }, + { /* Aghb */ { 0x62686741, 239, 8, 0x0020, 0, 1, 1, 0, 0, 0, 0 } }, + { /* Dupl */ { 0x6c707544, 755, 8, 0x0020, 0, 1, 0, 0, 0, 1, 1 } }, + { /* Elba */ { 0x61626c45, 226, 8, 0x0020, 0, 1, 1, 0, 0, 0, 0 } }, + { /* Gran */ { 0x6e617247, 343, 15, 0x0020, 1, 1, 1, 0, 0, 0, 0 } }, + { /* Khoj */ { 0x6a6f684b, 322, 15, 0x0020, 1, 1, 1, 0, 0, 0, 0 } }, + { /* Sind */ { 0x646e6953, 318, 8, 0x0020, 1, 1, 1, 0, 0, 0, 0 } }, + { /* Lina */ { 0x616e694c, 400, 1, 0x0020, 0, 0, 1, 1, 0, 0, 0 } }, + { /* Mahj */ { 0x6a68614d, 314, 8, 0x0020, 0, 1, 1, 0, 0, 0, 0 } }, + { /* Mani */ { 0x696e614d, 139, 8, 0x0640, 0, 1, 0, 0, 0, 1, 1 } }, + { /* Mend */ { 0x646e654d, 438, 1, 0x0020, 0, 1, 1, 0, 0, 0, 0 } }, + { /* Modi */ { 0x69646f4d, 324, 15, 0x0020, 1, 1, 0, 0, 0, 1, 0 } }, + { /* Mroo */ { 0x6f6f724d, 199, 8, 0x0020, 0, 1, 1, 0, 0, 0, 0 } }, + { /* Nbat */ { 0x7461624e, 159, 8, 0x0020, 1, 1, 1, 0, 0, 0, 0 } }, + { /* Narb */ { 0x6272614e, 106, 1, 0x0020, 0, 1, 1, 0, 0, 0, 0 } }, + { /* Perm */ { 0x6d726550, 227, 8, 0x0020, 0, 1, 1, 0, 0, 0, 0 } }, + { /* Hmng */ { 0x676e6d48, 450, 8, 0x0020, 0, 1, 1, 0, 0, 0, 0 } }, + { /* Palm */ { 0x6d6c6150, 126, 8, 0x0020, 1, 1, 1, 0, 0, 0, 0 } }, + { /* Pauc */ { 0x63756150, 263, 8, 0x0020, 0, 1, 1, 0, 0, 0, 0 } }, + { /* Phlp */ { 0x706c6850, 132, 8, 0x0640, 0, 1, 0, 0, 0, 1, 1 } }, + { /* Sidd */ { 0x64646953, 302, 8, 0x0020, 1, 0, 1, 1, 0, 0, 0 } }, + { /* Tirh */ { 0x68726954, 326, 15, 0x0020, 1, 1, 0, 0, 0, 1, 0 } }, + { /* Wara */ { 0x61726157, 262, 8, 0x0020, 0, 1, 1, 0, 0, 0, 0 } }, }; #undef _OT

1 0

Nikolay Sivov : dwrite: Implement another CreateFontFace() variant.
by Alexandre Julliard 05 Jul '16

05 Jul '16

Module: wine Branch: master Commit: bf211623fd39b8d15b97611637a53d61487b05e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf211623fd39b8d15b9761163… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jul 5 12:55:55 2016 +0300 dwrite: Implement another CreateFontFace() variant. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 24 ++++++++++++------------ dlls/dwrite/tests/font.c | 9 +++++---- 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index d635c15..d477ac0 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -1496,18 +1496,11 @@ static HRESULT WINAPI dwritefont_HasCharacter(IDWriteFont3 *iface, UINT32 value, return S_OK; } -static HRESULT WINAPI dwritefont_CreateFontFace(IDWriteFont3 *iface, IDWriteFontFace **face) +static HRESULT WINAPI dwritefont_CreateFontFace(IDWriteFont3 *iface, IDWriteFontFace **fontface) { struct dwrite_font *This = impl_from_IDWriteFont3(iface); - HRESULT hr; - - TRACE("(%p)->(%p)\n", This, face); - - hr = get_fontface_from_font(This, (IDWriteFontFace3**)face); - if (hr == S_OK) - IDWriteFontFace_AddRef(*face); - - return hr; + TRACE("(%p)->(%p)\n", This, fontface); + return IDWriteFont3_CreateFontFace(iface, (IDWriteFontFace3**)fontface); } static void WINAPI dwritefont1_GetMetrics(IDWriteFont3 *iface, DWRITE_FONT_METRICS1 *metrics) @@ -1572,8 +1565,15 @@ static BOOL WINAPI dwritefont2_IsColorFont(IDWriteFont3 *iface) static HRESULT WINAPI dwritefont3_CreateFontFace(IDWriteFont3 *iface, IDWriteFontFace3 **fontface) { struct dwrite_font *This = impl_from_IDWriteFont3(iface); - FIXME("(%p)->(%p): stub\n", This, fontface); - return E_NOTIMPL; + HRESULT hr; + + TRACE("(%p)->(%p)\n", This, fontface); + + hr = get_fontface_from_font(This, fontface); + if (hr == S_OK) + IDWriteFontFace3_AddRef(*fontface); + + return hr; } static BOOL WINAPI dwritefont3_Equals(IDWriteFont3 *iface, IDWriteFont *font) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 4fe494a..a1ef3d4 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -6177,17 +6177,19 @@ todo_wine /* references returned from IDWriteFontFace3 */ hr = IDWriteFont3_CreateFontFace(font3, &fontface); -todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); -if (hr == S_OK) { hr = IDWriteFontFace3_GetFontFaceReference(fontface, &ref); +todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); hr = IDWriteFontFace3_GetFontFaceReference(fontface, &ref1); +todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); +if (hr == S_OK) ok(ref == ref1, "got %p, %p\n", ref1, ref); +if (hr == S_OK) { hr = IDWriteFontFaceReference_CreateFontFace(ref, &fontface1); ok(hr == S_OK, "got 0x%08x\n", hr); ok(fontface1 == fontface, "got %p, %p\n", fontface1, fontface); @@ -6195,9 +6197,8 @@ if (hr == S_OK) { IDWriteFontFaceReference_Release(ref); IDWriteFontFaceReference_Release(ref1); - - IDWriteFontFace3_Release(fontface); } + IDWriteFontFace3_Release(fontface); IDWriteFont3_Release(font3); IDWriteFactory3_Release(factory3);

1 0

Nikolay Sivov : dwrite: Implement HasVerticalGlyphVariants().
by Alexandre Julliard 05 Jul '16

05 Jul '16

Module: wine Branch: master Commit: e30607fdb085d62125c716bd7678085f38b45aaa URL: http://source.winehq.org/git/wine.git/?a=commit;h=e30607fdb085d62125c716bd7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jul 5 12:55:54 2016 +0300 dwrite: Implement HasVerticalGlyphVariants(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 1 + dlls/dwrite/font.c | 38 +++++--- dlls/dwrite/opentype.c | 116 +++++++++++++++++++++++++ dlls/dwrite/tests/font.c | 203 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 346 insertions(+), 12 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e30607fdb085d62125c71…

1 0

Nikolay Sivov : dwrite: Return some of font properties from IDWriteFontFace3 methods.
by Alexandre Julliard 05 Jul '16

05 Jul '16

Module: wine Branch: master Commit: 90bcff0eae717138bc7da6256c8ce61d0e1a13a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=90bcff0eae717138bc7da6256… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jul 5 12:55:53 2016 +0300 dwrite: Return some of font properties from IDWriteFontFace3 methods. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/bidi.c | 1 - dlls/dwrite/dwrite_private.h | 17 ++++- dlls/dwrite/font.c | 144 +++++++++++++++++++++++++++++++------------ dlls/dwrite/layout.c | 1 - dlls/dwrite/main.c | 142 ++++++++++++++++++++++++++---------------- dlls/dwrite/tests/font.c | 63 +++++++++++++++++-- 6 files changed, 264 insertions(+), 104 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=90bcff0eae717138bc7da…

1 0

Michael Stefaniuc : gdi32: Use wine_dbgstr_rect() to trace a RECT.
by Alexandre Julliard 05 Jul '16

05 Jul '16

Module: wine Branch: master Commit: 8acdf5e7bf4cc567c69ed0354f1b3854a7c03aae URL: http://source.winehq.org/git/wine.git/?a=commit;h=8acdf5e7bf4cc567c69ed0354… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jul 5 10:03:52 2016 +0200 gdi32: Use wine_dbgstr_rect() to trace a RECT. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/enhmetafile.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/gdi32/enhmetafile.c b/dlls/gdi32/enhmetafile.c index cab30e9..cffac37 100644 --- a/dlls/gdi32/enhmetafile.c +++ b/dlls/gdi32/enhmetafile.c @@ -2382,8 +2382,7 @@ BOOL WINAPI EnumEnhMetaFile( double xSrcPixSize, ySrcPixSize, xscale, yscale; XFORM xform; - TRACE("rect: %d,%d - %d,%d. rclFrame: %d,%d - %d,%d\n", - lpRect->left, lpRect->top, lpRect->right, lpRect->bottom, + TRACE("rect: %s. rclFrame: (%d,%d)-(%d,%d)\n", wine_dbgstr_rect(lpRect), emh->rclFrame.left, emh->rclFrame.top, emh->rclFrame.right, emh->rclFrame.bottom);

1 0

Michael Stefaniuc : ole32: Standardize COM aggregation for the FreeThreadedMarshaler.
by Alexandre Julliard 05 Jul '16

05 Jul '16

Module: wine Branch: master Commit: a60b1897871ca895c6a8abb9294b7ea7f55818ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=a60b1897871ca895c6a8abb92… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jul 5 09:54:38 2016 +0200 ole32: Standardize COM aggregation for the FreeThreadedMarshaler. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/ftmarshal.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/dlls/ole32/ftmarshal.c b/dlls/ole32/ftmarshal.c index 21d9c9a..3eb7f87 100644 --- a/dlls/ole32/ftmarshal.c +++ b/dlls/ole32/ftmarshal.c @@ -39,16 +39,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole); typedef struct _FTMarshalImpl { - IUnknown IUnknown_iface; - LONG ref; + IUnknown IUnknown_inner; IMarshal IMarshal_iface; - - IUnknown *pUnkOuter; + IUnknown *outer_unk; + LONG ref; } FTMarshalImpl; static inline FTMarshalImpl *impl_from_IUnknown(IUnknown *iface) { - return CONTAINING_RECORD(iface, FTMarshalImpl, IUnknown_iface); + return CONTAINING_RECORD(iface, FTMarshalImpl, IUnknown_inner); } static inline FTMarshalImpl *impl_from_IMarshal( IMarshal *iface ) @@ -67,7 +66,7 @@ IiFTMUnknown_fnQueryInterface (IUnknown * iface, REFIID riid, LPVOID * ppv) *ppv = NULL; if (IsEqualIID (&IID_IUnknown, riid)) - *ppv = &This->IUnknown_iface; + *ppv = &This->IUnknown_inner; else if (IsEqualIID (&IID_IMarshal, riid)) *ppv = &This->IMarshal_iface; else { @@ -113,7 +112,7 @@ FTMarshalImpl_QueryInterface (LPMARSHAL iface, REFIID riid, LPVOID * ppv) FTMarshalImpl *This = impl_from_IMarshal(iface); TRACE ("(%p)->(%s,%p)\n", This, debugstr_guid (riid), ppv); - return IUnknown_QueryInterface (This->pUnkOuter, riid, ppv); + return IUnknown_QueryInterface(This->outer_unk, riid, ppv); } static ULONG WINAPI @@ -123,7 +122,7 @@ FTMarshalImpl_AddRef (LPMARSHAL iface) FTMarshalImpl *This = impl_from_IMarshal(iface); TRACE ("\n"); - return IUnknown_AddRef (This->pUnkOuter); + return IUnknown_AddRef(This->outer_unk); } static ULONG WINAPI @@ -133,7 +132,7 @@ FTMarshalImpl_Release (LPMARSHAL iface) FTMarshalImpl *This = impl_from_IMarshal(iface); TRACE ("\n"); - return IUnknown_Release (This->pUnkOuter); + return IUnknown_Release(This->outer_unk); } static HRESULT WINAPI @@ -342,12 +341,12 @@ HRESULT WINAPI CoCreateFreeThreadedMarshaler (LPUNKNOWN punkOuter, LPUNKNOWN * p if (!ftm) return E_OUTOFMEMORY; - ftm->IUnknown_iface.lpVtbl = &iunkvt; + ftm->IUnknown_inner.lpVtbl = &iunkvt; ftm->IMarshal_iface.lpVtbl = &ftmvtbl; ftm->ref = 1; - ftm->pUnkOuter = punkOuter ? punkOuter : &ftm->IUnknown_iface; + ftm->outer_unk = punkOuter ? punkOuter : &ftm->IUnknown_inner; - *ppunkMarshal = &ftm->IUnknown_iface; + *ppunkMarshal = &ftm->IUnknown_inner; return S_OK; }

1 0

Michael Stefaniuc : qedit: Avoid casting a COM object to an iface.
by Alexandre Julliard 05 Jul '16

05 Jul '16

Module: wine Branch: master Commit: 9525b1e2cfc16152e6cf6d77d2af5858d573c57b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9525b1e2cfc16152e6cf6d77d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jul 5 09:54:00 2016 +0200 qedit: Avoid casting a COM object to an iface. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/samplegrabber.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/qedit/samplegrabber.c b/dlls/qedit/samplegrabber.c index 151827e..7cbc0f8 100644 --- a/dlls/qedit/samplegrabber.c +++ b/dlls/qedit/samplegrabber.c @@ -1300,7 +1300,8 @@ HRESULT SampleGrabber_create(IUnknown *pUnkOuter, LPVOID *ppv) else obj->outer_unk = &obj->IUnknown_inner; - hr = CoCreateInstance(&CLSID_SeekingPassThru, (IUnknown*)obj, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void**)&obj->seekthru_unk); + hr = CoCreateInstance(&CLSID_SeekingPassThru, &obj->IUnknown_inner, CLSCTX_INPROC_SERVER, + &IID_IUnknown, (void**)&obj->seekthru_unk); if(hr) return hr; IUnknown_QueryInterface(obj->seekthru_unk, &IID_ISeekingPassThru, (void**)&passthru);

1 0

Piotr Caban : msvcrt: Remove unused call_dtor function.
by Alexandre Julliard 05 Jul '16

05 Jul '16

Module: wine Branch: master Commit: 4facdec6863bcb46a7f4f73b59fb6bb9d9689855 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4facdec6863bcb46a7f4f73b5… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jul 4 11:04:47 2016 +0200 msvcrt: Remove unused call_dtor function. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/except_i386.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/dlls/msvcrt/except_i386.c b/dlls/msvcrt/except_i386.c index f7f486d..c939585 100644 --- a/dlls/msvcrt/except_i386.c +++ b/dlls/msvcrt/except_i386.c @@ -161,12 +161,6 @@ static inline void call_copy_ctor( void *func, void *this, void *src, int has_vb : : "r" (func), "c" (this), "r" (src) : "eax", "edx", "memory" ); } -/* call the destructor of the exception object */ -static inline void call_dtor( void *func, void *object ) -{ - __asm__ __volatile__("call *%0" : : "r" (func), "c" (object) : "eax", "edx", "memory" ); -} - /* continue execution to the specified address after exception is caught */ static inline void DECLSPEC_NORETURN continue_after_catch( cxx_exception_frame* frame, void *addr ) {

1 0

Piotr Caban : msvcr120: Add fegetenv implementation.
by Alexandre Julliard 05 Jul '16

05 Jul '16

Module: wine Branch: master Commit: 1150c0454d1b93fd30bdee552ea8e82d35eda51a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1150c0454d1b93fd30bdee552… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jul 4 11:04:23 2016 +0200 msvcr120: Add fegetenv implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-runtime-l1-1-0.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120/tests/msvcr120.c | 25 ++++++++++++++++++++++ dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcrt/math.c | 11 ++++++++++ dlls/msvcrt/msvcrt.h | 6 ++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- 7 files changed, 46 insertions(+), 4 deletions(-) diff --git a/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec b/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec index 8d96f98..17b9861 100644 --- a/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec +++ b/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec @@ -88,7 +88,7 @@ @ cdecl abort() ucrtbase.abort @ cdecl exit(long) ucrtbase.exit @ stub feclearexcept -@ stub fegetenv +@ cdecl fegetenv(ptr) ucrtbase.fegetenv @ stub fegetexceptflag @ stub fegetround @ stub feholdexcept diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 86f466b..a2e7832 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2144,7 +2144,7 @@ @ stub fdimf @ stub fdiml @ stub feclearexcept -@ stub fegetenv +@ cdecl fegetenv(ptr) MSVCRT_fegetenv @ stub fegetexceptflag @ stub fegetround @ stub feholdexcept diff --git a/dlls/msvcr120/tests/msvcr120.c b/dlls/msvcr120/tests/msvcr120.c index 6ee659f..25330f1 100644 --- a/dlls/msvcr120/tests/msvcr120.c +++ b/dlls/msvcr120/tests/msvcr120.c @@ -147,6 +147,12 @@ struct MSVCRT_lconv wchar_t* _W_negative_sign; }; +typedef struct +{ + unsigned int control; + unsigned int status; +} fenv_t; + static char* (CDECL *p_setlocale)(int category, const char* locale); static struct MSVCRT_lconv* (CDECL *p_localeconv)(void); static size_t (CDECL *p_wcstombs_s)(size_t *ret, char* dest, size_t sz, const wchar_t* src, size_t max); @@ -162,6 +168,8 @@ static int (CDECL *p__finite)(double); static float (CDECL *p_wcstof)(const wchar_t*, wchar_t**); static double (CDECL *p_remainder)(double, double); static int* (CDECL *p_errno)(void); +static int (CDECL *p_fegetenv)(fenv_t*); +static int (CDECL *p__clearfp)(void); /* make sure we use the correct errno */ #undef errno @@ -207,6 +215,8 @@ static BOOL init(void) p_wcstof = (void*)GetProcAddress(module, "wcstof"); p_remainder = (void*)GetProcAddress(module, "remainder"); p_errno = (void*)GetProcAddress(module, "_errno"); + SET(p_fegetenv, "fegetenv"); + SET(p__clearfp, "_clearfp"); if(sizeof(void*) == 8) { /* 64-bit initialization */ SET(p_critical_section_ctor, "??0critical_section@Concurrency@@QEAA@XZ"); @@ -686,6 +696,20 @@ static void test_critical_section(void) call_func1(p_critical_section_dtor, &cs); } +static void test_fegetenv(void) +{ + int ret; + fenv_t env; + + p__clearfp(); + + ret = p_fegetenv(&env); + ok(!ret, "fegetenv returned %x\n", ret); + ok(env.control == (_EM_INEXACT|_EM_UNDERFLOW|_EM_OVERFLOW|_EM_ZERODIVIDE|_EM_INVALID), + "env.control = %x\n", env.control); + ok(!env.status, "env.status = %x\n", env.status); +} + START_TEST(msvcr120) { if (!init()) return; @@ -699,4 +723,5 @@ START_TEST(msvcr120) test__strtof(); test_remainder(); test_critical_section(); + test_fegetenv(); } diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index e498fc7..94c0e08 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1810,7 +1810,7 @@ @ stub fdimf @ stub fdiml @ stub feclearexcept -@ stub fegetenv +@ cdecl fegetenv(ptr) msvcr120.fegetenv @ stub fegetexceptflag @ stub fegetround @ stub feholdexcept diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 3d2104b..e9d594c 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -1199,6 +1199,17 @@ int CDECL _controlfp_s(unsigned int *cur, unsigned int newval, unsigned int mask } /********************************************************************* + * fegetenv (MSVCR120.@) + */ +int CDECL MSVCRT_fegetenv(fenv_t *env) +{ + env->control = _controlfp(0, 0) & (MSVCRT__EM_INEXACT | MSVCRT__EM_UNDERFLOW | + MSVCRT__EM_OVERFLOW | MSVCRT__EM_ZERODIVIDE | MSVCRT__EM_INVALID); + env->status = _statusfp(); + return 0; +} + +/********************************************************************* * __fpe_flt_rounds (UCRTBASE.@) */ int CDECL __fpe_flt_rounds(void) diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 6c2ab42..958ca4e 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -910,6 +910,12 @@ struct MSVCRT__stat64 { #define MSVCRT__DN_SAVE_OPERANDS_FLUSH_RESULTS 0x03000000 #define MSVCRT__EM_AMBIGUOUS 0x80000000 +typedef struct +{ + unsigned int control; + unsigned int status; +} fenv_t; + #define MSVCRT_CLOCKS_PER_SEC 1000 /* signals */ diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index c03a434..0d6b397 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2286,7 +2286,7 @@ @ stub fdimf @ stub fdiml @ stub feclearexcept -@ stub fegetenv +@ cdecl fegetenv(ptr) MSVCRT_fegetenv @ stub fegetexceptflag @ stub fegetround @ stub feholdexcept

1 0

← Newer
1
...
53
54
55
56
57
58
59
...
68
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2016