May 2013 - Wine-Commits - list.winehq.org

Nikolay Sivov : comctl32: Properly paint thumb using DrawEdge() for diagonal edges too.
by Alexandre Julliard May 13, 2013

May 13, 2013

Module: wine Branch: master Commit: 1776cbf459c60165d8a22b7125cc03b7bf87db74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1776cbf459c60165d8a22b712… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 12 17:12:32 2013 +0400 comctl32: Properly paint thumb using DrawEdge() for diagonal edges too. --- dlls/comctl32/trackbar.c | 230 +++++++++++++++++++++++++++++++-------------- 1 files changed, 158 insertions(+), 72 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1776cbf459c60165d8a22…

1 0

Nikolay Sivov : comctl32: Update thumb size on WM_SIZE if it's not fixed, invalidate after resize.
by Alexandre Julliard May 13, 2013

May 13, 2013

Module: wine Branch: master Commit: e95b9d2f06204be6540b29e130b7ac62bcf6343e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e95b9d2f06204be6540b29e13… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat May 11 01:52:44 2013 +0400 comctl32: Update thumb size on WM_SIZE if it's not fixed, invalidate after resize. --- dlls/comctl32/trackbar.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/trackbar.c b/dlls/comctl32/trackbar.c index ee0f927..4c04d5b 100644 --- a/dlls/comctl32/trackbar.c +++ b/dlls/comctl32/trackbar.c @@ -1573,9 +1573,15 @@ TRACKBAR_SetFocus (TRACKBAR_INFO *infoPtr) static LRESULT TRACKBAR_Size (TRACKBAR_INFO *infoPtr) { - TRACKBAR_CalcChannel (infoPtr); - TRACKBAR_UpdateThumb (infoPtr); + if (infoPtr->dwStyle & TBS_FIXEDLENGTH) + { + TRACKBAR_CalcChannel(infoPtr); + TRACKBAR_UpdateThumb(infoPtr); + } + else + TRACKBAR_InitializeThumb(infoPtr); TRACKBAR_AlignBuddies (infoPtr); + TRACKBAR_InvalidateAll(infoPtr); return 0; }

1 0

Andrew Eikum : oleaut32: Sanity check some arguments.
by Alexandre Julliard May 13, 2013

May 13, 2013

Module: wine Branch: master Commit: 787ac75045aef3b98af23387fb73b58077637152 URL: http://source.winehq.org/git/wine.git/?a=commit;h=787ac75045aef3b98af23387f… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri May 10 14:31:24 2013 -0500 oleaut32: Sanity check some arguments. --- dlls/oleaut32/typelib.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index d42dd34..8434e56 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -5498,6 +5498,9 @@ static HRESULT WINAPI ITypeInfo_fnGetFuncDesc( ITypeInfo2 *iface, UINT index, TRACE("(%p) index %d\n", This, index); + if (!ppFuncDesc) + return E_INVALIDARG; + if (This->TypeAttr.typekind == TKIND_DISPATCH) hr = ITypeInfoImpl_GetInternalDispatchFuncDesc((ITypeInfo *)iface, index, &internal_funcdesc, NULL, @@ -5729,6 +5732,9 @@ static HRESULT WINAPI ITypeInfo_fnGetImplTypeFlags( ITypeInfo2 *iface, TRACE("(%p) index %d\n", This, index); + if(!pImplTypeFlags) + return E_INVALIDARG; + if(This->TypeAttr.typekind == TKIND_DISPATCH && index == 0){ *pImplTypeFlags = 0; return S_OK; @@ -7027,6 +7033,9 @@ static HRESULT WINAPI ITypeInfo_fnGetRefTypeInfo( ITypeInfoImpl *This = impl_from_ITypeInfo2(iface); HRESULT result = E_FAIL; + if(!ppTInfo) + return E_INVALIDARG; + if ((This->hreftype != -1) && (This->hreftype == hRefType)) { *ppTInfo = (ITypeInfo *)&This->ITypeInfo2_iface; @@ -7424,6 +7433,9 @@ static HRESULT WINAPI ITypeInfo2_fnGetCustData( TRACE("%p %s %p\n", This, debugstr_guid(guid), pVarVal); + if(!guid || !pVarVal) + return E_INVALIDARG; + pCData = TLB_get_custdata_by_guid(&This->custdata_list, guid); VariantInit( pVarVal);

1 0

Christian Costa : d3dcompiler: Add trace to D3DPreprocess.
by Alexandre Julliard May 13, 2013

May 13, 2013

Module: wine Branch: master Commit: af59f19461b8e6e8244d192baa8af1b530a83e16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af59f19461b8e6e8244d192ba… Author: Christian Costa <titan.costa(a)gmail.com> Date: Sun May 12 23:56:01 2013 +0200 d3dcompiler: Add trace to D3DPreprocess. --- dlls/d3dcompiler_43/compiler.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/d3dcompiler_43/compiler.c b/dlls/d3dcompiler_43/compiler.c index 985fc72..ac8fdc5 100644 --- a/dlls/d3dcompiler_43/compiler.c +++ b/dlls/d3dcompiler_43/compiler.c @@ -722,6 +722,9 @@ HRESULT WINAPI D3DPreprocess(const void *data, SIZE_T size, const char *filename HRESULT hr; ID3DBlob *buffer; + TRACE("data %p, size %lu, filename %s, defines %p, include %p, shader %p, error_messages %p\n", + data, size, debugstr_a(filename), defines, include, shader, error_messages); + if (!data) return E_INVALIDARG;

1 0

Sam Edwards : winex11: Cache XRandR 1.2 display mode.
by Alexandre Julliard May 13, 2013

May 13, 2013

Module: wine Branch: master Commit: 3a5eef4eed44cb342d3d35d73fe19d2e0109f7ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a5eef4eed44cb342d3d35d73… Author: Sam Edwards <CFSworks(a)gmail.com> Date: Fri May 10 10:03:42 2013 -0600 winex11: Cache XRandR 1.2 display mode. --- dlls/winex11.drv/xrandr.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index 36b9fe9..fc09020 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -278,6 +278,9 @@ static int xrandr12_get_current_mode(void) XRRCrtcInfo *crtc_info; int i, ret = -1; + if (xrandr_current_mode != -1) + return xrandr_current_mode; + if (!(resources = pXRRGetScreenResourcesCurrent( gdi_display, root_window ))) { ERR("Failed to get screen resources.\n"); @@ -310,9 +313,10 @@ static int xrandr12_get_current_mode(void) if (ret == -1) { ERR("Unknown mode, returning default.\n"); - ret = 0; + return 0; } + xrandr_current_mode = ret; return ret; } @@ -354,6 +358,7 @@ static LONG xrandr12_set_current_mode( int mode ) return DISP_CHANGE_FAILED; } + xrandr_current_mode = mode; X11DRV_resize_desktop( dd_modes[mode].width, dd_modes[mode].height ); return DISP_CHANGE_SUCCESSFUL; }

1 0

Nikolay Sivov : comctl32: Properly invalidate after setting thumb length.
by Alexandre Julliard May 13, 2013

May 13, 2013

Module: wine Branch: master Commit: a24808326d6848d1efacad244b8ed2ea341597b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a24808326d6848d1efacad244… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat May 11 02:25:26 2013 +0400 comctl32: Properly invalidate after setting thumb length. --- dlls/comctl32/trackbar.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/trackbar.c b/dlls/comctl32/trackbar.c index 4c04d5b..1d14a78 100644 --- a/dlls/comctl32/trackbar.c +++ b/dlls/comctl32/trackbar.c @@ -1297,9 +1297,11 @@ static inline LRESULT TRACKBAR_SetThumbLength (TRACKBAR_INFO *infoPtr, UINT iLength) { if (infoPtr->dwStyle & TBS_FIXEDLENGTH) { + /* We're not supposed to check if it's really changed or not, + just repaint in any case. */ infoPtr->uThumbLen = iLength; infoPtr->flags |= TB_THUMBSIZECHANGED; - InvalidateRect (infoPtr->hwndSelf, &infoPtr->rcThumb, FALSE); + TRACKBAR_InvalidateAll(infoPtr); } return 0;

1 0

Marcus Meissner : dinput: GetKeyNameW takes chars not bytes (Coverity).
by Alexandre Julliard May 13, 2013

May 13, 2013

Module: wine Branch: master Commit: 8990cf091d4de259f941ea1a6bb50becdc44f86e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8990cf091d4de259f941ea1a6… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat May 11 19:27:27 2013 +0200 dinput: GetKeyNameW takes chars not bytes (Coverity). --- dlls/dinput/keyboard.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c index 8e1d1a4..99697a1 100644 --- a/dlls/dinput/keyboard.c +++ b/dlls/dinput/keyboard.c @@ -439,7 +439,7 @@ static HRESULT WINAPI SysKeyboardWImpl_GetObjectInfo(LPDIRECTINPUTDEVICE8W iface scan = DIDFT_GETINSTANCE(pdidoi->dwType); if (scan == DIK_PAUSE || scan == DIK_NUMLOCK) scan ^= 0x80; if (!GetKeyNameTextW((scan & 0x80) << 17 | (scan & 0x7f) << 16, - pdidoi->tszName, sizeof(pdidoi->tszName))) + pdidoi->tszName, sizeof(pdidoi->tszName)/sizeof(pdidoi->tszName[0]))) return DIERR_OBJECTNOTFOUND; _dump_OBJECTINSTANCEW(pdidoi);

1 0

Andrew Eikum : oleaut32: Don' t return bogus pointers if no data is available.
by Alexandre Julliard May 13, 2013

May 13, 2013

Module: wine Branch: master Commit: 5f85b7c8ac9872519f3a43c96d03b5086006506c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f85b7c8ac9872519f3a43c96… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri May 10 14:31:35 2013 -0500 oleaut32: Don't return bogus pointers if no data is available. --- dlls/oleaut32/typelib.c | 44 +++++++++++++++++++++++++------------------- 1 files changed, 25 insertions(+), 19 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index b0a18b9..bb9eaf4 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -5330,9 +5330,12 @@ static HRESULT TLB_AllocAndInitFuncDesc( const FUNCDESC *src, FUNCDESC **dest_pt dest->funckind = FUNC_DISPATCH; buffer = (char *)(dest + 1); - dest->lprgscode = (SCODE *)buffer; - memcpy(dest->lprgscode, src->lprgscode, sizeof(*src->lprgscode) * src->cScodes); - buffer += sizeof(*src->lprgscode) * src->cScodes; + if (dest->cScodes) { + dest->lprgscode = (SCODE *)buffer; + memcpy(dest->lprgscode, src->lprgscode, sizeof(*src->lprgscode) * src->cScodes); + buffer += sizeof(*src->lprgscode) * src->cScodes; + } else + dest->lprgscode = NULL; hr = TLB_CopyElemDesc(&src->elemdescFunc, &dest->elemdescFunc, &buffer); if (FAILED(hr)) @@ -5341,23 +5344,26 @@ static HRESULT TLB_AllocAndInitFuncDesc( const FUNCDESC *src, FUNCDESC **dest_pt return hr; } - dest->lprgelemdescParam = (ELEMDESC *)buffer; - buffer += sizeof(ELEMDESC) * src->cParams; - for (i = 0; i < src->cParams; i++) - { - hr = TLB_CopyElemDesc(&src->lprgelemdescParam[i], &dest->lprgelemdescParam[i], &buffer); + if (dest->cParams) { + dest->lprgelemdescParam = (ELEMDESC *)buffer; + buffer += sizeof(ELEMDESC) * src->cParams; + for (i = 0; i < src->cParams; i++) + { + hr = TLB_CopyElemDesc(&src->lprgelemdescParam[i], &dest->lprgelemdescParam[i], &buffer); + if (FAILED(hr)) + break; + } if (FAILED(hr)) - break; - } - if (FAILED(hr)) - { - /* undo the above actions */ - for (i = i - 1; i >= 0; i--) - TLB_FreeElemDesc(&dest->lprgelemdescParam[i]); - TLB_FreeElemDesc(&dest->elemdescFunc); - SysFreeString((BSTR)dest); - return hr; - } + { + /* undo the above actions */ + for (i = i - 1; i >= 0; i--) + TLB_FreeElemDesc(&dest->lprgelemdescParam[i]); + TLB_FreeElemDesc(&dest->elemdescFunc); + SysFreeString((BSTR)dest); + return hr; + } + } else + dest->lprgelemdescParam = NULL; /* special treatment for dispinterfaces: this makes functions appear * to return their [retval] value when it is really returning an

1 0

Andrew Eikum : oleaut32: Use containing TypeLib's HelpFile in ITypeInfo:: GetDocumentation.
by Alexandre Julliard May 13, 2013

May 13, 2013

Module: wine Branch: master Commit: 1a00e932ad57dcc91f75c3bdbc8301fc32353f16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a00e932ad57dcc91f75c3bdb… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri May 10 14:31:29 2013 -0500 oleaut32: Use containing TypeLib's HelpFile in ITypeInfo::GetDocumentation. --- dlls/oleaut32/typelib.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 8434e56..b0a18b9 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -6898,7 +6898,7 @@ static HRESULT WINAPI ITypeInfo_fnGetDocumentation( ITypeInfo2 *iface, if(pdwHelpContext) *pdwHelpContext=This->dwHelpContext; if(pBstrHelpFile) - *pBstrHelpFile=SysAllocString(This->DocString);/* FIXME */ + *pBstrHelpFile=SysAllocString(This->pTypeLib->HelpFile); return S_OK; }else {/* for a member */ pFDesc = TLB_get_funcdesc_by_memberid(This->funcdescs, This->TypeAttr.cFuncs, memid); @@ -6919,6 +6919,8 @@ static HRESULT WINAPI ITypeInfo_fnGetDocumentation( ITypeInfo2 *iface, *pBstrDocString=SysAllocString(pVDesc->HelpString); if(pdwHelpContext) *pdwHelpContext=pVDesc->HelpContext; + if(pBstrHelpFile) + *pBstrHelpFile = SysAllocString(This->pTypeLib->HelpFile); return S_OK; } }

1 0

Alexandre Julliard : configure: Add explicit install targets in libs/ wine for make_makefiles.
by Alexandre Julliard May 13, 2013

May 13, 2013

Module: wine Branch: master Commit: ce4b6451aabbe83809c7483c748cfa009cc090d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce4b6451aabbe83809c7483c7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 10 22:01:44 2013 +0200 configure: Add explicit install targets in libs/wine for make_makefiles. --- configure | 2 +- configure.ac | 2 +- libs/wine/Makefile.in | 4 ++++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/configure b/configure index d4c1f8e..ef38bfd 100755 --- a/configure +++ b/configure @@ -16379,7 +16379,7 @@ wine_fn_config_makefile documentation enable_documentation wine_fn_config_makefile fonts enable_fonts install-lib wine_fn_config_makefile include enable_include install-dev wine_fn_config_makefile libs/port enable_libs_port -wine_fn_config_makefile libs/wine enable_libs_wine +wine_fn_config_makefile libs/wine enable_libs_wine install-dev,install-lib wine_fn_config_makefile libs/wpp enable_libs_wpp wine_fn_config_makefile loader enable_loader install-lib,manpage wine_fn_config_program aspnet_regiis enable_aspnet_regiis install diff --git a/configure.ac b/configure.ac index 6dd2348..b44673e 100644 --- a/configure.ac +++ b/configure.ac @@ -3173,7 +3173,7 @@ WINE_CONFIG_MAKEFILE([documentation]) WINE_CONFIG_MAKEFILE([fonts],,[install-lib]) WINE_CONFIG_MAKEFILE([include],,[install-dev]) WINE_CONFIG_MAKEFILE([libs/port]) -WINE_CONFIG_MAKEFILE([libs/wine]) +WINE_CONFIG_MAKEFILE([libs/wine],,[install-dev,install-lib]) WINE_CONFIG_MAKEFILE([libs/wpp]) WINE_CONFIG_MAKEFILE([loader],,[install-lib,manpage]) WINE_CONFIG_PROGRAM(aspnet_regiis,,[install]) diff --git a/libs/wine/Makefile.in b/libs/wine/Makefile.in index b8dc385..7de7799 100644 --- a/libs/wine/Makefile.in +++ b/libs/wine/Makefile.in @@ -111,4 +111,8 @@ version.c: dummy $(RELPATH): @cd $(TOOLSDIR)/tools && $(MAKE) relpath$(TOOLSEXT) +# Make sure that make_makefiles sees the install rules +install install-lib:: +install install-dev:: + @LIBWINE_RULES@

1 0