April 2017 - Wine-commits - list.winehq.org

Michael Stefaniuc : Release 2.0.1
by Alexandre Julliard 20 Apr '17

20 Apr '17

Module: wine Branch: stable Commit: 476376e16873ba711be5525a28ad0c2f67bed43c URL: http://source.winehq.org/git/wine.git/?a=commit;h=476376e16873ba711be5525a2… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Mar 27 23:56:06 2017 +0200 Release 2.0.1 Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 527 ++++++++++++++++++++++++-------------------------------------- AUTHORS | 4 + VERSION | 2 +- configure | 18 +-- 4 files changed, 221 insertions(+), 330 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=476376e16873ba711be55…

1 0

Tag wine-2.0.1 : Alexandre Julliard : Release 2.0.1
by Alexandre Julliard 20 Apr '17

20 Apr '17

Module: wine Branch: refs/tags/wine-2.0.1 Tag: 7be0d76a0b5631249caf6b65c468d3707bbd8cdb URL: http://source.winehq.org/git/wine.git/?a=tag;h=7be0d76a0b5631249caf6b65c468… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 20 19:32:33 2017 +0200 Release 2.0.1

1 0

Alistair Leslie-Hughes : include: Add dhcpcsdk.h.
by Alexandre Julliard 20 Apr '17

20 Apr '17

Module: wine Branch: stable Commit: bfe71e63769f640dfb1650e470d0d3a4c33bf8fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfe71e63769f640dfb1650e47… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Feb 2 06:53:17 2017 +0000 include: Add dhcpcsdk.h. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit c84e6fb3e50946fa235d69e0275ea6ace77a013b) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- include/Makefile.in | 1 + include/dhcpcsdk.h | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 401b02b..9f615cd 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -313,6 +313,7 @@ HEADER_SRCS = \ devguid.h \ devpkey.h \ devpropdef.h \ + dhcpcsdk.h \ difxapi.h \ digitalv.h \ dinput.h \ diff --git a/include/dhcpcsdk.h b/include/dhcpcsdk.h new file mode 100644 index 0000000..93c7af6 --- /dev/null +++ b/include/dhcpcsdk.h @@ -0,0 +1,50 @@ +/* + * Copyright (C) 2017 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#ifndef _DHCPCSDK_ +#define _DHCPCSDK_ + +typedef struct _DHCPAPI_PARAMS +{ + ULONG Flags; + ULONG OptionId; + BOOL IsVendor; + BYTE *Data; + DWORD nBytesData; +} DHCPAPI_PARAMS, *PDHCPAPI_PARAMS, *LPDHCPAPI_PARAMS; + +typedef struct _DHCPAPI_PARAMS DHCPCAPI_PARAMS, *PDHCPCAPI_PARAMS, *LPDHCPCAPI_PARAMS; + +typedef struct _DHCPCAPI_PARAMS_ARARAY +{ + ULONG nParams; + LPDHCPCAPI_PARAMS Params; +} DHCPCAPI_PARAMS_ARRAY, *PDHCPCAPI_PARAMS_ARRAY, *LPDHCPCAPI_PARAMS_ARRAY; + +typedef struct _DHCPCAPI_CLASSID +{ + ULONG Flags; + BYTE *Data; + ULONG nBytesData; +} DHCPCAPI_CLASSID, *PDHCPCAPI_CLASSID, *LPDHCPCAPI_CLASSID; + + +DWORD WINAPI DhcpRequestParams( DWORD flags, void *reserved, WCHAR *adaptername, DHCPCAPI_CLASSID *classid, + DHCPCAPI_PARAMS_ARRAY sendparams, DHCPCAPI_PARAMS_ARRAY recdparams, + BYTE *buffer, DWORD *size, WCHAR *requestidstr ); + +#endif

1 0

Austin English : dhcpsvc: Add DhcpRequestParams stub.
by Alexandre Julliard 20 Apr '17

20 Apr '17

Module: wine Branch: stable Commit: 232adfc880c08146455850e9d7164bd926e4a0a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=232adfc880c08146455850e9d… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Feb 2 06:53:30 2017 +0000 dhcpsvc: Add DhcpRequestParams stub. Based on a patch by Mike Ellery. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit a2ff4f37fd10f95e8ebcd18cbe2fd477ba18523c) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dhcpcsvc/dhcpcsvc.c | 10 ++++++++++ dlls/dhcpcsvc/dhcpcsvc.spec | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/dhcpcsvc/dhcpcsvc.c b/dlls/dhcpcsvc/dhcpcsvc.c index 3600680..20ff589 100644 --- a/dlls/dhcpcsvc/dhcpcsvc.c +++ b/dlls/dhcpcsvc/dhcpcsvc.c @@ -19,6 +19,7 @@ #include <stdarg.h> #include "windef.h" #include "winbase.h" +#include "dhcpcsdk.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(dhcpcsvc); @@ -37,3 +38,12 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) } return TRUE; } + +DWORD WINAPI DhcpRequestParams( DWORD flags, void *reserved, WCHAR *adaptername, DHCPCAPI_CLASSID *classid, + DHCPCAPI_PARAMS_ARRAY sendparams, DHCPCAPI_PARAMS_ARRAY recdparams, + BYTE *buffer, DWORD *size, WCHAR *requestidstr ) +{ + FIXME("(%08x, %p, %s, %p, %u, %u, %p, %p, %s): stub\n", flags, reserved, debugstr_w(adaptername), classid, + sendparams.nParams, recdparams.nParams, buffer, size, debugstr_w(requestidstr)); + return ERROR_SUCCESS; +} diff --git a/dlls/dhcpcsvc/dhcpcsvc.spec b/dlls/dhcpcsvc/dhcpcsvc.spec index 97194a6..3e85cb2 100644 --- a/dlls/dhcpcsvc/dhcpcsvc.spec +++ b/dlls/dhcpcsvc/dhcpcsvc.spec @@ -31,7 +31,7 @@ @ stub DhcpRenewIpAddressLeaseEx @ stub DhcpRequestCachedParams @ stub DhcpRequestOptions -@ stub DhcpRequestParams +@ stdcall DhcpRequestParams(long ptr wstr ptr int64 int64 ptr ptr wstr) @ stub DhcpSetMSFTVendorSpecificOptions @ stub DhcpStaticRefreshParams @ stub DhcpUndoRequestParams

1 0

Alex Henrie : comdlg32: Don' t crash if an IShellFolder could not be created.
by Alexandre Julliard 20 Apr '17

20 Apr '17

Module: wine Branch: stable Commit: 0a2abcee3d76f1e88cbb21c7f9d542a8e2d5c6a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a2abcee3d76f1e88cbb21c7f… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Feb 14 00:00:48 2017 -0700 comdlg32: Don't crash if an IShellFolder could not be created. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit e07d20f3f39220d5f1d2a2e5c85cc4d624060f2f) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comdlg32/filedlg.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index d0d00b3..bcae7d3 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -2951,7 +2951,8 @@ static void FILEDLG95_SHELL_Clean(HWND hwnd) IShellView_DestroyViewWindow(fodInfos->Shell.FOIShellView); IShellView_Release(fodInfos->Shell.FOIShellView); } - IShellFolder_Release(fodInfos->Shell.FOIShellFolder); + if (fodInfos->Shell.FOIShellFolder) + IShellFolder_Release(fodInfos->Shell.FOIShellFolder); IShellBrowser_Release(fodInfos->Shell.FOIShellBrowser); if (fodInfos->Shell.FOIDataObject) IDataObject_Release(fodInfos->Shell.FOIDataObject);

1 0

Henri Verbeet : wined3d: Allow decompression blits on system memory resources in arbfp_blit_supported ().
by Alexandre Julliard 20 Apr '17

20 Apr '17

Module: wine Branch: stable Commit: 1fd7e669b3fd95d4dcde6dbc70bdf5806c2b93ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fd7e669b3fd95d4dcde6dbc7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 8 16:46:34 2017 +0100 wined3d: Allow decompression blits on system memory resources in arbfp_blit_supported(). In general we prefer to do blits between system memory resources on the CPU, but decompressing DXTn formats in particular is problematic. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit f576e5c02857a506e63c33e3303e2a0a4bc24e1a) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 210b2f9..7e30aa3 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7885,6 +7885,7 @@ static BOOL arbfp_blit_supported(const struct wined3d_gl_info *gl_info, const RECT *dst_rect, DWORD dst_usage, enum wined3d_pool dst_pool, const struct wined3d_format *dst_format) { enum complex_fixup src_fixup; + BOOL decompress; if (!gl_info->supported[ARB_FRAGMENT_PROGRAM]) return FALSE; @@ -7907,7 +7908,9 @@ static BOOL arbfp_blit_supported(const struct wined3d_gl_info *gl_info, return FALSE; } - if (src_pool == WINED3D_POOL_SYSTEM_MEM || dst_pool == WINED3D_POOL_SYSTEM_MEM) + decompress = src_format && (src_format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_COMPRESSED) + && !(dst_format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_COMPRESSED); + if (!decompress && (dst_pool == WINED3D_POOL_SYSTEM_MEM || src_pool == WINED3D_POOL_SYSTEM_MEM)) return FALSE; src_fixup = get_complex_fixup(src_format->color_fixup);

1 0

Henri Verbeet : wined3d: Disallow upload conversion from compressed formats in surface_convert_format ().
by Alexandre Julliard 20 Apr '17

20 Apr '17

Module: wine Branch: stable Commit: 9e47cf696bb499f99f9f3c6437dafba34bc80180 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e47cf696bb499f99f9f3c643… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 8 16:46:36 2017 +0100 wined3d: Disallow upload conversion from compressed formats in surface_convert_format(). The underlying issue is that glCompressedTexSubImage2D() needs the upload format to match the texture's internal format. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 5a6efe632918fd18758897c39910d52791d46053) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/surface.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 18b008c..7d26709 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1519,7 +1519,8 @@ static struct wined3d_texture *surface_convert_format(struct wined3d_texture *sr if (!(conv = find_converter(src_format->id, dst_format->id)) && (!device->d3d_initialized || !is_identity_fixup(src_format->color_fixup) || src_format->convert - || !is_identity_fixup(dst_format->color_fixup) || dst_format->convert)) + || !is_identity_fixup(dst_format->color_fixup) || dst_format->convert + || (src_format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_COMPRESSED))) { FIXME("Cannot find a conversion function from format %s to %s.\n", debug_d3dformat(src_format->id), debug_d3dformat(dst_format->id));

1 0

Jefferson Carpenter : wmvcore: Implement WMCreateReaderPriv.
by Alexandre Julliard 20 Apr '17

20 Apr '17

Module: wine Branch: stable Commit: 8e431aaf351d28f3a298bc861bcec02eda99e6ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e431aaf351d28f3a298bc861… Author: Jefferson Carpenter <jeffersoncarpenter2(a)gmail.com> Date: Wed Feb 1 21:59:19 2017 -0600 wmvcore: Implement WMCreateReaderPriv. Signed-off-by: Jefferson Carpenter <jeffersoncarpenter2(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 7b70ebac6deb60d9a7c4d561a2768e3a34008a72) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wmvcore/wmvcore.spec | 2 +- dlls/wmvcore/wmvcore_main.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/wmvcore/wmvcore.spec b/dlls/wmvcore/wmvcore.spec index a3f23eb..bb17683 100644 --- a/dlls/wmvcore/wmvcore.spec +++ b/dlls/wmvcore/wmvcore.spec @@ -10,7 +10,7 @@ @ stub WMCreateIndexer @ stdcall WMCreateProfileManager(ptr) @ stdcall WMCreateReader(ptr long ptr) -@ stub WMCreateReaderPriv +@ stdcall WMCreateReaderPriv(ptr) @ stdcall WMCreateSyncReader(ptr long ptr) @ stdcall WMCreateWriter(ptr ptr) @ stub WMCreateWriterFileSink diff --git a/dlls/wmvcore/wmvcore_main.c b/dlls/wmvcore/wmvcore_main.c index 741dd70c..d196079 100644 --- a/dlls/wmvcore/wmvcore_main.c +++ b/dlls/wmvcore/wmvcore_main.c @@ -667,6 +667,11 @@ HRESULT WINAPI WMCreateReader(IUnknown *reserved, DWORD rights, IWMReader **ret_ return S_OK; } +HRESULT WINAPI WMCreateReaderPriv(IWMReader **ret_reader) +{ + return WMCreateReader(NULL, 0, ret_reader); +} + HRESULT WINAPI WMCreateSyncReader(IUnknown *pcert, DWORD rights, IWMSyncReader **syncreader) { FIXME("(%p, %x, %p): stub\n", pcert, rights, syncreader);

1 0

Louis Lenders : wmvcore: Add version resource.
by Alexandre Julliard 20 Apr '17

20 Apr '17

Module: wine Branch: stable Commit: 04460ab0734c1577441e5dabc94ebc8bf63ba3b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=04460ab0734c1577441e5dabc… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Wed Mar 1 19:53:06 2017 +0100 wmvcore: Add version resource. Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 55fa550a02991b94c2981a630746a9fd45f5dc84) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wmvcore/Makefile.in | 2 ++ dlls/wmvcore/version.rc | 26 ++++++++++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/dlls/wmvcore/Makefile.in b/dlls/wmvcore/Makefile.in index bec1032..ba3539b 100644 --- a/dlls/wmvcore/Makefile.in +++ b/dlls/wmvcore/Makefile.in @@ -4,3 +4,5 @@ IMPORTS = kernel32 C_SRCS = \ wmvcore_main.c \ writer.c + +RC_SRCS = version.rc diff --git a/dlls/wmvcore/version.rc b/dlls/wmvcore/version.rc new file mode 100644 index 0000000..445a399 --- /dev/null +++ b/dlls/wmvcore/version.rc @@ -0,0 +1,26 @@ +/* + * Copyright 2017 Louis Lenders + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define WINE_FILEDESCRIPTION_STR "Wine Media Playback dll" +#define WINE_FILENAME_STR "wmvcore.dll" +#define WINE_FILEVERSION 12,0,7601,17514 +#define WINE_FILEVERSION_STR "12.0.7601.17514" +#define WINE_PRODUCTVERSION 12,0,7601,17514 +#define WINE_PRODUCTVERSION_STR "12.0.7601.17514" + +#include "wine/wine_common_ver.rc"

1 0

Nikolay Sivov : comdlg32: Expand initial directory path for file open dialog.
by Alexandre Julliard 20 Apr '17

20 Apr '17

Module: wine Branch: stable Commit: cf4fb7291d9bc315a8ba85087dd505b66c28f371 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf4fb7291d9bc315a8ba85087… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 21 15:35:15 2017 +0300 comdlg32: Expand initial directory path for file open dialog. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit aef84332a2dc3a05a3e1b433158b2e91abc48ed0) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comdlg32/filedlg.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index bcae7d3..6bedf40 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -508,15 +508,17 @@ static BOOL GetFileDialog95W(LPOPENFILENAMEW ofn,UINT iDlgType) else fodInfos.filename = NULL; + fodInfos.initdir = NULL; if(ofn->lpstrInitialDir) { /* fodInfos.initdir = strdupW(ofn->lpstrInitialDir); */ - DWORD len = lstrlenW(ofn->lpstrInitialDir)+1; - fodInfos.initdir = MemAlloc(len*sizeof(WCHAR)); - memcpy(fodInfos.initdir,ofn->lpstrInitialDir,len*sizeof(WCHAR)); + DWORD len = ExpandEnvironmentStringsW(ofn->lpstrInitialDir, NULL, 0); + if (len) + { + fodInfos.initdir = MemAlloc(len * sizeof(WCHAR)); + ExpandEnvironmentStringsW(ofn->lpstrInitialDir, fodInfos.initdir, len); + } } - else - fodInfos.initdir = NULL; /* save current directory */ if (ofn->Flags & OFN_NOCHANGEDIR)

1 0