September 2017 - Wine-commits

Vincent Povirk : winex11: Convert process name to lowercase for WM name hint.
by Alexandre Julliard 08 Sep '17

08 Sep '17

Module: wine Branch: master Commit: 50b033691494186421f04d518a9eb249d8a348cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=50b033691494186421f04d518… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Sep 8 10:54:29 2017 -0500 winex11: Convert process name to lowercase for WM name hint. The startup-notification spec is vague on this point, but it seems that StartupWMClass is case-sensitive. We should convert to a standard case so we can use that field. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/x11drv_main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 65ef59b..a2ec18b 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -343,6 +343,7 @@ static void setup_options(void) WCHAR *p, *appname = bufferW; if ((p = strrchrW( appname, '/' ))) appname = p + 1; if ((p = strrchrW( appname, '\\' ))) appname = p + 1; + CharLowerW(appname); len = WideCharToMultiByte( CP_UNIXCP, 0, appname, -1, NULL, 0, NULL, NULL ); if ((process_name = HeapAlloc( GetProcessHeap(), 0, len ))) WideCharToMultiByte( CP_UNIXCP, 0, appname, -1, process_name, len, NULL, NULL );

1 0

Vincent Povirk : winemenubuilder: Set StartupWMClass for shortcuts to exe files.
by Alexandre Julliard 08 Sep '17

08 Sep '17

Module: wine Branch: master Commit: 917e86dd7a4cca1da47262caaded2bef9e022f99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=917e86dd7a4cca1da47262caa… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Sep 8 10:54:30 2017 -0500 winemenubuilder: Set StartupWMClass for shortcuts to exe files. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winemenubuilder/winemenubuilder.c | 44 ++++++++++++++++++++---------- 1 file changed, 30 insertions(+), 14 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 154b575..0013b04 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -1446,13 +1446,14 @@ static DWORD register_menus_entry(const char *unix_file, const char *windows_fil static BOOL write_desktop_entry(const char *unix_link, const char *location, const char *linkname, const char *path, const char *args, const char *descr, - const char *workdir, const char *icon) + const char *workdir, const char *icon, const char *wmclass) { FILE *file; - WINE_TRACE("(%s,%s,%s,%s,%s,%s,%s,%s)\n", wine_dbgstr_a(unix_link), wine_dbgstr_a(location), + WINE_TRACE("(%s,%s,%s,%s,%s,%s,%s,%s,%s)\n", wine_dbgstr_a(unix_link), wine_dbgstr_a(location), wine_dbgstr_a(linkname), wine_dbgstr_a(path), wine_dbgstr_a(args), - wine_dbgstr_a(descr), wine_dbgstr_a(workdir), wine_dbgstr_a(icon)); + wine_dbgstr_a(descr), wine_dbgstr_a(workdir), wine_dbgstr_a(icon), + wine_dbgstr_a(wmclass)); file = fopen(location, "w"); if (file == NULL) @@ -1470,6 +1471,8 @@ static BOOL write_desktop_entry(const char *unix_link, const char *location, con fprintf(file, "Path=%s\n", workdir); if (icon && lstrlenA(icon)) fprintf(file, "Icon=%s\n", icon); + if (wmclass && lstrlenA(wmclass)) + fprintf(file, "StartupWMClass=%s\n", wmclass); fclose(file); @@ -1615,7 +1618,7 @@ end: } static BOOL write_menu_entry(const char *unix_link, const char *link, const char *path, const char *args, - const char *descr, const char *workdir, const char *icon) + const char *descr, const char *workdir, const char *icon, const char *wmclass) { const char *linkname; char *desktopPath = NULL; @@ -1623,9 +1626,9 @@ static BOOL write_menu_entry(const char *unix_link, const char *link, const char char *filename = NULL; BOOL ret = TRUE; - WINE_TRACE("(%s, %s, %s, %s, %s, %s, %s)\n", wine_dbgstr_a(unix_link), wine_dbgstr_a(link), + WINE_TRACE("(%s, %s, %s, %s, %s, %s, %s, %s)\n", wine_dbgstr_a(unix_link), wine_dbgstr_a(link), wine_dbgstr_a(path), wine_dbgstr_a(args), wine_dbgstr_a(descr), - wine_dbgstr_a(workdir), wine_dbgstr_a(icon)); + wine_dbgstr_a(workdir), wine_dbgstr_a(icon), wine_dbgstr_a(wmclass)); linkname = strrchr(link, '/'); if (linkname == NULL) @@ -1649,7 +1652,7 @@ static BOOL write_menu_entry(const char *unix_link, const char *link, const char goto end; } *desktopDir = '/'; - if (!write_desktop_entry(unix_link, desktopPath, linkname, path, args, descr, workdir, icon)) + if (!write_desktop_entry(unix_link, desktopPath, linkname, path, args, descr, workdir, icon, wmclass)) { WINE_WARN("couldn't make desktop entry %s\n", wine_dbgstr_a(desktopPath)); ret = FALSE; @@ -2771,9 +2774,10 @@ static BOOL InvokeShellLinker( IShellLinkW *sl, LPCWSTR link, BOOL bWait ) '\\','s','t','a','r','t','.','e','x','e',0}; char *link_name = NULL, *icon_name = NULL, *work_dir = NULL; char *escaped_path = NULL, *escaped_args = NULL, *description = NULL; + char *wmclass = NULL; WCHAR szTmp[INFOTIPSIZE]; WCHAR szDescription[INFOTIPSIZE], szPath[MAX_PATH], szWorkDir[MAX_PATH]; - WCHAR szArgs[INFOTIPSIZE], szIconPath[MAX_PATH]; + WCHAR szArgs[INFOTIPSIZE], szIconPath[MAX_PATH], szWMClass[MAX_PATH]; int iIconId = 0, r = -1; DWORD csidl = -1; HANDLE hsem = NULL; @@ -2818,6 +2822,8 @@ static BOOL InvokeShellLinker( IShellLinkW *sl, LPCWSTR link, BOOL bWait ) ExpandEnvironmentStringsW(szTmp, szIconPath, MAX_PATH); WINE_TRACE("icon file : %s\n", wine_dbgstr_w(szIconPath) ); + szWMClass[0] = 0; + if( !szPath[0] ) { LPITEMIDLIST pidl = NULL; @@ -2880,6 +2886,14 @@ static BOOL InvokeShellLinker( IShellLinkW *sl, LPCWSTR link, BOOL bWait ) GetWindowsDirectoryW(szPath, MAX_PATH); lstrcatW(szPath, startW); } + else + { + /* FIXME: Use AppUserModelID if present. */ + WCHAR *p = PathFindFileNameW(szPath); + + lstrcpyW(szWMClass, p); + CharLowerW(szWMClass); + } /* convert app working dir */ if (szWorkDir[0]) @@ -2897,7 +2911,8 @@ static BOOL InvokeShellLinker( IShellLinkW *sl, LPCWSTR link, BOOL bWait ) escaped_path = escape(szPath); escaped_args = escape(szArgs); description = wchars_to_utf8_chars(szDescription); - if (escaped_path == NULL || escaped_args == NULL || description == NULL) + wmclass = wchars_to_utf8_chars(szWMClass); + if (escaped_path == NULL || escaped_args == NULL || description == NULL || wmclass == NULL) { WINE_ERR("out of memory allocating/escaping parameters\n"); goto cleanup; @@ -2936,12 +2951,12 @@ static BOOL InvokeShellLinker( IShellLinkW *sl, LPCWSTR link, BOOL bWait ) if (link_arg) { r = !write_desktop_entry(unix_link, location, lastEntry, - start_path, link_arg, description, work_dir, icon_name); + start_path, link_arg, description, work_dir, icon_name, wmclass); HeapFree(GetProcessHeap(), 0, link_arg); } } else - r = !write_desktop_entry(NULL, location, lastEntry, escaped_path, escaped_args, description, work_dir, icon_name); + r = !write_desktop_entry(NULL, location, lastEntry, escaped_path, escaped_args, description, work_dir, icon_name, wmclass); if (r == 0) chmod(location, 0755); HeapFree(GetProcessHeap(), 0, location); @@ -2952,7 +2967,7 @@ static BOOL InvokeShellLinker( IShellLinkW *sl, LPCWSTR link, BOOL bWait ) char *link_arg = escape_unix_link_arg(unix_link); if (link_arg) { - r = !write_menu_entry(unix_link, link_name, start_path, link_arg, description, work_dir, icon_name); + r = !write_menu_entry(unix_link, link_name, start_path, link_arg, description, work_dir, icon_name, wmclass); HeapFree(GetProcessHeap(), 0, link_arg); } } @@ -2967,6 +2982,7 @@ cleanup: HeapFree( GetProcessHeap(), 0, escaped_args ); HeapFree( GetProcessHeap(), 0, escaped_path ); HeapFree( GetProcessHeap(), 0, description ); + HeapFree( GetProcessHeap(), 0, wmclass ); HeapFree( GetProcessHeap(), 0, unix_link ); HeapFree( GetProcessHeap(), 0, start_path ); @@ -3102,14 +3118,14 @@ static BOOL InvokeShellLinkerForURL( IUniformResourceLocatorW *url, LPCWSTR link location = heap_printf("%s/%s.desktop", xdg_desktop_dir, lastEntry); if (location) { - r = !write_desktop_entry(NULL, location, lastEntry, start_path, escaped_urlPath, NULL, NULL, icon_name); + r = !write_desktop_entry(NULL, location, lastEntry, start_path, escaped_urlPath, NULL, NULL, icon_name, NULL); if (r == 0) chmod(location, 0755); HeapFree(GetProcessHeap(), 0, location); } } else - r = !write_menu_entry(unix_link, link_name, start_path, escaped_urlPath, NULL, NULL, icon_name); + r = !write_menu_entry(unix_link, link_name, start_path, escaped_urlPath, NULL, NULL, icon_name, NULL); ret = (r == 0); ReleaseSemaphore(hSem, 1, NULL);

1 0

Paul Gofman : d3dx9/tests: Add test for null shaders in effect.
by Alexandre Julliard 08 Sep '17

08 Sep '17

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

Paul Gofman : d3dx9: Return E_FAIL from ValidateTechnique() for techniques with unsupported shaders.
by Alexandre Julliard 08 Sep '17

08 Sep '17

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: Fix zero object_id handling in d3dx9_base_effect_get_pass_desc().
by Alexandre Julliard 08 Sep '17

08 Sep '17

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 08 Sep '17

08 Sep '17

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

Francois Gouget : ieproxy: Case fixes.
by Alexandre Julliard 08 Sep '17

08 Sep '17

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

Francois Gouget : mshtml: A spelling fix in a WARN() message.
by Alexandre Julliard 08 Sep '17

08 Sep '17

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

Francois Gouget : mshtml: Make HTMLDocumentNode_init_dispex_info() static.
by Alexandre Julliard 08 Sep '17

08 Sep '17

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

Fabian Maurer : api-ms-win-core-heap-l2-1-0: Add dll.
by Alexandre Julliard 07 Sep '17

07 Sep '17

Module: wine Branch: master Commit: 9ec3939386c7cd462594c2a4327382c623f6157e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ec3939386c7cd462594c2a43… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Thu Sep 7 20:03:06 2017 +0200 api-ms-win-core-heap-l2-1-0: 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-heap-l2-1-0/Makefile.in | 1 + dlls/api-ms-win-core-heap-l2-1-0/api-ms-win-core-heap-l2-1-0.spec | 7 +++++++ tools/make_specfiles | 1 + 5 files changed, 12 insertions(+) diff --git a/configure b/configure index 3abee30..1011c3d 100755 --- a/configure +++ b/configure @@ -912,6 +912,7 @@ enable_api_ms_win_core_file_l2_1_1 enable_api_ms_win_core_handle_l1_1_0 enable_api_ms_win_core_heap_l1_1_0 enable_api_ms_win_core_heap_l1_2_0 +enable_api_ms_win_core_heap_l2_1_0 enable_api_ms_win_core_heap_obsolete_l1_1_0 enable_api_ms_win_core_interlocked_l1_1_0 enable_api_ms_win_core_interlocked_l1_2_0 @@ -17987,6 +17988,7 @@ wine_fn_config_dll api-ms-win-core-file-l2-1-1 enable_api_ms_win_core_file_l2_1_ wine_fn_config_dll api-ms-win-core-handle-l1-1-0 enable_api_ms_win_core_handle_l1_1_0 wine_fn_config_dll api-ms-win-core-heap-l1-1-0 enable_api_ms_win_core_heap_l1_1_0 wine_fn_config_dll api-ms-win-core-heap-l1-2-0 enable_api_ms_win_core_heap_l1_2_0 +wine_fn_config_dll api-ms-win-core-heap-l2-1-0 enable_api_ms_win_core_heap_l2_1_0 wine_fn_config_dll api-ms-win-core-heap-obsolete-l1-1-0 enable_api_ms_win_core_heap_obsolete_l1_1_0 wine_fn_config_dll api-ms-win-core-interlocked-l1-1-0 enable_api_ms_win_core_interlocked_l1_1_0 wine_fn_config_dll api-ms-win-core-interlocked-l1-2-0 enable_api_ms_win_core_interlocked_l1_2_0 diff --git a/configure.ac b/configure.ac index bf73b65..fac6ba0 100644 --- a/configure.ac +++ b/configure.ac @@ -2767,6 +2767,7 @@ WINE_CONFIG_DLL(api-ms-win-core-file-l2-1-1) WINE_CONFIG_DLL(api-ms-win-core-handle-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-heap-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-heap-l1-2-0) +WINE_CONFIG_DLL(api-ms-win-core-heap-l2-1-0) WINE_CONFIG_DLL(api-ms-win-core-heap-obsolete-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-interlocked-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-interlocked-l1-2-0) diff --git a/dlls/api-ms-win-core-heap-l2-1-0/Makefile.in b/dlls/api-ms-win-core-heap-l2-1-0/Makefile.in new file mode 100644 index 0000000..3caed9e --- /dev/null +++ b/dlls/api-ms-win-core-heap-l2-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-heap-l2-1-0.dll diff --git a/dlls/api-ms-win-core-heap-l2-1-0/api-ms-win-core-heap-l2-1-0.spec b/dlls/api-ms-win-core-heap-l2-1-0/api-ms-win-core-heap-l2-1-0.spec new file mode 100644 index 0000000..81308d2 --- /dev/null +++ b/dlls/api-ms-win-core-heap-l2-1-0/api-ms-win-core-heap-l2-1-0.spec @@ -0,0 +1,7 @@ +@ stdcall GlobalAlloc(long long) kernel32.GlobalAlloc +@ stdcall GlobalFree(long) kernel32.GlobalFree +@ stdcall LocalAlloc(long long) kernel32.LocalAlloc +@ stdcall LocalFree(long) kernel32.LocalFree +@ stdcall LocalLock(long) kernel32.LocalLock +@ stdcall LocalReAlloc(long long long) kernel32.LocalReAlloc +@ stdcall LocalUnlock(long) kernel32.LocalUnlock diff --git a/tools/make_specfiles b/tools/make_specfiles index b506f73..0ff4a57 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -211,6 +211,7 @@ my @dll_groups = "api-ms-win-core-handle-l1-1-0", "api-ms-win-core-heap-l1-1-0", "api-ms-win-core-heap-l1-2-0", + "api-ms-win-core-heap-l2-1-0", "api-ms-win-core-heap-obsolete-l1-1-0", "api-ms-win-core-io-l1-1-0", "api-ms-win-core-io-l1-1-1",

1 0