September 2017 - Wine-Commits

Daniel Lehman : wininet: Fix proxy bypass with wildcard if domain length matches with server.
by Alexandre Julliard Sept. 8, 2017

Sept. 8, 2017

Module: wine Branch: master Commit: 1b25de7d57e81e5307a18c8889d4727c857dadca URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b25de7d57e81e5307a18c888… Author: Daniel Lehman <dlehman(a)esri.com> Date: Wed Aug 30 09:44:16 2017 -0700 wininet: Fix proxy bypass with wildcard if domain length matches with server. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/http.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index dc106d8..9191188 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1732,7 +1732,7 @@ static BOOL HTTP_DomainMatches(LPCWSTR server, substr_t domain) return FALSE; len = strlenW(dot + 1); - if(len <= domain.len - 2) + if(len < domain.len - 2) return FALSE; /* The server's domain is longer than the wildcard, so it

1 0

Nikolay Sivov : msxml3/httpreq: Support HEAD request.
by Alexandre Julliard Sept. 8, 2017

Sept. 8, 2017

Module: wine Branch: master Commit: 79f11f228216f6b6fa6aaf02704a86592b44aba3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79f11f228216f6b6fa6aaf027… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Sep 8 17:47:27 2017 +0300 msxml3/httpreq: Support HEAD request. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/httprequest.c | 2 ++ dlls/msxml3/tests/httpreq.c | 22 ++++++++++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c index 55339e1..d9f3f98 100644 --- a/dlls/msxml3/httprequest.c +++ b/dlls/msxml3/httprequest.c @@ -880,6 +880,7 @@ static HRESULT verify_uri(httprequest *This, IUri *uri) static HRESULT httprequest_open(httprequest *This, BSTR method, BSTR url, VARIANT async, VARIANT user, VARIANT password) { + static const WCHAR MethodHeadW[] = {'H','E','A','D',0}; static const WCHAR MethodGetW[] = {'G','E','T',0}; static const WCHAR MethodPutW[] = {'P','U','T',0}; static const WCHAR MethodPostW[] = {'P','O','S','T',0}; @@ -915,6 +916,7 @@ static HRESULT httprequest_open(httprequest *This, BSTR method, BSTR url, This->verb = BINDVERB_POST; } else if (!strcmpiW(method, MethodDeleteW) || + !strcmpiW(method, MethodHeadW) || !strcmpiW(method, MethodPropFindW)) { This->verb = BINDVERB_CUSTOM; diff --git a/dlls/msxml3/tests/httpreq.c b/dlls/msxml3/tests/httpreq.c index 55ea8b6..a744b95 100644 --- a/dlls/msxml3/tests/httpreq.c +++ b/dlls/msxml3/tests/httpreq.c @@ -1731,6 +1731,28 @@ static void test_XMLHTTP(void) EXPECT_HR(hr, S_OK); IObjectWithSite_Release(obj_site); + + /* HEAD request */ + hr = IXMLHttpRequest_put_onreadystatechange(xhr, NULL); + ok(hr == S_OK, "Failed to reset state change handler, hr %#x.\n", hr); + + test_open(xhr, "HEAD", xmltestA, S_OK); + + V_VT(&varbody) = VT_EMPTY; + hr = IXMLHttpRequest_send(xhr, varbody); + ok(hr == S_OK, "Failed to send HEAD request, hr %#x.\n", hr); + + str = NULL; + hr = IXMLHttpRequest_get_responseText(xhr, &str); + ok(hr == S_OK, "Failed to get response text, hr %#x.\n", hr); + ok(!*str, "Unexpected text %s.\n", wine_dbgstr_w(str)); + SysFreeString(str); + + hr = IXMLHttpRequest_getAllResponseHeaders(xhr, &str); + ok(hr == S_OK, "Failed to get response headers, hr %#x.\n", hr); + ok(str && *str, "Expected response headers.\n"); + SysFreeString(str); + IXMLHttpRequest_Release(xhr); free_bstrs(); }

1 0

Francois Gouget : mshtml: Make HTMLDocumentNode_init_dispex_info() static.
by Alexandre Julliard Sept. 8, 2017

Sept. 8, 2017

Module: wine Branch: master Commit: e462c9ae11cbe5201b3724b894421d1c0db0a6cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=e462c9ae11cbe5201b3724b89… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Sep 8 02:16:27 2017 +0200 mshtml: Make HTMLDocumentNode_init_dispex_info() static. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index ed3075b..418e152 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -4893,7 +4893,7 @@ static const tid_t HTMLDocumentNode_iface_tids[] = { 0 }; -void HTMLDocumentNode_init_dispex_info(dispex_data_t *info, compat_mode_t mode) +static void HTMLDocumentNode_init_dispex_info(dispex_data_t *info, compat_mode_t mode) { HTMLDOMNode_init_dispex_info(info, mode);

1 0

Francois Gouget : mshtml: A spelling fix in a WARN() message.
by Alexandre Julliard Sept. 8, 2017

Sept. 8, 2017

Module: wine Branch: master Commit: 89eddb2dedf159b7314840565805340c11d007c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=89eddb2dedf159b7314840565… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Sep 8 02:13:52 2017 +0200 mshtml: A spelling fix in a WARN() message. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/mutation.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/mutation.c b/dlls/mshtml/mutation.c index cf69b60..3c2ca08 100644 --- a/dlls/mshtml/mutation.c +++ b/dlls/mshtml/mutation.c @@ -373,7 +373,7 @@ static nsresult run_insert_script(HTMLDocumentNode *doc, nsISupports *script_ifa static void set_document_mode(HTMLDocumentNode *doc, compat_mode_t document_mode, BOOL lock) { if(doc->document_mode_locked) { - WARN("attemting to set document mode %d on locked document %p\n", document_mode, doc); + WARN("attempting to set document mode %d on locked document %p\n", document_mode, doc); return; }

1 0

Paul Gofman : d3dx9: Return E_FAIL from ValidateTechnique() for techniques with unsupported shaders.
by Alexandre Julliard Sept. 8, 2017

Sept. 8, 2017

Module: wine Branch: master Commit: 07cc9acc9fccd2a007370b8ca9fc0303af84ab18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=07cc9acc9fccd2a007370b8ca… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Fri Sep 8 00:08:00 2017 +0200 d3dx9: Return E_FAIL from ValidateTechnique() for techniques with unsupported shaders. 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/effect.c | 50 +++++++++++++++++++++++++++++++++++++++----- dlls/d3dx9_36/tests/effect.c | 4 ---- 2 files changed, 45 insertions(+), 9 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 2cd0c22..75e0931 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -103,6 +103,7 @@ struct d3dx_object UINT size; void *data; struct d3dx_parameter *param; + BOOL creation_failed; }; struct d3dx_state @@ -3941,11 +3942,50 @@ static D3DXHANDLE WINAPI ID3DXEffectImpl_GetCurrentTechnique(ID3DXEffect *iface) static HRESULT WINAPI ID3DXEffectImpl_ValidateTechnique(ID3DXEffect* iface, D3DXHANDLE technique) { - struct ID3DXEffectImpl *This = impl_from_ID3DXEffect(iface); + struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx9_base_effect *base = &effect->base_effect; + struct d3dx_technique *tech = get_valid_technique(base, technique); + HRESULT ret = D3D_OK; + unsigned int i, j; - FIXME("(%p)->(%p): stub\n", This, technique); + FIXME("iface %p, technique %p semi-stub.\n", iface, technique); - return D3D_OK; + if (!tech) + { + ret = D3DERR_INVALIDCALL; + goto done; + } + for (i = 0; i < tech->pass_count; ++i) + { + struct d3dx_pass *pass = &tech->passes[i]; + + for (j = 0; j < pass->state_count; ++j) + { + struct d3dx_state *state = &pass->states[j]; + + if (state_table[state->operation].class == SC_VERTEXSHADER + || state_table[state->operation].class == SC_PIXELSHADER) + { + struct d3dx_parameter *param; + void *param_value; + BOOL param_dirty; + HRESULT hr; + + if (FAILED(hr = d3dx9_get_param_value_ptr(pass, &pass->states[j], &param_value, &param, + FALSE, &param_dirty))) + return hr; + + if (param->object_id && base->objects[param->object_id].creation_failed) + { + ret = E_FAIL; + goto done; + } + } + } + } +done: + TRACE("Returning %#x.\n", ret); + return ret; } static HRESULT WINAPI ID3DXEffectImpl_FindNextValidTechnique(ID3DXEffect* iface, D3DXHANDLE technique, D3DXHANDLE* next_technique) @@ -5938,7 +5978,7 @@ static HRESULT d3dx9_create_object(struct d3dx9_base_effect *base, struct d3dx_o (IDirect3DVertexShader9 **)param->data))) { WARN("Failed to create vertex shader.\n"); - return D3D_OK; + object->creation_failed = TRUE; } break; case D3DXPT_PIXELSHADER: @@ -5946,7 +5986,7 @@ static HRESULT d3dx9_create_object(struct d3dx9_base_effect *base, struct d3dx_o (IDirect3DPixelShader9 **)param->data))) { WARN("Failed to create pixel shader.\n"); - return D3D_OK; + object->creation_failed = TRUE; } break; default: diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index a3cf28e..45d3ace 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -7090,10 +7090,8 @@ static void test_effect_unsupported_shader(void) ok(hr == D3D_OK, "Got result %#x.\n", hr); hr = effect->lpVtbl->ValidateTechnique(effect, "missing_technique"); - todo_wine ok(hr == D3DERR_INVALIDCALL, "Got result %#x.\n", hr); hr = effect->lpVtbl->ValidateTechnique(effect, "tech0"); - todo_wine ok(hr == E_FAIL, "Got result %#x.\n", hr); hr = effect->lpVtbl->ValidateTechnique(effect, "tech1"); @@ -7101,7 +7099,6 @@ static void test_effect_unsupported_shader(void) effect->lpVtbl->SetInt(effect, "i", 1); ok(hr == D3D_OK, "Got result %#x.\n", hr); hr = effect->lpVtbl->ValidateTechnique(effect, "tech1"); - todo_wine ok(hr == E_FAIL, "Got result %#x.\n", hr); effect->lpVtbl->SetInt(effect, "i", 0); hr = effect->lpVtbl->ValidateTechnique(effect, "tech1"); @@ -7275,7 +7272,6 @@ static void test_effect_null_shader(void) effect->lpVtbl->SetInt(effect, "i", 2); ok(hr == D3D_OK, "Failed to set parameter, hr %#x.\n", hr); hr = effect->lpVtbl->ValidateTechnique(effect, "tech1"); - todo_wine ok(hr == E_FAIL, "Got result %#x.\n", hr); effect->lpVtbl->Release(effect);

1 0

Paul Gofman : d3dx9/tests: Add test for null shaders in effect.
by Alexandre Julliard Sept. 8, 2017

Sept. 8, 2017

Module: wine Branch: master Commit: 120a83dc03827bcfd31f1fd02ef4b3302fee177a URL: http://source.winehq.org/git/wine.git/?a=commit;h=120a83dc03827bcfd31f1fd02… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Fri Sep 8 00:07:59 2017 +0200 d3dx9/tests: Add test for null shaders in effect. 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 | 140 ++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 132 insertions(+), 8 deletions(-) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index bb26fe4..a3cf28e 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -7162,6 +7162,130 @@ static void test_effect_unsupported_shader(void) DestroyWindow(window); } +#if 0 +vertexshader vs_arr[2]; + +int i; + +technique tech0 +{ + pass p0 + { + VertexShader = null; + } +} +technique tech1 +{ + pass p0 + { + VertexShader = vs_arr[i]; + } +} +#endif +static const DWORD test_effect_null_shader_blob[] = +{ + 0xfeff0901, 0x000000b4, 0x00000000, 0x00000010, 0x00000004, 0x00000020, 0x00000000, 0x00000002, + 0x00000001, 0x00000002, 0x00000007, 0x615f7376, 0x00007272, 0x00000002, 0x00000000, 0x0000004c, + 0x00000000, 0x00000000, 0x00000001, 0x00000001, 0x00000000, 0x00000002, 0x00000069, 0x00000000, + 0x00000002, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000001, 0x00000003, + 0x00003070, 0x00000006, 0x68636574, 0x00000030, 0x00000003, 0x00000010, 0x00000004, 0x00000000, + 0x00000000, 0x00000000, 0x00000003, 0x00003070, 0x00000006, 0x68636574, 0x00000031, 0x00000002, + 0x00000002, 0x00000005, 0x00000004, 0x00000004, 0x00000018, 0x00000000, 0x00000000, 0x0000002c, + 0x00000048, 0x00000000, 0x00000000, 0x0000007c, 0x00000000, 0x00000001, 0x00000074, 0x00000000, + 0x00000001, 0x00000092, 0x00000000, 0x00000058, 0x00000054, 0x000000a8, 0x00000000, 0x00000001, + 0x000000a0, 0x00000000, 0x00000001, 0x00000092, 0x00000000, 0x0000008c, 0x00000088, 0x00000002, + 0x00000001, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0xffffffff, + 0x00000000, 0x00000002, 0x000000e4, 0x00000008, 0x615f7376, 0x00007272, 0x46580200, 0x0023fffe, + 0x42415443, 0x0000001c, 0x00000057, 0x46580200, 0x00000001, 0x0000001c, 0x00000100, 0x00000054, + 0x00000030, 0x00000002, 0x00000001, 0x00000034, 0x00000044, 0xabab0069, 0x00020000, 0x00010001, + 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x4d007874, 0x6f726369, + 0x74666f73, 0x29522820, 0x534c4820, 0x6853204c, 0x72656461, 0x6d6f4320, 0x656c6970, 0x2e392072, + 0x392e3932, 0x332e3235, 0x00313131, 0x0002fffe, 0x54494c43, 0x00000000, 0x000cfffe, 0x434c5846, + 0x00000001, 0x10000001, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000000, 0x00000004, + 0x00000000, 0xf0f0f0f0, 0x0f0f0f0f, 0x0000ffff, +}; + +static void test_effect_null_shader(void) +{ + D3DPRESENT_PARAMETERS present_parameters = {0}; + IDirect3DDevice9 *device; + ID3DXEffect *effect; + D3DXPASS_DESC desc; + IDirect3D9 *d3d; + D3DXHANDLE pass; + ULONG refcount; + HWND window; + HRESULT hr; + + /* Creating a fresh device because the existing device can have invalid + * render states from previous tests. If IDirect3DDevice9_ValidateDevice() + * returns certain error codes, native ValidateTechnique() fails. */ + if (!(window = CreateWindowA("static", "d3dx9_test", WS_OVERLAPPEDWINDOW, 0, 0, + 640, 480, NULL, NULL, NULL, NULL))) + { + skip("Failed to create window.\n"); + return; + } + if (!(d3d = Direct3DCreate9(D3D_SDK_VERSION))) + { + skip("Failed to create IDirect3D9 object.\n"); + DestroyWindow(window); + return; + } + present_parameters.Windowed = TRUE; + present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; + hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, window, + D3DCREATE_HARDWARE_VERTEXPROCESSING, &present_parameters, &device); + if (FAILED(hr)) + { + skip("Failed to create IDirect3DDevice9 object, hr %#x.\n", hr); + IDirect3D9_Release(d3d); + DestroyWindow(window); + return; + } + + hr = D3DXCreateEffectEx(device, test_effect_null_shader_blob, + sizeof(test_effect_null_shader_blob), NULL, NULL, NULL, 0, NULL, &effect, NULL); + ok(hr == D3D_OK, "Failed to create effect, hr %#x.\n", hr); + + pass = effect->lpVtbl->GetPass(effect, "tech0", 0); + ok(!!pass, "GetPass() failed.\n"); + hr = effect->lpVtbl->GetPassDesc(effect, pass, &desc); + todo_wine + ok(hr == D3D_OK, "Got result %#x.\n", hr); + ok(!desc.pVertexShaderFunction, "Got non NULL vertex function.\n"); + + pass = effect->lpVtbl->GetPass(effect, "tech1", 0); + ok(!!pass, "GetPass() failed.\n"); + hr = effect->lpVtbl->GetPassDesc(effect, pass, &desc); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + ok(!desc.pVertexShaderFunction, "Got non NULL vertex function.\n"); + + hr = effect->lpVtbl->ValidateTechnique(effect, "tech0"); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + effect->lpVtbl->SetInt(effect, "i", 0); + ok(hr == D3D_OK, "Failed to set parameter, hr %#x.\n", hr); + hr = effect->lpVtbl->ValidateTechnique(effect, "tech1"); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + effect->lpVtbl->SetInt(effect, "i", 1); + ok(hr == D3D_OK, "Failed to set parameter, hr %#x.\n", hr); + hr = effect->lpVtbl->ValidateTechnique(effect, "tech1"); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + + effect->lpVtbl->SetInt(effect, "i", 2); + ok(hr == D3D_OK, "Failed to set parameter, hr %#x.\n", hr); + hr = effect->lpVtbl->ValidateTechnique(effect, "tech1"); + todo_wine + ok(hr == E_FAIL, "Got result %#x.\n", hr); + + effect->lpVtbl->Release(effect); + + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D9_Release(d3d); + DestroyWindow(window); +} + START_TEST(effect) { HWND wnd; @@ -7169,7 +7293,7 @@ START_TEST(effect) IDirect3DDevice9 *device; D3DPRESENT_PARAMETERS d3dpp; HRESULT hr; - ULONG count; + ULONG refcount; if (!(wnd = CreateWindowA("static", "d3dx9_test", WS_OVERLAPPEDWINDOW, 0, 0, 640, 480, NULL, NULL, NULL, NULL))) @@ -7214,13 +7338,13 @@ START_TEST(effect) test_effect_large_address_aware_flag(device); test_effect_get_pass_desc(device); test_effect_skip_constants(device); - test_effect_unsupported_shader(); - - count = IDirect3DDevice9_Release(device); - ok(count == 0, "The device was not properly freed: refcount %u\n", count); - - count = IDirect3D9_Release(d3d); - ok(count == 0, "Release failed %u\n", count); + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + refcount = IDirect3D9_Release(d3d); + ok(!refcount, "D3D9 object has %u references left.\n", refcount); DestroyWindow(wnd); + + test_effect_unsupported_shader(); + test_effect_null_shader(); }

1 0

Francois Gouget : ieproxy: Case fixes.
by Alexandre Julliard Sept. 8, 2017

Sept. 8, 2017

Module: wine Branch: master Commit: 64726f9e14f94f5433e94bec958d67ec0c394050 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64726f9e14f94f5433e94bec9… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Sep 8 02:14:01 2017 +0200 ieproxy: Case fixes. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ieproxy/ieproxy_ieautomation.idl | 2 +- include/ieautomation.idl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ieproxy/ieproxy_ieautomation.idl b/dlls/ieproxy/ieproxy_ieautomation.idl index b53bcd7..9ffe91b 100644 --- a/dlls/ieproxy/ieproxy_ieautomation.idl +++ b/dlls/ieproxy/ieproxy_ieautomation.idl @@ -1,5 +1,5 @@ /* - * Copyright 2017 Zebediah Figura for Codeweavers + * Copyright 2017 Zebediah Figura for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/include/ieautomation.idl b/include/ieautomation.idl index c9b1c25..6eb41f4 100644 --- a/include/ieautomation.idl +++ b/include/ieautomation.idl @@ -1,5 +1,5 @@ /* - * Copyright 2017 Zebediah Figura for Codeweavers + * Copyright 2017 Zebediah Figura for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public

1 0

Paul Gofman : d3dx9: Fix zero object_id handling in d3dx9_base_effect_get_pass_desc().
by Alexandre Julliard Sept. 8, 2017

Sept. 8, 2017

Module: wine Branch: master Commit: 0778f1c294e4140736c813c99bc12adbeb27f0aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=0778f1c294e4140736c813c99… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Fri Sep 1 21:19:04 2017 +0300 d3dx9: Fix zero object_id handling in d3dx9_base_effect_get_pass_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/effect.c | 12 ++++-------- dlls/d3dx9_36/tests/effect.c | 1 - 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 75e0931..ce2e5d8 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1144,21 +1144,17 @@ static HRESULT d3dx9_base_effect_get_pass_desc(struct d3dx9_base_effect *base, void *param_value; BOOL param_dirty; HRESULT hr; + void *data; if (FAILED(hr = d3dx9_get_param_value_ptr(pass, &pass->states[i], &param_value, &param, FALSE, &param_dirty))) return hr; - if (!param->object_id) - { - FIXME("Zero object ID in shader parameter.\n"); - return E_FAIL; - } - + data = param->object_id ? base->objects[param->object_id].data : NULL; if (state_table[state->operation].class == SC_VERTEXSHADER) - desc->pVertexShaderFunction = base->objects[param->object_id].data; + desc->pVertexShaderFunction = data; else - desc->pPixelShaderFunction = base->objects[param->object_id].data; + desc->pPixelShaderFunction = data; } } diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index 45d3ace..96b21f0 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -7248,7 +7248,6 @@ static void test_effect_null_shader(void) pass = effect->lpVtbl->GetPass(effect, "tech0", 0); ok(!!pass, "GetPass() failed.\n"); hr = effect->lpVtbl->GetPassDesc(effect, pass, &desc); - todo_wine ok(hr == D3D_OK, "Got result %#x.\n", hr); ok(!desc.pVertexShaderFunction, "Got non NULL vertex function.\n");

1 0

Francois Gouget : dsquery: Case fixes.
by Alexandre Julliard Sept. 8, 2017

Sept. 8, 2017

Module: wine Branch: master Commit: 66f6fdd4a005b8d082258c644a473db3042dac3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=66f6fdd4a005b8d082258c644… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Sep 8 02:13:33 2017 +0200 dsquery: Case fixes. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsquery/main.c | 2 +- include/cmnquery.idl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dsquery/main.c b/dlls/dsquery/main.c index eee32cb..7f58502 100644 --- a/dlls/dsquery/main.c +++ b/dlls/dsquery/main.c @@ -1,5 +1,5 @@ /* - * Copyright 2017 Zebediah Figura for Codeweavers + * Copyright 2017 Zebediah Figura for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/include/cmnquery.idl b/include/cmnquery.idl index f9d2991..62411fd 100644 --- a/include/cmnquery.idl +++ b/include/cmnquery.idl @@ -1,5 +1,5 @@ /* - * Copyright 2017 Zebediah Figura for Codeweavers + * Copyright 2017 Zebediah Figura for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public

1 0

Fabian Maurer : api-ms-win-core-synch-l1-2-1: Add dll.
by Alexandre Julliard Sept. 7, 2017

Sept. 7, 2017

Module: wine Branch: master Commit: c9f72ccec2387da0c02fa1d35997fb914dcf4656 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9f72ccec2387da0c02fa1d35… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Thu Sep 7 20:03:09 2017 +0200 api-ms-win-core-synch-l1-2-1: Add dll. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 + configure.ac | 1 + dlls/api-ms-win-core-synch-l1-2-1/Makefile.in | 1 + .../api-ms-win-core-synch-l1-2-1.spec | 61 ++++++++++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 66 insertions(+) diff --git a/configure b/configure index ddeff2e..5138198 100755 --- a/configure +++ b/configure @@ -972,6 +972,7 @@ enable_api_ms_win_core_string_obsolete_l1_1_0 enable_api_ms_win_core_stringansi_l1_1_0 enable_api_ms_win_core_synch_l1_1_0 enable_api_ms_win_core_synch_l1_2_0 +enable_api_ms_win_core_synch_l1_2_1 enable_api_ms_win_core_sysinfo_l1_1_0 enable_api_ms_win_core_sysinfo_l1_2_0 enable_api_ms_win_core_sysinfo_l1_2_1 @@ -18050,6 +18051,7 @@ wine_fn_config_dll api-ms-win-core-string-obsolete-l1-1-0 enable_api_ms_win_core wine_fn_config_dll api-ms-win-core-stringansi-l1-1-0 enable_api_ms_win_core_stringansi_l1_1_0 wine_fn_config_dll api-ms-win-core-synch-l1-1-0 enable_api_ms_win_core_synch_l1_1_0 wine_fn_config_dll api-ms-win-core-synch-l1-2-0 enable_api_ms_win_core_synch_l1_2_0 +wine_fn_config_dll api-ms-win-core-synch-l1-2-1 enable_api_ms_win_core_synch_l1_2_1 wine_fn_config_dll api-ms-win-core-sysinfo-l1-1-0 enable_api_ms_win_core_sysinfo_l1_1_0 wine_fn_config_dll api-ms-win-core-sysinfo-l1-2-0 enable_api_ms_win_core_sysinfo_l1_2_0 wine_fn_config_dll api-ms-win-core-sysinfo-l1-2-1 enable_api_ms_win_core_sysinfo_l1_2_1 diff --git a/configure.ac b/configure.ac index ae514b0..a2ef1b4 100644 --- a/configure.ac +++ b/configure.ac @@ -2827,6 +2827,7 @@ WINE_CONFIG_DLL(api-ms-win-core-string-obsolete-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-stringansi-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-synch-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-synch-l1-2-0) +WINE_CONFIG_DLL(api-ms-win-core-synch-l1-2-1) WINE_CONFIG_DLL(api-ms-win-core-sysinfo-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-sysinfo-l1-2-0) WINE_CONFIG_DLL(api-ms-win-core-sysinfo-l1-2-1) diff --git a/dlls/api-ms-win-core-synch-l1-2-1/Makefile.in b/dlls/api-ms-win-core-synch-l1-2-1/Makefile.in new file mode 100644 index 0000000..b36c664 --- /dev/null +++ b/dlls/api-ms-win-core-synch-l1-2-1/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-synch-l1-2-1.dll diff --git a/dlls/api-ms-win-core-synch-l1-2-1/api-ms-win-core-synch-l1-2-1.spec b/dlls/api-ms-win-core-synch-l1-2-1/api-ms-win-core-synch-l1-2-1.spec new file mode 100644 index 0000000..84f40fa --- /dev/null +++ b/dlls/api-ms-win-core-synch-l1-2-1/api-ms-win-core-synch-l1-2-1.spec @@ -0,0 +1,61 @@ +@ stdcall AcquireSRWLockExclusive(ptr) kernel32.AcquireSRWLockExclusive +@ stdcall AcquireSRWLockShared(ptr) kernel32.AcquireSRWLockShared +@ stdcall CancelWaitableTimer(long) kernel32.CancelWaitableTimer +@ stdcall CreateEventA(ptr long long str) kernel32.CreateEventA +@ stdcall CreateEventExA(ptr str long long) kernel32.CreateEventExA +@ stdcall CreateEventExW(ptr wstr long long) kernel32.CreateEventExW +@ stdcall CreateEventW(ptr long long wstr) kernel32.CreateEventW +@ stdcall CreateMutexA(ptr long str) kernel32.CreateMutexA +@ stdcall CreateMutexExA(ptr str long long) kernel32.CreateMutexExA +@ stdcall CreateMutexExW(ptr wstr long long) kernel32.CreateMutexExW +@ stdcall CreateMutexW(ptr long wstr) kernel32.CreateMutexW +@ stdcall CreateSemaphoreExW(ptr long long wstr long long) kernel32.CreateSemaphoreExW +@ stdcall CreateSemaphoreW(ptr long long wstr) kernel32.CreateSemaphoreW +@ stdcall CreateWaitableTimerExW(ptr wstr long long) kernel32.CreateWaitableTimerExW +@ stdcall CreateWaitableTimerW(ptr long wstr) kernel32.CreateWaitableTimerW +@ stdcall DeleteCriticalSection(ptr) kernel32.DeleteCriticalSection +@ stub DeleteSynchronizationBarrier +@ stdcall EnterCriticalSection(ptr) kernel32.EnterCriticalSection +@ stub EnterSynchronizationBarrier +@ stdcall InitializeConditionVariable(ptr) kernel32.InitializeConditionVariable +@ stdcall InitializeCriticalSection(ptr) kernel32.InitializeCriticalSection +@ stdcall InitializeCriticalSectionAndSpinCount(ptr long) kernel32.InitializeCriticalSectionAndSpinCount +@ stdcall InitializeCriticalSectionEx(ptr long long) kernel32.InitializeCriticalSectionEx +@ stdcall InitializeSRWLock(ptr) kernel32.InitializeSRWLock +@ stub InitializeSynchronizationBarrier +@ stdcall InitOnceBeginInitialize(ptr long ptr ptr) kernel32.InitOnceBeginInitialize +@ stdcall InitOnceComplete(ptr long ptr) kernel32.InitOnceComplete +@ stdcall InitOnceExecuteOnce(ptr ptr ptr ptr) kernel32.InitOnceExecuteOnce +@ stdcall InitOnceInitialize(ptr) kernel32.InitOnceInitialize +@ stdcall LeaveCriticalSection(ptr) kernel32.LeaveCriticalSection +@ stdcall OpenEventA(long long str) kernel32.OpenEventA +@ stdcall OpenEventW(long long wstr) kernel32.OpenEventW +@ stdcall OpenMutexW(long long wstr) kernel32.OpenMutexW +@ stdcall OpenSemaphoreW(long long wstr) kernel32.OpenSemaphoreW +@ stdcall OpenWaitableTimerW(long long wstr) kernel32.OpenWaitableTimerW +@ stdcall ReleaseMutex(long) kernel32.ReleaseMutex +@ stdcall ReleaseSemaphore(long long ptr) kernel32.ReleaseSemaphore +@ stdcall ReleaseSRWLockExclusive(ptr) kernel32.ReleaseSRWLockExclusive +@ stdcall ReleaseSRWLockShared(ptr) kernel32.ReleaseSRWLockShared +@ stdcall ResetEvent(long) kernel32.ResetEvent +@ stdcall SetCriticalSectionSpinCount(ptr long) kernel32.SetCriticalSectionSpinCount +@ stdcall SetEvent(long) kernel32.SetEvent +@ stdcall SetWaitableTimer(long ptr long ptr ptr long) kernel32.SetWaitableTimer +@ stdcall SetWaitableTimerEx(long ptr long ptr ptr ptr long) kernel32.SetWaitableTimerEx +@ stdcall SignalObjectAndWait(long long long long) kernel32.SignalObjectAndWait +@ stdcall Sleep(long) kernel32.Sleep +@ stdcall SleepConditionVariableCS(ptr ptr long) kernel32.SleepConditionVariableCS +@ stdcall SleepConditionVariableSRW(ptr ptr long long) kernel32.SleepConditionVariableSRW +@ stdcall SleepEx(long long) kernel32.SleepEx +@ stdcall TryAcquireSRWLockExclusive(ptr) kernel32.TryAcquireSRWLockExclusive +@ stdcall TryAcquireSRWLockShared(ptr) kernel32.TryAcquireSRWLockShared +@ stdcall TryEnterCriticalSection(ptr) kernel32.TryEnterCriticalSection +@ stdcall WaitForMultipleObjects(long ptr long long) kernel32.WaitForMultipleObjects +@ stdcall WaitForMultipleObjectsEx(long ptr long long long) kernel32.WaitForMultipleObjectsEx +@ stdcall WaitForSingleObject(long long) kernel32.WaitForSingleObject +@ stdcall WaitForSingleObjectEx(long long long) kernel32.WaitForSingleObjectEx +@ stub WaitOnAddress +@ stdcall WakeAllConditionVariable(ptr) kernel32.WakeAllConditionVariable +@ stub WakeByAddressAll +@ stub WakeByAddressSingle +@ stdcall WakeConditionVariable(ptr) kernel32.WakeConditionVariable diff --git a/tools/make_specfiles b/tools/make_specfiles index 15966c3..3332313 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -201,6 +201,7 @@ my @dll_groups = "api-ms-win-core-util-l1-1-0", "api-ms-win-core-synch-l1-1-0", "api-ms-win-core-synch-l1-2-0", + "api-ms-win-core-synch-l1-2-1", "api-ms-win-core-console-l1-1-0", "api-ms-win-core-console-l2-1-0", "api-ms-win-core-file-l1-1-0",

1 0