April 2015 - Wine-Commits - list.winehq.org

Michael Müller : ws2_32: Don' t return an error in WS_select when EINTR happens during timeout.
by Alexandre Julliard April 6, 2015

April 6, 2015

Module: wine Branch: master Commit: 0601c86542b16c452c014d5a9a3d6d57e6476796 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0601c86542b16c452c014d5a9… Author: Michael Müller <michael(a)fds-team.de> Date: Sat Mar 28 20:47:52 2015 +0100 ws2_32: Don't return an error in WS_select when EINTR happens during timeout. --- dlls/ws2_32/socket.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 7f3134e..9d5067a 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -4780,7 +4780,11 @@ int WINAPI WS_select(int nfds, WS_fd_set *ws_readfds, } timeout = torig - (tv2.tv_sec * 1000) - (tv2.tv_usec + 999) / 1000; - if (timeout <= 0) break; + if (timeout <= 0) + { + ret = 0; + break; + } } else break; } release_poll_fds( ws_readfds, ws_writefds, ws_exceptfds, pollfds );

1 0

Andrew Cook : ntdll: Return success for JobObjectBasicUIRestrictions.
by Alexandre Julliard April 6, 2015

April 6, 2015

Module: wine Branch: master Commit: 4113fd875c4eaf1fe5d05080f7059c641572a5c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4113fd875c4eaf1fe5d05080f… Author: Andrew Cook <ariscop(a)gmail.com> Date: Sun Apr 5 07:04:25 2015 +1000 ntdll: Return success for JobObjectBasicUIRestrictions. --- dlls/ntdll/sync.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index a4df88a..5db736e 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -634,7 +634,7 @@ NTSTATUS WINAPI NtQueryInformationJobObject( HANDLE handle, JOBOBJECTINFOCLASS c */ NTSTATUS WINAPI NtSetInformationJobObject( HANDLE handle, JOBOBJECTINFOCLASS class, PVOID info, ULONG len ) { - NTSTATUS status = STATUS_SUCCESS; + NTSTATUS status = STATUS_NOT_IMPLEMENTED; JOBOBJECT_BASIC_LIMIT_INFORMATION *basic_limit; ULONG info_size = sizeof(JOBOBJECT_BASIC_LIMIT_INFORMATION); DWORD limit_flags = JOB_OBJECT_BASIC_LIMIT_VALID_FLAGS; @@ -683,9 +683,11 @@ NTSTATUS WINAPI NtSetInformationJobObject( HANDLE handle, JOBOBJECTINFOCLASS cla SERVER_END_REQ; break; + case JobObjectBasicUIRestrictions: + status = STATUS_SUCCESS; + /* fallthrough */ default: FIXME( "stub: %p %u %p %u\n", handle, class, info, len ); - return STATUS_NOT_IMPLEMENTED; } return status;

1 0

Mark Harmstone : uxtheme: Fix off-by-one error in array size.
by Alexandre Julliard April 6, 2015

April 6, 2015

Module: wine Branch: master Commit: 1a9810b3857487bba14f4a50f6de183a25b5f7a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a9810b3857487bba14f4a50f… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Sat Apr 4 11:35:43 2015 +0100 uxtheme: Fix off-by-one error in array size. --- dlls/uxtheme/msstyles.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/uxtheme/msstyles.c b/dlls/uxtheme/msstyles.c index 8205a12..780751b 100644 --- a/dlls/uxtheme/msstyles.c +++ b/dlls/uxtheme/msstyles.c @@ -674,8 +674,8 @@ static PTHEME_PROPERTY MSSTYLES_AddMetric(PTHEME_FILE tf, int iPropertyPrimitive struct PARSECOLORSTATE { int colorCount; - int colorElements[TMT_LASTCOLOR-TMT_FIRSTCOLOR]; - COLORREF colorRgb[TMT_LASTCOLOR-TMT_FIRSTCOLOR]; + int colorElements[TMT_LASTCOLOR-TMT_FIRSTCOLOR+1]; + COLORREF colorRgb[TMT_LASTCOLOR-TMT_FIRSTCOLOR+1]; int captionColors; };

1 0

Nikolay Sivov : ole32: Remove a couple of interface casts.
by Alexandre Julliard April 6, 2015

April 6, 2015

Module: wine Branch: master Commit: 961b1a270f709264ba3d32345ec7fedb1247efc1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=961b1a270f709264ba3d32345… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Apr 4 14:37:07 2015 +0300 ole32: Remove a couple of interface casts. --- dlls/ole32/compobj.c | 4 ++-- dlls/ole32/defaulthandler.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index d842aaf..762f011 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -4952,8 +4952,8 @@ HRESULT WINAPI CoGetObjectContext(REFIID riid, void **ppv) else context->apttype = APTTYPE_STA; - hr = IUnknown_QueryInterface((IUnknown *)&context->IComThreadingInfo_iface, riid, ppv); - IUnknown_Release((IUnknown *)&context->IComThreadingInfo_iface); + hr = IComThreadingInfo_QueryInterface(&context->IComThreadingInfo_iface, riid, ppv); + IComThreadingInfo_Release(&context->IComThreadingInfo_iface); return hr; } diff --git a/dlls/ole32/defaulthandler.c b/dlls/ole32/defaulthandler.c index 5e89977..913d4af 100644 --- a/dlls/ole32/defaulthandler.c +++ b/dlls/ole32/defaulthandler.c @@ -2185,7 +2185,7 @@ HRESULT HandlerCF_Create(REFCLSID rclsid, REFIID riid, LPVOID *ppv) This->refs = 0; This->clsid = *rclsid; - hr = IUnknown_QueryInterface((IUnknown *)&This->IClassFactory_iface, riid, ppv); + hr = IClassFactory_QueryInterface(&This->IClassFactory_iface, riid, ppv); if (FAILED(hr)) HeapFree(GetProcessHeap(), 0, This);

1 0

Mark Harmstone : include: Add MUI constants to winnls.h.
by Alexandre Julliard April 6, 2015

April 6, 2015

Module: wine Branch: master Commit: 547fcead1ffce42ab4831510c4e3e4f9d5fa48b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=547fcead1ffce42ab4831510c… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Fri Apr 3 12:12:02 2015 +0100 include: Add MUI constants to winnls.h. --- include/winnls.h | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/include/winnls.h b/include/winnls.h index 3dacc09..b1ce0cd 100644 --- a/include/winnls.h +++ b/include/winnls.h @@ -574,6 +574,36 @@ static const WCHAR LOCALE_NAME_SYSTEM_DEFAULT[] = {'!','s','y','s','-','d','e',' #define IDN_ALLOW_UNASSIGNED 0x1 #define IDN_USE_STD3_ASCII_RULES 0x2 +/* MUI defines. */ +#define MUI_LANGUAGE_ID 0x04 +#define MUI_LANGUAGE_NAME 0x08 +#define MUI_MERGE_SYSTEM_FALLBACK 0x10 +#define MUI_MERGE_USER_FALLBACK 0x20 +#define MUI_UI_FALLBACK MUI_MERGE_SYSTEM_FALLBACK | MUI_MERGE_USER_FALLBACK +#define MUI_THREAD_LANGUAGES 0x40 +#define MUI_CONSOLE_FILTER 0x100 +#define MUI_COMPLEX_SCRIPT_FILTER 0x200 +#define MUI_RESET_FILTERS 0x001 +#define MUI_USER_PREFERRED_UI_LANGUAGES 0x10 +#define MUI_USE_INSTALLED_LANGUAGES 0x20 +#define MUI_USE_SEARCH_ALL_LANGUAGES 0x40 +#define MUI_LANG_NEUTRAL_PE_FILE 0x100 +#define MUI_NON_LANG_NEUTRAL_FILE 0x200 +#define MUI_MACHINE_LANGUAGE_SETTINGS 0x400 +#define MUI_FILETYPE_NOT_LANGUAGE_NEUTRAL 0x001 +#define MUI_FILETYPE_LANGUAGE_NEUTRAL_MAIN 0x002 +#define MUI_FILETYPE_LANGUAGE_NEUTRAL_MUI 0x004 +#define MUI_QUERY_TYPE 0x001 +#define MUI_QUERY_CHECKSUM 0x002 +#define MUI_QUERY_LANGUAGE_NAME 0x004 +#define MUI_QUERY_RESOURCE_TYPES 0x008 +#define MUI_FILEINFO_VERSION 0x001 +#define MUI_FULL_LANGUAGE 0x01 +#define MUI_PARTIAL_LANGUAGE 0x02 +#define MUI_LIP_LANGUAGE 0x04 +#define MUI_LANGUAGE_INSTALLED 0x20 +#define MUI_LANGUAGE_LICENSED 0x40 + /* Types */

1 0

Andrew Eikum : gdiplus: Avoid unnecessary pre-multiplied alpha conversions in GdipDrawImagePointsRect.
by Alexandre Julliard April 6, 2015

April 6, 2015

Module: wine Branch: master Commit: 1d5914b77784de4118f4df3f6de6c6792b104b75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d5914b77784de4118f4df3f6… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Apr 3 14:26:35 2015 -0500 gdiplus: Avoid unnecessary pre-multiplied alpha conversions in GdipDrawImagePointsRect. We can avoid doing a pre-multiplied alpha conversion by detecting whether we need to perform any graphics operations ahead of time. --- dlls/gdiplus/gdiplus_private.h | 20 +++++++++++++ dlls/gdiplus/graphics.c | 66 ++++++++++++++++++++++++++++-------------- 2 files changed, 65 insertions(+), 21 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1d5914b77784de4118f4d…

1 0

Alexandre Julliard : ws2_32: Include wsnwlink.h even without IPX support.
by Alexandre Julliard April 6, 2015

April 6, 2015

Module: wine Branch: master Commit: 125b079f6015686d23982ea3e58580758a393cae URL: http://source.winehq.org/git/wine.git/?a=commit;h=125b079f6015686d23982ea3e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Apr 4 11:55:32 2015 +0900 ws2_32: Include wsnwlink.h even without IPX support. --- dlls/ws2_32/socket.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 09c8416..d8d724b 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -146,6 +146,7 @@ #include "ws2tcpip.h" #include "ws2spi.h" #include "wsipx.h" +#include "wsnwlink.h" #include "wshisotp.h" #include "mstcpip.h" #include "af_irda.h" @@ -157,10 +158,6 @@ #include "wine/exception.h" #include "wine/unicode.h" -#ifdef HAS_IPX -# include "wsnwlink.h" -#endif - #if defined(linux) && !defined(IP_UNICAST_IF) #define IP_UNICAST_IF 50 #endif

1 0

Alexandre Julliard : Wine release 1.7.40
by Alexandre Julliard April 3, 2015

April 3, 2015

Module: website Branch: master Commit: 5029e9d69eacc18b4de8ccd39b4790ef6f6c216f URL: http://source.winehq.org/git/website.git/?a=commit;h=5029e9d69eacc18b4de8cc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 3 22:58:22 2015 +0900 Wine release 1.7.40 --- news/en/2015040301.xml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/news/en/2015040301.xml b/news/en/2015040301.xml new file mode 100644 index 0000000..036e32d --- /dev/null +++ b/news/en/2015040301.xml @@ -0,0 +1,18 @@ +<news> +<date>April 3, 2015</date> +<title>Wine 1.7.40 Released</title> +<body> + The Wine development release 1.7.40 is now available. + <a href="{$root}/announce/1.7.40">What's new</a> in this release: +<ul> + <li>Support for kernel job objects.</li> + <li>Various fixes to the ListView control.</li> + <li>Better support for OOB data in Windows Sockets.</li> + <li>Support for DIB images in the OLE data cache.</li> + <li>Improved support for MSI patches.</li> + <li>Some fixes for ACL file permissions.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.40.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-1.7.40 : Alexandre Julliard : Release 1.7.40
by Alexandre Julliard April 3, 2015

April 3, 2015

Module: wine Branch: refs/tags/wine-1.7.40 Tag: 63539596fdc3c7381b9856dde20c99f740b6d9ae URL: http://source.winehq.org/git/wine.git/?a=tag;h=63539596fdc3c7381b9856dde20c… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 3 22:56:34 2015 +0900 Release 1.7.40

1 0

Alexandre Julliard : Release 1.7.40.
by Alexandre Julliard April 3, 2015

April 3, 2015

Module: wine Branch: master Commit: 22b6a2c01d8551a8fb753bc41eb36ad370840176 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22b6a2c01d8551a8fb753bc41… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 3 22:56:33 2015 +0900 Release 1.7.40. --- ANNOUNCE | 865 +++++++++++++++++++++++++++++++------------------------------- AUTHORS | 4 + VERSION | 2 +- configure | 18 +- 4 files changed, 444 insertions(+), 445 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=22b6a2c01d8551a8fb753…

1 0