January 2015 - Wine-Commits

Matteo Bruni : wined3d: Always use the core version of the glPointParameteri function.
by Alexandre Julliard Jan. 20, 2015

Jan. 20, 2015

Module: wine Branch: master Commit: 915e0ef0cfc56621d67e6fc65f123cf45d0f5469 URL: http://source.winehq.org/git/wine.git/?a=commit;h=915e0ef0cfc56621d67e6fc65… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Jan 20 15:47:08 2015 +0100 wined3d: Always use the core version of the glPointParameteri function. The state function depends on GL 2.0+ so it's unnecessary to check for NV_POINT_SPRITE. --- dlls/wined3d/directx.c | 6 ++---- dlls/wined3d/state.c | 7 ++----- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 60269f1..8f50b5e 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2848,9 +2848,7 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) USE_GL_FUNC(glVertexWeighthNV) USE_GL_FUNC(glVertexWeighthvNV) /* GL_NV_point_sprite */ - USE_GL_FUNC(glPointParameteri) USE_GL_FUNC(glPointParameteriNV) - USE_GL_FUNC(glPointParameteriv) USE_GL_FUNC(glPointParameterivNV) /* GL_NV_register_combiners */ USE_GL_FUNC(glCombinerInputNV) @@ -2889,6 +2887,8 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) USE_GL_FUNC(glGetBufferSubData) /* OpenGL 1.5 */ USE_GL_FUNC(glGetCompressedTexImage) /* OpenGL 1.3 */ USE_GL_FUNC(glMapBuffer) /* OpenGL 1.5 */ + USE_GL_FUNC(glPointParameteri) /* OpenGL 1.4 */ + USE_GL_FUNC(glPointParameteriv) /* OpenGL 1.4 */ USE_GL_FUNC(glUnmapBuffer) /* OpenGL 1.5 */ #undef USE_GL_FUNC @@ -3253,8 +3253,6 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter) if (!gl_info->supported[NV_POINT_SPRITE] && gl_version >= MAKEDWORD_VERSION(1, 4)) { TRACE("GL CORE: GL_NV_point_sprite support.\n"); - gl_info->gl_ops.ext.p_glPointParameterivNV = gl_info->gl_ops.ext.p_glPointParameteriv; - gl_info->gl_ops.ext.p_glPointParameteriNV = gl_info->gl_ops.ext.p_glPointParameteri; gl_info->supported[NV_POINT_SPRITE] = TRUE; } diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 2b149a0..f7cf14d 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -5010,11 +5010,8 @@ static void psorigin(struct wined3d_context *context, const struct wined3d_state const struct wined3d_gl_info *gl_info = context->gl_info; GLint origin = context->render_offscreen ? GL_LOWER_LEFT : GL_UPPER_LEFT; - if (gl_info->supported[NV_POINT_SPRITE]) - { - GL_EXTCALL(glPointParameteriNV(GL_POINT_SPRITE_COORD_ORIGIN, origin)); - checkGLcall("glPointParameteriNV(GL_POINT_SPRITE_COORD_ORIGIN, ...)"); - } + GL_EXTCALL(glPointParameteri(GL_POINT_SPRITE_COORD_ORIGIN, origin)); + checkGLcall("glPointParameteri(GL_POINT_SPRITE_COORD_ORIGIN, ...)"); } void state_srgbwrite(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id)

1 0

Matteo Bruni : wined3d: Use the core version of glDrawBuffers.
by Alexandre Julliard Jan. 20, 2015

Jan. 20, 2015

Module: wine Branch: master Commit: 75b96768e508180f2c9dd0ebeb29674299254c1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=75b96768e508180f2c9dd0ebe… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Jan 20 15:47:06 2015 +0100 wined3d: Use the core version of glDrawBuffers. --- dlls/wined3d/context.c | 2 +- dlls/wined3d/directx.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index d3f7629..b045ce8 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2082,7 +2082,7 @@ static void context_apply_draw_buffers(struct wined3d_context *context, DWORD rt if (gl_info->supported[ARB_DRAW_BUFFERS]) { - GL_EXTCALL(glDrawBuffersARB(i, context->draw_buffers)); + GL_EXTCALL(glDrawBuffers(i, context->draw_buffers)); checkGLcall("glDrawBuffers()"); } else diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 2566f9e..b596eac 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2883,6 +2883,7 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) USE_GL_FUNC(glCompressedTexSubImage2D) /* OpenGL 1.3 */ USE_GL_FUNC(glCompressedTexSubImage3D) /* OpenGL 1.3 */ USE_GL_FUNC(glDeleteBuffers) /* OpenGL 1.5 */ + USE_GL_FUNC(glDrawBuffers) /* OpenGL 2.0 */ USE_GL_FUNC(glGenBuffers) /* OpenGL 1.5 */ USE_GL_FUNC(glGetBufferSubData) /* OpenGL 1.5 */ USE_GL_FUNC(glGetCompressedTexImage) /* OpenGL 1.3 */ @@ -2917,6 +2918,7 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) MAP_GL_FUNCTION(glCompressedTexSubImage2D, glCompressedTexSubImage2DARB); MAP_GL_FUNCTION(glCompressedTexSubImage3D, glCompressedTexSubImage3DARB); MAP_GL_FUNCTION(glDeleteBuffers, glDeleteBuffersARB); + MAP_GL_FUNCTION(glDrawBuffers, glDrawBuffersARB); MAP_GL_FUNCTION(glGenBuffers, glGenBuffersARB); MAP_GL_FUNCTION(glGetBufferSubData, glGetBufferSubDataARB); MAP_GL_FUNCTION(glGetCompressedTexImage, glGetCompressedTexImageARB);

1 0

Matteo Bruni : dxgi: Fix a comment typo.
by Alexandre Julliard Jan. 20, 2015

Jan. 20, 2015

Module: wine Branch: master Commit: 5883c9ece3a205f8357a239ec4432408610928d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5883c9ece3a205f8357a239ec… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Jan 20 15:47:04 2015 +0100 dxgi: Fix a comment typo. --- dlls/dxgi/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dxgi/device.c b/dlls/dxgi/device.c index 7976a91..a6f72ca 100644 --- a/dlls/dxgi/device.c +++ b/dlls/dxgi/device.c @@ -326,7 +326,7 @@ static const struct IWineDXGIDeviceVtbl dxgi_device_vtbl = dxgi_device_QueryResourceResidency, dxgi_device_SetGPUThreadPriority, dxgi_device_GetGPUThreadPriority, - /* IWineDXGIAdapter methods */ + /* IWineDXGIDevice methods */ dxgi_device_create_surface, dxgi_device_create_swapchain, };

1 0

Michael Stefaniuc : oleaut32: Just stop instead of erroring out on 8 or 9 in octal numbers.
by Alexandre Julliard Jan. 20, 2015

Jan. 20, 2015

Module: wine Branch: master Commit: 512a814efc3c6f84086ea4eb6b405f374f6753d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=512a814efc3c6f84086ea4eb6… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jan 20 00:21:50 2015 +0100 oleaut32: Just stop instead of erroring out on 8 or 9 in octal numbers. --- dlls/oleaut32/tests/vartest.c | 2 -- dlls/oleaut32/variant.c | 5 ++--- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index 118aa75..7ed4fd4 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -1383,11 +1383,9 @@ static void test_VarParseNumFromStr(void) /* VB oct char bigger than 7 */ CONVERT("&o128", NUMPRS_HEX_OCT); - todo_wine { EXPECT(2,NUMPRS_HEX_OCT,0x40,4,3,0); EXPECTRGB(0,1); EXPECTRGB(1,2); - } EXPECTRGB(3,FAILDIG); /** NUMPRS_PARENS **/ diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index 5a28acc..feba6c5 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -1736,9 +1736,8 @@ HRESULT WINAPI VarParseNumFromStr(OLECHAR *lpszStr, LCID lcid, ULONG dwFlags, } else { - if ((dwState & B_PROCESSING_OCT) && ((*lpszStr == '8') || (*lpszStr == '9'))) { - return DISP_E_TYPEMISMATCH; - } + if ((dwState & B_PROCESSING_OCT) && ((*lpszStr == '8') || (*lpszStr == '9'))) + break; if (pNumprs->dwOutFlags & NUMPRS_DECIMAL) pNumprs->nPwr10--; /* Count decimal points in nPwr10 */

1 0

Ken Thomases : winemac: Fix conversion of empty RECT to an empty CGRect.
by Alexandre Julliard Jan. 20, 2015

Jan. 20, 2015

Module: wine Branch: master Commit: 50cd5b6a578a1427a501ef082017aebb66f132e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50cd5b6a578a1427a501ef082… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Jan 19 13:11:15 2015 -0600 winemac: Fix conversion of empty RECT to an empty CGRect. For some empty RECTs, such as { INT_MAX, INT_MAX, INT_MIN, INT_MIN }, right minus left or bottom minus top underflow and wrap around to positive values. --- dlls/winemac.drv/macdrv.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index 56ca24f..cf0fc64 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -47,7 +47,9 @@ extern const char* debugstr_cf(CFTypeRef t) DECLSPEC_HIDDEN; static inline CGRect cgrect_from_rect(RECT rect) { - return CGRectMake(rect.left, rect.top, max(0, rect.right - rect.left), max(0, rect.bottom - rect.top)); + if (rect.left >= rect.right || rect.top >= rect.bottom) + return CGRectMake(rect.left, rect.top, 0, 0); + return CGRectMake(rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top); } static inline RECT rect_from_cgrect(CGRect cgrect)

1 0

Michael Stefaniuc : oleaut32/tests: Uncomment and fix a test (PVS-Studio).
by Alexandre Julliard Jan. 20, 2015

Jan. 20, 2015

Module: wine Branch: master Commit: 9bfd58a5c97d471d6453c64bb492974313280d5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=9bfd58a5c97d471d6453c64bb… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jan 20 00:15:56 2015 +0100 oleaut32/tests: Uncomment and fix a test (PVS-Studio). --- dlls/oleaut32/tests/vartest.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index d15adcb..118aa75 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -1383,11 +1383,13 @@ static void test_VarParseNumFromStr(void) /* VB oct char bigger than 7 */ CONVERT("&o128", NUMPRS_HEX_OCT); -/* - Native versions 2.x of oleaut32 allow this to succeed: later versions and Wine don't - EXPECTFAIL; - EXPECTRGB(0,FAILDIG); -*/ + todo_wine { + EXPECT(2,NUMPRS_HEX_OCT,0x40,4,3,0); + EXPECTRGB(0,1); + EXPECTRGB(1,2); + } + EXPECTRGB(3,FAILDIG); + /** NUMPRS_PARENS **/ /* Empty parens = error */

1 0

Piotr Caban : msvcrt: Add _vscprintf_p implementation.
by Alexandre Julliard Jan. 20, 2015

Jan. 20, 2015

Module: wine Branch: master Commit: bd1428ef50a49b2f99505e9be39c24faf0a33c1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd1428ef50a49b2f99505e9be… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jan 20 13:43:09 2015 +0100 msvcrt: Add _vscprintf_p implementation. --- dlls/msvcr100/msvcr100.spec | 4 ++-- dlls/msvcr110/msvcr110.spec | 4 ++-- dlls/msvcr120/msvcr120.spec | 4 ++-- dlls/msvcr120_app/msvcr120_app.spec | 4 ++-- dlls/msvcr80/msvcr80.spec | 4 ++-- dlls/msvcr90/msvcr90.spec | 4 ++-- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/wcs.c | 36 ++++++++++++++++++++++++++++++++++++ 8 files changed, 49 insertions(+), 13 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 29cbe7f..c1eb594 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1446,8 +1446,8 @@ @ stub _vprintf_s_l @ cdecl _vscprintf(str ptr) MSVCRT__vscprintf @ stub _vscprintf_l -@ stub _vscprintf_p -@ stub _vscprintf_p_l +@ cdecl _vscprintf_p(str ptr) MSVCRT__vscprintf_p +@ cdecl _vscprintf_p_l(str ptr ptr) MSVCRT__vscprintf_p_l @ cdecl _vscwprintf(wstr ptr) MSVCRT__vscwprintf @ cdecl _vscwprintf_l(wstr ptr ptr) MSVCRT__vscwprintf_l @ cdecl _vscwprintf_p(wstr ptr) MSVCRT__vscwprintf_p diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 9017921..c0bc9e1 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1804,8 +1804,8 @@ @ stub _vprintf_s_l @ cdecl _vscprintf(str ptr) MSVCRT__vscprintf @ stub _vscprintf_l -@ stub _vscprintf_p -@ stub _vscprintf_p_l +@ cdecl _vscprintf_p(str ptr) MSVCRT__vscprintf_p +@ cdecl _vscprintf_p_l(str ptr ptr) MSVCRT__vscprintf_p_l @ cdecl _vscwprintf(wstr ptr) MSVCRT__vscwprintf @ cdecl _vscwprintf_l(wstr ptr ptr) MSVCRT__vscwprintf_l @ cdecl _vscwprintf_p(wstr ptr) MSVCRT__vscwprintf_p diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index c675436..0faf1f0 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1819,8 +1819,8 @@ @ stub _vprintf_s_l @ cdecl _vscprintf(str ptr) MSVCRT__vscprintf @ stub _vscprintf_l -@ stub _vscprintf_p -@ stub _vscprintf_p_l +@ cdecl _vscprintf_p(str ptr) MSVCRT__vscprintf_p +@ cdecl _vscprintf_p_l(str ptr ptr) MSVCRT__vscprintf_p_l @ cdecl _vscwprintf(wstr ptr) MSVCRT__vscwprintf @ cdecl _vscwprintf_l(wstr ptr ptr) MSVCRT__vscwprintf_l @ cdecl _vscwprintf_p(wstr ptr) MSVCRT__vscwprintf_p diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 760f8f9..eddb27d 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1516,8 +1516,8 @@ @ stub _vprintf_s_l @ cdecl _vscprintf(str ptr) msvcr120._vscprintf @ stub _vscprintf_l -@ stub _vscprintf_p -@ stub _vscprintf_p_l +@ cdecl _vscprintf_p(str ptr) msvcr120._vscprintf_p +@ cdecl _vscprintf_p_l(str ptr ptr) msvcr120._vscprintf_p_l @ cdecl _vscwprintf(wstr ptr) msvcr120._vscwprintf @ cdecl _vscwprintf_l(wstr ptr ptr) msvcr120._vscwprintf_l @ cdecl _vscwprintf_p(wstr ptr) msvcr120._vscwprintf_p diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index fbe42f3..13a2270 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1126,8 +1126,8 @@ @ stub _vprintf_s_l @ cdecl _vscprintf(str ptr) MSVCRT__vscprintf @ stub _vscprintf_l -@ stub _vscprintf_p -@ stub _vscprintf_p_l +@ cdecl _vscprintf_p(str ptr) MSVCRT__vscprintf_p +@ cdecl _vscprintf_p_l(str ptr ptr) MSVCRT__vscprintf_p_l @ cdecl _vscwprintf(wstr ptr) MSVCRT__vscwprintf @ cdecl _vscwprintf_l(wstr ptr ptr) MSVCRT__vscwprintf_l @ cdecl _vscwprintf_p(wstr ptr) MSVCRT__vscwprintf_p diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 9623aa5..e53f622 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1101,8 +1101,8 @@ @ stub _vprintf_s_l @ cdecl _vscprintf(str ptr) MSVCRT__vscprintf @ stub _vscprintf_l -@ stub _vscprintf_p -@ stub _vscprintf_p_l +@ cdecl _vscprintf_p(str ptr) MSVCRT__vscprintf_p +@ cdecl _vscprintf_p_l(str ptr ptr) MSVCRT__vscprintf_p_l @ cdecl _vscwprintf(wstr ptr) MSVCRT__vscwprintf @ cdecl _vscwprintf_l(wstr ptr ptr) MSVCRT__vscwprintf_l @ cdecl _vscwprintf_p(wstr ptr) MSVCRT__vscwprintf_p diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 141cd9e..7156a50 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1059,7 +1059,7 @@ @ cdecl _utime(str ptr) @ cdecl _vscprintf(str ptr) MSVCRT__vscprintf # stub _vscprintf_l(str ptr ptr) -# stub _vscprintf_p_l(str ptr ptr) +@ cdecl _vscprintf_p_l(str ptr ptr) MSVCRT__vscprintf_p_l @ cdecl _vscwprintf(wstr ptr) MSVCRT__vscwprintf @ cdecl _vscwprintf_l(wstr ptr ptr) MSVCRT__vscwprintf_l @ cdecl _vscwprintf_p_l(wstr ptr ptr) MSVCRT__vscwprintf_p_l diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 935c264..771f6f6 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -825,6 +825,42 @@ int CDECL MSVCRT__vscprintf( const char *format, __ms_va_list valist ) } /********************************************************************* + * _vscprintf_p_l (MSVCRT.@) + */ +int CDECL MSVCRT__vscprintf_p_l(const char *format, + MSVCRT__locale_t locale, __ms_va_list args) +{ + printf_arg args_ctx[MSVCRT__ARGMAX+1]; + struct _str_ctx_a puts_ctx = {INT_MAX, NULL}; + int ret; + + memset(args_ctx, 0, sizeof(args_ctx)); + + ret = create_positional_ctx_a(args_ctx, format, args); + if(ret < 0) { + MSVCRT__invalid_parameter(NULL, NULL, NULL, 0, 0); + *MSVCRT__errno() = MSVCRT_EINVAL; + return ret; + } else if(ret == 0) { + ret = pf_printf_a(puts_clbk_str_a, &puts_ctx, format, locale, FALSE, TRUE, + arg_clbk_valist, NULL, &args); + } else { + ret = pf_printf_a(puts_clbk_str_a, &puts_ctx, format, locale, TRUE, TRUE, + arg_clbk_positional, args_ctx, NULL); + } + + return ret; +} + +/********************************************************************* + * _vscprintf_p (MSVCR80.@) + */ +int CDECL MSVCRT__vscprintf_p(const char *format, __ms_va_list argptr) +{ + return MSVCRT__vscprintf_p_l(format, NULL, argptr); +} + +/********************************************************************* * _snprintf (MSVCRT.@) */ int CDECL MSVCRT__snprintf(char *str, unsigned int len, const char *format, ...)

1 0

Nikolay Sivov : dwrite: Implement GetClusterMetrics().
by Alexandre Julliard Jan. 20, 2015

Jan. 20, 2015

Module: wine Branch: master Commit: e292385fcd80c897ebff3f17f3a85400c4a6a149 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e292385fcd80c897ebff3f17f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jan 12 13:56:27 2015 +0300 dwrite: Implement GetClusterMetrics(). --- dlls/dwrite/layout.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 785ded8..88a83cc 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -1704,13 +1704,17 @@ static HRESULT WINAPI dwritetextlayout_GetClusterMetrics(IDWriteTextLayout2 *ifa struct dwrite_textlayout *This = impl_from_IDWriteTextLayout2(iface); HRESULT hr; - FIXME("(%p)->(%p %u %p): stub\n", This, metrics, max_count, count); + TRACE("(%p)->(%p %u %p)\n", This, metrics, max_count, count); hr = layout_compute(This); if (FAILED(hr)) return hr; - return E_NOTIMPL; + if (metrics) + memcpy(metrics, This->clusters, sizeof(DWRITE_CLUSTER_METRICS)*min(max_count, This->clusters_count)); + + *count = This->clusters_count; + return max_count < This->clusters_count ? S_OK : E_NOT_SUFFICIENT_BUFFER; } static HRESULT WINAPI dwritetextlayout_DetermineMinWidth(IDWriteTextLayout2 *iface, FLOAT* min_width)

1 0

Nikolay Sivov : msxml3: Remove child node in one place in node_insert_before().
by Alexandre Julliard Jan. 20, 2015

Jan. 20, 2015

Module: wine Branch: master Commit: fd925d0e5b477f8b99260596b88b33a85770cf07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd925d0e5b477f8b99260596b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jan 17 20:22:48 2015 +0300 msxml3: Remove child node in one place in node_insert_before(). --- dlls/msxml3/node.c | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 47d3159..92063be 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -477,15 +477,19 @@ HRESULT node_insert_before(xmlnode *This, IXMLDOMNode *new_child, const VARIANT xmlnode *before_node_obj = get_node_obj(before); IXMLDOMNode_Release(before); if(!before_node_obj) return E_FAIL; + } - /* unlink from current parent first */ - if(node_obj->parent) - { - hr = IXMLDOMNode_removeChild(node_obj->parent, node_obj->iface, NULL); - if (hr == S_OK) xmldoc_remove_orphan(node_obj->node->doc, node_obj->node); - } + /* unlink from current parent first */ + if(node_obj->parent) + { + hr = IXMLDOMNode_removeChild(node_obj->parent, node_obj->iface, NULL); + if (hr == S_OK) xmldoc_remove_orphan(node_obj->node->doc, node_obj->node); + } + doc = node_obj->node->doc; - doc = node_obj->node->doc; + if(before) + { + xmlnode *before_node_obj = get_node_obj(before); /* refs count including subtree */ if (doc != before_node_obj->node->doc) @@ -498,14 +502,6 @@ HRESULT node_insert_before(xmlnode *This, IXMLDOMNode *new_child, const VARIANT } else { - /* unlink from current parent first */ - if(node_obj->parent) - { - hr = IXMLDOMNode_removeChild(node_obj->parent, node_obj->iface, NULL); - if (hr == S_OK) xmldoc_remove_orphan(node_obj->node->doc, node_obj->node); - } - doc = node_obj->node->doc; - if (doc != This->node->doc) refcount = xmlnode_get_inst_cnt(node_obj);

1 0

Nikolay Sivov : hnetcfg: Release typeinfos and typelib on dll unload.
by Alexandre Julliard Jan. 20, 2015

Jan. 20, 2015

Module: wine Branch: master Commit: 4782be7e31c1a605d5dc5ea619a06ddcec75e26a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4782be7e31c1a605d5dc5ea61… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 14 13:39:22 2015 +0300 hnetcfg: Release typeinfos and typelib on dll unload. --- dlls/hnetcfg/apps.c | 12 ++++++++++++ dlls/hnetcfg/hnetcfg.c | 8 ++++++-- dlls/hnetcfg/hnetcfg_private.h | 1 + 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/hnetcfg/apps.c b/dlls/hnetcfg/apps.c index a0530e1..d21ed98 100644 --- a/dlls/hnetcfg/apps.c +++ b/dlls/hnetcfg/apps.c @@ -148,6 +148,18 @@ HRESULT get_typeinfo( enum type_id tid, ITypeInfo **ret ) return S_OK; } +void release_typelib(void) +{ + unsigned i; + + for (i = 0; i < sizeof(typeinfo)/sizeof(*typeinfo); i++) + if (typeinfo[i]) + ITypeInfo_Release(typeinfo[i]); + + if (typelib) + ITypeLib_Release(typelib); +} + static HRESULT WINAPI fw_app_GetTypeInfo( INetFwAuthorizedApplication *iface, UINT iTInfo, diff --git a/dlls/hnetcfg/hnetcfg.c b/dlls/hnetcfg/hnetcfg.c index 809b540..fadd367 100644 --- a/dlls/hnetcfg/hnetcfg.c +++ b/dlls/hnetcfg/hnetcfg.c @@ -114,9 +114,9 @@ static hnetcfg_cf fw_manager_cf = { { &hnetcfg_cf_vtbl }, NetFwMgr_create }; static hnetcfg_cf fw_app_cf = { { &hnetcfg_cf_vtbl }, NetFwAuthorizedApplication_create }; static hnetcfg_cf fw_openport_cf = { { &hnetcfg_cf_vtbl }, NetFwOpenPort_create }; -BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpvReserved) +BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID reserved) { - TRACE("(0x%p, %d, %p)\n",hInstDLL,fdwReason,lpvReserved); + TRACE("(0x%p, %d, %p)\n", hInstDLL, fdwReason, reserved); switch(fdwReason) { case DLL_WINE_PREATTACH: @@ -125,6 +125,10 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpvReserved) instance = hInstDLL; DisableThreadLibraryCalls(hInstDLL); break; + case DLL_PROCESS_DETACH: + if (reserved) break; + release_typelib(); + break; } return TRUE; } diff --git a/dlls/hnetcfg/hnetcfg_private.h b/dlls/hnetcfg/hnetcfg_private.h index 1045347..6fe69d5 100644 --- a/dlls/hnetcfg/hnetcfg_private.h +++ b/dlls/hnetcfg/hnetcfg_private.h @@ -28,6 +28,7 @@ enum type_id }; HRESULT get_typeinfo(enum type_id, ITypeInfo **) DECLSPEC_HIDDEN; +void release_typelib(void) DECLSPEC_HIDDEN; HRESULT NetFwMgr_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN; HRESULT NetFwPolicy_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN;

1 0