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

Re: [PATCH 1/3] user32/tests: Add tests for activating windows.
by Marvin July 11, 2017

July 11, 2017

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=32241 Your paranoid android. === wxppro (32 bit win) === win.c:9940: Test failed: GetActiveWindow() = 00020152 win.c:9940: Test failed: GetFocus() = 00020152 === w2003std (32 bit win) === win.c:9940: Test failed: GetActiveWindow() = 000400F6 win.c:9940: Test failed: GetFocus() = 000400F6 === wvistau64 (32 bit win) === win.c:9940: Test failed: GetActiveWindow() = 00050120 win.c:9940: Test failed: GetFocus() = 00050120 === w2008s64 (32 bit win) === win.c:9940: Test failed: GetActiveWindow() = 00080124 win.c:9940: Test failed: GetFocus() = 00080124 === w7u (32 bit win) === win.c:999: Test failed: wrong dwWindowStatus: 0000 != 0001 active 00A70144 fg 000B0188 in hook HCBT_MINMAX win.c:999: Test failed: wrong dwWindowStatus: 0000 != 0001 active 000700F8 fg 000B0188 in hook HCBT_MINMAX win.c:9962: Test failed: expected 000B00F0, got 000801AA win.c:9981: Test failed: expected 000B00F0, got 000801AA === wvistau64 (64 bit win) === win.c:9940: Test failed: GetActiveWindow() = 0000000000050120 win.c:9940: Test failed: GetFocus() = 0000000000050120 === w2008s64 (64 bit win) === win.c:9940: Test failed: GetActiveWindow() = 0000000000080124 win.c:9940: Test failed: GetFocus() = 0000000000080124 === w7pro64 (64 bit win) === win.c:9947: Test failed: expected 00000000000B015E, got 0000000000050024

1 0

Re: [PATCH 3/6] gdiplus: Support GdipSetSmoothingMode in metafiles
by Vincent Povirk July 11, 2017

July 11, 2017

According to the spec, SmoothingModeHighSpeed also does no antialiasing.

2 1

Re: [PATCH 7/9] msvcr120: Add erfc.
by Piotr Caban July 11, 2017

July 11, 2017

On 07/10/17 06:55, Alex Henrie wrote: > /********************************************************************* > + * erfc (MSVCR120.@) > + */ > +double CDECL MSVCR120_erfc(double x) > +{ > +#ifdef HAVE_ERFC > + return erfc(x); > +#else > + FIXME( "not implemented\n" ); > + return 0.0; > +#endif You can return 1.0 - MSVCR120_erf(x) if erfc is not available. Thanks, Piotr

2 2

Re: winhttp/tests: Make notification tests more strict.
by Marvin July 11, 2017

July 11, 2017

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=32231 Your paranoid android. === w7pro64 (32 bit notification) === notification.c:219: Test failed: unexpected function 8, expected 2. probably some notifications were missing notification.c:89: Test failed: 219: expected status 0x00000800 got 0x00000400 notification.c:90: Test failed: 219: expected function 8 got 2 notification.c:226: Test failed: unexpected function 8, expected 3. probably some notifications were missing notification.c:89: Test failed: 226: expected status 0x00000800 got 0x00000010 notification.c:90: Test failed: 226: expected function 8 got 3 notification.c:90: Test failed: 226: expected function 8 got 3 notification.c:89: Test failed: 226: expected status 0x00000800 got 0x00000020 notification.c:90: Test failed: 226: expected function 8 got 3 notification.c:236: Test failed: unexpected function 8, expected 4. probably some notifications were missing notification.c:89: Test failed: 236: expected status 0x00000800 got 0x00000040 notification.c:90: Test failed: 236: expected function 8 got 4 notification.c:89: Test failed: 236: expected status 0x00000800 got 0x00000080 notification.c:90: Test failed: 236: expected function 8 got 4 notification.c:248: Test failed: unexpected function 2, expected 8. probably some notifications were missing notification.c:89: Test failed: 248: expected status 0x00000400 got 0x00000800 notification.c:90: Test failed: 248: expected function 2 got 8 notification.c:89: Test failed: 248: expected status 0x00000400 got 0x00000800 notification.c:90: Test failed: 248: expected function 2 got 8 notification.c:282: Test failed: unexpected function 2, expected 1. probably some notifications were missing notification.c:90: Test failed: 282: expected function 2 got 1 notification.c:315: Test failed: unexpected function 8, expected 2. probably some notifications were missing notification.c:89: Test failed: 315: expected status 0x00000800 got 0x00000400 notification.c:90: Test failed: 315: expected function 8 got 2 notification.c:322: Test failed: unexpected function 8, expected 3. probably some notifications were missing notification.c:89: Test failed: 322: expected status 0x00000800 got 0x00000010 notification.c:90: Test failed: 322: expected function 8 got 3 notification.c:89: Test failed: 322: expected status 0x00000800 got 0x00000020 notification.c:90: Test failed: 322: expected function 8 got 3 notification.c:332: Test failed: unexpected function 8, expected 4. probably some notifications were missing notification.c:89: Test failed: 332: expected status 0x00000800 got 0x00000040 notification.c:90: Test failed: 332: expected function 8 got 4 notification.c:89: Test failed: 332: expected status 0x00000800 got 0x00000080 notification.c:90: Test failed: 332: expected function 8 got 4 notification.c:89: Test failed: 341: expected status 0x00000400 got 0x00000800 notification.c:90: Test failed: 341: expected function 1 got 8 === w1064 (64 bit notification) === notification.c:219: Test failed: unexpected function 8, expected 2. probably some notifications were missing notification.c:89: Test failed: 219: expected status 0x00000800 got 0x00000400 notification.c:90: Test failed: 219: expected function 8 got 2 notification.c:226: Test failed: unexpected function 8, expected 3. probably some notifications were missing notification.c:89: Test failed: 226: expected status 0x00000800 got 0x00000010 notification.c:90: Test failed: 226: expected function 8 got 3 notification.c:89: Test failed: 226: expected status 0x00000800 got 0x00000020 notification.c:90: Test failed: 226: expected function 8 got 3 notification.c:90: Test failed: 219: expected function 8 got 2 notification.c:236: Test failed: unexpected function 8, expected 4. probably some notifications were missing notification.c:89: Test failed: 236: expected status 0x00000800 got 0x00000040 notification.c:90: Test failed: 236: expected function 8 got 4 notification.c:89: Test failed: 236: expected status 0x00000800 got 0x00000080 notification.c:90: Test failed: 236: expected function 8 got 4 notification.c:248: Test failed: unexpected function 2, expected 8. probably some notifications were missing notification.c:89: Test failed: 248: expected status 0x00000400 got 0x00000800 notification.c:90: Test failed: 248: expected function 2 got 8 notification.c:89: Test failed: 248: expected status 0x00000400 got 0x00000800 notification.c:90: Test failed: 248: expected function 2 got 8 notification.c:282: Test failed: unexpected function 2, expected 1. probably some notifications were missing notification.c:90: Test failed: 282: expected function 2 got 1 notification.c:315: Test failed: unexpected function 8, expected 2. probably some notifications were missing notification.c:89: Test failed: 315: expected status 0x00000800 got 0x00000400 notification.c:90: Test failed: 315: expected function 8 got 2 notification.c:322: Test failed: unexpected function 8, expected 3. probably some notifications were missing notification.c:90: Test failed: 322: expected function 8 got 3 notification.c:89: Test failed: 322: expected status 0x00000800 got 0x00000010 notification.c:90: Test failed: 322: expected function 8 got 3 notification.c:89: Test failed: 322: expected status 0x00000800 got 0x00000020 notification.c:90: Test failed: 322: expected function 8 got 3 notification.c:332: Test failed: unexpected function 8, expected 4. probably some notifications were missing notification.c:89: Test failed: 332: expected status 0x00000800 got 0x00000040 notification.c:90: Test failed: 332: expected function 8 got 4 notification.c:89: Test failed: 332: expected status 0x00000800 got 0x00000080 notification.c:90: Test failed: 332: expected function 8 got 4

1 0

Re: [PATCH 4/4] msvcp140: Implement _Stat and _Lstat.
by Marvin July 11, 2017

July 11, 2017

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=32230 Your paranoid android. === wvistau64 (32 bit msvcp140) === 0504:msvcp140: unhandled exception c0000005 at 00000000 === wvistau64 (64 bit msvcp140) === 0504:msvcp140: unhandled exception c0000005 at 0000000000000000

1 0

Re: [PATCH 1/2] advapi32/tests: Statically link to ConvertSidToStringSidA()
by Dmitry Timoshkov July 11, 2017

July 11, 2017

Nikolay Sivov <nsivov(a)codeweavers.com> wrote: > -static BOOL (WINAPI *pConvertSidToStringSidA)( PSID pSid, LPSTR *str ); > static BOOL (WINAPI *pConvertStringSidToSidA)( LPCSTR str, PSID pSid ); ... > - pConvertSidToStringSidA = (void *)GetProcAddress(hmod, "ConvertSidToStringSidA"); > pConvertStringSidToSidA = (void *)GetProcAddress(hmod, "ConvertStringSidToSidA"); ... > - if( !pConvertSidToStringSidA || !pConvertStringSidToSidA ) > + if( !pConvertStringSidToSidA ) What's so special about ConvertSidToStringSidA and why same logic won't apply to ConvertStringSidToSidA and possibly others? -- Dmitry.

2 2

Re: [PATCH 7/7] gdiplus: Add EMF+ properties records tests
by Piotr Caban July 11, 2017

July 11, 2017

On 07/11/17 11:42, Piotr Caban wrote: > Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> > --- > dlls/gdiplus/tests/metafile.c | 78 > +++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 78 insertions(+) > I've sent it incorrectly so it wasn't picked by testbot. Here are the results: https://testbot.winehq.org/JobDetails.pl?Key=32226 Thanks, Piotr

1 0

Re: [PATCH 2/6] gdiplus: Support GdipSetPixelOffsetMode in metafiles
by Dmitry Timoshkov July 11, 2017

July 11, 2017

Piotr Caban <piotr(a)codeweavers.com> wrote: > + if(graphics->pixeloffset == mode) > + return Ok; This particular change would need an approproate test case to confirm that repetitive GdipSetPixelOffsetMode() calls with the same value won't generate new records. Same applies to other patches in the series. -- Dmitry.

1 1

Re: [PATCH 1/7] d3dx9/tests: Add test for skip_constants effect parameter.
by Matteo Bruni July 11, 2017

July 11, 2017

2017-07-06 13:15 GMT+02:00 Paul Gofman <gofmanp(a)gmail.com>: > +static void test_effect_skip_constants(IDirect3DDevice9 *device) > +{ > + HRESULT hr; > + ID3DXEffect *effect; > + unsigned int passes_count; > + D3DXVECTOR4 fvect; > + unsigned int i; > + > + hr = D3DXCreateEffectEx(device, test_effect_skip_constants_blob, sizeof(test_effect_skip_constants_blob), > + NULL, NULL, "v3", 0, NULL, &effect, NULL); > + todo_wine > + ok(hr == D3DERR_INVALIDCALL, "Got result %#x.\n", hr); > + if (SUCCEEDED(hr)) > + effect->lpVtbl->Release(effect); > + hr = D3DXCreateEffectEx(device, test_effect_skip_constants_blob, sizeof(test_effect_skip_constants_blob), > + NULL, NULL, "v4", 0, NULL, &effect, NULL); > + todo_wine > + ok(hr == D3DERR_INVALIDCALL, "Got result %#x.\n", hr); > + if (SUCCEEDED(hr)) > + effect->lpVtbl->Release(effect); > + > + hr = D3DXCreateEffectEx(device, test_effect_skip_constants_blob, sizeof(test_effect_skip_constants_blob), > + NULL, NULL, " v1#,.+-= &\t\nv2*/!\"'v5 v6[1]", 0, NULL, &effect, NULL); > + ok(hr == D3D_OK, "Got result %#x.\n", hr); Maybe also add a test with the "expected" syntax for the skip_constants parameters? MSDN mentions a semicolon-separated list. Of course it's not strictly needed, given this test... > + > + todo_wine > + ok(!effect->lpVtbl->IsParameterUsed(effect, "v1", "tech0"), > + "Unexpected IsParameterUsed result.\n"); > + todo_wine > + ok(!effect->lpVtbl->IsParameterUsed(effect, "v2", "tech0"), > + "Unexpected IsParameterUsed result.\n"); > + ok(effect->lpVtbl->IsParameterUsed(effect, "v3", "tech0"), > + "Unexpected IsParameterUsed result.\n"); > + ok(effect->lpVtbl->IsParameterUsed(effect, "v4", "tech0"), > + "Unexpected IsParameterUsed result.\n"); > + ok(!effect->lpVtbl->IsParameterUsed(effect, "v5", "tech0"), > + "Unexpected IsParameterUsed result.\n"); What about "v6"?

2 1

Re: [PATCH 5/7] d3dx9: Fail effect creation when shader parameter evaluator creation fails.
by Matteo Bruni July 11, 2017

July 11, 2017

2017-07-06 13:15 GMT+02:00 Paul Gofman <gofmanp(a)gmail.com>: > @@ -6099,8 +6100,9 @@ static HRESULT d3dx9_parse_resource(struct d3dx9_base_effect *base, const char * > { > if (FAILED(hr = d3dx9_create_object(base, object))) > return hr; > - d3dx_create_param_eval(base, object->data, object->size, param->type, > - &param->param_eval, get_version_counter_ptr(base)); > + if (FAILED(hr = d3dx_create_param_eval(base, object->data, object->size, param->type, > + &param->param_eval, get_version_counter_ptr(base)))) > + return hr; > } > break; > > @@ -6138,8 +6140,11 @@ static HRESULT d3dx9_parse_resource(struct d3dx9_base_effect *base, const char * It looks like you missed another call to d3dx_create_param_eval() in between these two.

2 1

Re: [PATCH 2/5] regedit: Use 'return' statements in delete_registry_key() to allow for memory clean-up
by Alexandre Julliard July 11, 2017

July 11, 2017

Hugh McMaster <hugh.mcmaster(a)outlook.com> writes: > @@ -1593,11 +1593,11 @@ void delete_registry_key(WCHAR *reg_key_name) > > if (!(key_class = parse_key_name(reg_key_name, &key_name))) { > output_message(STRING_INCORRECT_REG_CLASS, reg_key_name); > - exit(1); > + return; > } > if (!*key_name) { > output_message(STRING_DELETE_REG_CLASS_FAILED, reg_key_name); > - exit(1); > + return; If the process is going to exit anyway, freeing memory is a waste of time. -- Alexandre Julliard julliard(a)winehq.org

2 3

Re: [PATCH 3/9] msvcr120: Remove precompiler check for asinh.
by Piotr Caban July 11, 2017

July 11, 2017

On 07/10/17 06:55, Alex Henrie wrote: > asinh is part of C89, so it is guaranteed to be present. Are you sure about it? As far as I know it's part of C99. The manual for asinh looks strange (it says that it conforms to C89 and gives test macro that checks for never standards). Thanks, Piotr

4 7

Re: [PATCH 6/7] d3dx9: Implement d3dx_shader_get_raw_constant_info() function.
by Matteo Bruni July 10, 2017

July 10, 2017

2017-07-06 13:15 GMT+02:00 Paul Gofman <gofmanp(a)gmail.com>: > Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> > --- > dlls/d3dx9_36/d3dx9_private.h | 3 +++ > dlls/d3dx9_36/shader.c | 18 ++++++++++++++++++ > 2 files changed, 21 insertions(+) > > diff --git a/dlls/d3dx9_36/d3dx9_private.h b/dlls/d3dx9_36/d3dx9_private.h > index db80490..bfb3909 100644 > --- a/dlls/d3dx9_36/d3dx9_private.h > +++ b/dlls/d3dx9_36/d3dx9_private.h > @@ -355,4 +355,7 @@ HRESULT d3dx_param_eval_set_shader_constants(ID3DXEffectStateManager *manager, s > struct d3dx_param_eval *peval, BOOL update_all) DECLSPEC_HIDDEN; > BOOL is_param_eval_input_dirty(struct d3dx_param_eval *peval, ULONG64 update_version) DECLSPEC_HIDDEN; > > +const D3DXSHADER_CONSTANTINFO *d3dx_shader_get_raw_constant_info(ID3DXConstantTable *iface, > + D3DXHANDLE constant) DECLSPEC_HIDDEN; > + > #endif /* __WINE_D3DX9_PRIVATE_H */ > diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c > index 4dbecb1..11527c8 100644 > --- a/dlls/d3dx9_36/shader.c > +++ b/dlls/d3dx9_36/shader.c > @@ -682,6 +682,7 @@ HRESULT WINAPI D3DXPreprocessShaderFromResourceW(HMODULE module, const WCHAR *re > } > > struct ctab_constant { > + const D3DXSHADER_CONSTANTINFO *raw_constant_info; > D3DXCONSTANT_DESC desc; > struct ctab_constant *constants; > }; > @@ -946,6 +947,22 @@ static HRESULT WINAPI ID3DXConstantTableImpl_GetDesc(ID3DXConstantTable *iface, > return D3D_OK; > } > > +const D3DXSHADER_CONSTANTINFO *d3dx_shader_get_raw_constant_info(ID3DXConstantTable *iface, D3DXHANDLE constant) > +{ > + struct ID3DXConstantTableImpl *const_table = impl_from_ID3DXConstantTable(iface); > + struct ctab_constant *c = get_valid_constant(const_table, constant); > + > + TRACE("const_table %p, constant %p.\n", const_table, constant); > + > + if (!c) > + { > + WARN("Invalid argument specified.\n"); > + return NULL; > + } > + > + return c->raw_constant_info; > +} > + > static HRESULT WINAPI ID3DXConstantTableImpl_GetConstantDesc(ID3DXConstantTable *iface, D3DXHANDLE constant, > D3DXCONSTANT_DESC *desc, UINT *count) > { > @@ -2052,6 +2069,7 @@ HRESULT WINAPI D3DXGetShaderConstantTableEx(const DWORD *byte_code, DWORD flags, > { > object->constants[i].desc.RegisterCount = constant_info[i].RegisterCount; > } > + object->constants[i].raw_constant_info = &constant_info[i]; > } > > *constant_table = &object->ID3DXConstantTable_iface; I don't like this all that much. If you need access to the original D3DXSHADER_CONSTANTINFO only for the Reserved field, as in the next patch, I'd say just store that one in struct ctab_constant. Then, for the retrieval part, I don't think it makes much sense to hide our internals from ourselves. You could move the definition of struct ctab_constant to d3dx9_private.h and introduce an internal function to return it from the constant table. You could then entirely replace the use of ID3DXConstantTable_GetConstantDesc(), if you want. Otherwise you can keep that part as-is for the time being and make use of the new function only to get to the Reserved data. Actually, if you go with the latter, it probably makes sense to merge this patch into the next.

1 0

Re: [PATCH 4/7] d3dx9: Get rid of init_set_constants() function.
by Matteo Bruni July 10, 2017

July 10, 2017

2017-07-06 13:15 GMT+02:00 Paul Gofman <gofmanp(a)gmail.com>: > Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> > --- > dlls/d3dx9_36/preshader.c | 58 ++++++++++++++--------------------------------- > 1 file changed, 17 insertions(+), 41 deletions(-) > > diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c > index cabddcd..1aaf59d 100644 > --- a/dlls/d3dx9_36/preshader.c > +++ b/dlls/d3dx9_36/preshader.c > @@ -305,7 +305,8 @@ static unsigned int get_reg_components(unsigned int table) > > #define PRES_BITMASK_BLOCK_SIZE (sizeof(unsigned int) * 8) > > -static HRESULT init_set_constants(struct d3dx_const_tab *const_tab, ID3DXConstantTable *ctab); > +static HRESULT init_set_constants_param(struct d3dx_const_tab *const_tab, ID3DXConstantTable *ctab, > + D3DXHANDLE hc, struct d3dx_parameter *param); With some function reordering this forward declaration shouldn't be necessary at all.

1 0

Re: [PATCH 3/7] d3dx9: Simplify init and cleanup in get_constants_desc().
by Matteo Bruni July 10, 2017

July 10, 2017

2017-07-06 13:15 GMT+02:00 Paul Gofman <gofmanp(a)gmail.com>: > Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> > --- > dlls/d3dx9_36/preshader.c | 17 +++-------------- > 1 file changed, 3 insertions(+), 14 deletions(-) > > diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c > index 2fb14ab..cabddcd 100644 > --- a/dlls/d3dx9_36/preshader.c > +++ b/dlls/d3dx9_36/preshader.c > @@ -618,10 +618,6 @@ static HRESULT get_constants_desc(unsigned int *byte_code, struct d3dx_const_tab > D3DXHANDLE hc; > unsigned int i; > > - out->inputs = cdesc = NULL; > - out->inputs_param = NULL; > - out->input_count = 0; > - inputs_param = NULL; > hr = D3DXGetShaderConstantTable(byte_code, &ctab); > if (FAILED(hr) || !ctab) > { > @@ -635,8 +631,8 @@ static HRESULT get_constants_desc(unsigned int *byte_code, struct d3dx_const_tab > goto err_out; > } > > - cdesc = HeapAlloc(GetProcessHeap(), 0, sizeof(*cdesc) * desc.Constants); > - inputs_param = HeapAlloc(GetProcessHeap(), 0, sizeof(*inputs_param) * desc.Constants); > + out->inputs = cdesc = HeapAlloc(GetProcessHeap(), 0, sizeof(*cdesc) * desc.Constants); > + out->inputs_param = inputs_param = HeapAlloc(GetProcessHeap(), 0, sizeof(*inputs_param) * desc.Constants); > if (!cdesc || !inputs_param) > { > hr = E_OUTOFMEMORY; > @@ -678,16 +674,9 @@ static HRESULT get_constants_desc(unsigned int *byte_code, struct d3dx_const_tab > } > } > out->input_count = desc.Constants; > - out->inputs = cdesc; > - out->inputs_param = inputs_param; > hr = init_set_constants(out, ctab); > - ID3DXConstantTable_Release(ctab); > - return hr; > err_out: > - HeapFree(GetProcessHeap(), 0, cdesc); > - HeapFree(GetProcessHeap(), 0, inputs_param); > - if (ctab) > - ID3DXConstantTable_Release(ctab); > + ID3DXConstantTable_Release(ctab); > return hr; > } It would be a nice cleanup to rename the err_out: label to cleanup:, done: or similar.

1 0

Re: [PATCH 1/2] widl: Only generate Proxy Stubs when functions have the call_as attribute
by Nikolay Sivov July 10, 2017

July 10, 2017

On 10.07.2017 7:43, Alistair Leslie-Hughes wrote: > Fixes: https://bugs.winehq.org/show_bug.cgi?id=43302 > > Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> > --- > tools/widl/header.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/tools/widl/header.c b/tools/widl/header.c > index 7b97158..e48b488 100644 > --- a/tools/widl/header.c > +++ b/tools/widl/header.c > @@ -1172,7 +1172,7 @@ static void write_method_proto(FILE *header, const type_t *iface) > { > const var_t *func = stmt->u.var; > > - if (!is_local(func->attrs)) { > + if (is_callas(func->attrs)) { > const char *callconv = get_attrp(func->type->attrs, ATTR_CALLCONV); > if (!callconv) callconv = "STDMETHODCALLTYPE"; > /* proxy prototype */ > This is wrong, 'call_as' is used to map different method to be used for remote calls. Midl certainly does not limit prototype generation like that. You mentioned 'odl' attribute on bug report, it's irrelevant too.

2 2

Re: [v2 PATCH] widl: Only generate Proxy Stubs when functions have the call_as attribute
by Huw Davies July 10, 2017

July 10, 2017

On Mon, Jul 10, 2017 at 10:11:42AM +0000, Alistair Leslie-Hughes wrote: > Fixes: https://bugs.winehq.org/show_bug.cgi?id=43302 > > v2: Merge two matches together. > > Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> > --- > include/unknwn.idl | 10 ++++++++++ > tools/widl/header.c | 2 +- > 2 files changed, 11 insertions(+), 1 deletion(-) > > diff --git a/include/unknwn.idl b/include/unknwn.idl > index 78a2d9db18..7856a7f504 100644 > --- a/include/unknwn.idl > +++ b/include/unknwn.idl > @@ -46,6 +46,16 @@ interface IUnknown > ULONG Release(); > } > > +cpp_quote("HRESULT STDMETHODCALLTYPE IUnknown_QueryInterface_Proxy(IUnknown* This, REFIID riid, void **ppvObject);") > +cpp_quote("void __RPC_STUB IUnknown_QueryInterface_Stub(IRpcStubBuffer* This, IRpcChannelBuffer* pRpcChannelBuffer,") > +cpp_quote(" PRPC_MESSAGE pRpcMessage, DWORD* pdwStubPhase);") > +cpp_quote("ULONG STDMETHODCALLTYPE IUnknown_AddRef_Proxy(IUnknown* This);") > +cpp_quote("void __RPC_STUB IUnknown_AddRef_Stub(IRpcStubBuffer* This, IRpcChannelBuffer* pRpcChannelBuffer,") > +cpp_quote(" PRPC_MESSAGE pRpcMessage, DWORD* pdwStubPhase);") > +cpp_quote("ULONG STDMETHODCALLTYPE IUnknown_Release_Proxy(IUnknown* This);") > +cpp_quote("void __RPC_STUB IUnknown_Release_Stub(IRpcStubBuffer* This, IRpcChannelBuffer* pRpcChannelBuffer,") > +cpp_quote(" PRPC_MESSAGE pRpcMessage, DWORD* pdwStubPhase);") > + > cpp_quote("#ifdef SAVE_WIDL_C_INLINE_WRAPPERS") > cpp_quote("#define WIDL_C_INLINE_WRAPPERS") > cpp_quote("#endif") > diff --git a/tools/widl/header.c b/tools/widl/header.c > index 7b971582db..e48b488ae3 100644 > --- a/tools/widl/header.c > +++ b/tools/widl/header.c > @@ -1172,7 +1172,7 @@ static void write_method_proto(FILE *header, const type_t *iface) > { > const var_t *func = stmt->u.var; > > - if (!is_local(func->attrs)) { > + if (is_callas(func->attrs)) { > const char *callconv = get_attrp(func->type->attrs, ATTR_CALLCONV); > if (!callconv) callconv = "STDMETHODCALLTYPE"; > /* proxy prototype */ On further testing with midl v7, /Os does emit Proxy/Stub prototypes for all functions. Since widl essentially runs in this mode, I'd prefer to keep this behaviour if possible. In the bug you mention redefinition errors in qmgrprxy. How are you getting these? Huw.

1 1

Wine appimage request
by Dpto Catastro Topografia MuniSantaCruz July 10, 2017

July 10, 2017

Hello, I have used this software and it has been very useful to me, I am a surveyor engineer and free software user. A year ago in the world linux have agreed to generate universal packages self-contained with everything they need to install on any linux distribution. Of which there are today 3; Simon Peter's appimage, Gnome flatpak and Canonical snaps. The advantage of these packages is that they use everything in the same package to work, libraries and so on. Hence they can be installed in any linux distribution. It would be great to see the WINE in appimage or in flatpak or snap, and avoid using the terminal for new users. I somehow defend myself with the terminal but sometimes it is still somewhat annoying and tedious. I leave you the links of these new packaging technologies, so that you can analyze them and may in the not too distant future offer some of these simple packages. In fact I prefer appimage, I downloaded several of these applications with this type of package and is simple to use and distribute. Flatpak and snap are still using the terminal to install them, the snaps are fairly simple (it will be installed in the gnome and kde software center in 2018), flatpak the gnome desktop and kde install it from the software center to install packages Flatpak. Appimage has its own charm and does not use the terminal, just make executable and run. Thank you Links Http://appimage.org/ Http://flatpak.org/ Https://snapcraft.io/ atte Luis V --

1 0

Re: [PATCH 5/5] d3drm: Assign animation key ids
by Henri Verbeet July 10, 2017

July 10, 2017

On 10 July 2017 at 12:40, Nikolay Sivov <nsivov(a)codeweavers.com> wrote: > +static BOOL d3drm_animation_get_next_key_id(struct d3drm_animation_keys *keys, DWORD *id) > +{ > + DWORD i; > + > + if (keys->next_unused <= keys->last_id) > + { > + *id = keys->next_unused++; > + return TRUE; > + } > + > + if (keys->next_free <= keys->last_id) > + { > + *id = keys->next_free; > + keys->next_free = ~0u; > + return TRUE; > + } > + > + if (keys->count == keys->last_id - keys->first_id + 1) > + return FALSE; > + > + /* Worst case, look for the spot from the beginning. */ > + for (i = 0, *id = keys->first_id; i < keys->count; i++, ++*id) > + { > + if (*id != keys->keys[i].id) > + break; > + } Does that work? The keys aren't necessarily ordered by ID, right? Regardless, it may be easier to make use of the fact that we never shrink the keys array.

1 0

Re: server: Don't allow APCs on objects associated with completion port.
by Marvin July 10, 2017

July 10, 2017

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=32203 Your paranoid android. === w7u (32 bit sock) === sock.c:6121: Test failed: Expected event sequence [FD_WRITE(0)], got [] sock.c:6142: Test failed: Expected event sequence [FD_READ(0) FD_CLOSE(0)], got [FD_WRITE(0) FD_CLOSE(10053)] sock.c:6145: Test failed: Failed to empty buffer: -1 - 10054 sock.c:6146: Test failed: Expected event sequence [FD_READ(0)], got [] sock.c:6149: Test failed: Failed to empty buffer: -1 - 10054

1 0

Re: [PATCH 2/2] msvcp140: Implement _File_size.
by Piotr Caban July 10, 2017

July 10, 2017

On 07/09/17 22:14, Stefan Dösinger wrote: > static int (__cdecl *p_To_wide)(const char *src, WCHAR *dst); > +static ULONGLONG(__cdecl *p_File_size)(WCHAR const*); Please add a space after ULONGLONG. > +static void test_File_size(void) > +{ > + ULONGLONG val; > + HANDLE file; > + LARGE_INTEGER file_size; > + WCHAR test_f1_W[] = {'t','r','2','_','t','e','s','t','_','d','i','r','/','f','1',0}; > + WCHAR test_f2_W[] = {'t','r','2','_','t','e','s','t','_','d','i','r','/','f','2',0}; > + WCHAR test_dir_W[] = {'t','r','2','_','t','e','s','t','_','d','i','r',0}; > + WCHAR test_ne_W[] = {'t','r','2','_','t','e','s','t','_','d','i','r','/','n','e',0}; > + CreateDirectoryW(test_dir_W, NULL); Could you please create the test files in temp directory? Also please rename the directory (these are no longer tr2 namespace tests). > +/* _File_size, msvcp140 version. Different error handling. */ > +ULONGLONG __cdecl _File_size(WCHAR const* path) > +{ > + WIN32_FILE_ATTRIBUTE_DATA fad; > + > + TRACE("(%s)\n", debugstr_w(path)); > + if(!GetFileAttributesExW(path, GetFileExInfoStandard, &fad)) > + return ~0ULL; > + if(fad.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) > + return 0; We don't need to handle the directory separately here. It will have file size set to 0 anyway. Thanks, Piotr

1 0

Re: advapi32/tests: Add tests for RegSetValueExW and RegQueryValueExW.
by Alexandre Julliard July 10, 2017

July 10, 2017

Jactry Zeng <jzeng(a)codeweavers.com> writes: > Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> > --- > dlls/advapi32/tests/registry.c | 46 > +++++++++++++++++++++++++++++++++++++++++- > 1 file changed, 45 insertions(+), 1 deletion(-) I don't see how this is different from the existing tests. -- Alexandre Julliard julliard(a)winehq.org

2 4

Re: user.exe16: Fix an incorrect use of ADD_TO_T in FormatMessage16.
by Henri Verbeet July 10, 2017

July 10, 2017

On 9 July 2017 at 18:53, Gerald Pfeifer <gerald(a)pfeifer.com> wrote: > ADD_TO_T actually consists of two statements > > #define ADD_TO_T(c) \ > *t++=c;\ > if (t-target == talloced) {\ > target = HeapReAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,target,talloced*2);\ > t = target+talloced;\ > talloced*=2;\ > } > > so > > for (x=b; *x; x++) ADD_TO_T(*x); > > does _not_ actually do what one might expect/hope. > > Fixed thusly, in line with other usage. > Alternatively, it shouldn't be hard to either fix the macro or replace it with a function.

1 0

Re: [PATCH 2/2] include: Add Proxy stubs for IUnknown
by Huw Davies July 10, 2017

July 10, 2017

On Mon, Jul 10, 2017 at 04:43:49AM +0000, Alistair Leslie-Hughes wrote: > Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> > --- > include/unknwn.idl | 10 ++++++++++ > 1 file changed, 10 insertions(+) > > diff --git a/include/unknwn.idl b/include/unknwn.idl > index 78a2d9d..7856a7f 100644 > --- a/include/unknwn.idl > +++ b/include/unknwn.idl > @@ -46,6 +46,16 @@ interface IUnknown > ULONG Release(); > } > > +cpp_quote("HRESULT STDMETHODCALLTYPE IUnknown_QueryInterface_Proxy(IUnknown* This, REFIID riid, void **ppvObject);") > +cpp_quote("void __RPC_STUB IUnknown_QueryInterface_Stub(IRpcStubBuffer* This, IRpcChannelBuffer* pRpcChannelBuffer,") > +cpp_quote(" PRPC_MESSAGE pRpcMessage, DWORD* pdwStubPhase);") > +cpp_quote("ULONG STDMETHODCALLTYPE IUnknown_AddRef_Proxy(IUnknown* This);") > +cpp_quote("void __RPC_STUB IUnknown_AddRef_Stub(IRpcStubBuffer* This, IRpcChannelBuffer* pRpcChannelBuffer,") > +cpp_quote(" PRPC_MESSAGE pRpcMessage, DWORD* pdwStubPhase);") > +cpp_quote("ULONG STDMETHODCALLTYPE IUnknown_Release_Proxy(IUnknown* This);") > +cpp_quote("void __RPC_STUB IUnknown_Release_Stub(IRpcStubBuffer* This, IRpcChannelBuffer* pRpcChannelBuffer,") > +cpp_quote(" PRPC_MESSAGE pRpcMessage, DWORD* pdwStubPhase);") What do you need these for? Huw.

1 0

Re: msvcp140: implement _To_byte
by Nikolay Sivov July 9, 2017

July 9, 2017

On 08.07.2017 22:33, Mikhail Paulyshka wrote: > Signed-off-by: Mikhail Paulyshka <me(a)mixaill.tk> > --- > dlls/msvcp140/msvcp140.spec | 2 +- > dlls/msvcp140/tests/msvcp140.c | 49 ++++++++++++++++++++++++++++++++++++++++++ > dlls/msvcp90/locale.c | 10 +++++++++ > 3 files changed, 60 insertions(+), 1 deletion(-) > Hi, and thanks for the patch. Some comments in addition to Stefan's reply: > + static const WCHAR test_2[] = {0xfe95, 0xfea0, 0xfea6, 0}; //some arabic glyphs These are characters, not glyphs. Also please use C-style comments - /**/.

3 2

Re: notepad: Fix string length calculating.
by Nikolay Sivov July 9, 2017

July 9, 2017

Do we have RegSetValueExW tests to justify this?

3 2

Re: msvcp140: implement _To_byte
by Stefan Dösinger July 9, 2017

July 9, 2017

Hi, I was about to implement this function too, but it seems you've beaten me by two days :-) . Am 2017-07-08 um 17:55 schrieb Mikhail Paulyshka: > + WCHAR longstr[MAX_PATH + 3]; > + memset(longstr, 'A', sizeof(longstr)); This memset doesn't do what you probably expect. It doesn't fill the string with 'A's, but instead with U+4141 characters (䅁, http://www.fileformat.info/info/unicode/char/4141/index.htm) > + if (!src || !dst) > + return 0; This is redundant. WideCharToMultiByte checks this for you and returns 0. I noticed this after sending the _To_wide patch and will send a patch removing the redundant check from _To_wide.

2 3

Re: [PATCH] notepad: Use the default window position and size.
by Henri Verbeet July 8, 2017

July 8, 2017

On 8 July 2017 at 01:58, Zebediah Figura <zfigura(a)codeweavers.com> wrote: > @@ -775,17 +774,9 @@ int PASCAL WinMain(HINSTANCE hInstance, HINSTANCE prev, LPSTR cmdline, int show) > info.cbSize = sizeof(info); > GetMonitorInfoW( monitor, &info ); > > - x = main_rect.left; > - y = main_rect.top; > - if (main_rect.left >= info.rcWork.right || > - main_rect.top >= info.rcWork.bottom || > - main_rect.right < info.rcWork.left || > - main_rect.bottom < info.rcWork.top) > - x = y = CW_USEDEFAULT; > - > Globals.hMainWnd = > - CreateWindowW(className, winName, WS_OVERLAPPEDWINDOW, x, y, > - main_rect.right - main_rect.left, main_rect.bottom - main_rect.top, > + CreateWindowW(className, winName, WS_OVERLAPPEDWINDOW, > + CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, > NULL, NULL, Globals.hInstance, NULL); > if (!Globals.hMainWnd) > { Why would you want to do that? But if we're going to ignore it, we probably shouldn't bother saving and loading the window position to/from the registry either.

3 3

Compile MFC application
by MAX Trifonov July 8, 2017

July 8, 2017

Hello I try compile my application with winemaker ... winemaker --lower-uppercase --mfc -I/home/max/libffc-master/Include -I/home/max/wine/include DN After make I have got result: wineg++ -c -I/home/max/libffc-master/Include -I/home/max/wine/include -I. -o Big.o Big.cpp In file included from /home/max/wine/include/windows.h:70:0, from /home/max/libffc-master/Include/FFC/Globals.h:6, from /home/max/libffc-master/Include/afx.h:13, from /home/max/libffc-master/Include/afxwin.h:13, from StdAfx.h:16, from Big.cpp:2: /home/max/wine/include/winscard.h:22:20: fatal error: wtypes.h: Why wtypes.h not included ? -- MAX Trifonov

1 0

Re: [PATCH 1/2] explorer: Improve tray sizing and style.
by Dmitry Timoshkov July 8, 2017

July 8, 2017

Zebediah Figura <zfigura(a)codeweavers.com> wrote: > - SetWindowPos( win->button, 0, pos, 0, start_button_width, tray_height, > + SetWindowPos( win->button, 0, pos, 0, start_button_width, tray_height - 4, > SWP_NOZORDER | SWP_NOACTIVATE | SWP_SHOWWINDOW ); ... > - SetWindowPos( win->button, 0, pos, 0, width, tray_height, > + SetWindowPos( win->button, 0, pos, 0, width, tray_height - 4, > SWP_NOZORDER | SWP_NOACTIVATE | SWP_SHOWWINDOW ); ... > tray_width = GetSystemMetrics( SM_CXSCREEN ); > tray_height = max( icon_cy, size.cy ); > + tray_height = max( tray_height, 26 ); ... > start_button_width = size.cx; > - SetWindowPos( tray_window, HWND_TOPMOST, 0, GetSystemMetrics( SM_CYSCREEN ) - tray_height, > - tray_width, tray_height, SWP_NOACTIVATE | SWP_SHOWWINDOW ); > + SetWindowPos( tray_window, HWND_TOPMOST, -2, GetSystemMetrics(SM_CYSCREEN) - tray_height - 2, > + tray_width + 4, tray_height + 4, SWP_NOACTIVATE | SWP_SHOWWINDOW ); I guess that magic -4/-2 are caused by added WS_THICKFRAME style, if that's the case an appropriate system metric should be used instead to make the code work for different visual themes. 26 above also needs to be changed to an appropriate system metric. -- Dmitry.

1 0

Re: [PATCH 3/3] mfplat/tests: Add MFCreateAttributes test
by Marvin July 7, 2017

July 7, 2017

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

1 0

Re: [PATCH] include: Support all version of BackgroundCopyManager from bits.h
by Alexandre Julliard July 7, 2017

July 7, 2017

Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> writes: > @@ -22,12 +22,6 @@ > > #include "bits.idl" > > -#define DO_NO_IMPORTS > -#include "bits1_5.idl" > -#include "bits2_0.idl" > -#include "bits2_5.idl" > -#include "bits3_0.idl" This breaks the registration: ../../../tools/runtest -q -P wine -T ../../.. -M qmgr.dll -p qmgr_test.exe.so job && touch job.ok job.c:700: Test failed: Tests need BITS 2.0 or higher job.c:719: Test failed: Tests need BITS 2.5 or higher Makefile:285: recipe for target 'job.ok' failed make: *** [job.ok] Error 2 -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH] ntdll: Handle IMAGE_REL_BASED_DIR64 for arm64 in the same way as for x86_64
by Jacek Caban July 7, 2017

July 7, 2017

Hi Martin, On 07.07.2017 12:39, Martin Storsjo wrote: > diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c > index 518a99f..3b784bf 100644 > --- a/dlls/ntdll/loader.c > +++ b/dlls/ntdll/loader.c > @@ -2476,7 +2476,7 @@ IMAGE_BASE_RELOCATION * WINAPI LdrProcessRelocationBlock( void *page, UINT count > case IMAGE_REL_BASED_HIGHLOW: > *(int *)((char *)page + offset) += delta; > break; > -#ifdef __x86_64__ > +#if defined(__x86_64__) || defined(__aarch64__) Could it use simply #ifdef _WIN64? Thanks, Jacek

1 0

Re: [1/2] vcomp: Add ARM64 support
by Alexandre Julliard July 7, 2017

July 7, 2017

Sebastian Lackner <sebastian(a)fds-team.de> writes: > On 05.07.2017 21:23, André Hentschel wrote: >> Signed-off-by: André Hentschel <nerv(a)dawncrow.de> >> --- >> dlls/vcomp/main.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ >> 1 file changed, 45 insertions(+) >> > > I have no ARM64 setup available, so please double-check that it actually > compiles before applying the patch. ;) It doesn't: aarch64-linux-android-clang -c -o main.o ../../../wine/dlls/vcomp/main.c -I. -I../../../wine/dlls/vcomp -I../../include \ -I../../../wine/include -D__WINESRC__ -D_REENTRANT -fPIC -Wall -pipe -fno-strict-aliasing \ -Wdeclaration-after-statement -Wempty-body -Wignored-qualifiers -Wstrict-prototypes -Wtype-limits \ -Wvla -Wwrite-strings -Wpointer-arith -gdwarf-2 -gstrict-dwarf -g -O2 -fno-caret-diagnostics -Wno-tautological-constant-out-of-range-compare -Wno-enum-conversion -Wno-sometimes-uninitialized -Wno-ignored-attributes -Wno-array-bounds -Wno-absolute-value -Wno-unused-function -Wno-incompatible-pointer-types -Wno-invalid-source-encoding <inline asm>:36:2: error: too few operands for instruction Makefile:166: recipe for target 'main.o' failed make: *** [main.o] Error 1 -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [1/2] vcomp: Add ARM64 support
by Sebastian Lackner July 7, 2017

July 7, 2017

On 05.07.2017 21:23, André Hentschel wrote: > Signed-off-by: André Hentschel <nerv(a)dawncrow.de> > --- > dlls/vcomp/main.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 45 insertions(+) > Just recently it was mentioned on the mailing lists that compilers do not support ms_va_list on ARM64 yet. Does your code rely on any compiler patches, or do you assume that va_list == ms_va_list?

2 2

Re: [PATCH 3/6] msi: Correctly format the template field for MsiProcessMessage().
by Hans Leidekker July 7, 2017

July 7, 2017

This one no longer applies after [PATCH v2 2/6] msi: Implement UI messages for dialogs: $ curl --silent -o - https://source.winehq.org/patches/data/135555 | git apply --verbose Checking patch dlls/msi/dialog.c... Checking patch dlls/msi/msi.rc... Checking patch dlls/msi/msipriv.h... Checking patch dlls/msi/package.c... Checking patch dlls/msi/resource.h... Checking patch dlls/msi/tests/package.c... error: while searching for: MsiCloseHandle(hpkg); ok_sequence(closehandle_sequence, "MsiCloseHandle()", TRUE); CoUninitialize(); DeleteFileA(msifile); DeleteFileA("forcecodepage.idt"); error: patch failed: dlls/msi/tests/package.c:9552 error: dlls/msi/tests/package.c: patch does not apply

1 0

Re: [PATCH 3/5] msi: Implement UI messages for dialogs.
by Alexandre Julliard July 6, 2017

July 6, 2017

Zebediah Figura <z.figura12(a)gmail.com> writes: > Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> > --- > dlls/msi/action.c | 74 +++++++++++++-------------- > dlls/msi/custom.c | 2 +- > dlls/msi/dialog.c | 55 +++++++++++++++++++- > dlls/msi/msi.rc | 3 +- > dlls/msi/msipriv.h | 1 + > dlls/msi/package.c | 7 +++ > dlls/msi/resource.h | 1 + > dlls/msi/tests/package.c | 130 +++++++++++++++++++++++++++++++++++++++++++++-- > 8 files changed, 225 insertions(+), 48 deletions(-) This is causing the test to leave behind a winetest-package.msi file. -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: ws2_32/tests: A spelling fix in a comment.
by Marvin July 6, 2017

July 6, 2017

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=32127 Your paranoid android. === wvistau64 (64 bit sock) === sock.c:8273: Test failed: bytesReturned isn't supposed to be 1 sock.c:8297: Test failed: GetOverlappedResult failed, error 997

1 0

Re: [PATCH 2/2] regedit: Null-terminate REG_EXPAND_SZ and REG_MULTI_SZ data if the parsed hex data does not end in a null-te
by Marvin July 6, 2017

July 6, 2017

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

1 0

Re: [PATCH 1/2] regedit: Hex data lines may be terminated by a semicolon
by Marvin July 6, 2017

July 6, 2017

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

1 0

Re: [PATCH 4/5] msi: Don't increment the refcount when creating dialogs.
by Hans Leidekker July 6, 2017

July 6, 2017

On Wed, 2017-07-05 at 23:31 -0500, Zebediah Figura wrote: > We should only ever have one dialog anyway, and this is destroyed > when we close the package. It causes a crash in a random installer here: $ ./wine msiexec /i "XPSEP XP and Server 2003 32 bit.msi" fixme:ntdll:NtLockFile I/O completion on lock not implemented yet err:msi:msiobj_addref Invalid handle! err:msi:msiobj_addref Invalid handle! wine: Unhandled page fault on read access to 0x57e5896d at address 0x7ed68688 (thread 0009), starting debugger... Unhandled exception: page fault on read access to 0x57e5896d in 32-bit code (0x7ed68688). Register dump: CS:0023 SS:002b DS:002b ES:002b FS:0063 GS:006b EIP:7ed68688 ESP:0032d078 EBP:0032d088 EFLAGS:00210202( R- -- I - - - ) EAX:57e5896d EBX:7edaf2f4 ECX:00151018 EDX:7ed686d0 ESI:57e58949 EDI:00000045 Stack dump: 0x0032d078: 00150c40 7edaee74 00150c40 00150c40 0x0032d088: 0032d0e8 7ed6b4ae 7ed84b14 00000016 0x0032d098: 0032d0c8 7edaee40 4d430003 00000000 0x0032d0a8: 00000000 00000000 00000000 00000000 0x0032d0b8: 4d430000 0014947c 0000001c 7bc4fc76 0x0032d0c8: 0032d0f0 7edaf2f4 7edaee40 00150c40 Backtrace: =>0 0x7ed68688 find_cached_table+0x28(db=<is not available>, name="EventMapping") [/home/hans/wine/dlls/msi/../../include/wine/unicode.h:216] in msi (0x0032d088) 1 0x7ed6b4ae get_table+0x1d() in msi (0x0032d0e8) 2 0x7ed6c9e8 TABLE_CreateView+0xe7(db=0x7edaee40, name="EventMapping", view=0x14946c) [/home/hans/wine/dlls/msi/table.c:2179] in msi (0x0032d128) 3 0x7ed72857 WHERE_CreateView+0xe6(db=0x7edaee40, view=0x32d1e4, tables="EventMapping", cond=0x149400) [/home/hans/wine/dlls/msi/where.c:1242] in msi (0x0032d178) fixme:dbghelp_dwarf:compute_location Only supporting one reg (ebp/22 -> -2) 4 0x7ed75cd2 sql_parse+0xd71(info=0x32d9f4) [/home/hans/wine/dlls/msi/sql.y:506] in msi (0x0032d9d8) 5 0x7ed763af MSI_ParseSQL+0x4e(db=0x7edaee40, command="SELECT * FROM `EventMapping` WHERE `Dialog_` = 'ProgressForm' AND `Control_` = 'NextButton'", phview=0x154370, mem=0x15437c) [/home/hans/wine/dlls/msi/sql.y:1002] in msi (0x0032da18) 6 0x7ed49012 MSI_DatabaseOpenViewW+0x71() in msi (0x0032da58) 7 0x7ed4911f MSI_OpenQuery+0x8e(db=0x7edaee40, view=0x32dac4, fmt="SELECT * FROM `EventMapping` WHERE `Dialog_` = '%s' AND `Control_` = '%s'") [/home/hans/wine/dlls/msi/msiquery.c:163] in msi (0x0032da98) 8 0x7ed21ce2 dialog_map_events+0x31(dialog=<is not available>, control=<is not available>) [/home/hans/wine/dlls/msi/dialog.c:761] in msi (0x0032dad8) 9 0x7ed26a9e msi_dialog_add_control+0xad(dialog=0x15e0b8, rec=0x154218, szCls="BUTTON", style=0x18010000) [/home/hans/wine/dlls/msi/dialog.c:791] in msi (0x0032db18) 10 0x7ed28dfa msi_dialog_button_control+0xf9(dialog=0x15e0b8, rec=0x154218) [/home/hans/wine/dlls/msi/dialog.c:1011] in msi (0x0032db58) 11 0x7ed22070 msi_dialog_create_controls+0xaf(rec=0x154218, param=0x15e0b8) [/home/hans/wine/dlls/msi/dialog.c:3475] in msi (0x0032db88) 12 0x7ed49a2a MSI_IterateRecords+0x79(view=0x1f0e48, count=0x0(nil), func=0x7ed21fc0, param=0x15e0b8) [/home/hans/wine/dlls/msi/msiquery.c:188] in msi (0x0032dbd8) 13 0x7ed264f2 MSIDialog_WndProc+0xb71(hwnd=<couldn't compute location>, msg=<couldn't compute location>, wParam=<couldn't compute location>, lParam=<couldn't compute location>) [/home/hans/wine/dlls/msi/dialog.c:3502] in msi (0x0032dcd8) 14 0x7e9ee37a WINPROC_wrapper+0x19() in user32 (0x0032dd18) 15 0x7e9ee9ba call_window_proc+0x49(hwnd=0x2005a, msg=0x1, wp=0, lp=0x32e050, result=0x32dde8, arg=0x7ed25980) [/home/hans/wine/dlls/user32/winproc.c:245] in user32 (0x0032dd68) 16 0x7e9f0ce5 WINPROC_call_window+0xc4(hwnd=0x2005a, msg=0x1, wParam=0, lParam=0x32e050, result=0x32dde8, unicode=0x1, mapping=2124605252) [/home/hans/wine/dlls/user32/winproc.c:920] in user32 (0x0032ddb8) 17 0x7e9b4b14 call_window_proc+0x63(hwnd=0x2005a, msg=0x1, wparam=0, lparam=0x32e050, unicode=0x1, same_thread=0x1, mapping=2124605252) [/home/hans/wine/dlls/user32/message.c:2224] in user32 (0x0032de18) 18 0x7e9bbb0e send_message+0x1bd(info=0x32dea4, res_ptr=0x32dea0, unicode=0x1) [/home/hans/wine/dlls/user32/message.c:3269] in user32 (0x0032de88) 19 0x7e9bbd61 SendMessageW+0x50(hwnd=<couldn't compute location>, msg=<couldn't compute location>, wparam=<couldn't compute location>, lparam=<couldn't compute location>) [/home/hans/wine/dlls/user32/message.c:3469] in user32 (0x0032ded8) 20 0x7e9e54aa WIN_CreateWindowEx+0xba9(cs=0x32e050, className="MsiDialogCloseClass", module=(nil), unicode=0x1) [/home/hans/wine/dlls/user32/win.c:1641] in user32 (0x0032e038) 21 0x7e9df098 CreateWindowExW+0x72(exStyle=<couldn't compute location>, className=<couldn't compute location>, windowName=<couldn't compute location>, style=<couldn't compute location>, x=<couldn't compute location>, y=<couldn't compute location>, width=<couldn't compute location>, height=<couldn't compute location>, parent=<couldn't compute location>, menu=<couldn't compute location>, instance=<couldn't compute location>, data=<couldn't compute location>) [/home/hans/wine/dlls/user32/win.c:1776] in user32 (0x0032e088) 22 0x7ed231c6 dialog_run_message_loop+0x65() in msi (0x0032e0f8) 23 0x7ed2ad43 event_do_dialog+0x42(package=0x13f538, name=<is not available>, parent=(nil), destroy_modeless=0x1) [/home/hans/wine/dlls/msi/dialog.c:4349] in msi (0x0032e128) 24 0x7ed2c0e9 ACTION_DialogBox+0x48(package=0x13f538, dialog="ProgressForm") [/home/hans/wine/dlls/msi/dialog.c:4567] in msi (0x0032e168) 25 0x7ed4c8ca MSI_ProcessMessage+0x5d9(package=0x13f538, eMessageType=INSTALLMESSAGE_SHOWDIALOG, record=0x146d60) [/home/hans/wine/dlls/msi/package.c:1794] in msi (0x0032f288) 26 0x7ed2bfc7 ACTION_ShowDialog+0x76(package=0x13f538, dialog="ProgressForm") [/home/hans/wine/dlls/msi/dialog.c:4522] in msi (0x0032fac8) 27 0x7ecfad88 ACTION_HandleCustomAction.part+0x77() in msi (0x0032faf8) 28 0x7ed0ab3c ACTION_PerformUIAction+0xab() in msi (0x0032fb38) 29 0x7ed0acdc ITERATE_Actions+0x13b(row=0x152b60, param=0x13f538) [/home/hans/wine/dlls/msi/action.c:499] in msi (0x0032fb78) 30 0x7ed49a2a MSI_IterateRecords+0x79(view=0x146928, count=0x0(nil), func=0x7ed0aba0, param=0x13f538) [/home/hans/wine/dlls/msi/msiquery.c:188] in msi (0x0032fbc8) 31 0x7ed0b463 MSI_InstallPackage+0x4f2(package=0x13f538, szPackagePath="XPSEP XP and Server 2003 32 bit.msi", szCommandLine=0x0(nil)) [/home/hans/wine/dlls/msi/action.c:604] in msi (0x0032fc18) 32 0x7ed3dd51 MsiInstallProductW+0xc0(szPackagePath=<is not available>, szCommandLine=<is not available>) [/home/hans/wine/dlls/msi/msi.c:251] in msi (0x0032fc68) 33 0x7efefbee WinMain+0x73d(hInstance=<is not available>, hPrevInstance=<is not available>, lpCmdLine=<is not available>, nCmdShow=<is not available>) [/home/hans/wine/programs/msiexec/msiexec.c:994] in msiexec (0x0032fd48) 34 0x7efee904 main+0xc3(argc=<couldn't compute location>, argv=<couldn't compute location>) [/home/hans/wine/dlls/winecrt0/exe_main.c:49] in msiexec (0x0032fde8) 35 0x7eff12ff __wine_spec_exe_entry+0x6e(peb=<couldn't compute location>) [/home/hans/wine/dlls/winecrt0/exe_entry.c:36] in msiexec (0x0032fe38) 36 0x7b45ee6c call_process_entry+0xb() in kernel32 (0x0032fe58) 37 0x7b45fe09 start_process+0x68(entry=<couldn't compute location>) [/home/hans/wine/dlls/kernel32/process.c:1116] in kernel32 (0x0032fe98) 38 0x7bc7e5b0 call_thread_func_wrapper+0xb() in ntdll (0x0032feb8) 39 0x7bc813a1 call_thread_func+0xb0(entry=0x7b45fda0, arg=0x7eff1290, frame=0x32ffc8) [/home/hans/wine/dlls/ntdll/signal_i386.c:2759] in ntdll (0x0032ffa8) 40 0x7bc7e58e call_thread_entry_point+0x11() in ntdll (0x0032ffc8) 41 0x7bc53473 start_process+0x12(arg=0xffaf6bd8) [/home/hans/wine/dlls/ntdll/loader.c:3083] in ntdll (0x0032ffe8) 42 0xf757d81d wine_call_on_stack+0x1c() in libwine.so.1 (0x00000000) 43 0xf757d980 wine_switch_to_stack+0x1f(func=0x7bc53460, arg=0xffaf6bd8, stack=0x330000) [/home/hans/wine/libs/wine/port.c:77] in libwine.so.1 (0xffaf6ba8) 44 0x7bc5911a LdrInitializeThunk+0x239(kernel_start=<couldn't compute location>, unknown2=<couldn't compute location>, unknown3=<couldn't compute location>, unknown4=<couldn't compute location>) [/home/hans/wine/dlls/ntdll/loader.c:3144] in ntdll (0xffaf6bf8) 45 0x7b465c33 __wine_kernel_init+0x962() [/home/hans/wine/dlls/kernel32/process.c:1310] in kernel32 (0xffaf7ae8) 46 0x7bc59ee3 __wine_process_init+0x152() [/home/hans/wine/dlls/ntdll/loader.c:3353] in ntdll (0xffaf7b58) 47 0xf757bbe3 wine_init+0x292(argc=0x4, argv=0xffaf8094, error="", error_size=0x400) [/home/hans/wine/libs/wine/loader.c:974] in libwine.so.1 (0xffaf7ba8) 48 0x7c000aaa main+0x79(argc=<is not available>, argv=<is not available>) [/home/hans/wine/loader/main.c:258] in <wine-loader> (0xffaf7fe8) 49 0xf739ea63 __libc_start_main+0xf2() in libc.so.6 (0x00000000) 0x7ed68688 find_cached_table+0x28 [/home/hans/wine/dlls/msi/../../include/wine/unicode.h:216] in msi: cmpw 0x24(%esi),%di 216 while (*str1 && (*str1 == *str2)) { str1++; str2++; }

1 0

Re: [PATCH 2/5] msi: Add a basic internal UI implementation.
by Marvin July 5, 2017

July 5, 2017

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=32104 Your paranoid android. === w7u (32 bit msi) === The task timed out

1 0

Re: [2/2] vcomp/tests: Test more arguments with a callback
by Sebastian Lackner July 5, 2017

July 5, 2017

On 05.07.2017 21:23, André Hentschel wrote: > - p_vcomp_fork(TRUE, 5, fork_uintptr_cb, (UINT_PTR)1, (UINT_PTR)(MAXUINT_PTR - 2), > - (UINT_PTR)3, (UINT_PTR)(MAXUINT_PTR - 4), (UINT_PTR)5); > + p_vcomp_fork(TRUE, 12, fork_uintptr_cb, (UINT_PTR)1, (UINT_PTR)(MAXUINT_PTR - 2), > + (UINT_PTR)3, (UINT_PTR)(MAXUINT_PTR - 4), (UINT_PTR)5, > + (UINT_PTR)6, (UINT_PTR)7, (UINT_PTR)8, (UINT_PTR)9, > + (UINT_PTR)10, (UINT_PTR)11); Shouldn't the second argument be 11?

2 1

Re: [PATCH 3/3] d3dx9/tests: Add tests for array of samplers.
by Matteo Bruni July 5, 2017

July 5, 2017

2017-06-28 13:28 GMT+02:00 Paul Gofman <gofmanp(a)gmail.com>: Sorry for the delayed reviews. I did it at last... > #define test_effect_preshader_compare_shader_bytecode(a, b, c, d) \ > @@ -4505,12 +4551,38 @@ static void test_effect_preshader(IDirect3DDevice9 *device) > hr = IDirect3DDevice9_GetSamplerState(device, 0, D3DSAMP_MAGFILTER, &value); > ok(hr == D3D_OK, "Got result %#x.\n", hr); > todo_wine ok(value == 3, "Unexpected sampler 0 magfilter %u.\n", value); > + > + hr = IDirect3DDevice9_GetSamplerState(device, 1, D3DSAMP_MINFILTER, &value); > + ok(hr == D3D_OK, "Got result %#x.\n", hr); > + ok(value == 1, "Unexpected sampler 1 minfilter %u.\n", value); > + hr = IDirect3DDevice9_GetSamplerState(device, 1, D3DSAMP_MAGFILTER, &value); > + ok(hr == D3D_OK, "Got result %#x.\n", hr); > + todo_wine > + ok(value == 1, "Unexpected sampler 1 magfilter %u.\n", value); Not new or really related to this patch: any idea about what's going on with the magfilter state computation? I didn't really look into it, does it have to do with default parameter values by any chance?

2 7

Re: [PATCH] dmime: Rename IPersistStreamImpl_Load functions
by Michael Stefaniuc July 5, 2017

July 5, 2017

Hello Alistair, On 07/05/2017 08:17 AM, Alistair Leslie-Hughes wrote: > When a log had IPersistStreamImpl_Load entry from dmime, it's > quiet confusing to which of the _Load function was used. could you please change the "persist_stream" part of the new name to "IPersistStream"? That way it is consistent with the other method names. thanks bye michael > > Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> > --- > dlls/dmime/lyricstrack.c | 4 ++-- > dlls/dmime/markertrack.c | 4 ++-- > dlls/dmime/paramcontroltrack.c | 4 ++-- > dlls/dmime/segment.c | 4 ++-- > dlls/dmime/segtriggertrack.c | 4 ++-- > dlls/dmime/seqtrack.c | 4 ++-- > dlls/dmime/sysextrack.c | 4 ++-- > dlls/dmime/tempotrack.c | 4 ++-- > dlls/dmime/timesigtrack.c | 4 ++-- > dlls/dmime/wavetrack.c | 4 ++-- > 10 files changed, 20 insertions(+), 20 deletions(-) > > diff --git a/dlls/dmime/lyricstrack.c b/dlls/dmime/lyricstrack.c > index 70382735d5..66293526dc 100644 > --- a/dlls/dmime/lyricstrack.c > +++ b/dlls/dmime/lyricstrack.c > @@ -240,7 +240,7 @@ static const IDirectMusicTrack8Vtbl dmtrack8_vtbl = { > IDirectMusicTrack8Impl_Join > }; > > -static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *stream) > +static HRESULT WINAPI lyrics_persist_stream_Load(IPersistStream *iface, IStream *stream) > { > FIXME(": Loading not implemented yet\n"); > return S_OK; > @@ -252,7 +252,7 @@ static const IPersistStreamVtbl persiststream_vtbl = { > dmobj_IPersistStream_Release, > dmobj_IPersistStream_GetClassID, > unimpl_IPersistStream_IsDirty, > - IPersistStreamImpl_Load, > + lyrics_persist_stream_Load, > unimpl_IPersistStream_Save, > unimpl_IPersistStream_GetSizeMax > }; > diff --git a/dlls/dmime/markertrack.c b/dlls/dmime/markertrack.c > index 852948ab40..0fe72f9c91 100644 > --- a/dlls/dmime/markertrack.c > +++ b/dlls/dmime/markertrack.c > @@ -188,7 +188,7 @@ static const IDirectMusicTrackVtbl dmtrack_vtbl = { > IDirectMusicTrackImpl_Clone > }; > > -static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *stream) > +static HRESULT WINAPI marker_persist_stream_Load(IPersistStream *iface, IStream *stream) > { > FIXME(": Loading not implemented yet\n"); > return S_OK; > @@ -200,7 +200,7 @@ static const IPersistStreamVtbl persiststream_vtbl = { > dmobj_IPersistStream_Release, > dmobj_IPersistStream_GetClassID, > unimpl_IPersistStream_IsDirty, > - IPersistStreamImpl_Load, > + marker_persist_stream_Load, > unimpl_IPersistStream_Save, > unimpl_IPersistStream_GetSizeMax > }; > diff --git a/dlls/dmime/paramcontroltrack.c b/dlls/dmime/paramcontroltrack.c > index affea1da90..a7bc873c97 100644 > --- a/dlls/dmime/paramcontroltrack.c > +++ b/dlls/dmime/paramcontroltrack.c > @@ -240,7 +240,7 @@ static const IDirectMusicTrack8Vtbl dmtrack8_vtbl = { > IDirectMusicTrack8Impl_Join > }; > > -static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *stream) > +static HRESULT WINAPI param_persist_stream_Load(IPersistStream *iface, IStream *stream) > { > FIXME(": Loading not implemented yet\n"); > return S_OK; > @@ -252,7 +252,7 @@ static const IPersistStreamVtbl persiststream_vtbl = { > dmobj_IPersistStream_Release, > dmobj_IPersistStream_GetClassID, > unimpl_IPersistStream_IsDirty, > - IPersistStreamImpl_Load, > + param_persist_stream_Load, > unimpl_IPersistStream_Save, > unimpl_IPersistStream_GetSizeMax > }; > diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c > index ad8561fcae..be4a850556 100644 > --- a/dlls/dmime/segment.c > +++ b/dlls/dmime/segment.c > @@ -1171,7 +1171,7 @@ static inline IDirectMusicSegment8Impl *impl_from_IPersistStream(IPersistStream > return CONTAINING_RECORD(iface, IDirectMusicSegment8Impl, dmobj.IPersistStream_iface); > } > > -static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pStm) > +static HRESULT WINAPI seg_persist_stream_Load(IPersistStream *iface, IStream *pStm) > { > IDirectMusicSegment8Impl *This = impl_from_IPersistStream(iface); > HRESULT hr; > @@ -1248,7 +1248,7 @@ static const IPersistStreamVtbl persiststream_vtbl = { > dmobj_IPersistStream_Release, > dmobj_IPersistStream_GetClassID, > unimpl_IPersistStream_IsDirty, > - IPersistStreamImpl_Load, > + seg_persist_stream_Load, > unimpl_IPersistStream_Save, > unimpl_IPersistStream_GetSizeMax > }; > diff --git a/dlls/dmime/segtriggertrack.c b/dlls/dmime/segtriggertrack.c > index d1b208a6d0..17d5da2db5 100644 > --- a/dlls/dmime/segtriggertrack.c > +++ b/dlls/dmime/segtriggertrack.c > @@ -456,7 +456,7 @@ static inline IDirectMusicSegTriggerTrack *impl_from_IPersistStream(IPersistStre > return CONTAINING_RECORD(iface, IDirectMusicSegTriggerTrack, dmobj.IPersistStream_iface); > } > > -static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pStm) > +static HRESULT WINAPI trigger_persist_stream_Load(IPersistStream *iface, IStream *pStm) > { > IDirectMusicSegTriggerTrack *This = impl_from_IPersistStream(iface); > DMUS_PRIVATE_CHUNK Chunk; > @@ -505,7 +505,7 @@ static const IPersistStreamVtbl persiststream_vtbl = { > dmobj_IPersistStream_Release, > dmobj_IPersistStream_GetClassID, > unimpl_IPersistStream_IsDirty, > - IPersistStreamImpl_Load, > + trigger_persist_stream_Load, > unimpl_IPersistStream_Save, > unimpl_IPersistStream_GetSizeMax > }; > diff --git a/dlls/dmime/seqtrack.c b/dlls/dmime/seqtrack.c > index 2d80db75cd..7e74fa6036 100644 > --- a/dlls/dmime/seqtrack.c > +++ b/dlls/dmime/seqtrack.c > @@ -242,7 +242,7 @@ static const IDirectMusicTrack8Vtbl dmtrack8_vtbl = { > IDirectMusicTrack8Impl_Join > }; > > -static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *stream) > +static HRESULT WINAPI track_persist_stream_Load(IPersistStream *iface, IStream *stream) > { > FIXME(": Loading not implemented yet\n"); > return S_OK; > @@ -254,7 +254,7 @@ static const IPersistStreamVtbl persiststream_vtbl = { > dmobj_IPersistStream_Release, > dmobj_IPersistStream_GetClassID, > unimpl_IPersistStream_IsDirty, > - IPersistStreamImpl_Load, > + track_persist_stream_Load, > unimpl_IPersistStream_Save, > unimpl_IPersistStream_GetSizeMax > }; > diff --git a/dlls/dmime/sysextrack.c b/dlls/dmime/sysextrack.c > index 431fca7227..ba7a8fdc7c 100644 > --- a/dlls/dmime/sysextrack.c > +++ b/dlls/dmime/sysextrack.c > @@ -242,7 +242,7 @@ static const IDirectMusicTrack8Vtbl dmtrack8_vtbl = { > IDirectMusicTrack8Impl_Join > }; > > -static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *stream) > +static HRESULT WINAPI sys_persist_stream_Load(IPersistStream *iface, IStream *stream) > { > FIXME(": Loading not implemented yet\n"); > return S_OK; > @@ -254,7 +254,7 @@ static const IPersistStreamVtbl persiststream_vtbl = { > dmobj_IPersistStream_Release, > dmobj_IPersistStream_GetClassID, > unimpl_IPersistStream_IsDirty, > - IPersistStreamImpl_Load, > + sys_persist_stream_Load, > unimpl_IPersistStream_Save, > unimpl_IPersistStream_GetSizeMax > }; > diff --git a/dlls/dmime/tempotrack.c b/dlls/dmime/tempotrack.c > index 70de44228f..3c6f957571 100644 > --- a/dlls/dmime/tempotrack.c > +++ b/dlls/dmime/tempotrack.c > @@ -320,7 +320,7 @@ static inline IDirectMusicTempoTrack *impl_from_IPersistStream(IPersistStream *i > return CONTAINING_RECORD(iface, IDirectMusicTempoTrack, dmobj.IPersistStream_iface); > } > > -static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pStm) > +static HRESULT WINAPI tempo_persist_stream_Load(IPersistStream *iface, IStream *pStm) > { > IDirectMusicTempoTrack *This = impl_from_IPersistStream(iface); > DMUS_PRIVATE_CHUNK Chunk; > @@ -375,7 +375,7 @@ static const IPersistStreamVtbl persiststream_vtbl = { > dmobj_IPersistStream_Release, > dmobj_IPersistStream_GetClassID, > unimpl_IPersistStream_IsDirty, > - IPersistStreamImpl_Load, > + tempo_persist_stream_Load, > unimpl_IPersistStream_Save, > unimpl_IPersistStream_GetSizeMax > }; > diff --git a/dlls/dmime/timesigtrack.c b/dlls/dmime/timesigtrack.c > index 9bd7450264..72fdac8cbe 100644 > --- a/dlls/dmime/timesigtrack.c > +++ b/dlls/dmime/timesigtrack.c > @@ -189,7 +189,7 @@ static const IDirectMusicTrackVtbl dmtack_vtbl = { > IDirectMusicTrackImpl_Clone > }; > > -static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *stream) > +static HRESULT WINAPI time_persist_stream_Load(IPersistStream *iface, IStream *stream) > { > FIXME(": Loading not implemented yet\n"); > return S_OK; > @@ -201,7 +201,7 @@ static const IPersistStreamVtbl persiststream_vtbl = { > dmobj_IPersistStream_Release, > dmobj_IPersistStream_GetClassID, > unimpl_IPersistStream_IsDirty, > - IPersistStreamImpl_Load, > + time_persist_stream_Load, > unimpl_IPersistStream_Save, > unimpl_IPersistStream_GetSizeMax > }; > diff --git a/dlls/dmime/wavetrack.c b/dlls/dmime/wavetrack.c > index bc6e3ca413..20656a9362 100644 > --- a/dlls/dmime/wavetrack.c > +++ b/dlls/dmime/wavetrack.c > @@ -249,7 +249,7 @@ static const IDirectMusicTrack8Vtbl dmtrack8_vtbl = { > IDirectMusicTrack8Impl_Join > }; > > -static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *stream) > +static HRESULT WINAPI wave_persist_stream_Load(IPersistStream *iface, IStream *stream) > { > FIXME(": Loading not implemented yet\n"); > return S_OK; > @@ -261,7 +261,7 @@ static const IPersistStreamVtbl persiststream_vtbl = { > dmobj_IPersistStream_Release, > dmobj_IPersistStream_GetClassID, > unimpl_IPersistStream_IsDirty, > - IPersistStreamImpl_Load, > + wave_persist_stream_Load, > unimpl_IPersistStream_Save, > unimpl_IPersistStream_GetSizeMax > }; >

1 0

Re: [PATCH] mmdevapi/tests: Use standard wine_dbgstr_longlong.
by Marvin July 4, 2017

July 4, 2017

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=32062 Your paranoid android. === w7u (32 bit render) === render.c:1029: Test failed: Position 6592 too far after playing 100ms === w864 (32 bit render) === render.c:1255: Test failed: GetBuffer large (20671) at iteration 2

1 0

Re: [PATCH 2/5] msi: Add a basic internal UI implementation.
by Marvin July 4, 2017

July 4, 2017

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=32025 Your paranoid android. === w7u (32 bit msi) === The task timed out

3 3

Re: [1/5] libwine: Added a wine_mmap_is_in_reserved_area_ex function which returns boundary address.
by Alexandre Julliard July 4, 2017

July 4, 2017

Akihiro Sagawa <sagawa.aki(a)gmail.com> writes: > Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> > --- > include/wine/library.h | 1 + > libs/wine/mmap.c | 23 ++++++++++++++++++++++- > libs/wine/wine.map | 1 + > 3 files changed, 24 insertions(+), 1 deletion(-) > > diff --git a/include/wine/library.h b/include/wine/library.h > index 242bb69..0920c60 100644 > --- a/include/wine/library.h > +++ b/include/wine/library.h > @@ -79,6 +79,7 @@ extern void *wine_anon_mmap( void *start, size_t size, int prot, int flags ); > extern void wine_mmap_add_reserved_area( void *addr, size_t size ); > extern void wine_mmap_remove_reserved_area( void *addr, size_t size, int unmap ); > extern int wine_mmap_is_in_reserved_area( void *addr, size_t size ); > +extern int wine_mmap_is_in_reserved_area_ex( void *addr, size_t size, void **boundary ); > extern int wine_mmap_enum_reserved_areas( int (*enum_func)(void *base, size_t size, void *arg), > void *arg, int top_down ); > I'm afraid we don't want to add functions either. It should be possible to implement what you want without changing the libwine interface. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: Definition (or not) of IDXGIResource methods
by Ben "Root" Anderson July 4, 2017

July 4, 2017

On Mon, Jul 3, 2017 at 1:52 PM, Henri Verbeet <hverbeet(a)gmail.com> wrote: > I expect ultimately you'll need some way to get at the underlying > OpenGL object. One way to go about that may to for example extend the > IWineDXGIDevice interface in include/wine/winedxgi.idl with a method > to retrieve the underlying OpenGL object of a resource. Thanks for the tip. It'll likely make a good temporary hack until I put together the (sizable) proper solution. The added functions may even wind up being a part of said solution. > There are some details to take care of there though. For one, while > wined3d is implemented on top OpenGL, that's an implementation detail > and may not be true forever. A D3D surface/texture could be backed by > an OpenGL texture, an OpenGL renderbuffer, both, or something else > entirely, so you'll probably want some kind of interface to negotiate > the kind of representation you're requesting. Even if for simplicity > we assume we have a D3D texture backed by an OpenGL texture, that > doesn't guarantee that at any given time that OpenGL texture is > current/coherent. (See also, wined3d_texture_load_location(), > wined3d_texture_validate_location(), > wined3d_texture_invalidate_location(), etc.) So you may need a way to > flush/synchronise that OpenGL texture as well. And while > IWineDXGIDevice may be a good way to prove the concept, that's an > internal interface that doesn't make any guarantees about interface > stability, so for something that you'd want to use to interface with > external software, it would be best to create a separate interface > that does make those kinds of guarantees. Yeah, I definitely want to avoid interfaces that aren't agnostic to the underlying implementation, at which point it makes more sense to instead implement the relevant Windows APIs. My current plan is to make and submit a patch to wine-staging that implements VK_KHX_external_memory_win32 and the Direct3D/DXGI functionality needed to interact with that extension from Direct3D; this implementation would very probably lean on GL_EXT_memory_object and related extensions. Then, I'd use those interfaces to import the textures into a Vulkan instance, which is then passed to the compositor. > Finally, does this need to work with arbitrary resources, or do you > only need this for e.g. swapchain buffers? It needs to work not with swapchain buffers, but a pair of ID3D11Texture2D objects that are created by the application for the express purpose of being passed to the API I'm wrapping. One or both of these textures may or may not also be presented by the application in its own window through the usual D3D process, but I do not know and am not supposed to know whether they are, and shouldn't care. (Some apps actually render and present a completely separate scene in their window.) I need to ultimately pass the textures to the native Linux version of the compositor in a form it can digest (specifically, either a GL texture or render buffer name, or a VkImage and associated instance structs), which then (among other things) presents it in the HMD using its own (Vulkan) swapchains.

2 1

Re: [PATCH 3/4] d3drm: Initial support for storing animation keys
by Henri Verbeet July 4, 2017

July 4, 2017

On 4 July 2017 at 09:43, Nikolay Sivov <nsivov(a)codeweavers.com> wrote: > +static int d3drm_animation_cmp_min(const struct d3drm_animation_keys *keys, D3DVALUE left, D3DVALUE right, DWORD *cur) > +{ > + if (left == right) > + { > + while (*cur > 0 && left == keys->keys[*cur - 1].time) > + (*cur)--; > + return 0; > + } Does this really need to happen inside the comparison function? I.e., couldn't you just use a single comparison function, bsearch(), and do the fixup for duplicates afterwards? > +static DWORD d3drm_animation_get_index(struct d3drm_animation_keys *keys, D3DVALUE time, > + int (*compare_func)(const struct d3drm_animation_keys *keys, D3DVALUE left, D3DVALUE right, DWORD *cur)) > +{ > + int min = 0, max = keys->count - 1; unsigned/SIZE_T, right? > +static BOOL d3drm_animation_get_range(struct d3drm_animation_keys *keys, D3DVALUE time_min, D3DVALUE time_max, > + DWORD *min, DWORD *max) > +{ > + if (keys->count == 0) > + return FALSE; > + > + if (time_min > keys->keys[keys->count - 1].time || time_max < keys->keys[0].time) > + return FALSE; > + > + *min = d3drm_animation_get_index(keys, time_min, d3drm_animation_cmp_min); > + *max = d3drm_animation_get_index(keys, time_max, d3drm_animation_cmp_max); This is pretty minor, but note that to find *max you'd only have to search through *min to the end, instead of through the entire range. > + if (!key || key->dwSize != sizeof(*key)) > + return E_INVALIDARG; We usually print a WARN for cases where the application passes us questionable data. That's certainly not a strict requirement, but on occasion it does tend to make it slightly easier to figure out where things start failing. > + memmove(keys->keys + index + 1, keys->keys + index, sizeof(*keys->keys) * (keys->count - index)); We'd typically write those as "&keys->keys[index + 1]", etc. That's purely stylistic, of course. > + if (d3drm_animation_get_range(&animation->rotate, time_min, time_max, &min, &max)) > + { > + *count += max - min + 1; > + > + for (i = min; i <= max && keys; i++, cur++) > + { > + keys[cur].dwSize = sizeof(*keys); > + keys[cur].dwKeyType = D3DRMANIMATION_ROTATEKEY; > + keys[cur].dvTime = animation->rotate.keys[i].time; > + keys[cur].dwID = 0; /* FIXME */ > + keys[cur].u.dqRotateKey = animation->rotate.keys[i].u.rotate; > + } > + } Minor, but note that it would probably be more convenient if d3drm_animation_get_range() returned a pointer to animation->rotate.keys[min] and a count.

1 0

Re: [PATCH 5/5] msi: Correctly format the template field for MsiProcessMessage().
by Marvin July 3, 2017

July 3, 2017

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=32028 Your paranoid android. === wxppro (32 bit package) === 0a08:package: unhandled exception c0000005 at 00000738

1 0

Re: [PATCH 4/5] msi: Don't increment the refcount when creating dialogs.
by Marvin July 3, 2017

July 3, 2017

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=32027 Your paranoid android. === wxppro (32 bit package) === 09f0:package: unhandled exception c0000005 at 00000000

1 0

Re: [PATCH 3/5] msi: Implement UI messages for dialogs.
by Marvin July 3, 2017

July 3, 2017

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=32026 Your paranoid android. === wxppro (32 bit package) === 09f0:package: unhandled exception c0000005 at 00000000

1 0

wine-2.0.2-rc1 Available
by Michael Stefaniuc July 3, 2017

July 3, 2017

Hello guys, I have pushed wine-2.0.2-rc1 (with tag) to https://github.com/mstefani/wine-stable https://static-winehq.rhcloud.com/stable/ This version features 88 commits: - Some patches deferred from 2.0.1 - The compilation fixes for the prediluvian gcc 2.95 (but untested if those are enough) - Some simple "crash fix" commits that have no bugzilla entries - The usual assortment of bug fixes And now the interesting parts from the ANNOUNCE file: What's new in this release (see below for details): - Various bug fixes ---------------------------------------------------------------- Bugs fixed in 2.0.2 (total 61): 2624 In dialogs, an incorrect extra WM_ERASEBKGND is sent after WM_PAINT 10858 BlueByte Game Channel fails to install 14606 TreeView + right click doesn't work the way it does in native windows 20215 Extra mouse buttons do not work in Firefox 23302 Not standard background color in Wine configuration 25625 Implement PROPSHEET_InsertPage 30378 Xuzhou network client crashes at start 30764 regedit: a key created from right-click context menu is in incorrect position 33717 regedit: Sorting registry keys on refreshing 33987 Secret Files 3 demo shows only some parts of background in ConfigTool 35563 Custom game development library expects non-zero value for ProcessVmCounters info class member 'WorkingSetSize' 37404 A right click on a registry key does not select it 37976 Poedit 1.7.4 crashes on unimplemented function msvcr120.dll.??0_ReentrantBlockingLock(a)details@Concurrency@@QAE(a)XZ 39685 Multiple applications crash on startup, need unimplemented function msvcr120.dll.??0event(a)Concurrency@@QAE(a)XZ (Rollcage Redux v1.3.8, ARC client, Playstation Now) 39856 Regedit: Default registry key is not the same as on Windows 39895 MalwareBytes Anti-malware software needs msvcr100.dll.lldiv implementation 40629 Noto Nastaliq Urdu font crashes notepad during shaping 40798 ACDSee Pro 9 (64-bit) needs msvcr120.dll.??0event(a)Concurrency@@QEAA(a)XZ 40948 Multiple apps need api-ms-win-crt-locale-l1-1-0.dll.__initialize_lconv_for_unsigned_char 40956 unimplemented function msvcr110.dll._Lock_shared_ptr_spin_lock when starting Zoner Photo Studio 18 41408 Multiple applications crash on unimplemented function msvcp140.dll.??0task_continuation_context(a)Concurrency@@AAE(a)XZ 41472 kolotibablo needs ntoskrnl.exe.KeAcquireInStackQueuedSpinLock 41753 Steep (Ubisoft) needs iphlpapi.dll.GetUnicastIpAddressEntry 41928 Mortal Kombat X needs msvcr110.dll._get_dstbias 42017 Silence d3d11_immediate_context_OMSetBlendState spam at console 42129 Steam client - unimplemented function mfreadwrite.dll.MFCreateSourceReaderFromMediaSource 42138 bug when running reaktor 6: "Unhandled exception: unimplemented function concrt140.dll.??0_ReentrantBlockingLock(a)details@Concurrency@@QAE(a)XZ called in 32-bit code (0x7b43bf1c)." 42206 Gauntlet character screen background is corrupted. 42209 Native Instruments Native Access 1.0.25 (R37) crashes on unimplemented function concrt140.dll.??1_ReentrantBlockingLock(a)details@Concurrency@@QAE(a)XZ 42239 Kontact 5.6 needs api-ms-win-crt-time-l1-1-0.dll._Wcsftime 42240 Kontact 5.6 needs concrt140.dll.??0_ReentrantBlockingLock(a)details@Concurrency@@QEAA(a)XZ 42271 Final Fantasy X needs msvcr110.dll.__crtUnhandledException 42449 Multiple apps need function msvcr120.dll.fesetround (0 A.D., BeamNG.drive) 42463 ZmLearn crash at startup: "Assertion 'm->state == STATE_PASSIVE' failed at pulse/mainloop.c:787, function pa_mainloop_prepare(). Aborting." 42465 winhttp set_cookies() violates RFC6265 string comparison rules 42487 Free Devanagari font Samanata crashes during GPOS processing 42490 Assertion failure when clicking boxes in altWinDirStat 42510 InternetOpenUrl does not send query parameters for HTTPS urls 42559 Adobe Reader DC: No longer installs (Unimplemented function msi.dll.MsiGetComponentPathExW) 42575 Multiple applications need msvcp140.dll.?_LogScheduleTask(a)_TaskEventLogger@details(a)Concurrency@@QAEX_N(a)Z 42576 Poedit crashes on start on unimplemented function msvcp140.dll.?_Reset(a)_ContextCallback@details(a)Concurrency@@AAEXXZ 42578 WSAStringToAddress fails to parse IP v6 addresses with port number 42626 unimplemented function msvcr110.dll.__crtUnhandledException 42651 ViStart: fails to install, needs ntoskrnl.exe.IoReportResourceForDetection 42655 Aliens vs. Predator (2010) needs d3dx11_42.dll.D3DX11FilterTexture 42657 ACDSee Pro 9 needs msvcr120.dll.?Alloc(a)Concurrency@@YAPEAX_K(a)Z 42658 Playstation Now needs msvcr120.dll.?Alloc(a)Concurrency@@YAPAXI(a)Z 42688 Native Acces crashes on unimplemented msvcp140.dll.?__ExceptionPtrCompare@@YA_NPBX0(a)Z 42703 Excel 2010 does not work: unimplemented function oleaut32.dll.GetAltMonthNames 42736 scanf doesn't work as expected when using format string contains non-ascii chars 42774 WinHttpQueryAuthSchemes fails to return the correct supported value for multiple WWW-Authenticate 42798 MsiGetPatchInfoEx returns incorrect values for UNINSTALLABLE, PATCHSTATE properties 42834 Steuer-Spar-Erklärung 2017 crashes with critical error 42876 iTunes needs function msvcp140.dll._Lock_shared_ptr_spin_lock 42986 wine can't be compiled by gcc-2.95.4 (amstream/mediastream.c) 42991 wine can't be compiled by gcc-2.95.4 (dmusic/port.c) 42992 wine can't be compiled by gcc-2.95.4 (dwrite/opentype.c) 42993 wine can't be compiled by gcc-2.95.4 (gdiplus/metafile.c) 42994 wine can't be compiled by gcc-2.95.4 (mscoree/assembly.c) 42995 wine can't be compiled by gcc-2.95.4 (netprofm/list.c) 43127 Multiple 64-bit applications crash with stack overflow errors when Wine is compiled with GCC 7.x (set_context_reg in ntdll/signal_x86_64.c assumes Xmm registers are aligned) ---------------------------------------------------------------- Changes since 2.0.1: Alex Henrie (7): winecfg: Paint text on About tab with the right background color. ntdll: Implement ProcessVmCounters for Linux. user32: Translate WM_(NC)XBUTTONUP to WM_APPCOMMAND in DefWindowProc. comctl32: Return TRUE from LVM_REDRAWITEMS with bad indices. ddraw: Don't crash if writing out a new ddraw2 surface segfaults. ddraw: Don't crash if writing out a new ddraw4 surface segfaults. ddraw: Don't crash if writing out a new ddraw7 surface segfaults. Alistair Leslie-Hughes (3): winhttp/tests: Added multi Authenticate header test. include: Add mfreadwrite.idl. mfreadwrite: Add MFCreateSourceReaderFromMediaSource stub. Andrey Gusev (1): d3dx11: Add D3DX11FilterTexture stub. André Hentschel (4): include: Add the new version of the IP_ADAPTER_UNICAST_ADDRESS structure. iphlpapi: Add GetUnicastIpAddressEntry implementation. hidclass.sys: Fix compilation on systems that don't support nameless structs. winebus.sys: Fix compilation on systems that don't support nameless structs. Aric Stewart (1): usp10: Fix Contextual Shaping for Languages with RTL write order. Austin English (2): ntoskrnl.exe: Add KeAcquireInStackQueuedSpinLock stub. ntoskrnl.exe: Add IoReportResourceForDetection stub. Björn Bidar (1): wined3d: Add NVIDIA GTX 1080 Ti to the GPU list. Bruno Jesus (2): ws2_32/tests: Rework WSAStringToAddress tests. ws2_32: Fix WSAStringToAddress parsing for IPv6. Christopher Berner (1): wined3d: Add Nvidia TitanX (Pascal). Daniel Lehman (1): msvcrt: Add Concurrency::event stubs. Fabian Maurer (5): user32/tests: Add tests for windows when first shown with WS_VISIBLE or RedrawWindow. user32/tests: Add tests for windows when first shown with SetWindowPos. user32/tests: Add tests for windows when first shown if they have children. user32/tests: Add WM_NCPAINT tests for windows crossing screen or maximized. user32: Send WM_NCPAINT and WM_ERASEBKGND when window is shown. Gijs Vermeulen (1): msvcrt: Add stub for Concurrency::Alloc. Hans Leidekker (7): msi: Implement MsiGetComponentPathExA/W. winhttp: Parse cookie attributes. winhttp: Cookie attributes are case-insensitive. winhttp: Ignore unknown schemes in WinHttpQueryAuthSchemes. msi: Properly handle DWORD registry values in MsiGetPatchInfoEx. netprofm: Fix compilation on systems that don't support nameless unions. winhttp: Fix a memory leak in insert_header (Valgrind). Hugh McMaster (4): comctl32: Improve right-click handling in treeview controls. regedit: Call TrackPopupMenu() from WM_CONTEXTMENU. regedit: Select the targeted treeview item on right mouse click. regedit: Sort treeview children on refresh. Huw D. M. Davies (1): shell32: Avoid leaking icon handles. Jacek Caban (1): msvcrt: Added lldiv implementation. Jakub Bartmiński (1): regedit: Fall back to tree root on invalid path. Józef Kucia (11): d3d11: Try to avoid spurious blend state FIXMEs(). wined3d: Add ARB_texture_buffer_object extension. wined3d: Create dummy buffer textures. wined3d: Add initial support for shader buffer views. wined3d: Do not pass LOD to texelFetch() for buffer resources. wined3d: Implement buffer samplers. amstream: Fix compilation on systems that don't support nameless unions. dmusic: Fix compilation on systems that don't support nameless structs or unions. mscoree: Fix compilation on systems that don't support nameless unions. gdiplus: Fix compilation on systems that don't support nameless unions. dxgi: Fix HMODULE leak in register_d3d10core_layers(). Michael Müller (2): cabinet: Set index of folder in FDICopy callback. wininet: Handle query parameters for HTTPS urls in InternetOpenUrlW. Michael Stefaniuc (1): dmloader: Avoid a crash on a NULL string pointer. Nikolay Sivov (8): oleaut32: Implement GetAltMonthNames(). dwrite: Make CreateFontFaceFromHdc() properly fail on unsupported font format. regedit: Sort each of top level branches separately. usp10: Ignore device tables with invalid delta format. dwrite: Fix compilation failure regarding nameless unions. schedsvc: Fix xml buffer leak (Valgrind). dwrite: Fix file object leak. shell32: Fix string leak. Peter Hater (1): comctl32/propsheet: Added PSM_INSERTPAGE implementation. Piotr Caban (16): msvcp110: Add _Lock_shared_ptr_spin_lock implementation. msvcp140: Add task_continuation_context constructor implementation. msvcp140: Add _ContextCallback implementation. msvcp140: Add _TaskEventLogger class implementation. msvcr: Add _Wcsftime implementation. msvcr100: Add reader_writer_lock class stub. msvcr100: Add _ReentrantBlockingLock class implementation. msvcrt: Add __ExceptionPtrCopyException implementation. msvcrt: Add __ExceptionPtrCompare implementation. msvcr: Add __crtUnhandledException implementation. msvcr120: Add fesetround implementation. msvcrt: Fix handling of unsigned chars in scanf format. msvcrt: Fix wide characters handling in wscanf functions. msvcr: Add _get_dstbias implementation. ucrtbase: Add __initialize_lconv_for_unsigned_char implementation. msvcr110: Add _Lock_shared_ptr_spin_lock implementation. Sebastian Lackner (3): rasapi32: Set *lpcDevices in RasEnumDevicesA. ntdll: Do not cast unaligned pointer to M128A in set_context_reg. mmdevapi: Use InitOnce to initialize audio drivers. Thierry Vermeylen (1): wnaspi32: Do not crash on SC_GETSET_TIMEOUTS. Viktor Semykin (2): windowscodecs/tests: Test for png codec seeking too far. windowscodecs: Fixed loading png from streams. -- Michael Stefaniuc mstefani(a)winehq.org

1 0

Re: [PATCH 2/2] make_unicode: Update to Unicode to version 10 I added "Bottom_And_Left", but i have no idea, if my change is correct
by Aric Stewart July 3, 2017

July 3, 2017

Please do not change existing values. You can add new ones to the end. -aric On 7/2/17 5:23 PM, Detlef Riekenberg wrote: > -- > Bye bye ... Detlef > > Signed-off-by: Detlef Riekenberg <wine.dev(a)web.de> > --- > tools/make_unicode | 9 +++++---- > 1 file changed, 5 insertions(+), 4 deletions(-) > > diff --git a/tools/make_unicode b/tools/make_unicode > index f9c2917..5bbc5b8 100755 > --- a/tools/make_unicode > +++ b/tools/make_unicode > @@ -23,7 +23,7 @@ use strict; > > # base URLs for www.unicode.org files > my $MAPPINGS = "http://www.unicode.org/Public/MAPPINGS"; > -my $UNIDATA = "http://www.unicode.org/Public/9.0.0/ucd"; > +my $UNIDATA = "http://www.unicode.org/Public/10.0.0/ucd"; > my $REPORTS = "http://www.unicode.org/reports"; > my $RFCS = "http://www.rfc-editor.org/rfc"; > my $VERTICALPATH = "http://www.unicode.org/Public/vertical/revision-17"; > @@ -190,9 +190,10 @@ my %matra_types = > "Top_And_Left" => 0x09, > "Top_And_Left_And_Right" => 0x0a, > "Bottom_And_Right" => 0x0b, > - "Top_And_Bottom_And_Right" => 0x0c, > - "Overstruck" => 0x0d, > - "Invisible" => 0x0e > + "Bottom_And_Left" => 0x0c, > + "Top_And_Bottom_And_Right" => 0x0d, > + "Overstruck" => 0x0e, > + "Invisible" => 0x0f > ); > > my %nameprep_flags = >

1 0

Re: [4/7] ntdll: Allow map_view() to allocate fixed memory between reserved area and non-reserved area.
by Alexandre Julliard July 3, 2017

July 3, 2017

Akihiro Sagawa <sagawa.aki(a)gmail.com> writes: > @@ -551,11 +551,12 @@ void wine_mmap_remove_reserved_area( void *addr, size_t size, int unmap ) > * Check if the specified range is included in a reserved area. > * Returns 1 if range is fully included, 0 if range is not included > * at all, and -1 if it is only partially included. > + * When returning -1, set the boundary address if the pointer is supplied. > * > * Note: the reserved areas functions are not reentrant, caller is > * responsible for proper locking. > */ > -int wine_mmap_is_in_reserved_area( void *addr, size_t size ) > +int wine_mmap_is_in_reserved_area( void *addr, size_t size, void **boundary ) libwine is supposed to be backwards compatible, you can't change its interface. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 1/4] msi: Add a basic internal UI implementation.
by Marvin July 3, 2017

July 3, 2017

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=31999 Your paranoid android. === w7u (32 bit msi) === The task timed out

3 2

Re: [PATCH] make_unicode: Update vertical spec to revision 17
by Alexandre Julliard July 3, 2017

July 3, 2017

Detlef Riekenberg <wine.dev(a)web.de> writes: > @@ -26,7 +26,8 @@ my $MAPPINGS = "http://www.unicode.org/Public/MAPPINGS"; > my $UNIDATA = "http://www.unicode.org/Public/9.0.0/ucd"; > my $REPORTS = "http://www.unicode.org/reports"; > my $RFCS = "http://www.rfc-editor.org/rfc"; > -my $VERTICALDATA = "http://www.unicode.org/Public/vertical/revision-15"; > +my $VERTICALPATH = "http://www.unicode.org/Public/vertical/revision-17"; > +my $VERTICALFILE = "VerticalOrientation-17.txt"; This doesn't seem to make any difference in the generated file, should it? -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 05/10 v4] gdiplus: Support SetTextRenderingHint in metafiles
by Nikolay Sivov July 3, 2017

July 3, 2017

On 06/30/2017 07:14 PM, Piotr Caban wrote: > +GpStatus METAFILE_AddSimpleProperty(GpMetafile *metafile, SHORT prop, SHORT val) > +{ > + EmfPlusRecordHeader *hint_record; > + GpStatus stat; > + > + if (metafile->metafile_type != MetafileTypeEmfPlusOnly && metafile->metafile_type != MetafileTypeEmfPlusDual) > + return Ok; > + > + stat = METAFILE_AllocateRecord(metafile, sizeof(*hint_record), (void**)&hint_record); > + if (stat != Ok) return stat; > + > + hint_record->Type = prop; > + hint_record->Flags = val; > + > + METAFILE_WriteRecords(metafile); > + return Ok; > +} This is not specific to text rendering hint parameter anymore, local variable should be just "record".

2 1

Re: [PATCH 03/10 v4] gdiplus: Add functions for managing metafile objects id
by Vincent Povirk July 3, 2017

July 3, 2017

This seems like overkill to me? I don't see the need for per-object refcounting. Every drawing operation that uses an object is just going to end with a series of releases, and after it returns all refcounts should be 0. + /* TODO: object id should be released on object dispose */ I don't think this approach is possible. It would require every object to be aware of which metafiles are using it, and every operation that modifies the object would have to release them. Bitmap objects can refer to an application buffer that could be modified without any call into gdiplus. (Or, Bitmaps could be modified by an ImageAttributes, in which case we can't reuse them except with an identical ImageAttributes.) If we wanted to reuse Bitmaps, we'd have to compare the data. For other large types like Paths, maybe keeping an id to detect whether it changed would make sense. For types of bounded size, it probably would be easier to store a complete copy.

2 2

Re: [PATCH] kernel32: Fix GetModuleHandleEx() spec file entry
by Chris Robinson July 2, 2017

July 2, 2017

On 07/02/2017 01:26 AM, Nikolay Sivov wrote: > -@ stdcall GetModuleHandleExA(long ptr ptr) > -@ stdcall GetModuleHandleExW(long ptr ptr) > +@ stdcall GetModuleHandleExA(long str ptr) > +@ stdcall GetModuleHandleExW(long wstr ptr) Depending on the flags, the second parameter might not actually be a string. e.g. if GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS is set, the second parameter is any address within the module's address space.

2 1