From b727968b457a3c64c16bfe5cf32955592c3d8ebc Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Tue, 9 Aug 2016 20:42:49 +0200 Subject: [PATCH] Rebase against ba858c28fd489a812ea0f55a11680a8edaf99ce5. --- ...void-misleading-indentation-warnings.patch | 248 ------------------ ...-stubs-for-ObReferenceObjectByPointe.patch | 66 ++--- patches/patchinstall.sh | 13 +- ...e-the-framebuffer-into-wined3d_state.patch | 100 +++---- .../wined3d-CSMT_Main/9999-IfDefined.patch | 20 +- 5 files changed, 83 insertions(+), 364 deletions(-) delete mode 100644 patches/Compiler_Warnings/0002-dwrite-tests-Avoid-misleading-indentation-warnings.patch diff --git a/patches/Compiler_Warnings/0002-dwrite-tests-Avoid-misleading-indentation-warnings.patch b/patches/Compiler_Warnings/0002-dwrite-tests-Avoid-misleading-indentation-warnings.patch deleted file mode 100644 index 1af943c8..00000000 --- a/patches/Compiler_Warnings/0002-dwrite-tests-Avoid-misleading-indentation-warnings.patch +++ /dev/null @@ -1,248 +0,0 @@ -From 41ec9334edb0453cbc979d7655b430061af02dbb Mon Sep 17 00:00:00 2001 -From: Sebastian Lackner -Date: Sat, 30 Jul 2016 23:54:51 +0200 -Subject: dwrite/tests: Avoid misleading indentation warnings. - ---- - dlls/dwrite/tests/analyzer.c | 2 ++ - dlls/dwrite/tests/font.c | 28 ++++++++++++++++++++++++++++ - dlls/dwrite/tests/layout.c | 14 ++++++++++++++ - 3 files changed, 44 insertions(+) - -diff --git a/dlls/dwrite/tests/analyzer.c b/dlls/dwrite/tests/analyzer.c -index 1e3b318..ddd3584 100644 ---- a/dlls/dwrite/tests/analyzer.c -+++ b/dlls/dwrite/tests/analyzer.c -@@ -1167,7 +1167,9 @@ static void test_GetScriptProperties(void) - ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); - - if (0) /* crashes on native */ -+{ - hr = IDWriteTextAnalyzer1_GetScriptProperties(analyzer1, sa, NULL); -+} - - sa.script = 0; - hr = IDWriteTextAnalyzer1_GetScriptProperties(analyzer1, sa, &props); -diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c -index 3b402b8..5691388 100644 ---- a/dlls/dwrite/tests/font.c -+++ b/dlls/dwrite/tests/font.c -@@ -842,8 +842,10 @@ static void test_CreateFontFromLOGFONT(void) - EXPECT_HR(hr, S_OK); - - if (0) -+{ - /* null out parameter crashes this call */ - hr = IDWriteGdiInterop_CreateFontFromLOGFONT(interop, NULL, NULL); -+} - - font = (void*)0xdeadbeef; - hr = IDWriteGdiInterop_CreateFontFromLOGFONT(interop, NULL, &font); -@@ -1013,7 +1015,9 @@ static void test_CreateBitmapRenderTarget(void) - EXPECT_HR(hr, S_OK); - - if (0) /* crashes on native */ -+{ - hr = IDWriteBitmapRenderTarget_GetSize(target, NULL); -+} - - size.cx = size.cy = -1; - hr = IDWriteBitmapRenderTarget_GetSize(target, &size); -@@ -1159,7 +1163,9 @@ if (0) /* crashes on native */ - - /* transform tests, current hdc transform is not immediately affected */ - if (0) /* crashes on native */ -+{ - hr = IDWriteBitmapRenderTarget_GetCurrentTransform(target, NULL); -+} - - memset(&m, 0xcc, sizeof(m)); - hr = IDWriteBitmapRenderTarget_GetCurrentTransform(target, &m); -@@ -1406,7 +1412,9 @@ static void test_GetFamilyNames(void) - EXPECT_HR(hr, S_OK); - - if (0) /* crashes on native */ -+{ - hr = IDWriteFontFamily_GetFamilyNames(family, NULL); -+} - - hr = IDWriteFontFamily_GetFamilyNames(family, &names); - ok(hr == S_OK, "got 0x%08x\n", hr); -@@ -1421,7 +1429,9 @@ if (0) /* crashes on native */ - - /* GetStringLength */ - if (0) /* crashes on native */ -+{ - hr = IDWriteLocalizedStrings_GetStringLength(names, 0, NULL); -+} - - len = 100; - hr = IDWriteLocalizedStrings_GetStringLength(names, 10, &len); -@@ -1441,7 +1451,9 @@ if (0) /* crashes on native */ - ok(hr == E_FAIL, "got 0x%08x\n", hr); - - if (0) -+{ - hr = IDWriteLocalizedStrings_GetString(names, 0, NULL, 100); -+} - - buffer[0] = 1; - hr = IDWriteLocalizedStrings_GetString(names, 10, buffer, 100); -@@ -1513,7 +1525,9 @@ static void test_CreateFontFace(void) - ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); - - if (0) /* crashes on native */ -+{ - hr = IDWriteFont_CreateFontFace(font, NULL); -+} - - fontface = NULL; - hr = IDWriteFont_CreateFontFace(font, &fontface); -@@ -1846,7 +1860,9 @@ static void test_GetMetrics(void) - DeleteObject(hfont); - - if (0) /* crashes on native */ -+{ - IDWriteFont_GetMetrics(font, NULL); -+} - - memset(&metrics, 0, sizeof(metrics)); - IDWriteFont_GetMetrics(font, &metrics); -@@ -2649,7 +2665,9 @@ if (0) { /* crashes on win10 */ - todo_wine - ok(hr == S_OK, "got 0x%08x\n", hr); - if (face2) -+{ - IDWriteFontFace_Release(face2); -+} - - file2 = NULL; - hr = IDWriteFactory_CreateCustomFontFileReference(factory, &fontrsrc, sizeof(HRSRC), &rloader, &file2); -@@ -2682,7 +2700,9 @@ if (face2) - ok(indices[1] == 11, "got index %i\n", indices[1]); - - if (0) /* crashes on native */ -+{ - hr = IDWriteFontFace_GetGlyphIndices(face, NULL, 1, NULL); -+} - - hr = IDWriteFontFace_GetGlyphIndices(face, codePoints, 1, indices); - ok(hr == S_OK, "got 0x%08x\n", hr); -@@ -4130,7 +4150,9 @@ static void test_GetKerningPairAdjustments(void) - ok(hr == E_INVALIDARG || broken(hr == S_OK) /* win8 */, "got 0x%08x\n", hr); - - if (0) /* crashes on native */ -+ { - hr = IDWriteFontFace1_GetKerningPairAdjustments(fontface1, 1, NULL, NULL); -+ } - - adjustments[0] = 1; - hr = IDWriteFontFace1_GetKerningPairAdjustments(fontface1, 1, NULL, adjustments); -@@ -4837,7 +4859,9 @@ static void test_GetGdiCompatibleMetrics_face(IDWriteFontFace *face) - expected.subscriptSizeY = round(round(design_metrics1.subscriptSizeY * scale) / scale); - expected.superscriptPositionX = round(round(design_metrics1.superscriptPositionX * scale) / scale); - if (0) /* this fails for 3 emsizes, Tahoma from [5, 2048] range */ -+ { - expected.superscriptPositionY = round(round(design_metrics1.superscriptPositionY * scale) / scale); -+ } - expected.superscriptSizeX = round(round(design_metrics1.superscriptSizeX * scale) / scale); - expected.superscriptSizeY = round(round(design_metrics1.superscriptSizeY * scale) / scale); - expected.hasTypographicMetrics = design_metrics1.hasTypographicMetrics; -@@ -4904,7 +4928,9 @@ static void test_GetPanose(void) - DWRITE_PANOSE panose; - - if (0) /* crashes on native */ -+ { - IDWriteFont1_GetPanose(font1, NULL); -+ } - - memset(&panose, 0, sizeof(panose)); - IDWriteFont1_GetPanose(font1, &panose); -@@ -5211,8 +5237,10 @@ static void test_GetRecommendedRenderingMode(void) - win_skip("IDWriteFontFace3::GetRecommendedRenderingMode() is not supported.\n"); - - if (0) /* crashes on native */ -+{ - hr = IDWriteFontFace_GetRecommendedRenderingMode(fontface, 3.0, 1.0, - DWRITE_MEASURING_MODE_GDI_CLASSIC, NULL, NULL); -+} - - mode = 10; - hr = IDWriteFontFace_GetRecommendedRenderingMode(fontface, 3.0, 1.0, -diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c -index 03038d8..d92d419 100644 ---- a/dlls/dwrite/tests/layout.c -+++ b/dlls/dwrite/tests/layout.c -@@ -983,7 +983,9 @@ static void test_CreateTextFormat(void) - ok(hr == S_OK, "got 0x%08x\n", hr); - - if (0) /* crashes on native */ -+{ - hr = IDWriteTextFormat_GetFontCollection(format, NULL); -+} - - collection = NULL; - hr = IDWriteTextFormat_GetFontCollection(format, &collection); -@@ -2235,7 +2237,9 @@ static void test_SetLocaleName(void) - ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); - - if (0) /* crashes on native */ -+{ - hr = IDWriteTextLayout_GetLocaleName(layout, 0, NULL, 1, NULL); -+} - - buffW[0] = 0; - range.length = 0; -@@ -2447,7 +2451,9 @@ static void test_fallback(void) - } - - if (0) /* crashes on native */ -+{ - hr = IDWriteTextLayout2_GetFontFallback(layout2, NULL); -+} - - fallback = (void*)0xdeadbeef; - hr = IDWriteTextLayout2_GetFontFallback(layout2, &fallback); -@@ -4371,7 +4377,9 @@ todo_wine { - todo_wine - ok(font != NULL, "got %p\n", font); - if (font) -+{ - IDWriteFont_Release(font); -+} - - /* same latin text, full length */ - g_source = strW; -@@ -4388,7 +4396,9 @@ todo_wine { - todo_wine - ok(font != NULL, "got %p\n", font); - if (font) -+{ - IDWriteFont_Release(font); -+} - - /* string 'a\x3058b' */ - g_source = str2W; -@@ -4405,7 +4415,9 @@ todo_wine { - todo_wine - ok(font != NULL, "got %p\n", font); - if (font) -+{ - IDWriteFont_Release(font); -+} - - g_source = str2W; - mappedlength = 0; -@@ -4545,7 +4557,9 @@ static void test_FontFallbackBuilder(void) - ok(hr == S_OK, "got 0x%08x\n", hr); - - if (0) /* crashes on native */ -+{ - hr = IDWriteFontFallbackBuilder_CreateFontFallback(builder, NULL); -+} - - hr = IDWriteFontFallbackBuilder_CreateFontFallback(builder, &fallback); - ok(hr == S_OK, "got 0x%08x\n", hr); --- -2.9.0 - diff --git a/patches/ntoskrnl-Stubs/0004-ntoskrnl.exe-Add-stubs-for-ObReferenceObjectByPointe.patch b/patches/ntoskrnl-Stubs/0004-ntoskrnl.exe-Add-stubs-for-ObReferenceObjectByPointe.patch index 61a72a6e..bac6bde9 100644 --- a/patches/ntoskrnl-Stubs/0004-ntoskrnl.exe-Add-stubs-for-ObReferenceObjectByPointe.patch +++ b/patches/ntoskrnl-Stubs/0004-ntoskrnl.exe-Add-stubs-for-ObReferenceObjectByPointe.patch @@ -1,26 +1,25 @@ -From 7bab64e071904df31e980969a19a231099cfd6c0 Mon Sep 17 00:00:00 2001 +From 5761c59c44922f139eeb9fdc873ad52cf2b75e02 Mon Sep 17 00:00:00 2001 From: Alexander Morozov Date: Fri, 30 Jan 2015 00:01:37 +0100 -Subject: ntoskrnl.exe: Add stubs for ObReferenceObjectByPointer and - ObDereferenceObject. +Subject: ntoskrnl.exe: Add stub for ObReferenceObjectByPointer. --- - dlls/ntoskrnl.exe/ntoskrnl.c | 24 +++++++++++++++++++++++- - dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 4 ++-- - include/ddk/wdm.h | 2 ++ - 3 files changed, 27 insertions(+), 3 deletions(-) + dlls/ntoskrnl.exe/ntoskrnl.c | 13 +++++++++++++ + dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- + include/ddk/wdm.h | 1 + + 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c -index 702cde7..3d22563 100644 +index b2b900c..8db5bf0 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c -@@ -2067,6 +2067,28 @@ NTSTATUS WINAPI ObReferenceObjectByName( UNICODE_STRING *ObjectName, +@@ -2192,6 +2192,19 @@ NTSTATUS WINAPI ObReferenceObjectByName( UNICODE_STRING *ObjectName, /*********************************************************************** + * ObReferenceObjectByPointer (NTOSKRNL.EXE.@) + */ -+NTSTATUS WINAPI ObReferenceObjectByPointer(VOID *obj, ACCESS_MASK access, ++NTSTATUS WINAPI ObReferenceObjectByPointer(void *obj, ACCESS_MASK access, + POBJECT_TYPE type, + KPROCESSOR_MODE mode) +{ @@ -31,40 +30,13 @@ index 702cde7..3d22563 100644 + + +/*********************************************************************** -+ * ObDereferenceObject (NTOSKRNL.EXE.@) -+ */ -+void WINAPI ObDereferenceObject(VOID *obj) -+{ -+ FIXME("(%p): stub\n", obj); -+} -+ -+ -+/*********************************************************************** - * ObfReferenceObject (NTOSKRNL.EXE.@) + * ObDereferenceObject (NTOSKRNL.EXE.@) */ - #ifdef DEFINE_FASTCALL1_ENTRYPOINT -@@ -2090,7 +2112,7 @@ void WINAPI __regs_ObfDereferenceObject( void *obj ) - void WINAPI ObfDereferenceObject( void *obj ) - #endif - { -- FIXME( "(%p): stub\n", obj ); -+ ObDereferenceObject( obj ); - } - - + void WINAPI ObDereferenceObject( void *obj ) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec -index 1a19fd5..acc1713 100644 +index 8ff5d49..702dde0 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec -@@ -798,7 +798,7 @@ - @ stub ObCloseHandle - @ stub ObCreateObject - @ stub ObCreateObjectType --@ stub ObDereferenceObject -+@ stdcall ObDereferenceObject(ptr) - @ stub ObDereferenceSecurityDescriptor - @ stub ObFindHandleForObject - @ stub ObGetObjectSecurity @@ -811,7 +811,7 @@ @ stub ObQueryObjectAuditingByHandle @ stdcall ObReferenceObjectByHandle(long long ptr long ptr ptr) @@ -75,19 +47,17 @@ index 1a19fd5..acc1713 100644 @ stub ObReleaseObjectSecurity @ stub ObSetHandleAttributes diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h -index f5efc59..fceb4b2 100644 +index 7d7fd73..60136ce 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h -@@ -1252,7 +1252,9 @@ PMDL WINAPI MmAllocatePagesForMdl(PHYSICAL_ADDRESS,PHYSICAL_ADDRESS,PHYSICA - void WINAPI MmFreeNonCachedMemory(PVOID,SIZE_T); - MM_SYSTEMSIZE WINAPI MmQuerySystemSize(void); - -+void WINAPI ObDereferenceObject(VOID*); +@@ -1255,6 +1255,7 @@ MM_SYSTEMSIZE WINAPI MmQuerySystemSize(void); + void WINAPI ObDereferenceObject(void*); NTSTATUS WINAPI ObReferenceObjectByHandle(HANDLE,ACCESS_MASK,POBJECT_TYPE,KPROCESSOR_MODE,PVOID*,POBJECT_HANDLE_INFORMATION); -+NTSTATUS WINAPI ObReferenceObjectByPointer(VOID*,ACCESS_MASK,POBJECT_TYPE,KPROCESSOR_MODE); + NTSTATUS WINAPI ObReferenceObjectByName(UNICODE_STRING*,ULONG,ACCESS_STATE*,ACCESS_MASK,POBJECT_TYPE,KPROCESSOR_MODE,void*,void**); ++NTSTATUS WINAPI ObReferenceObjectByPointer(void*,ACCESS_MASK,POBJECT_TYPE,KPROCESSOR_MODE); POWER_STATE WINAPI PoSetPowerState(PDEVICE_OBJECT,POWER_STATE_TYPE,POWER_STATE); NTSTATUS WINAPI PsCreateSystemThread(PHANDLE,ULONG,POBJECT_ATTRIBUTES,HANDLE,PCLIENT_ID,PKSTART_ROUTINE,PVOID); -- -2.7.1 +2.9.0 diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 509aae19..77ede01e 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -51,7 +51,7 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "84b3218ed6ad5975f537481edf2f61fb26bedb8b" + echo "ba858c28fd489a812ea0f55a11680a8edaf99ce5" } # Show version information @@ -2329,10 +2329,9 @@ fi # | Modified files: # | * dlls/amstream/mediastreamfilter.c, dlls/comctl32/listview.c, dlls/d2d1/brush.c, dlls/d2d1/geometry.c, dlls/d3d11/view.c, # | dlls/d3d8/texture.c, dlls/d3d9/tests/visual.c, dlls/d3d9/texture.c, dlls/ddraw/viewport.c, dlls/dsound/primary.c, -# | dlls/dwrite/layout.c, dlls/dwrite/tests/analyzer.c, dlls/dwrite/tests/font.c, dlls/dwrite/tests/layout.c, -# | dlls/mshtml/script.c, dlls/msvcirt/tests/msvcirt.c, dlls/msxml3/schema.c, dlls/netapi32/netapi32.c, -# | dlls/ole32/tests/compobj.c, dlls/oleaut32/oleaut.c, dlls/oleaut32/tests/safearray.c, dlls/rpcrt4/cstub.c, -# | dlls/rpcrt4/tests/ndr_marshall.c, dlls/scrrun/tests/dictionary.c, dlls/shell32/tests/appbar.c, +# | dlls/dwrite/layout.c, dlls/mshtml/script.c, dlls/msvcirt/tests/msvcirt.c, dlls/msxml3/schema.c, +# | dlls/netapi32/netapi32.c, dlls/ole32/tests/compobj.c, dlls/oleaut32/oleaut.c, dlls/oleaut32/tests/safearray.c, +# | dlls/rpcrt4/cstub.c, dlls/rpcrt4/tests/ndr_marshall.c, dlls/scrrun/tests/dictionary.c, dlls/shell32/tests/appbar.c, # | dlls/shell32/tests/shelldispatch.c, dlls/shell32/tests/shellole.c, dlls/shlwapi/tests/ordinal.c, # | dlls/user32/tests/input.c, dlls/user32/tests/menu.c, dlls/vbscript/vbdisp.c, dlls/winealsa.drv/mmdevdrv.c, # | dlls/wined3d/glsl_shader.c, dlls/winhttp/tests/winhttp.c, dlls/wshom.ocx/tests/wshom.c, include/d3dtypes.h, @@ -2340,7 +2339,6 @@ fi # | if test "$enable_Compiler_Warnings" -eq 1; then patch_apply Compiler_Warnings/0001-comctl32-Avoid-misleading-indentation-warnings.patch - patch_apply Compiler_Warnings/0002-dwrite-tests-Avoid-misleading-indentation-warnings.patch patch_apply Compiler_Warnings/0004-mshtml-Avoid-misleading-indentation-warnings.patch patch_apply Compiler_Warnings/0005-msvcirt-tests-Avoid-misleading-indentation-warnings.patch patch_apply Compiler_Warnings/0006-oleaut32-tests-Avoid-misleading-indentation-warnings.patch @@ -2369,7 +2367,6 @@ if test "$enable_Compiler_Warnings" -eq 1; then patch_apply Compiler_Warnings/0031-include-Check-element-type-in-CONTAINING_RECORD-and-.patch ( echo '+ { "Sebastian Lackner", "comctl32: Avoid misleading indentation warnings.", 1 },'; - echo '+ { "Sebastian Lackner", "dwrite/tests: Avoid misleading indentation warnings.", 1 },'; echo '+ { "Sebastian Lackner", "mshtml: Avoid misleading indentation warnings.", 1 },'; echo '+ { "Sebastian Lackner", "msvcirt/tests: Avoid misleading indentation warnings.", 1 },'; echo '+ { "Sebastian Lackner", "oleaut32/tests: Avoid misleading indentation warnings.", 1 },'; @@ -5410,7 +5407,7 @@ if test "$enable_ntoskrnl_Stubs" -eq 1; then echo '+ { "Austin English", "ntoskrnl.exe: Add KeWaitForMultipleObjects stub.", 1 },'; echo '+ { "Alexander Morozov", "ntoskrnl.exe: Add stub for IoGetAttachedDeviceReference.", 1 },'; echo '+ { "Alexander Morozov", "ntoskrnl.exe: Add stubs for ExAcquireFastMutexUnsafe and ExReleaseFastMutexUnsafe.", 1 },'; - echo '+ { "Alexander Morozov", "ntoskrnl.exe: Add stubs for ObReferenceObjectByPointer and ObDereferenceObject.", 1 },'; + echo '+ { "Alexander Morozov", "ntoskrnl.exe: Add stub for ObReferenceObjectByPointer.", 1 },'; echo '+ { "Alexander Morozov", "ntoskrnl.exe: Improve KeReleaseMutex stub.", 1 },'; echo '+ { "Alexander Morozov", "ntoskrnl.exe: Improve KeInitializeSemaphore stub.", 1 },'; echo '+ { "Alexander Morozov", "ntoskrnl.exe: Improve KeInitializeTimerEx stub.", 1 },'; diff --git a/patches/wined3d-CSMT_Main/0008-wined3d-Move-the-framebuffer-into-wined3d_state.patch b/patches/wined3d-CSMT_Main/0008-wined3d-Move-the-framebuffer-into-wined3d_state.patch index e0a56dd8..336ae3e1 100644 --- a/patches/wined3d-CSMT_Main/0008-wined3d-Move-the-framebuffer-into-wined3d_state.patch +++ b/patches/wined3d-CSMT_Main/0008-wined3d-Move-the-framebuffer-into-wined3d_state.patch @@ -1,4 +1,4 @@ -From 8f5ab38fe34d5b7da764d021d8389661f6815956 Mon Sep 17 00:00:00 2001 +From 70827802a1fc98a6a804538508e6b35d618810cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20D=C3=B6singer?= Date: Thu, 20 Dec 2012 13:09:17 +0100 Subject: wined3d: Move the framebuffer into wined3d_state @@ -128,10 +128,10 @@ index f5311af..d276ee8 100644 WORD map; diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c -index c9c9b9c..446c642 100644 +index f51c06a..825523e 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c -@@ -328,19 +328,19 @@ static void wined3d_cs_exec_clear(struct wined3d_cs *cs, const void *data) +@@ -335,19 +335,19 @@ static void wined3d_cs_exec_clear(struct wined3d_cs *cs, const void *data) state = &device->state; wined3d_get_draw_rect(state, &draw_rect); device_clear_render_targets(device, device->adapter->gl_info.limits.buffers, @@ -155,7 +155,7 @@ index c9c9b9c..446c642 100644 } void wined3d_cs_emit_clear(struct wined3d_cs *cs, DWORD rect_count, const RECT *rects, -@@ -363,12 +363,12 @@ void wined3d_cs_emit_clear(struct wined3d_cs *cs, DWORD rect_count, const RECT * +@@ -370,12 +370,12 @@ void wined3d_cs_emit_clear(struct wined3d_cs *cs, DWORD rect_count, const RECT * { for (i = 0; i < cs->device->adapter->gl_info.limits.buffers; ++i) { @@ -171,7 +171,7 @@ index c9c9b9c..446c642 100644 cs->ops->submit(cs); } -@@ -406,11 +406,11 @@ static void wined3d_cs_exec_draw(struct wined3d_cs *cs, const void *data) +@@ -413,11 +413,11 @@ static void wined3d_cs_exec_draw(struct wined3d_cs *cs, const void *data) } for (i = 0; i < cs->device->adapter->gl_info.limits.buffers; ++i) { @@ -187,7 +187,7 @@ index c9c9b9c..446c642 100644 for (i = 0; i < WINED3D_SHADER_TYPE_COUNT; ++i) { if (!(shader = state->shader[i])) -@@ -467,11 +467,11 @@ void wined3d_cs_emit_draw(struct wined3d_cs *cs, int base_vertex_idx, unsigned i +@@ -474,11 +474,11 @@ void wined3d_cs_emit_draw(struct wined3d_cs *cs, int base_vertex_idx, unsigned i } for (i = 0; i < cs->device->adapter->gl_info.limits.buffers; ++i) { @@ -203,7 +203,7 @@ index c9c9b9c..446c642 100644 for (i = 0; i < WINED3D_SHADER_TYPE_COUNT; ++i) { if (!(shader = state->shader[i])) -@@ -559,7 +559,7 @@ static void wined3d_cs_exec_set_rendertarget_view(struct wined3d_cs *cs, const v +@@ -566,7 +566,7 @@ static void wined3d_cs_exec_set_rendertarget_view(struct wined3d_cs *cs, const v { const struct wined3d_cs_set_rendertarget_view *op = data; @@ -212,7 +212,7 @@ index c9c9b9c..446c642 100644 device_invalidate_state(cs->device, STATE_FRAMEBUFFER); } -@@ -582,7 +582,7 @@ static void wined3d_cs_exec_set_depth_stencil_view(struct wined3d_cs *cs, const +@@ -589,7 +589,7 @@ static void wined3d_cs_exec_set_depth_stencil_view(struct wined3d_cs *cs, const struct wined3d_device *device = cs->device; struct wined3d_rendertarget_view *prev; @@ -221,7 +221,7 @@ index c9c9b9c..446c642 100644 { struct wined3d_surface *prev_surface = wined3d_rendertarget_view_get_surface(prev); -@@ -598,7 +598,7 @@ static void wined3d_cs_exec_set_depth_stencil_view(struct wined3d_cs *cs, const +@@ -605,7 +605,7 @@ static void wined3d_cs_exec_set_depth_stencil_view(struct wined3d_cs *cs, const } } @@ -230,7 +230,7 @@ index c9c9b9c..446c642 100644 if (!prev != !op->view) { -@@ -1187,11 +1187,13 @@ void wined3d_cs_emit_set_material(struct wined3d_cs *cs, const struct wined3d_ma +@@ -1194,11 +1194,13 @@ void wined3d_cs_emit_set_material(struct wined3d_cs *cs, const struct wined3d_ma static void wined3d_cs_exec_reset_state(struct wined3d_cs *cs, const void *data) { struct wined3d_adapter *adapter = cs->device->adapter; @@ -246,7 +246,7 @@ index c9c9b9c..446c642 100644 } void wined3d_cs_emit_reset_state(struct wined3d_cs *cs) -@@ -1314,15 +1316,13 @@ struct wined3d_cs *wined3d_cs_create(struct wined3d_device *device) +@@ -1341,15 +1343,13 @@ struct wined3d_cs *wined3d_cs_create(struct wined3d_device *device) if (!(cs = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*cs)))) return NULL; @@ -264,7 +264,7 @@ index c9c9b9c..446c642 100644 cs->ops = &wined3d_cs_st_ops; cs->device = device; -@@ -1330,7 +1330,6 @@ struct wined3d_cs *wined3d_cs_create(struct wined3d_device *device) +@@ -1357,7 +1357,6 @@ struct wined3d_cs *wined3d_cs_create(struct wined3d_device *device) if (!(cs->data = HeapAlloc(GetProcessHeap(), 0, cs->data_size))) { state_cleanup(&cs->state); @@ -272,7 +272,7 @@ index c9c9b9c..446c642 100644 HeapFree(GetProcessHeap(), 0, cs); return NULL; } -@@ -1341,7 +1340,6 @@ struct wined3d_cs *wined3d_cs_create(struct wined3d_device *device) +@@ -1368,7 +1367,6 @@ struct wined3d_cs *wined3d_cs_create(struct wined3d_device *device) void wined3d_cs_destroy(struct wined3d_cs *cs) { state_cleanup(&cs->state); @@ -281,10 +281,10 @@ index c9c9b9c..446c642 100644 HeapFree(GetProcessHeap(), 0, cs); } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c -index 604be94..e7f0a67 100644 +index 5879f7e..0ca0041 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c -@@ -995,7 +995,7 @@ static void device_init_swapchain_state(struct wined3d_device *device, struct wi +@@ -996,7 +996,7 @@ static void device_init_swapchain_state(struct wined3d_device *device, struct wi BOOL ds_enable = !!swapchain->desc.enable_auto_depth_stencil; unsigned int i; @@ -293,7 +293,7 @@ index 604be94..e7f0a67 100644 { for (i = 0; i < device->adapter->gl_info.limits.buffers; ++i) { -@@ -1013,7 +1013,6 @@ HRESULT CDECL wined3d_device_init_3d(struct wined3d_device *device, +@@ -1014,7 +1014,6 @@ HRESULT CDECL wined3d_device_init_3d(struct wined3d_device *device, struct wined3d_swapchain_desc *swapchain_desc) { static const struct wined3d_color black = {0.0f, 0.0f, 0.0f, 0.0f}; @@ -301,7 +301,7 @@ index 604be94..e7f0a67 100644 struct wined3d_swapchain *swapchain = NULL; struct wined3d_context *context; DWORD clear_flags = 0; -@@ -1026,9 +1025,6 @@ HRESULT CDECL wined3d_device_init_3d(struct wined3d_device *device, +@@ -1027,9 +1026,6 @@ HRESULT CDECL wined3d_device_init_3d(struct wined3d_device *device, if (device->wined3d->flags & WINED3D_NO3D) return WINED3DERR_INVALIDCALL; @@ -311,7 +311,7 @@ index 604be94..e7f0a67 100644 if (FAILED(hr = device->shader_backend->shader_alloc_private(device, device->adapter->vertex_pipe, device->adapter->fragment_pipe))) { -@@ -1103,7 +1099,6 @@ HRESULT CDECL wined3d_device_init_3d(struct wined3d_device *device, +@@ -1104,7 +1100,6 @@ HRESULT CDECL wined3d_device_init_3d(struct wined3d_device *device, return WINED3D_OK; err_out: @@ -319,7 +319,7 @@ index 604be94..e7f0a67 100644 HeapFree(GetProcessHeap(), 0, device->swapchains); device->swapchain_count = 0; if (device->back_buffer_view) -@@ -1181,8 +1176,25 @@ HRESULT CDECL wined3d_device_uninit_3d(struct wined3d_device *device) +@@ -1182,8 +1177,25 @@ HRESULT CDECL wined3d_device_uninit_3d(struct wined3d_device *device) if (device->cursor_texture) wined3d_texture_decref(device->cursor_texture); @@ -345,7 +345,7 @@ index 604be94..e7f0a67 100644 /* Unload resources */ LIST_FOR_EACH_ENTRY_SAFE(resource, cursor, &device->resources, struct wined3d_resource, resource_list_entry) { -@@ -1213,37 +1225,6 @@ HRESULT CDECL wined3d_device_uninit_3d(struct wined3d_device *device) +@@ -1214,37 +1226,6 @@ HRESULT CDECL wined3d_device_uninit_3d(struct wined3d_device *device) * destroy the context. */ context_release(context); @@ -383,7 +383,7 @@ index 604be94..e7f0a67 100644 if (device->back_buffer_view) { wined3d_rendertarget_view_decref(device->back_buffer_view); -@@ -1261,9 +1242,6 @@ HRESULT CDECL wined3d_device_uninit_3d(struct wined3d_device *device) +@@ -1262,9 +1243,6 @@ HRESULT CDECL wined3d_device_uninit_3d(struct wined3d_device *device) device->swapchains = NULL; device->swapchain_count = 0; @@ -393,7 +393,7 @@ index 604be94..e7f0a67 100644 device->d3d_initialized = FALSE; return WINED3D_OK; -@@ -2080,7 +2058,7 @@ static void resolve_depth_buffer(struct wined3d_state *state) +@@ -2081,7 +2059,7 @@ static void resolve_depth_buffer(struct wined3d_state *state) || !(dst_texture->resource.format_flags & WINED3DFMT_FLAG_DEPTH)) return; @@ -402,7 +402,7 @@ index 604be94..e7f0a67 100644 return; if (src_view->resource->type == WINED3D_RTYPE_BUFFER) { -@@ -3475,6 +3453,8 @@ HRESULT CDECL wined3d_device_end_scene(struct wined3d_device *device) +@@ -3476,6 +3454,8 @@ HRESULT CDECL wined3d_device_end_scene(struct wined3d_device *device) HRESULT CDECL wined3d_device_clear(struct wined3d_device *device, DWORD rect_count, const RECT *rects, DWORD flags, const struct wined3d_color *color, float depth, DWORD stencil) { @@ -411,7 +411,7 @@ index 604be94..e7f0a67 100644 TRACE("device %p, rect_count %u, rects %p, flags %#x, color %s, depth %.8e, stencil %u.\n", device, rect_count, rects, flags, debug_color(color), depth, stencil); -@@ -3486,7 +3466,7 @@ HRESULT CDECL wined3d_device_clear(struct wined3d_device *device, DWORD rect_cou +@@ -3487,7 +3467,7 @@ HRESULT CDECL wined3d_device_clear(struct wined3d_device *device, DWORD rect_cou if (flags & (WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL)) { @@ -420,7 +420,7 @@ index 604be94..e7f0a67 100644 if (!ds) { WARN("Clearing depth and/or stencil without a depth stencil buffer attached, returning WINED3DERR_INVALIDCALL\n"); -@@ -3495,8 +3475,8 @@ HRESULT CDECL wined3d_device_clear(struct wined3d_device *device, DWORD rect_cou +@@ -3496,8 +3476,8 @@ HRESULT CDECL wined3d_device_clear(struct wined3d_device *device, DWORD rect_cou } else if (flags & WINED3DCLEAR_TARGET) { @@ -431,7 +431,7 @@ index 604be94..e7f0a67 100644 { WARN("Silently ignoring depth and target clear with mismatching sizes\n"); return WINED3D_OK; -@@ -3812,8 +3792,8 @@ HRESULT CDECL wined3d_device_validate_device(const struct wined3d_device *device +@@ -3813,8 +3793,8 @@ HRESULT CDECL wined3d_device_validate_device(const struct wined3d_device *device if (state->render_states[WINED3D_RS_ZENABLE] || state->render_states[WINED3D_RS_ZWRITEENABLE] || state->render_states[WINED3D_RS_STENCILENABLE]) { @@ -442,7 +442,7 @@ index 604be94..e7f0a67 100644 if (ds && rt && (ds->width < rt->width || ds->height < rt->height)) { -@@ -4271,20 +4251,21 @@ struct wined3d_rendertarget_view * CDECL wined3d_device_get_rendertarget_view(co +@@ -4272,20 +4252,21 @@ struct wined3d_rendertarget_view * CDECL wined3d_device_get_rendertarget_view(co return NULL; } @@ -466,7 +466,7 @@ index 604be94..e7f0a67 100644 TRACE("device %p, view_idx %u, view %p, set_viewport %#x.\n", device, view_idx, view, set_viewport); -@@ -4321,13 +4302,13 @@ HRESULT CDECL wined3d_device_set_rendertarget_view(struct wined3d_device *device +@@ -4322,13 +4303,13 @@ HRESULT CDECL wined3d_device_set_rendertarget_view(struct wined3d_device *device } @@ -482,7 +482,7 @@ index 604be94..e7f0a67 100644 wined3d_cs_emit_set_rendertarget_view(device->cs, view_idx, view); /* Release after the assignment, to prevent device_resource_released() * from seeing the surface as still in use. */ -@@ -4339,18 +4320,19 @@ HRESULT CDECL wined3d_device_set_rendertarget_view(struct wined3d_device *device +@@ -4340,18 +4321,19 @@ HRESULT CDECL wined3d_device_set_rendertarget_view(struct wined3d_device *device void CDECL wined3d_device_set_depth_stencil_view(struct wined3d_device *device, struct wined3d_rendertarget_view *view) { @@ -504,7 +504,7 @@ index 604be94..e7f0a67 100644 wined3d_rendertarget_view_incref(view); wined3d_cs_emit_set_depth_stencil_view(device->cs, view); if (prev) -@@ -4710,10 +4692,9 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, +@@ -4708,10 +4690,9 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, wined3d_texture_decref(device->cursor_texture); device->cursor_texture = NULL; } @@ -516,7 +516,7 @@ index 604be94..e7f0a67 100644 { for (i = 0; i < device->adapter->gl_info.limits.buffers; ++i) { -@@ -4722,6 +4703,11 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, +@@ -4720,6 +4701,11 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, } wined3d_device_set_depth_stencil_view(device, NULL); @@ -528,7 +528,7 @@ index 604be94..e7f0a67 100644 if (device->onscreen_depth_stencil) { wined3d_texture_decref(device->onscreen_depth_stencil->container); -@@ -4888,27 +4874,28 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, +@@ -4886,27 +4872,28 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, if (device->d3d_initialized) delete_opengl_contexts(device, swapchain); @@ -564,7 +564,7 @@ index 604be94..e7f0a67 100644 wined3d_cs_emit_set_scissor_rect(device->cs, &state->scissor_rect); } -@@ -4998,11 +4985,11 @@ void device_resource_released(struct wined3d_device *device, struct wined3d_reso +@@ -4996,11 +4983,11 @@ void device_resource_released(struct wined3d_device *device, struct wined3d_reso for (i = 0; i < device->adapter->gl_info.limits.buffers; ++i) { @@ -578,7 +578,7 @@ index 604be94..e7f0a67 100644 ERR("Resource %p is still in use as depth/stencil buffer.\n", resource); switch (type) -@@ -5138,8 +5125,12 @@ HRESULT device_init(struct wined3d_device *device, struct wined3d *wined3d, +@@ -5136,8 +5123,12 @@ HRESULT device_init(struct wined3d_device *device, struct wined3d *wined3d, device->blitter = adapter->blitter; @@ -607,7 +607,7 @@ index e5b30db..1188009 100644 struct wined3d_event_query *ib_query = NULL; struct wined3d_stream_info si_emulated; diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c -index d13f429..f8f0b8d 100644 +index de85d3c..4bfff83 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1495,7 +1495,7 @@ static void shader_glsl_load_constants(void *shader_priv, struct wined3d_context @@ -633,7 +633,7 @@ index 28d5972..37594b2 100644 static unsigned int warned = 0; diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c -index 50b82e9..c08af26 100644 +index 572dda2..156e8a5 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -152,7 +152,7 @@ static void state_zenable(struct wined3d_context *context, const struct wined3d_ @@ -645,8 +645,8 @@ index 50b82e9..c08af26 100644 { TRACE("No Z buffer - disabling depth test\n"); zenable = WINED3D_ZB_FALSE; -@@ -429,14 +429,14 @@ static void state_blend(struct wined3d_context *context, const struct wined3d_st - GLenum srcBlend, dstBlend; +@@ -452,14 +452,14 @@ static void state_blend(struct wined3d_context *context, const struct wined3d_st + GLenum src_blend, dst_blend; unsigned int rt_fmt_flags; - if (!state->fb->render_targets[0]) @@ -663,7 +663,7 @@ index 50b82e9..c08af26 100644 /* According to the red book, GL_LINE_SMOOTH needs GL_BLEND with specific * blending parameters to work. */ -@@ -870,7 +870,7 @@ static void state_stencil(struct wined3d_context *context, const struct wined3d_ +@@ -861,7 +861,7 @@ static void state_stencil(struct wined3d_context *context, const struct wined3d_ GLint depthFail_ccw; /* No stencil test without a stencil buffer. */ @@ -672,7 +672,7 @@ index 50b82e9..c08af26 100644 { gl_info->gl_ops.gl.p_glDisable(GL_STENCIL_TEST); checkGLcall("glDisable GL_STENCIL_TEST"); -@@ -966,7 +966,7 @@ static void state_stencil(struct wined3d_context *context, const struct wined3d_ +@@ -957,7 +957,7 @@ static void state_stencil(struct wined3d_context *context, const struct wined3d_ static void state_stencilwrite2s(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { @@ -681,7 +681,7 @@ index 50b82e9..c08af26 100644 const struct wined3d_gl_info *gl_info = context->gl_info; GL_EXTCALL(glActiveStencilFaceEXT(GL_BACK)); -@@ -980,7 +980,7 @@ static void state_stencilwrite2s(struct wined3d_context *context, const struct w +@@ -971,7 +971,7 @@ static void state_stencilwrite2s(struct wined3d_context *context, const struct w static void state_stencilwrite(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { @@ -690,7 +690,7 @@ index 50b82e9..c08af26 100644 const struct wined3d_gl_info *gl_info = context->gl_info; gl_info->gl_ops.gl.p_glStencilMask(mask); -@@ -1718,7 +1718,7 @@ static void state_depthbias(struct wined3d_context *context, const struct wined3 +@@ -1709,7 +1709,7 @@ static void state_depthbias(struct wined3d_context *context, const struct wined3 if (state->render_states[WINED3D_RS_SLOPESCALEDEPTHBIAS] || state->render_states[WINED3D_RS_DEPTHBIAS]) { @@ -699,7 +699,7 @@ index 50b82e9..c08af26 100644 float scale; union -@@ -4632,8 +4632,8 @@ static void vertexdeclaration(struct wined3d_context *context, const struct wine +@@ -4623,8 +4623,8 @@ static void vertexdeclaration(struct wined3d_context *context, const struct wine static void viewport_miscpart(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { @@ -710,7 +710,7 @@ index 50b82e9..c08af26 100644 const struct wined3d_gl_info *gl_info = context->gl_info; struct wined3d_viewport vp = state->viewport; unsigned int width, height; -@@ -4819,7 +4819,7 @@ static void scissorrect(struct wined3d_context *context, const struct wined3d_st +@@ -4810,7 +4810,7 @@ static void scissorrect(struct wined3d_context *context, const struct wined3d_st } else { @@ -719,7 +719,7 @@ index 50b82e9..c08af26 100644 UINT height; UINT width; -@@ -4884,7 +4884,7 @@ void state_srgbwrite(struct wined3d_context *context, const struct wined3d_state +@@ -4875,7 +4875,7 @@ void state_srgbwrite(struct wined3d_context *context, const struct wined3d_state TRACE("context %p, state %p, state_id %#x.\n", context, state, state_id); @@ -842,7 +842,7 @@ index 3673fe9..5695a53 100644 struct wined3d_texture *src_texture; diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c -index 041e289..c2db0e4 100644 +index 66a836b..522fe89 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -488,7 +488,7 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, @@ -855,10 +855,10 @@ index 041e289..c2db0e4 100644 struct wined3d_texture *logo_texture; struct wined3d_context *context; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c -index 93b610d..288c82e 100644 +index 31d5014..2daf43e 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c -@@ -4498,7 +4498,7 @@ void get_projection_matrix(const struct wined3d_context *context, const struct w +@@ -4499,7 +4499,7 @@ void get_projection_matrix(const struct wined3d_context *context, const struct w float y_offset = context->render_offscreen ? (center_offset - (2.0f * y) - h) / h : (center_offset - (2.0f * y) - h) / -h; @@ -867,7 +867,7 @@ index 93b610d..288c82e 100644 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; -@@ -5295,7 +5295,7 @@ void gen_ffp_frag_op(const struct wined3d_context *context, const struct wined3d +@@ -5296,7 +5296,7 @@ void gen_ffp_frag_op(const struct wined3d_context *context, const struct wined3d break; } } @@ -877,7 +877,7 @@ index 93b610d..288c82e 100644 || !state->render_states[WINED3D_RS_CLIPPLANEENABLE]) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h -index 4b4aecc..032d236 100644 +index 5502b83..05a53f4 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1450,6 +1450,36 @@ struct wined3d_timestamp_query diff --git a/patches/wined3d-CSMT_Main/9999-IfDefined.patch b/patches/wined3d-CSMT_Main/9999-IfDefined.patch index 5e76c799..56794321 100644 --- a/patches/wined3d-CSMT_Main/9999-IfDefined.patch +++ b/patches/wined3d-CSMT_Main/9999-IfDefined.patch @@ -5384,8 +5384,8 @@ diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c { TRACE("No Z buffer - disabling depth test\n"); zenable = WINED3D_ZB_FALSE; -@@ -429,14 +433,23 @@ static void state_blend(struct wined3d_context *context, const struct wined3d_st - GLenum srcBlend, dstBlend; +@@ -452,14 +456,23 @@ static void state_blend(struct wined3d_context *context, const struct wined3d_st + GLenum src_blend, dst_blend; unsigned int rt_fmt_flags; +#if !defined(STAGING_CSMT) @@ -5408,7 +5408,7 @@ diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c /* According to the red book, GL_LINE_SMOOTH needs GL_BLEND with specific * blending parameters to work. */ -@@ -870,7 +883,11 @@ static void state_stencil(struct wined3d_context *context, const struct wined3d_ +@@ -861,7 +874,11 @@ static void state_stencil(struct wined3d_context *context, const struct wined3d_ GLint depthFail_ccw; /* No stencil test without a stencil buffer. */ @@ -5420,7 +5420,7 @@ diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c { gl_info->gl_ops.gl.p_glDisable(GL_STENCIL_TEST); checkGLcall("glDisable GL_STENCIL_TEST"); -@@ -966,7 +983,11 @@ static void state_stencil(struct wined3d_context *context, const struct wined3d_ +@@ -957,7 +974,11 @@ static void state_stencil(struct wined3d_context *context, const struct wined3d_ static void state_stencilwrite2s(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { @@ -5432,7 +5432,7 @@ diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c const struct wined3d_gl_info *gl_info = context->gl_info; GL_EXTCALL(glActiveStencilFaceEXT(GL_BACK)); -@@ -980,7 +1001,11 @@ static void state_stencilwrite2s(struct wined3d_context *context, const struct w +@@ -971,7 +992,11 @@ static void state_stencilwrite2s(struct wined3d_context *context, const struct w static void state_stencilwrite(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { @@ -5444,7 +5444,7 @@ diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c const struct wined3d_gl_info *gl_info = context->gl_info; gl_info->gl_ops.gl.p_glStencilMask(mask); -@@ -1718,7 +1743,11 @@ static void state_depthbias(struct wined3d_context *context, const struct wined3 +@@ -1709,7 +1734,11 @@ static void state_depthbias(struct wined3d_context *context, const struct wined3 if (state->render_states[WINED3D_RS_SLOPESCALEDEPTHBIAS] || state->render_states[WINED3D_RS_DEPTHBIAS]) { @@ -5456,7 +5456,7 @@ diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c float scale; union -@@ -3651,7 +3680,11 @@ static void sampler(struct wined3d_context *context, const struct wined3d_state +@@ -3642,7 +3671,11 @@ static void sampler(struct wined3d_context *context, const struct wined3d_state } else { @@ -5468,7 +5468,7 @@ diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c { ERR("Failed to create sampler.\n"); sampler = NULL; -@@ -4632,8 +4665,13 @@ static void vertexdeclaration(struct wined3d_context *context, const struct wine +@@ -4623,8 +4656,13 @@ static void vertexdeclaration(struct wined3d_context *context, const struct wine static void viewport_miscpart(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { @@ -5482,7 +5482,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; unsigned int width, height; -@@ -4819,7 +4857,11 @@ static void scissorrect(struct wined3d_context *context, const struct wined3d_st +@@ -4810,7 +4848,11 @@ static void scissorrect(struct wined3d_context *context, const struct wined3d_st } else { @@ -5494,7 +5494,7 @@ diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c UINT height; UINT width; -@@ -4884,7 +4926,11 @@ void state_srgbwrite(struct wined3d_context *context, const struct wined3d_state +@@ -4875,7 +4917,11 @@ void state_srgbwrite(struct wined3d_context *context, const struct wined3d_state TRACE("context %p, state %p, state_id %#x.\n", context, state, state_id);