February 2015 - Wine-commits

Vincent Povirk : xmllite: Fix reader_cmp for multiple characters.
by Alexandre Julliard 23 Feb '15

23 Feb '15

Module: wine Branch: master Commit: 8615365945d631df5a3983528963bb2c7a05ff33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8615365945d631df5a3983528… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Feb 20 12:54:32 2015 -0600 xmllite: Fix reader_cmp for multiple characters. --- dlls/xmllite/reader.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index cf89fb7..2aa9d95 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -900,8 +900,20 @@ static inline WCHAR *reader_get_ptr(xmlreader *reader) static int reader_cmp(xmlreader *reader, const WCHAR *str) { + int i=0; const WCHAR *ptr = reader_get_ptr(reader); - return strncmpW(str, ptr, strlenW(str)); + while (str[i]) + { + if (!ptr[i]) + { + reader_more(reader); + ptr = reader_get_ptr(reader); + } + if (str[i] != ptr[i]) + return ptr[i] - str[i]; + i++; + } + return 0; } /* moves cursor n WCHARs forward */

1 0

Alexandre Julliard : Wine release 1.7.37
by Alexandre Julliard 20 Feb '15

20 Feb '15

Module: website Branch: master Commit: 42ee792bdbcad44485848243e2393b2240077d41 URL: http://source.winehq.org/git/website.git/?a=commit;h=42ee792bdbcad444858482… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 20 23:24:55 2015 +0900 Wine release 1.7.37 --- news/en/2015022001.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/en/2015022001.xml b/news/en/2015022001.xml new file mode 100644 index 0000000..509023c --- /dev/null +++ b/news/en/2015022001.xml @@ -0,0 +1,16 @@ +<news> +<date>February 20, 2015</date> +<title>Wine 1.7.37 Released</title> +<body> + The Wine development release 1.7.37 is now available. + <a href="{$root}/announce/1.7.37">What's new</a> in this release: +<ul> + <li>Interface change notifications.</li> + <li>Support for the UTF-7 encoding.</li> + <li>A number of graphical fixes for themed controls.</li> + <li>Wininet now implemented on top of Win32 sockets.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.37.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

Alex Henrie : cryptui: Fix grammar in warning message.
by Alexandre Julliard 20 Feb '15

20 Feb '15

1 0

Andrey Gusev : xapofx1_3: Add stub dll.
by Alexandre Julliard 20 Feb '15

20 Feb '15

Module: wine Branch: master Commit: 1e3f45c2094439db4cac66222d6a83b9d3aa1ff4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e3f45c2094439db4cac66222… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Thu Feb 19 21:04:23 2015 +0200 xapofx1_3: Add stub dll. --- configure | 2 ++ configure.ac | 1 + dlls/xapofx1_3/Makefile.in | 6 ++++++ dlls/xapofx1_3/main.c | 38 ++++++++++++++++++++++++++++++++++++++ dlls/xapofx1_3/version.rc | 26 ++++++++++++++++++++++++++ dlls/xapofx1_3/xapofx1_3.spec | 1 + 6 files changed, 74 insertions(+) diff --git a/configure b/configure index fd639fc..1df598a 100755 --- a/configure +++ b/configure @@ -1325,6 +1325,7 @@ enable_wuapi enable_wuaueng enable_x3daudio1_7 enable_xapofx1_1 +enable_xapofx1_3 enable_xapofx1_4 enable_xapofx1_5 enable_xaudio2_7 @@ -17677,6 +17678,7 @@ wine_fn_config_dll wuapi enable_wuapi clean wine_fn_config_dll wuaueng enable_wuaueng wine_fn_config_dll x3daudio1_7 enable_x3daudio1_7 wine_fn_config_dll xapofx1_1 enable_xapofx1_1 +wine_fn_config_dll xapofx1_3 enable_xapofx1_3 wine_fn_config_dll xapofx1_4 enable_xapofx1_4 wine_fn_config_dll xapofx1_5 enable_xapofx1_5 wine_fn_config_dll xaudio2_7 enable_xaudio2_7 diff --git a/configure.ac b/configure.ac index 97ae4e2..ef58f2d 100644 --- a/configure.ac +++ b/configure.ac @@ -3386,6 +3386,7 @@ WINE_CONFIG_DLL(wuapi,,[clean]) WINE_CONFIG_DLL(wuaueng) WINE_CONFIG_DLL(x3daudio1_7) WINE_CONFIG_DLL(xapofx1_1) +WINE_CONFIG_DLL(xapofx1_3) WINE_CONFIG_DLL(xapofx1_4) WINE_CONFIG_DLL(xapofx1_5) WINE_CONFIG_DLL(xaudio2_7) diff --git a/dlls/xapofx1_3/Makefile.in b/dlls/xapofx1_3/Makefile.in new file mode 100644 index 0000000..3730872 --- /dev/null +++ b/dlls/xapofx1_3/Makefile.in @@ -0,0 +1,6 @@ +MODULE = xapofx1_3.dll + +C_SRCS = \ + main.c + +RC_SRCS = version.rc diff --git a/dlls/xapofx1_3/main.c b/dlls/xapofx1_3/main.c new file mode 100644 index 0000000..6a7f185 --- /dev/null +++ b/dlls/xapofx1_3/main.c @@ -0,0 +1,38 @@ +/* + * Copyright 2015 Andrey Gusev + * + * 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 + */ + +#include "config.h" + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" + +BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) +{ + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(instance); + break; + } + + return TRUE; +} diff --git a/dlls/xapofx1_3/version.rc b/dlls/xapofx1_3/version.rc new file mode 100644 index 0000000..900726b --- /dev/null +++ b/dlls/xapofx1_3/version.rc @@ -0,0 +1,26 @@ +/* + * Copyright 2015 Andrey Gusev + * + * 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 XAPOFX dll" +#define WINE_FILENAME_STR "xapofx1_3.dll" +#define WINE_FILEVERSION 9,26,1590,0 +#define WINE_FILEVERSION_STR "9.26.1590.0" +#define WINE_PRODUCTVERSION 9,26,1590,0 +#define WINE_PRODUCTVERSION_STR "9.26.1590.0" + +#include "wine/wine_common_ver.rc" diff --git a/dlls/xapofx1_3/xapofx1_3.spec b/dlls/xapofx1_3/xapofx1_3.spec new file mode 100644 index 0000000..33269e3 --- /dev/null +++ b/dlls/xapofx1_3/xapofx1_3.spec @@ -0,0 +1 @@ +@ stub CreateFX

1 0

Austin English : x3daudio1_1: Add stub dll.
by Alexandre Julliard 20 Feb '15

20 Feb '15

Module: wine Branch: master Commit: 32c8b79b92f9a9cd2e2a961e8d25b24ba5ccb810 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32c8b79b92f9a9cd2e2a961e8… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Feb 19 17:28:41 2015 -0600 x3daudio1_1: Add stub dll. --- configure | 2 ++ configure.ac | 1 + dlls/x3daudio1_1/Makefile.in | 4 ++++ dlls/x3daudio1_1/main.c | 36 ++++++++++++++++++++++++++++++++++++ dlls/x3daudio1_1/x3daudio1_1.spec | 2 ++ 5 files changed, 45 insertions(+) diff --git a/configure b/configure index 1df598a..1265c86 100755 --- a/configure +++ b/configure @@ -1323,6 +1323,7 @@ enable_wsock32 enable_wtsapi32 enable_wuapi enable_wuaueng +enable_x3daudio1_1 enable_x3daudio1_7 enable_xapofx1_1 enable_xapofx1_3 @@ -17676,6 +17677,7 @@ wine_fn_config_dll wtsapi32 enable_wtsapi32 implib wine_fn_config_test dlls/wtsapi32/tests wtsapi32_test wine_fn_config_dll wuapi enable_wuapi clean wine_fn_config_dll wuaueng enable_wuaueng +wine_fn_config_dll x3daudio1_1 enable_x3daudio1_1 wine_fn_config_dll x3daudio1_7 enable_x3daudio1_7 wine_fn_config_dll xapofx1_1 enable_xapofx1_1 wine_fn_config_dll xapofx1_3 enable_xapofx1_3 diff --git a/configure.ac b/configure.ac index ef58f2d..f611fa5 100644 --- a/configure.ac +++ b/configure.ac @@ -3384,6 +3384,7 @@ WINE_CONFIG_DLL(wtsapi32,,[implib]) WINE_CONFIG_TEST(dlls/wtsapi32/tests) WINE_CONFIG_DLL(wuapi,,[clean]) WINE_CONFIG_DLL(wuaueng) +WINE_CONFIG_DLL(x3daudio1_1) WINE_CONFIG_DLL(x3daudio1_7) WINE_CONFIG_DLL(xapofx1_1) WINE_CONFIG_DLL(xapofx1_3) diff --git a/dlls/x3daudio1_1/Makefile.in b/dlls/x3daudio1_1/Makefile.in new file mode 100644 index 0000000..3d90eaa --- /dev/null +++ b/dlls/x3daudio1_1/Makefile.in @@ -0,0 +1,4 @@ +MODULE = x3daudio1_1.dll + +C_SRCS = \ + main.c diff --git a/dlls/x3daudio1_1/main.c b/dlls/x3daudio1_1/main.c new file mode 100644 index 0000000..9fc9bd2 --- /dev/null +++ b/dlls/x3daudio1_1/main.c @@ -0,0 +1,36 @@ +/* + * Copyright 2015 Austin English + * + * 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 + */ +#include "config.h" +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" + +BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) +{ + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(instance); + break; + } + + return TRUE; +} diff --git a/dlls/x3daudio1_1/x3daudio1_1.spec b/dlls/x3daudio1_1/x3daudio1_1.spec new file mode 100644 index 0000000..9a51f1b --- /dev/null +++ b/dlls/x3daudio1_1/x3daudio1_1.spec @@ -0,0 +1,2 @@ +@ stub X3DAudioCalculate +@ stub X3DAudioInitialize

1 0

Austin English : include: Add msasn1.h.
by Alexandre Julliard 20 Feb '15

20 Feb '15

Module: wine Branch: master Commit: c633cadb4f5a6962f63863fb3d63a56a5c24de3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c633cadb4f5a6962f63863fb3… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Feb 18 14:34:59 2015 -0600 include: Add msasn1.h. --- include/Makefile.in | 1 + include/msasn1.h | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index da674b9..02d5d88 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -411,6 +411,7 @@ SRCDIR_INCLUDES = \ msacm.h \ msacmdlg.h \ msacmdrv.h \ + msasn1.h \ mscat.h \ msdaguid.h \ mshtmcid.h \ diff --git a/include/msasn1.h b/include/msasn1.h new file mode 100644 index 0000000..8172849 --- /dev/null +++ b/include/msasn1.h @@ -0,0 +1,47 @@ +/* + * Copyright (C) 2015 Austin English + * + * 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 __MS_ASN1_H__ +#define __MS_ASN1_H__ + +#ifdef __cplusplus +extern "C" { +#endif + +typedef char ASN1char_t; +typedef signed char ASN1int8_t; +typedef unsigned char ASN1uint8_t; +typedef unsigned short ASN1uint16_t; +typedef signed short ASN1int16_t; +typedef ULONG ASN1uint32_t; +typedef LONG ASN1int32_t; + +typedef ASN1char_t *ASN1ztcharstring_t; +typedef ASN1char16_t *ASN1ztchar16string_t; +typedef ASN1char32_t *ASN1ztchar32string_t; +typedef ASN1int32_t ASN1enum_t; +typedef ASN1uint8_t ASN1octet_t; +typedef ASN1uint8_t ASN1bool_t; +typedef ASN1uint16_t ASN1choice_t; +typedef ASN1uint32_t ASN1magic_t; +typedef ASN1ztcharstring_t ASN1objectdescriptor_t; + +#ifdef __cplusplus +} +#endif + +#endif /* __MS_ASN1_H__ */

1 0

Nikolay Sivov : wshom.ocx: Fix WshShell instance QI behaviour.
by Alexandre Julliard 20 Feb '15

20 Feb '15

Module: wine Branch: master Commit: 366aa9e74eb5f69a4159cbc32618eb166201f969 URL: http://source.winehq.org/git/wine.git/?a=commit;h=366aa9e74eb5f69a4159cbc32… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 19 19:47:32 2015 +0300 wshom.ocx: Fix WshShell instance QI behaviour. --- dlls/wshom.ocx/shell.c | 10 ++++++---- dlls/wshom.ocx/tests/wshom.c | 13 ++++++++++++- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/dlls/wshom.ocx/shell.c b/dlls/wshom.ocx/shell.c index 0284967..198531e 100644 --- a/dlls/wshom.ocx/shell.c +++ b/dlls/wshom.ocx/shell.c @@ -817,9 +817,11 @@ static HRESULT WINAPI WshShell3_QueryInterface(IWshShell3 *iface, REFIID riid, v *ppv = NULL; - if(IsEqualGUID(riid, &IID_IUnknown) || - IsEqualGUID(riid, &IID_IDispatch) || - IsEqualGUID(riid, &IID_IWshShell3)) + if (IsEqualGUID(riid, &IID_IDispatch) || + IsEqualGUID(riid, &IID_IWshShell3) || + IsEqualGUID(riid, &IID_IWshShell2) || + IsEqualGUID(riid, &IID_IWshShell) || + IsEqualGUID(riid, &IID_IUnknown)) { *ppv = iface; } @@ -829,7 +831,7 @@ static HRESULT WINAPI WshShell3_QueryInterface(IWshShell3 *iface, REFIID riid, v } else { - FIXME("Unknown iface %s\n", debugstr_guid(riid)); + WARN("unknown iface %s\n", debugstr_guid(riid)); return E_NOINTERFACE; } diff --git a/dlls/wshom.ocx/tests/wshom.c b/dlls/wshom.ocx/tests/wshom.c index a836f10..888023f 100644 --- a/dlls/wshom.ocx/tests/wshom.c +++ b/dlls/wshom.ocx/tests/wshom.c @@ -44,7 +44,7 @@ static void test_wshshell(void) IDispatchEx *dispex; IWshCollection *coll; IDispatch *disp, *shortcut; - IUnknown *shell; + IUnknown *shell, *unk; IFolderCollection *folders; IWshShortcut *shcut; ITypeInfo *ti; @@ -71,6 +71,17 @@ static void test_wshshell(void) hr = IUnknown_QueryInterface(shell, &IID_IWshShell3, (void**)&sh3); EXPECT_HR(hr, S_OK); + hr = IWshShell3_QueryInterface(sh3, &IID_IObjectWithSite, (void**)&unk); + ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); + + hr = IWshShell3_QueryInterface(sh3, &IID_IWshShell, (void**)&unk); + ok(hr == S_OK, "got 0x%08x\n", hr); + IUnknown_Release(unk); + + hr = IWshShell3_QueryInterface(sh3, &IID_IWshShell2, (void**)&unk); + ok(hr == S_OK, "got 0x%08x\n", hr); + IUnknown_Release(unk); + hr = IWshShell3_get_SpecialFolders(sh3, &coll); EXPECT_HR(hr, S_OK);

1 0

Nikolay Sivov : wshom.ocx: Silence class factory QI fixme.
by Alexandre Julliard 20 Feb '15

20 Feb '15

Module: wine Branch: master Commit: d91ba373b71bf425204281fad1f8b53b5a689023 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d91ba373b71bf425204281fad… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 19 19:54:25 2015 +0300 wshom.ocx: Silence class factory QI fixme. --- dlls/wshom.ocx/wshom_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wshom.ocx/wshom_main.c b/dlls/wshom.ocx/wshom_main.c index 8400f83..118b6c9 100644 --- a/dlls/wshom.ocx/wshom_main.c +++ b/dlls/wshom.ocx/wshom_main.c @@ -114,7 +114,7 @@ static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID r return S_OK; } - FIXME("(%p)->(%s %p)\n", iface, debugstr_guid(riid), ppv); + WARN("(%p)->(%s %p)\n", iface, debugstr_guid(riid), ppv); return E_NOINTERFACE; }

1 0

Matteo Bruni : wined3d: Set GL_UNPACK_ALIGNMENT to 1.
by Alexandre Julliard 20 Feb '15

20 Feb '15

Module: wine Branch: master Commit: 78ae4f66d7a6181499261ca4e8311de7175404cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=78ae4f66d7a6181499261ca4e… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Feb 20 13:06:02 2015 +0100 wined3d: Set GL_UNPACK_ALIGNMENT to 1. Alignment should be taken care by the surface pitch and GL_UNPACK_ROW_LENGTH alone just fine, as long as the pitch is a multiple of the pixel size. Client APIs respect that, internally we need to do the same and the changes to surface_load_texture and wined3d_volume_upload_data are there for this reason (e.g. WINED3DFMT_R16G16_SNORM is emulated with GL_RGB16 when NV_texture_shader isn't supported). --- dlls/wined3d/context.c | 2 +- dlls/wined3d/surface.c | 1 - dlls/wined3d/volume.c | 2 -- 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 843905a..fa8d768 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1685,7 +1685,7 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, gl_info->gl_ops.gl.p_glPixelStorei(GL_PACK_ALIGNMENT, device->surface_alignment); checkGLcall("glPixelStorei(GL_PACK_ALIGNMENT, device->surface_alignment);"); - gl_info->gl_ops.gl.p_glPixelStorei(GL_UNPACK_ALIGNMENT, device->surface_alignment); + gl_info->gl_ops.gl.p_glPixelStorei(GL_UNPACK_ALIGNMENT, 1); checkGLcall("glPixelStorei(GL_UNPACK_ALIGNMENT, device->surface_alignment);"); if (gl_info->supported[ARB_VERTEX_BLEND]) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 429147e..36806ec 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -4192,7 +4192,6 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, format.byte_count = format.conv_byte_count; dst_pitch = wined3d_format_calculate_pitch(&format, width); - dst_pitch = (dst_pitch + device->surface_alignment - 1) & ~(device->surface_alignment - 1); if (!(mem = HeapAlloc(GetProcessHeap(), 0, dst_pitch * height))) { diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index 0d13dd0..91325dc 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -84,7 +84,6 @@ void wined3d_volume_upload_data(struct wined3d_volume *volume, const struct wine { UINT dst_row_pitch, dst_slice_pitch; UINT src_row_pitch, src_slice_pitch; - UINT alignment = volume->resource.device->surface_alignment; if (data->buffer_object) ERR("Loading a converted volume from a PBO.\n"); @@ -92,7 +91,6 @@ void wined3d_volume_upload_data(struct wined3d_volume *volume, const struct wine ERR("Converting a block-based format.\n"); dst_row_pitch = width * format->conv_byte_count; - dst_row_pitch = (dst_row_pitch + alignment - 1) & ~(alignment - 1); dst_slice_pitch = dst_row_pitch * height; wined3d_volume_get_pitch(volume, &src_row_pitch, &src_slice_pitch);

1 0

Matteo Bruni : d3d9/tests: Test upload of user memory textures.
by Alexandre Julliard 20 Feb '15

20 Feb '15

Module: wine Branch: master Commit: acbb387753dcfbed1b39f83407941577744ce5ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=acbb387753dcfbed1b39f8340… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Feb 20 13:06:05 2015 +0100 d3d9/tests: Test upload of user memory textures. --- dlls/d3d9/tests/d3d9ex.c | 135 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 134 insertions(+), 1 deletion(-) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index 1d16ccf..b17ceb5 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -42,6 +42,76 @@ struct device_desc DWORD flags; }; +static BOOL color_match(D3DCOLOR c1, D3DCOLOR c2, BYTE max_diff) +{ + unsigned int i; + + for (i = 0; i < 4; ++i) + { + if (abs((c1 & 0xff) - (c2 & 0xff)) > max_diff) + return FALSE; + c1 >>= 8; + c2 >>= 8; + } + return TRUE; +} + +static DWORD get_pixel_color(IDirect3DDevice9Ex *device, unsigned int x, unsigned int y) +{ + DWORD ret; + IDirect3DSurface9 *surf = NULL, *target = NULL; + HRESULT hr; + D3DLOCKED_RECT locked_rect; + RECT rect = {x, y, x + 1, y + 1}; + + hr = IDirect3DDevice9Ex_CreateOffscreenPlainSurface(device, 640, 480, + D3DFMT_A8R8G8B8, D3DPOOL_SYSTEMMEM, &surf, NULL); + if (FAILED(hr) || !surf) + { + trace("Can't create an offscreen plain surface to read the render target data, hr %#x.\n", hr); + return 0xdeadbeef; + } + + hr = IDirect3DDevice9Ex_GetRenderTarget(device, 0, &target); + if (FAILED(hr)) + { + trace("Can't get the render target, hr %#x.\n", hr); + ret = 0xdeadbeed; + goto out; + } + + hr = IDirect3DDevice9Ex_GetRenderTargetData(device, target, surf); + if (FAILED(hr)) + { + trace("Can't read the render target data, hr %#x.\n", hr); + ret = 0xdeadbeec; + goto out; + } + + hr = IDirect3DSurface9_LockRect(surf, &locked_rect, &rect, D3DLOCK_READONLY); + if (FAILED(hr)) + { + trace("Can't lock the offscreen surface, hr %#x.\n", hr); + ret = 0xdeadbeeb; + goto out; + } + + /* Remove the X channel for now. DirectX and OpenGL have different + * ideas how to treat it apparently, and it isn't really important + * for these tests. */ + ret = ((DWORD *)locked_rect.pBits)[0] & 0x00ffffff; + hr = IDirect3DSurface9_UnlockRect(surf); + if (FAILED(hr)) + trace("Can't unlock the offscreen surface, hr %#x.\n", hr); + +out: + if (target) + IDirect3DSurface9_Release(target); + if (surf) + IDirect3DSurface9_Release(surf); + return ret; +} + static HWND create_window(void) { WNDCLASSA wc = {0}; @@ -576,8 +646,20 @@ out: static void test_user_memory(void) { + static const struct + { + float x, y, z; + float u, v; + } + quad[] = + { + {-1.0f, -1.0f, 0.0f, 0.0f, 1.0f}, + {-1.0f, 1.0f, 0.0f, 0.0f, 0.0f}, + { 1.0f, -1.0f, 0.0f, 1.0f, 1.0f}, + { 1.0f, 1.0f, 0.0f, 1.0f, 0.0f}, + }; IDirect3DDevice9Ex *device; - IDirect3DTexture9 *texture; + IDirect3DTexture9 *texture, *texture2; IDirect3DCubeTexture9 *cube_texture; IDirect3DVolumeTexture9 *volume_texture; IDirect3DVertexBuffer9 *vertex_buffer; @@ -588,7 +670,10 @@ static void test_user_memory(void) HWND window; HRESULT hr; void *mem; + char *ptr; D3DCAPS9 caps; + unsigned int x, y; + D3DCOLOR color; window = create_window(); if (!(device = create_device(window, NULL))) @@ -675,6 +760,54 @@ static void test_user_memory(void) D3DPOOL_SCRATCH, &surface, &mem, 0); todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + ptr = mem; + for (y = 0; y < 33; ++y) + for (x = 0; x < 33; ++x) + *ptr++ = x * 255 / 32; + + hr = IDirect3DDevice9Ex_CreateTexture(device, 33, 33, 1, 0, D3DFMT_L8, + D3DPOOL_SYSTEMMEM, &texture, &mem); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + hr = IDirect3DTexture9_LockRect(texture, 0, &locked_rect, NULL, 0); + ok(SUCCEEDED(hr), "Failed to lock texture, hr %#x.\n", hr); + ok(locked_rect.Pitch == 33, "Got unexpected pitch %d.\n", locked_rect.Pitch); + ok(locked_rect.pBits == mem, "Got unexpected pBits %p, expected %p.\n", locked_rect.pBits, mem); + hr = IDirect3DTexture9_UnlockRect(texture, 0); + ok(SUCCEEDED(hr), "Failed to unlock texture, hr %#x.\n", hr); + + hr = IDirect3DDevice9Ex_CreateTexture(device, 33, 33, 1, 0, D3DFMT_L8, + D3DPOOL_DEFAULT, &texture2, NULL); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + hr = IDirect3DDevice9_UpdateTexture(device, (IDirect3DBaseTexture9 *)texture, + (IDirect3DBaseTexture9 *)texture2); + ok(SUCCEEDED(hr), "Failed to update texture, hr %#x.\n", hr); + + hr = IDirect3DDevice9Ex_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0x000000ff, 0.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + + hr = IDirect3DDevice9Ex_SetFVF(device, D3DFVF_XYZ | D3DFVF_TEX1); + ok(SUCCEEDED(hr), "Failed to set fvf, hr %#x.\n", hr); + hr = IDirect3DDevice9Ex_SetRenderState(device, D3DRS_LIGHTING, FALSE); + ok(SUCCEEDED(hr), "Failed to disable lighting, hr %#x.\n", hr); + hr = IDirect3DDevice9Ex_SetTexture(device, 0, (IDirect3DBaseTexture9 *)texture2); + ok(SUCCEEDED(hr), "Failed to set texture, hr %#x.\n", hr); + + hr = IDirect3DDevice9Ex_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice9Ex_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, sizeof(quad[0])); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice9Ex_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + + color = get_pixel_color(device, 320, 240); + ok(color_match(color, 0x007f7f7f, 2), "Got unexpected color %#x.\n", color); + hr = IDirect3DDevice9Ex_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetTexture(device, 0, NULL); + ok(SUCCEEDED(hr), "Failed to set texture, hr %#x.\n", hr); + IDirect3DTexture9_Release(texture2); + IDirect3DTexture9_Release(texture); HeapFree(GetProcessHeap(), 0, mem); refcount = IDirect3DDevice9Ex_Release(device); ok(!refcount, "Device has %u references left.\n", refcount);

1 0