July 2016 - Wine-commits - list.winehq.org

Alistair Leslie-Hughes : hnetcfg: Add stubbed INetFwPolicy2 interface.
by Alexandre Julliard 26 Jul '16

26 Jul '16

Module: wine Branch: master Commit: 1abf294e1d7ae8001434005aaea5002172d78a68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1abf294e1d7ae8001434005aa… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Jul 22 07:47:13 2016 +0000 hnetcfg: Add stubbed INetFwPolicy2 interface. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hnetcfg/apps.c | 1 + dlls/hnetcfg/hnetcfg.c | 5 + dlls/hnetcfg/hnetcfg.idl | 8 + dlls/hnetcfg/hnetcfg_private.h | 2 + dlls/hnetcfg/policy.c | 331 +++++++++++++++++++++++++++++++++++++++++ 5 files changed, 347 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1abf294e1d7ae80014340…

1 0

Alistair Leslie-Hughes : hnetcfg/tests: Add initial tests.
by Alexandre Julliard 26 Jul '16

26 Jul '16

Module: wine Branch: master Commit: 7ffb4a912cd88ad848c716d1b1f5b51b8970071f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ffb4a912cd88ad848c716d1b… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Jul 22 07:47:27 2016 +0000 hnetcfg/tests: Add initial tests. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/hnetcfg/tests/Makefile.in | 5 +++ dlls/hnetcfg/tests/policy.c | 90 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 97 insertions(+) diff --git a/configure b/configure index a6442c7..928ff66 100755 --- a/configure +++ b/configure @@ -17734,6 +17734,7 @@ wine_fn_config_dll hidclass.sys enable_hidclass_sys implib hidclass wine_fn_config_dll hlink enable_hlink clean,implib wine_fn_config_test dlls/hlink/tests hlink_test wine_fn_config_dll hnetcfg enable_hnetcfg clean +wine_fn_config_test dlls/hnetcfg/tests hnetcfg_test wine_fn_config_dll httpapi enable_httpapi wine_fn_config_dll iccvid enable_iccvid clean wine_fn_config_dll icmp enable_icmp diff --git a/configure.ac b/configure.ac index 0a42855..1cdba77 100644 --- a/configure.ac +++ b/configure.ac @@ -2968,6 +2968,7 @@ WINE_CONFIG_DLL(hidclass.sys,,[implib],[hidclass]) WINE_CONFIG_DLL(hlink,,[clean,implib]) WINE_CONFIG_TEST(dlls/hlink/tests) WINE_CONFIG_DLL(hnetcfg,,[clean]) +WINE_CONFIG_TEST(dlls/hnetcfg/tests) WINE_CONFIG_DLL(httpapi) WINE_CONFIG_DLL(iccvid,,[clean]) WINE_CONFIG_DLL(icmp) diff --git a/dlls/hnetcfg/tests/Makefile.in b/dlls/hnetcfg/tests/Makefile.in new file mode 100644 index 0000000..aa4062a --- /dev/null +++ b/dlls/hnetcfg/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = hnetcfg.dll +IMPORTS = ole32 uuid + +C_SRCS = \ + policy.c diff --git a/dlls/hnetcfg/tests/policy.c b/dlls/hnetcfg/tests/policy.c new file mode 100644 index 0000000..a3ed4b2 --- /dev/null +++ b/dlls/hnetcfg/tests/policy.c @@ -0,0 +1,90 @@ +/* + * Copyright 2016 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 + */ +#define COBJMACROS +#include <stdio.h> + +#include "windows.h" +#include "ole2.h" +#include "oleauto.h" +#include "olectl.h" +#include "dispex.h" + +#include "wine/test.h" + +#include "netfw.h" + +static void test_interfaces(void) +{ + INetFwMgr *manager; + INetFwPolicy *policy; + INetFwPolicy2 *policy2; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_NetFwMgr, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, + &IID_INetFwMgr, (void**)&manager); + ok(hr == S_OK, "NetFwMgr create failed: %08x\n", hr); + + hr = INetFwMgr_QueryInterface(manager, &IID_INetFwPolicy, (void**)&policy); + ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); + + hr = INetFwMgr_QueryInterface(manager, &IID_INetFwPolicy2, (void**)&policy2); + ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); + + hr = INetFwMgr_get_LocalPolicy(manager, &policy); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = INetFwPolicy_QueryInterface(policy, &IID_INetFwPolicy2, (void**)&policy2); + ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); + + INetFwPolicy_Release(policy); + + hr = CoCreateInstance(&CLSID_NetFwPolicy2, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, + &IID_INetFwPolicy2, (void**)&policy2); + if(hr == S_OK) + { + INetFwPolicy2_Release(policy2); + } + else + win_skip("NetFwPolicy2 object is not supported: %08x\n", hr); + + INetFwMgr_Release(manager); +} + +START_TEST(policy) +{ + INetFwMgr *manager; + HRESULT hr; + + CoInitialize(NULL); + + hr = CoCreateInstance(&CLSID_NetFwMgr, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, + &IID_INetFwMgr, (void**)&manager); + if(FAILED(hr)) + { + win_skip("NetFwMgr object is not supported: %08x\n", hr); + CoUninitialize(); + return; + } + + INetFwMgr_Release(manager); + + test_interfaces(); + + + CoUninitialize(); +}

1 0

Jactry Zeng : shell32: Use remove() instead of rmdir().
by Alexandre Julliard 26 Jul '16

26 Jul '16

Module: wine Branch: master Commit: dad2223ad6df1ed8aa358f7a4ee6f6438a5abe91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dad2223ad6df1ed8aa358f7a4… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Fri Jul 22 15:40:55 2016 +0800 shell32: Use remove() instead of rmdir(). rmdir() will fail when target is a symbolic link. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shellpath.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index cb79d6f..2072814 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -4318,7 +4318,7 @@ static void _SHCreateSymbolicLinks(void) } /* Replace 'My Documents' directory with a symlink or fail silently if not empty. */ - rmdir(pszPersonal); + remove(pszPersonal); symlink(szPersonalTarget, pszPersonal); } else @@ -4374,7 +4374,7 @@ static void _SHCreateSymbolicLinks(void) strcpy(szMyStuffTarget, szPersonalTarget); break; } - rmdir(pszMyStuff); + remove(pszMyStuff); symlink(szMyStuffTarget, pszMyStuff); HeapFree(GetProcessHeap(), 0, pszMyStuff); } @@ -4395,7 +4395,7 @@ static void _SHCreateSymbolicLinks(void) SHGFP_TYPE_DEFAULT, wszTempPath); if (SUCCEEDED(hr) && (pszDesktop = wine_get_unix_file_name(wszTempPath))) { - rmdir(pszDesktop); + remove(pszDesktop); if (xdg_desktop_dir) symlink(xdg_desktop_dir, pszDesktop); else

1 0

Francois Gouget : kernel32/tests: Remove a trailing space from an ok() call message.
by Alexandre Julliard 26 Jul '16

26 Jul '16

Module: wine Branch: master Commit: b54a8dda844a1a43d1dff22eff0ea206be5c630c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b54a8dda844a1a43d1dff22ef… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jul 26 16:52:13 2016 +0200 kernel32/tests: Remove a trailing space from an ok() call message. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/virtual.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index 2a13857..40b1bc9 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -651,7 +651,7 @@ static void test_MapViewOfFile(void) ok( mapping != 0, "OpenFileMapping FILE_MAP_WRITE error %u\n", GetLastError() ); SetLastError(0xdeadbeef); ptr = MapViewOfFile( mapping, FILE_MAP_READ, 0, 0, 0 ); - ok( !ptr, "MapViewOfFile succeeded\n " ); + ok( !ptr, "MapViewOfFile succeeded\n" ); ok( GetLastError() == ERROR_ACCESS_DENIED, "Wrong error %d\n", GetLastError() ); SetLastError(0xdeadbeef); ptr = MapViewOfFile( mapping, FILE_MAP_WRITE, 0, 0, 0 );

1 0

Christian Costa : d3dx9: Implement D3DXCreateTextureShader with stubbed ID3DXTextureShader interface.
by Alexandre Julliard 26 Jul '16

26 Jul '16

Module: wine Branch: master Commit: 8e80ee68370c2acf3e7ce1a2f123278595512888 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e80ee68370c2acf3e7ce1a2f… Author: Christian Costa <titan.costa(a)gmail.com> Date: Thu Jul 21 09:06:29 2016 +0000 d3dx9: Implement D3DXCreateTextureShader with stubbed ID3DXTextureShader interface. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_24/d3dx9_24.spec | 2 +- dlls/d3dx9_25/d3dx9_25.spec | 2 +- dlls/d3dx9_26/d3dx9_26.spec | 2 +- dlls/d3dx9_27/d3dx9_27.spec | 2 +- dlls/d3dx9_28/d3dx9_28.spec | 2 +- dlls/d3dx9_29/d3dx9_29.spec | 2 +- dlls/d3dx9_30/d3dx9_30.spec | 2 +- dlls/d3dx9_31/d3dx9_31.spec | 2 +- dlls/d3dx9_32/d3dx9_32.spec | 2 +- dlls/d3dx9_33/d3dx9_33.spec | 2 +- dlls/d3dx9_34/d3dx9_34.spec | 2 +- dlls/d3dx9_35/d3dx9_35.spec | 2 +- dlls/d3dx9_36/d3dx9_36.spec | 2 +- dlls/d3dx9_36/shader.c | 267 ++++++++++++++++++++++++++++++++++++++++++++ dlls/d3dx9_37/d3dx9_37.spec | 2 +- dlls/d3dx9_38/d3dx9_38.spec | 2 +- dlls/d3dx9_39/d3dx9_39.spec | 2 +- dlls/d3dx9_40/d3dx9_40.spec | 2 +- dlls/d3dx9_41/d3dx9_41.spec | 2 +- dlls/d3dx9_42/d3dx9_42.spec | 2 +- dlls/d3dx9_43/d3dx9_43.spec | 2 +- 21 files changed, 287 insertions(+), 20 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8e80ee68370c2acf3e7ce…

1 0

Christian Costa : include: Fix prototypes of D3DXFillXXXTextureTx for d3dx9.
by Alexandre Julliard 26 Jul '16

26 Jul '16

Module: wine Branch: master Commit: 607da49d473166452741d76d50b6dd36b554a9ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=607da49d473166452741d76d5… Author: Christian Costa <titan.costa(a)gmail.com> Date: Thu Jul 21 09:06:42 2016 +0000 include: Fix prototypes of D3DXFillXXXTextureTx for d3dx9. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d3dx9tex.h | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/include/d3dx9tex.h b/include/d3dx9tex.h index 542460f..77f2d35 100644 --- a/include/d3dx9tex.h +++ b/include/d3dx9tex.h @@ -337,12 +337,9 @@ HRESULT WINAPI D3DXFillTexture(struct IDirect3DTexture9 *texture, LPD3DXFILL2D f HRESULT WINAPI D3DXFillCubeTexture(struct IDirect3DCubeTexture9 *cube, LPD3DXFILL3D function, void *data); HRESULT WINAPI D3DXFillVolumeTexture(struct IDirect3DVolumeTexture9 *volume, LPD3DXFILL3D function, void *data); -HRESULT WINAPI D3DXFillTextureTX(struct IDirect3DTexture9 *texture, const DWORD *function, - const D3DXVECTOR4 *constants, UINT numconstants); -HRESULT WINAPI D3DXFillCubeTextureTX(struct IDirect3DCubeTexture9 *cube, const DWORD *function, - const D3DXVECTOR4 *constants, UINT numconstants); -HRESULT WINAPI D3DXFillVolumeTextureTX(struct IDirect3DVolumeTexture9 *volume, const DWORD *function, - const D3DXVECTOR4 *constants, UINT numconstants); +HRESULT WINAPI D3DXFillTextureTX(struct IDirect3DTexture9 *texture, ID3DXTextureShader *texture_shader); +HRESULT WINAPI D3DXFillCubeTextureTX(struct IDirect3DCubeTexture9 *cube, ID3DXTextureShader *texture_shader); +HRESULT WINAPI D3DXFillVolumeTextureTX(struct IDirect3DVolumeTexture9 *volume, ID3DXTextureShader *texture_shader); HRESULT WINAPI D3DXComputeNormalMap(IDirect3DTexture9 *texture, IDirect3DTexture9 *srctexture, const PALETTEENTRY *srcpalette, DWORD flags, DWORD channel, float amplitude);

1 0

Andrey Gusev : include: Add missing include directive in d3dx10tex.h.
by Alexandre Julliard 26 Jul '16

26 Jul '16

Module: wine Branch: master Commit: 4504b52507add4a91afcb4e1923fcc9ef2beb148 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4504b52507add4a91afcb4e19… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Fri Jul 22 16:33:18 2016 +0300 include: Add missing include directive in d3dx10tex.h. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d3dx10tex.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/d3dx10tex.h b/include/d3dx10tex.h index a0d5aa7..25ad490 100644 --- a/include/d3dx10tex.h +++ b/include/d3dx10tex.h @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "d3dx10.h" + #ifndef __D3DX10TEX_H__ #define __D3DX10TEX_H__

1 0

Andrey Gusev : include: Improve include directives in d3dx9* headers.
by Alexandre Julliard 26 Jul '16

26 Jul '16

Module: wine Branch: master Commit: 066330d4938a15765290b33214599520481cb976 URL: http://source.winehq.org/git/wine.git/?a=commit;h=066330d4938a15765290b3321… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Fri Jul 22 16:36:24 2016 +0300 include: Improve include directives in d3dx9* headers. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d3dx9core.h | 2 +- include/d3dx9effect.h | 2 +- include/d3dx9math.h | 4 ++-- include/d3dx9mesh.h | 2 +- include/d3dx9tex.h | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/d3dx9core.h b/include/d3dx9core.h index 5233317..a04bced 100644 --- a/include/d3dx9core.h +++ b/include/d3dx9core.h @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <d3dx9.h> +#include "d3dx9.h" #ifndef __WINE_D3DX9CORE_H #define __WINE_D3DX9CORE_H diff --git a/include/d3dx9effect.h b/include/d3dx9effect.h index 3f527ed..8235794 100644 --- a/include/d3dx9effect.h +++ b/include/d3dx9effect.h @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <d3dx9.h> +#include "d3dx9.h" #ifndef __D3DX9EFFECT_H__ #define __D3DX9EFFECT_H__ diff --git a/include/d3dx9math.h b/include/d3dx9math.h index 2c41b73..bf03ca3 100644 --- a/include/d3dx9math.h +++ b/include/d3dx9math.h @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <d3dx9.h> +#include "d3dx9.h" #ifndef __D3DX9MATH_H__ #define __D3DX9MATH_H__ @@ -469,6 +469,6 @@ HRESULT WINAPI D3DXCreateMatrixStack(DWORD flags, ID3DXMatrixStack **stack); } #endif -#include <d3dx9math.inl> +#include "d3dx9math.inl" #endif /* __D3DX9MATH_H__ */ diff --git a/include/d3dx9mesh.h b/include/d3dx9mesh.h index 47b0a3f..c9a2fd5 100644 --- a/include/d3dx9mesh.h +++ b/include/d3dx9mesh.h @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <d3dx9.h> +#include "d3dx9.h" #ifndef __WINE_D3DX9MESH_H #define __WINE_D3DX9MESH_H diff --git a/include/d3dx9tex.h b/include/d3dx9tex.h index 77f2d35..3883165 100644 --- a/include/d3dx9tex.h +++ b/include/d3dx9tex.h @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <d3dx9.h> +#include "d3dx9.h" #ifndef __WINE_D3DX9TEX_H #define __WINE_D3DX9TEX_H

1 0

Nikolay Sivov : dbghelp: Recognize DW_FORM_flag_present.
by Alexandre Julliard 26 Jul '16

26 Jul '16

Module: wine Branch: master Commit: 99f56bf78d68684bd066d599792cec19885c9bee URL: http://source.winehq.org/git/wine.git/?a=commit;h=99f56bf78d68684bd066d5997… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jul 26 03:08:17 2016 +0300 dbghelp: Recognize DW_FORM_flag_present. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dwarf.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 655c586..dcbcf0a 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -462,6 +462,7 @@ static void dwarf2_swallow_attribute(dwarf2_traverse_context_t* ctx, switch (abbrev_attr->form) { + case DW_FORM_flag_present: step = 0; break; case DW_FORM_ref_addr: case DW_FORM_addr: step = ctx->word_size; break; case DW_FORM_flag: @@ -509,6 +510,11 @@ static void dwarf2_fill_attr(const dwarf2_parse_context_t* ctx, TRACE("flag<0x%lx>\n", attr->u.uvalue); break; + case DW_FORM_flag_present: + attr->u.uvalue = 1; + TRACE("flag_present\n"); + break; + case DW_FORM_data1: attr->u.uvalue = dwarf2_get_byte(data); TRACE("data1<%lu>\n", attr->u.uvalue);

1 0

Andrew Eikum : winepulse.drv: Downgrade failed server connection message to WARN.
by Alexandre Julliard 26 Jul '16

26 Jul '16

Module: wine Branch: master Commit: 87754283becca7aef8f90af1d584d47ad25d8324 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87754283becca7aef8f90af1d… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Jul 25 13:00:14 2016 -0500 winepulse.drv: Downgrade failed server connection message to WARN. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winepulse.drv/mmdevdrv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index 5bf534e..32db0d1 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -304,7 +304,7 @@ static void pulse_contextcallback(pa_context *c, void *userdata) break; case PA_CONTEXT_FAILED: - ERR("Context failed: %s\n", pa_strerror(pa_context_errno(c))); + WARN("Context failed: %s\n", pa_strerror(pa_context_errno(c))); break; } pthread_cond_signal(&pulse_cond);

1 0