From e21bed742a7ddbde9b08a0c81e639f82a98f47da Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Fri, 31 Jul 2015 01:42:04 +0200 Subject: [PATCH] Rebase against 571462c633edbcc5dd6f2f8e56470470f27b0b07. --- README.md | 4 +- debian/changelog | 2 + ...ecurityCookie-pointer-before-derefer.patch | 30 ----- patches/ntdll-Security_Cookie/definition | 2 - patches/patchinstall.sh | 52 +++----- ...istently-return-nonzero-exitcode-on-.patch | 117 ------------------ ...sole-Forward-child-process-exitcode.patch} | 0 .../wined3d-CSMT_Main/9999-IfDefined.patch | 93 +++++++------- 8 files changed, 66 insertions(+), 234 deletions(-) delete mode 100644 patches/ntdll-Security_Cookie/0001-ntdll-Validate-SecurityCookie-pointer-before-derefer.patch delete mode 100644 patches/ntdll-Security_Cookie/definition delete mode 100644 patches/wineconsole-Forward_Exitcode/0001-wineconsole-Consistently-return-nonzero-exitcode-on-.patch rename patches/wineconsole-Forward_Exitcode/{0002-wineconsole-Forward-child-process-exitcode.patch => 0001-wineconsole-Forward-child-process-exitcode.patch} (100%) diff --git a/README.md b/README.md index 712f381e..5d3fd94e 100644 --- a/README.md +++ b/README.md @@ -142,7 +142,7 @@ for more details.* * Fix handling of opening read-only files for FILE_DELETE_ON_CLOSE ([Wine Bug #38417](https://bugs.winehq.org/show_bug.cgi?id=38417)) * Fix handling of window attributes for WS_EX_LAYERED | WS_EX_COMPOSITED ([Wine Bug #37876](https://bugs.winehq.org/show_bug.cgi?id=37876)) * Fix issues with dragging layers between images in Adobe Photoshop 7.0 ([Wine Bug #12007](https://bugs.winehq.org/show_bug.cgi?id=12007)) -* Fix loading of libraries with incomplete IMAGE_LOAD_CONFIG_DIRECTORY struct +* ~~Fix loading of libraries with incomplete IMAGE_LOAD_CONFIG_DIRECTORY struct~~ * Fix missing video introduced by pixelformat changes. ([Wine Bug #36900](https://bugs.winehq.org/show_bug.cgi?id=36900)) * Fix multithreading issues with fullscreen clipping ([Wine Bug #38087](https://bugs.winehq.org/show_bug.cgi?id=38087)) * Fix possible segfault in pulse_rd_loop of PulseAudio backend @@ -150,7 +150,7 @@ for more details.* * Fix regression caused by blacklisting supported OpenGL extensions ([Wine Bug #38480](https://bugs.winehq.org/show_bug.cgi?id=38480)) * Fix return value of ScrollWindowEx for invisible windows ([Wine Bug #37706](https://bugs.winehq.org/show_bug.cgi?id=37706)) * Fix scaling behaviour of images and mipmap levels in IDirect3DTexture2_Load (needed for example by Prezzie Hunt) -* Fix security cookie handling for UPX compressed executables ([Wine Bug #38949](https://bugs.winehq.org/show_bug.cgi?id=38949)) +* ~~Fix security cookie handling for UPX compressed executables~~ ([Wine Bug #38949](https://bugs.winehq.org/show_bug.cgi?id=38949)) * Fix texture corruption in CSI: Fatal Conspiracy ([Wine Bug #33768](https://bugs.winehq.org/show_bug.cgi?id=33768)) * Fix unintentional leaks with ntdll internals * Fix wined3d performance drop introduced by pixelformat changes. ([Wine Bug #35655](https://bugs.winehq.org/show_bug.cgi?id=35655)) diff --git a/debian/changelog b/debian/changelog index 1d2089f2..998450e0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,8 @@ wine-staging (1.7.49) UNRELEASED; urgency=low (accepted upstream). * Removed patch to add support for ThreadQuerySetWin32StartAddress info class (accepted upstream). + * Removed patch to fix security cookie handling for UPX compressed executables + (accepted upstream). -- Sebastian Lackner Wed, 29 Jul 2015 22:52:46 +0200 wine-staging (1.7.48) unstable; urgency=low diff --git a/patches/ntdll-Security_Cookie/0001-ntdll-Validate-SecurityCookie-pointer-before-derefer.patch b/patches/ntdll-Security_Cookie/0001-ntdll-Validate-SecurityCookie-pointer-before-derefer.patch deleted file mode 100644 index 916f30cb..00000000 --- a/patches/ntdll-Security_Cookie/0001-ntdll-Validate-SecurityCookie-pointer-before-derefer.patch +++ /dev/null @@ -1,30 +0,0 @@ -From e365fdbc966b3aab4dbfced4c651965cc8cd9c23 Mon Sep 17 00:00:00 2001 -From: Sebastian Lackner -Date: Tue, 21 Jul 2015 20:33:47 +0200 -Subject: ntdll: Validate SecurityCookie pointer before dereferencing. - ---- - dlls/ntdll/virtual.c | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c -index 479ca79..2fd8198 100644 ---- a/dlls/ntdll/virtual.c -+++ b/dlls/ntdll/virtual.c -@@ -1320,9 +1320,11 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz - - loadcfg = RtlImageDirectoryEntryToData( (HMODULE)ptr, TRUE, - IMAGE_DIRECTORY_ENTRY_LOAD_CONFIG, &loadcfg_size ); -- if (loadcfg && -- loadcfg_size >= offsetof(IMAGE_LOAD_CONFIG_DIRECTORY, SecurityCookie) + sizeof(loadcfg->SecurityCookie)) -+ if (loadcfg && loadcfg_size >= offsetof(IMAGE_LOAD_CONFIG_DIRECTORY, SecurityCookie) + sizeof(loadcfg->SecurityCookie) && -+ (ULONG_PTR)ptr <= loadcfg->SecurityCookie && loadcfg->SecurityCookie <= (ULONG_PTR)ptr + total_size - sizeof(ULONG_PTR)) -+ { - set_security_cookie((ULONG_PTR *)loadcfg->SecurityCookie); -+ } - - /* set the image protections */ - --- -2.4.5 - diff --git a/patches/ntdll-Security_Cookie/definition b/patches/ntdll-Security_Cookie/definition deleted file mode 100644 index eae5e5d9..00000000 --- a/patches/ntdll-Security_Cookie/definition +++ /dev/null @@ -1,2 +0,0 @@ -Fixes: Fix loading of libraries with incomplete IMAGE_LOAD_CONFIG_DIRECTORY struct -Fixes: [38949] Fix security cookie handling for UPX compressed executables diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index b11aca8c..2826460d 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -55,7 +55,7 @@ version() echo "Copyright (C) 2014-2015 the Wine Staging project authors." echo "" echo "Patchset to be applied on upstream Wine:" - echo " commit 5bd9d58016236da3142e030add2efbb2789fa2e4" + echo " commit 571462c633edbcc5dd6f2f8e56470470f27b0b07" echo "" } @@ -175,7 +175,6 @@ patch_enable_all () enable_ntdll_NtSetLdtEntries="$1" enable_ntdll_Pipe_SpecialCharacters="$1" enable_ntdll_RtlIpStringToAddress="$1" - enable_ntdll_Security_Cookie="$1" enable_ntdll_ThreadTime="$1" enable_ntdll_Threading="$1" enable_ntdll_User_Shared_Data="$1" @@ -604,9 +603,6 @@ patch_enable () ntdll-RtlIpStringToAddress) enable_ntdll_RtlIpStringToAddress="$2" ;; - ntdll-Security_Cookie) - enable_ntdll_Security_Cookie="$2" - ;; ntdll-ThreadTime) enable_ntdll_ThreadTime="$2" ;; @@ -3716,21 +3712,6 @@ if test "$enable_ntdll_RtlIpStringToAddress" -eq 1; then ) >> "$patchlist" fi -# Patchset ntdll-Security_Cookie -# | -# | This patchset fixes the following Wine bugs: -# | * [#38949] Fix security cookie handling for UPX compressed executables -# | -# | Modified files: -# | * dlls/ntdll/virtual.c -# | -if test "$enable_ntdll_Security_Cookie" -eq 1; then - patch_apply ntdll-Security_Cookie/0001-ntdll-Validate-SecurityCookie-pointer-before-derefer.patch - ( - echo '+ { "Sebastian Lackner", "ntdll: Validate SecurityCookie pointer before dereferencing.", 1 },'; - ) >> "$patchlist" -fi - # Patchset ntdll-ThreadTime # | # | This patchset fixes the following Wine bugs: @@ -4881,14 +4862,11 @@ fi # Patchset wineconsole-Forward_Exitcode # | # | Modified files: -# | * programs/wineconsole/curses.c, programs/wineconsole/user.c, programs/wineconsole/winecon_private.h, -# | programs/wineconsole/wineconsole.c +# | * programs/wineconsole/winecon_private.h, programs/wineconsole/wineconsole.c # | if test "$enable_wineconsole_Forward_Exitcode" -eq 1; then - patch_apply wineconsole-Forward_Exitcode/0001-wineconsole-Consistently-return-nonzero-exitcode-on-.patch - patch_apply wineconsole-Forward_Exitcode/0002-wineconsole-Forward-child-process-exitcode.patch + patch_apply wineconsole-Forward_Exitcode/0001-wineconsole-Forward-child-process-exitcode.patch ( - echo '+ { "Sebastian Lackner", "wineconsole: Consistently return nonzero exitcode on error.", 1 },'; echo '+ { "Michael Müller", "wineconsole: Forward child process exitcode.", 1 },'; ) >> "$patchlist" fi @@ -4917,18 +4895,6 @@ if test "$enable_wined3d_CSMT_Helper" -eq 1; then ) >> "$patchlist" fi -# Patchset wined3d-UnhandledBlendFactor -# | -# | Modified files: -# | * dlls/wined3d/state.c -# | -if test "$enable_wined3d_UnhandledBlendFactor" -eq 1; then - patch_apply wined3d-UnhandledBlendFactor/0001-wined3d-Silence-repeated-Unhandled-blend-factor-0-me.patch - ( - echo '+ { "Sebastian Lackner", "wined3d: Silence repeated '\''Unhandled blend factor 0'\'' messages.", 1 },'; - ) >> "$patchlist" -fi - # Patchset wined3d-resource_check_usage # | # | Modified files: @@ -5028,6 +4994,18 @@ if test "$enable_wined3d_Revert_PixelFormat" -eq 1; then ) >> "$patchlist" fi +# Patchset wined3d-UnhandledBlendFactor +# | +# | Modified files: +# | * dlls/wined3d/state.c +# | +if test "$enable_wined3d_UnhandledBlendFactor" -eq 1; then + patch_apply wined3d-UnhandledBlendFactor/0001-wined3d-Silence-repeated-Unhandled-blend-factor-0-me.patch + ( + echo '+ { "Sebastian Lackner", "wined3d: Silence repeated '\''Unhandled blend factor 0'\'' messages.", 1 },'; + ) >> "$patchlist" +fi + # Patchset wined3d-CSMT_Main # | # | This patchset fixes the following Wine bugs: diff --git a/patches/wineconsole-Forward_Exitcode/0001-wineconsole-Consistently-return-nonzero-exitcode-on-.patch b/patches/wineconsole-Forward_Exitcode/0001-wineconsole-Consistently-return-nonzero-exitcode-on-.patch deleted file mode 100644 index 90af5b65..00000000 --- a/patches/wineconsole-Forward_Exitcode/0001-wineconsole-Consistently-return-nonzero-exitcode-on-.patch +++ /dev/null @@ -1,117 +0,0 @@ -From 4134e0b939a4194bc961231523e381fa83806b33 Mon Sep 17 00:00:00 2001 -From: Sebastian Lackner -Date: Mon, 13 Jul 2015 20:51:29 +0200 -Subject: wineconsole: Consistently return nonzero exitcode on error. - ---- - programs/wineconsole/curses.c | 2 +- - programs/wineconsole/user.c | 2 +- - programs/wineconsole/wineconsole.c | 28 +++++++++++++++------------- - 3 files changed, 17 insertions(+), 15 deletions(-) - -diff --git a/programs/wineconsole/curses.c b/programs/wineconsole/curses.c -index 2903b80..7413c8f 100644 ---- a/programs/wineconsole/curses.c -+++ b/programs/wineconsole/curses.c -@@ -1018,7 +1018,7 @@ static int WCCURSES_MainLoop(struct inner_data* data) - - WCCURSES_Resize(data); - -- if (pipe( PRIVATE(data)->sync_pipe ) == -1) return 0; -+ if (pipe( PRIVATE(data)->sync_pipe ) == -1) return 1; - PRIVATE(data)->input_thread = CreateThread( NULL, 0, input_thread, data, 0, &id ); - - while (!data->dying && WaitForSingleObject(data->hSynchro, INFINITE) == WAIT_OBJECT_0) -diff --git a/programs/wineconsole/user.c b/programs/wineconsole/user.c -index 5c8c2c0..4725ebd 100644 ---- a/programs/wineconsole/user.c -+++ b/programs/wineconsole/user.c -@@ -1382,7 +1382,7 @@ static int WCUSER_MainLoop(struct inner_data* data) - * so GetMessage would lead to delayed processing */ - while (PeekMessageW(&msg, 0, 0, 0, PM_REMOVE)) - { -- if (msg.message == WM_QUIT) return 0; -+ if (msg.message == WM_QUIT) return 1; - WINE_TRACE("dispatching msg %04x\n", msg.message); - DispatchMessageW(&msg); - } -diff --git a/programs/wineconsole/wineconsole.c b/programs/wineconsole/wineconsole.c -index bdd5629..4ea5f84 100644 ---- a/programs/wineconsole/wineconsole.c -+++ b/programs/wineconsole/wineconsole.c -@@ -747,16 +747,18 @@ static BOOL WINECON_Spawn(struct inner_data* data, LPWSTR cmdLine) - } - - done = CreateProcessW(NULL, cmdLine, NULL, NULL, TRUE, 0L, NULL, NULL, &startup, &info); -+ if (done) -+ { -+ CloseHandle(info.hProcess); -+ CloseHandle(info.hThread); -+ } - - /* we no longer need the handles passed to the child for the console */ - CloseHandle(startup.hStdInput); - CloseHandle(startup.hStdOutput); - CloseHandle(startup.hStdError); - -- CloseHandle(info.hProcess); -- CloseHandle(info.hThread); -- -- return done; -+ return !done; - } - - struct wc_init { -@@ -852,9 +854,9 @@ int PASCAL WinMain(HINSTANCE hInst, HINSTANCE hPrev, LPSTR lpCmdLine, INT nCmdSh - { - case from_event: - /* case of wineconsole , signal process that created us that we're up and running */ -- if (!(data = WINECON_Init(hInst, 0, NULL, wci.backend, nCmdShow))) return 0; -- ret = SetEvent(wci.event); -- if (!ret) WINE_ERR("SetEvent failed.\n"); -+ if (!(data = WINECON_Init(hInst, 0, NULL, wci.backend, nCmdShow))) return 1; -+ ret = !SetEvent(wci.event); -+ if (ret != 0) WINE_ERR("SetEvent failed.\n"); - break; - case from_process_name: - { -@@ -865,30 +867,30 @@ int PASCAL WinMain(HINSTANCE hInst, HINSTANCE hPrev, LPSTR lpCmdLine, INT nCmdSh - - buffer = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - if (!buffer) -- return 0; -+ return 1; - - MultiByteToWideChar(CP_ACP, 0, wci.ptr, -1, buffer, len); - - if (!(data = WINECON_Init(hInst, GetCurrentProcessId(), buffer, wci.backend, nCmdShow))) - { - HeapFree(GetProcessHeap(), 0, buffer); -- return 0; -+ return 1; - } - ret = WINECON_Spawn(data, buffer); - HeapFree(GetProcessHeap(), 0, buffer); -- if (!ret) -+ if (ret != 0) - { - WINECON_Delete(data); - printf_res(IDS_CMD_LAUNCH_FAILED, wine_dbgstr_a(wci.ptr)); -- return 0; -+ return ret; - } - } - break; - default: -- return 0; -+ return 1; - } - -- if (ret) -+ if (!ret) - { - WINE_TRACE("calling MainLoop.\n"); - ret = data->fnMainLoop(data); --- -2.4.5 - diff --git a/patches/wineconsole-Forward_Exitcode/0002-wineconsole-Forward-child-process-exitcode.patch b/patches/wineconsole-Forward_Exitcode/0001-wineconsole-Forward-child-process-exitcode.patch similarity index 100% rename from patches/wineconsole-Forward_Exitcode/0002-wineconsole-Forward-child-process-exitcode.patch rename to patches/wineconsole-Forward_Exitcode/0001-wineconsole-Forward-child-process-exitcode.patch diff --git a/patches/wined3d-CSMT_Main/9999-IfDefined.patch b/patches/wined3d-CSMT_Main/9999-IfDefined.patch index 96742aa5..84360500 100644 --- a/patches/wined3d-CSMT_Main/9999-IfDefined.patch +++ b/patches/wined3d-CSMT_Main/9999-IfDefined.patch @@ -396,7 +396,7 @@ diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c new_source = FOGSOURCE_COORD; gl_info->gl_ops.gl.p_glFogi(GL_FOG_MODE, GL_LINEAR); checkGLcall("glFogi(GL_FOG_MODE, GL_LINEAR)"); -@@ -1644,7 +1672,11 @@ +@@ -1650,7 +1678,11 @@ if (state->render_states[WINED3D_RS_SLOPESCALEDEPTHBIAS] || state->render_states[WINED3D_RS_DEPTHBIAS]) { @@ -408,7 +408,7 @@ diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c float scale; union -@@ -4178,9 +4210,15 @@ +@@ -4187,9 +4219,15 @@ } } } else { @@ -424,7 +424,7 @@ diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c WARN("unsupported blending in openGl\n"); } } -@@ -4534,7 +4572,11 @@ +@@ -4543,7 +4581,11 @@ static void viewport_miscpart(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { @@ -436,7 +436,7 @@ diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c const struct wined3d_gl_info *gl_info = context->gl_info; struct wined3d_viewport vp = state->viewport; -@@ -4712,7 +4754,11 @@ +@@ -4721,7 +4763,11 @@ } else { @@ -448,7 +448,7 @@ diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c UINT height; UINT width; -@@ -4776,7 +4822,11 @@ +@@ -4785,7 +4831,11 @@ void state_srgbwrite(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { @@ -1152,7 +1152,7 @@ diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c -@@ -3626,7 +3626,11 @@ +@@ -3720,7 +3720,11 @@ float y_offset = context->render_offscreen ? (center_offset - (2.0f * y) - h) / h : (center_offset - (2.0f * y) - h) / -h; @@ -1164,7 +1164,7 @@ diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c state->render_states[WINED3D_RS_ZENABLE] : WINED3D_ZB_FALSE; float z_scale = zenable ? 2.0f : 0.0f; float z_offset = zenable ? -1.0f : 0.0f; -@@ -3749,6 +3753,7 @@ +@@ -3843,6 +3847,7 @@ /* case WINED3D_TTFF_COUNT1: Won't ever get here. */ case WINED3D_TTFF_COUNT2: mat._13 = mat._23 = mat._33 = mat._43 = 0.0f; @@ -1172,7 +1172,7 @@ diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c /* OpenGL divides the first 3 vertex coord by the 4th by default, * which is essentially the same as D3DTTFF_PROJECTED. Make sure that * the 4th coord evaluates to 1.0 to eliminate that. -@@ -3761,6 +3766,20 @@ +@@ -3855,6 +3860,20 @@ * A more serious problem occurs if the app passes 4 coordinates in, and the * 4th is != 1.0(opengl default). This would have to be fixed in draw_strided_slow * or a replacement shader. */ @@ -1193,7 +1193,7 @@ diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c default: mat._14 = mat._24 = mat._34 = 0.0f; mat._44 = 1.0f; } -@@ -4216,7 +4235,11 @@ +@@ -4310,7 +4329,11 @@ unsigned int i; DWORD ttff; DWORD cop, aop, carg0, carg1, carg2, aarg0, aarg1, aarg2; @@ -1899,7 +1899,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h void context_apply_fbo_state_blit(struct wined3d_context *context, GLenum target, struct wined3d_surface *render_target, struct wined3d_surface *depth_stencil, DWORD location) DECLSPEC_HIDDEN; void context_active_texture(struct wined3d_context *context, const struct wined3d_gl_info *gl_info, -@@ -2002,7 +2061,11 @@ +@@ -2004,7 +2063,11 @@ struct wined3d_state { DWORD flags; @@ -1911,7 +1911,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h struct wined3d_vertex_declaration *vertex_declaration; struct wined3d_stream_output stream_output[MAX_STREAM_OUT]; -@@ -2047,6 +2110,7 @@ +@@ -2049,6 +2112,7 @@ DWORD render_states[WINEHIGHEST_RENDER_STATE + 1]; }; @@ -1919,7 +1919,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h struct wined3d_gl_bo { GLuint name; -@@ -2055,6 +2119,7 @@ +@@ -2057,6 +2121,7 @@ UINT size; }; @@ -1927,7 +1927,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h #define WINED3D_UNMAPPED_STAGE ~0U /* Multithreaded flag. Removed from the public header to signal that -@@ -2110,11 +2175,23 @@ +@@ -2112,11 +2177,23 @@ struct wined3d_rendertarget_view *back_buffer_view; struct wined3d_swapchain **swapchains; UINT swapchain_count; @@ -1951,7 +1951,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h /* For rendering to a texture using glCopyTexImage */ GLuint depth_blt_texture; -@@ -2125,6 +2202,9 @@ +@@ -2127,6 +2204,9 @@ UINT xScreenSpace; UINT yScreenSpace; UINT cursorWidth, cursorHeight; @@ -1961,7 +1961,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h HCURSOR hardwareCursor; /* The Wine logo texture */ -@@ -2156,6 +2236,7 @@ +@@ -2158,6 +2238,7 @@ 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; @@ -1969,7 +1969,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h void device_invalidate_state(const struct wined3d_device *device, DWORD state) DECLSPEC_HIDDEN; void device_invalidate_shader_constants(const struct wined3d_device *device, DWORD mask) DECLSPEC_HIDDEN; void device_exec_update_texture(struct wined3d_context *context, struct wined3d_texture *src_texture, -@@ -2167,6 +2248,11 @@ +@@ -2169,6 +2250,11 @@ void device_create_dummy_textures(struct wined3d_device *device, struct wined3d_context *context) DECLSPEC_HIDDEN; void device_delete_opengl_contexts_cs(struct wined3d_device *device, struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; @@ -1981,7 +1981,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h static inline BOOL isStateDirty(const struct wined3d_context *context, DWORD state) { -@@ -2183,9 +2269,11 @@ +@@ -2185,9 +2271,11 @@ ULONG (*resource_incref)(struct wined3d_resource *resource); ULONG (*resource_decref)(struct wined3d_resource *resource); void (*resource_unload)(struct wined3d_resource *resource); @@ -1993,7 +1993,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h }; struct wined3d_resource -@@ -2210,6 +2298,7 @@ +@@ -2212,6 +2300,7 @@ UINT depth; UINT size; DWORD priority; @@ -2001,7 +2001,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h void *heap_memory, *map_heap_memory, *user_memory, *bitmap_data; UINT custom_row_pitch, custom_slice_pitch; struct wined3d_gl_bo *buffer, *map_buffer; -@@ -2217,6 +2306,10 @@ +@@ -2219,6 +2308,10 @@ DWORD locations; LONG access_fence; BOOL unmap_dirtify; @@ -2012,7 +2012,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h void *parent; const struct wined3d_parent_ops *parent_ops; -@@ -2241,6 +2334,7 @@ +@@ -2243,6 +2336,7 @@ void *parent, const struct wined3d_parent_ops *parent_ops, const struct wined3d_resource_ops *resource_ops) DECLSPEC_HIDDEN; void resource_unload(struct wined3d_resource *resource) DECLSPEC_HIDDEN; @@ -2020,7 +2020,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h DWORD wined3d_resource_access_from_location(DWORD location) DECLSPEC_HIDDEN; BOOL wined3d_resource_allocate_sysmem(struct wined3d_resource *resource) DECLSPEC_HIDDEN; void wined3d_resource_changed(struct wined3d_resource *resource, -@@ -2289,6 +2383,15 @@ +@@ -2291,6 +2385,15 @@ { while(InterlockedCompareExchange(&resource->access_fence, 0, 0)); } @@ -2036,7 +2036,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h /* Tests show that the start address of resources is 32 byte aligned */ #define RESOURCE_ALIGNMENT 16 -@@ -2373,7 +2476,9 @@ +@@ -2375,7 +2478,9 @@ void wined3d_texture_apply_sampler_desc(struct wined3d_texture *texture, const struct wined3d_sampler_desc *sampler_desc, const struct wined3d_gl_info *gl_info) DECLSPEC_HIDDEN; @@ -2046,7 +2046,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h void wined3d_texture_bind(struct wined3d_texture *texture, struct wined3d_context *context, BOOL srgb) DECLSPEC_HIDDEN; void wined3d_texture_bind_and_dirtify(struct wined3d_texture *texture, -@@ -2407,9 +2512,16 @@ +@@ -2409,9 +2514,16 @@ struct wined3d_resource resource; struct wined3d_texture *container; @@ -2063,7 +2063,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h }; static inline struct wined3d_volume *volume_from_resource(struct wined3d_resource *resource) -@@ -2417,6 +2529,7 @@ +@@ -2419,6 +2531,7 @@ return CONTAINING_RECORD(resource, struct wined3d_volume, resource); } @@ -2071,7 +2071,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h HRESULT wined3d_volume_create(struct wined3d_texture *container, const struct wined3d_resource_desc *desc, unsigned int level, struct wined3d_volume **volume) DECLSPEC_HIDDEN; void wined3d_volume_destroy(struct wined3d_volume *volume) DECLSPEC_HIDDEN; -@@ -2429,6 +2542,24 @@ +@@ -2431,6 +2544,24 @@ struct wined3d_surface_dib { HBITMAP DIBsection; @@ -2096,7 +2096,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h UINT bitmap_size; }; -@@ -2454,7 +2585,11 @@ +@@ -2456,7 +2587,11 @@ struct wined3d_surface_ops { HRESULT (*surface_private_setup)(struct wined3d_surface *surface); @@ -2108,7 +2108,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h }; struct wined3d_surface -@@ -2462,12 +2597,26 @@ +@@ -2464,12 +2599,26 @@ struct wined3d_resource resource; const struct wined3d_surface_ops *surface_ops; struct wined3d_texture *container; @@ -2135,7 +2135,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h GLuint rb_multisample; GLuint rb_resolved; GLenum texture_target; -@@ -2511,10 +2660,19 @@ +@@ -2513,10 +2662,19 @@ GLenum surface_get_gl_buffer(const struct wined3d_surface *surface) DECLSPEC_HIDDEN; void surface_get_drawable_size(const struct wined3d_surface *surface, const struct wined3d_context *context, unsigned int *width, unsigned int *height) DECLSPEC_HIDDEN; @@ -2155,7 +2155,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h void surface_modify_ds_location(struct wined3d_surface *surface, DWORD location, UINT w, UINT h) DECLSPEC_HIDDEN; void surface_prepare_rb(struct wined3d_surface *surface, const struct wined3d_gl_info *gl_info, BOOL multisample) DECLSPEC_HIDDEN; -@@ -2526,6 +2684,7 @@ +@@ -2528,6 +2686,7 @@ const struct wined3d_gl_info *gl_info, void *mem, unsigned int pitch) DECLSPEC_HIDDEN; HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const POINT *dst_point, struct wined3d_surface *src_surface, const RECT *src_rect) DECLSPEC_HIDDEN; @@ -2163,7 +2163,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h HRESULT wined3d_surface_create(struct wined3d_texture *container, const struct wined3d_resource_desc *desc, GLenum target, unsigned int level, unsigned int layer, DWORD flags, struct wined3d_surface **surface) DECLSPEC_HIDDEN; -@@ -2544,6 +2703,21 @@ +@@ -2546,6 +2705,21 @@ void draw_textured_quad(const struct wined3d_surface *src_surface, struct wined3d_context *context, const RECT *src_rect, const RECT *dst_rect, enum wined3d_texture_filter_type filter) DECLSPEC_HIDDEN; void surface_flip(struct wined3d_surface *front, struct wined3d_surface *back) DECLSPEC_HIDDEN; @@ -2185,7 +2185,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h /* Surface flags: */ #define SFLAG_DIBSECTION 0x00000001 /* Has a DIB section attached for GetDC. */ -@@ -2591,8 +2765,10 @@ +@@ -2593,8 +2767,10 @@ BOOL half_float_conv_needed; }; @@ -2196,7 +2196,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h struct wined3d_saved_states { DWORD transform[(HIGHEST_TRANSFORMSTATE >> 5) + 1]; -@@ -2660,6 +2836,7 @@ +@@ -2662,6 +2838,7 @@ void stateblock_init_contained_states(struct wined3d_stateblock *stateblock) DECLSPEC_HIDDEN; void state_cleanup(struct wined3d_state *state) DECLSPEC_HIDDEN; @@ -2204,7 +2204,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h HRESULT state_init(struct wined3d_state *state, const struct wined3d_gl_info *gl_info, const struct wined3d_d3d_info *d3d_info, DWORD flags) DECLSPEC_HIDDEN; void state_unbind_resources(struct wined3d_state *state) DECLSPEC_HIDDEN; -@@ -2710,6 +2887,32 @@ +@@ -2712,6 +2889,32 @@ void wined3d_cs_destroy(struct wined3d_cs *cs) DECLSPEC_HIDDEN; void wined3d_cs_switch_onscreen_ds(struct wined3d_cs *cs, struct wined3d_context *context, struct wined3d_surface *depth_stencil) DECLSPEC_HIDDEN; @@ -2237,7 +2237,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h void wined3d_cs_emit_clear(struct wined3d_cs *cs, DWORD rect_count, const RECT *rects, DWORD flags, const struct wined3d_color *color, float depth, DWORD stencil) DECLSPEC_HIDDEN; -@@ -2759,6 +2962,7 @@ +@@ -2761,6 +2964,7 @@ void wined3d_cs_emit_set_vertex_declaration(struct wined3d_cs *cs, struct wined3d_vertex_declaration *declaration) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_viewport(struct wined3d_cs *cs, const struct wined3d_viewport *viewport) DECLSPEC_HIDDEN; @@ -2245,7 +2245,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h void wined3d_cs_emit_set_consts_f(struct wined3d_cs *cs, UINT start_register, const float *constants, UINT vector4f_count, enum wined3d_shader_type type) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_consts_b(struct wined3d_cs *cs, UINT start_register, -@@ -2818,6 +3022,7 @@ +@@ -2820,6 +3024,7 @@ struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; void wined3d_cs_emit_getdc(struct wined3d_cs *cs, struct wined3d_surface *surface) DECLSPEC_HIDDEN; void wined3d_cs_emit_releasedc(struct wined3d_cs *cs, struct wined3d_surface *surface) DECLSPEC_HIDDEN; @@ -2253,7 +2253,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h /* Direct3D terminology with little modifications. We do not have an issued state * because only the driver knows about it, but we have a created state because d3d -@@ -2832,8 +3037,12 @@ +@@ -2834,8 +3039,12 @@ struct wined3d_query_ops { HRESULT (*query_get_data)(struct wined3d_query *query, void *data, DWORD data_size, DWORD flags); @@ -2266,7 +2266,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h }; struct wined3d_query -@@ -2847,12 +3056,16 @@ +@@ -2849,12 +3058,16 @@ enum wined3d_query_type type; DWORD data_size; void *extendedData; @@ -2283,7 +2283,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h /* TODO: Add tests and support for FLOAT16_4 POSITIONT, D3DCOLOR position, other * fixed function semantics as D3DCOLOR or FLOAT16 */ -@@ -2879,7 +3092,9 @@ +@@ -2881,7 +3094,9 @@ GLenum buffer_object_usage; GLenum buffer_type_hint; DWORD flags; @@ -2293,7 +2293,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h void *map_ptr; struct wined3d_map_range *maps; -@@ -2904,11 +3119,15 @@ +@@ -2906,11 +3121,15 @@ BYTE *buffer_get_sysmem(struct wined3d_buffer *This, struct wined3d_context *context) DECLSPEC_HIDDEN; void buffer_internal_preload(struct wined3d_buffer *buffer, struct wined3d_context *context, const struct wined3d_state *state) DECLSPEC_HIDDEN; @@ -2309,7 +2309,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h struct wined3d_rendertarget_view { -@@ -2947,8 +3166,10 @@ +@@ -2949,8 +3168,10 @@ return surface_from_resource(resource); } @@ -2320,7 +2320,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h struct wined3d_shader_resource_view { LONG refcount; -@@ -2961,8 +3182,12 @@ +@@ -2963,8 +3184,12 @@ struct wined3d_swapchain_ops { void (*swapchain_present)(struct wined3d_swapchain *swapchain, const RECT *src_rect, @@ -2333,7 +2333,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h }; struct wined3d_swapchain -@@ -3002,8 +3227,10 @@ +@@ -3004,8 +3229,10 @@ HDC swapchain_get_backup_dc(struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; void swapchain_update_draw_bindings(struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; void swapchain_update_render_to_fbo(struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; @@ -2344,7 +2344,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h /***************************************************************************** * Utility function prototypes -@@ -3207,7 +3434,9 @@ +@@ -3209,7 +3436,9 @@ void shader_generate_main(const struct wined3d_shader *shader, struct wined3d_string_buffer *buffer, const struct wined3d_shader_reg_maps *reg_maps, const DWORD *byte_code, void *backend_ctx) DECLSPEC_HIDDEN; BOOL shader_match_semantic(const char *semantic_name, enum wined3d_decl_usage usage) DECLSPEC_HIDDEN; @@ -4752,7 +4752,7 @@ diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c struct wined3d_cs_set_consts_f { enum wined3d_cs_op opcode; -@@ -2762,190 +2822,963 @@ +@@ -2763,190 +2823,964 @@ /* WINED3D_CS_OP_NOP */ wined3d_cs_exec_nop, /* WINED3D_CS_OP_SKIP */ wined3d_cs_exec_skip, /* WINED3D_CS_OP_FENCE */ wined3d_cs_exec_fence, @@ -5105,7 +5105,8 @@ diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c + device_invalidate_state(device, STATE_RENDER(WINED3D_RS_STENCILWRITEMASK)); + device_invalidate_state(device, STATE_RENDER(WINED3D_RS_DEPTHBIAS)); + } -+ else if (prev && prev->format->depth_size != op->view->format->depth_size) ++ else if (prev && (prev->format_flags & WINED3DFMT_FLAG_FLOAT) ++ != (op->view->format_flags & WINED3DFMT_FLAG_FLOAT)) + { + device_invalidate_state(device, STATE_RENDER(WINED3D_RS_DEPTHBIAS)); + } @@ -5869,7 +5870,7 @@ diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c } static const struct wined3d_cs_ops wined3d_cs_mt_ops = -@@ -3173,5 +4006,80 @@ +@@ -3174,5 +4008,80 @@ ERR("Closing event failed.\n"); }