- wine-devel - winehq.org

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

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