- wine-devel - winehq.org

Re: [Tools v2] testbot/TestLauncher: Provide proper replacements for the str*_s() functions.
by Alexandre Julliard 13 Jun '17

13 Jun '17

Francois Gouget <fgouget(a)codeweavers.com> writes: > Windows XP's msvcrt does not have the str*_s() functions but mapping > them to their non _s() counterparts resulted in the test name sometimes > not being NUL-terminated. As a result the start and done lines would not > be recognized. > > An alternative solution would be to eschew the buffer safety and switch > to the non _s() functions with a couple of minor code adjustments. That would be preferable IMO. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 3/3] msacm32/tests: Add tests for PCM conversion.
by Marvin 13 Jun '17

13 Jun '17

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=31623 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [PATCH 2/3] msacm32/tests: Move stream tests to separate file.
by Marvin 13 Jun '17

13 Jun '17

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=31622 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [PATCH v2 2/2] winemp3.acm: Fix error in acmStreamSize().
by Andrew Eikum 13 Jun '17

13 Jun '17

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> On Mon, Jun 12, 2017 at 02:36:36PM -0500, Zebediah Figura wrote: > Fixes https://bugs.winehq.org/show_bug.cgi?id=33740. > > Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> > --- > dlls/winemp3.acm/mpegl3.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/dlls/winemp3.acm/mpegl3.c b/dlls/winemp3.acm/mpegl3.c > index cc6008da59e..13a6109a77a 100644 > --- a/dlls/winemp3.acm/mpegl3.c > +++ b/dlls/winemp3.acm/mpegl3.c > @@ -940,11 +940,11 @@ static LRESULT MPEG3_StreamSize(PACMDRVSTREAMINSTANCE adsi, PACMDRVSTREAMSIZE ad > adsi->pwfxDst->wFormatTag == WAVE_FORMAT_MPEG)) > { > nblocks = adss->cbSrcLength / (adsi->pwfxSrc->nBlockAlign * 1152); > - if (nblocks == 0) > - return ACMERR_NOTPOSSIBLE; > if (adss->cbSrcLength % (DWORD)(adsi->pwfxSrc->nBlockAlign * 1152)) > /* Round block count up. */ > nblocks++; > + if (nblocks == 0) > + return ACMERR_NOTPOSSIBLE; > adss->cbDstLength = 3000 + nblocks * (DWORD)(adsi->pwfxDst->nAvgBytesPerSec * 1152 / adsi->pwfxDst->nSamplesPerSec + 0.5); > } > else if ((adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_MPEGLAYER3 || > @@ -952,11 +952,11 @@ static LRESULT MPEG3_StreamSize(PACMDRVSTREAMINSTANCE adsi, PACMDRVSTREAMSIZE ad > adsi->pwfxDst->wFormatTag == WAVE_FORMAT_PCM) > { > nblocks = adss->cbSrcLength / (DWORD)(adsi->pwfxSrc->nAvgBytesPerSec * 1152 / adsi->pwfxSrc->nSamplesPerSec); > - if (nblocks == 0) > - return ACMERR_NOTPOSSIBLE; > if (adss->cbSrcLength % (DWORD)(adsi->pwfxSrc->nAvgBytesPerSec * 1152 / adsi->pwfxSrc->nSamplesPerSec)) > /* Round block count up. */ > nblocks++; > + if (nblocks == 0) > + return ACMERR_NOTPOSSIBLE; > adss->cbDstLength = nblocks * 1152 * adsi->pwfxDst->nBlockAlign; > } > else > -- > 2.13.0 > > >

1 0

Re: [PATCH] dinput: Limit axes remap and fix loop variable in the js driver
by Sebastian Lackner 13 Jun '17

13 Jun '17

On 13.06.2017 08:06, Bruno Jesus wrote: > Tested with the Xbox 360 controller, Wii Classic controler, PS2 controller + usb converter and a virtual device with 24 axes. > > Fixes https://bugs.winehq.org/show_bug.cgi?id=43120 > > Signed-off-by: Bruno Jesus <bjesus(a)codeweavers.com> > --- > dlls/dinput/joystick_linux.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c > index 1032659621..dea8f17324 100644 > --- a/dlls/dinput/joystick_linux.c > +++ b/dlls/dinput/joystick_linux.c > @@ -253,9 +253,11 @@ static INT find_joystick_devices(void) > /* If no axes were configured but there are axes assume a 1-to-1 (wii controller) */ > if (joydev.axis_count && !found_axes) > { > + int axes_limit = min(joydev.axis_count, 8); /* generic driver limit */ Is it intentional that you are ignoring any POV sticks here? The limit of 8 only seems to apply to the buttons. > + > ERR("Incoherent joystick data, advertised %d axes, detected 0. Assuming 1-to-1.\n", > joydev.axis_count); > - for (j = 0; j < joydev.axis_count; j++) > + for (j = 0; j < axes_limit; j++) > joydev.dev_axes_map[j] = j; > } > } > @@ -472,7 +474,7 @@ static HRESULT alloc_device(REFGUID rguid, IDirectInputImpl *dinput, > df->dwNumObjs = newDevice->generic.devcaps.dwAxes + newDevice->generic.devcaps.dwPOVs + newDevice->generic.devcaps.dwButtons; > if (!(df->rgodf = HeapAlloc(GetProcessHeap(), 0, df->dwNumObjs * df->dwObjSize))) goto FAILED; > > - for (i = 0; i < newDevice->generic.device_axis_count; i++) > + for (i = 0; i < newDevice->generic.devcaps.dwAxes; i++) > { > int wine_obj = newDevice->generic.axis_map[i]; > > -- 2.11.0 > This change looks very suspicious because you are changing the for-loop, but not the dwNumObjs counter above. You are allocating dwPOVs additional entries which are now unused after this change. Is this really correct, and did you test with a joystick with POV switch? Best regards, Sebastian

2 1

Re: [2/2] ws2_32/tests: Test IP address conversion in getaddrinfo.
by Bruno Jesus 12 Jun '17

12 Jun '17

On Thu, Jun 8, 2017 at 6:26 PM, Owen Rudge <orudge(a)codeweavers.com> wrote: > Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> > --- > dlls/ws2_32/tests/sock.c | 101 > +++++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 101 insertions(+) It looks like this patch is missing some freeaddrinfo in the tests related to verify_ipv6_addrinfo, and could be simplified a bit , I'm making minor changes and will submit a new version of the series.

2 1

Re: [PATCH] wmvcore: add WMCheckURLScheme stub
by Alexandre Julliard 12 Jun '17

12 Jun '17

Austin English <austinenglish(a)gmail.com> writes: > +HRESULT WINAPI WMCheckURLScheme(const WCHAR *scheme) > +{ > + FIXME("(%s): stub\n", wine_dbgstr_w(scheme)); > + > + return ERROR_INVALID_NAME; That's not an HRESULT. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 1/4] include: Pack WAVEFORMAT structs.
by Alexandre Julliard 12 Jun '17

12 Jun '17

Andrew Eikum <aeikum(a)codeweavers.com> writes: > This looks OK to me, and fixes the size of the MPEGLAYER3WAVEFORMAT > structure to match native, but I don't know how to use our packing > headers well enough to be confident. It looks like the entire file should be using 1-byte packing. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH] msacm32: Fix bytes written in PCM converter.
by Andrew Eikum 12 Jun '17

12 Jun '17

On Tue, Jun 06, 2017 at 06:17:46PM -0500, Zebediah Figura wrote: > diff --git a/dlls/msacm32/pcmconverter.c b/dlls/msacm32/pcmconverter.c > index e4bc5e7777..51f5eec8ee 100644 > --- a/dlls/msacm32/pcmconverter.c > +++ b/dlls/msacm32/pcmconverter.c > @@ -561,6 +561,7 @@ static void cvtSS88C(DWORD srcRate, const unsigned char* src, LPDWORD nsrc, > error = error - dstRate; > } > } > + *ndst = 0; > } > I'm confused how this makes a difference. Isn't ndst already 0 at this point since it exited the while loop? Andrew

3 3

Re: [PATCH 4/5] d3drm: Make it possible to create frame with CreateObject()
by Henri Verbeet 12 Jun '17

12 Jun '17

On 11 June 2017 at 17:52, Nikolay Sivov <nsivov(a)codeweavers.com> wrote: > Subject: [PATCH 4/5] d3drm: Make it possible to create frame with CreateObject() Technically that should be "frames" or "frame objects" instead of "frame". Likewise in patch 5/5.

1 0

Re: [PATCH 3/5] d3drm/tests: Some tests for mesh builder and faces interaction
by Henri Verbeet 12 Jun '17

12 Jun '17

On 11 June 2017 at 17:52, Nikolay Sivov <nsivov(a)codeweavers.com> wrote: > + /* CreateFace() already added this face. */ > + hr = IDirect3DRMMeshBuilder_AddFace(mesh_builder, face); > + ok(hr == D3DRMERR_FACEUSED, "Got unexpected hr %#x.\n", hr); > + > + count = IDirect3DRMMeshBuilder_GetFaceCount(mesh_builder); > + ok(count == 1, "Unexpected face count %d.\n", count); > + > + hr = IDirect3DRMFace_AddVertex(face, 1.0f, 2.0f, 3.0f); > + ok(SUCCEEDED(hr), "Failed to add a vertex, hr %#x.\n", hr); > + > + ref = IDirect3DRMFace_Release(face); > + ok(ref == 0, "Unexpected ref count %u.\n", ref); > + > + count = IDirect3DRMMeshBuilder_GetFaceCount(mesh_builder); > + ok(count == 1, "Unexpected face count %d.\n", count); > + > + hr = IDirect3DRMMeshBuilder2_GetFace(mesh_builder2, 0, &face1); > + ok(SUCCEEDED(hr), "Failed to retrieve face, hr %#x.\n", hr); > + ok(face1 != face, "Unexpected face pointer.\n"); This fails for me on Windows: d3drm.c:606: Test failed: Unexpected face pointer. > +static void test_add_vertex_normal_indexed(void) > +{ ... > + hr = IDirect3DRMMeshBuilder3_DeleteVertices(mesh_builder3, 0, 1); > + ok(SUCCEEDED(hr), "Failed to delete vertices, hr %#x.\n", hr); > +} > + IDirect3DRMMeshBuilder3_Release(mesh_builder3); > + IDirect3DRMMeshBuilder_Release(mesh_builder); > + > + IDirect3DRM_Release(d3drm); > +} This sometimes fails for me on Windows: d3drm.c:6787: this is the last test seen before the exception 0cec:d3drm: unhandled exception c0000005 at 77532A62

1 0

Re: [PATCH 1/5] d3drm/tests: Add helpers to test vectors
by Henri Verbeet 12 Jun '17

12 Jun '17

On 11 June 2017 at 17:52, Nikolay Sivov <nsivov(a)codeweavers.com> wrote: > Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> > --- > dlls/d3drm/tests/d3drm.c | 144 +++++++++++++++++++---------------------------- > 1 file changed, 57 insertions(+), 87 deletions(-) > For what it's worth, 32 seems fairly loose for values that are either loaded directly or trivially computed. I suspect it should be possible to tighten that a little.

1 0

Re: [PATCH] user32: Return desktop as shell window if shell is not set.
by Nikolay Sivov 12 Jun '17

12 Jun '17

On 10.06.2017 20:22, Ilya Konovalov wrote: > This should fix https://bugs.winehq.org/show_bug.cgi?id=38196 Explorer seems like a good candidate to call SetShellWindow() from.

2 1

Re: [PATCH v2] msxml3: Remove CRs in domtext_put_data and add them in domtext_get_xml.
by Marvin 12 Jun '17

12 Jun '17

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=31588 Your paranoid android. === wxppro (32 bit domdoc) === 0a20:domdoc: unhandled exception c0000005 at 749B3845 === w2003std (32 bit domdoc) === 05f0:domdoc: unhandled exception c0000005 at 72EAD79F === wvistau64 (32 bit domdoc) === 01f4:domdoc: unhandled exception c0000005 at 737A9A31 === w2008s64 (32 bit domdoc) === 08f4:domdoc: unhandled exception c0000005 at 741B9A31 === w7u (32 bit domdoc) === 0f30:domdoc: unhandled exception c0000005 at 6BF5ADFC === w7pro64 (32 bit domdoc) === 084c:domdoc: unhandled exception c0000005 at 737AADA9 === w8 (32 bit domdoc) === 0ecc:domdoc: unhandled exception c0000005 at 68D2B47E === w864 (32 bit domdoc) === 0f98:domdoc: unhandled exception c0000005 at 7445B47E === w1064 (32 bit domdoc) === 0eb4:domdoc: unhandled exception c0000005 at 6FFD7894 === wvistau64 (64 bit domdoc) === 0504:domdoc: unhandled exception c0000005 at 000007FEF9FDA46A === w2008s64 (64 bit domdoc) === 0a44:domdoc: unhandled exception c0000005 at 000007FEF92DA46A === w7pro64 (64 bit domdoc) === 06ec:domdoc: unhandled exception c0000005 at 000007FEF3D1A0FC === w864 (64 bit domdoc) === 0fa8:domdoc: unhandled exception c0000005 at 00007FFB1B6148C4 === w1064 (64 bit domdoc) === 0e28:domdoc: unhandled exception c0000005 at 00007FFC241D2166

1 0

Re: [PATCH v3] comctl32/taskdialog: Implement buttons.
by Nikolay Sivov 11 Jun '17

11 Jun '17

Thanks. I attached what I believe to be improved version, while keeping your positioning logic. It fixes compiler warning, loading custom button text from resources, naming issues, and minor formatting inconsistencies. If you're okay with it, I'll submit under your name, or you can do it yourself. Nikolay

3 2

Re: [PATCH 3/5] d3dx9: Turn a "Out of bounds" FIXME into a WARN.
by Paul Gofman 11 Jun '17

11 Jun '17

Matteo, I am curious why would you want to change this FIXME to WARN? We know that native implementation does not fail effect creation in this case. Regards, Paul. On 06/09/2017 10:19 PM, Matteo Bruni wrote: > Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> > --- > It could be triggered by broken preshaders. > > dlls/d3dx9_36/preshader.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c > index 522d4841f9..d0cff22e4a 100644 > --- a/dlls/d3dx9_36/preshader.c > +++ b/dlls/d3dx9_36/preshader.c > @@ -868,7 +868,7 @@ static HRESULT parse_preshader(struct d3dx_preshader *pres, unsigned int *ptr, u > } > if (reg_idx >= pres->regs.table_sizes[table]) > { > - FIXME("Out of bounds register index, i %u, j %u, table %u, reg_idx %u.\n", > + WARN("Out of bounds register index, i %u, j %u, table %u, reg_idx %u.\n", > i, j, table, reg_idx); > return D3DXERR_INVALIDDATA; > }

2 1

Re: [PATCH 1/5] d3dx9: Avoid casting each value separately in set_constants().
by Matteo Bruni 09 Jun '17

09 Jun '17

2017-06-06 14:28 GMT+02:00 Paul Gofman <gofmanp(a)gmail.com>: > +static void pres_float_to_int(void *in, void *out, unsigned int count) "in" should probably be const in all of these helpers. > +static void pres_bool_to_int(void *in, void * out, unsigned int count) Stray whitespace after *. > +{ > + unsigned int i; > + const float *in_bool = in; > + int *out_int = out; > + > + for (i = 0; i < count; ++i) > + out_int[i] = !!in_bool[i]; Is the double negation necessary here (or above)? > +static void regstore_set_data(struct d3dx_regstore *rs, unsigned int table, > + unsigned int offset, unsigned int *in, unsigned int count, enum pres_value_type param_type) > +{ > + typedef void (*conv_func)(void *in, void *out, unsigned int count); > + static conv_func set_const_funcs[PRES_VT_COUNT][PRES_VT_COUNT] = Missing const. > + { > + {NULL, NULL, pres_float_to_int, pres_value_to_bool}, > + {NULL, NULL, NULL, NULL}, > + {pres_int_to_float, NULL, NULL, pres_value_to_bool}, > + {pres_bool_to_float, NULL, pres_bool_to_int, NULL} > + }; > + enum pres_value_type table_type = table_info[table].type; > + > + if (table_type == param_type) > + { > + regstore_set_values(rs, table, in, offset, count); > + return; > + } IIUC in this case regstore_set_values() will have in == out. That's a problem since it means memcpy()ing the data onto itself, which is undefined. It's also unnecessary, regstore_set_modified() would be enough, but only if in == out which is something the current regstore_set_data() interface doesn't enforce (and indeed patch 2/5 doesn't respect). I guess the root issue is that you're now using the regstore also as temporary storage and none of the existing (and new) code expects it. So it's a matter of fixing the code as necessary to make it work fine or to avoid this "new" usage of the regstore e.g. by means of a separate temporary buffer. > for (element = 0; element < const_set->element_count; ++element) > { > + unsigned int *out = (unsigned int *)rs->tables[table] + start_offset; Aside from the issue I mentioned above, this works only because all the formats we're interesting in converting from / to happen be 4 bytes wide. It's somewhat assumed in a bunch of places already but adding more isn't too exciting. I'd like at least an assert checking for the precondition, if possible. > @@ -1083,23 +1155,15 @@ static void set_constants(struct d3dx_regstore *rs, struct d3dx_const_tab *const > WARN("Parameter data is too short, name %s, component %u.\n", debugstr_a(param->name), i); > break; > } > - > - in = (unsigned int *)data + param_offset; > - switch (table_type) > - { > - case PRES_VT_FLOAT: set_number(&out, D3DXPT_FLOAT, in, param->type); break; > - case PRES_VT_INT: set_number(&out, D3DXPT_INT, in, param->type); break; > - case PRES_VT_BOOL: set_number(&out, D3DXPT_BOOL, in, param->type); break; > - default: > - FIXME("Unexpected type %#x.\n", table_info[table].type); > - break; > - } > - regstore_set_values(rs, table, &out, offset, 1); > + out[offset] = data[param_offset]; I think separating the matrix transposing / "reshaping" from the data conversion is okay, if that allows further changes and optimizations like patch 2/5. You might want to add a small comment around here to clarify the split. > } > } > start_offset += get_offset_reg(table, const_set->register_count); > data += param->rows * param->columns; > } > + start_offset = get_offset_reg(table, const_set->register_index); > + regstore_set_data(rs, table, start_offset, (unsigned int *)rs->tables[table] + start_offset, > + get_offset_reg(table, const_set->register_count) * const_set->element_count, param_type); I understand that you want to avoid to use some separate storage for the "to be converted" data but, like above, this regstore table pointer cast makes me a bit uncomfortable.

2 4

Re: [PATCH 4/5] d3dx9: Get rid of constant's length checking for matrix in set_constants().
by Matteo Bruni 09 Jun '17

09 Jun '17

2017-06-06 14:28 GMT+02:00 Paul Gofman <gofmanp(a)gmail.com>: > @@ -1026,10 +1027,22 @@ static void get_const_upload_info(struct d3dx_const_param_eval_output *const_set > info->major = param->rows; > info->minor = param->columns; > } > - info->major_stride = max(info->minor, get_offset_reg(table, 1)); > - info->major_count = min(info->major * info->major_stride, > - get_offset_reg(table, const_set->register_count) + info->major_stride - 1) / info->major_stride; > - info->count = info->major_count * info->minor; > + > + if (table == PRES_REGTAB_OBCONST) Minor, but you could key this on component_count == 1 instead of explicitly checking PRES_REGTAB_OBCONST. > + { > + unsigned int const_length = get_offset_reg(table, const_set->register_count); > + > + info->major_stride = info->minor; > + info->major_count = const_length / info->major_stride; > + info->minor_remainder = const_length % info->major_stride; > + } > + else > + { > + info->major_stride = get_offset_reg(table, 1); Another potential use for the get_reg_components(table) helper :)

2 2

Re: [PATCH 2/4] winemp3.acm: Disallow operations encoding to MPEG.
by Marvin 09 Jun '17

09 Jun '17

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=31546 Your paranoid android. === wxppro (32 bit msacm) === msacm.c:1162: Test failed: expected 0, got 41 === w2003std (32 bit msacm) === msacm.c:1162: Test failed: expected 0, got 41 === w2008s64 (32 bit msacm) === msacm.c:1159: Test failed: failed with error 0x200 msacm.c:1160: Test failed: expected 30, got 0 msacm.c:1167: Test failed: failed with error 0x6 msacm.c:1168: Test failed: expected 1, got 0 msacm.c:1169: Test failed: expected 44100, got 0 msacm.c:1170: Test failed: expected 16, got 0 msacm.c:1171: Test failed: expected 2, got 0 msacm.c:1172: Test failed: expected 88200, got 0 === w2008s64 (64 bit msacm) === msacm.c:1159: Test failed: failed with error 0x200 msacm.c:1160: Test failed: expected 30, got 0 msacm.c:1167: Test failed: failed with error 0x6 msacm.c:1168: Test failed: expected 1, got 0 msacm.c:1169: Test failed: expected 44100, got 0 msacm.c:1170: Test failed: expected 16, got 0 msacm.c:1171: Test failed: expected 2, got 0 msacm.c:1172: Test failed: expected 88200, got 0

1 0

Re: [PATCH 3/3] d3drm/tests: Some tests for mesh builder and faces
by Henri Verbeet 09 Jun '17

09 Jun '17

On 9 June 2017 at 01:36, Nikolay Sivov <nsivov(a)codeweavers.com> wrote: > +#define test_vector_eq(a, b, c, d) test_vector_eq_(__LINE__, a, b, c, d) > +static void test_vector_eq_(unsigned int line, D3DVECTOR *v, float x, float y, float z) "v" should probably be const. More generally, with the scheme we've been using for the other D3D tests, this would look like the following: static void check_vector_(unsigned int line, const D3DVECTOR *v, float x, float y, float x, unsigned int ulps) and print the ok_() as something like "Got unexpected vector {%.8e, %.8e, %.8e}, expected {%.8e, %.8e, %.8e}.\n". Note that the %.8e is because %f is lossy. See e.g. compare_vec4() in the ddraw and d3d11 tests. > + memset(v, 0, sizeof(v)); > + hr = IDirect3DRMFace_GetVertex(face1, 0, v, n); > + ok(SUCCEEDED(hr), "Failed to get vertex data, hr %#x.\n", hr); > + ok(U1(v[0]).x == 1.0f, "Wrong component v[0].x = %f (expected %f)\n", U1(v[0]).x, 1.0f); > + ok(U2(v[0]).y == 2.0f, "Wrong component v[0].y = %f (expected %f)\n", U2(v[0]).y, 2.0f); > + ok(U3(v[0]).z == 3.0f, "Wrong component v[0].z = %f (expected %f)\n", U3(v[0]).z, 3.0f); > + That should probably use check_vector(), and I think there are more places in the d3drm tests that would benefit from using check_vector(). > + color = IDirect3DRMFace_GetColor(face1); > +todo_wine > + ok(color == 0xff00ff00, "Got wrong color, %#x.\n", color); %#x is a little awkward for colours, 0x%08x would be more appropriate. I'd argue for "unexpected" over "wrong". > + hr = IDirect3DRMMeshBuilder3_GetFace(mesh_builder3, 0, &face2); > + ok(SUCCEEDED(hr), "Failed to delete a face, %#x.\n", hr); s/delete/retrieve/ I think that should be "the" instead of "a", but I think simply omitting the article would also be fine. > -#define IDirect3DRMFace_GetColor(p,a) (p)->lpVtbl->GetColor(p,a) > +#define IDirect3DRMFace_GetColor(p) (p)->lpVtbl->GetColor(p) IDirect3DRMFace2 seems to have the same issue.

1 0

Re: [PATCH v2] comctl32/taskdialog: Implement buttons.
by Nikolay Sivov 09 Jun '17

09 Jun '17

On 01.06.2017 20:02, Fabian Maurer wrote: > Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> > --- > dlls/comctl32/taskdialog.c | 243 ++++++++++++++++++++++++++++++++++----------- > 1 file changed, 185 insertions(+), 58 deletions(-) > It does not apply to current git head, most likely because of my latest patch to this file. Could you please rebase, I'd like to test new wrapping logic.

1 0

Re: [2/2] ws2_32/tests: Test IP address conversion in getaddrinfo.
by Marvin 09 Jun '17

09 Jun '17

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=31521 Your paranoid android. === w7u (32 bit sock) === sock.c:5979: Test failed: Expected event sequence [FD_READ(0)], got [] sock.c:5988: Test failed: Expected event sequence [FD_READ(0)], got [FD_READ(0) FD_READ(0)]

2 1

Re: Alexandre Julliard : wineandroid: Implement ToUnicodeEx.
by Dmitry Timoshkov 09 Jun '17

09 Jun '17

Alexandre Julliard <julliard(a)winehq.org> wrote: > +INT CDECL ANDROID_ToUnicodeEx( UINT virt, UINT scan, const BYTE *state, > + LPWSTR buf, int size, UINT flags, HKL hkl ) > +{ > + WCHAR buffer[2]; > + BOOL shift = (state[VK_SHIFT] & 0x80) || (state[VK_CAPITAL] & 0x01); Treating Shift and CapsLock states same way leads to not correct results for the not letter keys. > + BOOL ctrl = state[VK_CONTROL] & 0x80; > + BOOL numlock = state[VK_NUMLOCK] & 0x01; > + > + buffer[0] = buffer[1] = 0; > + > + if (scan & 0x8000) return 0; /* key up */ > + > + /* FIXME: hardcoded layout */ > + > + if (!ctrl) > + { > + switch (virt) > + { > + case VK_BACK: buffer[0] = '\b'; break; > + case VK_OEM_1: buffer[0] = shift ? ':' : ';'; break; > + case VK_OEM_2: buffer[0] = shift ? '?' : '/'; break; > + case VK_OEM_3: buffer[0] = shift ? '~' : '`'; break; > + case VK_OEM_4: buffer[0] = shift ? '{' : '['; break; > + case VK_OEM_5: buffer[0] = shift ? '|' : '\\'; break; > + case VK_OEM_6: buffer[0] = shift ? '}' : ']'; break; > + case VK_OEM_7: buffer[0] = shift ? '"' : '\''; break; > + case VK_OEM_COMMA: buffer[0] = shift ? '<' : ','; break; > + case VK_OEM_MINUS: buffer[0] = shift ? '_' : '-'; break; > + case VK_OEM_PERIOD: buffer[0] = shift ? '>' : '.'; break; > + case VK_OEM_PLUS: buffer[0] = shift ? '+' : '='; break; > + case VK_RETURN: buffer[0] = '\r'; break; > + case VK_SPACE: buffer[0] = ' '; break; > + case VK_TAB: buffer[0] = '\t'; break; > + case VK_MULTIPLY: buffer[0] = '*'; break; > + case VK_ADD: buffer[0] = '+'; break; > + case VK_SUBTRACT: buffer[0] = '-'; break; > + case VK_DIVIDE: buffer[0] = '/'; break; > + default: > + if (virt >= '0' && virt <= '9') > + { > + buffer[0] = shift ? ")!@#$%^&*("[virt - '0'] : virt; While this compiles even with MSVC there are certainly more readable ways to do the same thing. -- Dmitry.

1 0

Re: [PATCH v2] shell32: Implement FCIDM_SHVIEW_CREATELINK
by Nikolay Sivov 08 Jun '17

08 Jun '17

On 05.06.2017 18:42, Aric Stewart wrote: > > v2: suggestions from Nikolay Sivov > > Presently the wine file explorer has a create shortcut entry that > does nothing. This implements the FCIDM_SHVIEW_CREATELINK command. > > Signed-off-by: Aric Stewart <aric(a)codeweavers.com> > --- > dlls/shell32/shlview_cmenu.c | 49 ++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 49 insertions(+) > > I tested this a bit more, and it's more complicated than that: - created file name format is "<target file name> - Shortcut.lnk", where "Shortcut" is localized. If such file exists, it tries to create unique name using extended format "<target file name> - Shortcut (%u).lnk", where %u starts with 2; - for special folders link is placed on the desktop; - for fs folders without write access user is prompted with message box, asking if shortcut file should be placed on the desktop or not. I think we should address at least some of those, like generating unique name. It's possible this needs extension for ISFHelper. Regarding patch itself, there's still some room for improvement: - QI check is not required, IPersistFile is always supported; - still !SUCCEEDED(); - path concatenation should use some API imho; - no allocation failure check; - MAX_PATH assumptions.

1 0

WineConf 2017
by Jacek Caban 08 Jun '17

08 Jun '17

Hi all, We'd like to share with everyone current plans for WineConf. It will most likely be on 28th and 29th October 2017 in Wrocław, Sofitel hotel. It's still not final yet, but we feel that it's close enough to be worth sharing. We will send an announcement with more details once we have everything sorted out. Looking forward to see you all in Wrocław, Piotr and Jacek PS: I don't seem to have enough permissions to create a page on Wiki. Could someone please do that?

1 1

Re: [PATCH 1/2] imaadp32.acm: Fix block size calculations.
by Andrew Eikum 08 Jun '17

08 Jun '17

On Wed, Jun 07, 2017 at 10:29:42AM -0500, Zebediah Figura wrote: > Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> > --- > dlls/imaadp32.acm/imaadp32.c | 11 ++--------- > 1 file changed, 2 insertions(+), 9 deletions(-) > > diff --git a/dlls/imaadp32.acm/imaadp32.c b/dlls/imaadp32.acm/imaadp32.c > index 78a0ac4c6c..ecc111c071 100644 > --- a/dlls/imaadp32.acm/imaadp32.c > +++ b/dlls/imaadp32.acm/imaadp32.c > @@ -154,7 +154,7 @@ static void init_wfx_ima_adpcm(IMAADPCMWAVEFORMAT* awfx/*, DWORD nba*/) > } > pwfx->cbSize = sizeof(WORD); > > - awfx->wSamplesPerBlock = (pwfx->nBlockAlign - (4 * pwfx->nChannels) * 2) / pwfx->nChannels + 1; > + awfx->wSamplesPerBlock = pwfx->nBlockAlign * (2 / pwfx->nChannels) - 7; If this reference is accurate: https://wiki.multimedia.cx/index.php/Microsoft_IMA_ADPCM Then I think the old version is actually almost correct. I think they just distributed the 2 factor incorrectly. Can you try this and double check my math? + awfx->wSamplesPerBlock = ((pwfx->nBlockAlign - (4 * pwfx->nChannels)) * 2) / pwfx->nChannels + 1; Andrew

2 1

Re: [PATCH v2 2/4] msacm32: Add invalid parameter checks for acmFormatDetails().
by Andrew Eikum 07 Jun '17

07 Jun '17

This one adds test failures on my machine: msacm.c:542: Test failed: acmFormatDetailsA(): rc = 00000200, should be 0000000b msacm.c:542: Test failed: acmFormatDetailsA(): rc = 00000200, should be 0000000b msacm.c:542: Test failed: acmFormatDetailsA(): rc = 00000200, should be 0000000b msacm.c:542: Test failed: acmFormatDetailsA(): rc = 00000200, should be 0000000b msacm.c:542: Test failed: acmFormatDetailsA(): rc = 00000200, should be 0000000b msacm.c:542: Test failed: acmFormatDetailsA(): rc = 00000200, should be 0000000b Andrew On Wed, Jun 07, 2017 at 10:28:40AM -0500, Zebediah Figura wrote: > v2: restore zero struct, check for error from acmFormatTagDetailsW() > Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> > --- > dlls/msacm32/format.c | 34 ++++++++++-- > dlls/msacm32/tests/msacm.c | 132 +++++++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 163 insertions(+), 3 deletions(-) > > diff --git a/dlls/msacm32/format.c b/dlls/msacm32/format.c > index 902807cb72..359fbe8366 100644 > --- a/dlls/msacm32/format.c > +++ b/dlls/msacm32/format.c > @@ -68,7 +68,7 @@ static BOOL CALLBACK MSACM_FillFormatTagsCB(HACMDRIVERID hadid, > HACMDRIVER had; > > if (acmDriverOpen(&had, hadid, 0) == MMSYSERR_NOERROR) { > - ACMFORMATDETAILSW afd; > + ACMFORMATDETAILSW afd = {0}; > unsigned int i, len; > MMRESULT mmr; > WCHAR buffer[ACMFORMATDETAILS_FORMAT_CHARS+16]; > @@ -87,6 +87,7 @@ static BOOL CALLBACK MSACM_FillFormatTagsCB(HACMDRIVERID hadid, > int j; > > afd.dwFormatIndex = i; > + afd.fdwSupport = 0; > mmr = acmFormatDetailsW(had, &afd, ACM_FORMATDETAILSF_INDEX); > if (mmr == MMSYSERR_NOERROR) { > lstrcpynW(buffer, afd.szFormat, ACMFORMATTAGDETAILS_FORMATTAG_CHARS + 1); > @@ -112,7 +113,7 @@ static BOOL CALLBACK MSACM_FillFormatTagsCB(HACMDRIVERID hadid, > HACMDRIVER had; > > if (acmDriverOpen(&had, hadid, 0) == MMSYSERR_NOERROR) { > - ACMFORMATDETAILSW afd; > + ACMFORMATDETAILSW afd = {0}; > > afd.cbStruct = sizeof(afd); > afd.dwFormatTag = paftd->dwFormatTag; > @@ -376,10 +377,14 @@ MMRESULT WINAPI acmFormatDetailsA(HACMDRIVER had, PACMFORMATDETAILSA pafd, > ACMFORMATDETAILSW afdw; > MMRESULT mmr; > > + if (!pafd) > + return MMSYSERR_INVALPARAM; > + > memset(&afdw, 0, sizeof(afdw)); > afdw.cbStruct = sizeof(afdw); > afdw.dwFormatIndex = pafd->dwFormatIndex; > afdw.dwFormatTag = pafd->dwFormatTag; > + afdw.fdwSupport = pafd->fdwSupport; > afdw.pwfx = pafd->pwfx; > afdw.cbwfx = pafd->cbwfx; > > @@ -401,11 +406,24 @@ MMRESULT WINAPI acmFormatDetailsW(HACMDRIVER had, PACMFORMATDETAILSW pafd, DWORD > MMRESULT mmr; > static const WCHAR fmt1[] = {'%','d',' ','H','z',0}; > static const WCHAR fmt2[] = {';',' ','%','d',' ','b','i','t','s',0}; > + ACMFORMATTAGDETAILSW aftd = {0}; > > TRACE("(%p, %p, %d)\n", had, pafd, fdwDetails); > > + if (!pafd) > + return MMSYSERR_INVALPARAM; > + > if (pafd->cbStruct < sizeof(*pafd)) return MMSYSERR_INVALPARAM; > > + if (!pafd->pwfx) > + return MMSYSERR_INVALPARAM; > + > + if (pafd->cbwfx < sizeof(PCMWAVEFORMAT)) > + return MMSYSERR_INVALPARAM; > + > + if (pafd->fdwSupport) > + return MMSYSERR_INVALPARAM; > + > switch (fdwDetails) { > case ACM_FORMATDETAILSF_FORMAT: > if (pafd->dwFormatTag != pafd->pwfx->wFormatTag) { > @@ -430,7 +448,16 @@ MMRESULT WINAPI acmFormatDetailsW(HACMDRIVER had, PACMFORMATDETAILSW pafd, DWORD > } > break; > case ACM_FORMATDETAILSF_INDEX: > - /* should check pafd->dwFormatIndex < aftd->cStandardFormats */ > + aftd.cbStruct = sizeof(aftd); > + aftd.dwFormatTag = pafd->dwFormatTag; > + mmr = acmFormatTagDetailsW(had, &aftd, ACM_FORMATTAGDETAILSF_FORMATTAG); > + if (mmr != MMSYSERR_NOERROR) > + break; > + if (pafd->dwFormatIndex >= aftd.cStandardFormats) > + { > + mmr = MMSYSERR_INVALPARAM; > + break; > + } > mmr = MSACM_Message(had, ACMDM_FORMAT_DETAILS, (LPARAM)pafd, fdwDetails); > break; > default: > @@ -581,6 +608,7 @@ static BOOL MSACM_FormatEnumHelper(PWINE_ACMDRIVERID padid, HACMDRIVER had, > for (j = 0; j < aftd.cStandardFormats; j++) { > pafd->dwFormatIndex = j; > pafd->dwFormatTag = aftd.dwFormatTag; > + pafd->fdwSupport = 0; > if (acmFormatDetailsW(had, pafd, ACM_FORMATDETAILSF_INDEX) != MMSYSERR_NOERROR) > continue; > > diff --git a/dlls/msacm32/tests/msacm.c b/dlls/msacm32/tests/msacm.c > index f5ab168290..1b47fe2087 100644 > --- a/dlls/msacm32/tests/msacm.c > +++ b/dlls/msacm32/tests/msacm.c > @@ -38,9 +38,110 @@ static BOOL CALLBACK FormatTagEnumProc(HACMDRIVERID hadid, > DWORD_PTR dwInstance, > DWORD fdwSupport) > { > + MMRESULT rc; > + HACMDRIVER had; > + > if (winetest_interactive) > trace(" Format 0x%04x: %s\n", paftd->dwFormatTag, paftd->szFormatTag); > > + rc = acmDriverOpen(&had, hadid, 0); > + ok(rc == MMSYSERR_NOERROR || rc == MMSYSERR_NODRIVER, > + "acmDriverOpen(): rc = %08x, should be %08x\n", > + rc, MMSYSERR_NOERROR); > + > + if (rc == MMSYSERR_NOERROR) > + { > + ACMFORMATDETAILSA fd = {0}; > + WAVEFORMATEX *pwfx; > + DWORD i; > + > + fd.cbStruct = sizeof(fd); > + if (paftd->cbFormatSize < sizeof(WAVEFORMATEX)) > + pwfx = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(WAVEFORMATEX)); > + else > + pwfx = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, paftd->cbFormatSize); > + fd.pwfx = pwfx; > + fd.cbwfx = paftd->cbFormatSize; > + fd.dwFormatTag = paftd->dwFormatTag; > + > + /* try bad pwfx */ > + fd.pwfx = NULL; > + rc = acmFormatDetailsA(had, &fd, ACM_FORMATDETAILSF_FORMAT); > + ok(rc == MMSYSERR_INVALPARAM, > + "acmFormatDetailsA(): rc = %08x, should be %08x\n", > + rc, MMSYSERR_INVALPARAM); > + fd.pwfx = pwfx; > + > + /* try bad wFormatTag */ > + fd.pwfx->wFormatTag = WAVE_FORMAT_UNKNOWN; > + rc = acmFormatDetailsA(had, &fd, ACM_FORMATDETAILSF_FORMAT); > + ok(rc == MMSYSERR_INVALPARAM, > + "acmFormatDetailsA(): rc = %08x, should be %08x\n", > + rc, MMSYSERR_INVALPARAM); > + fd.pwfx->wFormatTag = paftd->dwFormatTag; > + > + /* try bad fdwSupport */ > + fd.fdwSupport = 0xdeadbeef; > + rc = acmFormatDetailsA(had, &fd, ACM_FORMATDETAILSF_FORMAT); > + ok(rc == MMSYSERR_INVALPARAM, > + "acmFormatDetailsA(): rc = %08x, should be %08x\n", > + rc, MMSYSERR_INVALPARAM); > + fd.fdwSupport = 0; > + > + /* try bad pwfx structure size */ > + fd.cbwfx = sizeof(PCMWAVEFORMAT)-1; > + rc = acmFormatDetailsA(had, &fd, ACM_FORMATDETAILSF_FORMAT); > + ok(rc == MMSYSERR_INVALPARAM, > + "acmFormatDetailsA(): rc = %08x, should be %08x\n", > + rc, MMSYSERR_INVALPARAM); > + fd.cbwfx = paftd->cbFormatSize; > + > + /* test bad parameters (all zero) */ > + rc = acmFormatDetailsA(had, &fd, ACM_FORMATDETAILSF_FORMAT); > + ok(rc == ACMERR_NOTPOSSIBLE, > + "acmFormatDetailsA(): rc = %08x, should be %08x\n", > + rc, ACMERR_NOTPOSSIBLE); > + > + /* test index */ > + for (i = 0; i < paftd->cStandardFormats; i++) > + { > + fd.dwFormatIndex = i; > + > + fd.fdwSupport = 0; > + fd.cbwfx = paftd->cbFormatSize; > + fd.pwfx->cbSize = 0xbeef; > + rc = acmFormatDetailsA(had, &fd, ACM_FORMATDETAILSF_INDEX); > + ok(rc == MMSYSERR_NOERROR, > + "acmFormatDetailsA(): rc = %08x, should be %08x\n", > + rc, MMSYSERR_NOERROR); > + > + /* Windows will write cbSize (and other data) even if the > + * given cbwfx is not large enough */ > + fd.fdwSupport = 0; > + fd.cbwfx = sizeof(PCMWAVEFORMAT); > + fd.pwfx->cbSize = 0xbeef; > + rc = acmFormatDetailsA(had, &fd, ACM_FORMATDETAILSF_INDEX); > + todo_wine_if(rc != MMSYSERR_NOERROR) /* remove when fixed */ > + ok(rc == MMSYSERR_NOERROR, > + "acmFormatDetailsA(): rc = %08x, should be %08x\n", > + rc, MMSYSERR_NOERROR); > + if (paftd->dwFormatTag != WAVE_FORMAT_PCM) > + todo_wine_if(fd.pwfx->cbSize != paftd->cbFormatSize - sizeof(WAVEFORMATEX)) /* remove when fixed */ > + ok(fd.pwfx->cbSize == paftd->cbFormatSize - sizeof(WAVEFORMATEX), > + "expected cbSize %d, got %d\n", > + paftd->cbFormatSize - sizeof(WAVEFORMATEX), fd.pwfx->cbSize); > + } > + > + /* one more */ > + fd.dwFormatIndex = paftd->cStandardFormats; > + fd.fdwSupport = 0; > + rc = acmFormatDetailsA(had, &fd, ACM_FORMATDETAILSF_INDEX); > + ok(rc == MMSYSERR_INVALPARAM, > + "acmFormatDetailsA(): rc = %08x, should be %08x\n", > + rc, MMSYSERR_INVALPARAM); > + > + HeapFree(GetProcessHeap(), 0, pwfx); > + } > return TRUE; > } > > @@ -411,6 +512,37 @@ static BOOL CALLBACK DriverEnumProc(HACMDRIVERID hadid, > "acmFormatTagEnumA(): rc = %08x, should be %08x\n", > rc, MMSYSERR_NOERROR); > > + /* try bad pointer */ > + rc = acmFormatDetailsA(had, NULL, ACM_FORMATDETAILSF_INDEX); > + ok(rc == MMSYSERR_INVALPARAM, > + "acmFormatDetailsA(): rc = %08x, should be %08x\n", > + rc, MMSYSERR_INVALPARAM); > + > + /* try bad structure size */ > + ZeroMemory(&fd, sizeof(fd)); > + rc = acmFormatDetailsA(had, &fd, ACM_FORMATDETAILSF_INDEX); > + ok(rc == MMSYSERR_INVALPARAM, > + "acmFormatDetailsA(): rc = %08x, should be %08x\n", > + rc, MMSYSERR_INVALPARAM); > + > + fd.cbStruct = sizeof(fd) - 1; > + rc = acmFormatDetailsA(had, &fd, ACM_FORMATDETAILSF_INDEX); > + ok(rc == MMSYSERR_INVALPARAM, > + "acmFormatDetailsA(): rc = %08x, should be %08x\n", > + rc, MMSYSERR_INVALPARAM); > + > + fd.cbStruct = sizeof(fd); > + fd.pwfx = pwfx; > + ZeroMemory(fd.pwfx, dwSize); > + fd.cbwfx = dwSize; > + fd.dwFormatTag = WAVE_FORMAT_UNKNOWN; > + > + /* try WAVE_FORMAT_UNKNOWN */ > + rc = acmFormatDetailsA(had, &fd, ACM_FORMATDETAILSF_INDEX); > + ok(rc == MMSYSERR_INVALPARAM, > + "acmFormatDetailsA(): rc = %08x, should be %08x\n", > + rc, MMSYSERR_INVALPARAM); > + > HeapFree(GetProcessHeap(), 0, pwfx); > > /* try invalid handle */ > -- > 2.13.0 > > >

1 0

Re: [PATCH] kernel32: Don't limit physical memory size even if not large address aware.
by Sebastian Lackner 07 Jun '17

07 Jun '17

On 07.06.2017 19:39, Zebediah Figura wrote: > From testing on Windows 7, it appears Windows doesn't do this either. Also, > the virtual size is already limited in ntdll, so that check is unnecessary > as well. > > This fixes a bug with sndrec32.exe giving OOM errors when recording. > > Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> > --- > dlls/kernel32/heap.c | 10 ---------- > 1 file changed, 10 deletions(-) Are you sure you tested it correctly (with a binary that does not have IMAGE_FILE_LARGE_ADDRESS_AWARE set)? And what about Adobe Illustrator 8 which depends on this, according to the comment in the source code? Regards, Sebastian

2 1

Re: [PATCH 2/4] ntdll: Provide more accurate virtual memory counters.
by Alex Henrie 07 Jun '17

07 Jun '17

Out of curiosity, is there a particular application that depends on this behavior? It could be argued that reporting the value from the native operating system is better because it tells what's really happening in the process. -Alex

4 7

Re: [PATCH 1/2] mshtml: Added IBindCallbackRedirect implementation.
by Marvin 07 Jun '17

07 Jun '17

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=31467 Your paranoid android. === w7u (32 bit htmldoc) === htmldoc.c:2682: Test failed: unexpected call GetOverrideKeyPath

1 0

Re: [v2 PATCH 3/3] d3drm: Implement AddNormal()
by Henri Verbeet 07 Jun '17

07 Jun '17

On 7 June 2017 at 12:38, Nikolay Sivov <nsivov(a)codeweavers.com> wrote: > @@ -1165,12 +1169,13 @@ HRESULT load_mesh_data(IDirect3DRMMeshBuilder3 *iface, IDirectXFileData *pData, > mesh_builder->nb_normals = *(DWORD*)ptr; > nb_faces_normals = *(DWORD*)(ptr + sizeof(DWORD) + mesh_builder->nb_normals * sizeof(D3DVECTOR)); > > - TRACE("MeshNormals: nb_normals = %d, nb_faces_normals = %d\n", mesh_builder->nb_normals, nb_faces_normals); > + TRACE("MeshNormals: nb_normals = %lu, nb_faces_normals = %d\n", mesh_builder->nb_normals, nb_faces_normals); > if (nb_faces_normals != mesh_builder->nb_faces) > - WARN("nb_face_normals (%d) != nb_faces (%d)\n", nb_faces_normals, mesh_builder->nb_normals); > + WARN("nb_face_normals (%d) != nb_faces (%d)\n", nb_faces_normals, mesh_builder->nb_faces); > > - mesh_builder->pNormals = HeapAlloc(GetProcessHeap(), 0, mesh_builder->nb_normals * sizeof(D3DVECTOR)); > - memcpy(mesh_builder->pNormals, ptr + sizeof(DWORD), mesh_builder->nb_normals * sizeof(D3DVECTOR)); > + d3drm_array_reserve((void **)&mesh_builder->normals, &mesh_builder->normals_size, > + mesh_builder->nb_normals + 1, sizeof(*mesh_builder->normals)); That's not quite equivalent, but probably harmless. > @@ -1379,8 +1384,8 @@ HRESULT load_mesh_data(IDirect3DRMMeshBuilder3 *iface, IDirectXFileData *pData, > if (!mesh_builder->nb_normals) > { > /* Allocate normals, one per vertex */ > - mesh_builder->pNormals = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, mesh_builder->nb_vertices * sizeof(D3DVECTOR)); > - if (!mesh_builder->pNormals) > + if (!d3drm_array_reserve((void **)&mesh_builder->normals, &mesh_builder->normals_size, > + mesh_builder->nb_normals + 1, sizeof(*mesh_builder->normals))) This one isn't quite equivalent either, and less harmless. > @@ -1445,7 +1450,7 @@ HRESULT load_mesh_data(IDirect3DRMMeshBuilder3 *iface, IDirectXFileData *pData, > } > *(faces_data_ptr + faces_data_size++) = vertex_idx; > /* Add face normal to vertex normal */ > - D3DRMVectorAdd(&mesh_builder->pNormals[vertex_idx], &mesh_builder->pNormals[vertex_idx], &face_normal); > + D3DRMVectorAdd(&mesh_builder->normals[vertex_idx], &mesh_builder->normals[vertex_idx], &face_normal); In particular, note that this line depends on the initial vertex normals being {0.0f, 0.0f, 0.0f}.

1 0

Re: [PATCH 02/12] msacm32: Add invalid parameter checks for acmFormatDetails().
by Andrew Eikum 07 Jun '17

07 Jun '17

On Tue, Jun 06, 2017 at 03:14:51PM -0500, Zebediah Figura wrote: > @@ -376,10 +377,13 @@ MMRESULT WINAPI acmFormatDetailsA(HACMDRIVER had, PACMFORMATDETAILSA pafd, > ACMFORMATDETAILSW afdw; > MMRESULT mmr; > > - memset(&afdw, 0, sizeof(afdw)); > + if (!pafd) > + return MMSYSERR_INVALPARAM; > + > afdw.cbStruct = sizeof(afdw); > afdw.dwFormatIndex = pafd->dwFormatIndex; > afdw.dwFormatTag = pafd->dwFormatTag; > + afdw.fdwSupport = pafd->fdwSupport; > afdw.pwfx = pafd->pwfx; > afdw.cbwfx = pafd->cbwfx; > Like before, is there a reason to no longer zero this struct? > @@ -430,7 +447,14 @@ MMRESULT WINAPI acmFormatDetailsW(HACMDRIVER had, PACMFORMATDETAILSW pafd, DWORD > } > break; > case ACM_FORMATDETAILSF_INDEX: > - /* should check pafd->dwFormatIndex < aftd->cStandardFormats */ > + aftd.cbStruct = sizeof(aftd); > + aftd.dwFormatTag = pafd->dwFormatTag; > + acmFormatTagDetailsW(had, &aftd, ACM_FORMATTAGDETAILSF_FORMATTAG); > + if (pafd->dwFormatIndex >= aftd.cStandardFormats) > + { > + mmr = MMSYSERR_INVALPARAM; > + break; > + } Please add error checking for acmFormatTagDetailsW. The next two patches in the sequence fail on the test bot, so I stopped reviewing here. It's common for APIs to return different error codes on different Windows versions, so you likely just need to accept either code in your ok() checks. Andrew

1 0

Re: [PATCH 01/12] msacm32: Add more invalid parameter checks for acmFormatEnum().
by Andrew Eikum 07 Jun '17

07 Jun '17

In the future, please limit patch sequences to about four patches. It's much easier to review and iterate on smaller sequences. Looks mostly good, a couple small comments in-line below. On Tue, Jun 06, 2017 at 03:14:50PM -0500, Zebediah Figura wrote: > Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> > --- > dlls/msacm32/format.c | 19 ++++++++++++++++++- > dlls/msacm32/tests/msacm.c | 36 ++++++++++++++++++++++++++++++++---- > 2 files changed, 50 insertions(+), 5 deletions(-) > > diff --git a/dlls/msacm32/format.c b/dlls/msacm32/format.c > index 3f3ee5492d..70fe9f0d1b 100644 > --- a/dlls/msacm32/format.c > +++ b/dlls/msacm32/format.c > @@ -492,13 +492,16 @@ MMRESULT WINAPI acmFormatEnumA(HACMDRIVER had, PACMFORMATDETAILSA pafda, > if (!pafda) > return MMSYSERR_INVALPARAM; > > + if (!fnCallback) > + return MMSYSERR_INVALPARAM; > + > if (pafda->cbStruct < sizeof(*pafda)) > return MMSYSERR_INVALPARAM; > > - memset(&afdw, 0, sizeof(afdw)); > afdw.cbStruct = sizeof(afdw); > afdw.dwFormatIndex = pafda->dwFormatIndex; > afdw.dwFormatTag = pafda->dwFormatTag; > + afdw.fdwSupport = pafda->fdwSupport; > afdw.pwfx = pafda->pwfx; > afdw.cbwfx = pafda->cbwfx; > This no longer initializes the szFormat member. Unless there's a compelling reason not to initialize it, I'd rather continue to do so in case it doesn't get filled during acmFormatDetails. > @@ -639,6 +652,10 @@ MMRESULT WINAPI acmFormatEnumW(HACMDRIVER had, PACMFORMATDETAILSW pafd, > if (fdwEnum & (ACM_FORMATENUMF_CONVERT|ACM_FORMATENUMF_INPUT|ACM_FORMATENUMF_OUTPUT)) > FIXME("Unsupported fdwEnum values %08x\n", fdwEnum); > > + acmMetrics((HACMOBJ)had, ACM_METRIC_MAX_SIZE_FORMAT, &cbwfxMax); > + if (pafd->cbwfx < cbwfxMax) > + return MMSYSERR_INVALPARAM; > + Please add error checking here. Andrew

1 0

Re: [PATCH 1/2] include/windocdec.idl: Add interface IWICImagingFactory2
by Vincent Povirk 06 Jun '17

06 Jun '17

> +cpp_quote ("typedef interface ID2D1Device ID2D1Device;") > +cpp_quote ("typedef interface ID2D1Image ID2D1Image;") That's odd, why is this in wincodec.idl?

2 1

Re: [PATCH 08/12] winemp3.acm: Remove unnecessary checks.
by Marvin 06 Jun '17

06 Jun '17

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=31453 Your paranoid android. === wvistau64 (64 bit msacm) === msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 === w2008s64 (64 bit msacm) === msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 === w7pro64 (64 bit msacm) === msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 === w864 (64 bit msacm) === msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 === w1064 (64 bit msacm) === msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200

1 0

Re: [PATCH 05/12] msadp32.acm: Remove unnecessary checks.
by Marvin 06 Jun '17

06 Jun '17

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=31452 Your paranoid android. === wvistau64 (64 bit msacm) === msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 === w2008s64 (64 bit msacm) === msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 === w7pro64 (64 bit msacm) === msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 === w864 (64 bit msacm) === msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 === w1064 (64 bit msacm) === msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200

1 0

Re: [PATCH 04/12] msacm32: Try to suggest PCM to PCM conversion first.
by Marvin 06 Jun '17

06 Jun '17

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=31451 Your paranoid android. === wvistau64 (64 bit msacm) === msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 === w2008s64 (64 bit msacm) === msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 === w7pro64 (64 bit msacm) === msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 === w864 (64 bit msacm) === msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 === w1064 (64 bit msacm) === msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200

1 0

Re: [PATCH 03/12] msacm32: Add more invalid parameter checks for acmFormatSuggest().
by Marvin 06 Jun '17

06 Jun '17

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=31450 Your paranoid android. === wvistau64 (64 bit msacm) === msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 === w2008s64 (64 bit msacm) === msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 === w7pro64 (64 bit msacm) === msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 === w864 (64 bit msacm) === msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 === w1064 (64 bit msacm) === msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:141: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200 msacm.c:186: Test failed: acmFormatSuggest(): rc = 0000000b, should be 00000200

1 0

Re: [PATCH 6/6] urlmon/tests: Added BindProtocol redirection handling tests.
by Alexandre Julliard 06 Jun '17

06 Jun '17

Jacek Caban <jacek(a)codeweavers.com> writes: > Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> > --- > dlls/urlmon/tests/protocol.c | 155 > ++++++++++++++++++++++++++++++++++++++++++- > 1 file changed, 152 insertions(+), 3 deletions(-) This is failing consistently here: ../../../tools/runtest -q -P wine -T ../../.. -M urlmon.dll -p urlmon_test.exe.so protocol && touch protocol.ok protocol.c:1483: Test failed: unexpected call SetPriority protocol.c:1483: Test failed: unexpected call SetPriority Makefile:249: recipe for target 'protocol.ok' failed make: *** [protocol.ok] Error 2 -- Alexandre Julliard julliard(a)winehq.org

1 0

Wine uses the wrong pkg-config for 32 bit builds
by Francois Gouget 06 Jun '17

06 Jun '17

The problem with pkg-config is that it has no idea what the build target is so it always returns the include and library paths appropriate for the build host. For instance when Wine tries to figure out how to use GStreamer 1.0 it calls: $ pkg-config --cflags gstreamer-1.0 -pthread -I/usr/include/gstreamer-1.0 -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include It's pretty obvious that the 'x86_64-linux-gnu' is wrong for a 32 bit build. But then we never told pkg-config that we wanted to do a 32 bit build! There are two ways to tell pkg-config we want to do a 32 bit build. * The first way is to set PKG_CONFIG_LIBDIR to force pkg-config to only use the .pc files we want. However this requires knowing where the .pc files are stored and you'd want to make sure to include /usr/lib/<triplet>/pkgconfig, /usr/local/lib/<triplet>/pkgconfig. And then should you also include /usr/lib/pkgconfig? * Another way is to use a <triplet>-pkg-config tool, which will give us the right information for the specified <triplet>. Red Hat, Debian and its derivatives (Ubuntu, etc) all provide them. This gives: $ i686-linux-gnu-pkg-config --cflags gstreamer-1.0 -pthread -I/usr/include/gstreamer-1.0 -I/usr/include/glib-2.0 -I/usr/lib/i386-linux-gnu/glib-2.0/include We already have a WINE_CHECK_HOST_TOOL() macro that looks like it should do the trick. But it only takes ac_tool_prefix into account. So I modified it to take the host target into account if ac_tool_prefix is not set. This is modeled after the WINE_CHECK_MINGW_PROG macro and you can see the result in the patch below. On Red Hat the it's a quadruplet: it has an extra 'redhat-' in the name (it's i686-redhat-linux-gnu-pkg-config for instance). The patch below does not account for it. I'm hoping Red Hat developers can suggest how to best take this into account. Is this approach ok? ----- configure: Take the target host into account in WINE_CHECK_HOST_TOOL(). In particular this gets us the right pkg-config tool when building the 32 bit Wine. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- aclocal.m4 | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index 9364188e334..4ac467a71e5 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -27,13 +27,17 @@ dnl dnl Like AC_CHECK_TOOL but without the broken fallback to non-prefixed name dnl AC_DEFUN([WINE_CHECK_HOST_TOOL], -[AS_VAR_SET_IF([ac_tool_prefix], - AC_CHECK_PROG([$1],[${ac_tool_prefix}$2],[${ac_tool_prefix}$2],,[$4])) -AS_VAR_IF([ac_cv_prog_$1],[], - [AS_VAR_IF([cross_compiling],[yes],[], - [AS_UNSET([ac_cv_prog_$1]) - AC_CHECK_PROG([$1],[$2],[$2],[$3],[$4])])], -[AS_VAR_COPY([$1],[ac_cv_prog_$1])])]) +[AS_VAR_IF([ac_tool_prefix],[], + [case "$host_cpu" in + i[[3456789]]86*) + ac_host_tool_list="m4_foreach([ac_wine_cpu],[i686,i586,i486,i386],[ac_wine_cpu-${host_os}-$2 ]) $2" ;; + x86_64) + ac_host_tool_list="x86_64-${host_os}-$2 $2" ;; + *) + ac_host_tool_list="" ;; + esac], + [ac_host_tool_tool_list="${ac_tool_prefix}-$2"]) + AC_CHECK_PROGS($1,$ac_host_tool_list,[$3],[$4])]) dnl **** Initialize the programs used by other checks **** dnl -- 2.11.0

4 11

Re: [PATCH v2 1/2] msvcrt: Clean up registered C++ object in handler.
by Piotr Caban 06 Jun '17

06 Jun '17

Hi Daniel, On 06/06/17 00:43, Daniel Lehman wrote: > +typedef void (CALLBACK *__WINE_FINALLY_CTX)(BOOL, PEXCEPTION_RECORD, void*); The idea behind __FINALLY_CTX was to model native __finally behavior while extending its functionality for wine. It's not possible to call GetExceptionInfo/GetExceptionCode inside of finally on Windows so I don't think it's a change in good direction. If you really need the exception record you shouldn't use __FINALLY_CTX (but I don't think you need). > +static void CALLBACK cxx_catch_cleanup(BOOL normal, EXCEPTION_RECORD *rec, void *ctx) > +{ > + thread_data_t *data = msvcrt_get_thread_data(); > + cxx_frame_info *frame = ctx; > + > + if (normal) > + __CxxUnregisterExceptionObject(frame, FALSE); > + else > + { > + if (cxx_is_consolidate(rec)) > + rec = (void*)rec->ExceptionInformation[4]; > + > + __CxxUnregisterExceptionObject(frame, > + rec->ExceptionCode == CXX_EXCEPTION && > + data->exc_record->ExceptionCode == CXX_EXCEPTION && > + rec->ExceptionInformation[1] == data->exc_record->ExceptionInformation[1]); > + } Do you need to call __CxxUnregisterExceptionObject with TRUE as second argument in any case except of rethrow? > /* FIXME: native does local_unwind here in case of exception rethrow */ If you only need to handle rethrow in a special way I think it should be done differently. Something like this should do the job: __TRY { __TRY { ret_addr = handler(0, frame); } __EXCEPT(rethrow_filter) { /* probably all of this should be done inside of the filter */ /* do some unwinding here or add a FIXME */ catch_cleanup_ctx.in_use = TRUE; rethrow; } __ENDTRY; } __FINALLY_CTX(cxx_catch_cleanup, &catch_cleanup_ctx); The above code is incorrect if exception object needs to be preserved not only in case of rethrow. What do you think about it? Thanks, Piotr

2 1

Re: [PATCH 6/6] urlmon/tests: Added BindProtocol redirection handling tests.
by Marvin 06 Jun '17

06 Jun '17

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=31439 Your paranoid android. === w864 (32 bit protocol) === protocol.c:875: Test failed: unexpected call ReportProgress_CONNECTING === w864 (64 bit protocol) === protocol.c:875: Test failed: unexpected call ReportProgress_CONNECTING

1 0

Re: [v2 PATCH 2/3] mfplat: Implement MFCreateMediaType
by Nikolay Sivov 06 Jun '17

06 Jun '17

On 31.05.2017 4:09, Alistair Leslie-Hughes wrote: > +typedef struct _mfmedaitype > +{ > + IMFMediaType IMFMediaType_iface; > + LONG ref; > +} mfmedaitype; You got a typo in structure name.

4 4

Re: [v3 PATCH] oleaut32: Improve support for IDispatch in VarCat
by Jacek Caban 06 Jun '17

06 Jun '17

Hi Alistair, The patch looks mostly good now. On 26.05.2017 07:13, Alistair Leslie-Hughes wrote: > + hres = VariantChangeTypeEx(&bstrvar_left,tmp,0,VARIANT_ALPHABOOL|VARIANT_LOCALBOOL,VT_BSTR); > + if (hres == DISP_E_TYPEMISMATCH) > { It seems that might be the right thing to do, but one more test would make sure about that. Please add a test that will hit this case without VT_DISPATCH nor VT_NULL, since both of them are kind of special. As far as I can see, a VT_BYREF with NULL reference would be good for that. > - hres = VariantChangeTypeEx(&bstrvar_left,left,0,VARIANT_ALPHABOOL|VARIANT_LOCALBOOL,VT_BSTR); > - if (hres != S_OK) { > - VariantClear(&bstrvar_left); > - VariantClear(&bstrvar_right); > - return hres; > - } > + V_VT(&bstrvar_left) = VT_BSTR; > + V_BSTR(&bstrvar_left) = SysAllocString(sz_empty); You could just set it to NULL. Thanks, Jacek

1 0

Re: [PATCH 3/3] inetcomm: Implemented IMimeBody::GetClassID()
by Jacek Caban 06 Jun '17

06 Jun '17

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com>

1 0

Re: [PATCH 2/3] inetcomm: Release previously set data (Valgrind)
by Jacek Caban 06 Jun '17

06 Jun '17

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com>

1 0

Re: [PATCH 5/8] d3dx9/tests: Factor out test_effect_preshader_compare_pbool_consts() function.
by Matteo Bruni 05 Jun '17

05 Jun '17

2017-06-02 11:58 GMT+02:00 Paul Gofman <gofmanp(a)gmail.com>: > + if (!const_updated_mask) > + { > + for (i = 0; i < ARRAY_SIZE(test_effect_preshader_bconsts); ++i) > + { > + ok_(__FILE__, line)(!bdata[i] == !test_effect_preshader_bconsts[i], > + "Pixel shader boolean constants do not match, expected %#x, got %#x, i %u.\n", > + test_effect_preshader_bconsts[i], bdata[i], i); > + } > + } > + else > + { > + for (i = 0; i < ARRAY_SIZE(test_effect_preshader_bconsts); ++i) > + { > + if (const_updated_mask[i / TEST_EFFECT_BITMASK_BLOCK_SIZE] > + & (1u << (i % TEST_EFFECT_BITMASK_BLOCK_SIZE))) > + { > + ok_(__FILE__, line)(!bdata[i] == !test_effect_preshader_bconsts[i], > + "Pixel shader boolean constants do not match, expected %#x, got %#x, i %u, parameter %s.\n", > + test_effect_preshader_bconsts[i], bdata[i], i, updated_param); > + } > + else > + { > + ok_(__FILE__, line)(!bdata[i], > + "Pixel shader boolean constants updated unexpectedly, parameter %s.\n", updated_param); > + } > + } > + } Minor simplification possibility: in the (!const_updated_mask) case you could use a default "all ones" mask and use what's now the 'else' branch, getting rid of the 'if' branch altogether.

2 2

Re: [PATCH 5/5] d3drm: Consolidate GetClassName() implementation, reduce tests duplication
by Henri Verbeet 05 Jun '17

05 Jun '17

On 5 June 2017 at 01:07, Nikolay Sivov <nsivov(a)codeweavers.com> wrote: > +HRESULT d3drm_object_get_class_name(struct d3drm_object *object, DWORD *size, char *name) > +{ > + DWORD req_size; > + > + if (!size) > + return E_INVALIDARG; > + > + req_size = strlen(object->classname) + 1; > + if (name && *size < req_size) > + return E_INVALIDARG; > + > + *size = req_size; > + > + if (name) > + strcpy(name, object->classname); Note that you already know the string length, so just use memcpy(). (I.e., there's almost never a good reason to use strcpy().) > diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c > index e1091be423..a0dfe6c7d2 100644 > --- a/dlls/d3drm/tests/d3drm.c > +++ b/dlls/d3drm/tests/d3drm.c > @@ -52,6 +52,42 @@ static D3DRMMATRIX4D identity = { > { 0.0f, 0.0f, 0.0f, 1.0f } > }; > > + > +static void test_class_name(IDirect3DRMObject *object, const char *name) > +{ > + char cname[64] = {0}; > + HRESULT hr; > + DWORD size; > + > + hr = IDirect3DRMObject_GetClassName(object, NULL, cname); > + ok(hr == E_INVALIDARG, "GetClassName failed with %x\n", hr); "Got unexpected hr %#x.\n" > + hr = IDirect3DRMViewport_GetClassName(object, NULL, NULL); > + ok(hr == E_INVALIDARG, "GetClassName failed with %x\n", hr); > + > + size = 0; > + hr = IDirect3DRMObject_GetClassName(object, &size, NULL); > + ok(hr == D3DRM_OK, "Cannot get classname size (hr = %x)\n", hr); > + ok(size == strlen(name) + 1, "wrong size: %u\n", size); > + > + size = 1; > + hr = IDirect3DRMObject_GetClassName(object, &size, cname); > + ok(hr == E_INVALIDARG, "GetClassName failed with %x\n", hr); > + ok(size == 1, "Got size %u.\n", size); > + > + size = sizeof(cname); > + hr = IDirect3DRMObject_GetClassName(object, &size, cname); > + ok(hr == D3DRM_OK, "Cannot get classname (hr = %x)\n", hr); > + ok(size == strlen(name) + 1, "wrong size: %u\n", size); > + ok(!strcmp(cname, name), "Expected cname to be \"%s\", but got \"%s\"\n", name, cname); > + > + size = strlen(name); > + strcpy(cname, "XXX"); > + hr = IDirect3DRMObject_GetClassName(object, &size, cname); > + ok(hr == E_INVALIDARG, "GetClassName failed with %x\n", hr); > + ok(size == strlen(name), "wrong size: %u\n", size); > + ok(!strcmp(cname, "XXX"), "Expected unchanged buffer, but got \"%s\"\n", cname); > +} I would be happier if this printed the line number of the caller on failure, see e.g. check_interface_() in the d3d11 tests.

1 0

Re: [PATCH 1/5] d3drm/tests: Some tests for creating texture from ddraw surface
by Henri Verbeet 05 Jun '17

05 Jun '17

On 5 June 2017 at 01:07, Nikolay Sivov <nsivov(a)codeweavers.com> wrote: > Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> > --- > dlls/d3drm/tests/d3drm.c | 188 +++++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 188 insertions(+) > It looks like a good part of this was inspired by the existing d3drm tests, and it doesn't appear to be any worse than those. However, we'd like to raise the standards a little. I.e., in the future, please use the d3d11 and ddraw tests as a reference, instead of the existing d3drm tests.

1 0

Re: [PATCH] shell32: Implement FCIDM_SHVIEW_CREATELINK
by Nikolay Sivov 05 Jun '17

05 Jun '17

On 02.06.2017 17:24, Aric Stewart wrote: > > Presently the wine file explorer has a create shortcut entry that > does nothing. This implements the FCIDM_SHVIEW_CREATELINK command. > > Signed-off-by: Aric Stewart <aric(a)codeweavers.com> > --- > dlls/shell32/shlview_cmenu.c | 50 ++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 50 insertions(+) > > + if (!SUCCEEDED(CoCreateInstance( &CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER, > + &IID_IShellLinkW, (LPVOID*)&shelllink))) > + { > + ERR("couldn't create ShellLink object\n"); > + return; > + } This should be FAILED(). You can use IShellLink_Constructor() instead of going through generic object creation. > + SHGetSpecialFolderPathW(NULL, root, CSIDL_STARTMENU, TRUE); > + lnkfile=HeapAlloc(GetProcessHeap(), 0, (lstrlenW(root)+1+lstrlenW(wszFilename)+5) * sizeof(*lnkfile)); > + lstrcpyW(lnkfile, root); > + lstrcatW(lnkfile, backslashW); > + lstrcatW(lnkfile, wszFilename); > + lstrcatW(lnkfile, lnkW); Why is it created in Start Menu dir? I think usual behavior is to create it in target directory. > + if (!SUCCEEDED(IShellLinkW_QueryInterface(shelllink, &IID_IPersistFile, (LPVOID*)&persistfile))) > + { > + ERR("couldn't get IPersistFile interface\n"); > + IShellLinkW_Release(shelllink); > + HeapFree(GetProcessHeap(), 0, lnkfile); > + return; > + } FAILED() again, but really it can't fail. Also please LPVOID -> void*.

2 2

Re: [PATCH] msxml3: Remove CRs in domtext_put_data and add them in domtext_get_xml.
by Nikolay Sivov 05 Jun '17

05 Jun '17

This needs more tests, for different msxml object versions, and for different input document. It's possible that get_xml() returns original document, so test loading non trivial document is necessary. I remember looking at this some time ago, not for this specific report but in general, and my conclusion was that the only way to generate matching document is to duplicate node dumping in our code.

1 0

Re: kernel32: Fix WriteConsoleOutputCharacter[AW] spec file entries
by Alexandre Julliard 02 Jun '17

02 Jun '17

André Hentschel <nerv(a)dawncrow.de> writes: > @@ -1612,8 +1612,8 @@ > @ stdcall WriteConsoleInputW(long ptr long ptr) > @ stdcall WriteConsoleOutputA(long ptr long long ptr) > @ stdcall WriteConsoleOutputAttribute(long ptr long long ptr) > -@ stdcall WriteConsoleOutputCharacterA(long ptr long long ptr) > -@ stdcall WriteConsoleOutputCharacterW(long ptr long long ptr) > +@ stdcall WriteConsoleOutputCharacterA(long str long long ptr) > +@ stdcall WriteConsoleOutputCharacterW(long wstr long long ptr) It's questionable to use string types on potentially non null-terminated strings. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 2/8] comcat: label ordinals
by Alexandre Julliard 02 Jun '17

02 Jun '17

Austin English <austinenglish(a)gmail.com> writes: > Signed-off-by: Austin English <austinenglish(a)gmail.com> > --- > dlls/comcat/comcat.spec | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/dlls/comcat/comcat.spec b/dlls/comcat/comcat.spec > index 5b5f7b06cb..781b07437c 100644 > --- a/dlls/comcat/comcat.spec > +++ b/dlls/comcat/comcat.spec > @@ -1,4 +1,4 @@ > -@ stdcall -private DllCanUnloadNow() > -@ stdcall -private DllGetClassObject(ptr ptr ptr) ole32.DllGetClassObject > -@ stdcall -private DllRegisterServer() > -@ stdcall -private DllUnregisterServer() > +1 stdcall -private DllGetClassObject(ptr ptr ptr) ole32.DllGetClassObject > +2 stdcall -private DllCanUnloadNow() > +3 stdcall -private DllRegisterServer() > +4 stdcall -private DllUnregisterServer() It doesn't make much sense to define ordinals for such functions. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH] user32: Keep tracking if we just created the menu.
by Huw Davies 02 Jun '17

02 Jun '17

On Wed, May 31, 2017 at 02:34:06PM -0500, Zebediah Figura wrote: > Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> > --- > dlls/user32/menu.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c > index a65f01eaa5..c52b723f76 100644 > --- a/dlls/user32/menu.c > +++ b/dlls/user32/menu.c > @@ -2597,7 +2597,10 @@ static BOOL MENU_ButtonDown( MTRACKER* pmt, HMENU hPtMenu, UINT wFlags ) > > /* If the popup menu is not already "popped" */ > if (!(ptmenu->items[pos].fState & MF_MOUSESELECT)) > + { > pmt->hCurrentMenu = MENU_ShowSubPopup( pmt->hOwnerWnd, hPtMenu, FALSE, wFlags ); > + return TRUE; > + } > } > > /* A click on an item or anywhere on a popup keeps tracking going */ So under what conditions does the if statement directly below this hunk not get triggered? Huw.

2 4

Re: [PATCH] fusion: use correct size for ZeroMemory (GCC7)
by Dmitry Timoshkov 02 Jun '17

02 Jun '17

Marcus Meissner <meissner(a)suse.de> wrote: > diff --git a/dlls/fusion/tests/asmname.c b/dlls/fusion/tests/asmname.c > index 5fb14a4829..21cd4874ed 100644 > --- a/dlls/fusion/tests/asmname.c > +++ b/dlls/fusion/tests/asmname.c > @@ -358,7 +358,7 @@ static void test_assembly_name_props_line(IAssemblyName *name, > to_widechar(expect, vals[i].val); > > size = MAX_PATH; > - ZeroMemory(str, MAX_PATH); > + ZeroMemory(str, sizeof(str)); > hr = IAssemblyName_GetProperty(name, i, str, &size); > to_multibyte(val, str); Same problem with IAssemblyName_GetProperty() and 'size' argumenet as for the previous patch. -- Dmitry.

2 1

Re: [PATCH] use correct size for ZeroMemory (GCC7)
by Dmitry Timoshkov 02 Jun '17

02 Jun '17

Marcus Meissner <meissner(a)suse.de> wrote: > --- a/dlls/fusion/tests/asmname.c > +++ b/dlls/fusion/tests/asmname.c > @@ -358,7 +358,7 @@ static void test_assembly_name_props_line(IAssemblyName *name, > to_widechar(expect, vals[i].val); > > size = MAX_PATH; > - ZeroMemory(str, MAX_PATH); > + ZeroMemory(str, sizeof(str)); > hr = IAssemblyName_GetProperty(name, i, str, &size); > to_multibyte(val, str); According to the implementation of IAssemblyName_GetProperty() 'size' assignment needs to be fixed as well. And IAssemblyName_GetProperty() implementation should be fixed to actually take 'size' into account. -- Dmitry.

1 0

Re: [PATCH 3/4] quartz: fix crash in FilterGraph2_Render
by Andrew Eikum 02 Jun '17

02 Jun '17

Can you add a test for this? Andrew On Thu, May 25, 2017 at 04:54:49PM +0200, Miklós Máté wrote: > Note: there are a lot of other places as well where the null pointer handling > is present in the msdn docs but missing in wine. > > Signed-off-by: Miklós Máté <mtmkls(a)gmail.com> > --- > dlls/quartz/filtergraph.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c > index a143b05d83..e26eb199c8 100644 > --- a/dlls/quartz/filtergraph.c > +++ b/dlls/quartz/filtergraph.c > @@ -1279,6 +1279,9 @@ static HRESULT WINAPI FilterGraph2_Render(IFilterGraph2 *iface, IPin *ppinOut) > > TRACE("(%p/%p)->(%p)\n", This, iface, ppinOut); > > + if (!ppinOut) > + return E_POINTER; > + > if (TRACE_ON(quartz)) > { > PIN_INFO PinInfo; > -- > 2.11.0 > > >

3 2

Re: [PATCH 1/4] quartz: AsyncReader is always expected to have output pin
by Andrew Eikum 01 Jun '17

01 Jun '17

Thanks for working on this. I tested your patch sequence against a number of games as well as embedding videos in MSOffice 2007 and 2010 and found no regressions. I do have some comments, though, in-line below. Is this something you could write a test for? E.g. create the filter and then query for its output pin immediately after creation. On Thu, May 25, 2017 at 04:54:47PM +0200, Miklós Máté wrote: > Even between create() and Load(). This fixes a crash in DSPlayer. > > Signed-off-by: Miklós Máté <mtmkls(a)gmail.com> > --- > dlls/quartz/filesource.c | 31 ++++++++++++++++++++----------- > 1 file changed, 20 insertions(+), 11 deletions(-) > > diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c > index ed7e5ee201..200463ff5b 100644 > --- a/dlls/quartz/filesource.c > +++ b/dlls/quartz/filesource.c > @@ -73,7 +73,8 @@ static const IFileSourceFilterVtbl FileSource_Vtbl; > static const IAsyncReaderVtbl FileAsyncReader_Vtbl; > static const IAMFilterMiscFlagsVtbl IAMFilterMiscFlags_Vtbl; > > -static HRESULT FileAsyncReader_Construct(HANDLE hFile, IBaseFilter * pBaseFilter, LPCRITICAL_SECTION pCritSec, IPin ** ppPin); > +static HRESULT FileAsyncReader_Construct(IBaseFilter * pBaseFilter, LPCRITICAL_SECTION pCritSec, IPin ** ppPin); > +static HRESULT FileAsyncReader_SetFile(IAsyncReader * iface, HANDLE hFile); > > static const WCHAR mediatype_name[] = { > 'M', 'e', 'd', 'i', 'a', ' ', 'T', 'y', 'p', 'e', 0 }; > @@ -416,6 +417,7 @@ static const BaseFilterFuncTable BaseFuncTable = { > HRESULT AsyncReader_create(IUnknown * pUnkOuter, LPVOID * ppv) > { > AsyncReader *pAsyncRead; > + HRESULT hr; > > if( pUnkOuter ) > return CLASS_E_NOAGGREGATION; > @@ -429,7 +431,8 @@ HRESULT AsyncReader_create(IUnknown * pUnkOuter, LPVOID * ppv) > > pAsyncRead->IFileSourceFilter_iface.lpVtbl = &FileSource_Vtbl; > pAsyncRead->IAMFilterMiscFlags_iface.lpVtbl = &IAMFilterMiscFlags_Vtbl; > - pAsyncRead->pOutputPin = NULL; > + hr = FileAsyncReader_Construct(&pAsyncRead->filter.IBaseFilter_iface, &pAsyncRead->filter.csFilter, &pAsyncRead->pOutputPin); > + BaseFilterImpl_IncrementPinVersion(&pAsyncRead->filter); If this fails, I think we should free resources and return the error immediately. > > pAsyncRead->pszFileName = NULL; > pAsyncRead->pmt = NULL; > @@ -438,7 +441,7 @@ HRESULT AsyncReader_create(IUnknown * pUnkOuter, LPVOID * ppv) > > TRACE("-- created at %p\n", pAsyncRead); > > - return S_OK; > + return hr; > } > > /** IUnknown methods **/ > @@ -606,7 +609,7 @@ static ULONG WINAPI FileSource_Release(IFileSourceFilter * iface) > > static HRESULT WINAPI FileSource_Load(IFileSourceFilter * iface, LPCOLESTR pszFileName, const AM_MEDIA_TYPE * pmt) > { > - HRESULT hr; > + HRESULT hr = E_FAIL; > HANDLE hFile; > IAsyncReader * pReader = NULL; > AsyncReader *This = impl_from_IFileSourceFilter(iface); > @@ -625,16 +628,15 @@ static HRESULT WINAPI FileSource_Load(IFileSourceFilter * iface, LPCOLESTR pszFi > return HRESULT_FROM_WIN32(GetLastError()); > } > > - /* create pin */ > - hr = FileAsyncReader_Construct(hFile, &This->filter.IBaseFilter_iface, &This->filter.csFilter, &This->pOutputPin); > - BaseFilterImpl_IncrementPinVersion(&This->filter); > > - if (SUCCEEDED(hr)) > + if (This->pOutputPin) Since we now create the output pin during filter creation, this should never be non-NULL, right? > hr = IPin_QueryInterface(This->pOutputPin, &IID_IAsyncReader, (LPVOID *)&pReader); > > /* store file name & media type */ > if (SUCCEEDED(hr)) > { > + FileAsyncReader_SetFile(pReader, hFile); > + > CoTaskMemFree(This->pszFileName); > if (This->pmt) > FreeMediaType(This->pmt); > @@ -939,7 +941,7 @@ static const BaseOutputPinFuncTable output_BaseOutputFuncTable = { > BaseOutputPinImpl_BreakConnect > }; > > -static HRESULT FileAsyncReader_Construct(HANDLE hFile, IBaseFilter * pBaseFilter, LPCRITICAL_SECTION pCritSec, IPin ** ppPin) > +static HRESULT FileAsyncReader_Construct(IBaseFilter * pBaseFilter, LPCRITICAL_SECTION pCritSec, IPin ** ppPin) > { > PIN_INFO piOutput; > HRESULT hr; > @@ -952,9 +954,8 @@ static HRESULT FileAsyncReader_Construct(HANDLE hFile, IBaseFilter * pBaseFilter > > if (SUCCEEDED(hr)) > { > - FileAsyncReader *pPinImpl = (FileAsyncReader *)*ppPin; > + FileAsyncReader *pPinImpl = impl_from_IPin(*ppPin); > pPinImpl->IAsyncReader_iface.lpVtbl = &FileAsyncReader_Vtbl; > - pPinImpl->hFile = hFile; > pPinImpl->bFlushing = FALSE; > pPinImpl->sample_list = NULL; > pPinImpl->handle_list = NULL; > @@ -965,6 +966,14 @@ static HRESULT FileAsyncReader_Construct(HANDLE hFile, IBaseFilter * pBaseFilter > return hr; > } > > +static HRESULT FileAsyncReader_SetFile(IAsyncReader * iface, HANDLE hFile) > +{ > + FileAsyncReader *This = impl_from_IAsyncReader(iface); > + > + This->hFile = hFile; > + return S_OK; > +} > + Why is this a separate function instead of just setting hFile in FileSource_Load? > /* IAsyncReader */ > > static HRESULT WINAPI FileAsyncReader_QueryInterface(IAsyncReader * iface, REFIID riid, LPVOID * ppv) > -- > 2.11.0 > > >

2 1

Re: ntdll: On macOS, don't use clock_gettime() even if it's available.
by Michael Müller 01 Jun '17

01 Jun '17

Not sure which one of two commands is causing the lower overhead, but shouldn't you just build Wine using the 10.11 SDK if you plan to deploy it on 10.11? This could theoretically also apply to other parts of Wine and I don't think it makes sense to add backwards compatibility hacks everywhere. Regards, Michael

2 1

Re: [PATCH] msacm32: Correctly allocate WAVEFORMATEX.
by Andrew Eikum 01 Jun '17

01 Jun '17

This doesn't look right to me. According to MSDN[1], the cbFormatSize field should already be the full size of the format struct. It's possible MSDN is wrong, but we'd need tests to prove that first. Who sets cbFormatSize? Could the error be there? [1] https://msdn.microsoft.com/en-us/library/windows/desktop/dd742918(v=vs.85).… Andrew On Wed, May 31, 2017 at 06:03:58PM -0500, Zebediah Figura wrote: > Fixes https://bugs.winehq.org/show_bug.cgi?id=26388 > > Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> > --- > dlls/msacm32/format.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/dlls/msacm32/format.c b/dlls/msacm32/format.c > index de07cba9a3..ec46cae163 100644 > --- a/dlls/msacm32/format.c > +++ b/dlls/msacm32/format.c > @@ -75,7 +75,7 @@ static BOOL CALLBACK MSACM_FillFormatTagsCB(HACMDRIVERID hadid, > > afd.cbStruct = sizeof(afd); > afd.dwFormatTag = paftd->dwFormatTag; > - afd.pwfx = HeapAlloc(MSACM_hHeap, 0, paftd->cbFormatSize); > + afd.pwfx = HeapAlloc(MSACM_hHeap, 0, sizeof(WAVEFORMATEX) + paftd->cbFormatSize); > if (!afd.pwfx) return FALSE; > afd.pwfx->wFormatTag = paftd->dwFormatTag; > afd.pwfx->cbSize = paftd->cbFormatSize; > -- > 2.13.0 > > >

1 0

Re: PATCH 1/7] msvcrt: Translate SEH exception on each call to __CxxFrameHandler.
by Piotr Caban 01 Jun '17

01 Jun '17

On 05/24/17 02:54, Daniel Lehman wrote: > +extern void __wine_rtl_unwind( EXCEPTION_REGISTRATION_RECORD* frame, EXCEPTION_RECORD *record, > + void (*target)(void) ); It's already defined in wine/exception.h. > +extern void CDECL __DestructExceptionObject(EXCEPTION_RECORD *rec); This is also already defined (in msvcrt.h) > + > +static void DECLSPEC_NORETURN seh_unwind_target(void) > +{ > + seh_frame_info *seh_frame = (seh_frame_info *)__wine_get_frame(); > + __wine_pop_frame( &seh_frame->frame ); There's no need to call __wine_pop_frame here, it will be done after the jump anyway. I think that the whole series will be cleaner/easier to read if we add the __EXCEPT_CTX/__FINALLY_CTX macros and use them here. I'm attaching a patch with proposition of changes for this functions. With such changes your patch will look like this (this is not tested): typedef struct { ULONG64 dest_frame; ULONG64 orig_frame; DISPATCHER_CONTEXT *dispatch; const cxx_function_descr *descr; } se_translator_ctx; static DWORD se_translation_filter(EXCEPTION_POINTERS *ep, void *c) { se_translator_ctx *ctx = (se_translator_ctx*)c; /* this is copied from original patch but I think that */ /* terminate should be called on non C++ exceptions here */ if (ep->rec->ExceptionCode != CXX_EXCEPTION) return ExceptionContinueSearch; find_catch_block(...); __DestructExceptionObject(ep->rec); return ExceptionExecuteHandler; } in cxx_frame_handler: if (data->se_translator) { se_translator_ctx ctx; //initialize ctx __TRY { except_ptrs.ExceptionRecord = rec; except_ptrs.ContextRecord = context; data->se_translator(rec->ExceptionCode, &except_ptrs); } __EXCEPT_CTX(se_translation_filter, &ctx) { } __END_TRY } With such changes second patch can be also changed to use __TRY/__FINALLY_CTX around "ret_addr = handler(0, frame);" file. What do you think about it? Thanks, Piotr

2 1

Re: [PATCH 6/6] d3dx9: Merge constant setting for child parameters when possible.
by Matteo Bruni 31 May '17

31 May '17

2017-05-24 11:46 GMT+02:00 Paul Gofman <gofmanp(a)gmail.com>: > + if (!(const_set->table == current_table && current_start_offset == start_offset > + && const_set->direct_copy == first_const->direct_copy > + && current_data == const_set->param->data > + && (const_set->direct_copy || (first_const->param->type == const_set->param->type > + && first_const->param->class == const_set->param->class > + && first_const->param->columns == const_set->param->columns > + && first_const->param->rows == const_set->param->rows > + && first_const->register_count == const_set->register_count > + && (i == const_tab->const_set_count - 1 > + || first_const->param->element_count == const_set->param->element_count))))) > + { > + TRACE("direct_copy %u, i %u, index %u, param %s.%s, current_data %p, const_set->param->data %p, "\ > + "current_start_offset %u, start_offset %u, const_set->table %u, current_table %u.\n", > + const_set->direct_copy, i, index, debugstr_a(param->name), > + debugstr_a(const_set->param->name), current_data, const_set->param->data, > + current_start_offset, start_offset, const_set->table, current_table); > + break; > + } This looks like a debug trace. > + TRACE("Merging %u child parameters for %s, not merging %u, direct_copy %u.\n", i - index, > + debugstr_a(param->name), const_tab->const_set_count - i, first_const->direct_copy); I guess it's intentional that you're printing this even when not merging anything, in that case the TRACE sounds a bit awkward though. Maybe have a separate TRACE for that case? BTW, please format the BOOL with %#x. > + if (i > index + 1) > + { > + first_const->element_count = element_count; > + if (first_const->direct_copy) > + { > + first_const->element_count = 1; > + if (index == start_index > + && !(param->type == D3DXPT_VOID && param->class == D3DXPC_STRUCT)) > + { > + if (param_type_to_table_type(param->type) == PRES_VT_MAX) > + return D3DERR_INVALIDCALL; > + first_const->param = param; > + } > + first_const->register_count = get_reg_offset(current_table, current_start_offset) > + - first_const->register_index; > + } > + memmove(&const_tab->const_set[index + 1], &const_tab->const_set[i], > + sizeof(*const_tab->const_set) * (const_tab->const_set_count - i)); > + const_tab->const_set_count -= i - index - 1; > + } Just for my own curiosity, do you think it's significant to merge non-direct_copy entries? Not that it hurts anything to have it.

2 4

Re: [v2 2/6] d3dx9: Factor out get_const_upload_info() function.
by Matteo Bruni 31 May '17

31 May '17

2017-05-30 11:38 GMT+02:00 Paul Gofman <gofmanp(a)gmail.com>: > Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> > --- > v2: > - renamed 'n' to 'major_count'; major_count is still a bit meh, since "major" is really already a count and there is an unspecified "count" too. I don't have any good suggestion and this is an improvement over the current naming though, so...

1 0

Re: [PATCH 1/6] d3dx9: Get rid of table lookup for converting between register indexes and offsets.
by Matteo Bruni 31 May '17

31 May '17

2017-05-24 11:46 GMT+02:00 Paul Gofman <gofmanp(a)gmail.com>: > static unsigned int get_reg_offset(unsigned int table, unsigned int offset) > { > - return offset / table_info[table].reg_component_count; > + return table == PRES_REGTAB_OBCONST ? offset : offset >> 2; > +} > + > +static unsigned int get_offset_reg(unsigned int table, unsigned int reg_idx) > +{ > + return table == PRES_REGTAB_OBCONST ? reg_idx : reg_idx << 2; > } I suppose using an explicit division and multiplication here wouldn't change the generated code, in which case I'd slightly prefer that. It doesn't matter right now, just mentioning it for potentially similar cases in the future. Also this patch probably should have been split in two, with the first patch introducing get_offset_reg() with no functional changes and the second hardcoding the table check / dropping the table lookup. Not worth a rework at this point I guess. > @@ -1033,9 +1035,9 @@ static void set_constants(struct d3dx_regstore *rs, struct d3dx_const_tab *const > unsigned int offset; > > offset = start_offset + i * major_stride + j; > - if (offset / table_info[table].reg_component_count >= rs->table_sizes[table]) > + if (get_reg_offset(table, offset) >= rs->table_sizes[table]) > { > - if (table_info[table].reg_component_count != 1) > + if (table != PRES_REGTAB_OBCONST) > FIXME("Output offset exceeds table size, name %s, component %u.\n", > debugstr_a(param->name), i); > break; Not new and probably I just forgot the details, but, why would the register component count matter for the FIXME? > - offset = reg_index * table_info[table].reg_component_count > - + offset % table_info[table].reg_component_count; > + offset = get_offset_reg(table, reg_index) + offset % get_offset_reg(table, 1); That "get_offset_reg(table, 1)" comes up a number of times. Maybe worth making an extra get_reg_components(table) (or similar) helper? Simply for even greater clarity.

2 5

Re: [PATCH 3/6] d3d9: Validate adapter format in CheckDeviceFormat().
by Marvin 31 May '17

31 May '17

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=31280 Your paranoid android. === wvistau64 (32 bit device) === device.c:11206: Test failed: Got unexpected hr 0, device type 0x4. device.c:11209: Test failed: Got unexpected hr 0, device type 0x4. device.c:11212: Test failed: Got unexpected hr 0, device type 0x4. device.c:11215: Test failed: Got unexpected hr 0, device type 0x4. === w2008s64 (32 bit device) === device.c:11206: Test failed: Got unexpected hr 0, device type 0x4. device.c:11209: Test failed: Got unexpected hr 0, device type 0x4. device.c:11212: Test failed: Got unexpected hr 0, device type 0x4. device.c:11215: Test failed: Got unexpected hr 0, device type 0x4. === w7u (32 bit device) === device.c:11206: Test failed: Got unexpected hr 0, device type 0x4. device.c:11209: Test failed: Got unexpected hr 0, device type 0x4. device.c:11212: Test failed: Got unexpected hr 0, device type 0x4. device.c:11215: Test failed: Got unexpected hr 0, device type 0x4. === w7pro64 (32 bit device) === device.c:11206: Test failed: Got unexpected hr 0, device type 0x4. device.c:11209: Test failed: Got unexpected hr 0, device type 0x4. device.c:11212: Test failed: Got unexpected hr 0, device type 0x4. device.c:11215: Test failed: Got unexpected hr 0, device type 0x4. === w8 (32 bit device) === device.c:11206: Test failed: Got unexpected hr 0, device type 0x4. device.c:11209: Test failed: Got unexpected hr 0, device type 0x4. device.c:11212: Test failed: Got unexpected hr 0, device type 0x4. device.c:11215: Test failed: Got unexpected hr 0, device type 0x4. === w864 (32 bit device) === device.c:11206: Test failed: Got unexpected hr 0, device type 0x4. device.c:11209: Test failed: Got unexpected hr 0, device type 0x4. device.c:11212: Test failed: Got unexpected hr 0, device type 0x4. device.c:11215: Test failed: Got unexpected hr 0, device type 0x4. === w1064 (32 bit device) === device.c:11206: Test failed: Got unexpected hr 0, device type 0x4. device.c:11209: Test failed: Got unexpected hr 0, device type 0x4. device.c:11212: Test failed: Got unexpected hr 0, device type 0x4. device.c:11215: Test failed: Got unexpected hr 0, device type 0x4. === wvistau64 (64 bit device) === device.c:11206: Test failed: Got unexpected hr 0, device type 0x4. device.c:11209: Test failed: Got unexpected hr 0, device type 0x4. device.c:11212: Test failed: Got unexpected hr 0, device type 0x4. device.c:11215: Test failed: Got unexpected hr 0, device type 0x4. === w2008s64 (64 bit device) === device.c:11206: Test failed: Got unexpected hr 0, device type 0x4. device.c:11209: Test failed: Got unexpected hr 0, device type 0x4. device.c:11212: Test failed: Got unexpected hr 0, device type 0x4. device.c:11215: Test failed: Got unexpected hr 0, device type 0x4. === w7pro64 (64 bit device) === device.c:11206: Test failed: Got unexpected hr 0, device type 0x4. device.c:11209: Test failed: Got unexpected hr 0, device type 0x4. device.c:11212: Test failed: Got unexpected hr 0, device type 0x4. device.c:11215: Test failed: Got unexpected hr 0, device type 0x4. === w864 (64 bit device) === device.c:11206: Test failed: Got unexpected hr 0, device type 0x4. device.c:11209: Test failed: Got unexpected hr 0, device type 0x4. device.c:11212: Test failed: Got unexpected hr 0, device type 0x4. device.c:11215: Test failed: Got unexpected hr 0, device type 0x4. === w1064 (64 bit device) === device.c:11206: Test failed: Got unexpected hr 0, device type 0x4. device.c:11209: Test failed: Got unexpected hr 0, device type 0x4. device.c:11212: Test failed: Got unexpected hr 0, device type 0x4. device.c:11215: Test failed: Got unexpected hr 0, device type 0x4.

2 1

Re: [PATCH 2/6] d3d8: Validate adapter format in CheckDeviceFormat().
by Marvin 31 May '17

31 May '17

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=31279 Your paranoid android. === w8 (32 bit device) === device.c:2945: Test failed: Received WM_WINDOWPOSCHANGED but did not expect it.

1 0

RE: [PATCH 2/7] msvcrt: Clean up registered C++ object in handler.
by Daniel Lehman 31 May '17

31 May '17

On 05/24/17 02:55, Daniel Lehman wrote: > +static DWORD cxx_catch_cleanup(EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_RECORD *frame, > + CONTEXT *context, > +EXCEPTION_REGISTRATION_RECORD **pdispatcher) { > + if (rec->ExceptionFlags & (EH_UNWINDING | EH_EXIT_UNWIND)) > + { > + thread_data_t *data = msvcrt_get_thread_data(); > + frame_info *cur; > + > + if (cxx_is_consolidate(rec)) > Is this condition really needed? Shouldn't we clean the object no matter what's the reason of unwind? Yeah. That's covered by patch 7/7. The original code only cleaned up if consolidating. Since this 2/7 patch was somewhat of a refactoring for the later patches, I kept the consolidate-only cleanup logic. I can merge them if you want >> + if ((ULONG64)cur <= (ULONG64)frame) > This condition is not working. It's making assumption about order of catch_frame and frame_info variables on stack while they are declared this way: I see what you mean. If I forcefully reverse them, my tests crash; my version of gcc was always putting them in the same place on the stack, regardless of where they were declared >> + EXCEPTION_REGISTRATION_RECORD catch_frame; >> cxx_frame_info frame_info; > Shouldn't the cxx_catch_cleanup just unregister the object that was registered in call_catch_block? I didn't find a way to be call __CxxUnregisterObject on that one specifically (I'll try suggestions if you got em) but the loop in cxx_catch_cleanup effective does this. when unwinding a nested exception, cxx_catch_cleanup will be called when unwinding call_catch_block, so all objects registered in call_catch_block and below will be cleaned up at that point. Unless the catch block itself explicitly calls __CxxRegisterObject, the only object on the list up to that frame will be the one from call_catch_block > Here's a test case that demonstrate the problem with cur <= frame > comparison: > > try { > try { int *p = NULL; *p = 0x42; } > catch (klass x) { throw 1; } > } catch (int i) { } > > try { throw 1; } > catch(...) {} This crashes for me even on Windows because the SEGV is uncaught. It 'works' if I set an seh translator that throws int, but I get identical results on Wine with my series applied. Do I need to add something? Thanks daniel

2 1

Re: [PATCH 7/7] regedit: Do not get text for items with an index less than one
by Alexandre Julliard 31 May '17

31 May '17

Hugh McMaster <hugh.mcmaster(a)outlook.com> writes: > @@ -59,7 +59,7 @@ LPWSTR GetItemText(HWND hwndLV, UINT item) > { > LPWSTR newStr, curStr; > unsigned int maxLen = 128; > - if (item == 0) return NULL; /* first item is ALWAYS a default */ > + if (item < 1) return NULL; /* first item is ALWAYS a default */ How is this different? -- Alexandre Julliard julliard(a)winehq.org

3 3

Re: [PATCH 2/3] mfplat: Implement MFCreateMediaType
by Dmitry Timoshkov 30 May '17

30 May '17

Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> wrote: > +struct IMFMediaTypeVtbl mediatype_vtbl = > +{ It should be 'static const', and without 'struct'. -- Dmitry.

1 0

Re: [7/7] wsdapi/tests: Add tests for Get/SetSockaddr.
by Marvin 30 May '17

30 May '17

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=31269 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [6/7] wsdapi/tests: Add tests for Get/SetMessageType.
by Marvin 30 May '17

30 May '17

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=31268 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [5/7] wsdapi/tests: Add tests for Get/SetPort.
by Marvin 30 May '17

30 May '17

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=31267 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [4/7] wsdapi/tests: Add tests for Get/SetTransportAddress.
by Marvin 30 May '17

30 May '17

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=31266 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [3/7] wsdapi/tests: Add WSDCreateUdpAddress tests.
by Marvin 30 May '17

30 May '17

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=31265 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [PATCH 2/7] msvcrt: Clean up registered C++ object in handler.
by Piotr Caban 30 May '17

30 May '17

On 05/24/17 02:55, Daniel Lehman wrote: > +static DWORD cxx_catch_cleanup(EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_RECORD *frame, > + CONTEXT *context, EXCEPTION_REGISTRATION_RECORD **pdispatcher) > +{ > + if (rec->ExceptionFlags & (EH_UNWINDING | EH_EXIT_UNWIND)) > + { > + thread_data_t *data = msvcrt_get_thread_data(); > + frame_info *cur; > + > + if (cxx_is_consolidate(rec)) Is this condition really needed? Shouldn't we clean the object no matter what's the reason of unwind? > + { > + rec = (void*)rec->ExceptionInformation[4]; > + > + for (cur = data->frame_info_head; cur; cur = cur->next) > + { > + if ((ULONG64)cur <= (ULONG64)frame) This condition is not working. It's making assumption about order of catch_frame and frame_info variables on stack while they are declared this way: > + EXCEPTION_REGISTRATION_RECORD catch_frame; > cxx_frame_info frame_info; Shouldn't the cxx_catch_cleanup just unregister the object that was registered in call_catch_block? Thanks, Piotr

1 1

Re: [PATCH] macdrv: Don't update clipboard if its content didn't change
by Ken Thomases 30 May '17

30 May '17

On May 25, 2017, at 1:22 PM, Piotr Caban <piotr(a)codeweavers.com> wrote: > > Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> > --- > dlls/winemac.drv/clipboard.c | 34 ++++++++++------------------------ > dlls/winemac.drv/cocoa_clipboard.m | 18 ++++++++++++++++++ > dlls/winemac.drv/macdrv_cocoa.h | 1 + > 3 files changed, 29 insertions(+), 24 deletions(-) > > +int macdrv_has_pasteboard_changed(void) > +{ > + __block int new_change_count; > + int ret; > + > + OnMainThread(^{ > + NSPasteboard* pb = [NSPasteboard generalPasteboard]; > + new_change_count = [pb changeCount]; > + }); > + > + ret = (change_count != new_change_count); > + change_count = new_change_count; > + return ret; > +} Unfortunately, -[NSPasteboard changeCount] isn't incremented for all changes to the pasteboard. For example, if the owner replaces the data for an existing type, it doesn't change. I'd have to check again, but I think it doesn't even change if the owner adds a new data type. I think it only changes when the pasteboard is cleared and rebuilt by -clearContents or -declareTypes:owner:. -Ken

2 5

Re: [PATCH 4/6] d3dx9: Evaluate condition if parameter can be directly copied during initialization.
by Matteo Bruni 29 May '17

29 May '17

2017-05-24 11:46 GMT+02:00 Paul Gofman <gofmanp(a)gmail.com>: The patch subject is a bit cumbersome IMO, what about "d3dx9: Add a direct copy path to set_constants()."?

2 2

Re: [PATCH 3/6] d3dx9: Factor out param_type_to_table_type() function.
by Matteo Bruni 29 May '17

29 May '17

2017-05-24 11:46 GMT+02:00 Paul Gofman <gofmanp(a)gmail.com>: > Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> > --- > dlls/d3dx9_36/preshader.c | 26 ++++++++++++++++++++++---- > 1 file changed, 22 insertions(+), 4 deletions(-) > > diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c > index 262b7c1..bddd74f 100644 > --- a/dlls/d3dx9_36/preshader.c > +++ b/dlls/d3dx9_36/preshader.c > @@ -193,7 +193,8 @@ enum pres_value_type > PRES_VT_FLOAT, > PRES_VT_DOUBLE, > PRES_VT_INT, > - PRES_VT_BOOL > + PRES_VT_BOOL, > + PRES_VT_MAX > }; I guess you mean PRES_VT_COUNT. > > static const struct > @@ -260,6 +261,22 @@ struct d3dx_pres_ins > struct d3dx_pres_operand output; > }; > > +static enum pres_value_type param_type_to_table_type(D3DXPARAMETER_TYPE type) In d3d we usually name those the other way around e.g. table_type_from_param_type().

1 0

Re: [PATCH 2/6] d3dx9: Factor out get_constant_dimensions() function.
by Matteo Bruni 29 May '17

29 May '17

2017-05-24 11:46 GMT+02:00 Paul Gofman <gofmanp(a)gmail.com>: > Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> > --- > dlls/d3dx9_36/preshader.c | 43 +++++++++++++++++++++++++++---------------- > 1 file changed, 27 insertions(+), 16 deletions(-) > > diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c > index 29a2346..262b7c1 100644 > --- a/dlls/d3dx9_36/preshader.c > +++ b/dlls/d3dx9_36/preshader.c > @@ -979,6 +979,31 @@ void d3dx_free_param_eval(struct d3dx_param_eval *peval) > HeapFree(GetProcessHeap(), 0, peval); > } > > +static void get_constant_dimensions(struct d3dx_const_param_eval_output *const_set, BOOL *transpose, > + unsigned int *major, unsigned int *minor, unsigned int *major_stride, unsigned int *n, > + unsigned int *count) It seems better to pass around a struct pointer in place of all those separate out arguments, e.g. struct const_upload_info. Then you can name the helper get_"structname"() too. > + *n = min(*major * *major_stride, > + get_offset_reg(table, const_set->register_count) + *major_stride - 1) / *major_stride; > + *count = *n * *minor; Preexisting, but "n" is a bit confusing, especially considering that there is a "count" too. Something like "available_major" / "reg_count"? count might be "component_count" or similar. Maybe you can find some better names...

1 0

Re: [PATCH] api-ms-win-security-activedirectoryclient-l1-1-0: Add dll.
by Nikolay Sivov 29 May '17

29 May '17

On 29.05.2017 14:04, Andrey Gusev wrote: > Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> > --- > configure | 2 ++ > configure.ac | 1 + > dlls/api-ms-win-security-activedirectoryclient-l1-1-0/Makefile.in | 1 + > .../api-ms-win-security-activedirectoryclient-l1-1-0.spec | 8 ++++++++ > tools/make_specfiles | 4 ++++ > 5 files changed, 16 insertions(+) > create mode 100644 dlls/api-ms-win-security-activedirectoryclient-l1-1-0/Makefile.in > create mode 100644 dlls/api-ms-win-security-activedirectoryclient-l1-1-0/api-ms-win-security-activedirectoryclient-l1-1-0.spec > > diff --git a/configure b/configure > index d2d391c..fb22627 100755 > --- a/configure > +++ b/configure > @@ -1026,6 +1026,7 @@ enable_api_ms_win_ntuser_dc_access_l1_1_0 > enable_api_ms_win_power_base_l1_1_0 > enable_api_ms_win_power_setting_l1_1_0 > enable_api_ms_win_rtcore_ntuser_private_l1_1_0 > +enable_api_ms_win_security_activedirectoryclient_l1_1_0 > enable_api_ms_win_security_audit_l1_1_1 > enable_api_ms_win_security_base_l1_1_0 > enable_api_ms_win_security_base_l1_2_0 > @@ -17897,6 +17898,7 @@ wine_fn_config_dll api-ms-win-ntuser-dc-access-l1-1-0 enable_api_ms_win_ntuser_d > wine_fn_config_dll api-ms-win-power-base-l1-1-0 enable_api_ms_win_power_base_l1_1_0 > wine_fn_config_dll api-ms-win-power-setting-l1-1-0 enable_api_ms_win_power_setting_l1_1_0 > wine_fn_config_dll api-ms-win-rtcore-ntuser-private-l1-1-0 enable_api_ms_win_rtcore_ntuser_private_l1_1_0 > +wine_fn_config_dll api-ms-win-security-activedirectoryclient-l1-1-0 enable_api_ms_win_security_activedirectoryclient_l1_1_0 > wine_fn_config_dll api-ms-win-security-audit-l1-1-1 enable_api_ms_win_security_audit_l1_1_1 > wine_fn_config_dll api-ms-win-security-base-l1-1-0 enable_api_ms_win_security_base_l1_1_0 > wine_fn_config_dll api-ms-win-security-base-l1-2-0 enable_api_ms_win_security_base_l1_2_0 > diff --git a/configure.ac b/configure.ac > index db4d168..dde867b 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -2843,6 +2843,7 @@ WINE_CONFIG_DLL(api-ms-win-ntuser-dc-access-l1-1-0) > WINE_CONFIG_DLL(api-ms-win-power-base-l1-1-0) > WINE_CONFIG_DLL(api-ms-win-power-setting-l1-1-0) > WINE_CONFIG_DLL(api-ms-win-rtcore-ntuser-private-l1-1-0) > +WINE_CONFIG_DLL(api-ms-win-security-activedirectoryclient-l1-1-0) > WINE_CONFIG_DLL(api-ms-win-security-audit-l1-1-1) > WINE_CONFIG_DLL(api-ms-win-security-base-l1-1-0) > WINE_CONFIG_DLL(api-ms-win-security-base-l1-2-0) > diff --git a/dlls/api-ms-win-security-activedirectoryclient-l1-1-0/Makefile.in b/dlls/api-ms-win-security-activedirectoryclient-l1-1-0/Makefile.in > new file mode 100644 > index 0000000..e1e99bd > --- /dev/null > +++ b/dlls/api-ms-win-security-activedirectoryclient-l1-1-0/Makefile.in > @@ -0,0 +1 @@ > +MODULE = api-ms-win-security-activedirectoryclient-l1-1-0.dll > diff --git a/dlls/api-ms-win-security-activedirectoryclient-l1-1-0/api-ms-win-security-activedirectoryclient-l1-1-0.spec b/dlls/api-ms-win-security-activedirectoryclient-l1-1-0/api-ms-win-security-activedirectoryclient-l1-1-0.spec > new file mode 100644 > index 0000000..eef1c40 > --- /dev/null > +++ b/dlls/api-ms-win-security-activedirectoryclient-l1-1-0/api-ms-win-security-activedirectoryclient-l1-1-0.spec > @@ -0,0 +1,8 @@ > +@ stub DsBindWithSpnExW > +@ stub DsCrackNamesW > +@ stub DsFreeDomainControllerInfoW > +@ stub DsFreeNameResultW > +@ stub DsFreePasswordCredentials > +@ stub DsGetDomainControllerInfoW > +@ stub DsMakePasswordCredentialsW > +@ stub DsUnBindW > diff --git a/tools/make_specfiles b/tools/make_specfiles > index e544293..910bd0f 100755 > --- a/tools/make_specfiles > +++ b/tools/make_specfiles > @@ -157,6 +157,10 @@ my @dll_groups = > "api-ms-win-power-setting-l1-1-0", > ], > [ > + "ntdsapi", > + "api-ms-win-security-activedirectoryclient-l1-1-0", > + ], > + [ > "kernel32", > "api-ms-win-appmodel-identity-l1-1-0", > "api-ms-win-appmodel-runtime-l1-1-1", > Those exports are present in kernelbase spec file, maybe it's better to forward to it?

1 0

Re: [PATCH 4/6] wined3d: Prefer GLSL 1.50 shaders in draw_test_quad().
by Henri Verbeet 29 May '17

29 May '17

On 29 May 2017 at 10:53, Józef Kucia <jkucia(a)codeweavers.com> wrote: > + BOOL use_glsl_150 = gl_info->glsl_version >= 150; That doesn't work in Wine :D I wouldn't necessarily mind if it did though.

1 0

Re: [PATCH] comctl32/listview: Do not select the first list item when drawing a marquee rectangle
by Nikolay Sivov 29 May '17

29 May '17

On 22.05.2017 16:02, Hugh McMaster wrote: > Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> > --- > dlls/comctl32/listview.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c > index c681451..a117f83 100644 > --- a/dlls/comctl32/listview.c > +++ b/dlls/comctl32/listview.c > @@ -3892,6 +3892,9 @@ static void LISTVIEW_MarqueeHighlight(LISTVIEW_INFO *infoPtr, const POINT *coord > if ((scroll & SCROLL_DOWN) && (coords_orig->y >= infoPtr->rcList.bottom)) > LISTVIEW_Scroll(infoPtr, 0, (coords_orig->y - infoPtr->rcList.bottom)); > > + if (IsRectEmpty(&infoPtr->marqueeRect)) > + infoPtr->marqueeRect = rect; > + > iterator_frameditems_absolute(&old_elems, infoPtr, &infoPtr->marqueeRect); > > infoPtr->marqueeRect = rect; > I see what you mean, when you start selecting with marquee first item in report mode is always selected. This patch fixes that, but breaks ICON mode it seems - sometimes items are not selected when they are clearly intersect with marquee rectangle. Admittedly this selection mode is already funny in ICON mode, it does not use dead zones properly, so slight movement selects things, while it should check with icon rectangle when resized horizontally, and allow about half icon rectangle intersect marquee vertically before setting item state.

2 3

Re: [v5 PATCH 1/3] wined3d: Send texture updates through the command stream.
by Stefan Dösinger 29 May '17

29 May '17

Am 2017-05-24 um 15:49 schrieb Masanori Kakura: > + for (j = 0; j < layer_count; ++j) > + { > + wined3d_cs_emit_blt_sub_resource(cs, > + &dst_texture->resource, j * dst_level_count + i, &box, > + &src_texture->resource, j * src_level_count + i + src_skip_levels, &box, > + 0, NULL, WINED3D_TEXF_POINT); > + } I don't like emitting new operations in the CS handler instead of doing the actual operation. Maybe this can be avoided with some refactoring of wined3d_cs_exec_blt_sub_resource?

3 3

Re: [v6 PATCH 2/3] wined3d: Add dirty region tracking.
by Marvin 28 May '17

28 May '17

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=31231 Your paranoid android. === w1064 (64 bit visual) === visual.c:8016: Test failed: Got unexpected color 0x00007580 for quad 2 (different colors).

1 0

about donat enikeev csmt on graphics tab in winecfg
by CARLOS RODRIGUEZ 27 May '17

27 May '17

Hi henri I read your discussion about normal user dont need touch that However various titles needs csmt, mainly for solve graphics issues case duke nuke forever (dont show anything without csmt), resident evil 6 (only see light without csmt) Or flickering graphics case im alive, senran kagura shinovi versus, bayonetta, vanquish Resolve audio sincronization in prerenderer sequences case front mission evolved And possible many other titles Put option in winecfg could be usefull for new users I agree about you said related csmt dont be stay active for default for now, but solve before problems described Maybe can add some note in csmt like that: mainly for resolve graphics issues for now or something similar Thanks

1 0

Re: [PATCH] msvcp140: Implement _To_wide (v2).
by Stefan Dösinger 26 May '17

26 May '17

Am 2017-05-26 um 13:17 schrieb Stefan Dösinger: > + return MultiByteToWideChar(CP_ACP, 0, src, -1, dst, strlen(src) + 1); Do not commit this yet, there is another version coming. The maximum length is limited to MAX_PATH, and Nikolai says the test randomly crashes on his Windows. It seems Microsoft lets interns write APIs nowadays.

1 0

Re: [PATCH] msvcp140: Implement _To_wide.
by Marvin 26 May '17

26 May '17

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=31204 Your paranoid android. === wvistau64 (32 bit msvcp140) === msvcp140.c:492: Test failed: Got unexpected output L"\05e6\05d4\f895\f893\20ac\009f" === wvistau64 (64 bit msvcp140) === msvcp140.c:492: Test failed: Got unexpected output L"\05e6\05d4\f895\f893\20ac\009f"

1 0

Re: [PATCH] oleaut32: Add VarBstrFromDisp tests
by Marvin 25 May '17

25 May '17

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=31191 Your paranoid android. === wxppro (32 bit vartype) === vartype.c:5306: Test failed: got 0x80020008 vartype.c:5307: Test failed: got L"\c3c9\768d\c700\2444\7804\0014\c700\2404\9400S\8ce8\0091\c700\2404\fe44S\40e8\0094\c900\8dc3\26b4" === w2003std (32 bit vartype) === vartype.c:5306: Test failed: got 0x80020008 vartype.c:5307: Test failed: got L"\c3c9\768d\c700\2444\7804\0014\c700\2404\9400S\8ce8\0091\c700\2404\fe44S\40e8\0094\c900\8dc3\26b4" === wvistau64 (32 bit vartype) === vartype.c:5306: Test failed: got 0x80020008 vartype.c:5307: Test failed: got L"\c3c9\768d\c700\2444\7804\0014\c700\2404\9400S\8ce8\0091\c700\2404\fe44S\40e8\0094\c900\8dc3\26b4" === w2008s64 (32 bit vartype) === vartype.c:5306: Test failed: got 0x80020008 vartype.c:5307: Test failed: got L"\c3c9\768d\c700\2444\7804\0014\c700\2404\9400S\8ce8\0091\c700\2404\fe44S\40e8\0094\c900\8dc3\26b4" === w7u (32 bit vartype) === vartype.c:5306: Test failed: got 0x80020008 vartype.c:5307: Test failed: got L"\c3c9\768d\c700\2444\7804\0014\c700\2404\9400S\8ce8\0091\c700\2404\fe44S\40e8\0094\c900\8dc3\26b4" === w7pro64 (32 bit vartype) === vartype.c:5306: Test failed: got 0x80020008 vartype.c:5307: Test failed: got L"\c3c9\768d\c700\2444\7804\0014\c700\2404\9400S\8ce8\0091\c700\2404\fe44S\40e8\0094\c900\8dc3\26b4" === w8 (32 bit vartype) === vartype.c:5306: Test failed: got 0x80020008 vartype.c:5307: Test failed: got L"\c3c9\768d\c700\2444\7804\0014\c700\2404\9400S\8ce8\0091\c700\2404\fe44S\40e8\0094\c900\8dc3\26b4" === w864 (32 bit vartype) === vartype.c:5306: Test failed: got 0x80020008 vartype.c:5307: Test failed: got L"\c3c9\768d\c700\2444\7804\0014\c700\2404\9400S\8ce8\0091\c700\2404\fe44S\40e8\0094\c900\8dc3\26b4" === w1064 (32 bit vartype) === vartype.c:5306: Test failed: got 0x80020008 vartype.c:5307: Test failed: got L"\c3c9\768d\c700\2444\7804\0014\c700\2404\9400S\8ce8\0091\c700\2404\fe44S\40e8\0094\c900\8dc3\26b4" === wvistau64 (64 bit vartype) === vartype.c:5306: Test failed: got 0x80020008 vartype.c:5307: Test failed: got L"\8b4c\53dc\5655\4157\4154\4155\4156\4857\ec81\00a8" oleaut32:vartype crashed (c0000374) === w2008s64 (64 bit vartype) === vartype.c:5306: Test failed: got 0x80020008 vartype.c:5307: Test failed: got L"\8b4c\53dc\5655\4157\4154\4155\4156\4857\ec81\00a8" oleaut32:vartype crashed (c0000374) === w7pro64 (64 bit vartype) === vartype.c:5306: Test failed: got 0x80020008 vartype.c:5307: Test failed: got L"\8b4c\53dc\5655\4157\4154\4155\4156\4857\ec81\00a8" oleaut32:vartype crashed (c0000374) === w1064 (64 bit vartype) === vartype.c:5306: Test failed: got 0x80020008 vartype.c:5307: Test failed: got L"\5540\5653\4157\4154\4155\4156\4857\6c8d\e124\8148\d8ec" oleaut32:vartype crashed (c0000374)

1 0

Re: [7/8] d3d11/tests: Add R9G9B9E5_SHAREDEXP to test_create_texture3d.
by Józef Kucia 25 May '17

25 May '17

On Thu, May 25, 2017 at 12:15 PM, Sven Hesse <drmccoy(a)drmccoy.de> wrote: > {DXGI_FORMAT_R8G8B8A8_UNORM, D3D11_BIND_DEPTH_STENCIL, FALSE, FALSE}, > {DXGI_FORMAT_D24_UNORM_S8_UINT, D3D11_BIND_RENDER_TARGET, FALSE, FALSE}, > {DXGI_FORMAT_D32_FLOAT, D3D11_BIND_RENDER_TARGET, FALSE, FALSE}, > + {DXGI_FORMAT_R9G9B9E5_SHAREDEXP, D3D10_BIND_SHADER_RESOURCE, TRUE, FALSE}, > + {DXGI_FORMAT_R9G9B9E5_SHAREDEXP, D3D10_BIND_RENDER_TARGET, FALSE, FALSE}, > + {DXGI_FORMAT_R9G9B9E5_SHAREDEXP, D3D10_BIND_DEPTH_STENCIL, FALSE, FALSE}, Please use D3D11 enum values.

1 0

Re: [6/8] d3d11/tests: Add R9G9B9E5_SHAREDEXP to test_create_texture2d.
by Józef Kucia 25 May '17

25 May '17

On Thu, May 25, 2017 at 12:15 PM, Sven Hesse <drmccoy(a)drmccoy.de> wrote: > {DXGI_FORMAT_D32_FLOAT, 1, D3D11_BIND_RENDER_TARGET, 0, FALSE, FALSE}, > {DXGI_FORMAT_D32_FLOAT, 1, D3D11_BIND_DEPTH_STENCIL, 0, TRUE, FALSE}, > + {DXGI_FORMAT_R9G9B9E5_SHAREDEXP, 1, D3D10_BIND_SHADER_RESOURCE, 0, TRUE, FALSE}, > + {DXGI_FORMAT_R9G9B9E5_SHAREDEXP, 1, D3D10_BIND_RENDER_TARGET, 0, FALSE, FALSE}, > + {DXGI_FORMAT_R9G9B9E5_SHAREDEXP, 1, D3D10_BIND_DEPTH_STENCIL, 0, FALSE, FALSE}, > }; Please use D3D11 enum values.

1 0

Re: [5/8] d3d10core/tests: Add R9G9B9E5_SHAREDEXP to test_texture.
by Józef Kucia 25 May '17

25 May '17

On Thu, May 25, 2017 at 12:15 PM, Sven Hesse <drmccoy(a)drmccoy.de> wrote: > + static const DWORD r9g9b9e5_colors[16] = { Please try to put opening brackets on a new line (applies also to the d3d11 version).

1 0

Re: [PATCH 1/5] d3dx9/tests: Use ARRAY_SIZE in test_D3DXSHEvalDirectionalLight().
by Matteo Bruni 24 May '17

24 May '17

2017-05-23 11:04 GMT+02:00 Henri Verbeet <hverbeet(a)codeweavers.com>: > @@ -2908,7 +2908,7 @@ static void test_D3DXSHEvalDirectionalLight(void) > green_out = test[l].green_in; > blue_out = test[l].blue_in; > > - for (j = 0; j < 49; j++) > + for (j = 0; j < ARRAY_SIZE(red_out); ++j) red_out here is defined as a pointer, not an array.

1 0

Re: [v5 PATCH 3/3] wined3d: Update only dirty regions in wined3d_cs_exec_update_texture().
by Marvin 24 May '17

24 May '17

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=31147 Your paranoid android. === w1064 (32 bit visual) === visual.c:8016: Test failed: Got unexpected color 0x00007580 for quad 2 (different colors).

1 0

Re: [PATCH] iphlpapi: Implement if_nametoindex.
by Bruno Jesus 24 May '17

24 May '17

On Wed, May 24, 2017 at 7:39 AM, Stefan Dösinger <stefan(a)codeweavers.com> wrote: > ... > diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c > index 796950e0f9..4cceb65621 100644 > --- a/dlls/iphlpapi/iphlpapi_main.c > +++ b/dlls/iphlpapi/iphlpapi_main.c > @@ -36,6 +36,9 @@ > #ifdef HAVE_RESOLV_H > # include <resolv.h> > #endif > +#ifdef HAVE_NET_IF_H > +# include <net/if.h> > +#endif > > #define NONAMELESSUNION > #define NONAMELESSSTRUCT > @@ -3208,3 +3211,12 @@ DWORD WINAPI ConvertInterfaceNameToLuidW(const WCHAR *name, NET_LUID *luid) > luid->Info.IfType = row.dwType; > return NO_ERROR; > } > + > +/****************************************************************** > + * if_nametoindex (IPHLPAPI.@) > + */ > +IF_INDEX WINAPI IPHLP_if_nametoindex(const char *name) > +{ > + TRACE("(%s)\n", name); > + return if_nametoindex(name); > +} Hi, this seems to be the ASCII version of GetAdapterIndex, can't you call getInterfaceIndexByName and avoid the new #include? Best wishes, Bruno

3 8

Re: [PATCH 2/2] winex11.drv: Implement clipboard changes tracking using xfixes extension
by Alexandre Julliard 24 May '17

24 May '17

Piotr Caban <piotr(a)codeweavers.com> writes: > @@ -499,6 +499,7 @@ extern Atom systray_atom DECLSPEC_HIDDEN; > typedef BOOL (*x11drv_event_handler)( HWND hwnd, XEvent *event ); > > extern void X11DRV_register_event_handler( int type, x11drv_event_handler handler, const char *name ) DECLSPEC_HIDDEN; > +extern void X11DRV_register_XFixesSelectionNotify( int type ) DECLSPEC_HIDDEN; Is there a reason you can't use X11DRV_register_event_handler? -- Alexandre Julliard julliard(a)winehq.org

2 2

Re: [PATCH 2/2] regedit: Add 'Expand' and 'Collapse' options to the treeview pop-up menu
by Nikolay Sivov 24 May '17

24 May '17

On 24.05.2017 11:21, Hugh McMaster wrote: > + item.mask = TVIF_CHILDREN | TVIF_HANDLE | TVIF_STATE; > + item.stateMask = TVIS_EXPANDED | TVIS_EXPANDEDONCE | TVIS_EXPANDPARTIAL; > + SendMessageW(hwndTV, TVM_GETITEMW, 0, (LPARAM)&item) Later you only test for TVIS_EXPANDED, is it necessary to request other bits?

2 1

Re: [PATCH 2/2] regedit: Add 'Expand' and 'Collapse' options to the treeview pop-up menu
by Nikolay Sivov 24 May '17

24 May '17

On 24.05.2017 11:21, Hugh McMaster wrote: > + case ID_TREE_EXPAND: > + { > + HTREEITEM selected = (HTREEITEM)SendMessageW(g_pChildWnd->hTreeWnd, TVM_GETNEXTITEM, TVGN_CARET, 0); > + SendMessageW(g_pChildWnd->hTreeWnd, TVM_EXPAND, TVE_TOGGLE, (LPARAM)selected); > + break; > + } Maybe it's better to name it ID_TREE_EXPAND_COLLAPSE, since it does not only expand.

2 1

Re: [PATCH] authz: document missorted function in specfile
by Alexandre Julliard 24 May '17

24 May '17

Austin English <austinenglish(a)gmail.com> writes: > Signed-off-by: Austin English <austinenglish(a)gmail.com> > --- > dlls/authz/authz.spec | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/dlls/authz/authz.spec b/dlls/authz/authz.spec > index eb9e044d2a..1e9edefc59 100644 > --- a/dlls/authz/authz.spec > +++ b/dlls/authz/authz.spec > @@ -35,6 +35,8 @@ > @ stub AuthziInitializeAuditQueue > @ stub AuthziInitializeContextFromSid > @ stub AuthziLogAuditEvent > +# AuthziModifyAuditEvent2 comes before AuthziModifyAuditEvent on native, > +# even though AuthzInitializeObjectAccessAuditEvent is before AuthzInitializeObjectAccessAuditEvent2 > @ stub AuthziModifyAuditEvent2 > @ stub AuthziModifyAuditEvent > @ stub AuthziModifyAuditEventType There are many functions that aren't sorted, I don't think this warrants a comment. If you have a script for this, you may want to maintain a list of exceptions inside the script instead. -- Alexandre Julliard julliard(a)winehq.org

3 4

Re: [PATCH] comctl32/listview: Do not select the first list item when drawing a marquee rectangle
by Nikolay Sivov 23 May '17

23 May '17

On 22.05.2017 16:02, Hugh McMaster wrote: > Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> > --- > dlls/comctl32/listview.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c > index c681451..a117f83 100644 > --- a/dlls/comctl32/listview.c > +++ b/dlls/comctl32/listview.c > @@ -3892,6 +3892,9 @@ static void LISTVIEW_MarqueeHighlight(LISTVIEW_INFO *infoPtr, const POINT *coord > if ((scroll & SCROLL_DOWN) && (coords_orig->y >= infoPtr->rcList.bottom)) > LISTVIEW_Scroll(infoPtr, 0, (coords_orig->y - infoPtr->rcList.bottom)); > > + if (IsRectEmpty(&infoPtr->marqueeRect)) > + infoPtr->marqueeRect = rect; > + > iterator_frameditems_absolute(&old_elems, infoPtr, &infoPtr->marqueeRect); > > infoPtr->marqueeRect = rect; > How can I reproduce this issue?

1 0

Re: [PATCH 2/2] d3d11/tests: Add additional test for occlusion query.
by Henri Verbeet 22 May '17

22 May '17

On 20 May 2017 at 14:12, Józef Kucia <jkucia(a)codeweavers.com> wrote: > + for (i = 0; i < 500; ++i) > + { > + if ((hr = ID3D11DeviceContext_GetData(context, query, NULL, 0, 0)) != S_FALSE) > + break; > + Sleep(10); > + } > + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); > + hr = ID3D11DeviceContext_GetData(context, query, &data, sizeof(data), 0); > + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); > + todo_wine ok(data.dword[0] == 0x1000 && !data.dword[1], > + "Got unexpected query result 0x%08x%08x.\n", data.dword[1], data.dword[0]); This fails about half of the time with csmt enabled: d3d11.c:4872: Test succeeded inside todo block: Got unexpected query result 0x0000000000001000.

2 2

Re: [PATCH 5/5] d2d1: Implement initial support for quadratic bezier outlines.
by Dmitry Timoshkov 22 May '17

22 May '17

Henri Verbeet <hverbeet(a)codeweavers.com> wrote: > +static void d2d_point_lerp(D2D1_POINT_2F *out, > + const D2D1_POINT_2F *a, const D2D1_POINT_2F *b, float t) > +{ > + out->x = a->x * (1.0f - t) + b->x * t; > + out->y = a->y * (1.0f - t) + b->y * t; > +} According to my investigation of a better bilinear blending (lerp) implementation the above formula is better to explicitely simplify to out->x = a->x + (b->x - a->x) * t; out->y = a->y + (b->y - a->y) * t; or even better to avoid floating point operations at all by replacing them either by fixed point math or a mmx/sse helper, which is able to considerably (x10) improve performance. -- Dmitry.

3 9

What is the best way to debug a freeze in wine?
by Derek Lesho 22 May '17

22 May '17

This is my first time posting in a mailing list, so if this is the wrong place to ask or I am doing something wrong, please tell me. Anyway, In wine 2.8, GTA-V is able to be run, however there is a major bug in which any key press will freeze the game for a few seconds. However, if you bind any actions to the mouse, say mouse4 or mouse5, the issue is not present. GTA-V has also worked for people using xbox 360 controllers. I have moderate programming knowledge, and I would like to find the source of this bug, however I have no found a good way to do it yet. I have tried winedbg, however when I get a backtrace of the process, there are atleast 50 threads running and I am unsure which one is locking up the game. I would use perf, however so far I haven't figured out how to make it tell me which functions are taking up most of the time. My question is, do any of you know of good tools/techniques that would help me debug this sort of problem? It would be greatly appreciated. P.S. for any of you who are also interested in this specific problem, many error messages are sent out at a very fast speed, but when the game is frozen due to this bug, all error messages temporarily halt with the exception of these two: fixme:keyboard:X11DRV_ActivateKeyboardLayout 0x4090409, 40000000: semi-stub! fixme:keyboard:X11DRV_ActivateKeyboardLayout flags 40000000 not supported Which are output a slow interval instead until the game unfreezes at which point the console output returns back to its normal sporadic behavior. Also, here is a normal backtrace from winedbg while the issue is occuring: http://paste.ubuntu.com/24539530/

2 1

Re: [PATCH 7/7] d3dx9/tests: Use static test blob in test_effect_preshader_ops().
by Matteo Bruni 22 May '17

22 May '17

2017-05-19 13:56 GMT+02:00 Paul Gofman <gofmanp(a)gmail.com>: Thanks, I do think this is an improvement compared to the old tests. A few comments below. > static const struct > { > - unsigned int pos; > + const char *mnem; > + unsigned int expected_result[4]; > unsigned int result_index; > - unsigned int ins_count; > + float *result; > + D3DXVECTOR4 opvect1, opvect2, opvect3; > + unsigned int ulps; > + BOOL todo[4]; > } I assume ulps and todo are there for future tests? > + for (j = 0; j < 4; ++j) > + { > + const float *v = op_tests[i].result; Can you put the initialization of 'v' outside of the inner loop? I'm sure the compiler sees the optimization and the generated code is ultimately the same (not that it would really matter for a test anyway...) but it seems a bit nicer to do that in the "correct" block. You could also call it "result" or similar. > + todo_wine_if(op_tests[i].todo[j]) > + ok(compare_float(v[j], ((float *)op_tests[i].expected_result)[j], op_tests[i].ulps), > + "Operation %s, component %u, expected %#x (%g), got %#x (%g).\n", op_tests[i].mnem, > + j, op_tests[i].expected_result[j], ((float *)op_tests[i].expected_result)[j], > + ((unsigned int *)v)[j], v[j]); Just an idea, maybe use %.8e to print the float values? Mostly for consistency with the usual d3d stuff, although in this case it doesn't matter much since you're also printing the bit encoding in hex. Also you can clean the ok() a bit by defining a "const float *expected_float;" variable (similarly to test_effect_preshader_relative_addressing()). BTW, notice that you're currently casting away const from v.

2 2

Re: [v2 2/2] d3d11/tests: Add tests for SM5 instructions gather4_c/gather4_po_c
by Henri Verbeet 22 May '17

22 May '17

On 19 May 2017 at 14:31, Sven Hesse <drmccoy(a)drmccoy.de> wrote: > Signed-off-by: Sven Hesse <drmccoy(a)drmccoy.de> > --- > dlls/d3d11/tests/d3d11.c | 230 +++++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 230 insertions(+) > This fails here: d3d11.c:19637: Test failed: Got {0.00000000e+00, 0.00000000e+00, 0.00000000e+00, 0.00000000e+00}, expected {0.00000000e+00, 1.00000000e+00, 0.00000000e+00, 0.00000000e+00}. d3d11.c:19637: Test failed: Got {0.00000000e+00, 0.00000000e+00, 0.00000000e+00, 0.00000000e+00}, expected {1.00000000e+00, 1.00000000e+00, 0.00000000e+00, 0.00000000e+00}. d3d11.c:19637: Test failed: Got {0.00000000e+00, 0.00000000e+00, 0.00000000e+00, 0.00000000e+00}, expected {1.00000000e+00, 1.00000000e+00, 0.00000000e+00, 0.00000000e+00}. d3d11.c:19637: Test failed: Got {0.00000000e+00, 0.00000000e+00, 0.00000000e+00, 0.00000000e+00}, expected {1.00000000e+00, 1.00000000e+00, 0.00000000e+00, 0.00000000e+00}. d3d11.c:19637: Test failed: Got {0.00000000e+00, 0.00000000e+00, 0.00000000e+00, 0.00000000e+00}, expected {1.00000000e+00, 1.00000000e+00, 1.00000000e+00, 0.00000000e+00}. d3d11.c:19637: Test failed: Got {0.00000000e+00, 0.00000000e+00, 0.00000000e+00, 0.00000000e+00}, expected {1.00000000e+00, 0.00000000e+00, 1.00000000e+00, 1.00000000e+00}. d3d11.c:19637: Test failed: Got {0.00000000e+00, 0.00000000e+00, 0.00000000e+00, 0.00000000e+00}, expected {0.00000000e+00, 0.00000000e+00, 1.00000000e+00, 1.00000000e+00}. d3d11.c:19637: Test failed: Got {0.00000000e+00, 0.00000000e+00, 0.00000000e+00, 0.00000000e+00}, expected {0.00000000e+00, 0.00000000e+00, 1.00000000e+00, 1.00000000e+00}. d3d11.c:19637: Test failed: Got {0.00000000e+00, 0.00000000e+00, 0.00000000e+00, 0.00000000e+00}, expected {0.00000000e+00, 0.00000000e+00, 1.00000000e+00, 1.00000000e+00}. d3d11.c:19637: Test failed: Got {0.00000000e+00, 0.00000000e+00, 0.00000000e+00, 0.00000000e+00}, expected {0.00000000e+00, 0.00000000e+00, 0.00000000e+00, 1.00000000e+00}. d3d11.c:19637: Test failed: Got {0.00000000e+00, 0.00000000e+00, 0.00000000e+00, 0.00000000e+00}, expected {0.00000000e+00, 1.00000000e+00, 0.00000000e+00, 0.00000000e+00}. d3d11.c:19637: Test failed: Got {0.00000000e+00, 0.00000000e+00, 0.00000000e+00, 0.00000000e+00}, expected {1.00000000e+00, 1.00000000e+00, 0.00000000e+00, 0.00000000e+00}. d3d11.c:19637: Test failed: Got {0.00000000e+00, 0.00000000e+00, 0.00000000e+00, 0.00000000e+00}, expected {0.00000000e+00, 1.00000000e+00, 1.00000000e+00, 0.00000000e+00}. d3d11.c:19637: Test failed: Got {0.00000000e+00, 0.00000000e+00, 0.00000000e+00, 0.00000000e+00}, expected {1.00000000e+00, 1.00000000e+00, 1.00000000e+00, 1.00000000e+00}. d3d11.c:19658: Test failed: Got {0.00000000e+00, 0.00000000e+00, 0.00000000e+00, 0.00000000e+00}, expected {1.00000000e+00, 0.00000000e+00, 1.00000000e+00, 1.00000000e+00}. d3d11.c:19658: Test failed: Got {0.00000000e+00, 0.00000000e+00, 0.00000000e+00, 0.00000000e+00}, expected {0.00000000e+00, 0.00000000e+00, 1.00000000e+00, 1.00000000e+00}. d3d11.c:19658: Test failed: Got {0.00000000e+00, 0.00000000e+00, 0.00000000e+00, 0.00000000e+00}, expected {0.00000000e+00, 0.00000000e+00, 1.00000000e+00, 1.00000000e+00}. d3d11.c:19658: Test failed: Got {0.00000000e+00, 0.00000000e+00, 0.00000000e+00, 0.00000000e+00}, expected {0.00000000e+00, 0.00000000e+00, 1.00000000e+00, 1.00000000e+00}. d3d11.c:19658: Test failed: Got {0.00000000e+00, 0.00000000e+00, 0.00000000e+00, 0.00000000e+00}, expected {0.00000000e+00, 0.00000000e+00, 0.00000000e+00, 1.00000000e+00}. d3d11.c:19658: Test failed: Got {0.00000000e+00, 0.00000000e+00, 0.00000000e+00, 0.00000000e+00}, expected {0.00000000e+00, 1.00000000e+00, 0.00000000e+00, 0.00000000e+00}. d3d11.c:19658: Test failed: Got {0.00000000e+00, 0.00000000e+00, 0.00000000e+00, 0.00000000e+00}, expected {1.00000000e+00, 1.00000000e+00, 0.00000000e+00, 0.00000000e+00}. d3d11.c:19658: Test failed: Got {0.00000000e+00, 0.00000000e+00, 0.00000000e+00, 0.00000000e+00}, expected {1.00000000e+00, 1.00000000e+00, 0.00000000e+00, 0.00000000e+00}. d3d11.c:19658: Test failed: Got {0.00000000e+00, 0.00000000e+00, 0.00000000e+00, 0.00000000e+00}, expected {0.00000000e+00, 1.00000000e+00, 1.00000000e+00, 0.00000000e+00}. d3d11.c:19658: Test failed: Got {0.00000000e+00, 0.00000000e+00, 0.00000000e+00, 0.00000000e+00}, expected {1.00000000e+00, 1.00000000e+00, 1.00000000e+00, 1.00000000e+00}. d3d11.c:19658: Test failed: Got {0.00000000e+00, 0.00000000e+00, 0.00000000e+00, 0.00000000e+00}, expected {1.00000000e+00, 1.00000000e+00, 1.00000000e+00, 1.00000000e+00}. d3d11.c:19658: Test failed: Got {0.00000000e+00, 0.00000000e+00, 0.00000000e+00, 0.00000000e+00}, expected {0.00000000e+00, 1.00000000e+00, 1.00000000e+00, 0.00000000e+00}. d3d11.c:19658: Test failed: Got {0.00000000e+00, 0.00000000e+00, 0.00000000e+00, 0.00000000e+00}, expected {1.00000000e+00, 1.00000000e+00, 1.00000000e+00, 1.00000000e+00}. d3d11.c:19658: Test failed: Got {0.00000000e+00, 0.00000000e+00, 0.00000000e+00, 0.00000000e+00}, expected {1.00000000e+00, 1.00000000e+00, 1.00000000e+00, 1.00000000e+00}.

2 2

Re: [PATCH 1/2] kernel32/tests: Added more PeedNamedPipe tests.
by Marvin 22 May '17

22 May '17

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=31084 Your paranoid android. === w7u (32 bit pipe) === pipe.c:2631: Test failed: FlushFileBuffers failed: 0

1 0

D3D command stream patches for testing
by A.S. 21 May '17

21 May '17

Hello, I have low frame rate (~16-18) problem in Unreal Tournament 3, wine 2.8. "stat fps", "stat ld" commands were enabled in game console and showed relation that fps drop after 'static mesh tris' goes higher than >200 000 So I applied patchset from https://www.winehq.org/pipermail/wine-devel/2013-September/101116.html to wine 1.7 with CXXFLAGS -o3 -m native, and tested it. Yes, finnaly my fps imroves to ~30 on same maps where it was lower before. Thank you Stefan. same issue was reported by many unreal engine 3 players on windows, so AFAIK this could be ue3 problem itself. the patchset could be step in right direction, or workaround, but not a total fix, cuz even minimal ~30 frame rate is lower than expected on Core2Duo, gf GTS450, when other games works better. Thanks, Lex.

1 0

Re: [PATCH 2/2] kernel32/tests: Test bytes left in PeekNamedPipe().
by Marvin 21 May '17

21 May '17

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=31073 Your paranoid android. === wvistau64 (64 bit pipe) === pipe.c:356: Test failed: peek3 got -21 bytes left pipe.c:395: Test failed: peek4 got -21 bytes left === w2008s64 (64 bit pipe) === pipe.c:356: Test failed: peek3 got -21 bytes left pipe.c:395: Test failed: peek4 got -21 bytes left === w7pro64 (64 bit pipe) === pipe.c:356: Test failed: peek3 got -21 bytes left pipe.c:395: Test failed: peek4 got -21 bytes left === w864 (64 bit pipe) === pipe.c:356: Test failed: peek3 got -21 bytes left pipe.c:395: Test failed: peek4 got -21 bytes left === w1064 (64 bit pipe) === pipe.c:356: Test failed: peek3 got -21 bytes left pipe.c:395: Test failed: peek4 got -21 bytes left

3 2

Re: [PATCH] wined3d: Add Brian Paul recognize code
by Henri Verbeet 19 May '17

19 May '17

On 16 May 2017 at 16:09, Jarkko Korpi <jarkko_korpi(a)hotmail.com> wrote: > This is for bug #42538 > As explained in that bug, I don't object to adding this in principle, but would still like to see how this can be triggered in practice.

1 0

Re: [PATCH V3] wined3d: Add more gl_vendor_string codes for amd cards
by Henri Verbeet 19 May '17

19 May '17

On 16 May 2017 at 15:58, Jarkko Korpi <jarkko_korpi(a)hotmail.com> wrote: > @@ -1815,7 +1815,9 @@ static enum wined3d_pci_vendor wined3d_guess_card_vendor(const char *gl_vendor_s > || strstr(gl_renderer, "R200") > || strstr(gl_renderer, "R300") > || strstr(gl_renderer, "R600") > - || strstr(gl_renderer, "R700")) > + || strstr(gl_renderer, "R700") > + || strstr(gl_renderer, "R800") > + || strstr(gl_renderer, "R900")) Which driver reports these? Please use git send-email for submitting patches.

1 0

Re: [PATCH 6/8] wined3d: Generate code for hull shaders.
by Henri Verbeet 19 May '17

19 May '17

On 18 May 2017 at 15:19, Józef Kucia <jkucia(a)codeweavers.com> wrote: > @@ -228,6 +228,7 @@ struct glsl_shader_prog_link > { > struct wine_rb_entry program_lookup_entry; > struct glsl_vs_program vs; > + struct glsl_vs_program hs; Is that intentional?

2 1

Re: [2/2] d3d11/tests: Add tests for SM5 instructions gather4_c/gather4_po_c
by Józef Kucia 19 May '17

19 May '17

On Fri, May 19, 2017 at 2:50 AM, Sven Hesse <drmccoy(a)drmccoy.de> wrote: > + if (!init_test_context(&test_context, NULL)) > + return; > + > + device = test_context.device; > + context = test_context.immediate_context; > + > + if (ID3D11Device_GetFeatureLevel(device) < D3D_FEATURE_LEVEL_11_0) > + { > + skip("Shader model 5 required for gather4_c/gather4_po_c.\n"); > + release_test_context(&test_context); > + return; > + } You should just pass the feature level to init_test_context(), and it will skip the test for you. > + > + texture_desc.Format = DXGI_FORMAT_D32_FLOAT; > + texture_desc.BindFlags = D3D11_BIND_SHADER_RESOURCE; > + hr = ID3D11Device_CreateTexture2D(device, &texture_desc, &resource_data, &texture); > + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); > + hr = ID3D11Device_CreateShaderResourceView(device, (ID3D11Resource *)texture, NULL, &srv); The D32_FLOAT format cannot be used as SRV. You have to create the texture with format DXGI_FORMAT_R32_TYPELESS, and then use DXGI_FORMAT_R32_FLOAT for SRV. I think it may be interesting to test with D3D11_BIND_DEPTH_STENCIL and without D3D11_BIND_DEPTH_STENCIL because wined3d behaves a bit differently when depth stencil is enabled. > + ok(SUCCEEDED(hr), "Fialed to create shader resource view, hr %#x.\n", hr); Typo. > + ID3D11DeviceContext_PSSetSamplers(context, 0, 1, &sampler); You don't need to set samplers multiple times. It can be done once, after the sampler state is created.

1 0

Re: [1/2] wined3d: Implement SM5 gather4_po_c opcode.
by Józef Kucia 19 May '17

19 May '17

On Fri, May 19, 2017 at 2:50 AM, Sven Hesse <drmccoy(a)drmccoy.de> wrote: > - resource_param_idx = ins->handler_idx == WINED3DSIH_GATHER4_PO ? 2 : 1; > + resource_param_idx = (ins->handler_idx == WINED3DSIH_GATHER4_PO || ins->handler_idx == WINED3DSIH_GATHER4_PO_C) ? 2 : 1; Please avoid lines longer than 120 characters in D3D code. > resource_idx = ins->src[resource_param_idx].reg.idx[0].offset; > sampler_idx = ins->src[resource_param_idx + 1].reg.idx[0].offset; > component_idx = shader_glsl_swizzle_get_component(ins->src[resource_param_idx + 1].swizzle, 0); > @@ -5878,8 +5879,12 @@ static void shader_glsl_gather4(const struct wined3d_shader_instruction *ins) > { > shader_glsl_add_src_param(ins, &ins->src[3], WINED3DSP_WRITEMASK_0, &compare_param); > shader_addline(buffer, ", %s", compare_param.param_str); > + } else if (ins->handler_idx == WINED3DSIH_GATHER4_PO_C) > + { > + shader_glsl_add_src_param(ins, &ins->src[4], WINED3DSP_WRITEMASK_0, &compare_param); > + shader_addline(buffer, ", %s", compare_param.param_str); Please put the closing bracket on its own line in order to match existing D3D coding style. Also, you may merge "if" statements: if (ins->handler_idx == WINED3DSIH_GATHER4_C || ins->handler_idx == WINED3DSIH_GATHER4_PO_C) { shader_glsl_add_src_param(ins, &ins->src[resource_param_idx + 2], WINED3DSP_WRITEMASK_0, &compare_param); shader_addline(buffer, ", %s", compare_param.param_str); } > - else if (ins.handler_idx == WINED3DSIH_GATHER4_PO) > + else if (ins.handler_idx == WINED3DSIH_GATHER4_PO > + || ins.handler_idx == WINED3DSIH_GATHER4_PO_C) > + > { Please remove the empty line.

1 0

Re: Alexandre Julliard : gdi32: Return more meaningful data in the null driver GetDeviceCaps implementation.
by Dmitry Timoshkov 19 May '17

19 May '17

Alexandre Julliard <julliard(a)winehq.org> wrote: > + case BITSPIXEL: return 32; Shouldn't BITSPIXEL be also fetched from dev->hdc like the values below? > + case NUMCOLORS: > + bpp = GetDeviceCaps( dev->hdc, BITSPIXEL ); > + return (bpp > 8) ? -1 : (1 << bpp); > + case COLORRES: > + /* The observed correspondence between BITSPIXEL and COLORRES is: > + * BITSPIXEL: 8 -> COLORRES: 18 > + * BITSPIXEL: 16 -> COLORRES: 16 > + * BITSPIXEL: 24 -> COLORRES: 24 > + * BITSPIXEL: 32 -> COLORRES: 24 */ > + bpp = GetDeviceCaps( dev->hdc, BITSPIXEL ); > + return (bpp <= 8) ? 18 : min( 24, bpp ); -- Dmitry.

2 3

Re: [PATCH 1/3] msvcp: Implement the wchar version of _Open_dir.
by Piotr Caban 19 May '17

19 May '17

Hi Stefan, On 05/18/17 13:33, Stefan Dösinger wrote: > +/* ??_Open_dir@sys@tr2@std@@YAPAXPA_WPB_WAAHAAW4file_type@123@@Z */ > +/* ??_Open_dir@sys@tr2@std@@YAPEAXPEA_WPEB_WAEAHAEAW4file_type@123@@Z */ > +void* __cdecl tr2_sys__Open_dir_wchar(wchar_t* target, wchar_t const* dest, int* err_code, enum file_type* type) > { > HANDLE handle; > - WIN32_FIND_DATAA data; > - char temppath[MAX_PATH]; > - > - TRACE("(%p %s %p %p)\n", target, debugstr_a(dest), err_code, type); > - if(strlen(dest) > MAX_PATH - 3) { > + WIN32_FIND_DATAW data; > + wchar_t temppath[MAX_PATH]; > + static const wchar_t dot[] = {'.', 0}; > + static const wchar_t dotdot[] = {'.', '.', 0}; > + static const wchar_t asterisk[] = {'\\', '*', 0}; > + > + TRACE("(%p %s %p %p)\n", target, debugstr_w(dest), err_code, type); > + if(wcslen(dest) > MAX_PATH - 3) { > *err_code = ERROR_BAD_PATHNAME; > return NULL; > } Could you please check if there really is such a length limit in wchar version of the function? > > +/* ?_Open_dir@sys@tr2@std@@YAPAXAAY0BAE@DPBDAAHAAW4file_type@123@@Z */ > +/* ?_Open_dir@sys@tr2@std@@YAPEAXAEAY0BAE@DPEBDAEAHAEAW4file_type@123@@Z */ > +void* __cdecl tr2_sys__Open_dir(char* target, char const* dest, int* err_code, enum file_type* type) > +{ > + void *handle; > + size_t len; > + wchar_t target_w[MAX_PATH]; > + wchar_t *dest_w = NULL; > + > + TRACE("(%p %s %p %p)\n", target, debugstr_a(dest), err_code, type); > + > + if (dest) > + { > + len = strlen(dest) + 1; > + dest_w = malloc(sizeof(*dest_w) * len); You don't need to allocate dest_w dynamically. Its length is limited to ~MAX_PATH anyway. Thanks, Piotr

2 6

Re: [2/2] d3d11/tests: Add tests for SM5 instructions gather4_c/gather4_po_c
by Marvin 19 May '17

19 May '17

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=31043 Your paranoid android. === w7u (32 bit d3d11) === d3d11.c:19621: Test failed: Failed to create texture, hr 0x80070057. d3d11.c:19623: Test failed: Fialed to create shader resource view, hr 0x80070057. d3d11.c:19648: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {0.00000000e+000, 1.00000000e+000, 0.00000000e+000, 0.00000000e+000}. d3d11.c:19648: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {1.00000000e+000, 1.00000000e+000, 0.00000000e+000, 0.00000000e+000}. d3d11.c:19648: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {1.00000000e+000, 1.00000000e+000, 0.00000000e+000, 0.00000000e+000}. d3d11.c:19648: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {1.00000000e+000, 1.00000000e+000, 0.00000000e+000, 0.00000000e+000}. d3d11.c:19648: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {1.00000000e+000, 1.00000000e+000, 1.00000000e+000, 0.00000000e+000}. d3d11.c:19648: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {1.00000000e+000, 0.00000000e+000, 1.00000000e+000, 1.00000000e+000}. d3d11.c:19648: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {0.00000000e+000, 0.00000000e+000, 1.00000000e+000, 1.00000000e+000}. d3d11.c:19648: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {0.00000000e+000, 0.00000000e+000, 1.00000000e+000, 1.00000000e+000}. d3d11.c:19648: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {0.00000000e+000, 0.00000000e+000, 1.00000000e+000, 1.00000000e+000}. d3d11.c:19648: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 1.00000000e+000}. d3d11.c:19648: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {0.00000000e+000, 1.00000000e+000, 0.00000000e+000, 0.00000000e+000}. d3d11.c:19648: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {1.00000000e+000, 1.00000000e+000, 0.00000000e+000, 0.00000000e+000}. d3d11.c:19648: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {0.00000000e+000, 1.00000000e+000, 1.00000000e+000, 0.00000000e+000}. d3d11.c:19648: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {1.00000000e+000, 1.00000000e+000, 1.00000000e+000, 1.00000000e+000}. d3d11.c:19670: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {1.00000000e+000, 0.00000000e+000, 1.00000000e+000, 1.00000000e+000}. d3d11.c:19670: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {0.00000000e+000, 0.00000000e+000, 1.00000000e+000, 1.00000000e+000}. d3d11.c:19670: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {0.00000000e+000, 0.00000000e+000, 1.00000000e+000, 1.00000000e+000}. d3d11.c:19670: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {0.00000000e+000, 0.00000000e+000, 1.00000000e+000, 1.00000000e+000}. d3d11.c:19670: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 1.00000000e+000}. d3d11.c:19670: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {0.00000000e+000, 1.00000000e+000, 0.00000000e+000, 0.00000000e+000}. d3d11.c:19670: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {1.00000000e+000, 1.00000000e+000, 0.00000000e+000, 0.00000000e+000}. d3d11.c:19670: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {1.00000000e+000, 1.00000000e+000, 0.00000000e+000, 0.00000000e+000}. d3d11.c:19670: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {0.00000000e+000, 1.00000000e+000, 1.00000000e+000, 0.00000000e+000}. d3d11.c:19670: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {1.00000000e+000, 1.00000000e+000, 1.00000000e+000, 1.00000000e+000}. d3d11.c:19670: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {1.00000000e+000, 1.00000000e+000, 1.00000000e+000, 1.00000000e+000}. d3d11.c:19670: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {0.00000000e+000, 1.00000000e+000, 1.00000000e+000, 0.00000000e+000}. d3d11.c:19670: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {1.00000000e+000, 1.00000000e+000, 1.00000000e+000, 1.00000000e+000}. d3d11.c:19670: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {1.00000000e+000, 1.00000000e+000, 1.00000000e+000, 1.00000000e+000}. 094c:d3d11: unhandled exception c0000005 at 00413F16 === w7pro64 (32 bit d3d11) === d3d11.c:19621: Test failed: Failed to create texture, hr 0x80070057. d3d11.c:19623: Test failed: Fialed to create shader resource view, hr 0x80070057. d3d11.c:19648: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {0.00000000e+000, 1.00000000e+000, 0.00000000e+000, 0.00000000e+000}. d3d11.c:19648: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {1.00000000e+000, 1.00000000e+000, 0.00000000e+000, 0.00000000e+000}. d3d11.c:19648: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {1.00000000e+000, 1.00000000e+000, 0.00000000e+000, 0.00000000e+000}. d3d11.c:19648: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {1.00000000e+000, 1.00000000e+000, 0.00000000e+000, 0.00000000e+000}. d3d11.c:19648: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {1.00000000e+000, 1.00000000e+000, 1.00000000e+000, 0.00000000e+000}. d3d11.c:19648: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {1.00000000e+000, 0.00000000e+000, 1.00000000e+000, 1.00000000e+000}. d3d11.c:19648: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {0.00000000e+000, 0.00000000e+000, 1.00000000e+000, 1.00000000e+000}. d3d11.c:19648: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {0.00000000e+000, 0.00000000e+000, 1.00000000e+000, 1.00000000e+000}. d3d11.c:19648: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {0.00000000e+000, 0.00000000e+000, 1.00000000e+000, 1.00000000e+000}. d3d11.c:19648: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 1.00000000e+000}. d3d11.c:19648: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {0.00000000e+000, 1.00000000e+000, 0.00000000e+000, 0.00000000e+000}. d3d11.c:19648: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {1.00000000e+000, 1.00000000e+000, 0.00000000e+000, 0.00000000e+000}. d3d11.c:19648: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {0.00000000e+000, 1.00000000e+000, 1.00000000e+000, 0.00000000e+000}. d3d11.c:19648: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {1.00000000e+000, 1.00000000e+000, 1.00000000e+000, 1.00000000e+000}. d3d11.c:19670: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {1.00000000e+000, 0.00000000e+000, 1.00000000e+000, 1.00000000e+000}. d3d11.c:19670: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {0.00000000e+000, 0.00000000e+000, 1.00000000e+000, 1.00000000e+000}. d3d11.c:19670: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {0.00000000e+000, 0.00000000e+000, 1.00000000e+000, 1.00000000e+000}. d3d11.c:19670: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {0.00000000e+000, 0.00000000e+000, 1.00000000e+000, 1.00000000e+000}. d3d11.c:19670: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 1.00000000e+000}. d3d11.c:19670: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {0.00000000e+000, 1.00000000e+000, 0.00000000e+000, 0.00000000e+000}. d3d11.c:19670: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {1.00000000e+000, 1.00000000e+000, 0.00000000e+000, 0.00000000e+000}. d3d11.c:19670: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {1.00000000e+000, 1.00000000e+000, 0.00000000e+000, 0.00000000e+000}. d3d11.c:19670: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {0.00000000e+000, 1.00000000e+000, 1.00000000e+000, 0.00000000e+000}. d3d11.c:19670: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {1.00000000e+000, 1.00000000e+000, 1.00000000e+000, 1.00000000e+000}. d3d11.c:19670: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {1.00000000e+000, 1.00000000e+000, 1.00000000e+000, 1.00000000e+000}. d3d11.c:19670: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {0.00000000e+000, 1.00000000e+000, 1.00000000e+000, 0.00000000e+000}. d3d11.c:19670: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {1.00000000e+000, 1.00000000e+000, 1.00000000e+000, 1.00000000e+000}. d3d11.c:19670: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {1.00000000e+000, 1.00000000e+000, 1.00000000e+000, 1.00000000e+000}. 07e0:d3d11: unhandled exception c0000005 at 00413F16 === w8 (32 bit d3d11) === d3d11.c:19621: Test failed: Failed to create texture, hr 0x80070057. d3d11.c:19623: Test failed: Fialed to create shader resource view, hr 0x80070057. d3d11.c:19648: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {0.00000000e+000, 1.00000000e+000, 0.00000000e+000, 0.00000000e+000}. d3d11.c:19648: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {1.00000000e+000, 1.00000000e+000, 0.00000000e+000, 0.00000000e+000}. d3d11.c:19648: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {1.00000000e+000, 1.00000000e+000, 0.00000000e+000, 0.00000000e+000}. d3d11.c:19648: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {1.00000000e+000, 1.00000000e+000, 0.00000000e+000, 0.00000000e+000}. d3d11.c:19648: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {1.00000000e+000, 1.00000000e+000, 1.00000000e+000, 0.00000000e+000}. d3d11.c:19648: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {1.00000000e+000, 0.00000000e+000, 1.00000000e+000, 1.00000000e+000}. d3d11.c:19648: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {0.00000000e+000, 0.00000000e+000, 1.00000000e+000, 1.00000000e+000}. d3d11.c:19648: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {0.00000000e+000, 0.00000000e+000, 1.00000000e+000, 1.00000000e+000}. d3d11.c:19648: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {0.00000000e+000, 0.00000000e+000, 1.00000000e+000, 1.00000000e+000}. d3d11.c:19648: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 1.00000000e+000}. d3d11.c:19648: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {0.00000000e+000, 1.00000000e+000, 0.00000000e+000, 0.00000000e+000}. d3d11.c:19648: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {1.00000000e+000, 1.00000000e+000, 0.00000000e+000, 0.00000000e+000}. d3d11.c:19648: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {0.00000000e+000, 1.00000000e+000, 1.00000000e+000, 0.00000000e+000}. d3d11.c:19648: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {1.00000000e+000, 1.00000000e+000, 1.00000000e+000, 1.00000000e+000}. d3d11.c:19670: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {1.00000000e+000, 0.00000000e+000, 1.00000000e+000, 1.00000000e+000}. d3d11.c:19670: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {0.00000000e+000, 0.00000000e+000, 1.00000000e+000, 1.00000000e+000}. d3d11.c:19670: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {0.00000000e+000, 0.00000000e+000, 1.00000000e+000, 1.00000000e+000}. d3d11.c:19670: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {0.00000000e+000, 0.00000000e+000, 1.00000000e+000, 1.00000000e+000}. d3d11.c:19670: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 1.00000000e+000}. d3d11.c:19670: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {0.00000000e+000, 1.00000000e+000, 0.00000000e+000, 0.00000000e+000}. d3d11.c:19670: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {1.00000000e+000, 1.00000000e+000, 0.00000000e+000, 0.00000000e+000}. d3d11.c:19670: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {1.00000000e+000, 1.00000000e+000, 0.00000000e+000, 0.00000000e+000}. d3d11.c:19670: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {0.00000000e+000, 1.00000000e+000, 1.00000000e+000, 0.00000000e+000}. d3d11.c:19670: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {1.00000000e+000, 1.00000000e+000, 1.00000000e+000, 1.00000000e+000}. d3d11.c:19670: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {1.00000000e+000, 1.00000000e+000, 1.00000000e+000, 1.00000000e+000}. d3d11.c:19670: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {0.00000000e+000, 1.00000000e+000, 1.00000000e+000, 0.00000000e+000}. d3d11.c:19670: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {1.00000000e+000, 1.00000000e+000, 1.00000000e+000, 1.00000000e+000}. d3d11.c:19670: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {1.00000000e+000, 1.00000000e+000, 1.00000000e+000, 1.00000000e+000}. 0fd0:d3d11: unhandled exception c0000005 at 00413F16 === w864 (32 bit d3d11) === d3d11.c:19621: Test failed: Failed to create texture, hr 0x80070057. d3d11.c:19623: Test failed: Fialed to create shader resource view, hr 0x80070057. d3d11.c:19648: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {0.00000000e+000, 1.00000000e+000, 0.00000000e+000, 0.00000000e+000}. d3d11.c:19648: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {1.00000000e+000, 1.00000000e+000, 0.00000000e+000, 0.00000000e+000}. d3d11.c:19648: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {1.00000000e+000, 1.00000000e+000, 0.00000000e+000, 0.00000000e+000}. d3d11.c:19648: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {1.00000000e+000, 1.00000000e+000, 0.00000000e+000, 0.00000000e+000}. d3d11.c:19648: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {1.00000000e+000, 1.00000000e+000, 1.00000000e+000, 0.00000000e+000}. d3d11.c:19648: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {1.00000000e+000, 0.00000000e+000, 1.00000000e+000, 1.00000000e+000}. d3d11.c:19648: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {0.00000000e+000, 0.00000000e+000, 1.00000000e+000, 1.00000000e+000}. d3d11.c:19648: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {0.00000000e+000, 0.00000000e+000, 1.00000000e+000, 1.00000000e+000}. d3d11.c:19648: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {0.00000000e+000, 0.00000000e+000, 1.00000000e+000, 1.00000000e+000}. d3d11.c:19648: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 1.00000000e+000}. d3d11.c:19648: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {0.00000000e+000, 1.00000000e+000, 0.00000000e+000, 0.00000000e+000}. d3d11.c:19648: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {1.00000000e+000, 1.00000000e+000, 0.00000000e+000, 0.00000000e+000}. d3d11.c:19648: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {0.00000000e+000, 1.00000000e+000, 1.00000000e+000, 0.00000000e+000}. d3d11.c:19648: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {1.00000000e+000, 1.00000000e+000, 1.00000000e+000, 1.00000000e+000}. d3d11.c:19670: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {1.00000000e+000, 0.00000000e+000, 1.00000000e+000, 1.00000000e+000}. d3d11.c:19670: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {0.00000000e+000, 0.00000000e+000, 1.00000000e+000, 1.00000000e+000}. d3d11.c:19670: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {0.00000000e+000, 0.00000000e+000, 1.00000000e+000, 1.00000000e+000}. d3d11.c:19670: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {0.00000000e+000, 0.00000000e+000, 1.00000000e+000, 1.00000000e+000}. d3d11.c:19670: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 1.00000000e+000}. d3d11.c:19670: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {0.00000000e+000, 1.00000000e+000, 0.00000000e+000, 0.00000000e+000}. d3d11.c:19670: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {1.00000000e+000, 1.00000000e+000, 0.00000000e+000, 0.00000000e+000}. d3d11.c:19670: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {1.00000000e+000, 1.00000000e+000, 0.00000000e+000, 0.00000000e+000}. d3d11.c:19670: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {0.00000000e+000, 1.00000000e+000, 1.00000000e+000, 0.00000000e+000}. d3d11.c:19670: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {1.00000000e+000, 1.00000000e+000, 1.00000000e+000, 1.00000000e+000}. d3d11.c:19670: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {1.00000000e+000, 1.00000000e+000, 1.00000000e+000, 1.00000000e+000}. d3d11.c:19670: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {0.00000000e+000, 1.00000000e+000, 1.00000000e+000, 0.00000000e+000}. d3d11.c:19670: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {1.00000000e+000, 1.00000000e+000, 1.00000000e+000, 1.00000000e+000}. d3d11.c:19670: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {1.00000000e+000, 1.00000000e+000, 1.00000000e+000, 1.00000000e+000}. 08b0:d3d11: unhandled exception c0000005 at 00413F16 === w1064 (32 bit d3d11) === d3d11.c:19621: Test failed: Failed to create texture, hr 0x80070057. d3d11.c:19623: Test failed: Fialed to create shader resource view, hr 0x80070057. d3d11.c:19648: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {0.00000000e+000, 1.00000000e+000, 0.00000000e+000, 0.00000000e+000}. d3d11.c:19648: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {1.00000000e+000, 1.00000000e+000, 0.00000000e+000, 0.00000000e+000}. d3d11.c:19648: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {1.00000000e+000, 1.00000000e+000, 0.00000000e+000, 0.00000000e+000}. d3d11.c:19648: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {1.00000000e+000, 1.00000000e+000, 0.00000000e+000, 0.00000000e+000}. d3d11.c:19648: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {1.00000000e+000, 1.00000000e+000, 1.00000000e+000, 0.00000000e+000}. d3d11.c:19648: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {1.00000000e+000, 0.00000000e+000, 1.00000000e+000, 1.00000000e+000}. d3d11.c:19648: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {0.00000000e+000, 0.00000000e+000, 1.00000000e+000, 1.00000000e+000}. d3d11.c:19648: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {0.00000000e+000, 0.00000000e+000, 1.00000000e+000, 1.00000000e+000}. d3d11.c:19648: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {0.00000000e+000, 0.00000000e+000, 1.00000000e+000, 1.00000000e+000}. d3d11.c:19648: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 1.00000000e+000}. d3d11.c:19648: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {0.00000000e+000, 1.00000000e+000, 0.00000000e+000, 0.00000000e+000}. d3d11.c:19648: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {1.00000000e+000, 1.00000000e+000, 0.00000000e+000, 0.00000000e+000}. d3d11.c:19648: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {0.00000000e+000, 1.00000000e+000, 1.00000000e+000, 0.00000000e+000}. d3d11.c:19648: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {1.00000000e+000, 1.00000000e+000, 1.00000000e+000, 1.00000000e+000}. d3d11.c:19670: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {1.00000000e+000, 0.00000000e+000, 1.00000000e+000, 1.00000000e+000}. d3d11.c:19670: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {0.00000000e+000, 0.00000000e+000, 1.00000000e+000, 1.00000000e+000}. d3d11.c:19670: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {0.00000000e+000, 0.00000000e+000, 1.00000000e+000, 1.00000000e+000}. d3d11.c:19670: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {0.00000000e+000, 0.00000000e+000, 1.00000000e+000, 1.00000000e+000}. d3d11.c:19670: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 1.00000000e+000}. d3d11.c:19670: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {0.00000000e+000, 1.00000000e+000, 0.00000000e+000, 0.00000000e+000}. d3d11.c:19670: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {1.00000000e+000, 1.00000000e+000, 0.00000000e+000, 0.00000000e+000}. d3d11.c:19670: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {1.00000000e+000, 1.00000000e+000, 0.00000000e+000, 0.00000000e+000}. d3d11.c:19670: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {0.00000000e+000, 1.00000000e+000, 1.00000000e+000, 0.00000000e+000}. d3d11.c:19670: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {1.00000000e+000, 1.00000000e+000, 1.00000000e+000, 1.00000000e+000}. d3d11.c:19670: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {1.00000000e+000, 1.00000000e+000, 1.00000000e+000, 1.00000000e+000}. d3d11.c:19670: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {0.00000000e+000, 1.00000000e+000, 1.00000000e+000, 0.00000000e+000}. d3d11.c:19670: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {1.00000000e+000, 1.00000000e+000, 1.00000000e+000, 1.00000000e+000}. d3d11.c:19670: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {1.00000000e+000, 1.00000000e+000, 1.00000000e+000, 1.00000000e+000}. 0db0:d3d11: unhandled exception c0000005 at 00413F16 === w7pro64 (64 bit d3d11) === d3d11.c:19621: Test failed: Failed to create texture, hr 0x80070057. d3d11.c:19623: Test failed: Fialed to create shader resource view, hr 0x80070057. d3d11.c:19648: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {0.00000000e+000, 1.00000000e+000, 0.00000000e+000, 0.00000000e+000}. d3d11.c:19648: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {1.00000000e+000, 1.00000000e+000, 0.00000000e+000, 0.00000000e+000}. d3d11.c:19648: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {1.00000000e+000, 1.00000000e+000, 0.00000000e+000, 0.00000000e+000}. d3d11.c:19648: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {1.00000000e+000, 1.00000000e+000, 0.00000000e+000, 0.00000000e+000}. d3d11.c:19648: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {1.00000000e+000, 1.00000000e+000, 1.00000000e+000, 0.00000000e+000}. d3d11.c:19648: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {1.00000000e+000, 0.00000000e+000, 1.00000000e+000, 1.00000000e+000}. d3d11.c:19648: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {0.00000000e+000, 0.00000000e+000, 1.00000000e+000, 1.00000000e+000}. d3d11.c:19648: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {0.00000000e+000, 0.00000000e+000, 1.00000000e+000, 1.00000000e+000}. d3d11.c:19648: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {0.00000000e+000, 0.00000000e+000, 1.00000000e+000, 1.00000000e+000}. d3d11.c:19648: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 1.00000000e+000}. d3d11.c:19648: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {0.00000000e+000, 1.00000000e+000, 0.00000000e+000, 0.00000000e+000}. d3d11.c:19648: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {1.00000000e+000, 1.00000000e+000, 0.00000000e+000, 0.00000000e+000}. d3d11.c:19648: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {0.00000000e+000, 1.00000000e+000, 1.00000000e+000, 0.00000000e+000}. d3d11.c:19648: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {1.00000000e+000, 1.00000000e+000, 1.00000000e+000, 1.00000000e+000}. d3d11.c:19670: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {1.00000000e+000, 0.00000000e+000, 1.00000000e+000, 1.00000000e+000}. d3d11.c:19670: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {0.00000000e+000, 0.00000000e+000, 1.00000000e+000, 1.00000000e+000}. d3d11.c:19670: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {0.00000000e+000, 0.00000000e+000, 1.00000000e+000, 1.00000000e+000}. d3d11.c:19670: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {0.00000000e+000, 0.00000000e+000, 1.00000000e+000, 1.00000000e+000}. d3d11.c:19670: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 1.00000000e+000}. d3d11.c:19670: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {0.00000000e+000, 1.00000000e+000, 0.00000000e+000, 0.00000000e+000}. d3d11.c:19670: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {1.00000000e+000, 1.00000000e+000, 0.00000000e+000, 0.00000000e+000}. d3d11.c:19670: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {1.00000000e+000, 1.00000000e+000, 0.00000000e+000, 0.00000000e+000}. d3d11.c:19670: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {0.00000000e+000, 1.00000000e+000, 1.00000000e+000, 0.00000000e+000}. d3d11.c:19670: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {1.00000000e+000, 1.00000000e+000, 1.00000000e+000, 1.00000000e+000}. d3d11.c:19670: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {1.00000000e+000, 1.00000000e+000, 1.00000000e+000, 1.00000000e+000}. d3d11.c:19670: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {0.00000000e+000, 1.00000000e+000, 1.00000000e+000, 0.00000000e+000}. d3d11.c:19670: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {1.00000000e+000, 1.00000000e+000, 1.00000000e+000, 1.00000000e+000}. d3d11.c:19670: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {1.00000000e+000, 1.00000000e+000, 1.00000000e+000, 1.00000000e+000}. 0854:d3d11: unhandled exception c0000005 at 0000000000412BB7 === w864 (64 bit d3d11) === d3d11.c:19621: Test failed: Failed to create texture, hr 0x80070057. d3d11.c:19623: Test failed: Fialed to create shader resource view, hr 0x80070057. d3d11.c:19648: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {0.00000000e+000, 1.00000000e+000, 0.00000000e+000, 0.00000000e+000}. d3d11.c:19648: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {1.00000000e+000, 1.00000000e+000, 0.00000000e+000, 0.00000000e+000}. d3d11.c:19648: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {1.00000000e+000, 1.00000000e+000, 0.00000000e+000, 0.00000000e+000}. d3d11.c:19648: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {1.00000000e+000, 1.00000000e+000, 0.00000000e+000, 0.00000000e+000}. d3d11.c:19648: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {1.00000000e+000, 1.00000000e+000, 1.00000000e+000, 0.00000000e+000}. d3d11.c:19648: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {1.00000000e+000, 0.00000000e+000, 1.00000000e+000, 1.00000000e+000}. d3d11.c:19648: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {0.00000000e+000, 0.00000000e+000, 1.00000000e+000, 1.00000000e+000}. d3d11.c:19648: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {0.00000000e+000, 0.00000000e+000, 1.00000000e+000, 1.00000000e+000}. d3d11.c:19648: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {0.00000000e+000, 0.00000000e+000, 1.00000000e+000, 1.00000000e+000}. d3d11.c:19648: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 1.00000000e+000}. d3d11.c:19648: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {0.00000000e+000, 1.00000000e+000, 0.00000000e+000, 0.00000000e+000}. d3d11.c:19648: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {1.00000000e+000, 1.00000000e+000, 0.00000000e+000, 0.00000000e+000}. d3d11.c:19648: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {0.00000000e+000, 1.00000000e+000, 1.00000000e+000, 0.00000000e+000}. d3d11.c:19648: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {1.00000000e+000, 1.00000000e+000, 1.00000000e+000, 1.00000000e+000}. d3d11.c:19670: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {1.00000000e+000, 0.00000000e+000, 1.00000000e+000, 1.00000000e+000}. d3d11.c:19670: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {0.00000000e+000, 0.00000000e+000, 1.00000000e+000, 1.00000000e+000}. d3d11.c:19670: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {0.00000000e+000, 0.00000000e+000, 1.00000000e+000, 1.00000000e+000}. d3d11.c:19670: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {0.00000000e+000, 0.00000000e+000, 1.00000000e+000, 1.00000000e+000}. d3d11.c:19670: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 1.00000000e+000}. d3d11.c:19670: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {0.00000000e+000, 1.00000000e+000, 0.00000000e+000, 0.00000000e+000}. d3d11.c:19670: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {1.00000000e+000, 1.00000000e+000, 0.00000000e+000, 0.00000000e+000}. d3d11.c:19670: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {1.00000000e+000, 1.00000000e+000, 0.00000000e+000, 0.00000000e+000}. d3d11.c:19670: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {0.00000000e+000, 1.00000000e+000, 1.00000000e+000, 0.00000000e+000}. d3d11.c:19670: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {1.00000000e+000, 1.00000000e+000, 1.00000000e+000, 1.00000000e+000}. d3d11.c:19670: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {1.00000000e+000, 1.00000000e+000, 1.00000000e+000, 1.00000000e+000}. d3d11.c:19670: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {0.00000000e+000, 1.00000000e+000, 1.00000000e+000, 0.00000000e+000}. d3d11.c:19670: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {1.00000000e+000, 1.00000000e+000, 1.00000000e+000, 1.00000000e+000}. d3d11.c:19670: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {1.00000000e+000, 1.00000000e+000, 1.00000000e+000, 1.00000000e+000}. 0f8c:d3d11: unhandled exception c0000005 at 0000000000412BB7 === w1064 (64 bit d3d11) === d3d11.c:19621: Test failed: Failed to create texture, hr 0x80070057. d3d11.c:19623: Test failed: Fialed to create shader resource view, hr 0x80070057. d3d11.c:19648: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {0.00000000e+000, 1.00000000e+000, 0.00000000e+000, 0.00000000e+000}. d3d11.c:19648: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {1.00000000e+000, 1.00000000e+000, 0.00000000e+000, 0.00000000e+000}. d3d11.c:19648: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {1.00000000e+000, 1.00000000e+000, 0.00000000e+000, 0.00000000e+000}. d3d11.c:19648: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {1.00000000e+000, 1.00000000e+000, 0.00000000e+000, 0.00000000e+000}. d3d11.c:19648: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {1.00000000e+000, 1.00000000e+000, 1.00000000e+000, 0.00000000e+000}. d3d11.c:19648: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {1.00000000e+000, 0.00000000e+000, 1.00000000e+000, 1.00000000e+000}. d3d11.c:19648: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {0.00000000e+000, 0.00000000e+000, 1.00000000e+000, 1.00000000e+000}. d3d11.c:19648: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {0.00000000e+000, 0.00000000e+000, 1.00000000e+000, 1.00000000e+000}. d3d11.c:19648: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {0.00000000e+000, 0.00000000e+000, 1.00000000e+000, 1.00000000e+000}. d3d11.c:19648: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 1.00000000e+000}. d3d11.c:19648: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {0.00000000e+000, 1.00000000e+000, 0.00000000e+000, 0.00000000e+000}. d3d11.c:19648: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {1.00000000e+000, 1.00000000e+000, 0.00000000e+000, 0.00000000e+000}. d3d11.c:19648: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {0.00000000e+000, 1.00000000e+000, 1.00000000e+000, 0.00000000e+000}. d3d11.c:19648: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {1.00000000e+000, 1.00000000e+000, 1.00000000e+000, 1.00000000e+000}. d3d11.c:19670: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {1.00000000e+000, 0.00000000e+000, 1.00000000e+000, 1.00000000e+000}. d3d11.c:19670: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {0.00000000e+000, 0.00000000e+000, 1.00000000e+000, 1.00000000e+000}. d3d11.c:19670: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {0.00000000e+000, 0.00000000e+000, 1.00000000e+000, 1.00000000e+000}. d3d11.c:19670: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {0.00000000e+000, 0.00000000e+000, 1.00000000e+000, 1.00000000e+000}. d3d11.c:19670: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 1.00000000e+000}. d3d11.c:19670: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {0.00000000e+000, 1.00000000e+000, 0.00000000e+000, 0.00000000e+000}. d3d11.c:19670: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {1.00000000e+000, 1.00000000e+000, 0.00000000e+000, 0.00000000e+000}. d3d11.c:19670: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {1.00000000e+000, 1.00000000e+000, 0.00000000e+000, 0.00000000e+000}. d3d11.c:19670: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {0.00000000e+000, 1.00000000e+000, 1.00000000e+000, 0.00000000e+000}. d3d11.c:19670: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {1.00000000e+000, 1.00000000e+000, 1.00000000e+000, 1.00000000e+000}. d3d11.c:19670: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {1.00000000e+000, 1.00000000e+000, 1.00000000e+000, 1.00000000e+000}. d3d11.c:19670: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {0.00000000e+000, 1.00000000e+000, 1.00000000e+000, 0.00000000e+000}. d3d11.c:19670: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {1.00000000e+000, 1.00000000e+000, 1.00000000e+000, 1.00000000e+000}. d3d11.c:19670: Test failed: Got {0.00000000e+000, 0.00000000e+000, 0.00000000e+000, 0.00000000e+000}, expected {1.00000000e+000, 1.00000000e+000, 1.00000000e+000, 1.00000000e+000}. 02b8:d3d11: unhandled exception c0000005 at 0000000000412BB7

1 0

Re: [2/3] wsdapi: Implement AddNamespace, AddNameToNamespace.
by Alexandre Julliard 18 May '17

18 May '17

Owen Rudge <orudge(a)codeweavers.com> writes: > +static LPWSTR generate_namespace_prefix(struct list *namespaces, void *parentMemoryBlock, LPCWSTR uri) > +{ > + WCHAR formatString[] = { 'u','n','%','d', 0 }; > + WCHAR suggestedPrefix[7]; > + int i; > + > + ZeroMemory(suggestedPrefix, sizeof(suggestedPrefix)); > + > + /* Find a unique prefix */ > + for (i = 0; i < 1000; i++) > + { > + wsprintfW(suggestedPrefix, formatString, i); > + > + if (is_prefix_unique(namespaces, suggestedPrefix)) > + { > + return duplicate_string(parentMemoryBlock, suggestedPrefix); > + } > + } This looks extremely inefficient. -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: [PATCH] comctl32/listview: When adding a scrollbar, update the other one.
by Alex Henrie 18 May '17

18 May '17

2017-05-18 4:11 GMT-06:00 Nikolay Sivov <nsivov(a)codeweavers.com>: > From: Alex Henrie <alexhenrie24(a)gmail.com> > > Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> > Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> > --- > > Minor modifications from original patch - fixed length loop instead of repeated calls, > and changed subject to have component in front. > > dlls/comctl32/listview.c | 78 +++++++++++++++++++++++++++++++----------------- > 1 file changed, 50 insertions(+), 28 deletions(-) Looks good to me, thanks. -Alex

1 0

Re: [PATCH v3] d3dx9: Match native out of bounds array selector index handling.
by Marvin 18 May '17

18 May '17

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=31031 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [PATCH 6/9] combase: sort specfile
by Alexandre Julliard 18 May '17

18 May '17

Austin English <austinenglish(a)gmail.com> writes: > Signed-off-by: Austin English <austinenglish(a)gmail.com> > --- > dlls/combase/combase.spec | 128 +++++++++++++++++++++++----------------------- > 1 file changed, 64 insertions(+), 64 deletions(-) Please always confirm that they are sorted on Windows, many of these look like they might be ordinal exports. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 1/3] msvcp: Implement the wchar version of _Open_dir.
by Piotr Caban 18 May '17

18 May '17

On 05/18/17 13:33, Stefan Dösinger wrote: > + WideCharToMultiByte(CP_ACP, 0, target_w, -1, target, wcslen(target_w) + 1, NULL, NULL); You can use MAX_PATH here instead of wcslen(target_w)+1. Thanks, Piotr

1 0

Re: Avoid using isspace()/isdigit() for WCHARs.
by Hugh McMaster 18 May '17

18 May '17

On Thursday, 18 May 2017 6:16 PM, Hans Leidekker wrote: > +/* > +** WCHAR safe version of isdigit() > +*/ > +static inline int isDigit(WCHAR c) > +{ > + return c >= '0' && c <= '9'; > +} > + > +/* > +** WCHAR safe version of isspace(), except '\r' > +*/ > +static inline int isSpace(WCHAR c) > +{ > + return c == ' ' || c == '\t' || c == '\n' || c == '\f'; > +} Why not just use Wine's inbuilt inline functions? isdigitW() and isspaceW() are in wine/unicode.h, which is already included in msi/tokenize.c.

2 1

Re: [PATCH] kernel32: add AddDllDirectory stub
by Hugh McMaster 18 May '17

18 May '17

On Thursday, 18 May 2017 9:00 AM, Austin English wrote: > > +/************************************************************************* > + * AddDllDirectory (KERNEL32.@) > + */ > +BOOL WINAPI AddDllDirectory(WCHAR *directory) > +{ > + FIXME("(%s): stub\n", wine_dbgstr_w(directory)); > + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); > + return FALSE; > +} This function actually returns DLL_DIRECTORY_COOKIE, which is a typedef'd void *. The actual definition is in libloaderapi.h, which Wine doesn't have. And, according to MSDN, directory should be const WCHAR *. -- Hugh McMaster

1 0

Re: [PATCH v2] comctl32/tests: Add tests for mouse right-click in a treeview control
by Nikolay Sivov 17 May '17

17 May '17

On 16.05.2017 12:05, Hugh McMaster wrote: > Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> > --- > dlls/comctl32/tests/treeview.c | 79 ++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 79 insertions(+) > > diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c > index 43de61c..ca3366d 100644 > --- a/dlls/comctl32/tests/treeview.c > +++ b/dlls/comctl32/tests/treeview.c > @@ -54,6 +54,21 @@ static BOOL g_v6; > static struct msg_sequence *sequences[NUM_MSG_SEQUENCES]; > static struct msg_sequence *item_sequence[1]; > > +static void flush_events(void) > +{ > + MSG msg; > + int diff = 200; > + int min_timeout = 100; > + DWORD time = GetTickCount() + diff; > + > + while (diff > 0) > + { > + if (MsgWaitForMultipleObjects(0, NULL, FALSE, min_timeout, QS_ALLINPUT) == WAIT_TIMEOUT) break; > + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); > + diff = time - GetTickCount(); > + } > +} > + > static const struct message FillRootSeq[] = { > { TVM_INSERTITEMA, sent }, > { TVM_INSERTITEMA, sent }, > @@ -201,6 +216,13 @@ static const struct message test_get_set_unicodeformat_seq[] = { > { 0 } > }; > > +static const struct message test_right_click_seq[] = { > + { WM_RBUTTONDOWN, sent|wparam, MK_RBUTTON }, > + { WM_CAPTURECHANGED, sent|defwinproc }, > + { TVM_GETNEXTITEM, sent|wparam|lparam|defwinproc, TVGN_CARET, 0 }, > + { 0 } > +}; > + > static const struct message parent_expand_seq[] = { > { WM_NOTIFY, sent|id, 0, 0, TVN_ITEMEXPANDINGA }, > { WM_NOTIFY, sent|id, 0, 0, TVN_ITEMEXPANDEDA }, > @@ -342,6 +364,12 @@ static const struct message parent_vk_return_seq[] = { > { 0 } > }; > > +static const struct message parent_right_click_seq[] = { > + { WM_NOTIFY, sent|id, 0, 0, NM_RCLICK }, > + { WM_CONTEXTMENU, sent }, > + { 0 } > +}; > + > static HWND hMainWnd; > > static HTREEITEM hRoot, hChild; > @@ -1296,6 +1324,13 @@ static LRESULT CALLBACK parent_wnd_proc(HWND hWnd, UINT message, WPARAM wParam, > } > break; > } > + case NM_RCLICK: > + { > + HTREEITEM selected = (HTREEITEM)SendMessageA(((NMHDR *)lParam)->hwndFrom, > + TVM_GETNEXTITEM, TVGN_CARET, 0); > + ok(selected == hChild, "child item should still be selected\n"); > + break; > + } > } > } > break; > @@ -2583,6 +2618,49 @@ todo_wine > DestroyWindow(hwnd); > } > > +static void test_right_click(void) > +{ > + HWND hTree; > + HTREEITEM selected; > + RECT rc; > + LRESULT result; > + POINT pt; > + > + hTree = create_treeview_control(0); > + fill_tree(hTree); > + > + SendMessageA(hTree, TVM_ENSUREVISIBLE, 0, (LPARAM)hChild); > + SendMessageA(hTree, TVM_SELECTITEM, TVGN_CARET, (LPARAM)hChild); > + selected = (HTREEITEM)SendMessageA(hTree, TVM_GETNEXTITEM, TVGN_CARET, 0); > + ok(selected == hChild, "child item not selected\n"); > + > + *(HTREEITEM *)&rc = hRoot; > + result = SendMessageA(hTree, TVM_GETITEMRECT, TRUE, (LPARAM)&rc); > + ok(result, "TVM_GETITEMRECT failed\n"); > + > + flush_events(); > + > + pt.x = rc.left + (rc.right - rc.left) / 2; > + pt.y = rc.top + (rc.bottom - rc.top) / 2; Could you please simplify this to "(a + b) / 2"? Other than that, it looks good.

1 0

Re: [PATCH] appwiz.cpl: Use sha256 checksums to validate Mono/Gecko downloads.
by Alexandre Julliard 17 May '17

17 May '17

Alex Henrie <alexhenrie24(a)gmail.com> writes: > + if(BCryptOpenAlgorithmProvider(&alg, BCRYPT_SHA256_ALGORITHM, MS_PRIMITIVE_PROVIDER, 0)) > + goto end; > + if(BCryptCreateHash(alg, &hash, NULL, 0, NULL, 0, 0)) > + goto end; > + if(BCryptHashData(hash, (UCHAR *)file_map, size, 0)) > + goto end; > + if(BCryptFinishHash(hash, sha, sizeof(sha), 0)) > + goto end; > > UnmapViewOfFile(file_map); You are leaking file_map on error. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH] user32: add GetPhysicalCursorPos/SetPhysicalCursorPos stubs (try 3)
by Ken Thomases 17 May '17

17 May '17

On May 16, 2017, at 12:38 PM, Austin English <austinenglish(a)gmail.com> wrote: > --- > dlls/user32/input.c | 19 +++++++++++++++++++ > dlls/user32/user32.spec | 2 ++ > 2 files changed, 21 insertions(+) Looks good to me. -Ken

1 0

Re: [PATCH 4/6 v2] reg/tests: Add tests for importing REG_NONE data
by Marvin 17 May '17

17 May '17

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=31013 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [v8 PATCH] oleaut32: Improve support for IDispatch in VarCat
by Jacek Caban 17 May '17

17 May '17

Hi Alistair, On 12.05.2017 05:56, Alistair Leslie-Hughes wrote: > Fixes https://bugs.winehq.org/show_bug.cgi?id=27106 > > v6 - Simplify the code when the Variant cannot be coerced. > v7 - Fix copy/paste bug in return value. > v8 - Fixed failed test. > > Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> > --- > dlls/oleaut32/tests/vartest.c | 217 ++++++++++++++++++++++++++++++++++++++++++ > dlls/oleaut32/variant.c | 52 +++------- > 2 files changed, 229 insertions(+), 40 deletions(-) > > diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c > index 0e86ffb..f4224dc 100644 > --- a/dlls/oleaut32/tests/vartest.c > +++ b/dlls/oleaut32/tests/vartest.c > @@ -97,6 +97,150 @@ static BOOL has_i8; > #define R8_MAX DBL_MAX > #define R8_MIN DBL_MIN > > +#define DEFINE_EXPECT(func) \ > + static BOOL expect_ ## func = FALSE, called_ ## func = FALSE > + > +#define SET_EXPECT(func) \ > + do { called_ ## func = FALSE; expect_ ## func = TRUE; } while(0) > + > +#define CHECK_EXPECT2(func) \ > + do { \ > + ok(expect_ ##func, "unexpected call " #func "\n"); \ > + called_ ## func = TRUE; \ > + }while(0) > + > +#define CHECK_EXPECT(func) \ > + do { \ > + CHECK_EXPECT2(func); \ > + expect_ ## func = FALSE; \ > + }while(0) > + > +#define CHECK_CALLED(func) \ > + do { \ > + ok(called_ ## func, "expected " #func "\n"); \ > + expect_ ## func = called_ ## func = FALSE; \ > + }while(0) > + > +DEFINE_EXPECT(dispatch_invoke); > + > +typedef struct > +{ > + IDispatch IDispatch_iface; > + VARTYPE vt; > + HRESULT result; > +} DummyDispatch; > + > +static inline DummyDispatch *impl_from_IDispatch(IDispatch *iface) > +{ > + return CONTAINING_RECORD(iface, DummyDispatch, IDispatch_iface); > +} > + > +static ULONG WINAPI DummyDispatch_AddRef(IDispatch *iface) > +{ > + return 2; > +} > + > +static ULONG WINAPI DummyDispatch_Release(IDispatch *iface) > +{ > + return 1; > +} > + > +static HRESULT WINAPI DummyDispatch_QueryInterface(IDispatch *iface, > + REFIID riid, > + void** ppvObject) > +{ > + *ppvObject = NULL; > + > + if (IsEqualIID(riid, &IID_IDispatch) || > + IsEqualIID(riid, &IID_IUnknown)) > + { > + *ppvObject = iface; > + IDispatch_AddRef(iface); > + } > + > + return *ppvObject ? S_OK : E_NOINTERFACE; > +} > + > +static HRESULT WINAPI DummyDispatch_GetTypeInfoCount(IDispatch *iface, UINT *pctinfo) > +{ > + ok(0, "Unexpected call\n"); > + return E_NOTIMPL; > +} > + > +static HRESULT WINAPI DummyDispatch_GetTypeInfo(IDispatch *iface, UINT tinfo, LCID lcid, ITypeInfo **ti) > +{ > + ok(0, "Unexpected call\n"); > + return E_NOTIMPL; > +} > + > +static HRESULT WINAPI DummyDispatch_GetIDsOfNames(IDispatch *iface, REFIID riid, LPOLESTR *names, > + UINT cnames, LCID lcid, DISPID *dispid) > +{ > + ok(0, "Unexpected call\n"); > + return E_NOTIMPL; > +} > + > +static HRESULT WINAPI DummyDispatch_Invoke(IDispatch *iface, > + DISPID dispid, REFIID riid, > + LCID lcid, WORD wFlags, > + DISPPARAMS *params, > + VARIANT *res, > + EXCEPINFO *ei, > + UINT *arg_err) > +{ > + DummyDispatch *This = impl_from_IDispatch(iface); > + > + CHECK_EXPECT(dispatch_invoke); > + > + ok(dispid == DISPID_VALUE, "got dispid %d\n", dispid); > + ok(IsEqualIID(riid, &IID_NULL), "go riid %s\n", wine_dbgstr_guid(riid)); > + ok(wFlags == DISPATCH_PROPERTYGET, "Flags wrong\n"); > + > + ok(params->rgvarg == NULL, "got %p\n", params->rgvarg); > + ok(params->rgdispidNamedArgs == NULL, "got %p\n", params->rgdispidNamedArgs); > + ok(params->cArgs == 0, "got %d\n", params->cArgs); > + ok(params->cNamedArgs == 0, "got %d\n", params->cNamedArgs); > + > + ok(res != NULL, "got %p\n", res); > + ok(V_VT(res) == VT_EMPTY, "got %d\n", V_VT(res)); > + ok(ei == NULL, "got %p\n", ei); > + ok(arg_err == NULL, "got %p\n", arg_err); > + > + if (FAILED(This->result)) > + return This->result; > + > + V_VT(res) = This->vt; > + if (This->vt == VT_UI1) > + V_UI1(res) = 34; > + else if (This->vt == VT_NULL) > + { > + V_VT(res) = VT_NULL; > + V_BSTR(res) = NULL; > + } > + else > + memset(res, 0, sizeof(*res)); > + > + return S_OK; > +} > + > +static const IDispatchVtbl DummyDispatch_VTable = > +{ > + DummyDispatch_QueryInterface, > + DummyDispatch_AddRef, > + DummyDispatch_Release, > + DummyDispatch_GetTypeInfoCount, > + DummyDispatch_GetTypeInfo, > + DummyDispatch_GetIDsOfNames, > + DummyDispatch_Invoke > +}; > + > +static void init_test_dispatch(VARTYPE vt, DummyDispatch *dispatch) > +{ > + dispatch->IDispatch_iface.lpVtbl = &DummyDispatch_VTable; > + dispatch->vt = vt; > + dispatch->result = S_OK; > +} > + > typedef struct IRecordInfoImpl > { > IRecordInfo IRecordInfo_iface; > @@ -5607,6 +5751,7 @@ static void test_VarCat(void) > HRESULT hres; > HRESULT expected_error_num; > int cmp; > + DummyDispatch dispatch; > > CHECKPTR(VarCat); > > @@ -5941,6 +6086,78 @@ static void test_VarCat(void) > VariantClear(&result); > VariantClear(&expected); > > + /* Dispatch conversion */ > + init_test_dispatch(VT_NULL, &dispatch); > + V_VT(&left) = VT_DISPATCH; > + V_DISPATCH(&left) = &dispatch.IDispatch_iface; > + > + V_VT(&expected) = VT_BSTR; > + V_BSTR(&expected)= SysAllocString(sz_empty); > + > + SET_EXPECT(dispatch_invoke); > + hres = VarCat(&left, &right, &result); > + ok(hres == S_OK, "got 0x%08x\n", hres); > + ok(V_VT(&result) == VT_BSTR, "got %d\n", V_VT(&result)); > + ok(SysStringLen(V_BSTR(&result)) == 0, "got %d\n", SysStringLen(V_BSTR(&result))); > + CHECK_CALLED(dispatch_invoke); > + ok(VarCmp(&result,&expected,lcid,0) == VARCMP_EQ, "VarCat: DISPATCH concat with EMPTY did not return empty VT_BSTR\n"); This VarCmp doesn't test any more than you tested a few lines earlier. I'd remove it. > + > + VariantClear(&left); > + VariantClear(&right); > + VariantClear(&result); > + VariantClear(&expected); > + > + init_test_dispatch(VT_NULL, &dispatch); > + V_VT(&right) = VT_DISPATCH; > + V_DISPATCH(&right) = &dispatch.IDispatch_iface; > + > + SET_EXPECT(dispatch_invoke); > + hres = VarCat(&left, &right, &result); > + ok(hres == S_OK, "got 0x%08x\n", hres); > + ok(V_VT(&result) == VT_BSTR, "got %d\n", V_VT(&result)); > + ok(SysStringLen(V_BSTR(&result)) == 0, "got %d\n", SysStringLen(V_BSTR(&result))); > + CHECK_CALLED(dispatch_invoke); > + ok(VarCmp(&result,&expected,lcid,0) == VARCMP_EQ, "VarCat: DISPATCH concat with EMPTY did not return empty VT_BSTR\n"); Same here. > + > + VariantClear(&left); > + VariantClear(&right); > + VariantClear(&result); > + VariantClear(&expected); > + > + init_test_dispatch(VT_UI1, &dispatch); > + V_VT(&right) = VT_DISPATCH; > + V_DISPATCH(&right) = &dispatch.IDispatch_iface; > + > + V_VT(&expected) = VT_BSTR; > + V_VT(&left) = VT_BSTR; > + V_BSTR(&left) = SysAllocString(sz12); > + V_BSTR(&expected) = SysAllocString(sz1234); > + SET_EXPECT(dispatch_invoke); > + hres = pVarCat(&left,&right,&result); > + ok(hres == S_OK, "VarCat failed with error 0x%08x\n", hres); > + CHECK_CALLED(dispatch_invoke); > + ok(VarCmp(&result,&expected,lcid,0) == VARCMP_EQ, "VarCat: VT_DISPATCH concat with VT_BSTR failed to return correct result\n"); I'd replace that with explicit result tests, using strcmp_wa(). > + > + VariantClear(&left); > + VariantClear(&right); > + VariantClear(&result); > + VariantClear(&expected); > + > + init_test_dispatch(VT_NULL, &dispatch); > + dispatch.result = E_OUTOFMEMORY; > + V_VT(&right) = VT_DISPATCH; > + V_DISPATCH(&right) = &dispatch.IDispatch_iface; > + > + SET_EXPECT(dispatch_invoke); > + hres = VarCat(&left, &right, &result); > + todo_wine ok(hres == E_OUTOFMEMORY, "got 0x%08x\n", hres); > + CHECK_CALLED(dispatch_invoke); This test shows that there is still something wrong with error handling with your patch. > + > + VariantClear(&left); > + VariantClear(&right); > + VariantClear(&result); > + VariantClear(&expected); > + > /* Test boolean conversion */ > V_VT(&left) = VT_BOOL; > V_BOOL(&left) = VARIANT_TRUE; > diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c > index 17f753a..aa86be0 100644 > --- a/dlls/oleaut32/variant.c > +++ b/dlls/oleaut32/variant.c > @@ -2605,30 +2605,16 @@ HRESULT WINAPI VarCat(LPVARIANT left, LPVARIANT right, LPVARIANT out) > else > V_BSTR(&bstrvar_left) = SysAllocString(str_false); > } Note that V_BOOL case could also be handled by VariantChangeTypeEx if you used VARIANT_ALPHABOOL flag. > - /* Fill with empty string for later concat with right side */ > - else if (leftvt == VT_NULL) > - { > - V_VT(&bstrvar_left) = VT_BSTR; > - V_BSTR(&bstrvar_left) = SysAllocString(sz_empty); > - } > else > { > + /* The value may not be able to be coerced, ie. VT_NULL */ > hres = VariantChangeTypeEx(&bstrvar_left,left,0,0,VT_BSTR); > - if (hres != S_OK) { > - VariantClear(&bstrvar_left); > - VariantClear(&bstrvar_right); > - if (leftvt == VT_NULL && (rightvt == VT_EMPTY || > - rightvt == VT_NULL || rightvt == VT_I2 || > - rightvt == VT_I4 || rightvt == VT_R4 || > - rightvt == VT_R8 || rightvt == VT_CY || > - rightvt == VT_DATE || rightvt == VT_BSTR || > - rightvt == VT_BOOL || rightvt == VT_DECIMAL || > - rightvt == VT_I1 || rightvt == VT_UI1 || > - rightvt == VT_UI2 || rightvt == VT_UI4 || > - rightvt == VT_I8 || rightvt == VT_UI8 || > - rightvt == VT_INT || rightvt == VT_UINT)) > - return DISP_E_BADVARTYPE; Removing dead code should be a separated patch. > + if (hres != S_OK && hres != DISP_E_TYPEMISMATCH) > return hres; > + else if(FAILED(hres)) > + { > + V_VT(&bstrvar_left) = VT_BSTR; > + V_BSTR(&bstrvar_left) = SysAllocString(sz_empty); > } Something like: if (hres == DISP_E_TYPEMISMATCH) { // set empty string }else if(hres != S_OK) return hres; would be cleaner. However, more importantly, this needs more tests. There are more cases than IDispatch when your patch changes behaviour, so we need to make sure what behaviour is desired first. > } > } > @@ -2645,30 +2631,16 @@ HRESULT WINAPI VarCat(LPVARIANT left, LPVARIANT right, LPVARIANT out) > else > V_BSTR(&bstrvar_right) = SysAllocString(str_false); > } > - /* Fill with empty string for later concat with right side */ > - else if (rightvt == VT_NULL) > - { > - V_VT(&bstrvar_right) = VT_BSTR; > - V_BSTR(&bstrvar_right) = SysAllocString(sz_empty); > - } > else > { > + /* The value may not be able to be coerced, ie. VT_NULL */ > hres = VariantChangeTypeEx(&bstrvar_right,right,0,0,VT_BSTR); > - if (hres != S_OK) { > - VariantClear(&bstrvar_left); > - VariantClear(&bstrvar_right); > - if (rightvt == VT_NULL && (leftvt == VT_EMPTY || > - leftvt == VT_NULL || leftvt == VT_I2 || > - leftvt == VT_I4 || leftvt == VT_R4 || > - leftvt == VT_R8 || leftvt == VT_CY || > - leftvt == VT_DATE || leftvt == VT_BSTR || > - leftvt == VT_BOOL || leftvt == VT_DECIMAL || > - leftvt == VT_I1 || leftvt == VT_UI1 || > - leftvt == VT_UI2 || leftvt == VT_UI4 || > - leftvt == VT_I8 || leftvt == VT_UI8 || > - leftvt == VT_INT || leftvt == VT_UINT)) > - return DISP_E_BADVARTYPE; > + if (hres != S_OK && hres != DISP_E_TYPEMISMATCH) > return hres; > + else if(FAILED(hres)) > + { > + V_VT(&bstrvar_right) = VT_BSTR; > + V_BSTR(&bstrvar_right) = SysAllocString(sz_empty); > } > } > } > -- 1.9.1 Same for those changes: remove dead code in separated patch, add tests and consider using VARIANT_ALPHABOOL. Thanks, Jacek

1 0

Re: Transferring D3D textures to OpenGL or Vulkan contexts in Winelib
by Józef Kucia 16 May '17

16 May '17

On Tue, May 16, 2017 at 12:55 AM, Ben "Root" Anderson <roothorick(a)gmail.com> wrote: > On Sun, May 14, 2017 at 2:53 AM, Józef Kucia <joseph.kucia(a)gmail.com> wrote: >> In theory Wine could implement WGL_NV_DX_interop [1] and WGL_NV_DX_interop2 [2]. >> >> [1] - https://www.khronos.org/registry/OpenGL/extensions/NV/WGL_NV_DX_interop.txt >> [2] - https://www.khronos.org/registry/OpenGL/extensions/NV/WGL_NV_DX_interop2.txt > > In theory? I'm just a bit skeptical about usefulness of this extension in Wine besides your use-case. > > The main question I can't find the answer to is, are there any > potential copyright/IP problems (or just Wine policy issues) with > implementing these extensions "paint by numbers" off the published > specs? I'm not aware of such problems. Other WGL extensions are already implemented in Wine, see dlls/winex11.drv/opengl.c. In this case it may be a little harder though, the extension has to understand D3D9, D3D10 and D3D11 interfaces, and it has to talk to wined3d, and it has to presumably map GL objects to internal wined3d GL objects.

3 2

Re: d3d11/tests: Add test for the SM4 instruction continuec.
by Henri Verbeet 16 May '17

16 May '17

On 16 May 2017 at 17:47, Sven Hesse <drmccoy(a)drmccoy.de> wrote: > To get fxc to output continuec_z/continuec_nz instead of an if-block > with a normal continue inside, the shaders have been compiled with > the /Gfa flag. > Could you add that as a comment in the code itself?

1 0

Re: [PATCH 4/4] server: Don't change clipboard sequnce number on delayed data rendering
by Marvin 16 May '17

16 May '17

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=30988 Your paranoid android. === w8 (32 bit clipboard) === clipboard.c:399: Test failed: GlobalGetAtomNameA should fail clipboard.c:400: Test failed: err -559038737

1 0

Re: [PATCH 1/3] ws2_32: Don't try to match host name in getaddrinfo if AI_NUMERICHOST hint is specified.
by Marvin 16 May '17

16 May '17

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=30982 Your paranoid android. === w7u (32 bit sock) === sock.c:6146: Test failed: Expected event sequence [FD_READ(0)], got []

1 0

Re: wined3d: Implement SM4 continuec opcode.
by Henri Verbeet 16 May '17

16 May '17

On 14 May 2017 at 18:54, Sven Hesse <drmccoy(a)drmccoy.de> wrote: > Works just like breakc and retc. > > Signed-off-by: Sven Hesse <drmccoy(a)drmccoy.de> > --- > dlls/wined3d/arb_program_shader.c | 1 + > dlls/wined3d/glsl_shader.c | 2 ++ > dlls/wined3d/shader.c | 1 + > dlls/wined3d/shader_sm4.c | 3 +++ > dlls/wined3d/wined3d_private.h | 1 + > 5 files changed, 8 insertions(+) > Thanks. I'll take this as it is, although a small test using the instruction would be nice.

2 1

Re: rpcrt4: Use standard Wine list to store connections in RpcServerProtseq.
by Alexandre Julliard 16 May '17

16 May '17

Jacek Caban <jacek(a)codeweavers.com> writes: > Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> > --- > dlls/rpcrt4/rpc_binding.h | 2 +- > dlls/rpcrt4/rpc_server.c | 18 ++++---- > dlls/rpcrt4/rpc_server.h | 2 +- > dlls/rpcrt4/rpc_transport.c | 110 > +++++++++++++++----------------------------- > 4 files changed, 50 insertions(+), 82 deletions(-) This breaks the Windows build: i686-w64-mingw32-gcc -c -o rpc_transport.o ../../../wine/dlls/rpcrt4/rpc_transport.c -I. -I../../../wine/dlls/rpcrt4 \ -I../../include -I../../../wine/include -D__WINESRC__ -D_RPCRT4_ -DMSWMSG -D_REENTRANT -Wall -pipe \ -fno-strict-aliasing -Wdeclaration-after-statement -Wempty-body -Wignored-qualifiers \ -Wshift-overflow=2 -Wstrict-prototypes -Wtype-limits -Wunused-but-set-parameter -Wvla \ -Wwrite-strings -Wpointer-arith -Wlogical-op -gdwarf-2 -gstrict-dwarf -fno-omit-frame-pointer \ -g -O2 -fno-diagnostics-show-caret -D_WIN32 In file included from ../../../wine/include/windef.h:266:0, from ../../../wine/include/windows.h:37, from ../../../wine/include/winsock.h:110, from ../../../wine/include/winsock2.h:47, from ../../../wine/include/ws2tcpip.h:22, from ../../../wine/dlls/rpcrt4/rpc_transport.c:40: ../../../wine/dlls/rpcrt4/rpc_transport.c: In function ‘rpcrt4_protseq_sock_get_wait_array’: ../../../wine/dlls/rpcrt4/rpc_transport.c:1767:37: error: ‘RpcServerProtseq {aka struct _RpcServerProtseq}’ has no member named ‘conn’ ../../../wine/include/winnt.h:760:21: note: in definition of macro ‘CONTAINING_RECORD’ ../../../wine/dlls/rpcrt4/rpc_transport.c:1772:46: error: ‘RpcConnection {aka struct _RpcConnection}’ has no member named ‘Next’; did you mean ‘exp’? ../../../wine/include/winnt.h:760:21: note: in definition of macro ‘CONTAINING_RECORD’ ../../../wine/dlls/rpcrt4/rpc_transport.c:1789:37: error: ‘RpcServerProtseq {aka struct _RpcServerProtseq}’ has no member named ‘conn’ ../../../wine/include/winnt.h:760:21: note: in definition of macro ‘CONTAINING_RECORD’ ../../../wine/dlls/rpcrt4/rpc_transport.c:1803:46: error: ‘RpcConnection {aka struct _RpcConnection}’ has no member named ‘Next’; did you mean ‘exp’? ../../../wine/include/winnt.h:760:21: note: in definition of macro ‘CONTAINING_RECORD’ ../../../wine/dlls/rpcrt4/rpc_transport.c: In function ‘rpcrt4_protseq_sock_wait_for_new_connection’: ../../../wine/dlls/rpcrt4/rpc_transport.c:1846:41: error: ‘RpcServerProtseq {aka struct _RpcServerProtseq}’ has no member named ‘conn’ ../../../wine/include/winnt.h:760:21: note: in definition of macro ‘CONTAINING_RECORD’ ../../../wine/dlls/rpcrt4/rpc_transport.c:1850:50: error: ‘RpcConnection {aka struct _RpcConnection}’ has no member named ‘Next’; did you mean ‘exp’? ../../../wine/include/winnt.h:760:21: note: in definition of macro ‘CONTAINING_RECORD’ Makefile:737: recipe for target 'rpc_transport.o' failed -- Alexandre Julliard julliard(a)winehq.org

4 6

Re: [PATCH 3/6] d3dx9: Match native out of bounds array selector index handling.
by Matteo Bruni 16 May '17

16 May '17

2017-05-12 14:24 GMT+02:00 Paul Gofman <gofmanp(a)gmail.com>: > diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c > index 9c07f9c..21aa5d7 100644 > --- a/dlls/d3dx9_36/effect.c > +++ b/dlls/d3dx9_36/effect.c > @@ -1051,7 +1051,9 @@ static HRESULT d3dx9_get_param_value_ptr(struct d3dx_pass *pass, struct d3dx_sta > FIXME("Preshader structure is null.\n"); > return D3DERR_INVALIDCALL; > } > - if (update_all || is_param_eval_input_dirty(param->param_eval)) > + /* According to the tests, native d3dx handles the case of array index evaluated to -1 > + * in a specific way. */ > + if (state->index == 0xffffffffu || is_param_eval_input_dirty(param->param_eval, pass->update_version)) Hmm, so that's the index value set at initialization, thus getting a -1 in the first evaluation ends up breaking the "selector changed" check in native? You might want to spell that out in some form in the comment. AFAIU there is no other way a -1 is stored in state->index, correct?

2 3

Re: [PATCH 2/6] d3dx9: Use versioned parameter updates instead of 'dirty' flags.
by Matteo Bruni 16 May '17

16 May '17

2017-05-12 14:24 GMT+02:00 Paul Gofman <gofmanp(a)gmail.com>: > Looping through shared parameters in set_dirty() which is removed by this patch > has a major performance impact on parameter update for applications creating a > lot of effects and sharing parameters between them, which is a common case. > Using versioned scheme also allows for some further optimization. > > Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> I don't have serious issues with this patch but I also have a number of questions so I don't feel like signing it off either. Sorry :/ > @@ -163,6 +163,7 @@ struct d3dx_const_tab > unsigned int const_set_size; > struct d3dx_const_param_eval_output *const_set; > const enum pres_reg_tables *regset2table; > + ULONG64 update_version; > }; Is it necessary? Could you do without it, using the pass version instead? > struct d3dx_shared_data; > > @@ -213,6 +214,8 @@ struct d3dx_parameter > UINT bytes; > DWORD runtime_flags; > DWORD object_id; > + ULONG64 update_version; > + ULONG64 *update_version_counter; I don't like the "update_version_counter" name that much but I don't have particularly good suggestions. pass_update_version? current_update_version? parent_update_version? new_update_version? > +static inline ULONG64 get_update_version_counter(ULONG64 *update_version_counter) > +{ > + return ++*update_version_counter; > +} Maybe it's just me but it's a bit surprising to see this get_x() function having side effects. Not sure how to call it. next_update_version()? inc_update_version_counter()? > +static inline BOOL is_param_dirty(struct d3dx_parameter *param, ULONG64 update_version) > +{ > + struct d3dx_shared_data *shared_data; > + > + if ((shared_data = param->top_level_param->u.shared_data)) > + return update_version < shared_data->update_version; > + else > + return update_version < param->top_level_param->update_version; > +} Did you try if a unified update_version pointer looks any nicer? Especially considering that you have a more or less matching *update_version_counter at the moment. > HRESULT d3dx_evaluate_parameter(struct d3dx_param_eval *peval, > - const struct d3dx_parameter *param, void *param_value, BOOL update_all) DECLSPEC_HIDDEN; > + const struct d3dx_parameter *param, void *param_value) DECLSPEC_HIDDEN; I guess this has to do with the update_version in struct d3dx_const_tab. I might be missing something, in that case please clue me. > +static ULONG64 get_effect_update_version_counter(struct d3dx9_base_effect *base) > +{ > + return get_update_version_counter(get_update_version_counter_ptr(base)); > } Same naming caveat here. > -static void clear_dirty_params(struct d3dx9_base_effect *base) > +static void set_dirty(struct d3dx_parameter *param) > { > - unsigned int i; > + struct d3dx_shared_data *shared_data; > + struct d3dx_parameter *top_param = param->top_level_param; > + ULONG64 new_update_version = get_update_version_counter(top_param->update_version_counter); > > - for (i = 0; i < base->parameter_count; ++i) > - base->parameters[i].runtime_flags &= ~PARAMETER_FLAG_DIRTY; > + if ((shared_data = top_param->u.shared_data)) > + shared_data->update_version = new_update_version; > + else > + top_param->update_version = new_update_version; > } Another option would be NOT to increment the effect / pool counter on each set_dirty() but instead only increment it in BeginPass() and CommitChanges(), after you're done with the update (or well, it's fine at almost any point given that we don't have to care about races). It seems a bit better to me, unless I'm overlooking something and it won't work. > static HRESULT set_string(char **param_data, const char *string) > @@ -3078,6 +3074,7 @@ static HRESULT d3dx9_apply_pass_states(struct ID3DXEffectImpl *effect, struct d3 > unsigned int i; > HRESULT ret; > HRESULT hr; > + ULONG64 new_update_version = get_effect_update_version_counter(&effect->base_effect); > > TRACE("effect %p, pass %p, state_count %u.\n", effect, pass, pass->state_count); > > @@ -3109,7 +3106,7 @@ static HRESULT d3dx9_apply_pass_states(struct ID3DXEffectImpl *effect, struct d3 > } > effect->material_updated = FALSE; > > - clear_dirty_params(&effect->base_effect); > + pass->update_version = new_update_version; > return ret; > } Right, here is where I'd update the counter.

2 3

Re: wrc: Allow quotes in resource nameID.
by Alexandre Julliard 16 May '17

16 May '17

Artur Świgoń <artur.swigon(a)gmail.com> writes: > @@ -138,6 +142,14 @@ static int wbufalloc = 0; > > static int current_codepage = -1; /* use language default */ > > +/* Used for differentiating between single- and double-quoted nameID's */ > +static int id_dblquote = 0; > + > +/* Used for catching first (quoted) nameID before wanted_id is set. > + * This variable is reset to 0 once the first ID (quoted or not), string or > + * data has been encountered */ > +static int id_initial = 1; That's a bit hackish. Couldn't you simply set the initial state appropriately instead of introducing a separate variable? > @@ -402,8 +414,30 @@ static unsigned long xstrtoul(const char *nptr, char **endptr, int base) > 0[oO][0-7]+[lL]? { parser_lval.num = xstrtoul(yytext+2, 0, 8); > return (yytext[yyleng-1] == 'L' || yytext[yyleng-1] == 'l') ? tLNUMBER : tNUMBER; } > > +<tkid_dbl>[A-Za-z_0-9./\\\']+\" | > +<tkid_sgl>[A-Za-z_0-9./\\\"]+\' { There are more characters that should be allowed. Nested quotes are also supposed to work. -- Alexandre Julliard julliard(a)winehq.org

2 2

winetricks alldlls=builtin update based on wine-2.7
by wylda＠volny.cz 16 May '17

16 May '17

______________________________________________________________ > Od: Austin English <austinenglish(a)gmail.com> > Komu: wylda(a)volny.cz > Datum: 20.02.2017 07:07 > Předmět: Re: winetricks alldlls=builtin update based on wine-2.2 > > CC: <wine-devel(a)winehq.org> On Sun, Feb 19, 2017 at 7:51 AM, <wylda(a)volny.cz> wrote: > Hi, > in case you find it useful... > > W. Hi Wylda, Please send a pull request to https://github.com/Winetricks/winetricks/ -- -Austin GPG: 14FB D7EA A041 937B ______________________________________________________________ Hi Austin, i updated alldlls=builtin function for wine-2.7 and also fixed few things: - generates properly indentioned library list - removed nonsensical library names like "./dlls" - script generates override list matching 1:1 to wine-2.7 available list Unfortunately i not able to create pull request in github even though i have created github account right now. It's still grey out and i don't know different way to upload a patch. Anyway is there a different way to get it in, so i don't need to maintain locally? (spent whole day on this and i have no plans to learn git "details" in near futures). Best regards, W.

2 1

Re: [PATCH] user32: add GetPhysicalCursorPos/SetPhysicalCursorPos stubs (try 2)
by Dmitry Timoshkov 16 May '17

16 May '17

Austin English <austinenglish(a)gmail.com> wrote: > +BOOL WINAPI GetPhysicalCursorPos(POINT *point) > +{ > + FIXME("(%p) semi-stub: forwarding to GetCursorPos\n", point); > + return GetPhysicalCursorPos(point); > +} A copy/paste bug. -- Dmitry.

1 0

Re: [PATCH] user32: add GetPhysicalCursorPos/SetPhysicalCursorPos stubs
by Ken Thomases 16 May '17

16 May '17

On May 15, 2017, at 9:11 PM, Austin English <austinenglish(a)gmail.com> wrote: > > https://bugs.winehq.org/show_bug.cgi?id=42985 > > -- > -Austin > GPG: 14FB D7EA A041 937B > --- > dlls/user32/input.c | 14 ++++++++++++++ > dlls/user32/user32.spec | 2 ++ > 2 files changed, 16 insertions(+) Shouldn't these just pass through to GetCursorPos() and SetCursorPos(), respectively? Their docs refer to the docs for PhysicalToLogicalPoint()[1], which says that a) the distinction is only meaningful for Vista-style DPI scaling, which Wine doesn't support; and b) since Windows 8.1, even that distinction has been eliminated by DPI virtualization. [1] https://msdn.microsoft.com/en-us/library/windows/desktop/ms633536(v=vs.85).… -Ken

1 0

Transferring D3D textures to OpenGL or Vulkan contexts in Winelib
by Ben "Root" Anderson 15 May '17

15 May '17

I'd like to start a discussion here and see where it goes. First, my usecase. I want to write a wrapper that connects Windows SteamVR applications running under Wine to the native Linux SteamVR runtime. Because it's the same API on both sides, this is very straightforward, except for one crucial element. In their API, the application does not (necessarily) output the rendered frame to a window, instead submitting the frame to their VR compositor as either an ID3D11Texture, a struct describing a D3D12 texture, an OpenGL texture or render buffer name, or a struct describing a Vulkan texture. For obvious reasons, the latter two are the options available on Linux, making them very straightforward for a Winelib DLL. The former two... not so much. The vast majority of SteamVR applications are currently using Direct3D 11, which means for any of this to work with them, I need some way to convert an ID3D11Texture to the appropriate OpenGL or (preferably) Vulkan equivalent that SteamVR is expecting. I've looked high and low and see no way to do this, neither through Windows APIs nor Winelib. Just to get things working for now, I'll likely figure out a way to invoke wined3d_texture_get_gl_buffer() or similar from outside Wine itself, but that's a dirty hack at best and likely to break frequently (eventually, maybe permanently) as Wine evolves. Thoughts?

2 2

Re: [PATCH 5/6] d3dx9: Avoid redundant constant tables updates.
by Matteo Bruni 15 May '17

15 May '17

2017-05-12 14:24 GMT+02:00 Paul Gofman <gofmanp(a)gmail.com>: > +static void set_preshader_modified(struct d3dx_preshader *pres) > +{ > + unsigned int i; > + > + for (i = 0; i < pres->ins_count; ++i) > + { > + const struct d3dx_pres_ins *ins = &pres->ins[i]; > + const struct d3dx_pres_reg *reg = &ins->output.reg; > + > + regstore_set_modified(&pres->regs, reg->table, reg->offset, > + pres_op_info[ins->op].func_all_comps ? 1 : ins->component_count); > + } > +} This looks a bit ugly but I imagine it's actually okay in practice. Not that I can think of anything better either. E.g. I'm not sure that storing an array of register ranges to dirtify (i.e. precomputing this preshader scan) is really an improvement.

1 0

[v6 PATCH 00/21] x86: Enable User-Mode Instruction Prevention
by Ricardo Neri 15 May '17

15 May '17

This is v6 of this series. The five previous submissions can be found here [1], here [2], here[3], here[4], and here[5]. This version addresses the comments received in v4 plus improvements of the handling of emulation in 64-bit builds. Please see details in the change log. === What is UMIP? User-Mode Instruction Prevention (UMIP) is a security feature present in new Intel Processors. If enabled, it prevents the execution of certain instructions if the Current Privilege Level (CPL) is greater than 0. If these instructions were executed while in CPL > 0, user space applications could have access to system-wide settings such as the global and local descriptor tables, the segment selectors to the current task state and the local descriptor table. These are the instructions covered by UMIP: * SGDT - Store Global Descriptor Table * SIDT - Store Interrupt Descriptor Table * SLDT - Store Local Descriptor Table * SMSW - Store Machine Status Word * STR - Store Task Register If any of these instructions is executed with CPL > 0, a general protection exception is issued when UMIP is enabled. === How does it impact applications? There is a caveat, however. Certain applications rely on some of these instructions to function. An example of this are applications that use WineHQ[6]. For instance, these applications rely on sidt returning a non- accessible memory location[8]. During the discussions, it was proposed that the fault could be relied to the user-space and perform the emulation in user-mode. However, this would break existing applications until, for instance, they update to a new WineHQ version. However, this approach would require UMIP to be disabled by default. The consensus in this forum is to always enable it. This patchset initially treated tasks running in virtual-8086 mode as a special case. However, I received clarification that DOSEMU[8] does not support applications that use these instructions. It relies on WineHQ for this [9]. Furthermore, the applications for which the concern was raised run in protected mode [8]. Please note that UMIP is always enabled for both 64-bit and 32-bit Linux builds. However, emulation of the UMIP-protected instructions is not done for 64-bit processes. 64-bit user space applications will receive the SIGSEGV signal when UMIP instructions causes a general protection fault. === How are UMIP-protected instructions emulated? This version keeps UMIP enabled at all times and by default. If a general protection fault caused by the instructions protected by UMIP is detected, such fault will be fixed-up by returning dummy values as follows: * SGDT and SIDT return hard-coded dummy values as the base of the global descriptor and interrupt descriptor tables. These hard-coded values correspond to memory addresses that are near the end of the kernel memory map. This is also the case for virtual-8086 mode tasks. In all my experiments in x86_32, the base of GDT and IDT was always a 4-byte address, even for 16-bit operands. Thus, my emulation code does the same. In all cases, the limit of the table is set to 0. * STR and SLDT return 0 as the segment selector. This looks appropriate since we are providing a dummy value as the base address of the global descriptor table. * SMSW returns the value with which the CR0 register is programmed in head_32/64.S at boot time. This is, the following bits are enabled: CR0.0 for Protection Enable, CR.1 for Monitor Coprocessor, CR.4 for Extension Type, which will always be 1 in recent processors with UMIP; CR.5 for Numeric Error, CR0.16 for Write Protect, CR0.18 for Alignment Mask. As per the Intel 64 and IA-32 Architectures Software Developer's Manual, SMSW returns a 16-bit results for memory operands. However, when the operand is a register, the results can be up to CR0[63:0]. Since the emulation code only kicks-in in x86_32, we return up to CR[31:0]. * The proposed emulation code is handles faults that happens in both protected and virtual-8086 mode. === How is this series laid out? ++ Fix bugs in MPX address evaluator I found very useful the code for Intel MPX (Memory Protection Extensions) used to parse opcodes and the memory locations contained in the general purpose registers when used as operands. I put some of this code in a separate library file that both MPX and UMIP can access and avoid code duplication. Before creating the new library, I fixed a couple of bugs that I found in how MPX determines the address contained in the instruction and operands. ++ Provide a new x86 instruction evaluating library With bugs fixed, the MPX evaluating code is relocated in a new insn-eval.c library. The basic functionality of this library is extended to obtain the segment descriptor selected by either segment override prefixes or the default segment by the involved registers in the calculation of the effective address. It was also extended to obtain the default address and operand sizes as well as the segment base address. Also, support to process 16-bit address encodings. Armed with this arsenal, it is now possible to determine the linear address onto which the emulated results shall be copied. This code supports Normal 32-bit and 64-bit (i.e., __USER32_CS and/or __USER_CS) protected mode, virtual-8086 mode, 16-bit protected mode with 32-bit base address. ++ Emulate UMIP instructions A new fixup_umip_exception functions inspect the instruction at the instruction pointer. If it is an UMIP-protected instruction, it executes the emulation code. This uses all the address-computing code of the previous section. ++ Add self-tests Lastly, self-tests are added to entry_from_v86.c to exercise the most typical use cases of UMIP-protected instructions in a virtual-8086 mode. ++ Extensive tests Extensive tests were performed to test all the combinations of ModRM, SiB and displacements for 16-bit and 32-bit encodings for the ss, ds, es, fs and gs segments. Tests also include a 64-bit program that uses segmentation via fs and gs. For this purpose, I temporarily, and not as part of this patchset, enabled UMIP support for 64-bit process with the intention to test the computations of linear addresses in 64-bit mode, including the extra R8-R15 registers. Extensive test is also implemented for virtual-8086 tasks. Code of these tests can be found here [10] and here [11]. [1]. https://lwn.net/Articles/705877/ [2]. https://lkml.org/lkml/2016/12/23/265 [3]. https://lkml.org/lkml/2017/1/25/622 [4]. https://lkml.org/lkml/2017/2/23/40 [5]. https://lkml.org/lkml/2017/3/3/678 [7]. https://www.winehq.org/ [8]. https://www.winehq.org/pipermail/wine-devel/2016-November/115320.html [9]. http://www.dosemu.org/ [9]. http://marc.info/?l=linux-kernel&m=147876798717927&w=2 [10]. https://github.com/01org/luv-yocto/tree/rneri/umip/meta-luv/recipes-core/um… [11]. https://github.com/01org/luv-yocto/commit/a72a7fe7d68693c0f4100ad86de6ecabd… Thanks and BR, Ricardo Changes since V5: * Relocate the page fault error code enumerations to traps.h Changes since V4: * Audited patches to use braces in all the branches of conditional. statements, except those in which the conditional action only takes one line. * Implemented support in 64-builds for both 32-bit and 64-bit tasks in the instruction evaluating library. * Split segment selector function in the instruction evaluating library into two functions to resolve the segment type by instruction override or default and a separate function to actually read the segment selector. * Fixed a bug when evaluating 32-bit effective addresses with 64-bit kernels. * Split patches further for for easier review. * Use signed variables for computation of effective address. * Fixed issue with a spurious static modifier in function insn_get_addr_ref found by kbuild test bot. * Removed comparison between true and fixup_umip_exception. * Reworked check logic when identifying erroneous vs invalid values of the SiB base and index. Changes since V3: * Limited emulation to 32-bit and 16-bit modes. For 64-bit mode, a general protection fault is still issued when UMIP-protected instructions are executed with CPL > 0. * Expanded instruction-evaluating code to obtain segment descriptor along with their attributes such as base address and default address and operand sizes. Also, support for 16-bit encodings in protected mode was implemented. * When getting a segment descriptor, this include support to obtain those of a local descriptor table. * Now the instruction-evaluating code returns -EDOM when the value of registers should not be used in calculating the effective address. The value -EINVAL is left for errors. * Incorporate the value of the segment base address in the computation of linear addresses. * Renamed new instruction evaluation library from insn-kernel.c to insn-eval.c * Exported functions insn_get_reg_offset_* to obtain the register offset by ModRM r/m, SiB base and SiB index. * Improved documentation of functions. * Split patches further for easier review. Changes since V2: * Added new utility functions to decode the memory addresses contained in registers when the 16-bit addressing encodings are used. This includes code to obtain and compute memory addresses using segment selectors for real-mode address translation. * Added support to emulate UMIP-protected instructions for virtual-8086 tasks. * Added self-tests for virtual-8086 mode that contains representative use cases: address represented as a displacement, address in registers and registers as operands. * Instead of maintaining a static variable for the dummy base addresses of the IDT and GDT, a hard-coded value is used. * The emulated SMSW instructions now return the value with which the CR0 register is programmed in head_32/64.S This is: PE | MP | ET | NE | WP | AM. For x86_64, PG is also enabled. * The new file arch/x86/lib/insn-utils.c is now renamed as arch/x86/lib/ insn-kernel.c. It also has its own header. This helps keep in sync the the kernel and objtool instruction decoders. Also, the new insn-kernel.c contains utility functions that are only relevant in a kernel context. * Removed printed warnings for errors that occur when decoding instructions with invalid operands. * Added more comments on fixes in the instruction-decoding MPX functions. * Now user_64bit_mode(regs) is used instead of test_thread_flag(TIF_IA32) to determine if the task is 32-bit or 64-bit. * Found and fixed a bug in insn-decoder in which X86_MODRM_RM was incorrectly used to obtain the mod part of the ModRM byte. * Added more explanatory code in emulation and instruction decoding code. This includes a comment regarding that copy_from_user could fail if there exists a memory protection key in place. * Tested code with CONFIG_X86_DECODER_SELFTEST=y and everything passes now. * Prefixed get_reg_offset_rm with insn_ as this function is exposed via a header file. For clarity, this function was added in a separate patch. Changes since V1: * Virtual-8086 mode tasks are not treated in a special manner. All code for this purpose was removed. * Instead of attempting to disable UMIP during a context switch or when entering virtual-8086 mode, UMIP remains enabled all the time. General protection faults that occur are fixed-up by returning dummy values as detailed above. * Removed umip= kernel parameter in favor of using clearcpuid=514 to disable UMIP. * Removed selftests designed to detect the absence of SIGSEGV signals when running in virtual-8086 mode. * Reused code from MPX to decode instructions operands. For this purpose code was put in a common location. * Fixed two bugs in MPX code that decodes operands. Ricardo Neri (21): x86/mpx: Use signed variables to compute effective addresses x86/mpx: Do not use SIB index if index points to R/ESP x86/mpx: Do not use R/EBP as base in the SIB byte with Mod = 0 x86/mpx, x86/insn: Relocate insn util functions to a new insn-kernel x86/insn-eval: Add utility functions to get register offsets x86/insn-eval: Add utility functions to get segment selector x86/insn-eval: Add utility function to get segment descriptor x86/insn-eval: Add utility function to get segment descriptor base address x86/insn-eval: Add functions to get default operand and address sizes x86/insn-eval: Do not use R/EBP as base if mod in ModRM is zero insn/eval: Incorporate segment base in address computation x86/insn: Support both signed 32-bit and 64-bit effective addresses x86/insn-eval: Add support to resolve 16-bit addressing encodings x86/insn-eval: Add wrapper function for 16-bit and 32-bit address encodings x86/mm: Relocate page fault error codes to traps.h x86/cpufeature: Add User-Mode Instruction Prevention definitions x86: Add emulation code for UMIP instructions x86/umip: Force a page fault when unable to copy emulated result to user x86/traps: Fixup general protection faults caused by UMIP x86: Enable User-Mode Instruction Prevention selftests/x86: Add tests for User-Mode Instruction Prevention arch/x86/Kconfig | 10 + arch/x86/include/asm/cpufeatures.h | 1 + arch/x86/include/asm/disabled-features.h | 8 +- arch/x86/include/asm/insn-eval.h | 23 + arch/x86/include/asm/traps.h | 18 + arch/x86/include/asm/umip.h | 15 + arch/x86/include/uapi/asm/processor-flags.h | 2 + arch/x86/kernel/Makefile | 1 + arch/x86/kernel/cpu/common.c | 16 +- arch/x86/kernel/traps.c | 4 + arch/x86/kernel/umip.c | 298 +++++++++ arch/x86/lib/Makefile | 2 +- arch/x86/lib/insn-eval.c | 832 ++++++++++++++++++++++++++ arch/x86/mm/fault.c | 88 ++- arch/x86/mm/mpx.c | 120 +--- tools/testing/selftests/x86/entry_from_vm86.c | 39 +- 16 files changed, 1301 insertions(+), 176 deletions(-) create mode 100644 arch/x86/include/asm/insn-eval.h create mode 100644 arch/x86/include/asm/umip.h create mode 100644 arch/x86/kernel/umip.c create mode 100644 arch/x86/lib/insn-eval.c -- 2.9.3

7 109

Wine 2.8 source code
by Игорь Чебаненко 15 May '17

15 May '17

Wine 2.8 scanned with Cppcheck 1.72 There is A LOT of "noise" but I hope it will be helpfull for you.

1 0

Re: [RFC] README: Update Linux version requirement to 2.3.31.
by wylda＠volny.cz 15 May '17

15 May '17

>>> When I run winecfg, I got: >>> >>> wine: glibc >= 2.3 without NPTL or TLS is not a supported combination. >>> Please upgrade to a glibc with NPTL support. >>> >>> >>> Should I interpret that message, that: >>> 1. NPTL is required >>> 2. I should use glibc-2.2 or lower >>> >>> If 1) that's probably end of game per https://lwn.net/Articles/10465/ >>> * "- The 2.5.36 kernel or above must be installed and used." >>> * "The current snapshot for glibc 2.3 (or glibc 2.3 when released) is >>> necessary." >>> * "The general compiler requirement for glibc is at least gcc 3.2." >>> >>> So for further steps 1) or 2) ? >> >>A glibc using TLS might still work without NPTL, though that may require >>glibc 2.3 anyway. > >Yes, TLS was added to 2.5.29: >https://www.kernel.org/pub/linux/kernel/v2.5/ChangeLog-2.5.29 > >...and further improved in 2.5.32: >https://lwn.net/Articles/7591/ > >> Note that the above requirements are for building >>glibc, not running it. > >Short version: hint for 2.3 is probably not correct > >Longer version based on Glibc's release notes: > >glibc-2.3: Even though TLS support is mentioned as one new feature for this release >the default is not to build glibc with TLS support enabled. This has >several reasons, most of which are out of control of the glibc >developers. Therefore it is necessry to *not* use the --with-tls option >for configure. > >=no support for TLS & NPTL in glibc-2.3. > >glibc-2.3.2: ELF thread-local storage support (TLS) now works on x86-64. >glibc-2.3.2: The sources were also prepared to be used with the NPTL > thread library which is not yet included. > >=no support for NPTL in glibc-2.3.2 itself > >glibc-2.3.3: The main glibc-2.3.3 release >package contains the Native POSIX Threads Library (NPTL) contributed >by Ulrich Drepper, which supports Linux 2.6 kernels only. > > > > The NPTL support was backported to older kernels IIRC. > >It seems, that RedHat did that... >http://rpm.pbone.net/index.php3/stat/4/idpl/18727833/dir/fedora_1/com/kerne… > >I'm not fan of Fedora, so i could try your initially suggested >"A glibc using TLS might still work without NPTL...", i.e. >kernel-2.5.32 + rebuild of glibc-2.3.2, but i find that >glibc recipe pretty painful. But if you are expecting rather >2.4.xx results, that would be for some Fedora/RedHat fans. > >Anyway, i don't see chances for anything like subject mentioned >linux v2.3.31. > One more note: Debian Sarge includes glibc-2.3.2 and shows: "Thread-local storage support included" and does not mention NPTL. But kernel is 2.4.27 (without kernel side TLS), so winecfg complains. So i could also easily try Sarge's alternative kernel 2.6.8 instead of 2.4.27. Then TLS is supported in this glibc without NPTL and see if, winecfg is happy. That is the easiest step.

1 0

Re: [RFC] README: Update Linux version requirement to 2.3.31.
by wylda＠volny.cz 15 May '17

15 May '17

>> When I run winecfg, I got: >> >> wine: glibc >= 2.3 without NPTL or TLS is not a supported combination. >> Please upgrade to a glibc with NPTL support. >> >> >> Should I interpret that message, that: >> 1. NPTL is required >> 2. I should use glibc-2.2 or lower >> >> If 1) that's probably end of game per https://lwn.net/Articles/10465/ >> * "- The 2.5.36 kernel or above must be installed and used." >> * "The current snapshot for glibc 2.3 (or glibc 2.3 when released) is >> necessary." >> * "The general compiler requirement for glibc is at least gcc 3.2." >> >> So for further steps 1) or 2) ? > >A glibc using TLS might still work without NPTL, though that may require >glibc 2.3 anyway. Yes, TLS was added to 2.5.29: https://www.kernel.org/pub/linux/kernel/v2.5/ChangeLog-2.5.29 ...and further improved in 2.5.32: https://lwn.net/Articles/7591/ > Note that the above requirements are for building >glibc, not running it. Short version: hint for 2.3 is probably not correct Longer version based on Glibc's release notes: glibc-2.3: Even though TLS support is mentioned as one new feature for this release the default is not to build glibc with TLS support enabled. This has several reasons, most of which are out of control of the glibc developers. Therefore it is necessry to *not* use the --with-tls option for configure. =no support for TLS & NPTL in glibc-2.3. glibc-2.3.2: ELF thread-local storage support (TLS) now works on x86-64. glibc-2.3.2: The sources were also prepared to be used with the NPTL thread library which is not yet included. =no support for NPTL in glibc-2.3.2 itself glibc-2.3.3: The main glibc-2.3.3 release package contains the Native POSIX Threads Library (NPTL) contributed by Ulrich Drepper, which supports Linux 2.6 kernels only. > The NPTL support was backported to older kernels IIRC. It seems, that RedHat did that... http://rpm.pbone.net/index.php3/stat/4/idpl/18727833/dir/fedora_1/com/kerne… I'm not fan of Fedora, so i could try your initially suggested "A glibc using TLS might still work without NPTL...", i.e. kernel-2.5.32 + rebuild of glibc-2.3.2, but i find that glibc recipe pretty painful. But if you are expecting rather 2.4.xx results, that would be for some Fedora/RedHat fans. Anyway, i don't see chances for anything like subject mentioned linux v2.3.31.

1 0

Re: [RFC] README: Update Linux version requirement to 2.3.31.
by wylda＠volny.cz 15 May '17

15 May '17

>>>If winecfg runs, that should be good enough. Optional packages can be >>>backported if necessary. >>> >> >>OK, then I will concentrate on min kernel version :) >> Currently I build wine-2.8 on machine with: * Linux-v2.4.27-3-386 * gcc-v3.3.5 * libc6-v2.3.2 There were few failures which I overcome by not building these components: * dwrite * winealsa.drv * wmvcore * ws2_32 * programs/winhlp32 When I run winecfg, I got: wine: glibc >= 2.3 without NPTL or TLS is not a supported combination. Please upgrade to a glibc with NPTL support. Should I interpret that message, that: 1. NPTL is required 2. I should use glibc-2.2 or lower If 1) that's probably end of game per https://lwn.net/Articles/10465/ * "- The 2.5.36 kernel or above must be installed and used." * "The current snapshot for glibc 2.3 (or glibc 2.3 when released) is necessary." * "The general compiler requirement for glibc is at least gcc 3.2." So for further steps 1) or 2) ? wmvcore and winhlp32 look like a real bugs. Others failures can be probably be solved by using newer components. I can open bugreports, if anyone is interested. Regards, W.

2 1

Re: [PATCH 2/2] uninstaller: Allocate enough memory to null-terminate the command string
by Alexandre Julliard 15 May '17

15 May '17

Hugh McMaster <hugh.mcmaster(a)outlook.com> writes: > @@ -245,7 +245,7 @@ static int FetchFromRootKey(HKEY root) > type == REG_DWORD && value == 1) > { > static const WCHAR fmtW[] = {'m','s','i','e','x','e','c',' ','/','x','%','s',0}; > - command = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(fmtW) + lstrlenW(subKeyName)) * sizeof(WCHAR)); > + command = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(fmtW) + sizeOfSubKeyName + 1) * sizeof(WCHAR)); The %s in the format gets replaced, so the existing code is fine. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH] dwrite: Fix locale data buffer length passed to GetLocaleInfoEx()
by Alexandre Julliard 15 May '17

15 May '17

Nikolay Sivov <nsivov(a)codeweavers.com> writes: > @@ -1106,8 +1109,8 @@ static HRESULT WINAPI dwritetextanalyzer_GetGlyphs(IDWriteTextAnalyzer2 *iface, > struct scriptshaping_context context; > struct scriptshaping_cache *cache = NULL; > BOOL update_cluster, need_vertical; > + WCHAR digits[native_digits_length]; It would have to be a #define if you want to do this. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [APPDB] query.php: implement query_affected_rows()
by Sebastian Lackner 15 May '17

15 May '17

On 15.05.2017 03:13, Rosanne DiMesio wrote: > +function query_affected_rows(); Does this change work as expected? The ";" at the end of the function definition looks suspicious.

2 1

Re: [PATCH] dwrite/tests: Fix rendering mode variable type (Coverity)
by Sebastian Lackner 14 May '17

14 May '17

On 14.05.2017 22:49, Nikolay Sivov wrote: > - mode1 = IDWriteRenderingParams3_GetRenderingMode(params3); > - ok(mode1 == DWRITE_RENDERING_MODE1_NATURAL_SYMMETRIC, "got %d\n", mode1); > + mode = IDWriteRenderingParams3_GetRenderingMode(params3); > + ok(mode == DWRITE_RENDERING_MODE_NATURAL_SYMMETRIC, "got %d\n", mode1); ^^^^^ What about the remaining occurrence of mode1?

1 0

Re: [v7 PATCH] oleaut32: Improve support for IDispatch in VarCat
by Marvin 12 May '17

12 May '17

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=30935 Your paranoid android. === wxppro (32 bit vartest) === vartest.c:6153: Test failed: got 0x8007000e === w2003std (32 bit vartest) === vartest.c:6153: Test failed: got 0x8007000e === wvistau64 (32 bit vartest) === vartest.c:6153: Test failed: got 0x8007000e === w2008s64 (32 bit vartest) === vartest.c:6153: Test failed: got 0x8007000e === w7u (32 bit vartest) === vartest.c:6153: Test failed: got 0x8007000e === w7pro64 (32 bit vartest) === vartest.c:6153: Test failed: got 0x8007000e === w8 (32 bit vartest) === vartest.c:6153: Test failed: got 0x8007000e === w864 (32 bit vartest) === vartest.c:6153: Test failed: got 0x8007000e === w1064 (32 bit vartest) === vartest.c:6153: Test failed: got 0x8007000e === wvistau64 (64 bit vartest) === vartest.c:6153: Test failed: got 0x8007000e === w2008s64 (64 bit vartest) === vartest.c:6153: Test failed: got 0x8007000e === w7pro64 (64 bit vartest) === vartest.c:6153: Test failed: got 0x8007000e === w864 (64 bit vartest) === vartest.c:6153: Test failed: got 0x8007000e === w1064 (64 bit vartest) === vartest.c:6153: Test failed: got 0x8007000e

1 0

Re: [v6 PATCH] oleaut32: Improve support for IDispatch in VarCat
by Sebastian Lackner 12 May '17

12 May '17

On 12.05.2017 02:11, Alistair Leslie-Hughes wrote: > +static HRESULT WINAPI DummyDispatch_Invoke(IDispatch *iface, > + DISPID dispid, REFIID riid, > + LCID lcid, WORD wFlags, > + DISPPARAMS *params, > + VARIANT *res, > + EXCEPINFO *ei, > + UINT *arg_err) > +{ [...] > + if (FAILED(This->result)) > + return FAILED(This->result); I didn't review the whole patch, but this return value looks suspicious for a HRESULT function.

1 0

Re: [PATCH 8/9] d3dx9: Add test for 'cmp' preshader opcode.
by Matteo Bruni 11 May '17

11 May '17

2017-05-08 17:39 GMT+02:00 Paul Gofman <gofmanp(a)gmail.com>: > Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> > --- > dlls/d3dx9_36/tests/effect.c | 33 +++++++++++++++++++++++++++++---- > 1 file changed, 29 insertions(+), 4 deletions(-) > > diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c > index 015b505..dfc3f5b 100644 > --- a/dlls/d3dx9_36/tests/effect.c > +++ b/dlls/d3dx9_36/tests/effect.c > @@ -4490,7 +4490,8 @@ static void test_preshader_op(IDirect3DDevice9 *device, const DWORD *sample_effe > { > {0, 0, 0}, > {5549, 0, 4}, > - {5400, 2, 1} > + {5400, 2, 1}, > + {4121, 0, 1} > }; You could add a ',' after the new array element so that, if we ever need to add another test, that line doesn't need to be changed. Just mentioning it since you have to resend anyway. > DWORD *test_effect_blob; > HRESULT hr; > @@ -4506,8 +4507,30 @@ static void test_preshader_op(IDirect3DDevice9 *device, const DWORD *sample_effe > > test_effect_blob = HeapAlloc(GetProcessHeap(), 0, sample_effect_blob_size); > memcpy(test_effect_blob, sample_effect_blob, sample_effect_blob_size); > - for (i = 0; i < blob_position[test->args_count].ins_count; ++i) > - test_effect_blob[op_pos + i * op_step] = test->opcode; > + > + if (test->args_count == 3) > + { > + DWORD *pos; > + > + pos = &test_effect_blob[op_pos - 1]; > + *pos++ = 1; > + *pos++ = test->opcode; > + *pos++ = test->args_count; > + for (i = 0; i < 3; ++i) > + { > + *pos++ = 0; > + *pos++ = 2; > + *pos++ = i == 2 ? 4 : 0; > + } > + *pos++ = 0; > + *pos++ = 4; > + *pos++ = 0; > + } > + else > + { > + for (i = 0; i < blob_position[test->args_count].ins_count; ++i) > + test_effect_blob[op_pos + i * op_step] = test->opcode; > + } I think this is getting more and more ugly. What about writing an effect with those 3 preshaders by hand instead? You could start with those edited effect fragments, fixing them up and putting them together in a new effect blob. Sprinkle over some comments as necessary. I'm not going to block the patch for this reason but I think it's something worth exploring.

2 15

Re: [APPDB] admin.php: fix incorrect call to query_affected_rows
by Bruno Jesus 11 May '17

11 May '17

On Thu, May 11, 2017 at 3:27 PM, Rosanne DiMesio <dimesio(a)earthlink.net> wrote: > Should be query_num_rows. > > Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> > --- > admin.php | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/admin.php b/admin.php > index 09c0aca..fe1ccc6 100644 > --- a/admin.php > +++ b/admin.php > @@ -199,7 +199,7 @@ function fixNoteLinks() > > echo " Deleting note links "; > $hResult = query_parameters("DELETE FROM appNotes WHERE linkedWith != '0'"); > - echo "Deleted ".query_affected_rows()." links "; > + echo "Deleted ".query_num_rows()." links "; Is this some particularity of the wrapper database function? I say that because for example both mysql and postgresql have the 2 distinct functions where affected_rows is used for delete/update and num_rows is used for select queries.

1 0

Re: [APPDB] admin.php: fix incorrect call to query_affected_rows
by Michael Müller 11 May '17

11 May '17

Am 11.05.2017 um 20:27 schrieb Rosanne DiMesio: > $hResult = query_parameters("DELETE FROM appNotes WHERE linkedWith != '0'"); > - echo "Deleted ".query_affected_rows()." links "; > + echo "Deleted ".query_num_rows()." links "; I suspect the new code is as broken as the old one. The function query_num_rows returns the number of query results, which is always zero for a DELETE query. The correct solution would be to implement query_affected_rows() based on the corresponding php function [1]. [1]: http://php.net/manual/de/mysqli.affected-rows.php

1 0

Re: [PATCH] winemac.drv: Implement systray version 1-3 notifications.
by Ken Thomases 11 May '17

11 May '17

On May 11, 2017, at 6:15 AM, Stefan Dösinger <stefan(a)codeweavers.com> wrote: > > Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> > > --- > > I am not sure how to handle NOTIFY_VERSION_4. The click events do not contain > a coordinate and I don't know how to read the position of the icon. The first > issue is probably trivial to handle by assuming a fixed coordinate because the > icon isn't all that big anyway. The latter is a larger problem because a wrong > coordinate could cause an app to show a popup in the wrong place. Also on dual > screen setups there are two copies of the status bar and two icon copies. Pick > the wrong one and things go bad as well. Thanks. I've sent a modified version that properly handles version 4. The internal events that you were looking at didn't contain the position, but can be made to. :) -Ken

1 0

Re: [PATCH] oleaut32: Improve support for IDispatch in VarCat
by Jacek Caban 11 May '17

11 May '17

Hi Alistair, On 17.04.2017 05:43, Alistair Leslie-Hughes wrote: > diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c > index 17f753af70..6f695c3f37 100644 > --- a/dlls/oleaut32/variant.c > +++ b/dlls/oleaut32/variant.c > @@ -2611,6 +2611,13 @@ HRESULT WINAPI VarCat(LPVARIANT left, LPVARIANT right, LPVARIANT out) > V_VT(&bstrvar_left) = VT_BSTR; > V_BSTR(&bstrvar_left) = SysAllocString(sz_empty); > } > + else if (rightvt == VT_DISPATCH) > + { > + /* The returned Dispatch Value, may not be able to be coerced, ie. VT_NULL */ > + hres = VariantChangeTypeEx(&bstrvar_left,left,0,0,VT_BSTR); > + if (hres != S_OK && hres != DISP_E_TYPEMISMATCH) > + return hres; > + } > else > { > hres = VariantChangeTypeEx(&bstrvar_left,left,0,0,VT_BSTR); > @@ -2651,6 +2658,13 @@ HRESULT WINAPI VarCat(LPVARIANT left, LPVARIANT right, LPVARIANT out) > V_VT(&bstrvar_right) = VT_BSTR; > V_BSTR(&bstrvar_right) = SysAllocString(sz_empty); > } > + else if (rightvt == VT_DISPATCH) > + { > + /* The returned Dispatch Value, may not be able to be coerced, ie. VT_NULL */ > + hres = VariantChangeTypeEx(&bstrvar_right,right,0,0,VT_BSTR); > + if (hres != S_OK && hres != DISP_E_TYPEMISMATCH) > + return hres; > + } > else > { > hres = VariantChangeTypeEx(&bstrvar_right,right,0,0,VT_BSTR); While this change may do the right thing in the case you're fixing, the whole surrounding code looks just wrong and I don't like the idea of making it even more complicated to work around problem in this single case. For example take a look at if() statement in line 2620. It's never executed, because it requires leftvt to be VT_NULL, which is handled elsewhere (line 2609). If you remove that if(), this call is almost identical to what you add here as a special case. The only difference is DISP_E_TYPEMISMATCH handling. Did you investigate what happens in such case? Maybe we should handle VariantChangeTypeEx failures like you do in the patch? Thanks, Jacek

1 0

Re: [PATCH 3/9] d3dx9: Add 'asin' preshader opcode.
by Matteo Bruni 11 May '17

11 May '17

2017-05-08 17:39 GMT+02:00 Paul Gofman <gofmanp(a)gmail.com>: > +/* is_nan() does not work (by design) if compiled with gcc -ffinite-math-only option which is implied by > + * -ffast_math. */ > +static BOOL pres_is_nan(double v) > +{ > + return (*(ULONG64 *)&v & 0x7ff8000000000000) == 0x7ff8000000000000; > +} I don't think we care about people compiling Wine with broken CFLAGS. We should just trust the isnan() library function. FWIW we already do so in other places in Wine.

2 3

Re: [PATCH 7/7] wined3d: Add support for patch constant signatures.
by Henri Verbeet 11 May '17

11 May '17

On 10 May 2017 at 15:54, Józef Kucia <jkucia(a)codeweavers.com> wrote: > + if (FAILED(hr = shader_signature_calculate_strings_length(&desc->input_signature, &len))) > + return hr; > + total = len; > + if (FAILED(hr = shader_signature_calculate_strings_length(&desc->output_signature, &len))) > + return hr; > + total += len; > + if (FAILED(hr = shader_signature_calculate_strings_length(&desc->patch_constant_signature, &len))) > + return hr; > + total += len; It's perhaps a fairly theoretical concern, but I think you can still make "total" overflow here.

1 0

Re: [PATCH 3/6 v2] dmusic: Implement IDirectMusic8::SetDirectSound()
by Sebastian Lackner 10 May '17

10 May '17

On 10.05.2017 15:13, Michael Stefaniuc wrote: > + > + if (This->dsound) > + IDirectSound_Release(This->dsound); > + > + if (!dsound) { > + hr = DirectSoundCreate8(NULL, (IDirectSound8 **)&This->dsound, NULL); > + if (FAILED(hr)) > + return hr; > + hr = IDirectSound_SetCooperativeLevel(This->dsound, hwnd ? hwnd : GetForegroundWindow(), > + DSSCL_PRIORITY); > + if (FAILED(hr)) > + IDirectSound_Release(This->dsound); > + return hr; > + } > Shouldn't you unset This->dsound in the error paths (especially the last one)?

2 1

Re: [PATCH 3/6] d3d11/tests: Port test_clear_state() from d3d10core.
by Henri Verbeet 10 May '17

10 May '17

On 9 May 2017 at 12:51, Józef Kucia <jkucia(a)codeweavers.com> wrote: > + refcount = ID3D11Device_Release(device); > + ok(!refcount, "Device has %u references left.\n", refcount); > +} This test hangs for me on Windows. Specifically, the issue seems to be the final release of the device.

2 1

Wine native fps overlay
by CARLOS RODRIGUEZ 10 May '17

10 May '17

>The big picture answer to your feature requests is that Wine is a tool to run Windows apps and all these things are side features that can be added with other tools and partially exist in drivers.If we add code for that it needs to be maintained, taking away attention from our main goal. I once tried to make FRAPS run in Wine, which would give you an option to add an FPS overlay to pretty much all d3d or GL apps. Unfortunately its DLL injection code doesn't work, and fixing it would require changes to the linker and/or dynamic loader, which is rather tricky. Likewise you can write a more generic FPS limiting or vsync forcing tool with LD_PRELOAD. That way it would also work with non-wine apps.>Unfortunate but for now nikolay suggestion (WINEDEBUG=-all,+fps) works without issues (only shows fps information and seems improve performance in some apps too)

1 0

Re: [PATCH] ws2_32: Use unsigned interface index on interface_bind_check
by Alexandre Julliard 10 May '17

10 May '17

Bruno Jesus <bjesus(a)codeweavers.com> writes: > The exotic interface indexes used by linux for tun/ppp connections may > cause problems resulting in interface_bind_check not finding the > expected interface during loop. > > Signed-off-by: Bruno Jesus <bjesus(a)codeweavers.com> > --- > dlls/ws2_32/socket.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) The error checking would need to be adapted then, checking ifindex > 0 no longer makes much sense. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [v4 PATCH 2/3] include/wmsdkidl.idl: Add more interfaces
by Alex Henrie 10 May '17

10 May '17

Getting closer. + HRESULT GetPriorityRecords( + [out] WM_STREAM_PRIORITY_RECORD *arrray, + [in, out] WORD *records); + + HRESULT SetPriorityRecords( + [in] WM_STREAM_PRIORITY_RECORD *arrray, + [in] WORD records); "array" is spelled with two R's. + HRESULT ResetLoggingUrlList( ); None of the other zero-argument functions in this file have a space between the parentheses. + HRESULT SetMaxPacketSize([in] DWORD size); + HRESULT SetMinPacketSize([in] DWORD size); None of the other functions in this file have two spaces between [in] and the variable type. + HRESULT GetPlayOutputLevels( + [out, size_is( *length )] DRM_PLAY_OPL *play, + [in, out] DWORD *length, + [out] DWORD *level); + + HRESULT GetCopyOutputLevels( + [out, size_is( *length )] DRM_COPY_OPL *copy, + [in, out] DWORD *length, + [out] DWORD *compliance); Why did you name the variable "level" in the first function and "compliance" in the second? It seems like they should be the same. -Alex

1 0

Re: [v3 PATCH 2/3] include/wmsdkidl.idl: Add more interfaces
by Alex Henrie 10 May '17

10 May '17

These functions have formatting inconsistencies: + HRESULT GetPriorityRecords( + [out] WM_STREAM_PRIORITY_RECORD *arrray, + [in, out] WORD *records); + HRESULT SetPriorityRecords( + [in] WM_STREAM_PRIORITY_RECORD *arrray, + [in] WORD records); + HRESULT ResetLoggingUrlList( ); + HRESULT SetMaxPacketSize([in] DWORD size); + HRESULT SetMinPacketSize([in] DWORD size); + HRESULT GetDRMProperty( + [in] const WCHAR *name, + [out] WMT_ATTR_DATATYPE* type, + [out, size_is( *length )] BYTE *value, + [in, out] WORD *length); These functions have naming inconsistencies: + HRESULT GetPlayOutputLevels( + [out, size_is( *length )] DRM_PLAY_OPL *play, + [in, out] DWORD *length, + [out] DWORD *pdwMinAppComplianceLevel); + HRESULT GetTimecodeRangeBounds( + [in] WORD stream, + [in] WORD Range, + [out] DWORD *start_timecode, + [out] DWORD *end_timecode); Please spend some time double and triple checking before submitting again. -Alex

1 0

Re: [v2 PATCH 2/3] include/wmsdkidl.idl: Add more interfaces
by Alex Henrie 10 May '17

10 May '17

The formatting is a little better now, but it's still all over the place. Please make every function declaration match the existing code in this file. For example, for a function with one argument: HRESULT GetType([out] GUID *guid); And for a function with multiple arguments: HRESULT GetProxyPort( [in] LPCWSTR protocol, [out] DWORD *port); -Alex

1 0

Re: [PATCH 2/3] include/wmsdkidl.idl: Add more interfaces
by Alex Henrie 10 May '17

10 May '17

- WMT_CODECINFO_UNKNOWN = 0xFFFFFFFF, + WMT_CODECINFO_UNKNOWN = 0xffffffff, I think this qualifies as a gratuitous formatting change. + HRESULT GetBandwidth( [out] DWORD *bitrate, + [out] DWORD *buffer ); + + HRESULT SetBandwidth( [in] DWORD bitrate, + [in] DWORD buffer ); The extra spaces after the left parentheses look like a mistake; they don't match the format in the rest of the file. + HRESULT GetBandwidthSharing( [in] DWORD index, + [out] IWMBandwidthSharing **bandwidth ); + HRESULT GetExpectedPacketCount( [in] QWORD duration, + [out] QWORD *packets ); + HRESULT SetDRMProperty( [in] const WCHAR *name, [in] WMT_ATTR_DATATYPE type, + [in, size_is( length )] const BYTE *value, + [in] WORD length ); + HRESULT GetDRMProperty( [in] const WCHAR *name, [out] WMT_ATTR_DATATYPE* type, + [out, size_is( *length )] BYTE *value, + [in, out] WORD *length ); Again, pick a whitespace style and stick to it. In particular, decide whether you want to break the line after each variable or after reaching 80, 100, or 120 characters. -Alex

3 3

Re: [RFC] README: Update Linux version requirement to 2.3.31.
by wylda＠volny.cz 09 May '17

09 May '17

>>If winecfg runs, that should be good enough. Optional packages can be >>backported if necessary. >> > >OK, then I will concentrate on min kernel version :) > Currently blocked by Bug 42986.

1 0

Wine native fps overlay
by CARLOS RODRIGUEZ 09 May '17

09 May '17

>You suppress the rest of traces, like -all,+fps. >Many thanks i dont know this option can be used at same time, i thinking -all can disable +fpsAlmost forget will be posible wine can add some fps limiter, this will be usefull in many older titles when vsync dont workThanks again

3 2

Re: [PATCH 3/3] mshtml: Use IE version dependent on compatibility mode for conditional comments.
by Marvin 09 May '17

09 May '17

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=30879 Your paranoid android. === w7u (32 bit htmldoc) === htmldoc.c:2671: Test failed: unexpected call GetOverrideKeyPath

1 0

Re: [PATCH 1/3] mshtml: Don't expose doScroll in IE11 document mode.
by Marvin 09 May '17

09 May '17

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=30878 Your paranoid android. === w7u (32 bit htmldoc) === htmldoc.c:2671: Test failed: unexpected call GetOverrideKeyPath

1 0

Re: [PATCH] ws2_32: Don't post completion packet if receiving fails with error immediately.
by Bruno Jesus 09 May '17

09 May '17

On Mon, May 8, 2017 at 4:41 PM, Stefan Dösinger <stefan(a)codeweavers.com> wrote: > This fixes bug 38980. > > This patch is the equivalent to 1bbe92e7 for receiving operations. > Application in bug 38980 uses libtorrent, which in turn uses boost's > async IO classes. Boost starts IO operations and waits for their results > via IOCP. If the operation fails right away it enqueues a completion > status itself. By failing and enquing a status we broke Boost's > receiving logic - after the first status was read the internal data was > reused elsewhere (though the pointer was not freed). The second IOCP > result caused boost to call libtorrent's callback function with bad > parameters, ultimately causing a segfault or assertion violation in > libtorrent. Awesome work, thanks ;-) Some unused SetLastError calls and since I'm sending an email why not complain more? > Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> > --- > dlls/ws2_32/socket.c | 2 - > dlls/ws2_32/tests/sock.c | 127 +++++++++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 127 insertions(+), 2 deletions(-) > > diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c > index 9d27fab..0950754 100644 > --- a/dlls/ws2_32/socket.c > +++ b/dlls/ws2_32/socket.c > @@ -7744,9 +7744,7 @@ static int WS2_recv_base( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, > > if (errno != EAGAIN) > { > - int loc_errno = errno; > err = wsaErrno(); > - if (cvalue) WS_AddCompletion( s, cvalue, sock_get_ntstatus(loc_errno), 0 ); > goto error; > } > } > diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c > index 023eb42..7fefff5 100644 > --- a/dlls/ws2_32/tests/sock.c > +++ b/dlls/ws2_32/tests/sock.c > @@ -9299,6 +9299,133 @@ static void test_completion_port(void) > if (dest != INVALID_SOCKET) > closesocket(dest); > > + /* Test IOCP response on successful immediate read. */ > + tcp_socketpair(&src, &dest); > + if (src == INVALID_SOCKET || dest == INVALID_SOCKET) > + { > + skip("failed to create sockets\n"); > + goto end; > + } > + > + bufs.len = sizeof(buf); > + bufs.buf = buf; > + flags = 0; > + > + iret = WSASend(src, &bufs, 1, &num_bytes, 0, &ov, NULL); > + ok(!iret, "WSASend failed - %d\n", iret); Some winsock functions are basically boolean where 0 is true and SOCKET_ERROR is false, so (I believe) in most other places we use "WSASend failed with error %d", GetLastError()). This would require a previous SetLastError. > + ok(num_bytes == sizeof(buf), "Managed to send %d\n", num_bytes); I believe most code in ws2_32 prefer "Expected X, got Y\n". > + > + io_port = CreateIoCompletionPort((HANDLE)dest, previous_port, 125, 0); > + ok(io_port != NULL, "failed to create completion port %u\n", GetLastError()); > + > + set_blocking(dest, FALSE); > + > + Sleep(100); Better to remove the extra new empty line as in the other use of Sleep there is no empty line. Besides it makes it harder for AJ to see you are adding sleep to tests :-) > + > + num_bytes = 0xdeadbeef; > + SetLastError(0xdeadbeef); SetLastError forever alone, no GetLastError. Maybe reuse the format from above? > + flags = 0; > + > + iret = WSARecv(dest, &bufs, 1, &num_bytes, &flags, &ov, NULL); > + ok(!iret, "WSARecv failed - %d\n", iret); > + ok(num_bytes == sizeof(buf), "Managed to read %d\n", num_bytes); Reuse expected/got message format? > + SetLastError(0xdeadbeef); > + key = 0xdeadbeef; > + num_bytes = 0xdeadbeef; > + olp = (WSAOVERLAPPED *)0xdeadbeef; > + > + bret = GetQueuedCompletionStatus( io_port, &num_bytes, &key, &olp, 200 ); > + ok(bret == TRUE, "failed to get completion status %u\n", bret); > + ok(GetLastError() == 0xdeadbeef, "Last error was %d\n", GetLastError()); > + ok(key == 125, "Key is %lu\n", key); > + ok(num_bytes == sizeof(buf), "Number of bytes transferred is %u\n", num_bytes); > + ok(olp == &ov, "Overlapped structure is at %p\n", olp); > + > + /* Test IOCP response on graceful shutdown. */ > + closesocket(src); > + Sleep(100); > + > + num_bytes = 0xdeadbeef; > + SetLastError(0xdeadbeef); No GetLastError. > + flags = 0; > + memset(&ov, 0, sizeof(ov)); > + > + iret = WSARecv(dest, &bufs, 1, &num_bytes, &flags, &ov, NULL); > + ok(!iret, "WSARecv failed - %d\n", iret); > + ok(!num_bytes, "Managed to read %d\n", num_bytes); > + > + SetLastError(0xdeadbeef); > + key = 0xdeadbeef; > + num_bytes = 0xdeadbeef; > + olp = (WSAOVERLAPPED *)0xdeadbeef; > + > + bret = GetQueuedCompletionStatus( io_port, &num_bytes, &key, &olp, 200 ); > + ok(bret == TRUE, "failed to get completion status %u\n", bret); > + ok(GetLastError() == 0xdeadbeef, "Last error was %d\n", GetLastError()); > + ok(key == 125, "Key is %lu\n", key); > + ok(!num_bytes, "Number of bytes transferred is %u\n", num_bytes); > + ok(olp == &ov, "Overlapped structure is at %p\n", olp); > + > + closesocket(src); > + src = INVALID_SOCKET; > + closesocket(dest); > + dest = INVALID_SOCKET; > + > + /* Test IOCP response on hard shutdown. */ > + tcp_socketpair(&src, &dest); > + if (src == INVALID_SOCKET || dest == INVALID_SOCKET) > + { > + skip("failed to create sockets\n"); > + goto end; > + } > + > + bufs.len = sizeof(buf); > + bufs.buf = buf; > + flags = 0; > + memset(&ov, 0, sizeof(ov)); > + > + ling.l_onoff = 1; > + ling.l_linger = 0; > + iret = setsockopt (src, SOL_SOCKET, SO_LINGER, (char *) &ling, sizeof(ling)); > + ok(!iret, "Failed to set linger %d\n", GetLastError()); > + > + io_port = CreateIoCompletionPort((HANDLE)dest, previous_port, 125, 0); > + ok(io_port != NULL, "failed to create completion port %u\n", GetLastError()); > + > + set_blocking(dest, FALSE); > + > + closesocket(src); > + src = INVALID_SOCKET; > + > + Sleep(100); > + > + num_bytes = 0xdeadbeef; > + SetLastError(0xdeadbeef); > + > + /* Somehow a hard shutdown doesn't work on my Linux box. It seems SO_LINGER is ignored. */ AFAIR this is not your fault, it is a bug. WSARecv has a particular behavior of not returning a "0 bytes read", instead it returns error with WSAECONNRESET. Wine simply returns success with 0 bytes, which stands for connection reset in the old recv() way. This explains the 3 todo_wine below. > + iret = WSARecv(dest, &bufs, 1, &num_bytes, &flags, &ov, NULL); > + todo_wine ok(iret == SOCKET_ERROR, "WSARecv failed - %d\n", iret); > + todo_wine ok(GetLastError() == WSAECONNRESET, "Last error was %d\n", GetLastError()); > + todo_wine ok(num_bytes == 0xdeadbeef, "Managed to send %d\n", num_bytes); Expected/got format? If not the sentence is wrong: send/recv. > + > + SetLastError(0xdeadbeef); > + key = 0xdeadbeef; > + num_bytes = 0xdeadbeef; > + olp = (WSAOVERLAPPED *)0xdeadbeef; > + > + bret = GetQueuedCompletionStatus( io_port, &num_bytes, &key, &olp, 200 ); > + todo_wine ok(bret == FALSE, "GetQueuedCompletionStatus returned %u\n", bret ); > + todo_wine ok(GetLastError() == WAIT_TIMEOUT, "Last error was %d\n", GetLastError()); > + todo_wine ok(key == 0xdeadbeef, "Key is %lu\n", key); > + todo_wine ok(num_bytes == 0xdeadbeef, "Number of bytes transferred is %u\n", num_bytes); > + todo_wine ok(!olp, "Overlapped structure is at %p\n", olp); > + > + num_bytes = 0xdeadbeef; > + SetLastError(0xdeadbeef); > + > + closesocket(dest); > + > dest = socket(AF_INET, SOCK_STREAM, 0); > if (dest == INVALID_SOCKET) > { > -- > 2.10.2 > > >

3 2

Re: [APPDB] Remove Steam and GOG from licenses
by Bruno Jesus 09 May '17

09 May '17

On Mon, May 8, 2017 at 6:09 PM, Rosanne DiMesio <dimesio(a)earthlink.net> wrote: > Steam and GOG are distribution platforms, not licenses. See bug 42970. Entries already using the mistakenly-added items will have to be manually fixed in the live database. What about changing them into a single LICENSE_DIGITAL which would encompass all online platforms.

2 1

Re: [RFC] README: Update Linux version requirement to 2.3.31.
by wylda＠volny.cz 08 May '17

08 May '17

>> 1) So question is - if winecfg shows up. Is that supported? Is it enough, >> when that _big_ "WARNING:" will be resolved (disappears), is such wine >> package supported? Most of them would be easy to overcome, except >> XInput2 + libOSMesa which needs IMHO deeper dependencies. > >If winecfg runs, that should be good enough. Optional packages can be >backported if necessary. > OK, then I will concentrate on min kernel version :)

1 0

Re: [RFC] README: Update Linux version requirement to 2.3.31.
by wylda＠volny.cz 08 May '17

08 May '17

> >None of those are needed by winecfg. They would be needed by some >applications, though. > I'm aware of it. But the idea is elsewhere... There are two approaches: 1. i will strictly find the lowest kernel on which i'm able to run winecfg but probably not much more... 2. i will find minimum requirements like pcap-v1.8.1 etc. so, that we can get rid of those generic: "configure: libpulse development files not found or __too__ __old__" but user will be given exact version (for Linux and those who care about other OS can do the same). Let's face it - most of programs says for example something like min supported OS: Win7 and higher) Isn't that "Bug 42478 - Undeclared O_CLOEXEC use in qcap DLL" about this? Quick googling sugest "O_CLOEXEC (Since Linux 2.6.23)". With commit dfd22fb294c6ce9c3daba311f96ca3b4933d265c shouldn't be min requirements bumped to linux-2.6.23 ?? Sure there is https://github.com/wine-compholio/wine-staging/blob/master/patches/qcap-O_C… Then two users having wine-2.7, but with totally different behavior, which is definitely harder to support... Maybe that's OK and then wine probably doesn't need nothing like minimum requirements. If we don't play on min requirements = it's normal, that some parts of wine do not work. Why there are two kinds of warning? a) configure: libmpg123 development files not found (or too old), mp3 codec won't be supported. b) configure: WARNING: libgnutls development files not found, no schannel support.

1 0

Re: [RFC] README: Update Linux version requirement to 2.3.31.
by wylda＠volny.cz 08 May '17

08 May '17

>> >> Isn't commit https://source.winehq.org/git/wine.git/commitdiff/9f06a197c8c156acf21d8d809… >> about this? > >For that specific issue, yes. But it would be interesting to find out if >there are other issues that we aren't aware of, and whether they would >be worth trying to fix. Plan was: Debian 3.0 Woody i386 ===================== * Released 2002-07-19 * kernel v2.2.20, v2.4.6 kernel is also included Debian 3.1 Sarge i386 ===================== * Released 2005-06-06 * Linux kernel v2.4.27, v2.6.8 Debian 4.0 Etch i386 ==================== * Released 2007-04-08 * Linux kernel v2.6.18 After getting these, i started with Etch and wine-2.7. I installed all needed & available *-dev packages. Nevertheless i got: configure: XInput2 headers not found, the XInput 2 extension won't be supported. configure: libOSMesa development files not found (or too old), OpenGL rendering in bitmaps won't be supported. configure: OpenCL development files not found, OpenCL won't be supported. configure: pcap development files not found, wpcap won't be supported. configure: liblcms2 development files not found, Color Management won't be supported. configure: libpulse development files not found or too old, Pulse won't be supported. configure: gstreamer-1.0 base plugins development files not found, gstreamer support disabled configure: OSS sound system found but too old (OSSv4 needed), OSS won't be supported. configure: libudev development files not found, plug and play won't be supported. configure: libmpg123 development files not found (or too old), mp3 codec won't be supported. configure: libopenal development files not found (or too old), OpenAL won't be supported configure: openal-soft development files not found (or too old), XAudio2 won't be supported configure: WARNING: libgnutls development files not found, no schannel support. configure: Finished. Do 'make' to compile Wine. 1) So question is - if winecfg shows up. Is that supported? Is it enough, when that _big_ "WARNING:" will be resolved (disappears), is such wine package supported? Most of them would be easy to overcome, except XInput2 + libOSMesa which needs IMHO deeper dependencies. Anyway, configure suggest "do make". In that case compilation fails with: gcc -c -o v4l.o ../../../wine_git_src/dlls/qcap/v4l.c -I. -I../../../wine_git_src/dlls/qcap \ -I../../include -I../../../wine_git_src/include -D__WINESRC__ -D_REENTRANT -fPIC -Wall -pipe \ -fno-strict-aliasing -Wdeclaration-after-statement -Wstrict-prototypes -Wwrite-strings \ -Wpointer-arith -gdwarf-2 -fno-omit-frame-pointer ../../../wine_git_src/dlls/qcap/v4l.c: In function ‘qcap_driver_init’: ../../../wine_git_src/dlls/qcap/v4l.c:802: error: ‘O_CLOEXEC’ undeclared (first use in this function) ../../../wine_git_src/dlls/qcap/v4l.c:802: error: (Each undeclared identifier is reported only once ../../../wine_git_src/dlls/qcap/v4l.c:802: error: for each function it appears in.) make[1]: *** [v4l.o] Error 1 make[1]: Leaving directory `/build/wine_git_bin_32/dlls/qcap' 2) And this also happens with "./configure --without-v4l" so probably real bug? 3) That "libpcap0.8-dev" isn't that old. So i looked closer and it appears, that it fails because of missing "port.h". IMHO that comes from kernel headers as i have it in v4.9, but not in v2.6.18. So minimum is not 2.3.31, but 2.6.18+ / 3.x ? or where that port.h appeared for the first time ?? ... configure:6945: checking pcap/pcap.h usability configure:6945: gcc -c -g -O0 conftest.c >&5 configure:6945: $? = 0 configure:6945: result: yes configure:6945: checking pcap/pcap.h presence configure:6945: gcc -E conftest.c configure:6945: $? = 0 configure:6945: result: yes configure:6945: checking for pcap/pcap.h configure:6945: result: yes configure:6945: checking poll.h usability configure:6945: gcc -c -g -O0 conftest.c >&5 configure:6945: $? = 0 configure:6945: result: yes configure:6945: checking poll.h presence configure:6945: gcc -E conftest.c configure:6945: $? = 0 configure:6945: result: yes configure:6945: checking for poll.h configure:6945: result: yes configure:6945: checking port.h usability configure:6945: gcc -c -g -O0 conftest.c >&5 conftest.c:93:18: error: port.h: No such file or directory Before taking any other steps, i'll try to wait for feedback on 1), 2) and 3) Regards, W.

3 2

Re: [v5 PATCH 1/4] mfplat: Implement MFTRegister
by Alexandre Julliard 08 May '17

08 May '17

Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> writes: > + if (cinput && input_types) > + { > + size = cinput * sizeof(MFT_REGISTER_TYPE_INFO); > + types = HeapAlloc(GetProcessHeap(), 0, size); > + if (!types) goto err; > + > + memcpy(types, input_types, size); > + > + ret = RegSetValueExW(hclsid, inputtypesW, 0, REG_BINARY, (BYTE *)types, size); > + HeapFree(GetProcessHeap(), 0, types); > + if (ret) goto err; Again, why do you need a copy? -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 2/9] winemac.drv: EnumDisplayDevices placeholder implementation
by Ken Thomases 08 May '17

08 May '17

Hi, Thanks for taking this up again… On Apr 24, 2017, at 3:48 PM, Donat Enikeev <donat(a)enikeev.net> wrote: > > Based on Ken Thomases <ken(a)codeweavers.com> staging patches > > Signed-off-by: Donat Enikeev <donat(a)enikeev.net> > --- > dlls/winemac.drv/display.c | 51 +++++++++++++++++++++++++++++++++++++++ > dlls/winemac.drv/winemac.drv.spec | 1 + > 2 files changed, 52 insertions(+) This doesn't build: display.c:1007:13: error: use of undeclared identifier 'monitors' if (monitors[iDevNum].dwFlags & MONITORINFOF_PRIMARY) ^ display.c:1010:80: error: use of undeclared identifier 'monitors' memcpy(lpDisplayDevice->DeviceName, monitors[iDevNum].szDevice, sizeof(monitors[iDevNum].szDevice)); ^ display.c:1010:45: error: use of undeclared identifier 'monitors' memcpy(lpDisplayDevice->DeviceName, monitors[iDevNum].szDevice, sizeof(monitors[iDevNum].szDevice)); ^ Is this patch written on the assumption that some other staging patches have already been applied? Beyond that, can you explain the rationale of moving the implementation of EnumDisplayDevices to the drivers? My patches implemented it in user32 based on EnumDisplayMonitors() and GetMonitorInfoW(). It may be somewhat clunky, but has the advantage that it ensures all three functions return mutually consistent results. Since you appear to have dropped my patches which caused GetMonitorInfoW() to return unique names for the displays, they are no longer consistent. GetMonitorInfoW() always uses "\\.\DISPLAY1" for all monitors while this implementation of EnumDisplayDevices() attempts to use "\\.\DISPLAY2", etc., for secondary and subsequent monitors. For what it's worth, my original patches were rejected because Alexandre wanted the tracking and management of displays and display modes centralized in the explorer process[1]. I have my reservations about that approach, mind you. ;) [1] https://www.winehq.org/pipermail/wine-devel/2014-March/103680.html Issues with other patches in the series: Patch 1: \ No newline at end of file Patches 1 and 2 ought to come after 3. In the current order, they introduce dead code. -Ken

2 3

Outreachy: Rosanne DiMesio accepted for AppDB Improvements
by Austin English 08 May '17

08 May '17

Howdy all, Please welcome me in congratulating Roseanne on being accepted for Outreachy. She will be working on improving the AppDB (which greatly needs it), and is being mentored by Jeremy Newman. Congrats Rosanne! -- -Austin GPG: 14FB D7EA A041 937B

4 3

Re: [PATCH 2/6] wined3d: Disable EXT_TEXTURE_LOD_BIAS on core profile.
by Henri Verbeet 08 May '17

08 May '17

On 7 May 2017 at 20:32, Matteo Bruni <mbruni(a)codeweavers.com> wrote: > Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> > --- > glTexEnvf(..., GL_TEXTURE_LOD_BIAS, ...) is not available in core profile. > Just disable the extension for now. > Is the extension advertised on core profiles then?

2 3

Re: [PATCH 4/6] wined3d: Disable YUV formats when fixups are not supported.
by Henri Verbeet 08 May '17

08 May '17

On 7 May 2017 at 20:32, Matteo Bruni <mbruni(a)codeweavers.com> wrote: > @@ -5192,8 +5193,19 @@ static BOOL wined3d_check_surface_capability(const struct wined3d_format *format > > if (format->glInternal) > { > - TRACE("[OK]\n"); > - return TRUE; > + switch (format->id) > + { > + case WINED3DFMT_YUY2: > + case WINED3DFMT_UYVY: > + case WINED3DFMT_YV12: > + case WINED3DFMT_NV12: > + TRACE("%s\n", gl_info->supported[ARB_FRAGMENT_PROGRAM] > + ? "[OK]" : "[FAILED] - No YUV fixups support."); > + return gl_info->supported[ARB_FRAGMENT_PROGRAM]; > + default: > + TRACE("[OK]\n"); > + return TRUE; > + } Generally speaking, we've been moving away from this kind of "list some formats somewhere" approach. If we really have to disable these formats, I'd argue apply_format_fixups() would be the correct place, since creating the surfaces should probably also fail then. There's also an argument that the CPU blitter should be able to handle these though.

1 0

Re: [PATCH 3/6] wined3d: Disable ARB program extensions on core profile.
by Henri Verbeet 08 May '17

08 May '17

On 7 May 2017 at 20:32, Matteo Bruni <mbruni(a)codeweavers.com> wrote: > None of the ARBfp shader backend, fragment pipe replacement or blitter > are currently in working condition in core profiles (nor they are > expected to be in the foreseeable future). > Sure, but you can just check for WINED3D_GL_LEGACY_CONTEXT in e.g. wined3d_arbfp_blitter_create(). (And arguably, the shader backend and fragment pipe cases can't even happen unless you took extra steps to break your setup.)

1 0

Re: [PATCH 4/6] wined3d: Disable YUV formats when fixups are not supported.
by Stefan Dösinger 08 May '17

08 May '17

> Am 07.05.2017 um 20:32 schrieb Matteo Bruni <mbruni(a)codeweavers.com>: > > + switch (format->id) > + { > + case WINED3DFMT_YUY2: > + case WINED3DFMT_UYVY: > + case WINED3DFMT_YV12: > + case WINED3DFMT_NV12: > + TRACE("%s\n", gl_info->supported[ARB_FRAGMENT_PROGRAM] > + ? "[OK]" : "[FAILED] - No YUV fixups support."); > + return gl_info->supported[ARB_FRAGMENT_PROGRAM]; Once upon a time blitting YUY2 and UYVY via regular 3D draws worked with GL_APPLE_ycbcr_422, and afaics the necessary format definitions are still in place.

1 0

Re: [PATCH] msi: Add MsiGetPatchFileListA/W stubs.
by Hans Leidekker 08 May '17

08 May '17

On Mon, 2017-05-08 at 00:47 +0300, Andrey Gusev wrote: > +UINT WINAPI MsiGetPatchFileListA(LPCSTR szProductCode, LPCSTR szPatchList, > + LPDWORD pcFiles, MSIHANDLE **pphFileRecords) > +{ > + FIXME("(%s, %s, %p, %p) stub!\n", debugstr_a(szProductCode), > + debugstr_a(szPatchList), pcFiles, pphFileRecords); > + return ERROR_SUCCESS; You should set the output parameters to sensible values, or return an error.

1 0

Re: [PATCH v2 5/6] wined3d: Fix specular lighting calculation.
by Marvin 07 May '17

07 May '17

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=30826 Your paranoid android. === w1064 (32 bit visual) === visual.c:8016: Test failed: Got unexpected color 0x00008080 for quad 2 (different colors). === w1064 (64 bit visual) === visual.c:8016: Test failed: Got unexpected color 0x00007580 for quad 2 (different colors).

1 0

Re: [PATCH] user32: Removed 16-bit windows position trunc in WINPOS_SetPlacement.
by Alexandre Julliard 06 May '17

06 May '17

Kees Beets <kbeets68(a)gmail.com> writes: > Fixes https://bugs.winehq.org/show_bug.cgi?id=38231 > > Replaced SetWindowPos in WINPOS_SetPlacement with an implementation that > does not truncate windows positions to 16-bit. Fixes a bug in Adobe > Lightroom under wine that is not present under windows (7, 8, 10), > while still running all win tests successfully. It's good that it doesn't break the other tests, but since we currently don't have tests for SetWindowPlacement, that's not very convincing. You'd want to add some tests at least for the truncation thing, and also probably some for the message sequences. -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: [PATCH] msvcp90: Call invalid_parameter_handler on index out of range in basic_string::operator[]
by Piotr Caban 05 May '17

05 May '17

On 05/05/17 19:01, Piotr Caban wrote: > Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> > --- > dlls/msvcp90/string.c | 13 ++++++++----- > 1 file changed, 8 insertions(+), 5 deletions(-) Please ignore this patch for now. Thanks, Piotr

1 0

Re: [PATCH] wined3d: Add NVIDIA GTX 1080 Ti to the GPU list
by Henri Verbeet 05 May '17

05 May '17

On 4 May 2017 at 22:53, Björn Bidar <theodorstormgrade(a)googlemail.com> wrote: DRIVER_NVIDIA_GEFORCE8, 8192}, > + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX1080TI, "NVIDIA GeForce GTX 1080 Ti", DRIVER_NVIDIA_GEFORCE8, 11169}, That's an unusual amount of memory, should that be 11264?

1 0

Re: [PATCH 04/10] d3dx9/tests: Use compare_float() in test_D3DXSHEvalSphericalLight().
by Alexandre Julliard 04 May '17

04 May '17

Henri Verbeet <hverbeet(a)codeweavers.com> writes: > Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> > --- > dlls/d3dx9_36/tests/math.c | 171 ++++++++++++++++++++++++--------------------- > 1 file changed, 92 insertions(+), 79 deletions(-) This one is failing here: ../../../tools/runtest -q -P wine -T ../../.. -M d3dx9_36.dll -p d3dx9_36_test.exe.so math && touch math.ok math.c:3194: Test failed: Red: case 1, order 5: expected[20] = 5.29080920e-04, received 5.29033889e-04. math.c:3205: Test failed: Green: case 1, order 5: expected[20] = 8.09182529e-04, received 8.09110585e-04. math.c:3217: Test failed: Blue: case 1, order 5: expected[20] = 1.08928420e-03, received 1.08918734e-03. math.c:3194: Test failed: Red: case 1, order 6: expected[20] = 5.29080920e-04, received 5.29033889e-04. math.c:3205: Test failed: Green: case 1, order 6: expected[20] = 8.09182529e-04, received 8.09110585e-04. math.c:3217: Test failed: Blue: case 1, order 6: expected[20] = 1.08928420e-03, received 1.08918734e-03. math.c:3194: Test failed: Red: case 2, order 5: expected[20] = -7.14543217e-04, received -7.14479480e-04. math.c:3217: Test failed: Blue: case 2, order 5: expected[20] = -1.47111830e-03, received -1.47098722e-03. math.c:3194: Test failed: Red: case 2, order 6: expected[20] = -7.14543217e-04, received -7.14479480e-04. math.c:3217: Test failed: Blue: case 2, order 6: expected[20] = -1.47111830e-03, received -1.47098722e-03. Makefile:340: recipe for target 'math.ok' failed make[1]: *** [math.ok] Error 10 -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [v2 4/5] d3dx9: Do not set active pass if BeginPass() failed.
by Matteo Bruni 04 May '17

04 May '17

2017-05-04 0:33 GMT+02:00 Paul Gofman <gofmanp(a)gmail.com>: > if (technique && pass < technique->pass_count && !effect->active_pass) > { > + HRESULT hr; > + > effect->active_pass = &technique->passes[pass]; > memset(effect->current_light, 0, sizeof(effect->current_light)); > memset(&effect->current_material, 0, sizeof(effect->current_material)); > - return d3dx9_apply_pass_states(effect, effect->active_pass, TRUE); > + hr = d3dx9_apply_pass_states(effect, effect->active_pass, TRUE); > + if (FAILED(hr)) > + effect->active_pass = NULL; > + return hr; > } Can't you just set active_pass only if d3dx9_apply_pass_states() succeeds, instead?

2 1

Re: dmusic/tests: Add some IDirectMusic_SetDirectSound() tests.
by Marvin 04 May '17

04 May '17

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=30792 Your paranoid android. === wvistau64 (32 bit dmusic) === dmusic.c:143: Test failed: DirectSoundCreate failed: 88780078 00c4:dmusic: unhandled exception c0000005 at 73C598FB

1 0

Re: [PATCH 04/10] d3dx9/tests: Use compare_float() in test_D3DXSHEvalSphericalLight().
by Matteo Bruni 04 May '17

04 May '17

2017-05-04 12:05 GMT+02:00 Henri Verbeet <hverbeet(a)codeweavers.com>: > - ok(relative_error(expected, test[l].red_received[j]) < 0.0005f, > - "Red: case %u, order %u: expected[%u] = %f, received %f\n", l, order, j, expected, test[l].red_received[j]); > + equal = compare_float(expected, test[l].red_received[j], 512); > + ok(equal || (fabs(expected) < 1.0e-6f && fabs(test[l].red_received[j]) < 1.0e-6f), > + "Red: case %u, order %u: expected[%u] = %.8e, received %.8e.\n", > + l, order, j, expected, test[l].red_received[j]); I guess those are mostly to make our implementation pass the test. Did you have a look at it by any chance?

2 1

Re: [PATCH] d3dx9: Return shader functions in d3dx9_base_effect_get_pass_desc().
by Marvin 04 May '17

04 May '17

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=30788 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [v4 PATCH 1/4] mfplat: Implement MFTRegister
by Alexandre Julliard 04 May '17

04 May '17

Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> writes: > + if (cinput && input_types) > + { > + size = cinput * sizeof(MFT_REGISTER_TYPE_INFO); > + types = HeapAlloc(GetProcessHeap(), 0, size); > + if (!types) goto err; > + > + memcpy(types, input_types, size); > + > + ret = RegSetValueExW(hclsid, inputtypesW, 0, REG_BINARY, (BYTE *)types, size); > + HeapFree(GetProcessHeap(), 0, types); Why do you need to make a copy? > + if (coutput && output_types) > + { > + size = cinput * sizeof(MFT_REGISTER_TYPE_INFO); I'm guessing you want coutput here. -- Alexandre Julliard julliard(a)winehq.org

1 0

pulse/alsa option in wine cfg audio tab
by CARLOS RODRIGUEZ 04 May '17

04 May '17

>Are there bugs reported for those?>Yeah has been reported sometime agohttps://bugs.winehq.org/show_bug.cgi?id=41147

1 0

Re: [v2 5/5] d3dx9: Match native out of bounds array selector index handling.
by Paul Gofman 04 May '17

04 May '17

Sorry, please ignore this last patch in the series. I found it is not correct for some cases and I will come up with more tests and corrected version separately. On 05/04/2017 01:33 AM, Paul Gofman wrote: > Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> > --- > dlls/d3dx9_36/effect.c | 25 ++++++++++++++++--------- > dlls/d3dx9_36/tests/effect.c | 17 ++++++----------- > 2 files changed, 22 insertions(+), 20 deletions(-) > > diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c > index 1ecd32e..a3511c8 100644 > --- a/dlls/d3dx9_36/effect.c > +++ b/dlls/d3dx9_36/effect.c > @@ -1056,7 +1056,7 @@ static HRESULT d3dx9_base_effect_get_pass_desc(struct d3dx9_base_effect *base, > BOOL param_dirty; > > if (FAILED(hr = d3dx9_get_param_value_ptr(pass, &pass->states[i], &param_value, &param, > - TRUE, &param_dirty))) > + FALSE, &param_dirty))) > return hr; > > if (!param->object_id) > @@ -2647,7 +2647,9 @@ static HRESULT d3dx9_get_param_value_ptr(struct d3dx_pass *pass, struct d3dx_sta > FIXME("Preshader structure is null.\n"); > return D3DERR_INVALIDCALL; > } > - if (update_all || is_param_eval_input_dirty(param->param_eval)) > + /* According to the tests, native d3dx handles the case of array index evaluated to -1 > + * in a specific way. */ > + if (is_param_eval_input_dirty(param->param_eval) || state->index == 0xffffffffu) > { > if (FAILED(hr = d3dx_evaluate_parameter(param->param_eval, &array_idx_param, > &array_idx, update_all))) > @@ -2660,6 +2662,11 @@ static HRESULT d3dx9_get_param_value_ptr(struct d3dx_pass *pass, struct d3dx_sta > ref_param = param->referenced_param; > TRACE("Array index %u, stored array index %u, element_count %u.\n", array_idx, state->index, > ref_param->element_count); > + if (array_idx == 0xffffffffu) > + { > + WARN("Array index is -1, setting to 0.\n"); > + array_idx = 0; > + } > > if (array_idx >= ref_param->element_count) > { > @@ -2920,13 +2927,11 @@ static HRESULT d3dx9_apply_state(struct ID3DXEffectImpl *effect, struct d3dx_pas > if (FAILED(hr = d3dx9_get_param_value_ptr(pass, state, &param_value, &param, > update_all, &param_dirty))) > { > - if (hr == E_FAIL) > + if (!update_all && hr == E_FAIL) > { > - /* Native d3dx9 returns D3D_OK from BeginPass or Commit involving > + /* Native d3dx9 returns D3D_OK from Commit involving > * out of bounds array access and does not touch the affected > - * state, except for BeginPass when the out of bounds array index > - * depends on dirty parameters. The latter case is supposed to > - * return E_FAIL but is currently TODO. */ > + * state. */ > WARN("Returning D3D_OK on out of bounds array access.\n"); > return D3D_OK; > } > @@ -6101,6 +6106,7 @@ static HRESULT d3dx9_parse_resource(struct d3dx9_base_effect *base, const char * > if (FAILED(hr = d3dx9_copy_data(base, param->object_id, ptr))) > return hr; > hr = d3dx9_parse_array_selector(base, param); > + state->index = 0xffffffffu; > break; > > default: > @@ -6226,10 +6232,11 @@ static HRESULT d3dx9_parse_effect(struct d3dx9_base_effect *base, const char *da > > for (i = 0; i < base->parameter_count; ++i) > { > - if (FAILED(hr = d3dx_pool_sync_shared_parameter(base->pool, &base->parameters[i]))) > - goto err_out; > walk_parameter_tree(&base->parameters[i], param_set_top_level_param, > &base->parameters[i]); > + set_dirty(&base->parameters[i]); > + if (FAILED(hr = d3dx_pool_sync_shared_parameter(base->pool, &base->parameters[i]))) > + goto err_out; > } > return D3D_OK; > > diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c > index 7f7487e..c6713af 100644 > --- a/dlls/d3dx9_36/tests/effect.c > +++ b/dlls/d3dx9_36/tests/effect.c > @@ -4658,14 +4658,12 @@ static void test_effect_out_of_bounds_selector(IDirect3DDevice9 *device) > ok(hr == D3D_OK, "Got result %#x.\n", hr); > > hr = effect->lpVtbl->BeginPass(effect, 1); > - todo_wine ok(hr == E_FAIL, "Got result %#x.\n", hr); > - if (SUCCEEDED(hr)) > - effect->lpVtbl->EndPass(effect); > + ok(hr == E_FAIL, "Got result %#x.\n", hr); > > hr = effect->lpVtbl->BeginPass(effect, 1); > ok(hr == D3D_OK, "Got result %#x.\n", hr); > > - test_effect_preshader_compare_shader(device, 2, TRUE); > + test_effect_preshader_compare_shader(device, 2, FALSE); > > hr = effect->lpVtbl->EndPass(effect); > ok(hr == D3D_OK, "Got result %#x.\n", hr); > @@ -4678,9 +4676,7 @@ static void test_effect_out_of_bounds_selector(IDirect3DDevice9 *device) > ok(hr == D3D_OK, "Got result %#x.\n", hr); > > hr = effect->lpVtbl->BeginPass(effect, 1); > - todo_wine ok(hr == E_FAIL, "Got result %#x.\n", hr); > - if (SUCCEEDED(hr)) > - hr = effect->lpVtbl->EndPass(effect); > + ok(hr == E_FAIL, "Got result %#x.\n", hr); > > hr = IDirect3DDevice9_GetVertexShader(device, &vshader); > ok(hr == D3D_OK, "Got result %#x.\n", hr); > @@ -4689,7 +4685,7 @@ static void test_effect_out_of_bounds_selector(IDirect3DDevice9 *device) > hr = effect->lpVtbl->BeginPass(effect, 1); > ok(hr == D3D_OK, "Got result %#x.\n", hr); > > - test_effect_preshader_compare_shader(device, 2, TRUE); > + test_effect_preshader_compare_shader(device, 2, FALSE); > > hr = effect->lpVtbl->EndPass(effect); > ok(hr == D3D_OK, "Got result %#x.\n", hr); > @@ -4701,7 +4697,7 @@ static void test_effect_out_of_bounds_selector(IDirect3DDevice9 *device) > hr = effect->lpVtbl->BeginPass(effect, 1); > ok(hr == D3D_OK, "Got result %#x.\n", hr); > > - test_effect_preshader_compare_shader(device, 0, TRUE); > + test_effect_preshader_compare_shader(device, 0, FALSE); > > hr = IDirect3DDevice9_SetVertexShader(device, NULL); > ok(hr == D3D_OK, "Got result %#x.\n", hr); > @@ -6266,10 +6262,9 @@ static void test_effect_get_pass_desc(IDirect3DDevice9 *device) > ok(hr == D3D_OK, "Got result %#x.\n", hr); > > hr = effect->lpVtbl->GetPassDesc(effect, pass, &desc); > - todo_wine > ok(hr == D3D_OK, "Got result %#x.\n", hr); > > - test_effect_preshader_compare_shader_bytecode(desc.pVertexShaderFunction, 0, 0, TRUE); > + test_effect_preshader_compare_shader_bytecode(desc.pVertexShaderFunction, 0, 0, FALSE); > > fvect.z = 2.0f; > hr = effect->lpVtbl->SetVector(effect, "g_iVect", &fvect);

1 0

Re: [PATCH] comctl32/tests: Add tests for mouse right-click in a treeview control
by Alexandre Julliard 04 May '17

04 May '17

Nikolay Sivov <nsivov(a)codeweavers.com> writes: > From: Hugh McMaster <hugh.mcmaster(a)outlook.com> > > Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> > Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> > --- > dlls/comctl32/tests/treeview.c | 77 ++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 77 insertions(+) This fails here: ../../../tools/runtest -q -P wine -T ../../.. -M comctl32.dll -p comctl32_test.exe.so treeview && touch treeview.ok treeview.c:2653: Test failed: right click sequence: the msg sequence is not complete: expected 0000 - actual 000f treeview.c:2654: Test failed: parent right click sequence: the msg sequence is not complete: expected 0000 - actual 004e Makefile:968: recipe for target 'treeview.ok' failed make[1]: *** [treeview.ok] Error 2 -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: [PATCH 4/4] d3dx9: Match native out of bounds array selector index handling.
by Marvin 03 May '17

03 May '17

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=30756 Your paranoid android. === build (build) === Make failed

2 1

Re: [PATCH 3/4] d3dx9: Do not set active pass if BeginPass() failed.
by Marvin 03 May '17

03 May '17

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=30755 Your paranoid android. === build (build) === Make failed

1 0

Re: [PATCH 2/4] d3dx9: Return shader functions in d3dx9_base_effect_get_pass_desc().
by Marvin 03 May '17

03 May '17

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=30754 Your paranoid android. === build (build) === Make failed

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel