- wine-devel - winehq.org

Re: fltmgr.sys: add FltInitializePushLock stub (try 3)
by Dmitry Timoshkov 17 Oct '15

17 Oct '15

Austin English <austinenglish(a)gmail.com> wrote: > +void WINAPI FltInitializePushLock(EX_PUSH_LOCK *lock) > +{ > + FIXME("(%p): stub\n", lock); > +} > diff --git a/include/ddk/ntifs.h b/include/ddk/ntifs.h > index a8d90a1..8d22d41 100644 > --- a/include/ddk/ntifs.h > +++ b/include/ddk/ntifs.h > @@ -19,6 +19,9 @@ > #ifndef __NTIFS_H__ > #define __NTIFS_H__ > > +#define EX_PUSH_LOCK ULONG_PTR > +#define PEX_PUSH_LOCK PULONG_PTR I'd guess that's not what Alexandre meant with an opaque pointer (anyway 'ULONG_PTR *' and 'ULONG_PTR' are two different things, not sure what you tried to achieve with any of them), you may try with 'void *' instead. -- Dmitry.

1 0

Re: [PATCH] configure: Check for linker relocation support before relying on prelink
by Marcus Meissner 17 Oct '15

17 Oct '15

On Fri, Oct 16, 2015 at 10:21:50AM -0500, Michael Cronenworth wrote: > Prelink was used to rewrite binares and set their text segment, but > modern linkers support setting the value at link time. Prelink is > being retired by upstream. > > Signed-off-by: Michael Cronenworth <mike(a)cchtml.com> Can confirm it works on SUSE too. Signed-Off-By: Marcus Meissner <marcus(a)jet.franken.de> > --- > configure.ac | 11 ++++++++--- > tools/winegcc/winegcc.c | 11 +++++++++-- > 2 files changed, 17 insertions(+), 5 deletions(-) > > diff --git a/configure.ac b/configure.ac > index de8cde5..f283802 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -988,10 +988,15 @@ wine-installed: main.o > *) LDEXECFLAGS="$LDEXECFLAGS -Wl,--section-start,.interp=0x7bf00400" ;; > esac > ]) > - AC_PATH_PROG(PRELINK, prelink, false, [/sbin /usr/sbin $PATH]) > - if test "x$PRELINK" = xfalse > + WINE_TRY_CFLAGS([-Wl,-Ttext-segment=0x7bc00000], > + [HAVE_TTEXT_SEGMENT="yes"]) > + if test "x$HAVE_TTEXT_SEGMENT" != "xyes" > then > - WINE_WARNING([prelink not found, base address of core dlls won't be set correctly.]) > + AC_PATH_PROG(PRELINK, prelink, false, [/sbin /usr/sbin $PATH]) > + if test "x$PRELINK" = xfalse > + then > + WINE_WARNING([prelink not found and linker does not support relocation, base address of core dlls won't be set correctly.]) > + fi > fi > ;; > esac > diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c > index 3b2794e..4acd12d 100644 > --- a/tools/winegcc/winegcc.c > +++ b/tools/winegcc/winegcc.c > @@ -1134,6 +1134,12 @@ static void build(struct options* opts) > } > break; > default: > + /* Try option first, modern linkers support this */ > + if (opts->image_base && > + !try_link(opts->prefix, link_args, strmake("-Wl,-Ttext-segment=%s", opts->image_base))) > + { > + strarray_add(link_args, strmake("-Wl,-Ttext-segment=%s", opts->image_base)); > + } > break; > } > > @@ -1167,8 +1173,9 @@ static void build(struct options* opts) > spawn(opts->prefix, link_args, 0); > strarray_free (link_args); > > - /* set the base address */ > - if (opts->image_base && !opts->target) > + /* set the base address with prelink if linker support is not present */ > + if (opts->image_base && !opts->target && > + try_link(opts->prefix, link_args, strmake("-Wl,-Ttext-segment=%s", opts->image_base))) > { > const char *prelink = PRELINK; > if (prelink[0] && strcmp(prelink,"false")) > -- > 2.4.3 > > > >

1 0

Re: [1/2] msrle32/tests: Add uncompressed video tests using MRLE as codec (resend)
by Marvin 17 Oct '15

17 Oct '15

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=17422 Your paranoid android. === build (build) === Make failed

4 4

Re: [2/2] msrle32: Add support to uncompressed frames video (resend)
by Marvin 17 Oct '15

17 Oct '15

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=17423 Your paranoid android. === build (build) === Make failed

1 0

Re: [2/2] msrle32: Add support to uncompressed frames video
by Marvin 17 Oct '15

17 Oct '15

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=17420 Your paranoid android. === build (build) === Make failed

1 0

Re: [1/2] msrle32/tests: Add uncompressed video tests using MRLE as codec
by Marvin 17 Oct '15

17 Oct '15

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=17419 Your paranoid android. === build (build) === Make failed

1 0

Re: fltmgr.sys: add FltInitializePushLock stub (try 2)
by Alexandre Julliard 17 Oct '15

17 Oct '15

Austin English <austinenglish(a)gmail.com> writes: > +++ b/include/ddk/ntifs.h > @@ -19,6 +19,18 @@ > #ifndef __NTIFS_H__ > #define __NTIFS_H__ > > +typedef struct _EX_PUSH_LOCK { > + union { > + struct { > + ULONG waiting : 1; > + ULONG exclusive : 1; > + ULONG shared : 30; > + } DUMMYSTRUCTNAME; > + ULONG value; > + VOID *ptr; > + } DUMMYUNIONNAME; > +} EX_PUSH_LOCK, *PEX_PUSH_LOCK; Where does this come from? -- Alexandre Julliard julliard(a)winehq.org

2 2

Re: d3d8: Adjust D3DCOLOR_ARGB to avoid shift overflow.
by Stefan Dösinger 16 Oct '15

16 Oct '15

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 Am 2015-09-13 um 22:56 schrieb Gerald Pfeifer: > -#define D3DCOLOR_ARGB(a,r,g,b) ((D3DCOLOR)((((a)&0xff)<<24)|(((r)&0xff)<<16)|(((g)&0xff)<<8)|((b)&0xff))) > +#define D3DCOLOR_ARGB(a,r,g,b) ((D3DCOLOR)((((a)&0xffu)<<24)|(((r)&0xff)<<16)|(((g)&0xff)<<8)|((b)&0xff))) Wouldn't it make sense to make the masks for the other channels unsigned too? Are there any possible side effects when compiling code with winelib? The native header uses a signed 0xff. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJV9o1AAAoJEN0/YqbEcdMwVwUP/3G2g6LM41sKgJt3/mxlhkQ4 BdxJ+Oj2Sz1FdefWNzohcRGI5V8AaRSfoCyCQCvSvFRUm72VY9aMKvK3Nhg7gku0 OmP9z81GEDIb13eLNGrcGNmU97wsqk69MtahHFZ3tj8gYLEWVW3sZPwU64VOa89g 7eLLrx5xXGAhoyzN/q85rV7oGj6xmCzv8YKzasv7BAQIdARVwoSVzmyH2kqbuJFf ENVHyoPSJpphYBc4vxSOLVelgVCGEeAdAECnaGpGG+UfT8Sha3GTFu5q6Nn8P9Gx 3irwIPv7nfgqgdBFDRZUOuck/P5mirM9K3YQLB5309usVh7czusvR6LRWR7g5/gD aCf3fub02sfVe0+Sl2NBMfjF361qaOcMpv63e6+QGToKRIXSE9Ht/v4oUeblNi+h H6K/ljyv/kXr9mDUQBRbRUFlcKtp9Cm49xHAK7cT2xDrIj9z18mExKeARz+V1hiF Fs9W/sJao6F+LN9p1XpdZ+Ha10zvFUrsF3OPj09nyv/C+lXdIt5WgFIiI6gzsD/Z +vKFEoiYWnea9xBO9hUprnr4HTNlCMCZroQrvgeJm3xVxhcZZ9d7XQk7Q+oS1UlU S1g4FJL/Ea8EPNW5bq35F9x50azgZVKmdgIDe1ZtogDF+tgGwuuHN5DiqHAhU2cM deINoftjzz/ztYWqm2Yh =kZgE -----END PGP SIGNATURE-----

2 1

Re: d3drm/tests: Release two retrieved interfaces to allow proper cleanup.
by Stefan Dösinger 16 Oct '15

16 Oct '15

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 Am 2015-10-15 um 21:54 schrieb Bernhard Übelacker: > + hr = IDirect3DRMFrame_DeleteChild(pFrameP2, pFrameC); > + ok(hr == D3DRM_OK, "Cannot remove child frame (hr = %x)\n", hr); > + CHECK_REFCOUNT(pFrameC, 1); > + > + CHECK_REFCOUNT(pFrameP1, 2); > + hr = IDirect3DRMFrame_DeleteChild(pFrameP2, pFrameP1); > + ok(hr == D3DRM_OK, "Cannot remove child frame (hr = %x)\n", hr); > + CHECK_REFCOUNT(pFrameP1, 1); Are these necessary? I'd expect the frame children to be detached when their parent is destroyed, similarly to how it works in ddraw. I'm not opposed to explicitly removing them, so I'll send my signed-off-by to wine-patches. But it's something someone (Jamm? ;-) ) could write an explicit test for. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJWINjmAAoJEN0/YqbEcdMwQFAQAIcW8C+DxXKqNfUX2gxN3HtP FHrr2i+Ufy694aoL/O+hcWgL0mxS/Hv9F9RnXth+m5x1FKBkKJx1DA3wXZl+N6Ea w961wIDiPZCzCr2Hb1HGeQEEKBoPXnY3oxtGmOipv8bYEpjSXLngYKXVmM9U0Ojl BjAKCPraAukui5sLaMr3Bypf6jrOylrceWnyXo70Q7E1Gg5Lq5auTawYDvDsYxKF WISMIn5eBXsNDr4irRneuW/2JDwbB/FePzkqxhVfKzkw9K0A72enuzHMWkfeXAHS zQvZr+uSC+KanwWJq41VdFhWzFNhudUklHT/Ne5vl/nPeFibtCmB6CxoGtVJPaqT Htzb2MoPV4cV/efp+2+oZPPZxOeAgXhdFmWqGUYZ02/rHpthH8saRJ1mGZoWY7DU R82s3k0vXBmwzhK1CHvs2zZgi6mt25qZqeJwM7Ehci/VLwjaREjts8yetGL8NoKP 9ZFx+Hg4LD4w8mBOc5utkerODw6fwIZ3KKCfdX2S9FAIbqWsZ0/cN4rmJkIjRMGq FiYyOZ9GU2H93CyRTtQfv3mVcXGh2LXxvxsgviR5gzBxo4XbVqiYe/cFcCfTtJQu NrTYURDXQxFFkjq5rZXYP4bUItGAbuoC5/Kh4C/ATONahQq9yqEo7qDQRsP9IRS6 AX+rnn4Sagutm0q/OJc8 =R0Nv -----END PGP SIGNATURE-----

3 3

Re: [PATCH 1/3] ws2_32: Implement a basic synchronous TransmitFile (try 5).
by Marvin 16 Oct '15

16 Oct '15

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=17393 Your paranoid android. === w7pro64 (32 bit sock) === sock.c:7350: Test failed: bytesReturned isn't supposed to be 1 sock.c:7374: Test failed: GetOverlappedResult failed, error 0

3 2

Re: [PATCH] shell32: Implement IShellDispatch2::ShellExecute
by Dmitry Timoshkov 16 Oct '15

16 Oct '15

Andrew Eikum <aeikum(a)codeweavers.com> wrote: > + TRACE("(%s, %s, %s, %s, %s): stub\n", debugstr_w(file), debugstr_variant(&v_args), > + debugstr_variant(&v_dir), debugstr_variant(&v_op), debugstr_variant(&v_show)); Probably ": stub" part should be removed. > + if (V_VT(&v_op) == VT_BSTR) > + op = V_BSTR(&v_op); > + > + if (V_VT(&v_args) == VT_BSTR) > + args = V_BSTR(&v_args); > + > + if (V_VT(&v_dir) == VT_BSTR) > + dir = V_BSTR(&v_dir); > + > + if (V_VT(&v_show) == VT_INT) > + show = V_INT(&v_show); > + > + ShellExecuteW(NULL, op, file, args, dir, show); > + > + return S_OK; Shouldn't return value somehow reflect what ShellExecute returns? Also as usually it would be nice to see some tests for this, especially with not handled variant types. -- Dmitry.

2 1

Re: [PATCH] configure: Check for linker relocation support before relying on prelink
by Alexandre Julliard 16 Oct '15

16 Oct '15

Michael Cronenworth <mike(a)cchtml.com> writes: > @@ -988,10 +988,17 @@ wine-installed: main.o > *) LDEXECFLAGS="$LDEXECFLAGS -Wl,--section-start,.interp=0x7bf00400" ;; > esac > ]) > - AC_PATH_PROG(PRELINK, prelink, false, [/sbin /usr/sbin $PATH]) > - if test "x$PRELINK" = xfalse > + WINE_TRY_CFLAGS([-Wl,-Ttext-segment=0x7bc00000], > + [AC_DEFINE([HAVE_TTEXT_SEGMENT],[1],[Define if > +linker supports -Ttext-segment.])], > + [HAVE_TTEXT_SEGMENT="no"]) > + if test "x$HAVE_TTEXT_SEGMENT" = "xno" The check should be done at run-time. Check how winegcc does it for other linker flags. -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: d3drm/tests: Skip following tests when device creation fails.
by Stefan Dösinger 16 Oct '15

16 Oct '15

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 Am 2015-10-15 um 21:54 schrieb Bernhard Übelacker: > hr = IDirect3DRM3_CreateDeviceFromClipper(d3drm, pClipper, &driver, rc.right, rc.bottom, &device); > ok(hr == D3DRM_OK, "Cannot get IDirect3DRMDevice interface (hr = %x)\n", hr); > + if (FAILED(hr)) > + { > + skip("Cannot get IDirect3DRMDevice interface (hr = %x), skipping tests\n", hr); > + IDirectDrawClipper_Release(pClipper); > + IDirect3DRM_Release(d3drm); > + DestroyWindow(window); > + return; > + } The test will fail regardless, so you don't gain too much. It would be nicer if the test skips without a failing ok() statement in this case. Do you have a Windows VM to test how native d3drm responds if d3d is not available? I.e., which error code is returned? It might be a bit tricky to test because we request a software device that Wine doesn't implement but should be available everywhere on Windows. If you need help finding that out I can play a bit with my Windows XP box. (Technically failing is correct because we should have a software device without host GL in theory, but I don't expect that we'll ever implement one, so I think not failing the test if GL isn't available is the best thing to do) -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJWINx5AAoJEN0/YqbEcdMwcDYP/1mLNoDkllStJ4gySEeUgfxK QUuTt7vIFiWGVl8/x9QUsO9dWakZ+2fPZJSl3cO8cUxuk/GbpwmKNYFG3IEcQUIo 1nTn5aM6kTxv4b+uVT2BnX/CwJLouQnjuFnsTxTORJad1WsPk/qTVcPAmknnTPlX uHs30ed8QBm7ZWwi+549rQfFeGjp41xf05BVqjtSILtIhPiRYfnfsXAV/zFmUPMB hCG3QtaSL4Ea4zS3aEr0II0aV6TcSSY1t+V0+SvCuZEgZDKbYF5qbEeKRiXubdga mQEtEWcun0NUwtRD7ftNA6Ad5WumHUv3hj3fwb0q4hA0AtjvsW1L4zuYQs/DVb2v T/vpyZLowUpUn4peTOwuNU5rBeUY9BRqeoqcE1ccyVUFQ2nt6Iq3XJGvzjRWf3RT e5j1F9OyM31j8eDTVRO3Vr5SXqH3yDiwzSoLPJzTrE9AV4r1hj30Vb7MWjlqmOlq 03P83KwPDyNg5JBtr7R6a9TxQn7zhfZNzHctuJWI2ZSvXhbPTHgh0GZd1ka9ITkT 273sIi/VKU8e1HoBz5zTnGHYgE3utdqBk6RHVzSk/L+fhsVxD8LccyytRs7de+ai 7ut0IFuLsM3jd22g9FF3PTmpgZx3nEDUn0WN628hQO4w+Lf7w+MUmGslHMSrqx1r yiscxon1fyODz+BewWKG =NOTo -----END PGP SIGNATURE-----

3 4

Re: [PATCH 3/5] wined3d: make wined3d_swapchain_get_front_buffer_data work with wined3d_texture and sub_resource_idx
by Henri Verbeet 16 Oct '15

16 Oct '15

On 15 October 2015 at 15:41, Riccardo Bortolato <rikyz619(a)gmail.com> wrote: > + if (!(sub_resource = wined3d_texture_get_sub_resource(dst_texture, sub_resource_idx)) || > + sub_resource->type != WINED3D_RTYPE_SURFACE) Not a big issue, but if you're resending the series anyway, we usually put the "||" on the next line. (Here and in patch 4/5.)

2 1

Re: [PATCH 5/5] wined3d: introduce a new wined3d_texture_blt function
by Henri Verbeet 16 Oct '15

16 Oct '15

On 15 October 2015 at 15:41, Riccardo Bortolato <rikyz619(a)gmail.com> wrote: > +HRESULT CDECL wined3d_texture_blt(struct wined3d_texture *dst_texture, unsigned int dst_sub_resource_idx, const RECT *dst_rect_in, > + struct wined3d_texture *src_texture, unsigned int src_sub_resource_idx, const RECT *src_rect_in, DWORD flags, > + const WINEDDBLTFX *fx, enum wined3d_texture_filter_type filter) > +{ > + struct wined3d_resource *dst_resource, *src_resource; > + > + TRACE("dst_texture %p, dst_sub_resource_idx %u, src_texture %p, src_sub_resource_idx %u.\n", > + dst_texture, dst_sub_resource_idx, src_texture, src_sub_resource_idx); > + > + dst_resource = wined3d_texture_get_sub_resource(dst_texture, dst_sub_resource_idx); > + src_resource = wined3d_texture_get_sub_resource(src_texture, src_sub_resource_idx); > + > + if (!dst_resource || !src_resource) > + return WINED3DERR_INVALIDCALL; > + > + return wined3d_surface_blt(surface_from_resource(dst_resource), dst_rect_in, > + surface_from_resource(src_resource), src_rect_in, flags, fx, filter); > +} You can't assume src_resource and dst_resource are surfaces.

2 1

Re: [PATCH 1/5] d3d8: call wined3d_swapchain_get_front_buffer_data instead of wined3d_device_get_front_buffer_data in d3d8_device_GetFrontBuffer
by Henri Verbeet 16 Oct '15

16 Oct '15

On 15 October 2015 at 15:41, Riccardo Bortolato <rikyz619(a)gmail.com> wrote: > - hr = wined3d_device_get_front_buffer_data(device->wined3d_device, 0, dst_impl->wined3d_surface); > + if (!(swapchain = wined3d_device_get_swapchain(device->wined3d_device, 0))) > + hr = D3DERR_INVALIDCALL; > + else > + hr = wined3d_swapchain_get_front_buffer_data(swapchain, dst_impl->wined3d_surface); The timing is perhaps unfortunate, but since commit 20d5be042c577b8dfcca431fa4688cad192196df you can just use "device->implicit_swapchain->wined3d_swapchain" instead of calling wined3d_device_get_swapchain(). Something similar applies to patch 2/5.

1 0

Re: [PATCH 6/6] wined3d: Use non-deprecated texture sample builtins also in the fragment pipeline replacement shaders.
by Henri Verbeet 16 Oct '15

16 Oct '15

On 15 October 2015 at 22:01, Matteo Bruni <mbruni(a)codeweavers.com> wrote: > @@ -6259,7 +6259,7 @@ static GLuint shader_glsl_generate_ffp_fragment_shader(struct shader_glsl_priv * > { > struct wined3d_string_buffer *buffer = &priv->shader_buffer; > BYTE lum_map = 0, bump_map = 0, tex_map = 0, tss_const_map = 0; > - BOOL tempreg_used = FALSE, tfactor_used = FALSE; > + BOOL tempreg_used = FALSE, tfactor_used = FALSE, legacy_syntax = needs_legacy_glsl_syntax(gl_info); > const char *final_combiner_src = "ret"; > UINT lowest_disabled_stage; > GLuint shader_id; > @@ -6480,52 +6480,52 @@ static GLuint shader_glsl_generate_ffp_fragment_shader(struct shader_glsl_priv * > case WINED3D_GL_RES_TYPE_TEX_1D: > if (proj) > { > - texture_function = "texture1DProj"; > + texture_function = legacy_syntax ? "texture1DProj" : "textureProj"; > coord_mask = "xw"; > } > else > { > - texture_function = "texture1D"; > + texture_function = legacy_syntax ? "texture1D" : "texture"; > coord_mask = "x"; > } > break; > case WINED3D_GL_RES_TYPE_TEX_2D: > if (proj) > { > - texture_function = "texture2DProj"; > + texture_function = legacy_syntax ? "texture2DProj" : "textureProj"; > coord_mask = "xyw"; > } > else > { > - texture_function = "texture2D"; > + texture_function = legacy_syntax ? "texture2D" : "texture"; > coord_mask = "xy"; > } > break; > case WINED3D_GL_RES_TYPE_TEX_3D: > if (proj) > { > - texture_function = "texture3DProj"; > + texture_function = legacy_syntax ? "texture3DProj" : "textureProj"; > coord_mask = "xyzw"; > } > else > { > - texture_function = "texture3D"; > + texture_function = legacy_syntax ? "texture3D" : "texture"; > coord_mask = "xyz"; > } > break; > case WINED3D_GL_RES_TYPE_TEX_CUBE: > - texture_function = "textureCube"; > + texture_function = legacy_syntax ? "textureCube" : "texture"; > coord_mask = "xyz"; > break; > case WINED3D_GL_RES_TYPE_TEX_RECT: > if (proj) > { > - texture_function = "texture2DRectProj"; > + texture_function = legacy_syntax ? "texture2DRectProj" : "textureProj"; > coord_mask = "xyw"; > } > else > { > - texture_function = "texture2DRect"; > + texture_function = legacy_syntax ? "texture2DRect" : "texture"; > coord_mask = "xy"; > } > break; It seems like it would be at least as readable to adjust "proj" for cube textures and then just do if (!needs_legacy_glsl_syntax(gl_info)) texture_function = proj ? "textureProj" : "texture";

1 0

xrdp wine drv
by Jay Sorg 15 Oct '15

15 Oct '15

I'm hacking on wine fork from github.com. My goal is to create a new driver for wine for xrdp. Similar to winemac.drv and winex11.drv but not to draw into a Mac or X11 window but an xrdp session. I don't want to have any X11 in the picture, strait from wine gdi into xrdp. Is anyone interested in this effort? Is there an example dummy driver for learning? Jay

2 2

Re: [1/3] scrrun: Implement filesys_DriveExists.
by Nikolay Sivov 15 Oct '15

15 Oct '15

On 15.10.2015 13:56, Joachim Priesner wrote: > + if (!pfExists) return E_POINTER; > + *pfExists = VARIANT_FALSE; > + len = SysStringLen(DriveSpec); > + if (len >= 1 && DriveSpec[0] >= 'A' && DriveSpec[0] <= 'Z' > + && (len < 2 || DriveSpec[1] == ':') > + && (len < 3 || DriveSpec[2] == '\\')) { > + WCHAR root[] = {toupperW(DriveSpec[0]), ':', '\\', 0}; > + *pfExists = GetDriveTypeW(root) != DRIVE_NO_ROOT_DIR ? VARIANT_TRUE : VARIANT_FALSE; > + } Not necessary wrong, but it'd be better if all that validation was GetDriveTypeW responsibility. I don't see many tests for it in kernel32/tests, could you please add some, so we can get rid of this extra logic? I haven't looked much at its implementation but it feels like DRIVE_UNKNOWN would also qualify as non-existent drive.

2 2

Re: [3/3] scrrun: Implement filesys_GetDrive for local drives.
by Nikolay Sivov 15 Oct '15

15 Oct '15

On 15.10.2015 13:56, Joachim Priesner wrote: > + DriveSpec[0] = toupperW(DriveSpec[0]); > + if (DriveSpec[0] < 'A' || DriveSpec[0] > 'Z' > + || (len >= 2 && DriveSpec[1] != ':') > + || (len == 3 && DriveSpec[2] != '\\')) > + return E_INVALIDARG; > + hr = filesys_DriveExists(iface, DriveSpec, &drive_exists); I'm not sure about that sanity check, the reason is that DriveExists doesn't fail on invalid drivespec? Also please use method wrappers internally, instead of calling implementation functions, I'm talking about filesys_DriveExists.

1 0

Reviewer assignments in the patch tracker
by Alexandre Julliard 15 Oct '15

15 Oct '15

Folks, I've now added support in the patch tracker to enable assigning a reviewer to a patch. If you get assigned a patch, you are expected to either reply with a sign-off, or send a comment to wine-devel (and please CC the patch author). Initially I'm only going to assign patches to people who have listed themselves as maintainers for the area that the patch modifies. A further step will be to gather a list of volunteers who are willing to be assigned patches for areas that don't have an active maintainer. I don't know what's the best mechanism for that, I was thinking we could have volunteer entries in MAINTAINERS, from which I would pick someone. I'd like to hear suggestions for other approaches. Also, currently you don't get a mail telling you that you have been assigned a patch, so you have to watch the patch tracker. I can add that feature if people think it would be useful and not too obnoxious. Please let me know. -- Alexandre Julliard julliard(a)winehq.org

3 2

Re: [PATCH] dpnet: Add Server tests
by Stefan Dösinger 15 Oct '15

15 Oct '15

Just fyi, I want to take a closer look at this patch but didn't get around to it yet :-( . Stefan > Am 13.10.2015 um 11:05 schrieb Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com>: > > Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> > --- > dlls/dpnet/tests/server.c | 194 ++++++++++++++++++++++++++++++++++++++++++---- > 1 file changed, 179 insertions(+), 15 deletions(-) > > diff --git a/dlls/dpnet/tests/server.c b/dlls/dpnet/tests/server.c > index 8279666..9ed3ef3 100644 > --- a/dlls/dpnet/tests/server.c > +++ b/dlls/dpnet/tests/server.c > @@ -25,22 +25,84 @@ > /* {CD0C3D4B-E15E-4CF2-9EA8-6E1D6548C5A5} */ > static const GUID appguid = { 0xcd0c3d4b, 0xe15e, 0x4cf2, { 0x9e, 0xa8, 0x6e, 0x1d, 0x65, 0x48, 0xc5, 0xa5 } }; > static WCHAR sessionname[] = {'w','i','n','e','g','a','m','e','s','s','e','r','v','e','r',0}; > +static const WCHAR localhost[] = {'1','2','7','.','0','.','0','.','1',0}; > > -static BOOL nCreatePlayer; > -static BOOL nDestroyPlayer; > +static int create_cnt = 0; > +static int destroy_dnt = 0; > +static int indicate_cnt = 0; > +static IDirectPlay8Server *server = NULL; > +static IDirectPlay8Client* client = NULL; > +static HANDLE connect = NULL; > +static HANDLE hostenum = NULL; > +static HANDLE clientfinished = NULL; > +static DPN_APPLICATION_DESC hostdesc; > > -static HRESULT WINAPI DirectPlayMessageHandler(PVOID pvUserContext, DWORD dwMessageId, PVOID pMsgBuffer) > -{ > - trace("msgid: 0x%08x\n", dwMessageId); > +static IDirectPlay8Address *hostAddr = NULL; > +static IDirectPlay8Address *deviceAddr = NULL; > +static WCHAR session[255]; > > +static HRESULT WINAPI DirectPlayMessageHandler(void *pvUserContext, DWORD dwMessageId, void *pMsgBuffer) > +{ > switch(dwMessageId) > { > + case DPN_MSGID_INDICATE_CONNECT: > + trace("DPN_MSGID_CREATE_PLAYER\n"); > + indicate_cnt++; > + break; > case DPN_MSGID_CREATE_PLAYER: > - nCreatePlayer = TRUE; > + trace("DPN_MSGID_CREATE_PLAYER\n"); > + create_cnt++; > break; > case DPN_MSGID_DESTROY_PLAYER: > - nDestroyPlayer = TRUE; > + trace("DPN_MSGID_DESTROY_PLAYER\n"); > + destroy_dnt++; > break; > + default: > + trace("msgid: 0x%08x\n", dwMessageId); > + } > + > + return S_OK; > +} > + > +static HRESULT WINAPI DirectPlayClientMsHandler(void *context, DWORD dwMessageId, void *buffer) > +{ > + HRESULT hr; > + > + switch(dwMessageId) > + { > + case DPN_MSGID_ENUM_HOSTS_RESPONSE: > + { > + DPNMSG_ENUM_HOSTS_RESPONSE *host_msg; > + host_msg = (PDPNMSG_ENUM_HOSTS_RESPONSE)buffer; > + > + trace("DPN_MSGID_ENUM_HOSTS_RESPONSE\n"); > + > + hr = IDirectPlay8Address_Duplicate(host_msg->pAddressSender, &hostAddr); > + ok(hr == S_OK, "Failed to Duplicate Host Address\n"); > + > + hr = IDirectPlay8Address_Duplicate(host_msg->pAddressDevice, &deviceAddr); > + ok(hr == S_OK, "Failed to Duplicate Device Address\n"); > + > + memset(&hostdesc, 0, sizeof(DPN_APPLICATION_DESC)); > + memcpy(&hostdesc, host_msg->pApplicationDescription, sizeof(DPN_APPLICATION_DESC) ); > + > + lstrcpyW(session, host_msg->pApplicationDescription->pwszSessionName); > + > + trace("SessionName: %s\n", wine_dbgstr_w(session)); > + ok(!lstrcmpW(session, sessionname), "incorrect name %s\n", wine_dbgstr_w(session)); > + > + SetEvent(hostenum); > + break; > + } > + case DPN_MSGID_ASYNC_OP_COMPLETE: > + trace("DPN_MSGID_ASYNC_OP_COMPLETE\n"); > + break; > + case DPN_MSGID_CONNECT_COMPLETE: > + trace("DPN_MSGID_CONNECT_COMPLETE\n"); > + SetEvent(connect); > + break; > + default: > + trace("DirectPlayClientMsHandler: 0x%08x\n", dwMessageId); > } > > return S_OK; > @@ -49,7 +111,6 @@ static HRESULT WINAPI DirectPlayMessageHandler(PVOID pvUserContext, DWORD dwMess > static void create_server(void) > { > HRESULT hr; > - IDirectPlay8Server *server = NULL; > > hr = CoCreateInstance( &CLSID_DirectPlay8Server, NULL, CLSCTX_ALL, &IID_IDirectPlay8Server, (LPVOID*)&server); > ok(hr == S_OK, "Failed to create IDirectPlay8Server object\n"); > @@ -74,6 +135,10 @@ static void create_server(void) > hr = IDirectPlay8Address_SetSP(localaddr, &CLSID_DP8SP_TCPIP); > ok(hr == S_OK, "got 0x%08x\n", hr); > > + hr = IDirectPlay8Address_AddComponent(localaddr, DPNA_KEY_HOSTNAME, localhost, sizeof(localhost), > + DPNA_DATATYPE_STRING); > + ok(hr == S_OK, "IDirectPlay8Address failed with 0x%08x\n", hr); > + > memset( &appdesc, 0, sizeof(DPN_APPLICATION_DESC) ); > appdesc.dwSize = sizeof( DPN_APPLICATION_DESC ); > appdesc.dwFlags = DPNSESSION_CLIENT_SERVER; > @@ -83,16 +148,111 @@ static void create_server(void) > hr = IDirectPlay8Server_Host(server, &appdesc, &localaddr, 1, NULL, NULL, NULL, 0); > todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); > > - todo_wine ok(nCreatePlayer, "No DPN_MSGID_CREATE_PLAYER Message\n"); > - ok(!nDestroyPlayer, "Received DPN_MSGID_DESTROY_PLAYER Message\n"); > - > - hr = IDirectPlay8Server_Close(server, 0); > - todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); > - > - todo_wine ok(nDestroyPlayer, "No DPN_MSGID_DESTROY_PLAYER Message\n"); > + todo_wine ok(create_cnt == 1, "No DPN_MSGID_CREATE_PLAYER Message\n"); > + ok(indicate_cnt == 0, "wrong indicate count (%d)\n", indicate_cnt); > > IDirectPlay8Address_Release(localaddr); > } > + } > +} > + > +static void create_client(void) > +{ > + HRESULT hr; > + IDirectPlay8Address *host = NULL; > + IDirectPlay8Address *device = NULL; > + DPN_APPLICATION_DESC appdesc; > + DWORD ret; > + DPNHANDLE async = 0; > + > + hr = CoCreateInstance(&CLSID_DirectPlay8Client, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectPlay8Client, (void **)&client); > + ok(hr == S_OK, "CoCreateInstance failed with 0x%x\n", hr); > + if(hr != S_OK) > + return; > + > + memset( &appdesc, 0, sizeof(DPN_APPLICATION_DESC) ); > + appdesc.dwSize = sizeof( DPN_APPLICATION_DESC ); > + appdesc.guidApplication = appguid; > + > + connect = CreateEventA( NULL, TRUE, FALSE, NULL); > + hostenum = CreateEventA( NULL, TRUE, FALSE, NULL); > + > + hr = IDirectPlay8Client_Initialize(client, NULL, DirectPlayClientMsHandler, 0); > + ok(hr == S_OK, "IDirectPlay8Client_Initialize failed with %x\n", hr); > + > + hr = CoCreateInstance( &CLSID_DirectPlay8Address, NULL, CLSCTX_ALL, &IID_IDirectPlay8Address, (LPVOID*)&host); > + ok(hr == S_OK, "IDirectPlay8Address failed with 0x%08x\n", hr); > + > + hr = IDirectPlay8Address_SetSP(host, &CLSID_DP8SP_TCPIP); > + ok(hr == S_OK, "IDirectPlay8Address_SetSP failed with 0x%08x\n", hr); > + > + hr = CoCreateInstance( &CLSID_DirectPlay8Address, NULL, CLSCTX_ALL, &IID_IDirectPlay8Address, (LPVOID*)&device); > + ok(hr == S_OK, "IDirectPlay8Address failed with 0x%08x\n", hr); > + > + hr = IDirectPlay8Address_SetSP(device, &CLSID_DP8SP_TCPIP); > + ok(hr == S_OK, "IDirectPlay8Address_SetSP failed with 0x%08x\n", hr); > + > + hr = IDirectPlay8Address_AddComponent(host, DPNA_KEY_HOSTNAME, localhost, sizeof(localhost), > + DPNA_DATATYPE_STRING); > + ok(hr == S_OK, "IDirectPlay8Address failed with 0x%08x\n", hr); > + > + hr = CoCreateInstance( &CLSID_DirectPlay8Address, NULL, CLSCTX_ALL, &IID_IDirectPlay8Address, (LPVOID*)&device); > + ok(hr == S_OK, "IDirectPlay8Address failed with 0x%08x\n", hr); > + > + hr = IDirectPlay8Address_SetSP(device, &CLSID_DP8SP_TCPIP); > + ok(hr == S_OK, "IDirectPlay8Address_SetSP failed with 0x%08x\n", hr); > + > + hr = IDirectPlay8Client_EnumHosts(client, &appdesc, host, device, NULL, 0, INFINITE, 0, INFINITE, NULL, &async, 0); > + todo_wine ok(hr == DPNSUCCESS_PENDING, "IDirectPlay8Client_EnumServiceProviders failed with 0x%08x\n", hr); > + todo_wine ok(async, "No Handle returned\n"); > + > + ret = WaitForSingleObject(hostenum, 2000); > + todo_wine ok(ret == WAIT_OBJECT_0, "Failed to get find host\n"); > + if(ret == WAIT_OBJECT_0) > + { > + DPNHANDLE handle = 0; > + > + hr = IDirectPlay8Client_Connect(client, &hostdesc, hostAddr, deviceAddr, NULL, NULL, NULL, 0, NULL, &handle, 0 ); > + todo_wine ok(hr == DPNSUCCESS_PENDING, "IDirectPlay8Client_EnumServiceProviders failed with 0x%08x\n", hr); > + > + ret = WaitForSingleObject(connect, 2000); > + todo_wine ok(ret == WAIT_OBJECT_0, "Connect failed.\n"); > + > + todo_wine ok(create_cnt == 1, "Wrong create player count (%d)\n", create_cnt); > + todo_wine ok(destroy_dnt == 0, "Wrong Destroy player count (%d)\n", destroy_dnt); > + todo_wine ok(indicate_cnt == 1, "wrong indicate count (%d)\n", indicate_cnt); > + } > + > + CloseHandle(connect); > + CloseHandle(hostenum); > + > + SetEvent(clientfinished); > + > + IDirectPlay8Address_Release(host); > + IDirectPlay8Address_Release(device); > +} > + > +static void cleanup(void) > +{ > + HRESULT hr; > + > + if(client) > + { > + IDirectPlay8Client_Close(client, 0); > + IDirectPlay8Client_Release(client); > + } > + > + if(hostAddr) > + IDirectPlay8Address_Release(hostAddr); > + if(deviceAddr) > + IDirectPlay8Address_Release(deviceAddr); > + > + if(server) > + { > + hr = IDirectPlay8Server_Close(server, 0); > + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); > + > + todo_wine ok(destroy_dnt == 2 || broken(destroy_dnt == 1), "Wrong Destroy player count (%d)\n", destroy_dnt); > > IDirectPlay8Server_Release(server); > } > @@ -109,5 +269,9 @@ START_TEST(server) > > create_server(); > > + create_client(); > + > + cleanup(); > + > CoUninitialize(); > } > -- > 2.6.1 > > >

1 0

Re: include/wine: make LegalCopyright match CompanyName (resend)
by Michael Stefaniuc 15 Oct '15

15 Oct '15

On 10/15/2015 01:02 PM, Austin English wrote: > Previous patch was dropped without comment. > > For https://bugs.winehq.org/show_bug.cgi?id=35659 > 0001-include-wine-make-LegalCopyright-match-CompanyName-r.txt > > > From 3430c0e8fceb605b42fc4424be03f1d8a745c365 Mon Sep 17 00:00:00 2001 > From: Austin English <austinenglish(a)gmail.com> > Date: Thu, 15 Oct 2015 05:59:58 -0500 > Subject: [PATCH] include/wine: make LegalCopyright match CompanyName (resend) > > Signed-off-by: Austin English <austinenglish(a)gmail.com> > --- > include/wine/wine_common_ver.rc | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/include/wine/wine_common_ver.rc b/include/wine/wine_common_ver.rc > index 5938582..52024aa 100644 > --- a/include/wine/wine_common_ver.rc > +++ b/include/wine/wine_common_ver.rc > @@ -106,7 +106,7 @@ FILESUBTYPE WINE_FILESUBTYPE > VALUE "FileDescription", WINE_FILEDESCRIPTION_STR > VALUE "FileVersion", WINE_FILEVERSION_STR > VALUE "InternalName", WINE_FILENAME > - VALUE "LegalCopyright", "Copyright (c) 1993-2015 the Wine project authors (see the file AUTHORS for a complete list)" > + VALUE "LegalCopyright", "Microsoft Corporation" /* CATIA needs this in both CompanyName _and_ LegalCopyright */ CATIA needs that only to verify that the host has a certified OpenGL driver. So for compatibility reasons that needs to go only to opengl32.dll, we don't have to spread that around. And that's actually what focht proposed. bye michael

2 1

Re: [v2 2/4] wined3d: make wined3d_device_get_front_buffer_data work with wined3d_texture and sub_resource_index
by Henri Verbeet 15 Oct '15

15 Oct '15

On 13 October 2015 at 18:45, Riccardo Bortolato <rikyz619(a)gmail.com> wrote: > HRESULT CDECL wined3d_device_get_front_buffer_data(const struct wined3d_device *device, > - UINT swapchain_idx, struct wined3d_surface *dst_surface) > + UINT swapchain_idx, struct wined3d_texture *texture, unsigned int sub_resource_idx) > { > + struct wined3d_resource *sub_resource; > struct wined3d_swapchain *swapchain; > > - TRACE("device %p, swapchain_idx %u, dst_surface %p.\n", device, swapchain_idx, dst_surface); > + TRACE("device %p, swapchain_idx %u, texture %p, sub_resource_idx %u.\n", device, swapchain_idx, texture, sub_resource_idx); > > - if (!(swapchain = wined3d_device_get_swapchain(device, swapchain_idx))) > + sub_resource = wined3d_texture_get_sub_resource(texture, sub_resource_idx); > + > + if (!sub_resource || !(swapchain = wined3d_device_get_swapchain(device, swapchain_idx))) > return WINED3DERR_INVALIDCALL; > > - return wined3d_swapchain_get_front_buffer_data(swapchain, dst_surface); > + return wined3d_swapchain_get_front_buffer_data(swapchain, surface_from_resource(sub_resource)); > } It's a little harder than that, I'm afraid. In particular, you can't assume the sub-resource is a surface here. (I.e., "texture" could be a volume texture.) In general, the rule is that anywhere you use surface_from_resource() you should make sure the resource is actually the surface in some way. In this specific case, the answer is probably that wined3d_device_get_front_buffer_data() should just go away, and callers should use wined3d_swapchain_get_front_buffer_data() directly instead. Of course that only slightly moves the problem, so wined3d_swapchain_get_front_buffer_data() should then verify that it gets an appropriate texture when you make the equivalent change there.

2 2

Re: [v2 3/4] wined3d: make wined3d_device_set_cursor_properties work with wined3d_texture and sub_resource_index
by Henri Verbeet 15 Oct '15

15 Oct '15

On 13 October 2015 at 18:45, Riccardo Bortolato <rikyz619(a)gmail.com> wrote: > HRESULT CDECL wined3d_device_set_cursor_properties(struct wined3d_device *device, > - UINT x_hotspot, UINT y_hotspot, struct wined3d_surface *cursor_image) > + UINT x_hotspot, UINT y_hotspot, struct wined3d_texture *texture, unsigned int sub_resource_idx) > { > - TRACE("device %p, x_hotspot %u, y_hotspot %u, cursor_image %p.\n", > - device, x_hotspot, y_hotspot, cursor_image); > + struct wined3d_resource *sub_resource; > + struct wined3d_surface *cursor_image; > + > + TRACE("device %p, x_hotspot %u, y_hotspot %u, texture %p, sub_resource_idx %u.\n", > + device, x_hotspot, y_hotspot, texture, sub_resource_idx); > + > + sub_resource = wined3d_texture_get_sub_resource(texture, sub_resource_idx); > + > + if (!sub_resource) > + return WINED3DERR_INVALIDCALL; You can merge these lines: if (!(sub_resource = wined3d_texture_get_sub_resource(texture, sub_resource_idx))) return WINED3DERR_INVALIDCALL; Other than that, this has the same issue as patch 2/4 that "sub_resource" isn't necessarily a surface.

1 0

Re: [PATCH 1/6] d3d11: Implement d3d11_immediate_context_IASetPrimitiveTopology().
by Józef Kucia 15 Oct '15

15 Oct '15

On Wed, Oct 14, 2015 at 2:08 AM, Józef Kucia <jkucia(a)codeweavers.com> wrote: > Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> > --- > dlls/d3d11/device.c | 14 +++++++++++++- > 1 file changed, 13 insertions(+), 1 deletion(-) > > diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c > index 8a7a794..a06f3e6 100644 > --- a/dlls/d3d11/device.c > +++ b/dlls/d3d11/device.c > @@ -39,6 +39,12 @@ static inline struct d3d11_immediate_context *impl_from_ID3D11DeviceContext(ID3D > return CONTAINING_RECORD(iface, struct d3d11_immediate_context, ID3D11DeviceContext_iface); > } > > +static inline struct d3d_device *device_from_immediate_ID3D11DeviceContext(ID3D11DeviceContext *iface) > +{ > + struct d3d11_immediate_context *context = impl_from_ID3D11DeviceContext(iface); > + return CONTAINING_RECORD(context, struct d3d_device, immediate_context); > +} > + > static HRESULT STDMETHODCALLTYPE d3d11_immediate_context_QueryInterface(ID3D11DeviceContext *iface, > REFIID riid, void **out) > { > @@ -249,7 +255,13 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_GSSetShader(ID3D11DeviceCo > static void STDMETHODCALLTYPE d3d11_immediate_context_IASetPrimitiveTopology(ID3D11DeviceContext *iface, > D3D11_PRIMITIVE_TOPOLOGY topology) > { > - FIXME("iface %p, topology %u stub!\n", iface, topology); > + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); We could alternatively keep a pointer to d3d_device in d3d_immediate_context instead of a pointer to ID3D11Device.

2 4

Implementing the console font table
by Hugh McMaster 15 Oct '15

15 Oct '15

I'm implementing a version of the console font table, as it is needed by GetCurrentConsoleFont and friends. The Windows VMs on the testbot have the console font tables listed in [1]. As you can see, most of the font tables are the same (although the table itself depends on the host configuration). If the user changes the console font size, the new size is added to the table (if it is not already listed) and the active font index (nFont) re-assigned. 1. How much of the Windows table should be implemented in Wine? (Windows programs call GetCurrentConsoleFont, then pass the active font index to GetConsoleFontSize to retrieve the actual cell width/height). Keep in mind that Wine generally uses fonts not available on Windows, meaning the testbot data is somewhat irrelevant. It seems to me that we could simply use the registry font size as index 0 and add any new font sizes selected by the user to the array later. 2. Where to implement this functionality? In kernel32? Any comments/opinions welcome. [1] https://www.dropbox.com/s/bsvgxlwoamybu0y/font-table.pdf?dl=0 -- Hugh McMaster

2 2

Re: [PATCH 1/3] ws2_32: Implement a basic synchronous TransmitFile (try 4).
by Alexandre Julliard 14 Oct '15

14 Oct '15

"Erich E. Hoover" <erich.e.hoover(a)wine-staging.com> writes: > This patch adds support for the basic file-transfer operation of > TransmitFile. It reads the file in as "bytes_per_send" chunks, which > it then sends to the destination using WS2_send. This process is > repeated synchronously (until patch 5 adds async support) until the > entire file is sent. It doesn't work here: ../../../tools/runtest -q -P wine -T ../../.. -M ws2_32.dll -p ws2_32_test.exe.so sock && touch sock.ok sock.c:2399: Tests skipped: SOCK_RAW is not supported sock.c:7545: Test failed: TransmitFile failed unexpectedly. sock.c:7734: Tests skipped: Cannot test SIO_ADDRESS_LIST_CHANGE, interactive tests must be enabled make: *** [sock.ok] Error 1 -- Alexandre Julliard julliard(a)winehq.org

2 1

wine Presentation at ubucon Berlin - Powered by Codeweavers and Software Freedom Conservancy Project
by Maik Wagner 14 Oct '15

14 Oct '15

Hello everyone, thanks to Jeremy White and Sebastian (who made me aware of this) I have received funding to hold a presentation on wine in Berlin. The conference is called ubucon and is focussed on Ubuntu Linux which takes place from 23-25 October in Berlin at the premises of a privately owned higher education institution in Friedrichstraße. There is a quite well-known forum at ubuntuusers.de where I give regular support concerning wine. It's mostly helping people getting their games to run and Microsoft Office issues also come up frequently. I post a link to my presentation which will take about one hour. The time slot afterwards is still free and I am willing to take this longer if the room is still free and people are interested http://ubucon.de/2015/programm#wine I have attached the slides which I have developed so far and I can certainly change the master slides to match a more wine-centric "corporate identity" if there is any. I will be leaving for Berlin next Friday and will be available during the whole conference if people are interested in talking to me. You can also ask me about "Crossover" as I am regularly submitting Beta-reports and made it to "Mythical" ranking. I am also maintaining some applications in AppDB (Fifa 2005 Demo, Crazy Taxi Demo, Nerf Arena Blast and Fotostation Pro) I will be bringing my Slackware 14.1 laptop as wine always compiles fine on this machine. It is a fairly old laptop though and still on 32-bits and a fairly broken graphics stack but I think it should be alright to show people that there is a development version around. I will also test and present some demos and show people how to file reports in AppDB. I will be reporting back on how the presentation went on this mailing-list as this is part of the sponsorship deal. Again, thanks to everyone who supported this. Please feel free to write to me and share some ideas, comments etc. Best regards, Maik Wagner

2 3

Re: [PATCH 3/3] ws2_32: Add asynchronous support for TransmitFile.
by Alexandre Julliard 14 Oct '15

14 Oct '15

"Erich E. Hoover" <erich.e.hoover(a)wine-staging.com> writes: > + LARGE_INTEGER offset; > + int status; > + > + /* set the file offset to the desired point */ > + offset.u.LowPart = overlapped->u.s.Offset; > + offset.u.HighPart = overlapped->u.s.OffsetHigh; > + SetFilePointerEx( wsa->file, offset, NULL, FILE_BEGIN ); You need to handle overlapped files differently, using pread() instead of setting the file pointer. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: cmd/tests: Simplify boolean expressions (PVS-Studio)
by Marvin 14 Oct '15

14 Oct '15

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=17349 Your paranoid android. === wxppro (32 bit batch) === batch.c:312: Test failed: unexpected char 0x47 position 0 in line 708 (got 'Got unexpected result: "C:\Documents"', wanted 'Plain directory enumeration from provided root') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 709 (got 'Got unexpected result: "C:\Documents"', wanted 'File enumeration') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 710 (got 'Got unexpected result: "C:\Documents"', wanted 'File enumeration from provided root') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 711 (got 'Got unexpected result: "C:\Documents"', wanted 'Mixed enumeration') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 712 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\."', wanted 'Mixed enumeration from provided root') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 713 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\bar\."', wanted 'With duplicates enumeration') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 714 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\baz\."', wanted 'Strip missing wildcards, keep unwildcarded names') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 715 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\foo\."', wanted 'for /R passed') batch.c:312: Test failed: unexpected char 0x50 position 0 in line 716 (got 'Plain directory enumeration from provided root', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 717 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 718 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 719 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 720 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 721 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 722 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\bar\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 723 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\baz\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 724 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\foo\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 725 (got 'File enumeration', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 726 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 727 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 728 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\baz\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 729 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 730 (got 'File enumeration from provided root', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 731 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 732 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 733 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\baz\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 734 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x4d position 0 in line 735 (got 'Mixed enumeration', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 736 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 737 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 738 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 739 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 740 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 741 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 742 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 743 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\bar\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 744 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\baz\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 745 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\baz\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 746 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 747 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\foo\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x4d position 0 in line 748 (got 'Mixed enumeration from provided root', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 749 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 750 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 751 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 752 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 753 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 754 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 755 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 756 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\bar\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 757 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\baz\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 758 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\baz\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 759 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 760 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\foo\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 761 (got 'With duplicates enumeration', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 762 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 763 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 764 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 765 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 766 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 767 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 768 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 769 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 770 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 771 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 772 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 773 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 774 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\bar\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 775 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\bar\fred"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 776 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\baz\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 777 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\baz\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 778 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\baz\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 779 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\baz\fred"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 780 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 781 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 782 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 783 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\foo\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 784 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\foo\fred"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 785 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\fred"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x53 position 0 in line 786 (got 'Strip missing wildcards, keep unwildcarded names', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 787 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 788 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 789 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 790 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 791 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 792 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 793 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\bar\jim"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 794 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\baz\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 795 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\baz\jim"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 796 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 797 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\foo\jim"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 798 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\jim"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x66 position 0 in line 799 (got 'for /R passed', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 1383 (got 'Finished:', wanted 'value2') batch.c:312: Test failed: unexpected char 0x76 position 0 in line 1384 (got 'value2', wanted '2set1endvalue1') batch.c:312: Test failed: unexpected char 0x43 position 0 in line 1385 (got 'C:\Documents and Settings\winetest\My Documents\foobar\foodir2', wanted '@drive@@path@foobar\foodir3') batch.c:312: Test failed: unexpected char 0x76 position 0 in line 1386 (got 'value1', wanted 'Finished:') batch.c:312: Test failed: unexpected char 0x43 position 0 in line 1387 (got 'C:\Documents and Settings\winetest\My Documents\foobar', wanted 'value2') batch.c:312: Test failed: unexpected char 0x2d position 0 in line 1388 (got '--- Extra endlocal in called batch', wanted '@drive@@path@foobar\foodir2') batch.c:312: Test failed: unexpected char 0x2d position 0 in line 1389 (got '--- Extra endlocal in called batch', wanted 'value1') batch.c:312: Test failed: unexpected char 0x2d position 0 in line 1390 (got '--- Extra endlocal in called batch', wanted '@drive@@path@foobar') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 1392 (got 'Finished:', wanted 'value2') batch.c:312: Test failed: unexpected char 0x76 position 0 in line 1395 (got 'value1', wanted 'value2') batch.c:312: Test failed: unexpected char 0x43 position 0 in line 1396 (got 'C:\Documents and Settings\winetest\My Documents\foobar', wanted '@drive@@path@foobar\foodir2') batch.c:312: Test failed: unexpected char 0x2d position 0 in line 1397 (got '--- endlocal in called function rather than batch pgm is ineffective', wanted 'Finished:') batch.c:312: Test failed: unexpected char 0x2d position 0 in line 1398 (got '--- endlocal in called function rather than batch pgm is ineffective', wanted 'value2') batch.c:312: Test failed: unexpected char 0x2d position 0 in line 1399 (got '--- endlocal in called function rather than batch pgm is ineffective', wanted '@drive@@path@foobar\foodir2') batch.c:312: Test failed: unexpected char 0x2d position 0 in line 1400 (got '--- endlocal in called function rather than batch pgm is ineffective', wanted 'value1') batch.c:312: Test failed: unexpected char 0x2d position 0 in line 1401 (got '--- endlocal in called function rather than batch pgm is ineffective', wanted '@drive@@path@foobar') === w2003std (32 bit batch) === batch.c:312: Test failed: unexpected char 0x47 position 0 in line 708 (got 'Got unexpected result: "C:\Documents"', wanted 'Plain directory enumeration from provided root') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 709 (got 'Got unexpected result: "C:\Documents"', wanted 'File enumeration') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 710 (got 'Got unexpected result: "C:\Documents"', wanted 'File enumeration from provided root') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 711 (got 'Got unexpected result: "C:\Documents"', wanted 'Mixed enumeration') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 712 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\."', wanted 'Mixed enumeration from provided root') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 713 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\bar\."', wanted 'With duplicates enumeration') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 714 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\baz\."', wanted 'Strip missing wildcards, keep unwildcarded names') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 715 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\foo\."', wanted 'for /R passed') batch.c:312: Test failed: unexpected char 0x50 position 0 in line 716 (got 'Plain directory enumeration from provided root', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 717 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 718 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 719 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 720 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 721 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 722 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\bar\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 723 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\baz\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 724 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\foo\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 725 (got 'File enumeration', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 726 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 727 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 728 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\baz\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 729 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 730 (got 'File enumeration from provided root', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 731 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 732 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 733 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\baz\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 734 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x4d position 0 in line 735 (got 'Mixed enumeration', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 736 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 737 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 738 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 739 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 740 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 741 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 742 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 743 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\bar\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 744 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\baz\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 745 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\baz\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 746 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 747 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\foo\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x4d position 0 in line 748 (got 'Mixed enumeration from provided root', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 749 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 750 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 751 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 752 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 753 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 754 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 755 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 756 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\bar\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 757 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\baz\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 758 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\baz\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 759 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 760 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\foo\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 761 (got 'With duplicates enumeration', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 762 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 763 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 764 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 765 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 766 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 767 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 768 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 769 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 770 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 771 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 772 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 773 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 774 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\bar\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 775 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\bar\fred"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 776 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\baz\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 777 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\baz\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 778 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\baz\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 779 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\baz\fred"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 780 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 781 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 782 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 783 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\foo\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 784 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\foo\fred"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 785 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\fred"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x53 position 0 in line 786 (got 'Strip missing wildcards, keep unwildcarded names', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 787 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 788 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 789 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 790 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 791 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 792 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 793 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\bar\jim"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 794 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\baz\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 795 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\baz\jim"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 796 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 797 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\foo\jim"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 798 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\jim"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x66 position 0 in line 799 (got 'for /R passed', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 1383 (got 'Finished:', wanted 'value2') batch.c:312: Test failed: unexpected char 0x76 position 0 in line 1384 (got 'value2', wanted '2set1endvalue1') batch.c:312: Test failed: unexpected char 0x43 position 0 in line 1385 (got 'C:\Documents and Settings\Administrator\My Documents\foobar\foodir2', wanted '@drive@@path@foobar\foodir3') batch.c:312: Test failed: unexpected char 0x76 position 0 in line 1386 (got 'value1', wanted 'Finished:') batch.c:312: Test failed: unexpected char 0x43 position 0 in line 1387 (got 'C:\Documents and Settings\Administrator\My Documents\foobar', wanted 'value2') batch.c:312: Test failed: unexpected char 0x2d position 0 in line 1388 (got '--- Extra endlocal in called batch', wanted '@drive@@path@foobar\foodir2') batch.c:312: Test failed: unexpected char 0x2d position 0 in line 1389 (got '--- Extra endlocal in called batch', wanted 'value1') batch.c:312: Test failed: unexpected char 0x2d position 0 in line 1390 (got '--- Extra endlocal in called batch', wanted '@drive@@path@foobar') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 1392 (got 'Finished:', wanted 'value2') batch.c:312: Test failed: unexpected char 0x76 position 0 in line 1395 (got 'value1', wanted 'value2') batch.c:312: Test failed: unexpected char 0x43 position 0 in line 1396 (got 'C:\Documents and Settings\Administrator\My Documents\foobar', wanted '@drive@@path@foobar\foodir2') batch.c:312: Test failed: unexpected char 0x2d position 0 in line 1397 (got '--- endlocal in called function rather than batch pgm is ineffective', wanted 'Finished:') batch.c:312: Test failed: unexpected char 0x2d position 0 in line 1398 (got '--- endlocal in called function rather than batch pgm is ineffective', wanted 'value2') batch.c:312: Test failed: unexpected char 0x2d position 0 in line 1399 (got '--- endlocal in called function rather than batch pgm is ineffective', wanted '@drive@@path@foobar\foodir2') batch.c:312: Test failed: unexpected char 0x2d position 0 in line 1400 (got '--- endlocal in called function rather than batch pgm is ineffective', wanted 'value1') batch.c:312: Test failed: unexpected char 0x2d position 0 in line 1401 (got '--- endlocal in called function rather than batch pgm is ineffective', wanted '@drive@@path@foobar') === w1064 (32 bit batch) === batch.c:312: Test failed: unexpected char 0x27 position 0 in line 334 (got ''--a--------'', wanted ''--a------'@or_broken@'%~ai'') === w1064 (64 bit batch) === batch.c:312: Test failed: unexpected char 0x27 position 0 in line 334 (got ''--a--------'', wanted ''--a------'@or_broken@'%~ai'')

2 1

Re: [PATCH 2/5] wined3d: Remove wined3d_device_present (v2).
by Henri Verbeet 14 Oct '15

14 Oct '15

On 8 October 2015 at 20:09, Stefan Dösinger <stefan(a)codeweavers.com> wrote: > index c995afb..1355a95 100644 > --- a/dlls/d3d9/swapchain.c > +++ b/dlls/d3d9/swapchain.c > @@ -118,10 +118,6 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH d3d9_swapchain_Present(IDirect3DSwapChai > struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(swapchain->parent_device); > HRESULT hr; > > - TRACE("iface %p, src_rect %s, dst_rect %s, dst_window_override %p, dirty_region %p, flags %#x.\n", > - iface, wine_dbgstr_rect(src_rect), wine_dbgstr_rect(dst_rect), > - dst_window_override, dirty_region, flags); > Why would you want to do that?

2 1

Re: [PATCH] d3d8, 9/tests: Use BOOL variable for ShowCursor return value (PVS-Studio)
by Marvin 14 Oct '15

14 Oct '15

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=17345 Your paranoid android. === w1064 (64 bit device) === device.c:4213: Test failed: cw is 0xf60, expected 0x7f. device.c:4222: Test failed: Callback cw is 0xf60, expected 0x7f.

1 0

Re: [PATCH] d3d8, 9/tests: Use BOOL variable for ShowCursor return value (PVS-Studio)
by Marvin 14 Oct '15

14 Oct '15

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=17344 Your paranoid android. === w1064 (32 bit device) === device.c:2612: Test failed: Expected message 0x7e for window 0, but didn't receive it. device.c:2617: Test failed: The focus window is active. device.c:2625: Test failed: Got unexpected hr 0x88760869. device.c:2631: Test failed: Got unexpect screen size 1152x870. device.c:2646: Test failed: Expected message 0x47 for window 0, but didn't receive it, i=2. device.c:2655: Test failed: Got unexpect screen size 1152x870. device.c:2668: Test failed: Expected message 0x7e for window 0, but didn't receive it. device.c:2676: Test failed: Got unexpect width 1152. device.c:2677: Test failed: Got unexpect height 864.

1 0

Re: [PATCH] gdi32: Return default palette entries from GetSystemPaletteEntries for non-palette-based devices. (try 4, resend)
by Huw Davies 14 Oct '15

14 Oct '15

On 14 Oct 2015, at 07:13, Anton Baskanov wrote: > diff --git a/dlls/gdi32/palette.c b/dlls/gdi32/palette.c > index d850d0f..70a75d8 100644 > --- a/dlls/gdi32/palette.c > +++ b/dlls/gdi32/palette.c > @@ -418,8 +418,39 @@ UINT WINAPI GetSystemPaletteEntries( > + { > + if (entries && start < 256) > + { > + UINT i; > + const RGBQUAD *default_entries; > + > + if (start + count > 256) count = 256 - start; > + > + default_entries = get_default_color_table( 8 ); > + for (i = 0; i < count; ++i) > + { > + if (start + i < 10 || start + i >= 246) > + { > + entries[i].peRed = default_entries[start + i].rgbRed; > + entries[i].peGreen = default_entries[start + i].rgbGreen; > + entries[i].peBlue = default_entries[start + i].rgbBlue; > + } > + else > + { > + entries[i].peRed = 0; > + entries[i].peGreen = 0; > + entries[i].peBlue = 0; > + } > + entries[i].peFlags = 0; > + } > + } > + } I think this should be moved to nulldrv_GetSystemPaletteEntries(). Then X11DRV_GetSystemPaletteEntries() should forward to this (using GET_NEXT_PHYSDEV) in the case that 'palette_size' is zero. This avoids the ugly GetDeviceCaps call at the beginning. Huw.

1 0

Re: [v2 1/6] d3d8: make use of wined3d_texture_map in d3d8_surface_LockRect
by Henri Verbeet 13 Oct '15

13 Oct '15

On 11 October 2015 at 13:29, Riccardo Bortolato <rikyz619(a)gmail.com> wrote: > diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c > index 20027a7..8f66112 100644 > --- a/dlls/d3d11/device.c > +++ b/dlls/d3d11/device.c > @@ -3007,11 +3007,11 @@ static void CDECL device_parent_activate(struct wined3d_device_parent *device_pa > } > > static HRESULT CDECL device_parent_surface_created(struct wined3d_device_parent *device_parent, > - void *container_parent, struct wined3d_surface *surface, void **parent, > + struct wined3d_texture *wined3d_texture, unsigned int sub_resource_idx, struct wined3d_surface *surface, void **parent, > const struct wined3d_parent_ops **parent_ops) > { > - TRACE("device_parent %p, container_parent %p, surface %p, parent %p, parent_ops %p.\n", > - device_parent, container_parent, surface, parent, parent_ops); > + TRACE("device_parent %p, wined3d_texture %p, sub_resource_idx %u, surface %p, parent %p, parent_ops %p.\n", > + device_parent, wined3d_texture, sub_resource_idx, surface, parent, parent_ops); > > *parent = NULL; > *parent_ops = &d3d10_null_wined3d_parent_ops; This series looks fine, but there's a (trivial) merge conflict due to commit a865b14aedb01def345c09732717c3c5f2eb6dab.

3 2

ddraw cleanup
by Riccardo Bortolato 13 Oct '15

13 Oct '15

Hi, While sending the other cleanup patches I worked towards wined3d_surface freedom in ddraw and reached a critical point (aka it's the last thing I need to do and it's something that needs a strong decision): in order to get rid of wined3d_surface_get_resource() I need to accomodate the wined3d_resource_get_desc() call inside ddraw_surface_init() (ddraw/surface.c). Since the callback is executed when the wined3d_texture->sub_resources list isn't ready yet, I cannot use wined3d_texture_get_sub_resource(). So here are the ideas so far: - keep wined3d surface in the callback only (really ugly) - move the wined3d_resource_get_desc() calls in a loop after wined3d_texture_create() (kind of ugly) - do magic in wined3d (really unlikely?) Any ideas? Ciao, Riccardo

2 1

Re: [PATCH 4/7] wined3d: make wined3d_device_set_cursor_properties work with wined3d_texture and sub_resource_index
by Henri Verbeet 13 Oct '15

13 Oct '15

On 12 October 2015 at 17:23, Riccardo Bortolato <rikyz619(a)gmail.com> wrote: > HRESULT CDECL wined3d_device_set_cursor_properties(struct wined3d_device *device, > - UINT x_hotspot, UINT y_hotspot, struct wined3d_surface *cursor_image) > + UINT x_hotspot, UINT y_hotspot, struct wined3d_texture *wined3d_texture, unsigned int sub_resource_idx) "wined3d_texture" is redundant inside wined3d, just "texture" is fine. > { > + struct wined3d_resource *sub_resource = wined3d_texture_get_sub_resource(wined3d_texture, sub_resource_idx); > + struct wined3d_surface *cursor_image; > + > + if (!sub_resource) > + return WINED3DERR_INVALIDCALL; > + > + cursor_image = surface_from_resource(sub_resource); > + > TRACE("device %p, x_hotspot %u, y_hotspot %u, cursor_image %p.\n", > device, x_hotspot, y_hotspot, cursor_image); Like in 3/7, please move most of the new lines after the TRACE, and then update the trace to match the parameters.

1 0

Re: [PATCH 3/7] wined3d: make wined3d_device_get_front_buffer_data work with wined3d_texture and sub_resource_index
by Henri Verbeet 13 Oct '15

13 Oct '15

On 12 October 2015 at 17:23, Riccardo Bortolato <rikyz619(a)gmail.com> wrote: > HRESULT CDECL wined3d_device_get_front_buffer_data(const struct wined3d_device *device, > - UINT swapchain_idx, struct wined3d_surface *dst_surface) > + UINT swapchain_idx, struct wined3d_texture *texture, unsigned int sub_resource_idx) > { > + struct wined3d_resource *sub_resource = wined3d_texture_get_sub_resource(texture, sub_resource_idx); I'd rather have the wined3d_texture_get_sub_resource() call after the TRACE. It's not too much of an issue, but it does affect the order of the traces in the debug output. > - TRACE("device %p, swapchain_idx %u, dst_surface %p.\n", device, swapchain_idx, dst_surface); > + TRACE("device %p, swapchain_idx %u, texture %p, sub_index %u.\n", device, swapchain_idx, texture, sub_resource_idx); And please just match the parameter name here.

1 0

Re: [PATCH 1/7] d3d8: use wined3d_rendertarget_view_create instead of wined3d_rendertarget_view_create_from_surface in d3d8_surface_get_rendertarget_view
by Henri Verbeet 13 Oct '15

13 Oct '15

On 12 October 2015 at 17:23, Riccardo Bortolato <rikyz619(a)gmail.com> wrote: > + resource = wined3d_texture_get_resource(surface->wined3d_texture); > + if (!resource) > + { > + ERR("No resource found.\n"); > + return NULL; > + } wined3d_texture_get_resource() can't fail.

1 0

Re: [PATCH 1/4] ole32: Hold a reference to the stub manager throughout an incoming call.
by Jacek Caban 13 Oct '15

13 Oct '15

Hi Huw, On 10/13/15 15:49, Huw Davies wrote: > -HRESULT ipid_get_dispatch_params(const IPID *ipid, APARTMENT **stub_apt, IRpcStubBuffer **stub, IRpcChannelBuffer **chan, IID *iid, IUnknown **iface) DECLSPEC_HIDDEN; > +HRESULT ipid_get_dispatch_params(const IPID *ipid, APARTMENT **stub_apt, struct stub_manager **manager, IRpcStubBuffer **stub, > + IRpcChannelBuffer **chan, IID *iid, IUnknown **iface) DECLSPEC_HIDDEN; How about returning stub manager instead of APARTMENT? It already contains APARTMENT reference. Thanks, Jacek

2 1

Re: [PATCH 3/4] ole32/tests: Test calling CoDisconnectObject from within a COM call to the object.
by Marvin 13 Oct '15

13 Oct '15

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=17337 Your paranoid android. === w8 (32 bit marshal) === marshal.c:3473: Test failed: info->cbSize was -86228343 instead of 48 marshal.c:3474: Test failed: info->dwServerPid was 0x694 instead of 0xff0 marshal.c:3490: Test failed: info->cbSize was -86228343 instead of 48 marshal.c:3491: Test failed: info->dwServerPid was 0x694 instead of 0xff0 marshal.c:3528: Test failed: info->cbSize was -86228343 instead of 48 marshal.c:3529: Test failed: info->dwServerPid was 0x694 instead of 0xff0 marshal.c:3546: Test failed: info->cbSize was -86228343 instead of 48 marshal.c:3547: Test failed: info->dwServerPid was 0x694 instead of 0xff0 marshal.c:3510: Test failed: info->cbSize was -86228343 instead of 48 marshal.c:3511: Test failed: info->dwServerPid was 0x694 instead of 0xff0 marshal.c:3473: Test failed: info->cbSize was -86228343 instead of 48 marshal.c:3474: Test failed: info->dwServerPid was 0x694 instead of 0xff0 marshal.c:3490: Test failed: info->cbSize was -86228343 instead of 48 marshal.c:3491: Test failed: info->dwServerPid was 0x694 instead of 0xff0 marshal.c:3528: Test failed: info->cbSize was -86228343 instead of 48 marshal.c:3529: Test failed: info->dwServerPid was 0x694 instead of 0xff0 marshal.c:3546: Test failed: info->cbSize was -86228343 instead of 48 marshal.c:3547: Test failed: info->dwServerPid was 0x694 instead of 0xff0 marshal.c:3510: Test failed: info->cbSize was -86228343 instead of 48 marshal.c:3511: Test failed: info->dwServerPid was 0x694 instead of 0xff0 marshal.c:3473: Test failed: info->cbSize was -86228343 instead of 48 marshal.c:3474: Test failed: info->dwServerPid was 0x694 instead of 0xff0 marshal.c:3490: Test failed: info->cbSize was -86228343 instead of 48 marshal.c:3491: Test failed: info->dwServerPid was 0x694 instead of 0xff0 marshal.c:3528: Test failed: info->cbSize was -86228343 instead of 48 marshal.c:3529: Test failed: info->dwServerPid was 0x694 instead of 0xff0 marshal.c:3546: Test failed: info->cbSize was -86228343 instead of 48 marshal.c:3547: Test failed: info->dwServerPid was 0x694 instead of 0xff0 marshal.c:3510: Test failed: info->cbSize was -86228343 instead of 48 marshal.c:3511: Test failed: info->dwServerPid was 0x694 instead of 0xff0 === w864 (32 bit marshal) === marshal.c:3473: Test failed: info->cbSize was 48454452 instead of 48 marshal.c:3474: Test failed: info->dwServerPid was 0xcc instead of 0x7e8 marshal.c:3490: Test failed: info->cbSize was 48454452 instead of 48 marshal.c:3491: Test failed: info->dwServerPid was 0xcc instead of 0x7e8 marshal.c:3528: Test failed: info->cbSize was 48454452 instead of 48 marshal.c:3529: Test failed: info->dwServerPid was 0xcc instead of 0x7e8 marshal.c:3546: Test failed: info->cbSize was 48454452 instead of 48 marshal.c:3547: Test failed: info->dwServerPid was 0xcc instead of 0x7e8 marshal.c:3510: Test failed: info->cbSize was 48454452 instead of 48 marshal.c:3511: Test failed: info->dwServerPid was 0xcc instead of 0x7e8 marshal.c:3473: Test failed: info->cbSize was 48454452 instead of 48 marshal.c:3474: Test failed: info->dwServerPid was 0xcc instead of 0x7e8 marshal.c:3490: Test failed: info->cbSize was 48454452 instead of 48 marshal.c:3491: Test failed: info->dwServerPid was 0xcc instead of 0x7e8 marshal.c:3528: Test failed: info->cbSize was 48454452 instead of 48 marshal.c:3529: Test failed: info->dwServerPid was 0xcc instead of 0x7e8 marshal.c:3546: Test failed: info->cbSize was 48454452 instead of 48 marshal.c:3547: Test failed: info->dwServerPid was 0xcc instead of 0x7e8 marshal.c:3510: Test failed: info->cbSize was 48454452 instead of 48 marshal.c:3511: Test failed: info->dwServerPid was 0xcc instead of 0x7e8 marshal.c:3473: Test failed: info->cbSize was 48454452 instead of 48 marshal.c:3474: Test failed: info->dwServerPid was 0xcc instead of 0x7e8 marshal.c:3490: Test failed: info->cbSize was 48454452 instead of 48 marshal.c:3491: Test failed: info->dwServerPid was 0xcc instead of 0x7e8 marshal.c:3528: Test failed: info->cbSize was 48454452 instead of 48 marshal.c:3529: Test failed: info->dwServerPid was 0xcc instead of 0x7e8 marshal.c:3546: Test failed: info->cbSize was 48454452 instead of 48 marshal.c:3547: Test failed: info->dwServerPid was 0xcc instead of 0x7e8 marshal.c:3510: Test failed: info->cbSize was 48454452 instead of 48 marshal.c:3511: Test failed: info->dwServerPid was 0xcc instead of 0x7e8 === w1064 (32 bit marshal) === marshal.c:3473: Test failed: info->cbSize was -1482345884 instead of 48 marshal.c:3474: Test failed: info->dwServerPid was 0x139c instead of 0xc6c marshal.c:3490: Test failed: info->cbSize was -1482345884 instead of 48 marshal.c:3491: Test failed: info->dwServerPid was 0x139c instead of 0xc6c marshal.c:3528: Test failed: info->cbSize was -1482345884 instead of 48 marshal.c:3529: Test failed: info->dwServerPid was 0x139c instead of 0xc6c marshal.c:3530: Test failed: info->pObject shouldn't be NULL marshal.c:3546: Test failed: info->cbSize was -1482345884 instead of 48 marshal.c:3547: Test failed: info->dwServerPid was 0x139c instead of 0xc6c marshal.c:3548: Test failed: info->pObject shouldn't be NULL marshal.c:3510: Test failed: info->cbSize was -1482345884 instead of 48 marshal.c:3511: Test failed: info->dwServerPid was 0x139c instead of 0xc6c marshal.c:3513: Test failed: info->pObject shouldn't be NULL marshal.c:3473: Test failed: info->cbSize was -1482345884 instead of 48 marshal.c:3474: Test failed: info->dwServerPid was 0x139c instead of 0xc6c marshal.c:3490: Test failed: info->cbSize was -1482345884 instead of 48 marshal.c:3491: Test failed: info->dwServerPid was 0x139c instead of 0xc6c marshal.c:3528: Test failed: info->cbSize was -1482345884 instead of 48 marshal.c:3529: Test failed: info->dwServerPid was 0x139c instead of 0xc6c marshal.c:3530: Test failed: info->pObject shouldn't be NULL marshal.c:3546: Test failed: info->cbSize was -1482345884 instead of 48 marshal.c:3547: Test failed: info->dwServerPid was 0x139c instead of 0xc6c marshal.c:3548: Test failed: info->pObject shouldn't be NULL marshal.c:3510: Test failed: info->cbSize was -1482345884 instead of 48 marshal.c:3511: Test failed: info->dwServerPid was 0x139c instead of 0xc6c marshal.c:3513: Test failed: info->pObject shouldn't be NULL marshal.c:3473: Test failed: info->cbSize was -1482345884 instead of 48 marshal.c:3474: Test failed: info->dwServerPid was 0x139c instead of 0xc6c marshal.c:3490: Test failed: info->cbSize was -1482345884 instead of 48 marshal.c:3491: Test failed: info->dwServerPid was 0x139c instead of 0xc6c marshal.c:3528: Test failed: info->cbSize was -1482345884 instead of 48 marshal.c:3529: Test failed: info->dwServerPid was 0x139c instead of 0xc6c marshal.c:3530: Test failed: info->pObject shouldn't be NULL marshal.c:3546: Test failed: info->cbSize was -1482345884 instead of 48 marshal.c:3547: Test failed: info->dwServerPid was 0x139c instead of 0xc6c marshal.c:3548: Test failed: info->pObject shouldn't be NULL marshal.c:3510: Test failed: info->cbSize was -1482345884 instead of 48 marshal.c:3511: Test failed: info->dwServerPid was 0x139c instead of 0xc6c marshal.c:3513: Test failed: info->pObject shouldn't be NULL === w864 (64 bit marshal) === marshal.c:3473: Test failed: info->cbSize was -418054392 instead of 56 marshal.c:3474: Test failed: info->dwServerPid was 0x960 instead of 0xa14 marshal.c:3490: Test failed: info->cbSize was -418054392 instead of 56 marshal.c:3491: Test failed: info->dwServerPid was 0x960 instead of 0xa14 marshal.c:3528: Test failed: info->cbSize was -418054392 instead of 56 marshal.c:3529: Test failed: info->dwServerPid was 0x960 instead of 0xa14 marshal.c:3546: Test failed: info->cbSize was -418054392 instead of 56 marshal.c:3547: Test failed: info->dwServerPid was 0x960 instead of 0xa14 marshal.c:3510: Test failed: info->cbSize was -418054392 instead of 56 marshal.c:3511: Test failed: info->dwServerPid was 0x960 instead of 0xa14 marshal.c:3473: Test failed: info->cbSize was -418054392 instead of 56 marshal.c:3474: Test failed: info->dwServerPid was 0x960 instead of 0xa14 marshal.c:3490: Test failed: info->cbSize was -418054392 instead of 56 marshal.c:3491: Test failed: info->dwServerPid was 0x960 instead of 0xa14 marshal.c:3528: Test failed: info->cbSize was -418054392 instead of 56 marshal.c:3529: Test failed: info->dwServerPid was 0x960 instead of 0xa14 marshal.c:3546: Test failed: info->cbSize was -418054392 instead of 56 marshal.c:3547: Test failed: info->dwServerPid was 0x960 instead of 0xa14 marshal.c:3510: Test failed: info->cbSize was -418054392 instead of 56 marshal.c:3511: Test failed: info->dwServerPid was 0x960 instead of 0xa14 marshal.c:3473: Test failed: info->cbSize was -418054392 instead of 56 marshal.c:3474: Test failed: info->dwServerPid was 0x960 instead of 0xa14 marshal.c:3490: Test failed: info->cbSize was -418054392 instead of 56 marshal.c:3491: Test failed: info->dwServerPid was 0x960 instead of 0xa14 marshal.c:3528: Test failed: info->cbSize was -418054392 instead of 56 marshal.c:3529: Test failed: info->dwServerPid was 0x960 instead of 0xa14 marshal.c:3546: Test failed: info->cbSize was -418054392 instead of 56 marshal.c:3547: Test failed: info->dwServerPid was 0x960 instead of 0xa14 marshal.c:3510: Test failed: info->cbSize was -418054392 instead of 56 marshal.c:3511: Test failed: info->dwServerPid was 0x960 instead of 0xa14 === w1064 (64 bit marshal) === marshal.c:3473: Test failed: info->cbSize was -1670162658 instead of 56 marshal.c:3474: Test failed: info->dwServerPid was 0x370 instead of 0xafc marshal.c:3490: Test failed: info->cbSize was -1670162658 instead of 56 marshal.c:3491: Test failed: info->dwServerPid was 0x370 instead of 0xafc marshal.c:3528: Test failed: info->cbSize was -1670162658 instead of 56 marshal.c:3529: Test failed: info->dwServerPid was 0x370 instead of 0xafc marshal.c:3530: Test failed: info->pObject shouldn't be NULL marshal.c:3546: Test failed: info->cbSize was -1670162658 instead of 56 marshal.c:3547: Test failed: info->dwServerPid was 0x370 instead of 0xafc marshal.c:3548: Test failed: info->pObject shouldn't be NULL marshal.c:3510: Test failed: info->cbSize was -1670162658 instead of 56 marshal.c:3511: Test failed: info->dwServerPid was 0x370 instead of 0xafc marshal.c:3513: Test failed: info->pObject shouldn't be NULL marshal.c:3473: Test failed: info->cbSize was -1670162658 instead of 56 marshal.c:3474: Test failed: info->dwServerPid was 0x370 instead of 0xafc marshal.c:3490: Test failed: info->cbSize was -1670162658 instead of 56 marshal.c:3491: Test failed: info->dwServerPid was 0x370 instead of 0xafc marshal.c:3528: Test failed: info->cbSize was -1670162658 instead of 56 marshal.c:3529: Test failed: info->dwServerPid was 0x370 instead of 0xafc marshal.c:3530: Test failed: info->pObject shouldn't be NULL marshal.c:3546: Test failed: info->cbSize was -1670162658 instead of 56 marshal.c:3547: Test failed: info->dwServerPid was 0x370 instead of 0xafc marshal.c:3548: Test failed: info->pObject shouldn't be NULL marshal.c:3510: Test failed: info->cbSize was -1670162658 instead of 56 marshal.c:3511: Test failed: info->dwServerPid was 0x370 instead of 0xafc marshal.c:3513: Test failed: info->pObject shouldn't be NULL marshal.c:3473: Test failed: info->cbSize was -1670162658 instead of 56 marshal.c:3474: Test failed: info->dwServerPid was 0x370 instead of 0xafc marshal.c:3490: Test failed: info->cbSize was -1670162658 instead of 56 marshal.c:3491: Test failed: info->dwServerPid was 0x370 instead of 0xafc marshal.c:3528: Test failed: info->cbSize was -1670162658 instead of 56 marshal.c:3529: Test failed: info->dwServerPid was 0x370 instead of 0xafc marshal.c:3530: Test failed: info->pObject shouldn't be NULL marshal.c:3546: Test failed: info->cbSize was -1670162658 instead of 56 marshal.c:3547: Test failed: info->dwServerPid was 0x370 instead of 0xafc marshal.c:3548: Test failed: info->pObject shouldn't be NULL marshal.c:3510: Test failed: info->cbSize was -1670162658 instead of 56 marshal.c:3511: Test failed: info->dwServerPid was 0x370 instead of 0xafc marshal.c:3513: Test failed: info->pObject shouldn't be NULL

2 1

Re: [PATCH v3] d3d8/tests: Uninitialized varyings tests.
by Marvin 13 Oct '15

13 Oct '15

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=17335 Your paranoid android. === build (build) === Make failed

1 0

Re: mshtml: Fixed some tests on win10.
by Marvin 13 Oct '15

13 Oct '15

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=17332 Your paranoid android. === w1064 (32 bit htmldoc) === htmldoc.c:3559: Test failed: unexpected call IsErrorUrl htmldoc.c:875: Test failed: unexpected call {ede9319b-a823-403d-bd14-14c8adfe67dc} htmldoc.c:875: Test failed: unexpected call {ede9319b-a823-403d-bd14-14c8adfe67dc} htmldoc.c:2877: Test failed: unexpected state L"uninitialized", expected 4 htmldoc.c:2877: Test failed: VT_I4(out)=0, expected 4 htmldoc.c:875: Test failed: unexpected call {ede9319b-a823-403d-bd14-14c8adfe67dc} === w1064 (64 bit htmldoc) === htmldoc.c:3559: Test failed: unexpected call IsErrorUrl htmldoc.c:875: Test failed: unexpected call {ede9319b-a823-403d-bd14-14c8adfe67dc} htmldoc.c:875: Test failed: unexpected call {ede9319b-a823-403d-bd14-14c8adfe67dc} htmldoc.c:2877: Test failed: unexpected state L"uninitialized", expected 4 htmldoc.c:2877: Test failed: VT_I4(out)=0, expected 4 htmldoc.c:875: Test failed: unexpected call {ede9319b-a823-403d-bd14-14c8adfe67dc}

1 0

Re: [PATCH 2/5] wined3d: Pass a context to read_from_framebuffer.
by Matteo Bruni 13 Oct '15

13 Oct '15

2015-10-12 22:34 GMT+02:00 Stefan Dösinger <stefan(a)codeweavers.com>: > Sometimes the context won't be reusable because we need a specific > context to access the WGL drawable. Afterwards we need to switch back to > the caller's context. Bug 34574 is related to this. This is only > relevant for backbuffer offscreen rendering, and in practise it is rare. > It'll only matter if the application is blitting from an onscreen > surface to a currently active offscreen one. For everything else the > offscreen surface is copied into the texture when it is deactivated. > > Note that in most cases the wined3d_context * structure is the same for > both surfaces involved in the blit, but context->render_offscreen > differs for source and destination. That's why context_restore needs a > surface and not the old context. > > I'm open to placing the extra context_acquire / context_release calls > into the callers. We need them in 4 places: read_from_framebuffer, > surface_blt_to_drawable, surface_blt_fbo and surface_load_fb_texture. Yes, IMHO that would be better, although I haven't actually tried that so it might turn out to be bad in practice. Obviously ignore this suggestion altogether if Henri thinks otherwise :P

2 2

Re: [PATCH 4/5] wined3d: Pass a context to surface_load_drawable.
by Matteo Bruni 13 Oct '15

13 Oct '15

2015-10-12 22:34 GMT+02:00 Stefan Dösinger <stefan(a)codeweavers.com>: > Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> > --- > dlls/wined3d/surface.c | 11 ++++++----- > 1 file changed, 6 insertions(+), 5 deletions(-) > > diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c > index f5ee7e1..c70b709 100644 > --- a/dlls/wined3d/surface.c > +++ b/dlls/wined3d/surface.c > @@ -3850,11 +3850,11 @@ static void surface_load_sysmem(struct wined3d_surface *surface, > surface, wined3d_debug_location(surface->locations)); > } > > +/* Context activation is done by the caller. */ > static HRESULT surface_load_drawable(struct wined3d_surface *surface, > - const struct wined3d_gl_info *gl_info) > + struct wined3d_context *context) > { > RECT r; > - struct wined3d_context *context; > > if (wined3d_settings.offscreen_rendering_mode == ORM_FBO > && wined3d_resource_is_offscreen(&surface->container->resource)) > @@ -3863,12 +3863,10 @@ static HRESULT surface_load_drawable(struct wined3d_surface *surface, > return WINED3DERR_INVALIDCALL; > } > > - context = context_acquire(surface->resource.device, surface); > surface_get_rect(surface, NULL, &r); > surface_load_location(surface, WINED3D_LOCATION_TEXTURE_RGB); > surface_blt_to_drawable(surface->resource.device, context, > WINED3D_TEXF_POINT, FALSE, surface, &r, surface, &r); > - context_release(context); > > return WINED3D_OK; > } > @@ -4125,7 +4123,10 @@ HRESULT surface_load_location(struct wined3d_surface *surface, DWORD location) > break; > > case WINED3D_LOCATION_DRAWABLE: > - if (FAILED(hr = surface_load_drawable(surface, gl_info))) > + context = context_acquire(device, NULL); > + hr = surface_load_drawable(surface, context); Doesn't this context_acquire() need to take the surface of the drawable into account (i.e. something like the context_acquire you're removing from surface_load_drawable())? Maybe the context is already guaranteed to be correct? If that's the case though perhaps a comment would help since it's not immediately obvious.

2 2

Re: [PATCH] advapi32/tests: Simplify conditional expression (PVS-Studio)
by Marvin 13 Oct '15

13 Oct '15

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=17328 Your paranoid android. === w1064 (32 bit security) === security.c:3738: Test failed: MACHINE\Software owner SID != Administrators SID. security.c:3778: Test failed: Builtin Users ACE has unexpected flags (0x12 != 0xa) security.c:3782: Test failed: Builtin Users ACE has unexpected mask (0x20019 != 0x80000000) security.c:3791: Test failed: Builtin Admins ACE has unexpected flags (0x12 != 0x0) === w1064 (64 bit security) === security.c:3778: Test failed: Builtin Users ACE has unexpected flags (0x2 != 0xa) security.c:3782: Test failed: Builtin Users ACE has unexpected mask (0x20019 != 0x80000000) security.c:3791: Test failed: Builtin Admins ACE has unexpected flags (0x2 != 0x0)

1 0

Re: [PATCH v2 5/5] d3d8/tests: Uninitialized varyings tests.
by Marvin 13 Oct '15

13 Oct '15

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=17302 Your paranoid android. === w1064 (32 bit visual) === visual.c:8250: Test failed: Got unexpected color 0xffffffff, case 3. visual.c:8250: Test failed: Got unexpected color 0x00800000, case 5. visual.c:8250: Test failed: Got unexpected color 0x00800000, case 6.

2 1

Re: [PATCH 5/7] wined3d: introduce a new wined3d_texture_blt function
by Stefan Dösinger 13 Oct '15

13 Oct '15

> Am 12.10.2015 um 17:23 schrieb Riccardo Bortolato <rikyz619(a)gmail.com>: > > +HRESULT CDECL wined3d_texture_blt(struct wined3d_texture *dst_texture, unsigned int dst_idx, const RECT *dst_rect_in, > + struct wined3d_texture *src_texture, unsigned int src_idx, const RECT *src_rect_in, DWORD flags, > + const WINEDDBLTFX *fx, enum wined3d_texture_filter_type filter) I am not convinced that this is how we want blits to work. I was looking into some blit cleanups myself a few months ago, but got stuck in swapchain related sidequests, mostly to get rid of wined3d_swapchain_blit. My thinking re blitting is that we want to separate things into d3d9-style StretchRect (does color conversion, multisample resolve, stretching, color keying, ...) and CopySubresourceRegion (does sysmem<->vidmem transfers). Mapping d3d8+ methods on top of these calls is pretty simple. ddraw is trickier though and I cannot promise yet that it will work. Many things can be solved with staging resources, e.g. to split a color keyed sysmem -> vidmem blit into a copy_sub_resource_region upload and StretchRect color key blit. (StretchRect will need to be a bit more powerful than what d3d9 / d3d10 allow. At least we want sysmem<->sysmem blits supported by it). Henri was arguing for a more powerful blitter in wined3d if I understood him right, that would also be capable of handling the upload of converted surfaces (wined3d_format_texture_info.convert in utils.c). My concern is that this kind of blitter will turn into a god object that's more powerful than what we need (e.g. we don't need signed RGB -> unsigned RGB conversion while transfering from a sysmem vertex buffer to a vidmem volume texture), but I didn't get very far in proving that my alternative approach works.

2 1

Re: [PATCH 5/7] wined3d: introduce a new wined3d_texture_blt function
by Józef Kucia 13 Oct '15

13 Oct '15

Just some nitpicks. On Mon, Oct 12, 2015 at 5:23 PM, Riccardo Bortolato <rikyz619(a)gmail.com> wrote: > initial usage in d3d8 > > Signed-off-by: Riccardo Bortolato <rikyz619(a)gmail.com> > --- > dlls/d3d8/device.c | 12 ++++++------ > dlls/wined3d/texture.c | 14 ++++++++++++++ > dlls/wined3d/wined3d.spec | 1 + > include/wine/wined3d.h | 3 +++ > 4 files changed, 24 insertions(+), 6 deletions(-) > > diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c > index 2b11923..95684c7 100644 > --- a/dlls/d3d8/device.c > +++ b/dlls/d3d8/device.c > @@ -1093,8 +1093,8 @@ static HRESULT WINAPI d3d8_device_CopyRects(IDirect3DDevice8 *iface, > if (!rect_count && !src_rects && !dst_points) > { > RECT rect = {0, 0, src_w, src_h}; > - wined3d_surface_blt(dst->wined3d_surface, &rect, > - src->wined3d_surface, &rect, 0, NULL, WINED3D_TEXF_POINT); > + wined3d_texture_blt(dst->wined3d_texture, dst->sub_resource_idx, &rect, > + src->wined3d_texture, src->sub_resource_idx, &rect, 0, NULL, WINED3D_TEXF_POINT); > } > else > { > @@ -1109,8 +1109,8 @@ static HRESULT WINAPI d3d8_device_CopyRects(IDirect3DDevice8 *iface, > RECT dst_rect = {dst_points[i].x, dst_points[i].y, > dst_points[i].x + w, dst_points[i].y + h}; > > - wined3d_surface_blt(dst->wined3d_surface, &dst_rect, > - src->wined3d_surface, &src_rects[i], 0, NULL, WINED3D_TEXF_POINT); > + wined3d_texture_blt(dst->wined3d_texture, dst->sub_resource_idx, &dst_rect, > + src->wined3d_texture, src->sub_resource_idx, &src_rects[i], 0, NULL, WINED3D_TEXF_POINT); > } > } > else > @@ -1121,8 +1121,8 @@ static HRESULT WINAPI d3d8_device_CopyRects(IDirect3DDevice8 *iface, > UINT h = src_rects[i].bottom - src_rects[i].top; > RECT dst_rect = {0, 0, w, h}; > > - wined3d_surface_blt(dst->wined3d_surface, &dst_rect, > - src->wined3d_surface, &src_rects[i], 0, NULL, WINED3D_TEXF_POINT); > + wined3d_texture_blt(dst->wined3d_texture, dst->sub_resource_idx, &dst_rect, > + src->wined3d_texture, src->sub_resource_idx, &src_rects[i], 0, NULL, WINED3D_TEXF_POINT); > } > } > } > diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c > index d5f9591..d93c241 100644 > --- a/dlls/wined3d/texture.c > +++ b/dlls/wined3d/texture.c > @@ -1431,6 +1431,20 @@ static HRESULT volumetexture_init(struct wined3d_texture *texture, const struct > return WINED3D_OK; > } > > +HRESULT CDECL wined3d_texture_blt(struct wined3d_texture *dst_texture, unsigned int dst_idx, const RECT *dst_rect_in, > + struct wined3d_texture *src_texture, unsigned int src_idx, const RECT *src_rect_in, DWORD flags, > + const WINEDDBLTFX *fx, enum wined3d_texture_filter_type filter) > +{ > + struct wined3d_resource *dst_resource = wined3d_texture_get_sub_resource(dst_texture, dst_idx); > + struct wined3d_resource *src_resource = wined3d_texture_get_sub_resource(src_texture, src_idx); > + > + if (!dst_resource || !src_resource) > + return WINED3DERR_INVALIDCALL; > + > + return wined3d_surface_blt(surface_from_resource(dst_resource), dst_rect_in, > + surface_from_resource(src_resource), src_rect_in, flags, fx, filter); > +} > + > HRESULT CDECL wined3d_texture_create(struct wined3d_device *device, const struct wined3d_resource_desc *desc, > UINT level_count, DWORD surface_flags, const struct wined3d_sub_resource_data *data, void *parent, > const struct wined3d_parent_ops *parent_ops, struct wined3d_texture **texture) > diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec > index 1569e24..22c6d23 100644 > --- a/dlls/wined3d/wined3d.spec > +++ b/dlls/wined3d/wined3d.spec > @@ -259,6 +259,7 @@ > @ cdecl wined3d_swapchain_set_window(ptr ptr) > > @ cdecl wined3d_texture_add_dirty_region(ptr long ptr) > +@ cdecl wined3d_texture_blt(ptr long ptr ptr long ptr long ptr long) > @ cdecl wined3d_texture_create(ptr ptr long long ptr ptr ptr ptr) > @ cdecl wined3d_texture_decref(ptr) > @ cdecl wined3d_texture_generate_mipmaps(ptr) > diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h > index 1735b95..b5f705c 100644 > --- a/include/wine/wined3d.h > +++ b/include/wine/wined3d.h > @@ -2531,6 +2531,9 @@ void __cdecl wined3d_swapchain_set_window(struct wined3d_swapchain *swapchain, H > > HRESULT __cdecl wined3d_texture_add_dirty_region(struct wined3d_texture *texture, > UINT layer, const struct wined3d_box *dirty_region); > +HRESULT __cdecl wined3d_texture_blt(struct wined3d_texture *dst_texture, unsigned int dst_idx, const RECT *dst_rect_in, > + struct wined3d_texture *src_texture, unsigned int src_idx, const RECT *src_rect_in, DWORD flags, > + const WINEDDBLTFX *fx, enum wined3d_texture_filter_type filter); I think it would be preferred to use dst_sub_resource_idx and src_sub_resource_idx. Mostly for consistency. Also, the patch 6 and 7 should be probably merged. It doesn't make sense to leave unused fields just to remove them in the next patch.

2 1

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel