January 2017 - Wine-commits

Vincent Povirk : kernel32: DETACHED_PROCESS prevents automatic std handle inheritance.
by Alexandre Julliard 26 Jan '17

26 Jan '17

Module: wine Branch: master Commit: b1b4de5d6bf0dbe73b12b6b16e9442dbcdec7290 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1b4de5d6bf0dbe73b12b6b16… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Jan 25 15:04:13 2017 -0600 kernel32: DETACHED_PROCESS prevents automatic std handle inheritance. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/process.c | 6 +++++ dlls/kernel32/tests/process.c | 53 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 17cb1db..aaa1058 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -1696,6 +1696,12 @@ static startup_info_t *create_startup_info( LPCWSTR filename, LPCWSTR cmdline, hstdout = startup->hStdOutput; hstderr = startup->hStdError; } + else if (flags & DETACHED_PROCESS) + { + hstdin = INVALID_HANDLE_VALUE; + hstdout = INVALID_HANDLE_VALUE; + hstderr = INVALID_HANDLE_VALUE; + } else { hstdin = GetStdHandle( STD_INPUT_HANDLE ); diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index a36ecd6..9b429b8 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -2895,6 +2895,58 @@ static void test_StartupNoConsole(void) #endif } +static void test_DetachStdHandles(void) +{ +#ifndef _WIN64 + char buffer[MAX_PATH], tempfile[MAX_PATH]; + STARTUPINFOA startup; + PROCESS_INFORMATION info; + HANDLE hstdin, hstdout, hstderr, htemp; + BOOL res; + + hstdin = GetStdHandle(STD_INPUT_HANDLE); + hstdout = GetStdHandle(STD_OUTPUT_HANDLE); + hstderr = GetStdHandle(STD_ERROR_HANDLE); + + get_file_name(tempfile); + htemp = CreateFileA(tempfile, GENERIC_READ|GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, 0); + ok(htemp != INVALID_HANDLE_VALUE, "failed opening temporary file\n"); + + memset(&startup, 0, sizeof(startup)); + startup.cb = sizeof(startup); + startup.dwFlags = STARTF_USESHOWWINDOW; + startup.wShowWindow = SW_SHOWNORMAL; + get_file_name(resfile); + sprintf(buffer, "\"%s\" tests/process.c dump \"%s\"", selfname, resfile); + + SetStdHandle(STD_INPUT_HANDLE, htemp); + SetStdHandle(STD_OUTPUT_HANDLE, htemp); + SetStdHandle(STD_ERROR_HANDLE, htemp); + + res = CreateProcessA(NULL, buffer, NULL, NULL, TRUE, DETACHED_PROCESS, NULL, NULL, &startup, + &info); + + SetStdHandle(STD_INPUT_HANDLE, hstdin); + SetStdHandle(STD_OUTPUT_HANDLE, hstdout); + SetStdHandle(STD_ERROR_HANDLE, hstderr); + + ok(res, "CreateProcess failed\n"); + ok(WaitForSingleObject(info.hProcess, 30000) == WAIT_OBJECT_0, "Child process termination\n"); + WritePrivateProfileStringA(NULL, NULL, NULL, resfile); + okChildInt("StartupInfoA", "hStdInput", (UINT)INVALID_HANDLE_VALUE); + okChildInt("StartupInfoA", "hStdOutput", (UINT)INVALID_HANDLE_VALUE); + okChildInt("StartupInfoA", "hStdError", (UINT)INVALID_HANDLE_VALUE); + okChildInt("TEB", "hStdInput", 0); + okChildInt("TEB", "hStdOutput", 0); + okChildInt("TEB", "hStdError", 0); + release_memory(); + DeleteFileA(resfile); + + CloseHandle(htemp); + DeleteFileA(tempfile); +#endif +} + static void test_GetNumaProcessorNode(void) { SYSTEM_INFO si; @@ -3328,6 +3380,7 @@ START_TEST(process) test_RegistryQuota(); test_DuplicateHandle(); test_StartupNoConsole(); + test_DetachStdHandles(); test_GetNumaProcessorNode(); test_session_info(); test_GetLogicalProcessorInformationEx();

1 0

Vincent Povirk : kernel32: DETACHED_PROCESS doesn' t affect STARTUPINFO console handles.
by Alexandre Julliard 26 Jan '17

26 Jan '17

Module: wine Branch: master Commit: 0ad641af9cf83b89eeead95e6a476d53a75e803d URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ad641af9cf83b89eeead95e6… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Jan 25 15:04:14 2017 -0600 kernel32: DETACHED_PROCESS doesn't affect STARTUPINFO console handles. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/process.c | 2 +- dlls/kernel32/tests/process.c | 41 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index aaa1058..5a9fea2 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -1711,7 +1711,7 @@ static startup_info_t *create_startup_info( LPCWSTR filename, LPCWSTR cmdline, info->hstdin = wine_server_obj_handle( hstdin ); info->hstdout = wine_server_obj_handle( hstdout ); info->hstderr = wine_server_obj_handle( hstderr ); - if ((flags & (CREATE_NEW_CONSOLE | DETACHED_PROCESS)) != 0) + if ((flags & CREATE_NEW_CONSOLE) != 0) { /* this is temporary (for console handles). We have no way to control that the handle is invalid in child process otherwise */ if (is_console_handle(hstdin)) info->hstdin = wine_server_obj_handle( INVALID_HANDLE_VALUE ); diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 9b429b8..f66ab45 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -2895,6 +2895,46 @@ static void test_StartupNoConsole(void) #endif } +static void test_DetachConsoleHandles(void) +{ +#ifndef _WIN64 + char buffer[MAX_PATH]; + STARTUPINFOA startup; + PROCESS_INFORMATION info; + UINT result; + + memset(&startup, 0, sizeof(startup)); + startup.cb = sizeof(startup); + startup.dwFlags = STARTF_USESHOWWINDOW|STARTF_USESTDHANDLES; + startup.wShowWindow = SW_SHOWNORMAL; + startup.hStdInput = GetStdHandle(STD_INPUT_HANDLE); + startup.hStdOutput = GetStdHandle(STD_OUTPUT_HANDLE); + startup.hStdError = GetStdHandle(STD_ERROR_HANDLE); + get_file_name(resfile); + sprintf(buffer, "\"%s\" tests/process.c dump \"%s\"", selfname, resfile); + ok(CreateProcessA(NULL, buffer, NULL, NULL, TRUE, DETACHED_PROCESS, NULL, NULL, &startup, + &info), "CreateProcess\n"); + ok(WaitForSingleObject(info.hProcess, 30000) == WAIT_OBJECT_0, "Child process termination\n"); + WritePrivateProfileStringA(NULL, NULL, NULL, resfile); + + result = GetPrivateProfileIntA("StartupInfoA", "hStdInput", 0, resfile); + ok(result != 0 && result != (UINT)INVALID_HANDLE_VALUE, "bad handle %x\n", result); + result = GetPrivateProfileIntA("StartupInfoA", "hStdOutput", 0, resfile); + ok(result != 0 && result != (UINT)INVALID_HANDLE_VALUE, "bad handle %x\n", result); + result = GetPrivateProfileIntA("StartupInfoA", "hStdError", 0, resfile); + ok(result != 0 && result != (UINT)INVALID_HANDLE_VALUE, "bad handle %x\n", result); + result = GetPrivateProfileIntA("TEB", "hStdInput", 0, resfile); + ok(result != 0 && result != (UINT)INVALID_HANDLE_VALUE, "bad handle %x\n", result); + result = GetPrivateProfileIntA("TEB", "hStdOutput", 0, resfile); + ok(result != 0 && result != (UINT)INVALID_HANDLE_VALUE, "bad handle %x\n", result); + result = GetPrivateProfileIntA("TEB", "hStdError", 0, resfile); + ok(result != 0 && result != (UINT)INVALID_HANDLE_VALUE, "bad handle %x\n", result); + + release_memory(); + DeleteFileA(resfile); +#endif +} + static void test_DetachStdHandles(void) { #ifndef _WIN64 @@ -3380,6 +3420,7 @@ START_TEST(process) test_RegistryQuota(); test_DuplicateHandle(); test_StartupNoConsole(); + test_DetachConsoleHandles(); test_DetachStdHandles(); test_GetNumaProcessorNode(); test_session_info();

1 0

Bruno Jesus : dinput: Skip events that are not useful currently.
by Alexandre Julliard 26 Jan '17

26 Jan '17

Module: wine Branch: master Commit: 6bb2c4cdede6266557424f45814de13c09c888ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=6bb2c4cdede6266557424f458… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Jan 25 16:28:57 2017 -0200 dinput: Skip events that are not useful currently. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_linuxinput.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index 911700b..44d72fc 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -902,7 +902,7 @@ static void joy_polldev(LPDIRECTINPUTDEVICE8A iface) break; #endif default: - FIXME("joystick cannot handle type %d event (code %d)\n",ie.type,ie.code); + TRACE("skipping event\n"); break; } if (inst_id >= 0)

1 0

Austin English : mf3216: Add stub dll.
by Alexandre Julliard 26 Jan '17

26 Jan '17

Module: wine Branch: master Commit: 45de91966235ca61827ec099ed345ffc43d27e2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=45de91966235ca61827ec099e… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Jan 25 20:28:31 2017 -0600 mf3216: Add stub dll. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/mf3216/Makefile.in | 1 + dlls/mf3216/mf3216.spec | 2 ++ 4 files changed, 6 insertions(+) diff --git a/configure b/configure index 5bfad88..54329a6 100755 --- a/configure +++ b/configure @@ -1246,6 +1246,7 @@ enable_mciqtz32 enable_mciseq enable_mciwave enable_mf +enable_mf3216 enable_mfplat enable_mfreadwrite enable_mgmtapi @@ -18059,6 +18060,7 @@ wine_fn_config_dll mciqtz32 enable_mciqtz32 wine_fn_config_dll mciseq enable_mciseq wine_fn_config_dll mciwave enable_mciwave wine_fn_config_dll mf enable_mf +wine_fn_config_dll mf3216 enable_mf3216 wine_fn_config_dll mfplat enable_mfplat wine_fn_config_dll mfreadwrite enable_mfreadwrite wine_fn_config_dll mgmtapi enable_mgmtapi diff --git a/configure.ac b/configure.ac index d468bbe..26be5e6 100644 --- a/configure.ac +++ b/configure.ac @@ -3120,6 +3120,7 @@ WINE_CONFIG_DLL(mciqtz32) WINE_CONFIG_DLL(mciseq) WINE_CONFIG_DLL(mciwave) WINE_CONFIG_DLL(mf) +WINE_CONFIG_DLL(mf3216) WINE_CONFIG_DLL(mfplat) WINE_CONFIG_DLL(mfreadwrite) WINE_CONFIG_DLL(mgmtapi) diff --git a/dlls/mf3216/Makefile.in b/dlls/mf3216/Makefile.in new file mode 100644 index 0000000..bf98f53 --- /dev/null +++ b/dlls/mf3216/Makefile.in @@ -0,0 +1 @@ +MODULE = mf3216.dll diff --git a/dlls/mf3216/mf3216.spec b/dlls/mf3216/mf3216.spec new file mode 100644 index 0000000..b8480af --- /dev/null +++ b/dlls/mf3216/mf3216.spec @@ -0,0 +1,2 @@ +@ stub ConvertEmfToWmf +@ stub Mf3216DllInitialize

1 0

Louis Lenders : oledb32: Add version resource.
by Alexandre Julliard 26 Jan '17

26 Jan '17

Module: wine Branch: master Commit: 239653ea12a9157e39125062e46303640c6ef8bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=239653ea12a9157e39125062e… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Sun Jan 22 17:07:26 2017 +0100 oledb32: Add version resource. Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oledb32/Makefile.in | 2 ++ dlls/oledb32/version.rc | 26 ++++++++++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/dlls/oledb32/Makefile.in b/dlls/oledb32/Makefile.in index 0fcb4e4..a32e9b1 100644 --- a/dlls/oledb32/Makefile.in +++ b/dlls/oledb32/Makefile.in @@ -13,3 +13,5 @@ IDL_SRCS = \ convert.idl \ oledb32_classes.idl \ oledb32_typelib.idl + +RC_SRCS = version.rc diff --git a/dlls/oledb32/version.rc b/dlls/oledb32/version.rc new file mode 100644 index 0000000..e082acc --- /dev/null +++ b/dlls/oledb32/version.rc @@ -0,0 +1,26 @@ +/* + * Copyright 2017 Louis Lenders + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define WINE_FILEDESCRIPTION_STR "Wine oledb" +#define WINE_FILENAME_STR "oledb32.dll" +#define WINE_FILEVERSION 2,81,1117,0 +#define WINE_FILEVERSION_STR "2.81.1117.0" +#define WINE_PRODUCTVERSION 2,81,1117,0 +#define WINE_PRODUCTVERSION_STR "2.81.1117.0" + +#include "wine/wine_common_ver.rc"

1 0

Bruno Jesus : odbc32: Improve some tracing.
by Alexandre Julliard 26 Jan '17

26 Jan '17

Module: wine Branch: master Commit: 25e495fd3f68e65357f7d44765fb0c82634a7a26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25e495fd3f68e65357f7d4476… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Fri Jan 13 11:24:48 2017 -0200 odbc32: Improve some tracing. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/odbc32/proxyodbc.c | 85 +++++++++++++++++++++++++++++-------------------- 1 file changed, 50 insertions(+), 35 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=25e495fd3f68e65357f7d…

1 0

Henri Verbeet : wined3d: Simplify shader_glsl_load_np2fixup_constants().
by Alexandre Julliard 26 Jan '17

26 Jan '17

Module: wine Branch: master Commit: adf849356615a36e19ebc17c322e5ad19dae94e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=adf849356615a36e19ebc17c3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 26 13:25:17 2017 +0100 wined3d: Simplify shader_glsl_load_np2fixup_constants(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 8bd4cb5..7196cc6 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -887,7 +887,11 @@ static void reset_program_constant_version(struct wine_rb_entry *entry, void *co static void shader_glsl_load_np2fixup_constants(const struct glsl_ps_program *ps, const struct wined3d_gl_info *gl_info, const struct wined3d_state *state) { - GLfloat np2fixup_constants[4 * MAX_FRAGMENT_SAMPLERS]; + struct + { + float sx, sy; + } + np2fixup_constants[MAX_FRAGMENT_SAMPLERS]; UINT fixup = ps->np2_fixup_info->active; UINT i; @@ -895,7 +899,6 @@ static void shader_glsl_load_np2fixup_constants(const struct glsl_ps_program *ps { const struct wined3d_texture *tex = state->textures[i]; unsigned char idx = ps->np2_fixup_info->idx[i]; - GLfloat *tex_dim = &np2fixup_constants[(idx >> 1) * 4]; if (!tex) { @@ -903,19 +906,11 @@ static void shader_glsl_load_np2fixup_constants(const struct glsl_ps_program *ps continue; } - if (idx % 2) - { - tex_dim[2] = tex->pow2_matrix[0]; - tex_dim[3] = tex->pow2_matrix[5]; - } - else - { - tex_dim[0] = tex->pow2_matrix[0]; - tex_dim[1] = tex->pow2_matrix[5]; - } + np2fixup_constants[idx].sx = tex->pow2_matrix[0]; + np2fixup_constants[idx].sy = tex->pow2_matrix[5]; } - GL_EXTCALL(glUniform4fv(ps->np2_fixup_location, ps->np2_fixup_info->num_consts, np2fixup_constants)); + GL_EXTCALL(glUniform4fv(ps->np2_fixup_location, ps->np2_fixup_info->num_consts, &np2fixup_constants[0].sx)); } /* Taken and adapted from Mesa. */

1 0

Henri Verbeet : wined3d: Get rid of the "ds_current_size" field from struct wined3d_surface.
by Alexandre Julliard 26 Jan '17

26 Jan '17

Module: wine Branch: master Commit: 35e651caf130e1370c3fa7866ce0e1d29aa2aacd URL: http://source.winehq.org/git/wine.git/?a=commit;h=35e651caf130e1370c3fa7866… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 26 13:25:18 2017 +0100 wined3d: Get rid of the "ds_current_size" field from struct wined3d_surface. This should be unused now that surface_load_ds_location() is gone. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 2 +- dlls/wined3d/device.c | 66 ++---------------------------------------- dlls/wined3d/drawprim.c | 17 ++--------- dlls/wined3d/surface.c | 23 +++------------ dlls/wined3d/swapchain.c | 3 +- dlls/wined3d/wined3d_private.h | 3 +- 6 files changed, 12 insertions(+), 102 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=35e651caf130e1370c3fa…

1 0

Henri Verbeet : wined3d: Get rid of surface_modify_ds_location().
by Alexandre Julliard 26 Jan '17

26 Jan '17

Module: wine Branch: master Commit: 41738baea205bb308fced32db979de8b55d7d1e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41738baea205bb308fced32db… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 26 13:25:19 2017 +0100 wined3d: Get rid of surface_modify_ds_location(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 3 ++- dlls/wined3d/device.c | 7 ++++--- dlls/wined3d/drawprim.c | 7 ++++--- dlls/wined3d/surface.c | 17 ++++------------- dlls/wined3d/swapchain.c | 3 ++- dlls/wined3d/wined3d_private.h | 1 - 6 files changed, 16 insertions(+), 22 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index f1aef77..6a366b8 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -632,7 +632,8 @@ static void wined3d_cs_exec_set_depth_stencil_view(struct wined3d_cs *cs, const if (prev_surface && (device->swapchains[0]->desc.flags & WINED3D_SWAPCHAIN_DISCARD_DEPTHSTENCIL || prev_surface->container->flags & WINED3D_TEXTURE_DISCARD)) { - surface_modify_ds_location(prev_surface, WINED3D_LOCATION_DISCARDED); + wined3d_texture_validate_location(prev_surface->container, + prev->sub_resource_idx, WINED3D_LOCATION_DISCARDED); if (prev_surface == device->onscreen_depth_stencil) { wined3d_texture_decref(device->onscreen_depth_stencil->container); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 302df96..10c5df1 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -204,8 +204,8 @@ void device_switch_onscreen_ds(struct wined3d_device *device, if (device->onscreen_depth_stencil) { surface_load_location(device->onscreen_depth_stencil, context, WINED3D_LOCATION_TEXTURE_RGB); - - surface_modify_ds_location(device->onscreen_depth_stencil, WINED3D_LOCATION_TEXTURE_RGB); + wined3d_texture_invalidate_location(device->onscreen_depth_stencil->container, + surface_get_sub_resource_idx(device->onscreen_depth_stencil), ~WINED3D_LOCATION_TEXTURE_RGB); wined3d_texture_decref(device->onscreen_depth_stencil->container); } device->onscreen_depth_stencil = depth_stencil; @@ -331,7 +331,8 @@ void device_clear_render_targets(struct wined3d_device *device, UINT rt_count, c { DWORD location = render_offscreen ? dsv->resource->draw_binding : WINED3D_LOCATION_DRAWABLE; - surface_modify_ds_location(depth_stencil, location); + wined3d_texture_validate_location(depth_stencil->container, dsv->sub_resource_idx, location); + wined3d_texture_invalidate_location(depth_stencil->container, dsv->sub_resource_idx, ~location); gl_info->gl_ops.gl.p_glDepthMask(GL_TRUE); context_invalidate_state(context, STATE_RENDER(WINED3D_RS_ZWRITEENABLE)); diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index d846b8f..ddeb238 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -483,12 +483,13 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s return; } - if (fb->depth_stencil && state->render_states[WINED3D_RS_ZWRITEENABLE]) + if (dsv && state->render_states[WINED3D_RS_ZWRITEENABLE]) { - struct wined3d_surface *ds = wined3d_rendertarget_view_get_surface(fb->depth_stencil); + struct wined3d_surface *ds = wined3d_rendertarget_view_get_surface(dsv); DWORD location = context->render_offscreen ? ds->container->resource.draw_binding : WINED3D_LOCATION_DRAWABLE; - surface_modify_ds_location(ds, location); + wined3d_texture_validate_location(ds->container, dsv->sub_resource_idx, location); + wined3d_texture_invalidate_location(ds->container, dsv->sub_resource_idx, ~location); } if ((!gl_info->supported[WINED3D_GL_VERSION_2_0] diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index ad02a20..b4e2025 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -712,6 +712,7 @@ static HRESULT wined3d_surface_depth_blt(struct wined3d_surface *src_surface, DW struct wined3d_texture *src_texture = src_surface->container; struct wined3d_texture *dst_texture = dst_surface->container; struct wined3d_device *device = src_texture->resource.device; + unsigned int dst_sub_resource_idx; if (!fbo_blit_supported(&device->adapter->gl_info, WINED3D_BLIT_OP_DEPTH_BLIT, src_rect, src_texture->resource.usage, src_texture->resource.pool, src_texture->resource.format, @@ -720,7 +721,9 @@ static HRESULT wined3d_surface_depth_blt(struct wined3d_surface *src_surface, DW surface_depth_blt_fbo(device, src_surface, src_location, src_rect, dst_surface, dst_location, dst_rect); - surface_modify_ds_location(dst_surface, dst_location); + dst_sub_resource_idx = surface_get_sub_resource_idx(dst_surface); + wined3d_texture_validate_location(dst_texture, dst_sub_resource_idx, dst_location); + wined3d_texture_invalidate_location(dst_texture, dst_sub_resource_idx, ~dst_location); return WINED3D_OK; } @@ -2488,18 +2491,6 @@ static HRESULT surface_blt_special(struct wined3d_surface *dst_surface, const RE return WINED3DERR_INVALIDCALL; } -void surface_modify_ds_location(struct wined3d_surface *surface, DWORD location) -{ - struct wined3d_texture *texture = surface->container; - unsigned int sub_resource_idx; - - TRACE("surface %p, new location %#x.\n", surface, location); - - sub_resource_idx = surface_get_sub_resource_idx(surface); - wined3d_texture_validate_location(texture, sub_resource_idx, location); - wined3d_texture_invalidate_location(texture, sub_resource_idx, ~location); -} - static DWORD resource_access_from_location(DWORD location) { switch (location) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index cb704cd..30f6c7d 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -622,7 +622,8 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, if (ds && (swapchain->desc.flags & WINED3D_SWAPCHAIN_DISCARD_DEPTHSTENCIL || ds->container->flags & WINED3D_TEXTURE_DISCARD)) { - surface_modify_ds_location(ds, WINED3D_LOCATION_DISCARDED); + wined3d_texture_validate_location(ds->container, + fb->depth_stencil->sub_resource_idx, WINED3D_LOCATION_DISCARDED); if (ds == swapchain->device->onscreen_depth_stencil) { wined3d_texture_decref(swapchain->device->onscreen_depth_stencil->container); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 31c6c0d..338aef0 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2983,7 +2983,6 @@ void surface_load_fb_texture(struct wined3d_surface *surface, BOOL srgb, struct wined3d_context *context) DECLSPEC_HIDDEN; HRESULT surface_load_location(struct wined3d_surface *surface, struct wined3d_context *context, DWORD location) DECLSPEC_HIDDEN; -void surface_modify_ds_location(struct wined3d_surface *surface, DWORD location) DECLSPEC_HIDDEN; void surface_set_compatible_renderbuffer(struct wined3d_surface *surface, const struct wined3d_surface *rt) DECLSPEC_HIDDEN; void surface_translate_drawable_coords(const struct wined3d_surface *surface, HWND window, RECT *rect) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Get rid of the "onscreen_depth_stencil" field from struct wined3d_device.
by Alexandre Julliard 26 Jan '17

26 Jan '17

Module: wine Branch: master Commit: 7c5fd62efc095adc449fad558b003fb7cc3587b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c5fd62efc095adc449fad558… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 26 13:25:20 2017 +0100 wined3d: Get rid of the "onscreen_depth_stencil" field from struct wined3d_device. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 5 ----- dlls/wined3d/device.c | 31 ------------------------------- dlls/wined3d/drawprim.c | 5 ----- dlls/wined3d/swapchain.c | 7 ------- dlls/wined3d/wined3d_private.h | 3 --- 5 files changed, 51 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 6a366b8..c030d35 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -634,11 +634,6 @@ static void wined3d_cs_exec_set_depth_stencil_view(struct wined3d_cs *cs, const { wined3d_texture_validate_location(prev_surface->container, prev->sub_resource_idx, WINED3D_LOCATION_DISCARDED); - if (prev_surface == device->onscreen_depth_stencil) - { - wined3d_texture_decref(device->onscreen_depth_stencil->container); - device->onscreen_depth_stencil = NULL; - } } } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 10c5df1..75a939e 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -198,20 +198,6 @@ void device_context_remove(struct wined3d_device *device, struct wined3d_context device->contexts = new_array; } -void device_switch_onscreen_ds(struct wined3d_device *device, - struct wined3d_context *context, struct wined3d_surface *depth_stencil) -{ - if (device->onscreen_depth_stencil) - { - surface_load_location(device->onscreen_depth_stencil, context, WINED3D_LOCATION_TEXTURE_RGB); - wined3d_texture_invalidate_location(device->onscreen_depth_stencil->container, - surface_get_sub_resource_idx(device->onscreen_depth_stencil), ~WINED3D_LOCATION_TEXTURE_RGB); - wined3d_texture_decref(device->onscreen_depth_stencil->container); - } - device->onscreen_depth_stencil = depth_stencil; - wined3d_texture_incref(device->onscreen_depth_stencil->container); -} - static BOOL is_full_clear(const struct wined3d_surface *target, const RECT *draw_rect, const RECT *clear_rect) { unsigned int height = wined3d_texture_get_level_height(target->container, target->texture_level); @@ -300,8 +286,6 @@ void device_clear_render_targets(struct wined3d_device *device, UINT rt_count, c { DWORD location = render_offscreen ? dsv->resource->draw_binding : WINED3D_LOCATION_DRAWABLE; - if (!render_offscreen && depth_stencil != device->onscreen_depth_stencil) - device_switch_onscreen_ds(device, context, depth_stencil); surface_load_location(depth_stencil, context, location); } @@ -1086,7 +1070,6 @@ HRESULT CDECL wined3d_device_uninit_3d(struct wined3d_device *device) struct wined3d_resource *resource, *cursor; const struct wined3d_gl_info *gl_info; struct wined3d_context *context; - struct wined3d_surface *surface; UINT i; TRACE("device %p.\n", device); @@ -1133,14 +1116,6 @@ HRESULT CDECL wined3d_device_uninit_3d(struct wined3d_device *device) context_release(context); - /* Release the buffers (with sanity checks) */ - if (device->onscreen_depth_stencil) - { - surface = device->onscreen_depth_stencil; - device->onscreen_depth_stencil = NULL; - wined3d_texture_decref(surface->container); - } - if (device->fb.depth_stencil) { struct wined3d_rendertarget_view *view = device->fb.depth_stencil; @@ -4636,12 +4611,6 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, } wined3d_device_set_depth_stencil_view(device, NULL); - if (device->onscreen_depth_stencil) - { - wined3d_texture_decref(device->onscreen_depth_stencil->container); - device->onscreen_depth_stencil = NULL; - } - if (reset_state) { LIST_FOR_EACH_ENTRY_SAFE(resource, cursor, &device->resources, struct wined3d_resource, resource_list_entry) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index ddeb238..a3d88b9 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -466,12 +466,7 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s struct wined3d_surface *ds = wined3d_rendertarget_view_get_surface(dsv); if (state->render_states[WINED3D_RS_ZWRITEENABLE] || state->render_states[WINED3D_RS_ZENABLE]) - { - if (!context->render_offscreen && ds != device->onscreen_depth_stencil) - device_switch_onscreen_ds(device, context, ds); - wined3d_texture_load_location(ds->container, dsv->sub_resource_idx, context, location); - } else wined3d_texture_prepare_location(ds->container, dsv->sub_resource_idx, context, location); } diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 30f6c7d..62589c1 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -621,15 +621,8 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, if (ds && (swapchain->desc.flags & WINED3D_SWAPCHAIN_DISCARD_DEPTHSTENCIL || ds->container->flags & WINED3D_TEXTURE_DISCARD)) - { wined3d_texture_validate_location(ds->container, fb->depth_stencil->sub_resource_idx, WINED3D_LOCATION_DISCARDED); - if (ds == swapchain->device->onscreen_depth_stencil) - { - wined3d_texture_decref(swapchain->device->onscreen_depth_stencil->container); - swapchain->device->onscreen_depth_stencil = NULL; - } - } } context_release(context); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 338aef0..9f061bf 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2560,7 +2560,6 @@ struct wined3d_device /* Render Target Support */ struct wined3d_fb_state fb; - struct wined3d_surface *onscreen_depth_stencil; struct wined3d_rendertarget_view *auto_depth_stencil_view; /* For rendering to a texture using glCopyTexImage */ @@ -2612,8 +2611,6 @@ LRESULT device_process_message(struct wined3d_device *device, HWND window, BOOL UINT message, WPARAM wparam, LPARAM lparam, WNDPROC proc) DECLSPEC_HIDDEN; void device_resource_add(struct wined3d_device *device, struct wined3d_resource *resource) DECLSPEC_HIDDEN; void device_resource_released(struct wined3d_device *device, struct wined3d_resource *resource) DECLSPEC_HIDDEN; -void device_switch_onscreen_ds(struct wined3d_device *device, struct wined3d_context *context, - struct wined3d_surface *depth_stencil) DECLSPEC_HIDDEN; void device_invalidate_state(const struct wined3d_device *device, DWORD state) DECLSPEC_HIDDEN; static inline BOOL isStateDirty(const struct wined3d_context *context, DWORD state)

1 0