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

Daniel Lehman : kernel32/tests: Increase timeout for loader test.
by Alexandre Julliard July 18, 2017

July 18, 2017

Module: wine Branch: master Commit: 9118512135a1aac6969bf575a0656855ba84ef11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9118512135a1aac6969bf575a… Author: Daniel Lehman <dlehman(a)esri.com> Date: Tue Jul 18 08:28:11 2017 -0700 kernel32/tests: Increase timeout for loader test. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/loader.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 2587a97..09c21d8 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -2195,9 +2195,9 @@ static void child_process(const char *dll_name, DWORD target_offset) } else { - ret = WaitForSingleObject(attached_thread[0], 1000); + ret = WaitForSingleObject(attached_thread[0], 2000); ok(ret == WAIT_OBJECT_0, "expected WAIT_OBJECT_0, got %#x\n", ret); - ret = WaitForSingleObject(attached_thread[1], 1000); + ret = WaitForSingleObject(attached_thread[1], 2000); ok(ret == WAIT_OBJECT_0, "expected WAIT_OBJECT_0, got %#x\n", ret); }

1 0

Vincent Povirk : gdiplus: Don' t require specific gdi+ versions in metafile structures.
by Alexandre Julliard July 18, 2017

July 18, 2017

Module: wine Branch: master Commit: cfe2b3fa0e7509314c509f832f509936c88688d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cfe2b3fa0e7509314c509f832… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Jul 18 11:35:28 2017 -0500 gdiplus: Don't require specific gdi+ versions in metafile structures. Based on testing of manually edited metafiles, only the signature portion of version fields are tested, not the version number. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/gdiplus_private.h | 1 + dlls/gdiplus/region.c | 5 ++--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 88109d7..d6806cc 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -41,6 +41,7 @@ #define VERSION_MAGIC 0xdbc01001 #define VERSION_MAGIC2 0xdbc01002 +#define VALID_MAGIC(x) (((x) & 0xfffff000) == 0xdbc01000) #define TENSION_CONST (0.3) #define GIF_DISPOSE_UNSPECIFIED 0 diff --git a/dlls/gdiplus/region.c b/dlls/gdiplus/region.c index 35fef8b..390b50f 100644 --- a/dlls/gdiplus/region.c +++ b/dlls/gdiplus/region.c @@ -961,7 +961,7 @@ static GpStatus read_element(struct memory_buffer *mbuf, GpRegion *region, regio ERR("failed to read path header\n"); return InvalidParameter; } - if (path_header->magic != VERSION_MAGIC) + if (!VALID_MAGIC(path_header->magic)) { ERR("invalid path header magic %#x\n", path_header->magic); return InvalidParameter; @@ -1069,8 +1069,7 @@ GpStatus WINGDIPAPI GdipCreateRegionRgnData(GDIPCONST BYTE *data, INT size, GpRe init_memory_buffer(&mbuf, data, size); region_header = buffer_read(&mbuf, sizeof(*region_header)); - if (!region_header || (region_header->magic != VERSION_MAGIC && - region_header->magic != VERSION_MAGIC2)) + if (!region_header || !VALID_MAGIC(region_header->magic)) return InvalidParameter; status = GdipCreateRegion(region);

1 0

Paul Gofman : d3dx9: Fix potential memory leak on HeapReAlloc() failure in get_constants_desc().
by Alexandre Julliard July 18, 2017

July 18, 2017

Module: wine Branch: master Commit: 315e87e1720ddc0129c77afc10c99393b790acc3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=315e87e1720ddc0129c77afc1… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Tue Jul 11 14:27:01 2017 +0300 d3dx9: Fix potential memory leak on HeapReAlloc() failure in get_constants_desc(). Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/preshader.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c index c51fc6c..deb72e2 100644 --- a/dlls/d3dx9_36/preshader.c +++ b/dlls/d3dx9_36/preshader.c @@ -698,15 +698,19 @@ static HRESULT get_constants_desc(unsigned int *byte_code, struct d3dx_const_tab } if (out->const_set_count) { - out->const_set = HeapReAlloc(GetProcessHeap(), 0, out->const_set, + struct d3dx_const_param_eval_output *new_alloc; + + new_alloc = HeapReAlloc(GetProcessHeap(), 0, out->const_set, sizeof(*out->const_set) * out->const_set_count); - if (!out->const_set) + if (new_alloc) { - ERR("Out of memory.\n"); - hr = E_OUTOFMEMORY; - goto cleanup; + out->const_set = new_alloc; + out->const_set_size = out->const_set_count; + } + else + { + WARN("Out of memory.\n"); } - out->const_set_size = out->const_set_count; } cleanup: ID3DXConstantTable_Release(ctab);

1 0

Paul Gofman : d3dx9/tests: Add more tests for skip_constants effect parameter.
by Alexandre Julliard July 18, 2017

July 18, 2017

Module: wine Branch: master Commit: d8723657d2fe78aba70fea3c58adaa7493fd5267 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8723657d2fe78aba70fea3c5… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Tue Jul 11 14:27:00 2017 +0300 d3dx9/tests: Add more tests for skip_constants effect parameter. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/effect.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index 5cf899f..9658d2d 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -6924,6 +6924,9 @@ static void test_effect_skip_constants(IDirect3DDevice9 *device) hr = D3DXCreateEffectEx(device, test_effect_skip_constants_blob, sizeof(test_effect_skip_constants_blob), NULL, NULL, "v4", 0, NULL, &effect, NULL); ok(hr == D3DERR_INVALIDCALL, "Got result %#x.\n", hr); + hr = D3DXCreateEffectEx(device, test_effect_skip_constants_blob, sizeof(test_effect_skip_constants_blob), + NULL, NULL, "v1;v5;v4", 0, NULL, &effect, NULL); + ok(hr == D3DERR_INVALIDCALL, "Got result %#x.\n", hr); 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); @@ -6939,6 +6942,8 @@ static void test_effect_skip_constants(IDirect3DDevice9 *device) "Unexpected IsParameterUsed result.\n"); ok(!effect->lpVtbl->IsParameterUsed(effect, "v5", "tech0"), "Unexpected IsParameterUsed result.\n"); + ok(!effect->lpVtbl->IsParameterUsed(effect, "v6", "tech0"), + "Unexpected IsParameterUsed result.\n"); hr = effect->lpVtbl->SetFloat(effect, "v1", 28.0f); ok(hr == D3D_OK, "Got result %#x.\n", hr);

1 0

Alex Henrie : msvcr120: Set errno in log2.
by Alexandre Julliard July 18, 2017

July 18, 2017

Module: wine Branch: master Commit: b1230c34845ed36b52dcc05244502c51ac2f0a3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1230c34845ed36b52dcc0524… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Jul 17 22:33:52 2017 -0600 msvcr120: Set errno in log2. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index b12ce8b..637f920 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -2488,6 +2488,8 @@ LDOUBLE CDECL MSVCR120_log1pl(LDOUBLE x) */ double CDECL MSVCR120_log2(double x) { + if (x < 0) *MSVCRT__errno() = MSVCRT_EDOM; + else if (x == 0) *MSVCRT__errno() = MSVCRT_ERANGE; #ifdef HAVE_LOG2 return log2(x); #else @@ -2500,6 +2502,8 @@ double CDECL MSVCR120_log2(double x) */ float CDECL MSVCR120_log2f(float x) { + if (x < 0) *MSVCRT__errno() = MSVCRT_EDOM; + else if (x == 0) *MSVCRT__errno() = MSVCRT_ERANGE; #ifdef HAVE_LOG2F return log2f(x); #else

1 0

Matteo Bruni : d3dx9: Get rid of a forward declaration.
by Alexandre Julliard July 18, 2017

July 18, 2017

Module: wine Branch: master Commit: 88abcf3a1d64917bb1f4501ece9a043469c19fd5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88abcf3a1d64917bb1f4501ec… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Jul 18 18:58:28 2017 +0200 d3dx9: Get rid of a forward declaration. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/preshader.c | 782 +++++++++++++++++++++++----------------------- 1 file changed, 390 insertions(+), 392 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=88abcf3a1d64917bb1f45…

1 0

Paul Gofman : d3dx9: Introduce d3dx_shader_get_ctab_constant() function and use it instead of ID3DXConstantTableImpl_GetConstantDesc().
by Alexandre Julliard July 18, 2017

July 18, 2017

Module: wine Branch: master Commit: 6498a03a8ef0f0d157f05c8cac9c47aa88538a3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6498a03a8ef0f0d157f05c8ca… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Tue Jul 11 14:26:58 2017 +0300 d3dx9: Introduce d3dx_shader_get_ctab_constant() function and use it instead of ID3DXConstantTableImpl_GetConstantDesc(). Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/d3dx9_private.h | 8 ++++++++ dlls/d3dx9_36/preshader.c | 16 ++++------------ dlls/d3dx9_36/shader.c | 18 ++++++++++-------- 3 files changed, 22 insertions(+), 20 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_private.h b/dlls/d3dx9_36/d3dx9_private.h index db80490..f84266d 100644 --- a/dlls/d3dx9_36/d3dx9_private.h +++ b/dlls/d3dx9_36/d3dx9_private.h @@ -355,4 +355,12 @@ 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; +struct ctab_constant { + D3DXCONSTANT_DESC desc; + struct ctab_constant *constants; +}; + +const struct ctab_constant *d3dx_shader_get_ctab_constant(ID3DXConstantTable *iface, + D3DXHANDLE constant) DECLSPEC_HIDDEN; + #endif /* __WINE_D3DX9_PRIVATE_H */ diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c index 34fed07..7740bd6 100644 --- a/dlls/d3dx9_36/preshader.c +++ b/dlls/d3dx9_36/preshader.c @@ -590,22 +590,14 @@ static unsigned int *parse_pres_ins(unsigned int *ptr, unsigned int count, struc static HRESULT get_ctab_constant_desc(ID3DXConstantTable *ctab, D3DXHANDLE hc, D3DXCONSTANT_DESC *desc) { - D3DXCONSTANT_DESC buffer[2]; - HRESULT hr; - unsigned int count; + const struct ctab_constant *constant = d3dx_shader_get_ctab_constant(ctab, hc); - count = ARRAY_SIZE(buffer); - if (FAILED(hr = ID3DXConstantTable_GetConstantDesc(ctab, hc, buffer, &count))) - { - FIXME("Could not get constant desc, hr %#x.\n", hr); - return hr; - } - else if (count != 1) + if (!constant) { - FIXME("Unexpected constant descriptors count %u.\n", count); + FIXME("Could not get constant desc.\n"); return D3DERR_INVALIDCALL; } - *desc = buffer[0]; + *desc = constant->desc; return D3D_OK; } diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index 4dbecb1..b86bb65 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -681,11 +681,6 @@ HRESULT WINAPI D3DXPreprocessShaderFromResourceW(HMODULE module, const WCHAR *re } -struct ctab_constant { - D3DXCONSTANT_DESC desc; - struct ctab_constant *constants; -}; - struct ID3DXConstantTableImpl { ID3DXConstantTable ID3DXConstantTable_iface; LONG ref; @@ -946,13 +941,20 @@ static HRESULT WINAPI ID3DXConstantTableImpl_GetDesc(ID3DXConstantTable *iface, return D3D_OK; } +const struct ctab_constant *d3dx_shader_get_ctab_constant(ID3DXConstantTable *iface, D3DXHANDLE constant) +{ + struct ID3DXConstantTableImpl *ctab = impl_from_ID3DXConstantTable(iface); + + return get_valid_constant(ctab, constant); +} + static HRESULT WINAPI ID3DXConstantTableImpl_GetConstantDesc(ID3DXConstantTable *iface, D3DXHANDLE constant, D3DXCONSTANT_DESC *desc, UINT *count) { - struct ID3DXConstantTableImpl *This = impl_from_ID3DXConstantTable(iface); - struct ctab_constant *c = get_valid_constant(This, constant); + struct ID3DXConstantTableImpl *ctab = impl_from_ID3DXConstantTable(iface); + struct ctab_constant *c = get_valid_constant(ctab, constant); - TRACE("(%p)->(%p, %p, %p)\n", This, constant, desc, count); + TRACE("(%p)->(%p, %p, %p)\n", ctab, constant, desc, count); if (!c) {

1 0

Paul Gofman : d3dx9: Fail effect creation when parameter evaluator creation fails.
by Alexandre Julliard July 18, 2017

July 18, 2017

Module: wine Branch: master Commit: 518b2f27cf3fafb56d4c63ab478240b52a892914 URL: http://source.winehq.org/git/wine.git/?a=commit;h=518b2f27cf3fafb56d4c63ab4… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Tue Jul 11 14:26:57 2017 +0300 d3dx9: Fail effect creation when parameter evaluator creation fails. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/d3dx9_private.h | 2 +- dlls/d3dx9_36/effect.c | 28 ++++++++++++++++++---------- dlls/d3dx9_36/preshader.c | 22 +++++++++++++--------- 3 files changed, 32 insertions(+), 20 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_private.h b/dlls/d3dx9_36/d3dx9_private.h index c2f4977..db80490 100644 --- a/dlls/d3dx9_36/d3dx9_private.h +++ b/dlls/d3dx9_36/d3dx9_private.h @@ -345,7 +345,7 @@ struct d3dx_parameter *get_parameter_by_name(struct d3dx9_base_effect *base, : device->lpVtbl->method(device, args)) #define SET_D3D_STATE(base_effect, args...) SET_D3D_STATE_(base_effect->manager, base_effect->device, args) -void d3dx_create_param_eval(struct d3dx9_base_effect *base_effect, void *byte_code, +HRESULT d3dx_create_param_eval(struct d3dx9_base_effect *base_effect, void *byte_code, unsigned int byte_code_size, D3DXPARAMETER_TYPE type, struct d3dx_param_eval **peval, ULONG64 *version_counter) DECLSPEC_HIDDEN; void d3dx_free_param_eval(struct d3dx_param_eval *peval) DECLSPEC_HIDDEN; diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 333feab..e1fd92c 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -5966,8 +5966,10 @@ static HRESULT d3dx9_parse_array_selector(struct d3dx9_base_effect *base, struct if (string_size % sizeof(DWORD)) FIXME("Unaligned string_size %u.\n", string_size); - d3dx_create_param_eval(base, (DWORD *)(ptr + string_size) + 1, object->size - (string_size + sizeof(DWORD)), - D3DXPT_INT, &param->param_eval, get_version_counter_ptr(base)); + if (FAILED(ret = d3dx_create_param_eval(base, (DWORD *)(ptr + string_size) + 1, + object->size - (string_size + sizeof(DWORD)), D3DXPT_INT, &param->param_eval, + get_version_counter_ptr(base)))) + return ret; ret = D3D_OK; param = param->u.referenced_param; if (param->type == D3DXPT_VERTEXSHADER || param->type == D3DXPT_PIXELSHADER) @@ -5985,8 +5987,9 @@ static HRESULT d3dx9_parse_array_selector(struct d3dx9_base_effect *base, struct { TRACE("Creating preshader for object %u.\n", param->members[i].object_id); object = &base->objects[param->members[i].object_id]; - d3dx_create_param_eval(base, object->data, object->size, param->type, - &param->members[i].param_eval, get_version_counter_ptr(base)); + if (FAILED(ret = d3dx_create_param_eval(base, object->data, object->size, param->type, + &param->members[i].param_eval, get_version_counter_ptr(base)))) + break; } } } @@ -6099,8 +6102,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; @@ -6111,8 +6115,9 @@ static HRESULT d3dx9_parse_resource(struct d3dx9_base_effect *base, const char * state->type = ST_FXLC; if (FAILED(hr = d3dx9_copy_data(base, param->object_id, ptr))) 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; default: @@ -6138,8 +6143,11 @@ static HRESULT d3dx9_parse_resource(struct d3dx9_base_effect *base, const char * struct d3dx_object *refobj = &base->objects[refpar->object_id]; if (!refpar->param_eval) - d3dx_create_param_eval(base, refobj->data, refobj->size, - refpar->type, &refpar->param_eval, get_version_counter_ptr(base)); + { + if (FAILED(hr = d3dx_create_param_eval(base, refobj->data, refobj->size, + refpar->type, &refpar->param_eval, get_version_counter_ptr(base)))) + return hr; + } } } else diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c index 1aaf59d..34fed07 100644 --- a/dlls/d3dx9_36/preshader.c +++ b/dlls/d3dx9_36/preshader.c @@ -919,15 +919,15 @@ static HRESULT parse_preshader(struct d3dx_preshader *pres, unsigned int *ptr, u return D3D_OK; } -void d3dx_create_param_eval(struct d3dx9_base_effect *base_effect, void *byte_code, unsigned int byte_code_size, +HRESULT d3dx_create_param_eval(struct d3dx9_base_effect *base_effect, void *byte_code, unsigned int byte_code_size, D3DXPARAMETER_TYPE type, struct d3dx_param_eval **peval_out, ULONG64 *version_counter) { struct d3dx_param_eval *peval; unsigned int *ptr; - HRESULT hr; unsigned int i; BOOL shader; unsigned int count, pres_size; + HRESULT ret; TRACE("base_effect %p, byte_code %p, byte_code_size %u, type %u, peval_out %p.\n", base_effect, byte_code, byte_code_size, type, peval_out); @@ -936,13 +936,15 @@ void d3dx_create_param_eval(struct d3dx9_base_effect *base_effect, void *byte_co if (!byte_code || !count) { *peval_out = NULL; - return; + return D3D_OK; } peval = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*peval)); if (!peval) + { + ret = E_OUTOFMEMORY; goto err_out; - + } peval->version_counter = version_counter; peval->param_type = type; @@ -964,13 +966,14 @@ void d3dx_create_param_eval(struct d3dx9_base_effect *base_effect, void *byte_co if ((*ptr & 0xfffe0000) != 0xfffe0000) { FIXME("Invalid shader signature %#x.\n", *ptr); + ret = D3DXERR_INVALIDDATA; goto err_out; } TRACE("Shader version %#x.\n", *ptr & 0xffff); - if (FAILED(hr = get_constants_desc(ptr, &peval->shader_inputs, base_effect))) + if (FAILED(ret = get_constants_desc(ptr, &peval->shader_inputs, base_effect))) { - FIXME("Could not get shader constant table, hr %#x.\n", hr); + FIXME("Could not get shader constant table, ret %#x.\n", ret); goto err_out; } update_table_sizes_consts(peval->pres.regs.table_sizes, &peval->shader_inputs); @@ -983,7 +986,7 @@ void d3dx_create_param_eval(struct d3dx9_base_effect *base_effect, void *byte_co pres_size = count; } - if (ptr && FAILED(parse_preshader(&peval->pres, ptr, pres_size, base_effect))) + if (ptr && FAILED(ret = parse_preshader(&peval->pres, ptr, pres_size, base_effect))) { FIXME("Failed parsing preshader, byte code for analysis follows.\n"); dump_bytecode(byte_code, byte_code_size); @@ -992,7 +995,7 @@ void d3dx_create_param_eval(struct d3dx9_base_effect *base_effect, void *byte_co for (i = PRES_REGTAB_FIRST_SHADER; i < PRES_REGTAB_COUNT; ++i) { - if (FAILED(regstore_alloc_table(&peval->pres.regs, i))) + if (FAILED(ret = regstore_alloc_table(&peval->pres.regs, i))) goto err_out; } @@ -1008,12 +1011,13 @@ void d3dx_create_param_eval(struct d3dx9_base_effect *base_effect, void *byte_co } *peval_out = peval; TRACE("Created parameter evaluator %p.\n", *peval_out); - return; + return D3D_OK; err_out: FIXME("Error creating parameter evaluator.\n"); d3dx_free_param_eval(peval); *peval_out = NULL; + return ret; } static void d3dx_free_const_tab(struct d3dx_const_tab *ctab)

1 0

Alex Henrie : msvcrt: Don' t set errno in log functions if x is positive infinity.
by Alexandre Julliard July 18, 2017

July 18, 2017

Module: wine Branch: master Commit: f5d3ba5888ce8474a001ff975a7b5163d1e5c2ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5d3ba5888ce8474a001ff975… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Jul 17 22:33:53 2017 -0600 msvcrt: Don't set errno in log functions if x is positive infinity. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 637f920..b030a63 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -225,10 +225,10 @@ float CDECL MSVCRT_fmodf( float x, float y ) /********************************************************************* * MSVCRT_logf (MSVCRT.@) */ -float CDECL MSVCRT_logf( float x) +float CDECL MSVCRT_logf( float x ) { - if (x < 0.0 || !finitef(x)) *MSVCRT__errno() = MSVCRT_EDOM; - if (x == 0.0) *MSVCRT__errno() = MSVCRT_ERANGE; + if (x < 0.0) *MSVCRT__errno() = MSVCRT_EDOM; + else if (x == 0.0) *MSVCRT__errno() = MSVCRT_ERANGE; return logf(x); } @@ -237,8 +237,8 @@ float CDECL MSVCRT_logf( float x) */ float CDECL MSVCRT_log10f( float x ) { - if (x < 0.0 || !finitef(x)) *MSVCRT__errno() = MSVCRT_EDOM; - if (x == 0.0) *MSVCRT__errno() = MSVCRT_ERANGE; + if (x < 0.0) *MSVCRT__errno() = MSVCRT_EDOM; + else if (x == 0.0) *MSVCRT__errno() = MSVCRT_ERANGE; return log10f(x); } @@ -420,10 +420,10 @@ double CDECL MSVCRT_fmod( double x, double y ) /********************************************************************* * MSVCRT_log (MSVCRT.@) */ -double CDECL MSVCRT_log( double x) +double CDECL MSVCRT_log( double x ) { - if (x < 0.0 || !isfinite(x)) *MSVCRT__errno() = MSVCRT_EDOM; - if (x == 0.0) *MSVCRT__errno() = MSVCRT_ERANGE; + if (x < 0.0) *MSVCRT__errno() = MSVCRT_EDOM; + else if (x == 0.0) *MSVCRT__errno() = MSVCRT_ERANGE; return log(x); } @@ -432,8 +432,8 @@ double CDECL MSVCRT_log( double x) */ double CDECL MSVCRT_log10( double x ) { - if (x < 0.0 || !isfinite(x)) *MSVCRT__errno() = MSVCRT_EDOM; - if (x == 0.0) *MSVCRT__errno() = MSVCRT_ERANGE; + if (x < 0.0) *MSVCRT__errno() = MSVCRT_EDOM; + else if (x == 0.0) *MSVCRT__errno() = MSVCRT_ERANGE; return log10(x); }

1 0

Zebediah Figura : user32: Calculate a window's minimized size even if it' s already minimized.
by Alexandre Julliard July 18, 2017

July 18, 2017

Module: wine Branch: master Commit: 292450b07f3758f0ff087d16eddbaf30204c0907 URL: http://source.winehq.org/git/wine.git/?a=commit;h=292450b07f3758f0ff087d16e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jul 14 13:02:51 2017 -0500 user32: Calculate a window's minimized size even if it's already minimized. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 31 +++++++++++++++++++++++++++++++ dlls/user32/winpos.c | 5 +++++ 2 files changed, 36 insertions(+) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 2399228..5806f81 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -6622,6 +6622,37 @@ static void test_ShowWindow(void) ret = DefWindowProcA(hwnd, WM_SYSCOMMAND, SC_CLOSE, 0); ok(!ret, "not expected ret: %lu\n", ret); ok(!IsWindow(hwnd), "window should not exist\n"); + + hwnd = CreateWindowExA(0, "MainWindowClass", NULL, + WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | + WS_MAXIMIZEBOX | WS_POPUP | WS_MINIMIZE, + rcMain.left, rcMain.top, + rcMain.right - rcMain.left, rcMain.bottom - rcMain.top, + 0, 0, 0, NULL); + ok(hwnd != NULL, "failed to create window with error %u\n", GetLastError()); + style = GetWindowLongA(hwnd, GWL_STYLE); + ok(style & WS_MINIMIZE, "window should be minimized\n"); + GetWindowRect(hwnd, &rc); + todo_wine + ok((rc.left == -32000 || rc.left == 3000) && + (rc.top == -32000 || rc.top == 3000), + "expected (-32000,-32000), got (%d,%d)\n", rc.left, rc.top); + DestroyWindow(hwnd); + + hwnd = CreateWindowExA(0, "MainWindowClass", NULL, + WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | + WS_MAXIMIZEBOX | WS_POPUP | WS_MINIMIZE | WS_VISIBLE, + rcMain.left, rcMain.top, + rcMain.right - rcMain.left, rcMain.bottom - rcMain.top, + 0, 0, 0, NULL); + ok(hwnd != NULL, "failed to create window with error %u\n", GetLastError()); + style = GetWindowLongA(hwnd, GWL_STYLE); + ok(style & WS_MINIMIZE, "window should be minimized\n"); + GetWindowRect(hwnd, &rc); + ok((rc.left == -32000 || rc.left == 3000) && + (rc.top == -32000 || rc.top == 3000), + "expected (-32000,-32000), got (%d,%d)\n", rc.left, rc.top); + DestroyWindow(hwnd); } static DWORD CALLBACK enablewindow_thread(LPVOID arg) diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index a89c60d..6b6b26a 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -963,6 +963,11 @@ UINT WINPOS_MinMaximize( HWND hwnd, UINT cmd, LPRECT rect ) case SW_SHOWMINIMIZED: case SW_FORCEMINIMIZE: case SW_MINIMIZE: + wpl.ptMinPosition = WINPOS_FindIconPos( hwnd, wpl.ptMinPosition ); + + SetRect( rect, wpl.ptMinPosition.x, wpl.ptMinPosition.y, + wpl.ptMinPosition.x + GetSystemMetrics(SM_CXICON), + wpl.ptMinPosition.y + GetSystemMetrics(SM_CYICON) ); return SWP_NOSIZE | SWP_NOMOVE; } if (!SendMessageW( hwnd, WM_QUERYOPEN, 0, 0 )) return SWP_NOSIZE | SWP_NOMOVE;

1 0