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

Re: [3/4] vcomp: Implement 8-bit atomic instructions.
by Alexandre Julliard July 19, 2016

July 19, 2016

Sebastian Lackner <sebastian(a)fds-team.de> writes: > Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> > --- > dlls/vcomp/main.c | 109 ++++++++++++++++++++++++++++++++++++++++++++ > dlls/vcomp/vcomp.spec | 22 ++++---- > dlls/vcomp100/vcomp100.spec | 22 ++++---- > dlls/vcomp110/vcomp110.spec | 22 ++++---- > dlls/vcomp120/vcomp120.spec | 22 ++++---- > dlls/vcomp90/vcomp90.spec | 22 ++++---- > 6 files changed, 164 insertions(+), 55 deletions(-) It doesn't compile here (gcc 5.4.0): gcc -m32 -c -o main.o main.c -I. -I../../include -D__WINESRC__ -D_REENTRANT -fPIC -Wall -pipe \ -fno-strict-aliasing -Wdeclaration-after-statement -Wempty-body -Wignored-qualifiers \ -Wstrict-prototypes -Wtype-limits -Wunused-but-set-parameter -Wvla -Wwrite-strings -Wpointer-arith \ -Wlogical-op -gdwarf-2 -gstrict-dwarf -fno-omit-frame-pointer -Werror -g -O2 -fno-diagnostics-show-caret main.c: Assembler messages: main.c:246: Error: bad register name `%sil' main.c:246: Error: bad register name `%dil' main.c:246: Error: bad register name `%dil' main.c:246: Error: bad register name `%sil' main.c:246: Error: bad register name `%sil' main.c:246: Error: bad register name `%sil' main.c:246: Error: bad register name `%sil' main.c:246: Error: bad register name `%sil' main.c:246: Error: bad register name `%sil' Makefile:163: recipe for target 'main.o' failed make[1]: *** [main.o] Error 1 -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: shell32: add SHGetPropertyStoreForWindow stub
by Alex Henrie July 18, 2016

July 18, 2016

@ stdcall SHGetPropertyStoreFromParsingName(wstr ptr long ptr ptr) +@ stdcall SHGetPropertyStoreForWindow(long ptr ptr) Switch these two lines to get alphabetical order. -Alex

1 0

Re: [PATCH] wined3d: Test and enable ARB_gpu_shader5 in shaders.
by Józef Kucia July 18, 2016

July 18, 2016

As it was already mentioned the plan was to use GLSL 4.30 for shader model 5. However, it shouldn't be much of a burden to also support SM5 bitwise opcodes with ARB_gpu_shader5. Apart from that the other issue is that adding newer OpenGL extensions is generally blocked by bug 38648 [1]. The main reason is that it cannot be tested in the current version of Wine with drivers which do not support compatibility profiles. On Fri, Jul 15, 2016 at 2:25 PM, Guillaume Charifi <guillaume.charifi(a)sfr.fr> wrote: > + if (gl_info->supported[ARB_GPU_SHADER5]) > + shader_addline(buffer, "#extension GL_ARB_gpu_shader5 : enable\n"); > if (gl_info->supported[ARB_SHADER_BIT_ENCODING]) > shader_addline(buffer, "#extension GL_ARB_shader_bit_encoding : enable\n"); > if (gl_info->supported[ARB_SHADER_TEXTURE_LOD]) These should be sorted alphabetically. I guess the ARB_gpu_shader5 extension should also be added to the "core_extensions" table. [1] - https://bugs.winehq.org/show_bug.cgi?id=38648

3 5

Re: [PATCH] vcruntime140: Forward set_unexpected
by Piotr Caban July 18, 2016

July 18, 2016

On 07/18/16 12:11, Alistair Leslie-Hughes wrote: > dlls/ucrtbase/ucrtbase.spec | 2 +- > dlls/vcruntime140/vcruntime140.spec | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) Please also update api-ms-win-crt-private-l1-1-0.spec file. Thanks, Piotr

1 0

Re: [PATCH] wined3d: Implement SM5 bfrev opcode in glsl.
by Józef Kucia July 18, 2016

July 18, 2016

On Fri, Jul 15, 2016 at 1:25 PM, Guillaume Charifi <guillaume.charifi(a)sfr.fr> wrote: > Signed-off-by: Guillaume Charifi <guillaume.charifi(a)sfr.fr> > --- > dlls/wined3d/glsl_shader.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c > index 5e23920..376d110 100644 > --- a/dlls/wined3d/glsl_shader.c > +++ b/dlls/wined3d/glsl_shader.c > @@ -3538,6 +3538,7 @@ static void shader_glsl_map2gl(const struct wined3d_shader_instruction *ins) > case WINED3DSIH_ROUND_Z: instruction = "trunc"; break; > case WINED3DSIH_SQRT: instruction = "sqrt"; break; > case WINED3DSIH_UMAX: instruction = "max"; break; > + case WINED3DSIH_BFREV: instruction = "bitfieldReverse"; break; It looks like this should be in alphabetical order.

1 0

Re: [PATCH] wined3d: Implement SM5 f32tof16 opcode in glsl.
by Józef Kucia July 18, 2016

July 18, 2016

A test would be nice to have. On Fri, Jul 15, 2016 at 1:37 PM, Guillaume Charifi <guillaume.charifi(a)sfr.fr> wrote: > Signed-off-by: Guillaume Charifi <guillaume.charifi(a)sfr.fr> > --- > dlls/wined3d/arb_program_shader.c | 1 + > dlls/wined3d/glsl_shader.c | 38 ++++++++++++++++++++++++++++++++++++++ > dlls/wined3d/shader_sm4.c | 2 ++ > dlls/wined3d/wined3d_private.h | 1 + > 4 files changed, 42 insertions(+) > > diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c > index 24c1194..9aa4252 100644 > --- a/dlls/wined3d/arb_program_shader.c > +++ b/dlls/wined3d/arb_program_shader.c > @@ -5286,6 +5286,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL > /* WINED3DSIH_EQ */ NULL, > /* WINED3DSIH_EXP */ shader_hw_scalar_op, > /* WINED3DSIH_EXPP */ shader_hw_scalar_op, > + /* WINED3DSIH_F32TOF16 */ NULL, > /* WINED3DSIH_FRC */ shader_hw_map2gl, > /* WINED3DSIH_FTOI */ NULL, > /* WINED3DSIH_FTOU */ NULL, You need to add WINED3DSIH_F32TOF16 in other places as well, e.g. in shader.c. > + shader_addline(ins->ctx->buffer, "unpackHalf2x16(floatBitsToUint(%s)).x", src_param.param_str); You shouldn't need floatBitsToUint. shader_glsl_add_src_param() takes care about it when you set a proper type for the parameter. > + *dst_mask_ptr++ = dst_masks[i]; > + } else > + shader_addline(ins->ctx->buffer, "0"); > + > + if(i != NB_COMPS - 1) > + shader_addline(ins->ctx->buffer, ","); > + shader_addline(ins->ctx->buffer, "\n"); > + } > + > + *dst_mask_ptr++ = '\0'; You shouldn't need to construct dst_mask manually. > + shader_addline(ins->ctx->buffer, ")%s);\n", dst_mask); > +#undef NB_COMPS > +} > + > static void shader_glsl_else(const struct wined3d_shader_instruction *ins) > { > shader_addline(ins->ctx->buffer, "} else {\n"); > @@ -8704,6 +8741,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB > /* WINED3DSIH_EQ */ shader_glsl_relop, > /* WINED3DSIH_EXP */ shader_glsl_scalar_op, > /* WINED3DSIH_EXPP */ shader_glsl_expp, > + /* WINED3DSIH_F32TOF16 */ shader_glsl_f32tof16, > /* WINED3DSIH_FRC */ shader_glsl_map2gl, > /* WINED3DSIH_FTOI */ shader_glsl_to_int, > /* WINED3DSIH_FTOU */ shader_glsl_to_uint, > diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c > index c8fdb32..6c15751 100644 > --- a/dlls/wined3d/shader_sm4.c > +++ b/dlls/wined3d/shader_sm4.c > @@ -215,6 +215,7 @@ enum wined3d_sm4_opcode > WINED3D_SM5_OP_DERIV_RTY_COARSE = 0x7c, > WINED3D_SM5_OP_DERIV_RTY_FINE = 0x7d, > WINED3D_SM5_OP_GATHER4_C = 0x7e, > + WINED3D_SM5_OP_F32TOF16 = 0x82, > WINED3D_SM5_OP_BFI = 0x8c, > WINED3D_SM5_OP_BFREV = 0x8d, > WINED3D_SM5_OP_SWAPC = 0x8e, > @@ -811,6 +812,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = > {WINED3D_SM5_OP_DERIV_RTY_COARSE, WINED3DSIH_DSY_COARSE, "f", "f"}, > {WINED3D_SM5_OP_DERIV_RTY_FINE, WINED3DSIH_DSY_FINE, "f", "f"}, > {WINED3D_SM5_OP_GATHER4_C, WINED3DSIH_GATHER4_C, "f", "fRSf"}, > + {WINED3D_SM5_OP_F32TOF16, WINED3DSIH_F32TOF16, "f", "f"}, You should use "u" for the source parameters. Similar comments as to other patches also applies.

1 0

Re: [PATCH 1/2] wined3d: Implement SM5 bfi opcode in glsl.
by Józef Kucia July 18, 2016

July 18, 2016

On Fri, Jul 15, 2016 at 1:53 PM, Guillaume Charifi <guillaume.charifi(a)sfr.fr> wrote: > Signed-off-by: Guillaume Charifi <guillaume.charifi(a)sfr.fr> > --- > dlls/wined3d/glsl_shader.c | 72 +++++++++++++++++++++++++++++++++++++++++++++- > 1 file changed, 71 insertions(+), 1 deletion(-) > > diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c > index d8edfdc..b0d3a91 100644 > --- a/dlls/wined3d/glsl_shader.c > +++ b/dlls/wined3d/glsl_shader.c > @@ -4380,6 +4380,76 @@ static void shader_glsl_f32tof16(const struct wined3d_shader_instruction *ins) > #undef NB_COMPS > } This patch requires 124405 so it should be in the same series. > > + > +static void shader_glsl_bitfield_op(const struct wined3d_shader_instruction *ins) > +{ > +#define NB_COMPS 4 > + const DWORD write_masks[NB_COMPS] = { > + WINED3DSP_WRITEMASK_0, > + WINED3DSP_WRITEMASK_1, > + WINED3DSP_WRITEMASK_2, > + WINED3DSP_WRITEMASK_3, > + }; You shouldn't need this array. You can assume that WINED3DSP_WRITE_MASK_i = WINED3DSP_WRITE_MASK_0 << i. > + const char dst_masks[NB_COMPS] = { 'x', 'y', 'z', 'w' }; > + const char *prefix; > + const char *suffix; > + int nb_params; For consistency, this should be named "param_count" and should be unsigned int. > + struct glsl_src_param src_param; > + DWORD write_mask; > + char dst_mask[6]; > + char *dst_mask_ptr = dst_mask; > + > + switch(ins->handler_idx) > + { > + case WINED3DSIH_BFI: > + prefix = "bitfieldInsert("; > + suffix = ")"; > + nb_params = 4; > + break; > + > + default: > + prefix = "<unhandled opcode>"; > + suffix = ""; > + nb_params = 0; > + FIXME("Can't handle opcode %s.\n", debug_d3dshaderinstructionhandler(ins->handler_idx)); > + } > + > + write_mask = shader_glsl_append_dst(ins->ctx->buffer, ins); > + > + *dst_mask_ptr++ = '.'; > + shader_addline(ins->ctx->buffer, "uvec4(\n"); > + > + for (int i = 0; i < NB_COMPS; i++) This requires C99. > + { > + if (write_mask & write_masks[i]) > + { > + shader_addline(ins->ctx->buffer, "%s", prefix); > + for(int j = nb_params - 1; j >= 0; j--) > + { > + shader_glsl_add_src_param(ins, &ins->src[j], write_masks[i], &src_param); > + if(j <= 1) > + shader_addline(ins->ctx->buffer, "int(%s)", src_param.param_str); You shouldn't need this cast. It's better to adjust the parameter types and let shader_glsl_add_src_param() handle this. > + else > + shader_addline(ins->ctx->buffer, "%s", src_param.param_str); > + > + if(j) > + shader_addline(ins->ctx->buffer, ", "); > + } > + shader_addline(ins->ctx->buffer, "%s", suffix); > + *dst_mask_ptr++ = dst_masks[i]; > + } else > + shader_addline(ins->ctx->buffer, "0"); > + > + if(i != NB_COMPS - 1) > + shader_addline(ins->ctx->buffer, ","); > + shader_addline(ins->ctx->buffer, "\n"); > + } > + > + *dst_mask_ptr++ = '\0'; You shouldn't need to build dst_mask manually. > + shader_addline(ins->ctx->buffer, ")%s);\n", dst_mask); > +#undef NB_COMPS I don't like this duplicated enums. Generally, this implementation seems overly complicated. You should be able to do something similar to: for (i = 0; i < 4; ++i) { write_mask = WINED3DSP_WRITEMASK_0 << i; dst.write_mask = ins->dst[0].write_mask & write_mask; if (!(write_mask = shader_glsl_append_dst_ext(ins->ctx->buffer, ins, &dst, dst.reg.data_type))) continue; shader_glsl_add_src_param(ins, &ins->src[0], write_mask, &bits); shader_glsl_add_src_param(ins, &ins->src[1], write_mask, &offset); shader_glsl_add_src_param(ins, &ins->src[2], write_mask, &insert); shader_glsl_add_src_param(ins, &ins->src[3], write_mask, &base); shader_addline(ins->ctx->buffer, "bitfieldInsert(%s, %s, %s, %s));\n", base.param_str, insert.param_str, offset.param_str, bits.param_str); }

1 0

Re: [4/5] msvcirt: Implement istream::getline
by Piotr Caban July 18, 2016

July 18, 2016

On 07/18/16 10:13, Iván Matellanes wrote: > DEFINE_THISCALL_WRAPPER(istream_getline, 16) > istream* __thiscall istream_getline(istream *this, char *str, int count, char delim) > { > - FIXME("(%p %p %d %c) stub\n", this, str, count, delim); > - return this; > + this->extract_delim++; > + return istream_get_str_delim(this, str, count, (unsigned char) delim); > } You probably need to call ios_lock before updating extract_delim. Thanks, Piotr

1 0

Re: [v1 1/1] dinput: Sort virtual joysticks by name on the Mac
by Ken Thomases July 18, 2016

July 18, 2016

On Jul 16, 2016, at 3:15 AM, David Lawrie <david.dljunk(a)gmail.com> wrote: > > Tested on OS X 10.10.5. > > Signed-off-by: David Lawrie <david.dljunk(a)gmail.com> > --- > dlls/dinput/joystick_osx.c | 35 ++++++++++++++++++++++++++++++++--- > 1 file changed, 32 insertions(+), 3 deletions(-) > > diff --git a/dlls/dinput/joystick_osx.c b/dlls/dinput/joystick_osx.c > index 637692b..22bdc4f 100644 > --- a/dlls/dinput/joystick_osx.c > +++ b/dlls/dinput/joystick_osx.c > @@ -193,6 +193,26 @@ static long get_device_property_long(IOHIDDeviceRef device, CFStringRef key) > return result; > } > > +static CFStringRef get_device_name(IOHIDDeviceRef device) > +{ > + CFTypeRef ref; > + CFStringRef name = CFSTR("Default Name"); You can probably do better for a fallback. For example, you can format the vendor ID and product ID into a string. For an extreme take on this, see the Copy_DeviceName() function in Apple's HID Calibrator sample code: https://developer.apple.com/library/mac/samplecode/HID_Calibrator/Listings/… > + > + if(device) > + { > + assert(IOHIDDeviceGetTypeID() == CFGetTypeID(device)); > + > + ref = IOHIDDeviceGetProperty(device, CFSTR(kIOHIDProductKey)); > + > + if (ref && CFStringGetTypeID() == CFGetTypeID(ref)) > + name = ref; > + else if (ref) > + name = CFCopyDescription(ref); This introduces a memory-management problem, a.k.a. a leak. This copy is never released. If you follow my suggestion above for formatting a string as a fallback if the product name isn't available, you'd also have to release that. So, you would change this function's name to copy_device_name() and make sure all code paths return an owned reference to the caller, which the caller has to release. Basically, in the case where IOHIDDeviceGetProperty() gives you a string, you'd have to copy it to match the other code paths. Of course, you'd have to make sure the callers do, in fact, release the references. > + } > + > + return name; > +} > + > static long get_device_location_ID(IOHIDDeviceRef device) > { > return get_device_property_long(device, CFSTR(kIOHIDLocationIDKey)); > @@ -203,7 +223,15 @@ static void copy_set_to_array(const void *value, void *context) > CFArrayAppendValue(context, value); > } > > -static CFComparisonResult device_location_comparator(const void *val1, const void *val2, void *context) > +static CFComparisonResult device_name_comparator(IOHIDDeviceRef device1, IOHIDDeviceRef device2) > +{ > + CFStringRef name1 = get_device_name(device1), name2 = get_device_name(device2); > + CFStringCompareFlags compareOptions = kCFCompareForcedOrdering | kCFCompareNumerically; Any reason you've added this separate variable instead of just inlining the options in the call? > + > + return CFStringCompare(name1, name2, compareOptions); > +} -Ken

2 3

Re: [PATCH] winex11.drv: Use XRRSetScreenSize with XRRSetCrtcConfig
by Henri Verbeet July 17, 2016

July 17, 2016

On 16 July 2016 at 00:48, Gabriel Corona <gabriel.corona(a)enst-bretagne.fr> wrote: > Fixes https://bugs.winehq.org/show_bug.cgi?id=33290 > > The nvidia driver is not so happy about using XRRSetCrtcConfig alone > and generates a panning configuration. We set the screen size > accordingly. Moreover we disable the CRT during the transition. > Updating the screen size isn't necessarily wrong, although avoiding panning is the wrong reason. If you don't want panning, make sure it doesn't get enabled in the first place. The main problem with this patch though, is that it's almost certainly wrong for multi-head configurations.

1 0

Re: [v1 1/1] winejoystick.drv: Sort virtual joysticks by name on the Mac
by Ken Thomases July 17, 2016

July 17, 2016

On Jul 16, 2016, at 3:15 AM, David Lawrie <david.dljunk(a)gmail.com> wrote: > > Tested on OS X 10.10.5. > > Signed-off-by: David Lawrie <david.dljunk(a)gmail.com> > --- > dlls/winejoystick.drv/joystick_osx.c | 42 +++++++++++++++++++++++++++++++----- > 1 file changed, 37 insertions(+), 5 deletions(-) Same comments as for the dinput version. -Ken

1 0

Re: [PATCH] winegstreamer: Fixes for video flipping
by Andrew Eikum July 16, 2016

July 16, 2016

Thanks very much for working on this, I'm glad to have more eyes looking at it. Comments in-line below. On Sat, Jul 16, 2016 at 02:51:10AM +1000, Jan Schmidt wrote: > The videoflip element doesn't handle all formats, > so some formats like Intel Indeo 3 will fail. > Add videoconvert to do format conversion when it's > needed. > Shouldn't the decodebin handle this during format negotiation when the videoflip is connected to it? > Fix some refcount issues too - add a new element > to a bin takes ownership of the floating reference, > so there's no need to keep pointers around to unref > later. > Good catch. Could you separate this out into a different, stand-alone patch from the other changes? > Fix state setting of new elements - always just > set them to PAUSED. gst_element_sync_state_with_parent() > can be problematic, and we only need these in paused > or playing anyway. > I'm not sure about this part. It makes sense to me for all members of a container to be in the same state. Why is it better for these to be PAUSED while others are PLAYING? If it's needed, this should be its own patch, too. > @@ -846,13 +855,16 @@ static void init_new_decoded_pad(GstElement *bin, GstPad *pad, GSTImpl *This) > > gst_util_set_object_arg(G_OBJECT(pin->flipfilter), "method", "vertical-flip"); > > - gst_bin_add(GST_BIN(This->container), pin->flipfilter); > - gst_element_sync_state_with_parent(pin->flipfilter); > + gst_element_set_state (vconv, GST_STATE_PAUSED); > + gst_bin_add(GST_BIN(This->container), vconv); /* bin takes ownership */ > + gst_element_set_state (pin->flipfilter, GST_STATE_PAUSED); > + gst_bin_add(GST_BIN(This->container), pin->flipfilter); /* bin takes ownership */ > > - pin->flip_sink = gst_element_get_static_pad(pin->flipfilter, "sink"); > + gst_element_link (vconv, pin->flipfilter); > + > + pin->flip_sink = gst_element_get_static_pad(vconv, "sink"); > if(!pin->flip_sink){ > WARN("Couldn't find sink on flip filter\n"); > - gst_object_unref(pin->flipfilter); I believe this leaves a dangling element in the container. Should these lines be replaced with calls to gst_bin_remove() instead? Andrew

2 2

Re: [PATCH 2/9] d3drm: Implement IDirect3DRMDevice*::InitFromD3D. (v2)
by Henri Verbeet July 15, 2016

July 15, 2016

On 15 July 2016 at 12:32, Aaryaman Vasishta <jem456.vasishta(a)gmail.com> wrote: > @@ -3984,6 +3985,8 @@ static void test_create_device_from_d3d1(void) > ok(ref2 > ref1, "expected ref2 > ref1, got ref1 = %u , ref2 = %u.\n", ref1, ref2); > device_ref2 = get_refcount((IUnknown *)d3ddevice1); > ok(device_ref2 > device_ref1, "Expected device_ref2 > device_ref1, got device_ref1 = %u, device_ref2 = %u.\n", device_ref1, device_ref2); > + d3d_ref2 = get_refcount((IUnknown *)d3d1); > + ok(d3d_ref2 > d3d_ref1, "Expected d3d_ref2 > d3d_ref1, got d3d_ref1 = %u, d3d_ref2 = %u.\n", d3d_ref1, d3d_ref2); > ret_val = IDirect3DRMDevice_GetWidth(device1); > ok(ret_val == rc.right, "Expected device width = 300, got %u.\n", ret_val); > ret_val = IDirect3DRMDevice_GetHeight(device1); > @@ -4053,6 +4056,133 @@ static void test_create_device_from_d3d1(void) > device_ref2 = get_refcount((IUnknown *)d3ddevice1); > ok(device_ref2 == device_ref1, "Expected device_ref2 == device_ref1, got device_ref1 = %u, device_ref2 = %u.\n", device_ref1, device_ref2); > > + /* InitFromD3D tests */ > + hr = IDirect3DRM_CreateObject(d3drm1, &CLSID_CDirect3DRMDevice, NULL, &IID_IDirect3DRMDevice, (void **)&device1); > + ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice interface (hr = %#x).\n", hr); > + > + hr = IDirect3DRMDevice_InitFromD3D(device1, NULL, d3ddevice1); > + ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr); > + hr = IDirect3DRMDevice_InitFromD3D(device1, d3d1, NULL); > + ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr); > + > + hr = IDirect3DRMDevice_InitFromD3D(device1, d3d1, d3ddevice1); > + ok(SUCCEEDED(hr), "Failed to initialise IDirect3DRMDevice interface (hr = %#x)\n", hr); > + ref2 = get_refcount((IUnknown *)d3drm1); > + ok(ref2 > ref1, "expected ref2 > ref1, got ref1 = %u , ref2 = %u.\n", ref1, ref2); > + device_ref2 = get_refcount((IUnknown *)d3ddevice1); > + ok(device_ref2 > device_ref1, "Expected device_ref2 > device_ref1, got device_ref1 = %u, device_ref2 = %u.\n", device_ref1, device_ref2); I've just fixed some these up in the past, and let some others slide, but please watch your line length.

2 1

Fwd: Re: [PATCH] wined3d: Implement SM5 bfrev opcode in glsl.
by Guillaume Charifi July 15, 2016

July 15, 2016

Right, I was sure to forget to git add something... Do I need to resend everything, or is it ok if I send a patch that only enables the required extension, and will need to be committed before the others? Le 15/07/2016 13:59, Józef Kucia a écrit : > On Fri, Jul 15, 2016 at 1:25 PM, Guillaume Charifi > <guillaume.charifi(a)sfr.fr> wrote: >> Signed-off-by: Guillaume Charifi <guillaume.charifi(a)sfr.fr> >> --- >> dlls/wined3d/glsl_shader.c | 3 ++- >> 1 file changed, 2 insertions(+), 1 deletion(-) >> >> diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c >> index 5e23920..376d110 100644 >> --- a/dlls/wined3d/glsl_shader.c >> +++ b/dlls/wined3d/glsl_shader.c >> @@ -3538,6 +3538,7 @@ static void shader_glsl_map2gl(const struct wined3d_shader_instruction *ins) >> case WINED3DSIH_ROUND_Z: instruction = "trunc"; break; >> case WINED3DSIH_SQRT: instruction = "sqrt"; break; >> case WINED3DSIH_UMAX: instruction = "max"; break; >> + case WINED3DSIH_BFREV: instruction = "bitfieldReverse"; break; > I think this requires you to enable appriopriate extension in GLSL > (GL_ARB_gpu_shader5, in this case). I haven't looked closely at the > other patches but they seem to have the same issue.

1 0

Re: [PATCH] wined3d: Implement SM5 bfrev opcode in glsl.
by Józef Kucia July 15, 2016

July 15, 2016

On Fri, Jul 15, 2016 at 1:25 PM, Guillaume Charifi <guillaume.charifi(a)sfr.fr> wrote: > Signed-off-by: Guillaume Charifi <guillaume.charifi(a)sfr.fr> > --- > dlls/wined3d/glsl_shader.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c > index 5e23920..376d110 100644 > --- a/dlls/wined3d/glsl_shader.c > +++ b/dlls/wined3d/glsl_shader.c > @@ -3538,6 +3538,7 @@ static void shader_glsl_map2gl(const struct wined3d_shader_instruction *ins) > case WINED3DSIH_ROUND_Z: instruction = "trunc"; break; > case WINED3DSIH_SQRT: instruction = "sqrt"; break; > case WINED3DSIH_UMAX: instruction = "max"; break; > + case WINED3DSIH_BFREV: instruction = "bitfieldReverse"; break; I think this requires you to enable appriopriate extension in GLSL (GL_ARB_gpu_shader5, in this case). I haven't looked closely at the other patches but they seem to have the same issue.

2 1

Re: [PATCH 4/9] d3drm: Implement IDirect3DRMViewport*::Init. (v5)
by Henri Verbeet July 15, 2016

July 15, 2016

On 15 July 2016 at 12:32, Aaryaman Vasishta <jem456.vasishta(a)gmail.com> wrote: > diff --git a/dlls/d3drm/viewport.c b/dlls/d3drm/viewport.c > index 9fd627d..743fb75 100644 > --- a/dlls/d3drm/viewport.c > +++ b/dlls/d3drm/viewport.c > @@ -270,19 +279,126 @@ static HRESULT WINAPI d3drm_viewport1_GetClassName(IDirect3DRMViewport *iface, D > static HRESULT WINAPI d3drm_viewport2_Init(IDirect3DRMViewport2 *iface, IDirect3DRMDevice3 *device, > IDirect3DRMFrame3 *camera, DWORD x, DWORD y, DWORD width, DWORD height) > { > - FIXME("iface %p, device %p, camera %p, x %u, y %u, width %u, height %u stub!\n", > + struct d3drm_viewport *viewport = impl_from_IDirect3DRMViewport2(iface); > + D3DVIEWPORT vp; > + D3DVALUE scale; > + IDirect3D *d3d1 = NULL; > + D3DCOLOR color; > + IDirect3DDevice *d3d_device = NULL; > + IDirect3DMaterial *material = NULL; > + D3DMATERIAL mat; > + D3DMATERIALHANDLE hmat; > + HRESULT hr = D3DRM_OK; > + ... > + color = IDirect3DRMFrame3_GetSceneBackground(camera); > + /* Create material (ambient/diffuse/emissive?), set material */ > + if (FAILED(hr = IDirect3D_CreateMaterial(d3d1, &material, NULL))) > + goto cleanup; > + > + memset(&mat, 0, sizeof(mat)); > + memcpy(&mat.diffuse, &color, sizeof(color)); That doesn't look right.

1 0

Re: [PATCH] msscript: Initial support for hosting script engines
by Jacek Caban July 15, 2016

July 15, 2016

Hi Nikolay, On 14.07.2016 16:35, Nikolay Sivov wrote: > +static HRESULT init_script_host(const CLSID *clsid, ScriptHost **ret) > +{ > + IObjectSafety *objsafety; > + ScriptHost *host; > + HRESULT hr; > + > + *ret = NULL; > + > + host = heap_alloc(sizeof(*host)); > + if (!host) > + return E_OUTOFMEMORY; > + > + host->IActiveScriptSite_iface.lpVtbl = &ActiveScriptSiteVtbl; > + host->ref = 1; > + host->script = NULL; > + host->parse = NULL; > + host->clsid = *clsid; > + > + hr = CoCreateInstance(&host->clsid, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, > + &IID_IActiveScript, (void**)&host->script); > + if (FAILED(hr)) { > + WARN("Failed to create an instance for %s, %#x\n", debugstr_guid(clsid), hr); > + goto failed; > + } > + > + hr = IActiveScript_QueryInterface(host->script, &IID_IObjectSafety, (void**)&objsafety); > + if (FAILED(hr)) { > + FIXME("Could not get IObjectSafety, %#x\n", hr); > + goto failed; > + } > + > + hr = IObjectSafety_SetInterfaceSafetyOptions(objsafety, &IID_IActiveScriptParse, INTERFACESAFE_FOR_UNTRUSTED_DATA, 0); > + if (FAILED(hr)) > + FIXME("SetInterfaceSafetyOptions failed, %#x\n", hr); This failure is important, please handle it well. > + IObjectSafety_Release(objsafety); > + > + hr = IActiveScript_SetScriptSite(host->script, &host->IActiveScriptSite_iface); > + if (FAILED(hr)) { > + WARN("SetScriptSite failed, %#x\n", hr); > + goto failed; > + } > + > + hr = IActiveScript_QueryInterface(host->script, &IID_IActiveScriptParse, (void**)&host->parse); > + if (FAILED(hr)) { > + WARN("Failed to get IActiveScriptParse, %#x\n", hr); > + goto failed; > + } This and... > + hr = IActiveScriptParse_InitNew(host->parse); > + if (FAILED(hr)) { > + WARN("InitNew failed, %#x\n", hr); > + goto failed; > + } ...this failure will cause ref leak. You have already set script site, so engine holds a reference to ScriptHost, but you only release one reference on failure. Using release_script_engine on failure should fix that. > + > + *ret = host; > + return S_OK; > + > +failed: > + IActiveScriptSite_Release(&host->IActiveScriptSite_iface); > + return hr; > +} > + > static HRESULT WINAPI ScriptControl_QueryInterface(IScriptControl *iface, REFIID riid, void **ppv) > { > ScriptControl *This = impl_from_IScriptControl(iface); > @@ -257,6 +498,10 @@ static ULONG WINAPI ScriptControl_Release(IScriptControl *iface) > if(!ref) { > if (This->site) > IOleClientSite_Release(This->site); > + if (This->host) { > + release_script_engine(This->host); > + IActiveScriptSite_Release(&This->host->IActiveScriptSite_iface); > + } > heap_free(This); > } > > @@ -321,15 +566,47 @@ static HRESULT WINAPI ScriptControl_Invoke(IScriptControl *iface, DISPID dispIdM > static HRESULT WINAPI ScriptControl_get_Language(IScriptControl *iface, BSTR *p) > { > ScriptControl *This = impl_from_IScriptControl(iface); > - FIXME("(%p)->(%p)\n", This, p); > - return E_NOTIMPL; > + LPOLESTR progidW; > + HRESULT hr; > + > + TRACE("(%p)->(%p)\n", This, p); > + > + if (!p) > + return E_POINTER; > + > + *p = NULL; > + > + if (!This->host) > + return S_OK; > + > + hr = ProgIDFromCLSID(&This->host->clsid, &progidW); > + if (FAILED(hr)) > + return hr; > + > + *p = SysAllocStringLen(progidW, lstrlenW(progidW)); How about SysAllocString instead? > + CoTaskMemFree(progidW); > + return *p ? S_OK : E_OUTOFMEMORY; > } > > static HRESULT WINAPI ScriptControl_put_Language(IScriptControl *iface, BSTR language) > { > ScriptControl *This = impl_from_IScriptControl(iface); > - FIXME("(%p)->(%s)\n", This, debugstr_w(language)); > - return E_NOTIMPL; > + CLSID clsid; > + > + TRACE("(%p)->(%s)\n", This, debugstr_w(language)); > + > + if (language && FAILED(CLSIDFromProgID(language, &clsid))) > + return CTL_E_INVALIDPROPERTYVALUE; > + > + if (This->host) { > + IActiveScriptSite_Release(&This->host->IActiveScriptSite_iface); > + This->host = NULL; > + } This will leave zombie script host and engine. You should probably use release_script_engine here as well. > + > + if (!language) > + return S_OK; > + > + return init_script_host(&clsid, &This->host); > } > > static HRESULT WINAPI ScriptControl_get_State(IScriptControl *iface, ScriptControlStates *p) > @@ -1379,6 +1656,7 @@ static HRESULT WINAPI ScriptControl_CreateInstance(IClassFactory *iface, IUnknow > script_control->ref = 1; > script_control->site = NULL; > script_control->cp_list = NULL; > + script_control->host = NULL; > > ConnectionPoint_Init(&script_control->cp_scsource, script_control, &DIID_DScriptControlSource); > ConnectionPoint_Init(&script_control->cp_propnotif, script_control, &IID_IPropertyNotifySink); > Thanks, Jacek

1 0

Re: [PATCH 4/9] d3drm: Implement IDirect3DRMViewport*::Init. (v5)
by Aaryaman Vasishta July 15, 2016

July 15, 2016

On Fri, Jul 15, 2016 at 4:02 PM, Aaryaman Vasishta < jem456.vasishta(a)gmail.com> wrote: > struct d3drm_viewport > { > struct d3drm_object obj; > + IDirect3DRMFrame *camera; > IDirect3DRMViewport IDirect3DRMViewport_iface; > IDirect3DRMViewport2 IDirect3DRMViewport2_iface; > + IDirect3DViewport *d3d_viewport; > + IDirect3DMaterial *material; > IDirect3DRM *d3drm; > D3DVALUE back; > D3DVALUE front; > I've decided to keep the interface instead of using the struct directly, since it'll be easier to use the interface functions for transformations and other paramaters. Referencing the interface via the object for every function call seems a bit redundant. Also I think refcounts should be handled seamlessly this way. A reference to the background material created internally is also kept here. As Stefan had pointed out, the material is not AddRef'd since its handle is used instead, so it's probably safer to keep the reference to ourselves and release it when the object is destroyed. Cheers, Aaryaman

2 2

Re: [PATCH 4/4] d3drm: Implement IDirect3DRMDevice*::Add/DeleteDestroyCallback. (v2)
by Aaryaman Vasishta July 14, 2016

July 14, 2016

CC'ing to wine-devel again. On Mon, Jul 11, 2016 at 1:10 PM, Aaryaman Vasishta < jem456.vasishta(a)gmail.com> wrote: > > > On Mon, Jul 11, 2016 at 1:06 PM, Aaryaman Vasishta < > jem456.vasishta(a)gmail.com> wrote: > >> >> >> On Mon, Jul 11, 2016 at 12:05 PM, Stefan Dösinger < >> stefandoesinger(a)gmail.com> wrote: >> >>> -----BEGIN PGP SIGNED MESSAGE----- >>> Hash: SHA256 >>> >>> Am 2016-07-10 um 23:14 schrieb Aaryaman Vasishta: >>> > Anyways, the vtable qi tests tests written so far show that >>> > querying IDirect3DRMObject from a particular interface will return >>> > version 1 of that interface. So technically it all comes down to >>> > calling >>> > >>> IDirect3DRM<Interface_name>::AddDestroyCallback(&object->version1_vtable, >>> > ...);. In our implementation of this method (see d3drm_main.c), we >>> > have passed version 1 of the relevant interface while calling the >>> > destroy callbacks within d3drm_object_destroy. The tests seem to >>> > agree with that implementation so far. >>> >> Also, I may have written the example incorrectly. You're right about the > fact that calling device3->AddDestroyCallback will pass device3 into this > function. But internally this interface will be QI'd to IDirect3DRMObject, > and then passed as the first parameter to the destroy callback itself. > >

2 2

Re: [PATCH 05/12] d3drm: Implement IDirect3DRMDevice*::InitFromD3D.
by Stefan Dösinger July 14, 2016

July 14, 2016

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 Hi, Patches 1-4 look good to me, once the fixes you mentioned and we talked about on IRC are implemented. Am 2016-07-07 um 14:52 schrieb Aaryaman Vasishta: > struct d3drm_frame > { > + struct d3drm_object obj; This seems unrelated. > + if (device->ddraw) > + hr = D3DRMERR_BADOBJECT; I guess you're not returning here right away because you want to addref d3drm later. Wouldn't it be better to move those AddRefs in front in this case? The QueryInterface / GetRenderTarget code below is unlikely to fail, if it does something is severely wrong (A d3d device without a render target???) and getting the reference leak right is the last of your worries. > device->width = desc.dwWidth; > device->height = desc.dwHeight; If I read the diff right this code will set width and height to 0 on an already initialized device. > static HRESULT WINAPI d3drm_device3_GetDirect3DDevice2(IDirect3DRMDevice3 *iface, IDirect3DDevice2 **d3d_device) > { > struct d3drm_device *device = impl_from_IDirect3DRMDevice3(iface); > + HRESULT hr; > > TRACE("iface %p, d3d_device %p.\n", iface, d3d_device); > > - IDirect3DDevice_QueryInterface(device->device, &IID_IDirect3DDevice2, (void**)d3d_device); > + if (FAILED(hr = IDirect3DDevice_QueryInterface(device->device, &IID_IDirect3DDevice2, (void**)d3d_device))) > + hr = D3DRMERR_BADOBJECT; > > - return D3DRM_OK; > + return hr; > } I think this change (like the device2_GetDirect3DDevice2 one) can be moved to a separate patch. > + hr = IDirect3DRMDevice_InitFromD3D(device1, d3d1, d3ddevice1); > + ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr); > + ref3 = get_refcount((IUnknown *)d3ddevice1); > + ok(ref3 > device_ref2, "Expected ref3 > device_ref2, got ref3 = %u, device_ref2 = %u.\n", ref3, device_ref2); > + ref3 = get_refcount((IUnknown *)d3d1); > + ok(ref3 > d3d_ref2, "Expected ref3 > d3d_ref2, got ref3 = %u, d3d_ref2 = %u.\n", ref3, d3d_ref2); You forgot to test the reference of d3drm1. > + hr = IDirect3DRMDevice_QueryInterface(device1, &IID_IDirect3DRMDevice2, (void **)&device2); > + ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice2 Interface (hr = %x).\n", hr); > + hr = IDirect3DRMDevice2_GetDirect3DDevice2(device2, &d3ddevice2); > + ok(SUCCEEDED(hr), "Expected hr == D3DRM_OK, got %#x.\n", hr); > + ok(d3ddevice2 == NULL, "Expected d3ddevice2 == NULL, got %p.\n", d3ddevice2); > + IDirect3DRMDevice2_Release(device2); You forgot d3ddevice2 = 0xdeadbeef here. > + hr = IDirect3DRM2_CreateObject(d3drm2, &CLSID_CDirect3DRMDevice, NULL, &IID_IDirect3DRMDevice2, (void **)&device2); > + ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice2 interface (hr = %#x).\n", hr); > + > + hr = IDirectDraw_QueryInterface(ddraw1, &IID_IDirect3D, (void **)&d3d1); > + ok(SUCCEEDED(hr), "Cannot get IDirect3D interface (hr = %x).\n", hr); > + if (SUCCEEDED(hr = IDirect3DDevice2_QueryInterface(d3ddevice2, &IID_IDirect3DDevice, (void **)&d3ddevice1))) > + { > + hr = IDirect3DRMDevice2_InitFromD3D(device2, d3d1, d3ddevice1); > + ok(hr == E_NOINTERFACE, "Expected hr == E_NOINTERFACE, got %#x.\n", hr); What happens if you QI IDirect3DRMDevice1 from IDirect3DRMDevice2 and call InitFromD3D on it? I would expect it to succeed because common decency suggests that CreateObject doesn't leave a history of which interface was requested and there's no CLSID_CDirect3DRMDevice2 or CLSID_CDirect3DRMDevice3. Still worth a check though I think. Cheers, Stefan -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJXgmxrAAoJEN0/YqbEcdMw9dQP/RbovFFjwIdo5ho2BcxWi1Sm 68U7n+sX+HAPmHPc2W/fOK1scbPaQz84e3cHj+dsFClCUKNLUpZ1eGdJDu1u9Fgh ZJVC9hgw8rzC+IDGr5vdmuzzOj65mI7KslJX9CfD9tnXigLtlvPf3me8jnhjL51b Eq8N1rStZTh805gDBEnmr/oqgQFkRoHKgs5lLIWq2inAfF3dq0BiThBGpC+eq19H YcihqOJWgSXrbXQYtTPjFtjp3jqqFa32+/ZQufCEAELcYUjM2gG23+O/rT5sa4d2 QuQOIhdUnTR9G6WnoZXgxKwxtJTvTu02GKlk5gaIkpWFJ2O+mPJuiBmylLoucQ6V BkYkhORuT2WYKainbTx3qNJaxBPSa5/y4HWTpQhzYH0LryFBLkL8MiVjO+pGk7QM 4wHTeL4ZXmjtyYOs6qfuxNIEJyfDs0hU5850lWdVD6MLaj3JwZYRLedCJ9TwV7Jb Qz3JQIK6YPOgTSqehIGTwzxgcbvjjiLP2zalEV4HOIqKeEkodcBxVS0QiXSDbuAj gLhbqwlRMshT5Dtt1Umi2KUoGljFjh1rbe42cyVxXcoa72D+g9LQUb4d0hUP/Ppt 6lNhfq+Vf2W+FmdB2Hv/WWof7vBV59r/TwjjExrN00yRGCLNLF3BaK8lzjeJprGO H6J9OAsscEyzMNpB+l0W =exYP -----END PGP SIGNATURE-----

2 3

Re: Testbot 3D tests broken
by Patrick Rudolph July 14, 2016

July 14, 2016

On 2016-07-13 09:53 PM, Matteo Bruni wrote: > 2016-07-12 17:51 GMT+02:00 Patrick Rudolph <siro(a)das-labor.org>: >> Hi, >> can you have a look at the testbot, it doesn't run d3d8 and d3d9 tests. >> Other 3D tests might be affected, too. >> As you can see here it reports no test failures, but it skipped all >> tests: >> https://testbot.winehq.org/JobDetails.pl?Key=24151 >> https://testbot.winehq.org/JobDetails.pl?Key=24150 > > Not sure if you already got an answer on IRC or elsewhere. Anyway, the > tests are actually executed on OS versions with the WARP device > available, i.e. Win8 and newer. WARP device doesn't entirely match > "usual" hardware devices WRT test results and since we really only > care to match hardware behavior (but we still want the tests to pass > on the testbot) there are a number of hacks in the tests. > Should I don't care about pre Win8 test results ? Both, d3d8 and d3d9 games, are likely to be used with WinXp or Win7. Does it make sense to test them on Win8 or newer ? As likely every wine user is running wined3d on real hardware, shouldn't there be test systems that have real GPUs ? >> Regards, >> Patrick

2 1

Re: kernel32: Overhaul the handling of argv in set_process_name().
by Sebastian Lackner July 14, 2016

July 14, 2016

On 12.07.2016 06:44, Ken Thomases wrote: > This fixes several problems with the code: > > * The code had been assuming that the argument strings pointed to by the argv > array are contiguous iff certain process-name-setting functions are available. > This doesn't seem reliable. Instead, test if it's true and shift the strings > if so. Thanks for working on this, looks indeed like a nice improvement. > > However, setproctitle() is specifically documented as a preferred alternative > to the technique of overwriting the arg strings, so don't shift the strings > if that's available. Wouldn't it make sense to remove the directory component also in this case, to be consistent? By moving the code to the bottom all functions would be called in the same way. > > * Use the last path component, recognizing backslash as a path separator, for > setprogname() in addition to prctl(). First, setprogname() is documented as > searching for the last component itself, but it doesn't understand Windows- > style paths, so we need to help it. Second, on some platforms (e.g. macOS), > setprogname(), like prctl(), has a fairly small internal length limit (e.g. > 32 characters). So, concentrate on the most meaningful part of the path. > > * Remove argv[0] from argv whether or not there are any process-name-setting > functions available. This is necessary for the proper functioning of Wine, > so it must be done on all platforms. This part of the logic was lost with > commit 5a4576ee0. > > * Call all available process-name-setting functions instead of treating them > as mutually exclusive alternatives. This is also logic that was lost with > commit 5a4576ee0. > > Signed-off-by: Ken Thomases <ken(a)codeweavers.com> > --- > dlls/kernel32/process.c | 63 +++++++++++++++++++++++++++++-------------------- > 1 file changed, 37 insertions(+), 26 deletions(-) >

2 9

Re: [2/2] kernel32/tests: Add tests for GetThreadSelectorEntry.
by Marvin July 14, 2016

July 14, 2016

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=24204 Your paranoid android. === w1064 (32 bit thread) === thread.c:1086: Test failed: got 0 with 5 (expected FALSE with ERROR_GEN_FAILURE)

2 1

Testbot 3D tests broken
by Patrick Rudolph July 13, 2016

July 13, 2016

Hi, can you have a look at the testbot, it doesn't run d3d8 and d3d9 tests. Other 3D tests might be affected, too. As you can see here it reports no test failures, but it skipped all tests: https://testbot.winehq.org/JobDetails.pl?Key=24151 https://testbot.winehq.org/JobDetails.pl?Key=24150 Regards, Patrick

2 1

Re: [PATCH v2 2/3] winex11.drv: avoid passing NULL to memcpy (clang)
by Alexandre Julliard July 13, 2016

July 13, 2016

Kirill Smirnov <kirill.k.smirnov(a)gmail.com> writes: > @@ -92,7 +92,8 @@ static void X11DRV_ImmSetInternalString(DWORD dwOffset, > ptr_new = CompositionString + byte_offset; > memmove(ptr_new + byte_length, ptr_new + byte_selection, > dwCompStringLength - byte_offset - byte_selection); > - memcpy(ptr_new, lpComp, byte_length); > + /* Do not pass NULL even if the length == 0 */ > + if (lpComp) memcpy(ptr_new, lpComp, byte_length); > dwCompStringLength += byte_expansion; Why would that be a problem? -- Alexandre Julliard julliard(a)winehq.org

3 3

Re: [PATCH 1/2] include: Fix include arguments.
by Matteo Bruni July 13, 2016

July 13, 2016

This probably makes sense (although, WRT the patch title, this is probably more of a consistency improvement rather than a "fix"). Maybe split the d3dtypes.h change to a separate patch?

1 0

Re: include: Add d3dx10math.inl.
by Matteo Bruni July 13, 2016

July 13, 2016

2016-07-04 19:26 GMT+02:00 Andrey Gusev <andrey.goosev(a)gmail.com>: +#ifndef __D3DX10MATH_INL__ +#define __D3DX10MATH_INL__ My copy of the file (from the latest DX SDK) uses __D3DXMATH_INL__ as header guard. I think we should do the same for compatibility. +/* constructors & operators */ Nitpicking but this comment doesn't seem particularly useful. +inline D3DXVECTOR2::D3DXVECTOR2(const FLOAT *pf) Just use plain float. + if(!pf) return; Space before '(', return on a separate line. +inline D3DXVECTOR2::operator FLOAT* () +{ + return (FLOAT*)&x; Please put a space between "float" and '*' in the cast. Probably do the same in the operator definition, although I don't really care in that regard. +inline D3DXMATRIX D3DXMATRIX::operator - () const +{ + return D3DXMATRIX(-_11, -_12, -_13, -_14, + -_21, -_22, -_23, -_24, + -_31, -_32, -_33, -_34, + -_41, -_42, -_43, -_44); +} This is almost identical to the MS's header. Please use 8 space indentation for line continuations. Probably drop the space between the "operator" keyword and the operator and between the operator and the opening parenthesis, in the operator declaration. +inline D3DXCOLOR::operator UINT () const +{ + UINT _r = r >= 1.0f ? 0xff : r <= 0.0f ? 0x00 : (UINT)(r * 255.0f + 0.5f); + UINT _g = g >= 1.0f ? 0xff : g <= 0.0f ? 0x00 : (UINT)(g * 255.0f + 0.5f); + UINT _b = b >= 1.0f ? 0xff : b <= 0.0f ? 0x00 : (UINT)(b * 255.0f + 0.5f); + UINT _a = a >= 1.0f ? 0xff : a <= 0.0f ? 0x00 : (UINT)(a * 255.0f + 0.5f); + + return (_a << 24) | (_r << 16) | (_g << 8) | (_b << 0); +} This one is also virtually identical. There seems to be room for writing a slightly different but equivalent implementation. FWIW identifiers starting with an underscore are supposed to be reserved, to some degree. It's generally better to avoid them. +inline D3DXFLOAT16::D3DXFLOAT16() +{ +} These default constructors are in (native) d3dx10math.h. I know that with d3dx9* headers we did put those in the .inl file but I think that was a bad idea. +inline BOOL D3DXFLOAT16::operator == (const D3DXFLOAT16 &f) const +{ This one is also almost identical, implementation-wise. Now maybe there isn't that much room for variations here but still, at the very least replace the "== 0" with a '!'. If you can find other reasonable ways to differentiate, that's even better. +inline D3DXCOLOR::D3DXCOLOR(UINT col) +{ + const FLOAT f = 1.0f / 255.0f; + r = f * (FLOAT)(unsigned char)(col >> 16); + g = f * (FLOAT)(unsigned char)(col >> 8); + b = f * (FLOAT)(unsigned char)(col >> 0); + a = f * (FLOAT)(unsigned char)(col >> 24); +} Another one essentially identical. I would write it as something like: inline D3DXCOLOR::D3DXCOLOR(UINT col) { float inv = 1.0f / 255.0f; a = ((col >> 24) & 0xff) * inv; r = ((col >> 16) & 0xff) * inv; g = ((col >> 8) & 0xff) * inv; b = (col & 0xff) * inv; } +static inline D3DXCOLOR* D3DXColorLerp(D3DXCOLOR *pout, const D3DXCOLOR *pc1, const D3DXCOLOR *pc2, FLOAT s) Don't use those prefixed argument names: out, c1 and c2 work just fine. Also you want a space between D3DXCOLOR and '*' and no space between '*' and the function name. +{ + if ( !pout || !pc1 || !pc2 ) return NULL; Please no spaces after the '(' and before the ')'. Return on a separate line. + pout->r = (1-s) * (pc1->r) + s *(pc2->r); You want spaces around the '-' operator and a space after the multiplication operator. No need for the parentheses around pc1->r and pc2->r. Regardless, MS's header uses the "optimized" linear interpolation formula, with just one multiplication. Your current implementation will generally give slightly different results (because of the limited precision of floats) so you should stick to the same formula instead. This isn't an exhaustive list of issues. Many of the above comments apply to multiple places over the patch.

1 0

Re: [PATCH 4/5] d3d11/tests: Add test for writing special floating-point values to render target.
by Henri Verbeet July 13, 2016

July 13, 2016

On 13 July 2016 at 10:52, Józef Kucia <jkucia(a)codeweavers.com> wrote: > +#ifndef NAN > +static inline float __port_nan(void) > +{ > + static const unsigned __nan_bytes = 0x7fc00000; > + return *(const float *)&__nan_bytes; > +} > +#define NAN __port_nan() > +#endif This looks unused. > + const struct vec4 *value = get_readback_vec4(&rb, x, y); > + ok(isnan(value->x) && value->y == INFINITY && value->z == -INFINITY && value->w == 1.0f, > + "Got unexpected value {%.8e, %.8e, %.8e, %.8e} at (%u, %u).\n", > + value->x, value->y, value->z, value->w, x, y); It would slightly change the meaning of the test, but you could also just read these back as uvec4's and compare the bit patterns. > @@ -9312,4 +9400,5 @@ START_TEST(d3d11) > test_check_feature_support(); > test_create_unordered_access_view(); > test_immediate_constant_buffer(); > + test_special_float_values(); For what it's worth, those are usually called "floating-point specials". (And hence fp_special_test() in the d3d9 tests.)

1 0

Re: ntdll/tests: Use inline implementation of NtCurrentTeb for exception tests.
by Marvin July 13, 2016

July 13, 2016

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=24168 Your paranoid android. === wvistau64 (32 bit exception) === exception.c:489: Test failed: 42: Unexpected eip 0x3d0000/0x3d0001 exception: unhandled exception 80000004 at 003D0000 exception.c:489: Test failed: 42: Unexpected eip 0x77baed97/0x3d0001 === w7u (32 bit exception) === exception.c:489: Test failed: 42: Unexpected eip 0x280000/0x280001 exception: unhandled exception 80000004 at 00280000 exception.c:489: Test failed: 42: Unexpected eip 0x77cde34f/0x280001 === w1064 (32 bit exception) === An error occurred while waiting for the test to complete: network read timed out (wait2/connect:AgentVersion.h:0/9) The test VM has crashed, rebooted or lost connectivity (or the TestAgent server died) === w1064 (64 bit exception) === An error occurred while waiting for the test to complete: network read timed out (wait2/connect:AgentVersion.h:0/9) The test VM has crashed, rebooted or lost connectivity (or the TestAgent server died)

3 2

Re: [PATCH] wined3d: Fix the size parameter of glVertexAttrib*Pointer().
by Józef Kucia July 13, 2016

July 13, 2016

On Wed, Jul 13, 2016 at 2:48 AM, Guillaume Charifi <guillaume.charifi(a)sfr.fr> wrote: > The mistake is obvious when looking at the GL 3.0 spec: > p29: > void VertexAttribPointer(uint index, int size, enum type, boolean normalized, sizei stride, const void *pointer); > void VertexAttribIPointer(uint index, int size, enum type, sizei stride, const void *pointer); > > p30: > Command Sizes > VertexAttribPointer 1, 2, 3, 4 > VertexAttribIPointer 1, 2, 3, 4 > > Signed-off-by: Guillaume Charifi <guillaume.charifi(a)sfr.fr> > --- > dlls/wined3d/state.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) This looks wrong to me. The "gl_vtx_format" field is equal to the "component_count" field. There's one exception though, the "gl_vtx_format" is set to GL_BGRA for WINED3DFMT_B8G8R8A8_UNORM. GL_BGRA was added as an accepted value by GL_ARB_vertex_array_bgra (core since OpenGL 3.2). What are you trying to fix?

2 2

Re: ncrypt: add some ncrypt stubs
by Alex Henrie July 12, 2016

July 12, 2016

+ return NTE_INVALID_PARAMETER; I think NTE_NOT_SUPPORTED makes more sense for stub functions in this DLL. Other than that, the patch looks good. -Alex

2 1

Ubuntu considering dropping 32-bit libraries
by Josh DuBois July 12, 2016

July 12, 2016

A Slashdot post yesterday pointed to a worrying thread on the Ubuntu mailing list archive about dropping 32-bit support from Ubuntu. The Ubuntu thread is here: https://lists.ubuntu.com/archives/ubuntu-devel/2016-June/039420.html It is not 100% clear to me what they are considering - they mention dropping 32-bit .isos and also ceasing to support users who want to run 32-bit apps (at least unless the app is packaged in a container alongside all of the necessary libraries). Their thought is to do this in a couple of years, with Ubuntu 18.10: 18.10+: * Stop providing i386 port * Run legacy i386 only application in snaps / containers / virtual machines Disturbingly, no one on the Ubuntu thread ever mentions Wine. Oddly there is discussion about IoT applications which might need 32-bit libraries and a proposal to continue building select libs for those things, but maybe minus the graphics stack :-(. In the Slashdot post someone at least mentions Wine, but the little discussion that prompted was seemingly in error until Francois came along to correct them. I think Wine should be aware of the issue and make some noise about it before distros grow attached to the idea of ceasing to build 32-bit libraries. I will probably post to the Ubuntu thread to at least mention Wine, unless someone here is involved in that community and thinks they can do a better job. The more distros hear from the Wine community about the value of 32-bit libraries, the better. It might be that they will conclude on their own that users need them to continue building 32-bit libraries, but I don't know that we can trust distros not to break things if we don't speak up.

1 1

Re: [PATCH 3/3] wined3d/resource: Performance improvements, try 2
by Henri Verbeet July 12, 2016

July 12, 2016

This could do with a more descriptive subject line. On 11 July 2016 at 18:13, Patrick Rudolph <siro(a)das-labor.org> wrote: > Tests showed that D3DLOCK_NOOVERWRITE is prefered over D3DLOCK_DISCARD > and that D3DLOCK_NOOVERWRITE doesn't depend on dynamic buffers. "preferred", but you'll probably want to say "takes precedence over" instead. > Unigine Heavon maps a lot of buffers with both flags, but run on about > 85% GPU-load, as WINE removes both hints and the game has to wait for > the buffer to be mapped. "Unigine Heaven", "Wine" > OpenGL core profile version string: 3.3 (Core Profile) Mesa 12.1.0-devel (git-60c68c5) It doesn't make much of a difference here, but note that unless you set the "MaxVersionGL" registry key, wined3d doesn't use core profiles. > --- > dlls/d3d9/tests/visual.c | 10 +++++----- > dlls/wined3d/resource.c | 33 ++++++++++++++++----------------- > 2 files changed, 21 insertions(+), 22 deletions(-) What about the d3d8 tests? > @@ -359,29 +359,28 @@ DWORD wined3d_resource_sanitize_map_flags(const struct wined3d_resource *resourc > { > /* Not all flags make sense together, but Windows never returns an error. > * Catch the cases that could cause issues. */ > - if (flags & WINED3D_MAP_READONLY) > + if ((flags & (WINED3D_MAP_DISCARD | WINED3D_MAP_NOOVERWRITE)) == > + (WINED3D_MAP_DISCARD | WINED3D_MAP_NOOVERWRITE)) > { > - if (flags & WINED3D_MAP_DISCARD) > - { > - WARN("WINED3D_MAP_READONLY combined with WINED3D_MAP_DISCARD, ignoring flags.\n"); > - return 0; > - } > - if (flags & WINED3D_MAP_NOOVERWRITE) > - { > - WARN("WINED3D_MAP_READONLY combined with WINED3D_MAP_NOOVERWRITE, ignoring flags.\n"); > - return 0; > - } > + WARN("WINED3D_MAP_DISCARD and WINED3D_MAP_NOOVERWRITE used together, using WINED3D_MAP_NOOVERWRITE.\n"); > + flags &= ~WINED3D_MAP_DISCARD; > + } > + if ((flags & (WINED3D_MAP_READONLY | WINED3D_MAP_NOOVERWRITE)) == > + (WINED3D_MAP_READONLY | WINED3D_MAP_NOOVERWRITE)) > + { > + WARN("WINED3D_MAP_READONLY and WINED3D_MAP_NOOVERWRITE used together, clearing WINED3D_MAP_READONLY.\n"); > + flags &= ~WINED3D_MAP_READONLY; > } > - else if ((flags & (WINED3D_MAP_DISCARD | WINED3D_MAP_NOOVERWRITE)) > - == (WINED3D_MAP_DISCARD | WINED3D_MAP_NOOVERWRITE)) > + > + if ((flags & (WINED3D_MAP_READONLY | WINED3D_MAP_DISCARD)) == > + (WINED3D_MAP_READONLY | WINED3D_MAP_DISCARD)) > { > - WARN("WINED3D_MAP_DISCARD and WINED3D_MAP_NOOVERWRITE used together, ignoring.\n"); > + WARN("WINED3D_MAP_READONLY combined with WINED3D_MAP_DISCARD, ignoring flags.\n"); > return 0; > } > - else if (flags & (WINED3D_MAP_DISCARD | WINED3D_MAP_NOOVERWRITE) > - && !(resource->usage & WINED3DUSAGE_DYNAMIC)) > + else if ((flags & WINED3D_MAP_DISCARD) && !(resource->usage & WINED3DUSAGE_DYNAMIC)) > { > - WARN("DISCARD or NOOVERWRITE map on non-dynamic buffer, ignoring.\n"); > + WARN("DISCARD on non dynamic buffer, ignoring.\n"); > return 0; > } This changes several things at once. One (logical) change per commit, please.

1 0

Re: [PATCH 1/3] d3d9/tests/visual: Add Vertexbuffer locking tests, try 2
by Henri Verbeet July 12, 2016

July 12, 2016

On 11 July 2016 at 18:13, Patrick Rudolph <siro(a)das-labor.org> wrote: > +static void test_vb_lock_flags(void) > +{ > + IDirect3DVertexBuffer9 *buffer; > + IDirect3DDevice9 *device; > + IDirect3D9 *d3d9; > + DWORD i, j, tri, quads; > + HWND window; > + HRESULT hr; > + ULONG size; > + unsigned refcount; "ULONG refcount;", but that's minor. > + { > + "0", > + 0, > + 0, > + FALSE, > + FALSE > + }, This may have been inspired by other tests, but as long as it fits I'd prefer the more compact option of keeping this all on a single line. You may have to shorten the "flags_s" values a bit to do that. > + static struct > + { > + struct > + { > + struct vec3 position; > + DWORD diffuse; > + } strip[4]; > + } > + *quad_strip_array, quad_strip1 = > + { > + { > + {{-1.0f, -1.0f, 0.0f}, 0xffff0000}, > + {{-1.0f, 1.0f, 0.0f}, 0xff00ff00}, > + {{ 1.0f, -1.0f, 0.0f}, 0xff0000ff}, > + {{ 1.0f, 1.0f, 0.0f}, 0xffffffff}, > + } > + }, > + quad_strip2 = > + { > + { > + {{-1.0f, -1.0f, 0.0f}, 0xffffff00}, > + {{-1.0f, 1.0f, 0.0f}, 0xffffff00}, > + {{ 1.0f, -1.0f, 0.0f}, 0xffffff00}, > + {{ 1.0f, 1.0f, 0.0f}, 0xffffff00}, > + } > + }; These are triangle strips or quads, but I don't think "quad strips" makes sense here. "quad_strip1" and "quad_strip2" can be const, and "quad_strip_array" doesn't need to be static, right? > + hr = IDirect3DDevice9_CreateVertexBuffer(device, size, tests[i].usage, 0, D3DPOOL_DEFAULT, &buffer, NULL); > + ok(SUCCEEDED(hr), "Failed to create vertex buffer, hr %#x.\n", hr); > + if (!SUCCEEDED(hr)) > + continue; The continue is pointless, the test would have already failed at that point. > + if (tests[i].unsyncronized == unsyncronized) > + break; This means the test will only try the smallest buffer size for cases that you expect to be synchronised, right? That seems problematic, since the reason you try the larger buffer sizes is that you can't necessarily reliably detect the unsynchronised cases with the smaller buffer sizes. > + if (tests[i].todo) > + { > + todo_wine ok(tests[i].unsyncronized == unsyncronized, "Expected buffer mapped %s. Flags = %s. Usage = %d.\n", > + tests[i].unsyncronized ? "unsyncronized" : "syncronized", tests[i].flags_s, tests[i].usage); > + } > + else > + { > + ok(tests[i].unsyncronized == unsyncronized, "Expected buffer mapped %s. Flags = %s. Usage = %d.\n", > + tests[i].unsyncronized ? "unsyncronized" : "syncronized", tests[i].flags_s, tests[i].usage); > + } I think "todo_wine_if" would be appropriate here. Please use %#x to print the usage. Note that ddraw has the mostly equivalent flags DDLOCK_NOOVERWRITE and DDLOCK_DISCARDCONTENTS as well. Direct3D 10 has D3D10_MAP_WRITE_DISCARD and D3D10_MAP_WRITE_NO_OVERWRITE, but you can't use them at the same time because they're not flags. Direct3D 11 is similar to Direct3D 10. You'll need to account for the testbot failures in some way. They may be specific to WARP, but it's suspicious that the "D3DLOCK_NOOVERWRITE" tests do seem to pass. Also, please follow the usual conventions for the subject line. (I.e., "d3d9/tests:", "d3d8/tests:", "wined3d:".)

1 0

Re: [PATCH] dxgi: Implement IDXGISwapChain GetFullscreenState
by Henri Verbeet July 12, 2016

July 12, 2016

On 11 July 2016 at 12:08, Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> wrote: > +static HRESULT STDMETHODCALLTYPE dxgi_swapchain_GetFullscreenState(IDXGISwapChain *iface, > + BOOL *fullscreen, IDXGIOutput **target) > +{ > + HRESULT hr = S_OK; > + > + TRACE("iface %p, fullscreen %p, target %p semi-stub.\n", iface, fullscreen, target); > + > + if (fullscreen) > + *fullscreen = TRUE; > + > + if (target) > + hr = dxgi_swapchain_GetContainingOutput(iface, target); > + > + return hr; > +} That's not a real implementation, of course. > @@ -496,6 +498,22 @@ static void test_create_swapchain(void) > refcount = IUnknown_Release(parent); > todo_wine ok(refcount == 4, "Got unexpected refcount %u.\n", refcount); > > + hr = IDXGISwapChain_GetFullscreenState(swapchain, NULL, NULL); > + ok(hr == S_OK, "GetFullscreenState failed, hr %#x.\n", hr); > + > + hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL); > + ok(hr == S_OK, "GetFullscreenState failed, hr %#x.\n", hr); > + > + hr = IDXGISwapChain_GetFullscreenState(swapchain, NULL, &target); > + ok(hr == S_OK, "GetFullscreenState failed, hr %#x.\n", hr); > + if(target) > + IDXGIOutput_Release(target); > + > + hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, &target); > + ok(hr == S_OK, "GetFullscreenState failed, hr %#x.\n", hr); > + if(target) > + IDXGIOutput_Release(target); > + And this doesn't test much beyond the function returning S_OK.

1 0

Re: [PATCH v2] kernel32: Use setprogname(3) to set the program name if available.
by Theodore Dubois July 12, 2016

July 12, 2016

This patch causes a segfault in the event that __wine_main_argv is not the argv that got passed to main. This happened in a program I wrote that acts as a custom wine loader. It creates an argv by using malloc, then passes that to wine_init. Why wouldn’t setprogname(argv[1]) be adequate? ~Theodore > On Feb 19, 2016, at 2:33 PM, Charles Davis <cdavis5x(a)gmail.com> wrote: > > Signed-off-by: Charles Davis <cdavis5x(a)gmail.com> > --- > Try 2: > * Clean up the #ifdefs a bit. (I'm not happy about the duplicated code, though.) > * Don't copy the progname into a static array. There's no need; the argument vector lasts as long as the process itself. (I suppose I was being overly defensive with that.) > > configure.ac | 1 + > dlls/kernel32/process.c | 17 ++++++++++++++--- > 2 files changed, 15 insertions(+), 3 deletions(-) > > diff --git a/configure.ac b/configure.ac > index c9445e7..2ebbb10 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -2026,6 +2026,7 @@ AC_CHECK_FUNCS(\ > sched_yield \ > select \ > setproctitle \ > + setprogname \ > setrlimit \ > settimeofday \ > sigaltstack \ > diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c > index 86333be..4771108 100644 > --- a/dlls/kernel32/process.c > +++ b/dlls/kernel32/process.c > @@ -1118,9 +1118,20 @@ static void set_process_name( int argc, char *argv[] ) > { > #ifdef HAVE_SETPROCTITLE > setproctitle("-%s", argv[1]); > -#endif > + /* remove argv[0] */ > + memmove( argv, argv + 1, argc * sizeof(argv[0]) ); > +#elif defined(HAVE_SETPROGNAME) > + int i, offset; > + char *end = argv[argc-1] + strlen(argv[argc-1]) + 1; > > -#ifdef HAVE_PRCTL > + offset = argv[1] - argv[0]; > + memmove( argv[1] - offset, argv[1], end - argv[1] ); > + memset( end - offset, 0, offset ); > + for (i = 1; i < argc; i++) argv[i-1] = argv[i] - offset; > + argv[i-1] = NULL; > + > + setprogname( argv[0] ); > +#elif defined(HAVE_PRCTL) > int i, offset; > char *p, *prctl_name = argv[1]; > char *end = argv[argc-1] + strlen(argv[argc-1]) + 1; > @@ -1141,11 +1152,11 @@ static void set_process_name( int argc, char *argv[] ) > argv[i-1] = NULL; > } > else > -#endif /* HAVE_PRCTL */ > { > /* remove argv[0] */ > memmove( argv, argv + 1, argc * sizeof(argv[0]) ); > } > +#endif /* HAVE_PRCTL */ > } > > > -- > 2.7.1 > > >

4 12

Re: ntoskrnl.exe: add IoAttachDevice stub
by Sebastian Lackner July 12, 2016

July 12, 2016

On 12.07.2016 05:07, Austin English wrote: > + > +/*********************************************************************** > + * IoAttachDevice (NTOSKRNL.EXE.@) > + */ > +NTSTATUS IoAttachDevice(DEVICE_OBJECT *source, UNICODE_STRING *target, DEVICE_OBJECT *attached) You forgot to specify the calling convention (WINAPI) - this is probably also the reason why your stub is not sufficient yet. Otherwise the patch looks fine to me. > +{ > + FIXME("(%p, %s, %p): stub\n", source, debugstr_us(target), attached); > + return STATUS_NOT_IMPLEMENTED; > +}

1 0

Re: [PATCH] kernel32/tests/fiber: Add tests for fiber-local storage.
by Sebastian Lackner July 11, 2016

July 11, 2016

On 08.07.2016 00:16, John Sheu wrote: > Signed-off-by: John Sheu <sheu(a)google.com> > --- > dlls/kernel32/tests/fiber.c | 291 +++++++++++++++++++++++++++++++++++++++----- > 1 file changed, 258 insertions(+), 33 deletions(-) > > diff --git a/dlls/kernel32/tests/fiber.c b/dlls/kernel32/tests/fiber.c > index 1e4ca66..4f61f80 100644 > --- a/dlls/kernel32/tests/fiber.c > +++ b/dlls/kernel32/tests/fiber.c > @@ -33,9 +33,13 @@ static BOOL (WINAPI *pFlsFree)(DWORD); > static PVOID (WINAPI *pFlsGetValue)(DWORD); > static BOOL (WINAPI *pFlsSetValue)(DWORD,PVOID); > > -static LPVOID fibers[2]; > +static LPVOID fibers[3]; > static BYTE testparam = 185; > -static WORD cbCount; > +static DWORD fls_index_to_set = FLS_OUT_OF_INDEXES; > +static PVOID fls_value_to_set = NULL; > + > +static int fiberCount = 0; > +static int cbCount = 0; > > static VOID init_funcs(void) > { > @@ -59,15 +63,44 @@ static VOID init_funcs(void) > > static VOID WINAPI FiberLocalStorageProc(PVOID lpFlsData) > { > + ok(lpFlsData == fls_value_to_set, > + "FlsData expected not to be changed, value is %p, expected %p\n", > + lpFlsData, fls_value_to_set); > cbCount++; > - ok(lpFlsData == (PVOID) 1587, "FlsData expected not to be changed\n"); > } > > static VOID WINAPI FiberMainProc(LPVOID lpFiberParameter) > { > BYTE *tparam = (BYTE *)lpFiberParameter; > - cbCount++; > + fiberCount++; > ok(*tparam == 185, "Parameterdata expected not to be changed\n"); > + if (fls_index_to_set != FLS_OUT_OF_INDEXES) > + { > + if (!pFlsSetValue || !pFlsGetValue) > + { > + win_skip( "Fiber Local Storage not supported\n" ); You can get rid of this check, fls_index_to_set should not be set when Fiber Local Storage is not supported. > + } > + else > + { > + PVOID pret; Usually "void *" types and variable names without "p" prefix are preferred. > + BOOL bret; > + > + pret = pFlsGetValue(fls_index_to_set); > + ok(pret == NULL, "FlsGetValue returned %p, expected NULL\n", pret); > + > + /* Set the FLS value */ > + SetLastError( 0xdeadbeef ); You can remove this line when you are not testing the error value. > + bret = pFlsSetValue(fls_index_to_set, fls_value_to_set); > + ok(bret, "FlsSetValue failed with error %u\n", GetLastError()); > + > + /* Verify that FlsGetValue retrieves the value set by FlsSetValue */ > + SetLastError( 0xdeadbeef ); > + pret = pFlsGetValue(fls_index_to_set); > + ok(pret == fls_value_to_set, > + "FlsGetValue returned %p, expected %p\n", pret, fls_value_to_set); > + ok(GetLastError() == ERROR_SUCCESS, "FlsGetValue error %u\n", GetLastError()); > + } > + } > pSwitchToFiber(fibers[0]); > } > > @@ -110,9 +143,23 @@ static void test_ConvertFiberToThread(void) > } > } > > +static void test_IsThreadAFiber(BOOL is_fiber) > +{ > + if (pIsThreadAFiber) > + { > + BOOL ret = pIsThreadAFiber(); > + ok(ret == is_fiber, "IsThreadAFiber reported %d, expected %d\n", ret, is_fiber); > + } > + else > + { > + win_skip( "IsThreadAFiber not present\n" ); > + return; return at the end of a function is unnecessary. Also, I'm not sure if it makes much sense to have this as a separate function. You could probably just inline it in this case. > + } > +} > + > static void test_FiberHandling(void) > { > - cbCount = 0; > + fiberCount = 0; > fibers[0] = pCreateFiber(0,FiberMainProc,&testparam); > ok(fibers[0] != 0, "CreateFiber failed with error %d\n", GetLastError()); > pDeleteFiber(fibers[0]); > @@ -124,12 +171,11 @@ static void test_FiberHandling(void) > else > test_ConvertThreadToFiber(); > > - > fibers[1] = pCreateFiber(0,FiberMainProc,&testparam); > ok(fibers[1] != 0, "CreateFiber failed with error %d\n", GetLastError()); > > pSwitchToFiber(fibers[1]); > - ok(cbCount == 1, "Wrong callback count: %d\n", cbCount); > + ok(fiberCount == 1, "Wrong fiber count: %d\n", fiberCount); > pDeleteFiber(fibers[1]); > > if (!pCreateFiberEx) > @@ -143,46 +189,72 @@ static void test_FiberHandling(void) > ok(fibers[1] != 0, "CreateFiberEx failed with error %d\n", GetLastError()); > > pSwitchToFiber(fibers[1]); > - ok(cbCount == 2, "Wrong callback count: %d\n", cbCount); > + ok(fiberCount == 2, "Wrong fiber count: %d\n", fiberCount); > pDeleteFiber(fibers[1]); > > - if (!pIsThreadAFiber) > - { > - win_skip( "IsThreadAFiber not present\n" ); > - return; > - } > - > - ok(pIsThreadAFiber(), "IsThreadAFiber reported FALSE\n"); > + test_IsThreadAFiber(TRUE); > test_ConvertFiberToThread(); > - ok(!pIsThreadAFiber(), "IsThreadAFiber reported TRUE\n"); > + test_IsThreadAFiber(FALSE); > } > > -static void test_FiberLocalStorage(PFLS_CALLBACK_FUNCTION cbfunc) > +static void test_FiberLocalStorage(void) > { > - DWORD fls; > + DWORD fls, fls_2; > BOOL ret; > - PVOID val = (PVOID) 1587; > + PVOID val; "void *" would be preferred here. > > - if (!pFlsAlloc) > + if (!pFlsAlloc || !pFlsSetValue || !pFlsGetValue || !pFlsFree) > { > win_skip( "Fiber Local Storage not supported\n" ); > return; > } > - cbCount = 0; > > - fls = pFlsAlloc(cbfunc); > - ok(fls != FLS_OUT_OF_INDEXES, "FlsAlloc failed with error %d\n", GetLastError()); > + /* Test an unallocated index > + * FlsFree should fail > + * FlsGetValue and FlsSetValue should succeed > + */ > + SetLastError( 0xdeadbeef ); > + ret = pFlsFree( 127 ); > + ok( !ret, "freeing fls index 127 (unallocated) succeeded\n" ); > + ok( GetLastError() == ERROR_INVALID_PARAMETER, > + "freeing fls index 127 (unallocated) wrong error %u\n", GetLastError() ); > > - ret = pFlsSetValue(fls, val); > - ok(ret, "FlsSetValue failed\n"); > - ok(val == pFlsGetValue(fls), "FlsGetValue failed\n"); > + SetLastError( 0xdeadbeef ); This is unnecessary if you don't test the error. > + val = pFlsGetValue( 127 ); > + ok( val == NULL, > + "getting fls index 127 (unallocated) failed with error %u\n", GetLastError() ); > + > + SetLastError( 0xdeadbeef ); Same here. > + ret = pFlsSetValue( 127, (PVOID) 0x217 ); "(void *)0x217" would be preferred here (and at a couple of places below). > + ok( ret, "setting fls index 127 (unallocated) failed with error %u\n", GetLastError() ); > + > + SetLastError( 0xdeadbeef ); > + val = pFlsGetValue( 127 ); > + ok( val == (PVOID) 0x217, "fls index 127 (unallocated) wrong value %p\n", val ); > + ok( GetLastError() == ERROR_SUCCESS, > + "getting fls index 127 (unallocated) failed with error %u\n", GetLastError() ); > + > + /* FlsFree, FlsGetValue, and FlsSetValue out of bounds should return > + * ERROR_INVALID_PARAMETER > + */ > + SetLastError( 0xdeadbeef ); > + ret = pFlsFree( 128 ); > + ok( !ret, "freeing fls index 128 (out of bounds) succeeded\n" ); > + ok( GetLastError() == ERROR_INVALID_PARAMETER, > + "freeing fls index 128 (out of bounds) wrong error %u\n", GetLastError() ); > > - ret = pFlsFree(fls); > - ok(ret, "FlsFree failed\n"); > - if (cbfunc) > - todo_wine ok(cbCount == 1, "Wrong callback count: %d\n", cbCount); > + SetLastError( 0xdeadbeef ); > + ret = pFlsSetValue( 128, (PVOID) 0x217 ); > + ok( !ret, "setting fls index 128 (out of bounds) succeeded\n" ); > + ok( GetLastError() == ERROR_INVALID_PARAMETER, > + "setting fls index 128 (out of bounds) wrong error %u\n", GetLastError() ); > + > + SetLastError( 0xdeadbeef ); > + val = pFlsGetValue( 128 ); It would make sense to test "val" aswell. > + ok( GetLastError() == ERROR_INVALID_PARAMETER, > + "setting fls index 128 (out of bounds) wrong error %u\n", GetLastError() ); The function above is no set function. > > - /* test index 0 */ > + /* Test index 0 */ > SetLastError( 0xdeadbeef ); > val = pFlsGetValue( 0 ); > ok( !val, "fls index 0 set to %p\n", val ); > @@ -196,6 +268,7 @@ static void test_FiberLocalStorage(PFLS_CALLBACK_FUNCTION cbfunc) > ok( !val, "fls index 0 wrong value %p\n", val ); > ok( GetLastError() == ERROR_INVALID_PARAMETER, "setting fls index wrong error %u\n", GetLastError() ); > > + /* Test creating an FLS index */ > fls = pFlsAlloc( NULL ); > ok( fls != FLS_OUT_OF_INDEXES, "FlsAlloc failed\n" ); > ok( fls != 0, "fls index 0 allocated\n" ); > @@ -205,11 +278,162 @@ static void test_FiberLocalStorage(PFLS_CALLBACK_FUNCTION cbfunc) > ok( ret, "setting fls index %u failed\n", fls ); > val = pFlsGetValue( fls ); > ok( val == (void *)0xdeadbeef, "fls index %u wrong value %p\n", fls, val ); > + ok( GetLastError() == ERROR_SUCCESS, > + "getting fls index %u failed with error %u\n", fls, GetLastError() ); > pFlsFree( fls ); > + > + /* Undefined behavior: verify the value is NULL after it the slot is freed */ > + val = pFlsGetValue( fls ); > + ok( val == NULL, "fls index %u wrong value %p\n", fls, val ); > + ok( GetLastError() == ERROR_SUCCESS, > + "getting fls index %u failed with error %u\n", fls, GetLastError() ); > + > + /* Undefined behavior: verify the value is settable after the slot is freed */ > ret = pFlsSetValue( fls, (void *)0xdeadbabe ); > ok( ret, "setting fls index %u failed\n", fls ); > val = pFlsGetValue( fls ); > ok( val == (void *)0xdeadbabe, "fls index %u wrong value %p\n", fls, val ); > + > + /* Try to create the same FLS index again, and verify that is initialized to NULL */ > + fls_2 = pFlsAlloc( NULL ); > + ok( fls != FLS_OUT_OF_INDEXES, "FlsAlloc failed\n" ); > + /* If this fails it is not an API error, but the test will be inconclusive */ > + ok( fls_2 == fls, "different FLS index allocated, was %u, now %u\n", fls, fls_2 ); > + val = pFlsGetValue( fls_2 ); > + ok( val == NULL, "fls index %u wrong value %p\n", fls, val ); > + ok( GetLastError() == ERROR_SUCCESS, > + "getting fls index %u failed with error %u\n", fls_2, GetLastError() ); A SetLastError() call is missing here, otherwise this test is not really convincing. > + pFlsFree( fls_2 ); > +} > + > +static void test_FiberLocalStorageCallback(PFLS_CALLBACK_FUNCTION cbfunc) { All the other functions have the "{" on the next line. > + DWORD fls; > + BOOL ret; > + PVOID val, val2; > + > + if (!pFlsAlloc || !pFlsSetValue || !pFlsGetValue || !pFlsFree) > + { > + win_skip( "Fiber Local Storage not supported\n" ); > + return; > + } > + > + /* Test that the callback is executed */ > + SetLastError( 0xdeadbeef ); This is unnecessary. > + cbCount = 0; > + fls = pFlsAlloc( cbfunc ); > + ok( fls != FLS_OUT_OF_INDEXES, "FlsAlloc failed with error %u\n", GetLastError() ); > + > + SetLastError( 0xdeadbeef ); This also. > + val = (PVOID) 0x1587; > + fls_value_to_set = val; > + ret = pFlsSetValue( fls, val ); > + ok(ret, "FlsSetValue failed with error %u\n", GetLastError() ); > + > + val2 = pFlsGetValue( fls ); > + ok(val == val2, "FlsGetValue returned %p, expected %p\n", val2, val); > + > + SetLastError( 0xdeadbeef ); Same here. > + ret = pFlsFree( fls ); > + ok(ret, "FlsFree failed with error %u\n", GetLastError() ); > + todo_wine > + { > + ok( cbCount == 1, "Wrong callback count: %d\n", cbCount ); > + } > + > + /* Test that callback is not executed if value is NULL */ > + SetLastError( 0xdeadbeef ); Same here. > + cbCount = 0; > + fls = pFlsAlloc( cbfunc ); > + ok( fls != FLS_OUT_OF_INDEXES, "FlsAlloc failed with error %u\n", GetLastError() ); > + > + SetLastError( 0xdeadbeef ); Same here. > + ret = pFlsSetValue( fls, NULL ); > + ok( ret, "FlsSetValue failed with error %u\n", GetLastError() ); > + > + SetLastError( 0xdeadbeef ); Same here. > + pFlsFree( fls ); > + ok( ret, "FlsFree failed with error %u\n", GetLastError() ); > + ok( cbCount == 0, "Wrong callback count: %d\n", cbCount ); > +} > + > +static void test_FiberLocalStorageWithFibers(PFLS_CALLBACK_FUNCTION cbfunc) { > + PVOID val1 = (PVOID) 0x314; > + PVOID val2 = (PVOID) 0x152; > + BOOL ret; > + > + if (!pConvertThreadToFiber || !pSwitchToFiber || !pDeleteFiber || !pConvertFiberToThread) > + { > + win_skip( "Fibers not supported\n" ); > + return; > + } > + if (!pFlsAlloc || !pFlsFree || !pFlsSetValue || !pFlsGetValue) > + { > + win_skip( "Fiber Local Storage not supported\n" ); > + return; > + } > + > + > + fls_index_to_set = pFlsAlloc(cbfunc); > + ok(fls_index_to_set != FLS_OUT_OF_INDEXES, "FlsAlloc failed with error %d\n", GetLastError()); Not really critical, but in the code above you used %u for GetLastError values. > + > + test_ConvertThreadToFiber(); > + > + fiberCount = 0; > + cbCount = 0; > + fibers[1] = pCreateFiber(0,FiberMainProc,&testparam); > + fibers[2] = pCreateFiber(0,FiberMainProc,&testparam); > + ok(fibers[1] != 0, "CreateFiber failed with error %d\n", GetLastError()); > + ok(fibers[2] != 0, "CreateFiber failed with error %d\n", GetLastError()); CreateFiber returns a pointer, so it would be better to compare against NULL. > + ok(fiberCount == 0, "Wrong fiber count: %d\n", fiberCount); > + ok(cbCount == 0, "Wrong callback count: %d\n", cbCount); > + > + fiberCount = 0; > + cbCount = 0; > + fls_value_to_set = val1; > + pSwitchToFiber(fibers[1]); > + ok(fiberCount == 1, "Wrong fiber count: %d\n", fiberCount); > + ok(cbCount == 0, "Wrong callback count: %d\n", cbCount); > + > + fiberCount = 0; > + cbCount = 0; > + fls_value_to_set = val2; > + pSwitchToFiber(fibers[2]); > + ok(fiberCount == 1, "Wrong fiber count: %d\n", fiberCount); > + ok(cbCount == 0, "Wrong callback count: %d\n", cbCount); > + > + fls_value_to_set = val2; > + ret = pFlsSetValue(fls_index_to_set, fls_value_to_set); > + ok(ret, "FlsSetValue failed\n"); > + ok(val2 == pFlsGetValue(fls_index_to_set), "FlsGetValue failed\n"); > + > + fiberCount = 0; > + cbCount = 0; > + fls_value_to_set = val1; > + pDeleteFiber(fibers[1]); > + ok(fiberCount == 0, "Wrong fiber count: %d\n", fiberCount); > + todo_wine > + { > + ok(cbCount == 1, "Wrong callback count: %d\n", cbCount); > + } > + > + fiberCount = 0; > + cbCount = 0; > + fls_value_to_set = val2; > + pFlsFree(fls_index_to_set); > + ok(fiberCount == 0, "Wrong fiber count: %d\n", fiberCount); > + todo_wine > + { > + ok(cbCount == 2, "Wrong callback count: %d\n", cbCount); > + } > + > + fiberCount = 0; > + cbCount = 0; > + fls_value_to_set = val1; > + pDeleteFiber(fibers[2]); > + ok(fiberCount == 0, "Wrong fiber count: %d\n", fiberCount); > + ok(cbCount == 0, "Wrong callback count: %d\n", cbCount); > + > + test_ConvertFiberToThread(); > } > > START_TEST(fiber) > @@ -223,6 +447,7 @@ START_TEST(fiber) > } > > test_FiberHandling(); > - test_FiberLocalStorage(NULL); > - test_FiberLocalStorage(FiberLocalStorageProc); > + test_FiberLocalStorage(); > + test_FiberLocalStorageCallback(FiberLocalStorageProc); > + test_FiberLocalStorageWithFibers(FiberLocalStorageProc); > } >

2 2

Re: [PATCH 3/3] wined3d/resource: Performance improvements, try 2
by Marvin July 11, 2016

July 11, 2016

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=24152 Your paranoid android. === w8 (32 bit visual) === visual.c:8177: Test failed: Input test: Quad 3(2crd-wrongidx) returned color 0x00ff00ff, expected 0x00ff0080 visual.c:8345: Test failed: Got unexpected color 0x00ff0000 for no color attribute test. visual.c:4529: Test failed: Expected buffer mapped unsyncronized. Flags = D3DLOCK_NOOVERWRITE | D3DLOCK_DISCARD. Usage = 0. visual.c:4529: Test failed: Expected buffer mapped unsyncronized. Flags = D3DLOCK_NOOVERWRITE | D3DLOCK_DISCARD. Usage = 512. === w864 (32 bit visual) === visual.c:4529: Test failed: Expected buffer mapped unsyncronized. Flags = D3DLOCK_NOOVERWRITE | D3DLOCK_DISCARD. Usage = 0. visual.c:4529: Test failed: Expected buffer mapped unsyncronized. Flags = D3DLOCK_NOOVERWRITE | D3DLOCK_DISCARD. Usage = 512. === w1064 (32 bit visual) === visual.c:4529: Test failed: Expected buffer mapped unsyncronized. Flags = D3DLOCK_NOOVERWRITE | D3DLOCK_DISCARD. Usage = 0. visual.c:4529: Test failed: Expected buffer mapped unsyncronized. Flags = D3DLOCK_NOOVERWRITE | D3DLOCK_DISCARD. Usage = 512. === w864 (64 bit visual) === visual.c:4529: Test failed: Expected buffer mapped unsyncronized. Flags = D3DLOCK_NOOVERWRITE | D3DLOCK_DISCARD. Usage = 0. visual.c:4529: Test failed: Expected buffer mapped unsyncronized. Flags = D3DLOCK_NOOVERWRITE | D3DLOCK_DISCARD. Usage = 512. === w1064 (64 bit visual) === visual.c:4529: Test failed: Expected buffer mapped unsyncronized. Flags = D3DLOCK_NOOVERWRITE | D3DLOCK_DISCARD. Usage = 0. visual.c:4529: Test failed: Expected buffer mapped unsyncronized. Flags = D3DLOCK_NOOVERWRITE | D3DLOCK_DISCARD. Usage = 512.

1 0

Re: [PATCH 1/3] d3d9/tests/visual: Add Vertexbuffer locking tests, try 2
by Marvin July 11, 2016

July 11, 2016

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=24150 Your paranoid android. === w8 (32 bit visual) === visual.c:4524: Test failed: Expected buffer mapped unsyncronized. Flags = D3DLOCK_NOOVERWRITE | D3DLOCK_DISCARD. Usage = 0. visual.c:4524: Test failed: Expected buffer mapped unsyncronized. Flags = D3DLOCK_NOOVERWRITE | D3DLOCK_DISCARD. Usage = 512. === w864 (32 bit visual) === visual.c:4524: Test failed: Expected buffer mapped unsyncronized. Flags = D3DLOCK_NOOVERWRITE | D3DLOCK_DISCARD. Usage = 0. visual.c:4524: Test failed: Expected buffer mapped unsyncronized. Flags = D3DLOCK_NOOVERWRITE | D3DLOCK_DISCARD. Usage = 512. === w1064 (32 bit visual) === visual.c:4524: Test failed: Expected buffer mapped unsyncronized. Flags = D3DLOCK_NOOVERWRITE | D3DLOCK_DISCARD. Usage = 0. visual.c:4524: Test failed: Expected buffer mapped unsyncronized. Flags = D3DLOCK_NOOVERWRITE | D3DLOCK_DISCARD. Usage = 512. === w864 (64 bit visual) === visual.c:4524: Test failed: Expected buffer mapped unsyncronized. Flags = D3DLOCK_NOOVERWRITE | D3DLOCK_DISCARD. Usage = 0. visual.c:4524: Test failed: Expected buffer mapped unsyncronized. Flags = D3DLOCK_NOOVERWRITE | D3DLOCK_DISCARD. Usage = 512. === w1064 (64 bit visual) === visual.c:4524: Test failed: Expected buffer mapped unsyncronized. Flags = D3DLOCK_NOOVERWRITE | D3DLOCK_DISCARD. Usage = 0. visual.c:4524: Test failed: Expected buffer mapped unsyncronized. Flags = D3DLOCK_NOOVERWRITE | D3DLOCK_DISCARD. Usage = 512.

1 0

Re: [v3 1/2] winejoystick.drv: Print location ID in debugstr_device on the Mac
by Ken Thomases July 11, 2016

July 11, 2016

On Jun 30, 2016, at 7:02 PM, David Lawrie <david.dljunk(a)gmail.com> wrote: > > Tested on OS X 10.10.5. > > Signed-off-by: David Lawrie <david.dljunk(a)gmail.com> > --- > dlls/winejoystick.drv/joystick_osx.c | 30 ++++++++++++++++++++++++++++-- > 1 file changed, 28 insertions(+), 2 deletions(-) This has similar issues as the dinput version, the main one being the pointless "result" variable in get_device_property_long(). -Ken

2 3

Re: [v3 2/3] dinput: Sort devices by location ID on the Mac
by DavidL July 11, 2016

July 11, 2016

This patch will be superseded in a later version. Signed-off-by: David Lawrie <david.dljunk(a)gmail.com> On Sun, Jul 10, 2016 at 3:22 PM, Ken Thomases <ken(a)codeweavers.com> wrote: > Signed-off-by: Ken Thomases <ken(a)codeweavers.com> > > > >

1 0

Re: [v3 3/3] dinput: Alter function name and code style
by Ken Thomases July 11, 2016

July 11, 2016

On Jun 30, 2016, at 7:02 PM, David Lawrie <david.dljunk(a)gmail.com> wrote: > @@ -490,10 +490,10 @@ static int find_osx_devices(void) > if (devset) > { > CFIndex num_devices, num_main_elements, idx; > - CFMutableArrayRef devices = CFArrayCreateMutable(kCFAllocatorDefault, 0, &kCFTypeArrayCallBacks); > - CFSetApplyFunction(devset, CFSetApplierFunctionCopyToCFArray, devices); > - CFRelease( devset); > - num_devices = CFArrayGetCount(devices); > + num_devices = CFSetGetCount(devset); > + CFMutableArrayRef devices = CFArrayCreateMutable(kCFAllocatorDefault, num_devices, &kCFTypeArrayCallBacks); You've now interleaved statements and declarations. Wine's code standard requires that declarations all come before statements. So, you could change the assignment of num_devices to an initialization or split the declaration and initialization of devices to separate declaration and assignment. Wine should be using -Wdeclaration-after-statement for its compile commands. Therefore, this change would have added a new warning. I know that some of the Mac files have a lot of warnings, which makes it hard to see new ones, but you should strive to avoid adding more. -Ken

2 1

Re: usp10/tests: Use SetRect() instead of open coding it.
by Marvin July 11, 2016

July 11, 2016

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=24145 Your paranoid android. === w1064 (32 bit usp10) === usp10.c:1467: Test failed: 0: uJustification incorrect (0) usp10.c:1467: Test failed: 1: uJustification incorrect (0) usp10.c:1467: Test failed: 2: uJustification incorrect (0) usp10.c:1467: Test failed: 3: uJustification incorrect (0) usp10.c:1467: Test failed: 4: uJustification incorrect (0) usp10.c:1467: Test failed: 5: uJustification incorrect (0) usp10.c:1467: Test failed: 6: uJustification incorrect (0) usp10.c:1467: Test failed: 7: uJustification incorrect (0) usp10.c:1467: Test failed: 8: uJustification incorrect (0) usp10.c:1467: Test failed: 9: uJustification incorrect (0) usp10.c:1483: Test failed: 3: uJustification incorrect (0) usp10.c:1483: Test failed: 5: fDiacritic incorrect (1) usp10.c:1483: Test failed: 5: fZeroWidth incorrect (1) usp10.c:1483: Test failed: 15: fDiacritic incorrect (1) usp10.c:1483: Test failed: 15: fZeroWidth incorrect (1) === w1064 (64 bit usp10) === usp10.c:1467: Test failed: 0: uJustification incorrect (0) usp10.c:1467: Test failed: 1: uJustification incorrect (0) usp10.c:1467: Test failed: 2: uJustification incorrect (0) usp10.c:1467: Test failed: 3: uJustification incorrect (0) usp10.c:1467: Test failed: 4: uJustification incorrect (0) usp10.c:1467: Test failed: 5: uJustification incorrect (0) usp10.c:1467: Test failed: 6: uJustification incorrect (0) usp10.c:1467: Test failed: 7: uJustification incorrect (0) usp10.c:1467: Test failed: 8: uJustification incorrect (0) usp10.c:1467: Test failed: 9: uJustification incorrect (0) usp10.c:1483: Test failed: 3: uJustification incorrect (0) usp10.c:1483: Test failed: 5: fDiacritic incorrect (1) usp10.c:1483: Test failed: 5: fZeroWidth incorrect (1) usp10.c:1483: Test failed: 15: fDiacritic incorrect (1) usp10.c:1483: Test failed: 15: fZeroWidth incorrect (1)

2 1

Re: [PATCH 4/4] d3drm: Implement IDirect3DRMDevice*::Add/DeleteDestroyCallback. (v2)
by Stefan Dösinger July 11, 2016

July 11, 2016

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 Am 2016-07-10 um 21:49 schrieb Aaryaman Vasishta: > I believe the "obj == ctxt->obj" tests in destroy_callback and > destroy_callback1 should cover this. See test_destroy_callback. If I understand it correctly not quite, because you're only ever calling AddDestroyCallback via IDirect3DRMObject, never via IDirect3DRMSomethingElse. (Re-CCed wine-devel) -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJXgsLBAAoJEN0/YqbEcdMwlsUP/2AIUfNl//T23Ik/gnL5FHVd 4axt1f/F5l1Hb5C3049Eh/se5SfF8jM6YYJte62al60f8nf0ERCW8S9JCzRueV2+ Q4ETvXbxhffKh9Ceb8W83ijxkwGf3GplypnXK7OQnqFUg88AR4YTGIL4I5pTPZVq Bw/MKgOfnDAHn+QsRDnzaQTtZcJPDNx+mrf26S/x15Wdi+PQjdVWb3uPbtgfkHN4 TWVwAgTQwPcnJQDaQ2wmWlEG+uxvxqpCF5BFCf1JwRV6oMdYYCQeHH+nvBrnPjEN /7Upv092RGbazucxMr6OWc9GJaCy4K9pfer8U2Ahdb47eAsF9UTO4AoW718GnIfU CJPvh8kMxukMw81U3U5Dr61v9cxd2xywz8ZMWMfKScrN4b6W7/hiE19B3+0w/XHi JHDf0NlPG8RDS+LR3N67X7dkaVqtEkRNCyVfAKdOozlz2EIlzs6lHmYNSxd17GO1 foIPVad9Ovo7nNQhB6FK+0zMZCKAz7be6ai9orlCk4ThhBhVwlaQXX16LBxgrYBi cU/3emOonGzto6sqzDrXyTNEqQTzvFMXnqitH/ITgvKuey0GBLHVSeOAHdECbrN3 bdGYdYPuXnxdksTey/zGORo4u0plUxS3gXiAGM0Ch0oCb6E9uzWMqKJpH6rIoR22 yAuKU7HOboWb3rlcAs0i =s5bk -----END PGP SIGNATURE-----

2 3

Re: [PATCH] ddraw/tests: Skip A4R4G4B4 ckey tests on Nvidia (v3)
by Marvin July 10, 2016

July 10, 2016

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=24144 Your paranoid android. === w1064 (32 bit ddraw4) === ddraw4.c:2540: Test failed: Expected (0,0)-(512,384), got (0,0)-(1024,768). === w1064 (64 bit ddraw4) === ddraw4.c:2540: Test failed: Expected (0,0)-(512,384), got (0,0)-(1024,768). === w1064 (32 bit ddraw7) === ddraw7.c:2270: Test failed: Expected (0,0)-(512,384), got (0,0)-(1024,768). === w1064 (64 bit ddraw7) === ddraw7.c:2270: Test failed: Expected (0,0)-(512,384), got (0,0)-(1024,768). === w1064 (32 bit ddraw1) === ddraw1.c:2204: Test failed: Expected (0,0)-(512,384), got (0,0)-(1024,768). === w1064 (64 bit ddraw1) === ddraw1.c:2204: Test failed: Expected (0,0)-(512,384), got (0,0)-(1024,768). === w1064 (32 bit ddraw2) === ddraw2.c:2355: Test failed: Expected (0,0)-(512,384), got (0,0)-(1024,768). === w1064 (64 bit ddraw2) === ddraw2.c:2355: Test failed: Expected (0,0)-(512,384), got (0,0)-(1024,768).

1 0

Re: [v3 1/3] dinput: Print location ID in debugstr_device on the Mac
by Ken Thomases July 10, 2016

July 10, 2016

Hi, Sorry for the late review. See in-line comments: On Jun 30, 2016, at 7:02 PM, David Lawrie <david.dljunk(a)gmail.com> wrote: > > +static void get_device_property_long(IOHIDDeviceRef in_device, CFStringRef in_key, long * out_value) As Dmitry suggested, you could make this simply return the property value rather than provide it through the indirect output parameter. > +{ > + Boolean result = FALSE; This variable isn't really used. It's assigned, but never read. > + CFTypeRef type; This variable isn't holding a type, it's holding a value or, if you prefer, an object reference. (The fact that its type is "CFTypeRef" doesn't imply it holds a type. Frankly, "CFTypeRef" is also a lousy name, but that's on Apple.) > + > + if (in_device) > + { > + assert(IOHIDDeviceGetTypeID() == CFGetTypeID(in_device)); > + > + type = IOHIDDeviceGetProperty(in_device, in_key); > + > + if (type) > + { > + if (CFNumberGetTypeID() == CFGetTypeID(type)) You could combine these two "if" statements using &&. -Ken

1 0

Re: [v2 01/10] webservices: Add support for writing double values.
by Sebastian Lackner July 10, 2016

July 10, 2016

On 08.07.2016 10:20, Hans Leidekker wrote: > v2: Fix build failure. > > Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> > --- > dlls/webservices/reader.c | 8 +-- > dlls/webservices/tests/writer.c | 113 +++++++++++++++++++++++++++++++++ > dlls/webservices/webservices_private.h | 2 + > dlls/webservices/writer.c | 100 +++++++++++++++++++++++++++++ > include/webservices.h | 5 ++ > 5 files changed, 224 insertions(+), 4 deletions(-) > Unfortunately your patch does not work as expected here (gcc 5.3): ../../../tools/runtest -q -P wine -T ../../.. -M webservices.dll -p webservices_test.exe.so writer && touch writer.ok writer.c:358: Test failed: 1941: got 11 expected 10 writer.c:360: Test failed: 1941: got <t>:E-3</t>>000000004</t> expected <t>1E-2</t> writer.c:358: Test failed: 1941: got 12 expected 11 writer.c:360: Test failed: 1941: got <t>-:E-3</t>000000004</t> expected <t>-1E-2</t> Makefile:346: die Regel für Ziel „writer.ok“ scheiterte If you need any details to investigate this issue please let me know. Regards, Sebastian

2 2

Re: [PATCH 4/4] d3drm: Implement IDirect3DRMDevice*::Add/DeleteDestroyCallback. (v2)
by Stefan Dösinger July 10, 2016

July 10, 2016

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 Am 2016-07-10 um 17:41 schrieb Aaryaman Vasishta: > static HRESULT WINAPI d3drm_device1_AddDestroyCallback(IDirect3DRMDevice *iface, > D3DRMOBJECTCALLBACK cb, void *ctx) > { > - FIXME("iface %p, cb %p, ctx %p stub!\n", iface, cb, ctx); > + struct d3drm_device *device = impl_from_IDirect3DRMDevice(iface); > > - return E_NOTIMPL; > + TRACE("iface %p, cb %p, ctx %p.\n", iface, cb, ctx); > + > + return d3drm_device3_AddDestroyCallback(&device->IDirect3DRMDevice3_iface, cb, ctx); > } It doesn't fit in this patch, but at some point we should test which interface is passed to the destroy callback: Is it the interface on which AddDestroyCallback was called, or is it the interface returned by iface->QueryInterface(&IID_IDirect3DRMObject)? Please correct me if we already have tests for that and I missed them :- ) . -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJXgpstAAoJEN0/YqbEcdMwWkcP/j25Gk+jAQlDrb0l0YV5Tz0k V0D/PZW7lHMcGCeAW4Y8GyzzKAFVD+d8YL9RRHcxyWbUnl5f6nR/yjAe3da6FFpD AF+vDvKGlV1POG1QhC8d/34SxVYXsngKNq2tvxYVQOhldvKh9d9Ti255dLFicqG3 aBBzPF1OvY9ZaxQJQAyJdU9944YtaH3CUd6cxjOH95jR1hAiz55akKWDRQHm7Uc+ S77/XRaaUmGTX5gpma/EeY7Rb/eG3cEDF8UBoCI6rfu+kjIEa+KTJVZKzeSA5+RU xPETE28jUX94XZnRz8lqLJbSRboBXSa2MWDdb2KvBUqSTLPS1cTm55cLYRngWDAD czF8Wfo+UOfGeG9oGhorUE2GkOleDd/WtXQtAfJeAvxfBxd4aA5v66Z7IwhcVeEV sSEhsqxFfc31VBB/f4Ii3F/5nFyMN+LfcDUIHI4tmOMjwj+VMlIES//71BvYQpqm iJNo9DPSVUyqApIgPSNsYL7vORUl2AKsklJKk4fxka1j1010TLJdpFIyv4leLfL8 mBUY13S+wzaEObhztQJiMJ5usWu9BoClm38x4Oj5JzMZ2Pg2If0WAcVRLOLkb9Br GIyfN5K89SUmiJp6GoMtKG99QXypMsg1fanYe6imBTL8Cj5tGuVAoJlPDMpc8i07 JxITcNBrsu5/WwP8tGeq =Zf/v -----END PGP SIGNATURE-----

1 0

Re: [PATCH] kernel32/tests/fiber: Add tests for fiber-local storage.
by André Hentschel July 10, 2016

July 10, 2016

Hi, comments inline Am 08.07.2016 um 00:16 schrieb John Sheu: > +static void test_FiberLocalStorageCallback(PFLS_CALLBACK_FUNCTION cbfunc) { > + DWORD fls; > + BOOL ret; > + PVOID val, val2; > + > + if (!pFlsAlloc || !pFlsSetValue || !pFlsGetValue || !pFlsFree) > + { > + win_skip( "Fiber Local Storage not supported\n" ); > + return; > + } > + > + /* Test that the callback is executed */ > + SetLastError( 0xdeadbeef ); > + cbCount = 0; > + fls = pFlsAlloc( cbfunc ); > + ok( fls != FLS_OUT_OF_INDEXES, "FlsAlloc failed with error %u\n", GetLastError() ); > + > + SetLastError( 0xdeadbeef ); > + val = (PVOID) 0x1587; > + fls_value_to_set = val; > + ret = pFlsSetValue( fls, val ); > + ok(ret, "FlsSetValue failed with error %u\n", GetLastError() ); > + > + val2 = pFlsGetValue( fls ); > + ok(val == val2, "FlsGetValue returned %p, expected %p\n", val2, val); > + > + SetLastError( 0xdeadbeef ); > + ret = pFlsFree( fls ); > + ok(ret, "FlsFree failed with error %u\n", GetLastError() ); > + todo_wine > + { > + ok( cbCount == 1, "Wrong callback count: %d\n", cbCount ); > + } Please make those one-liners, like todo_wine ok(...); and the patch should be fine then > + > + /* Test that callback is not executed if value is NULL */ > + SetLastError( 0xdeadbeef ); > + cbCount = 0; > + fls = pFlsAlloc( cbfunc ); > + ok( fls != FLS_OUT_OF_INDEXES, "FlsAlloc failed with error %u\n", GetLastError() ); > + > + SetLastError( 0xdeadbeef ); > + ret = pFlsSetValue( fls, NULL ); > + ok( ret, "FlsSetValue failed with error %u\n", GetLastError() ); > + > + SetLastError( 0xdeadbeef ); > + pFlsFree( fls ); > + ok( ret, "FlsFree failed with error %u\n", GetLastError() ); > + ok( cbCount == 0, "Wrong callback count: %d\n", cbCount ); > +}

3 3