September 2016 - Wine-commits

Alexandre Julliard : user32/tests: Add more tests for GDI and private clipboard formats.
by Alexandre Julliard 09 Sep '16

09 Sep '16

Module: wine Branch: master Commit: ed97fa1cb2ed24af9a05a05ff2e601d1de8de794 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed97fa1cb2ed24af9a05a05ff… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 9 22:49:27 2016 +0900 user32/tests: Add more tests for GDI and private clipboard formats. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/clipboard.c | 142 ++++++++++++++++++++++++++---------------- dlls/winex11.drv/clipboard.c | 5 +- 2 files changed, 91 insertions(+), 56 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ed97fa1cb2ed24af9a05a…

1 0

Sebastian Lackner : configure: Fix a typo in the udev help message.
by Alexandre Julliard 09 Sep '16

09 Sep '16

Module: wine Branch: master Commit: 4bfefc5c7132023ee40d70572b677ae0e441df38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4bfefc5c7132023ee40d70572… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Sep 9 15:14:01 2016 +0200 configure: Fix a typo in the udev help message. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index bb18a6e..5e33a01 100755 --- a/configure +++ b/configure @@ -2281,7 +2281,7 @@ Optional Packages: --without-pulse do not use PulseAudio sound support --without-sane do not use SANE (scanner support) --without-tiff do not use TIFF - --without-udev do not use udev (play and play support) + --without-udev do not use udev (plug and play support) --without-v4l do not use v4l1 (v4l support) --without-xcomposite do not use the Xcomposite extension --without-xcursor do not use the Xcursor extension diff --git a/configure.ac b/configure.ac index cadaa5e..8007469 100644 --- a/configure.ac +++ b/configure.ac @@ -75,7 +75,7 @@ AC_ARG_WITH(pthread, AS_HELP_STRING([--without-pthread],[do not use the pthrea AC_ARG_WITH(pulse, AS_HELP_STRING([--without-pulse],[do not use PulseAudio sound support])) AC_ARG_WITH(sane, AS_HELP_STRING([--without-sane],[do not use SANE (scanner support)])) AC_ARG_WITH(tiff, AS_HELP_STRING([--without-tiff],[do not use TIFF])) -AC_ARG_WITH(udev, AS_HELP_STRING([--without-udev],[do not use udev (play and play support)])) +AC_ARG_WITH(udev, AS_HELP_STRING([--without-udev],[do not use udev (plug and play support)])) AC_ARG_WITH(v4l, AS_HELP_STRING([--without-v4l],[do not use v4l1 (v4l support)])) AC_ARG_WITH(xcomposite,AS_HELP_STRING([--without-xcomposite],[do not use the Xcomposite extension]), [if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_Xcomposite_h=no; fi])

1 0

Michael Stefaniuc : msdaps: Use the proper COM method wrappers.
by Alexandre Julliard 09 Sep '16

09 Sep '16

Module: wine Branch: master Commit: 502b9e9aa7390209a2ff5858b69830863b27a33b URL: http://source.winehq.org/git/wine.git/?a=commit;h=502b9e9aa7390209a2ff5858b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Sep 8 22:21:33 2016 +0200 msdaps: Use the proper COM method wrappers. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msdaps/row_server.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/msdaps/row_server.c b/dlls/msdaps/row_server.c index 784ade8..2b496be 100644 --- a/dlls/msdaps/row_server.c +++ b/dlls/msdaps/row_server.c @@ -757,19 +757,19 @@ static const IRowVtbl row_vtbl = static HRESULT WINAPI row_change_QueryInterface(IRowChange *iface, REFIID iid, void **obj) { row_proxy *This = impl_from_IRowChange(iface); - return IUnknown_QueryInterface((IUnknown *)This, iid, obj); + return IRow_QueryInterface(&This->IRow_iface, iid, obj); } static ULONG WINAPI row_change_AddRef(IRowChange *iface) { row_proxy *This = impl_from_IRowChange(iface); - return IUnknown_AddRef((IUnknown*)This); + return IRow_AddRef(&This->IRow_iface); } static ULONG WINAPI row_change_Release(IRowChange *iface) { row_proxy *This = impl_from_IRowChange(iface); - return IUnknown_Release((IUnknown*)This); + return IRow_Release(&This->IRow_iface); } static HRESULT WINAPI row_change_SetColumns(IRowChange *iface, DBORDINAL cColumns, @@ -1110,19 +1110,19 @@ static const IRowsetLocateVtbl rowsetlocate_vtbl = static HRESULT WINAPI rowsetinfo_QueryInterface(IRowsetInfo *iface, REFIID iid, void **obj) { rowset_proxy *This = impl_from_IRowsetInfo(iface); - return IUnknown_QueryInterface((IUnknown *)This, iid, obj); + return IRowsetLocate_QueryInterface(&This->IRowsetLocate_iface, iid, obj); } static ULONG WINAPI rowsetinfo_AddRef(IRowsetInfo *iface) { rowset_proxy *This = impl_from_IRowsetInfo(iface); - return IUnknown_AddRef((IUnknown *)This); + return IRowsetLocate_AddRef(&This->IRowsetLocate_iface); } static ULONG WINAPI rowsetinfo_Release(IRowsetInfo *iface) { rowset_proxy *This = impl_from_IRowsetInfo(iface); - return IUnknown_Release((IUnknown *)This); + return IRowsetLocate_Release(&This->IRowsetLocate_iface); } static HRESULT WINAPI rowsetinfo_GetProperties(IRowsetInfo *iface, const ULONG cPropertyIDSets, @@ -1167,19 +1167,19 @@ static const IRowsetInfoVtbl rowsetinfo_vtbl = static HRESULT WINAPI accessor_QueryInterface(IAccessor *iface, REFIID iid, void **obj) { rowset_proxy *This = impl_from_IAccessor(iface); - return IUnknown_QueryInterface((IUnknown *)This, iid, obj); + return IRowsetLocate_QueryInterface(&This->IRowsetLocate_iface, iid, obj); } static ULONG WINAPI accessor_AddRef(IAccessor *iface) { rowset_proxy *This = impl_from_IAccessor(iface); - return IUnknown_AddRef((IUnknown *)This); + return IRowsetLocate_AddRef(&This->IRowsetLocate_iface); } static ULONG WINAPI accessor_Release(IAccessor *iface) { rowset_proxy *This = impl_from_IAccessor(iface); - return IUnknown_Release((IUnknown *)This); + return IRowsetLocate_Release(&This->IRowsetLocate_iface); } static HRESULT WINAPI accessor_AddRefAccessor(IAccessor *iface, HACCESSOR hAccessor, DBREFCOUNT *pcRefCount)

1 0

Michael Stefaniuc : oleaut32: Avoid casts from COM objects to interfaces.
by Alexandre Julliard 09 Sep '16

09 Sep '16

Module: wine Branch: master Commit: a3c5c50bdd066b2e5196f79db93c4918f5d5ec1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3c5c50bdd066b2e5196f79db… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Sep 8 22:19:47 2016 +0200 oleaut32: Avoid casts from COM objects to interfaces. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/olefont.c | 6 ++++-- dlls/oleaut32/olepicture.c | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/olefont.c b/dlls/oleaut32/olefont.c index 4b3411e..c20093c 100644 --- a/dlls/oleaut32/olefont.c +++ b/dlls/oleaut32/olefont.c @@ -1014,8 +1014,10 @@ static HRESULT WINAPI OLEFontImpl_Clone( newObject->pPropertyNotifyCP = NULL; newObject->pFontEventsCP = NULL; - CreateConnectionPoint((IUnknown*)newObject, &IID_IPropertyNotifySink, &newObject->pPropertyNotifyCP); - CreateConnectionPoint((IUnknown*)newObject, &IID_IFontEventsDisp, &newObject->pFontEventsCP); + CreateConnectionPoint((IUnknown*)&newObject->IFont_iface, &IID_IPropertyNotifySink, + &newObject->pPropertyNotifyCP); + CreateConnectionPoint((IUnknown*)&newObject->IFont_iface, &IID_IFontEventsDisp, + &newObject->pFontEventsCP); if (!newObject->pPropertyNotifyCP || !newObject->pFontEventsCP) { diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index 96c109a..bfca22f 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -299,7 +299,8 @@ static OLEPictureImpl* OLEPictureImpl_Construct(LPPICTDESC pictDesc, BOOL fOwn) newObject->IConnectionPointContainer_iface.lpVtbl = &OLEPictureImpl_IConnectionPointContainer_VTable; newObject->pCP = NULL; - CreateConnectionPoint((IUnknown*)newObject,&IID_IPropertyNotifySink,&newObject->pCP); + CreateConnectionPoint((IUnknown*)&newObject->IPicture_iface, &IID_IPropertyNotifySink, + &newObject->pCP); if (!newObject->pCP) { HeapFree(GetProcessHeap(), 0, newObject);

1 0

Michael Stefaniuc : urlmon: Avoid a cast from a COM object to an iface.
by Alexandre Julliard 09 Sep '16

09 Sep '16

Module: wine Branch: master Commit: 1bf7c738d9554b7c05d7498a2b0b4401b3d9a71b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1bf7c738d9554b7c05d7498a2… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Sep 8 22:20:33 2016 +0200 urlmon: Avoid a cast from a COM object to an iface. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/sec_mgr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/urlmon/sec_mgr.c b/dlls/urlmon/sec_mgr.c index 0c20562..eab155d 100644 --- a/dlls/urlmon/sec_mgr.c +++ b/dlls/urlmon/sec_mgr.c @@ -1831,7 +1831,7 @@ HRESULT ZoneMgrImpl_Construct(IUnknown *pUnkOuter, LPVOID *ppobj) TRACE("(%p %p)\n", pUnkOuter, ppobj); ret->IInternetZoneManagerEx2_iface.lpVtbl = &ZoneMgrImplVtbl; ret->ref = 1; - *ppobj = (IInternetZoneManagerEx*)ret; + *ppobj = &ret->IInternetZoneManagerEx2_iface; URLMON_LockModule();

1 0

André Hentschel : loader/wine.inf: Open pdf files using winebrowser.
by Alexandre Julliard 09 Sep '16

09 Sep '16

Module: wine Branch: master Commit: 3e997a75d3cae811e0f90c760c1d5f0616ba3558 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e997a75d3cae811e0f90c760… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Sep 5 22:56:31 2016 +0200 loader/wine.inf: Open pdf files using winebrowser. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.inf.in | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 4e29026..0c58d6a 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -179,6 +179,7 @@ HKCR,.ini,,2,"inifile" HKCR,.lnk,,2,"lnkfile" HKCR,.msi,,2,"Msi.Package" HKCR,.msp,,2,"Msi.Patch" +HKCR,.pdf,,2,"pdffile" HKCR,.rtf,,2,"rtffile" HKCR,.wri,,2,"wrifile" HKCR,*\shellex\ContextMenuHandlers,,16 @@ -223,6 +224,12 @@ HKCR,Msi.Package\shell\Uninstall\command,,2,"%11%\msiexec.exe /x ""%1""" HKCR,Msi.Patch,,2,"Windows Installer Patch" HKCR,Msi.Patch\DefaultIcon,,2,"msiexec.exe" HKCR,Msi.Patch\shell\Open\command,,2,"%11%\msiexec.exe /p ""%1""" +HKCR,pdffile,,2,"PDF Document" +HKCR,pdffile\shell\open\command,,2,"""%11%\winebrowser.exe"" -nohome" +HKCR,pdffile\shell\open\ddeexec,,2,"""%1"",,-1,0,,,," +HKCR,pdffile\shell\open\ddeexec,"NoActivateHandler",2,"" +HKCR,pdffile\shell\open\ddeexec\Application,,2,"IExplore" +HKCR,pdffile\shell\open\ddeexec\Topic,,2,"WWW_OpenURL" HKCR,rtffile,,2,"Rich Text Document" HKCR,rtffile\shell\open\command,,2,"""%16422%\Windows NT\Accessories\wordpad.exe"" %1" HKCR,rtffile\shell\print\command,,2,"""%16422%\Windows NT\Accessories\wordpad.exe"" /p %1"

1 0

Alistair Leslie-Hughes : comdlg32: Clear the filename text on OPEN_BROWSE.
by Alexandre Julliard 09 Sep '16

09 Sep '16

Module: wine Branch: master Commit: b11d7f7482b6ce3c421848a092a4a2646c6bbaa4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b11d7f7482b6ce3c421848a09… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Aug 30 08:00:09 2016 +0000 comdlg32: Clear the filename text on OPEN_BROWSE. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comdlg32/filedlg.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index 0fbb621..c4bced9 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -2541,6 +2541,7 @@ BOOL FILEDLG95_OnOpen(HWND hwnd) && fodInfos->ofnInfos->Flags & OFN_EXPLORER) { SendCustomDlgNotificationMessage(hwnd, CDN_FOLDERCHANGE); + SendMessageA(fodInfos->DlgInfos.hwndFileName, WM_SETTEXT, 0, (LPARAM)""); } } else if( nOpenAction == ONOPEN_SEARCH )

1 0

Alistair Leslie-Hughes : comdlg: Select all text when enter is pressed.
by Alexandre Julliard 09 Sep '16

09 Sep '16

Module: wine Branch: master Commit: 326a9ea1375591a81ac5f8c0dc68a568f71825ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=326a9ea1375591a81ac5f8c0d… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Aug 30 08:00:21 2016 +0000 comdlg: Select all text when enter is pressed. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comdlg32/filedlg.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index c4bced9..95eacd3 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -2552,6 +2552,13 @@ BOOL FILEDLG95_OnOpen(HWND hwnd) COMDLG32_SHFree(pidlCurrent); if (filename_is_edit( fodInfos )) SendMessageW(fodInfos->DlgInfos.hwndFileName, EM_SETSEL, 0, -1); + else + { + HWND hwnd; + + hwnd = (HWND)SendMessageA(fodInfos->DlgInfos.hwndFileName, CBEM_GETEDITCONTROL, 0, 0); + SendMessageW(hwnd, EM_SETSEL, 0, -1); + } } } ret = FALSE;

1 0

Sebastian Lackner : jscript/tests: Remove an invalid win2k broken() check.
by Alexandre Julliard 09 Sep '16

09 Sep '16

Module: wine Branch: master Commit: cd5ea7612e9a4fc8ec70dce96776dd6b3c372896 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd5ea7612e9a4fc8ec70dce96… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Sep 8 19:16:51 2016 +0200 jscript/tests: Remove an invalid win2k broken() check. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/tests/jscript.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/jscript/tests/jscript.c b/dlls/jscript/tests/jscript.c index f949b9d..4c5aa6c 100644 --- a/dlls/jscript/tests/jscript.c +++ b/dlls/jscript/tests/jscript.c @@ -659,7 +659,7 @@ static void test_aggregation(void) hres = CoCreateInstance(&CLSID_JScript, (IUnknown*)0xdeadbeef, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, &IID_IUnknown, (void**)&unk); - ok(hres == CLASS_E_NOAGGREGATION || broken(E_INVALIDARG) /* win2k */, + ok(hres == CLASS_E_NOAGGREGATION, "CoCreateInstance failed: %08x, expected CLASS_E_NOAGGREGATION\n", hres); ok(!unk || broken(unk != NULL), "unk = %p\n", unk); }

1 0

Sebastian Lackner : user32: Add missing calls to GlobalUnlock in render_synthesized_dib.
by Alexandre Julliard 08 Sep '16

08 Sep '16

Module: wine Branch: master Commit: 5eb8217f6d3c1cc8e2dc3a040c03fd6b1eb904cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=5eb8217f6d3c1cc8e2dc3a040… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Sep 7 20:52:35 2016 +0200 user32: Add missing calls to GlobalUnlock in render_synthesized_dib. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/clipboard.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/user32/clipboard.c b/dlls/user32/clipboard.c index f6f073e..135790a 100644 --- a/dlls/user32/clipboard.c +++ b/dlls/user32/clipboard.c @@ -283,13 +283,16 @@ static HANDLE render_synthesized_dib( HANDLE data, UINT format, UINT from ) header_size = (format == CF_DIBV5) ? sizeof(BITMAPV5HEADER) : offsetof( BITMAPINFO, bmiColors[src->bmiHeader.biCompression == BI_BITFIELDS ? 3 : 0] ); - if (!(ret = GlobalAlloc( GMEM_FIXED, header_size + bits_size ))) goto done; - bmi = (BITMAPINFO *)ret; - memset( bmi, 0, header_size ); - memcpy( bmi, src, min( header_size, src_size )); - bmi->bmiHeader.biSize = header_size; - /* FIXME: convert colors according to DIBv5 color profile */ - memcpy( (char *)bmi + header_size, (char *)src + src_size, bits_size ); + if ((ret = GlobalAlloc( GMEM_FIXED, header_size + bits_size ))) + { + bmi = (BITMAPINFO *)ret; + memset( bmi, 0, header_size ); + memcpy( bmi, src, min( header_size, src_size )); + bmi->bmiHeader.biSize = header_size; + /* FIXME: convert colors according to DIBv5 color profile */ + memcpy( (char *)bmi + header_size, (char *)src + src_size, bits_size ); + } + GlobalUnlock( data ); } done:

1 0