diff --git a/patches/ntdll-NtQuerySection/0002-kernel32-tests-Add-tests-for-NtQuerySection.patch b/patches/ntdll-NtQuerySection/0002-kernel32-tests-Add-tests-for-NtQuerySection.patch index 7289bede..554cba32 100644 --- a/patches/ntdll-NtQuerySection/0002-kernel32-tests-Add-tests-for-NtQuerySection.patch +++ b/patches/ntdll-NtQuerySection/0002-kernel32-tests-Add-tests-for-NtQuerySection.patch @@ -1,14 +1,14 @@ -From b28aedb793ed3367b42906a19da394d4e8b93753 Mon Sep 17 00:00:00 2001 +From 9b893a6f231547a99090342749bc60ae58d02272 Mon Sep 17 00:00:00 2001 From: Dmitry Timoshkov Date: Thu, 16 Oct 2014 23:26:35 +0200 Subject: kernel32/tests: Add tests for NtQuerySection. (try 2) --- - dlls/kernel32/tests/virtual.c | 251 ++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 251 insertions(+) + dlls/kernel32/tests/virtual.c | 248 ++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 248 insertions(+) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c -index 40b1bc9..26e5195 100644 +index 583abf6..3d60557 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -56,6 +56,23 @@ static NTSTATUS (WINAPI *pNtFreeVirtualMemory)(HANDLE, PVOID *, SIZE_T *, ULONG) @@ -35,7 +35,7 @@ index 40b1bc9..26e5195 100644 static HANDLE create_target_process(const char *arg) { char **argv; -@@ -3828,6 +3845,239 @@ static void test_shared_memory_ro(BOOL is_child, DWORD child_access) +@@ -3845,6 +3862,236 @@ static void test_shared_memory_ro(BOOL is_child, DWORD child_access) CloseHandle(mapping); } @@ -97,7 +97,6 @@ index 40b1bc9..26e5195 100644 + ok(ret == sizeof(info.basic), "wrong returned size %u\n", ret); + ok(info.basic.BaseAddress == NULL, "expected NULL, got %p\n", info.basic.BaseAddress); + ok(info.basic.Attributes == SEC_FILE, "expected SEC_FILE, got %#x\n", info.basic.Attributes); -+todo_wine + ok(info.basic.Size.QuadPart == fsize, "expected %#lx, got %#x/%08x\n", fsize, info.basic.Size.HighPart, info.basic.Size.LowPart); + + status = pNtQuerySection(mapping, SectionImageInformation, &info, sizeof(info.basic), &ret); @@ -120,7 +119,6 @@ index 40b1bc9..26e5195 100644 + ok(ret == sizeof(info.basic), "wrong returned size %u\n", ret); + ok(info.basic.BaseAddress == NULL, "expected NULL, got %p\n", info.basic.BaseAddress); + ok(info.basic.Attributes == SEC_FILE, "expected SEC_FILE, got %#x\n", info.basic.Attributes); -+todo_wine + ok(info.basic.Size.QuadPart == fsize, "expected %#lx, got %#x/%08x\n", fsize, info.basic.Size.HighPart, info.basic.Size.LowPart); + + UnmapViewOfFile(p); @@ -203,7 +201,6 @@ index 40b1bc9..26e5195 100644 + ok(info.basic.BaseAddress == NULL, "expected NULL, got %p\n", info.basic.BaseAddress); +todo_wine + ok(info.basic.Attributes == SEC_FILE, "expected SEC_FILE, got %#x\n", info.basic.Attributes); -+todo_wine + ok(info.basic.Size.QuadPart == fsize, "expected %#lx, got %#x/%08x\n", fsize, info.basic.Size.HighPart, info.basic.Size.LowPart); + + CloseHandle(mapping); @@ -275,7 +272,7 @@ index 40b1bc9..26e5195 100644 START_TEST(virtual) { int argc; -@@ -3891,6 +4141,7 @@ START_TEST(virtual) +@@ -3908,6 +4155,7 @@ START_TEST(virtual) test_shared_memory_ro(FALSE, FILE_MAP_COPY); test_shared_memory_ro(FALSE, FILE_MAP_COPY|FILE_MAP_WRITE); test_mapping(); diff --git a/patches/ntdll-NtQuerySection/0003-server-CreateFileMapping-should-not-fail-without-SEC.patch b/patches/ntdll-NtQuerySection/0003-server-CreateFileMapping-should-not-fail-without-SEC.patch index 095d2c72..76356a7a 100644 --- a/patches/ntdll-NtQuerySection/0003-server-CreateFileMapping-should-not-fail-without-SEC.patch +++ b/patches/ntdll-NtQuerySection/0003-server-CreateFileMapping-should-not-fail-without-SEC.patch @@ -1,4 +1,4 @@ -From 84cdc8afb6575024f2ebab1347cfc6becf41ce06 Mon Sep 17 00:00:00 2001 +From a02d5eb0b87c5358e2431cd3c96e76f20bb51e88 Mon Sep 17 00:00:00 2001 From: Dmitry Timoshkov Date: Wed, 9 Mar 2016 13:06:13 +0800 Subject: server: CreateFileMapping should not fail without SEC_COMMIT for a @@ -6,15 +6,15 @@ Subject: server: CreateFileMapping should not fail without SEC_COMMIT for a Anonymous file mapping already behaves this way. --- - dlls/kernel32/tests/virtual.c | 4 +--- + dlls/kernel32/tests/virtual.c | 3 --- server/mapping.c | 5 +++-- - 2 files changed, 4 insertions(+), 5 deletions(-) + 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c -index 26e5195..866d1b8 100644 +index 3d60557..c6e7ebe 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c -@@ -4016,9 +4016,7 @@ todo_wine +@@ -4030,9 +4030,7 @@ todo_wine SetLastError(0xdeadbef); mapping = CreateFileMappingA(file, NULL, PAGE_READONLY|SEC_RESERVE, 0, 0, NULL); @@ -24,11 +24,7 @@ index 26e5195..866d1b8 100644 memset(&info, 0x55, sizeof(info)); ret = 0xdeadbeef; -@@ -4027,10 +4025,10 @@ todo_wine - ok(ret == sizeof(info.basic), "wrong returned size %u\n", ret); - ok(info.basic.BaseAddress == NULL, "expected NULL, got %p\n", info.basic.BaseAddress); - ok(info.basic.Attributes == SEC_FILE, "expected SEC_FILE, got %#x\n", info.basic.Attributes); -+todo_wine +@@ -4044,7 +4042,6 @@ todo_wine ok(info.basic.Size.QuadPart == fsize, "expected %#lx, got %#x/%08x\n", fsize, info.basic.Size.HighPart, info.basic.Size.LowPart); CloseHandle(mapping); @@ -37,10 +33,10 @@ index 26e5195..866d1b8 100644 SetLastError(0xdeadbef); diff --git a/server/mapping.c b/server/mapping.c -index 71c3437..c223037 100644 +index b68f281..1f18c5c 100644 --- a/server/mapping.c +++ b/server/mapping.c -@@ -529,8 +529,9 @@ static struct object *create_mapping( struct object *root, const struct unicode_ +@@ -533,8 +533,9 @@ static struct object *create_mapping( struct object *root, const struct unicode_ if (flags & SEC_RESERVE) { diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index a66a787b..dac3796b 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -51,7 +51,7 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "b54a8dda844a1a43d1dff22eff0ea206be5c630c" + echo "b05704dbbd429a5325132c77a3e13fcb88b2995f" } # Show version information diff --git a/patches/wined3d-CSMT_Main/9999-IfDefined.patch b/patches/wined3d-CSMT_Main/9999-IfDefined.patch index 4d3ac2a0..57a29294 100644 --- a/patches/wined3d-CSMT_Main/9999-IfDefined.patch +++ b/patches/wined3d-CSMT_Main/9999-IfDefined.patch @@ -8513,7 +8513,7 @@ diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c -@@ -4494,7 +4494,11 @@ void get_projection_matrix(const struct wined3d_context *context, const struct w +@@ -4498,7 +4498,11 @@ 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; @@ -8525,7 +8525,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; -@@ -5291,7 +5295,11 @@ void gen_ffp_frag_op(const struct wined3d_context *context, const struct wined3d +@@ -5295,7 +5299,11 @@ void gen_ffp_frag_op(const struct wined3d_context *context, const struct wined3d break; } }