wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-09-12 18:50:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against f0429adbffce1f67b88b8c0a3e3a5badb6d6526e.

Browse Source 
[compobj.dll16-StringFromGUID2]
Removed patch to fix implementation of compobj.dll16.StringFromGUID2 function
(accepted upstream).

[ntdll-Stack_Guard_Pages]
Removed patch to handle stack guard pages on x86_64 (accepted upstream).

[windowscodecs-PNG_Fixes]
Removed patch to allocate correct amount of memory for PNG image data (accepted
upstream).
This commit is contained in:
Sebastian Lackner
2016-04-15 17:37:38 +02:00
parent 7cbb25d95d
commit 7fefd606b8
7 changed files with 9 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
patches/ntdll-NtQuerySection/0002-kernel32-tests-Add-tests-for-NtQuerySection.patch
View File

@@ -1,4 +1,4 @@
From 10503470d7495f2cd04287742e773aa9a87569f6 Mon Sep 17 00:00:00 2001
From f781fe643462f94c07cef57b28403ab6a3b5348a Mon Sep 17 00:00:00 2001
From: Dmitry Timoshkov <dmitry@baikal.ru>
Date: Thu, 16 Oct 2014 23:26:35 +0200
Subject: kernel32/tests: Add tests for NtQuerySection. (try 2)
@@ -8,10 +8,10 @@ Subject: kernel32/tests: Add tests for NtQuerySection. (try 2)
1 file changed, 258 insertions(+)
diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c
index d10d85d..ba49193 100644
index 5503e25..fb8d598 100644
--- a/dlls/kernel32/tests/virtual.c
+++ b/dlls/kernel32/tests/virtual.c
@@ -48,12 +48,30 @@ static PVOID (WINAPI *pRtlAddVectoredExceptionHandler)(ULONG, PVECTORED_EXCEPTI
@@ -47,12 +47,30 @@ static PVOID (WINAPI *pRtlAddVectoredExceptionHandler)(ULONG, PVECTORED_EXCEPTI
static ULONG (WINAPI *pRtlRemoveVectoredExceptionHandler)(PVOID);
static BOOL (WINAPI *pGetProcessDEPPolicy)(HANDLE, LPDWORD, PBOOL);
static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL);
@@ -42,7 +42,7 @@ index d10d85d..ba49193 100644
static HANDLE create_target_process(const char *arg)
{
char **argv;
@@ -3631,6 +3649,244 @@ static void test_shared_memory_ro(BOOL is_child, DWORD child_access)
@@ -3768,6 +3786,244 @@ static void test_shared_memory_ro(BOOL is_child, DWORD child_access)
CloseHandle(mapping);
}
@@ -287,15 +287,15 @@ index d10d85d..ba49193 100644
START_TEST(virtual)
{
int argc;
@@ -3684,6 +3940,7 @@ START_TEST(virtual)
pNtCurrentTeb = (void *)GetProcAddress( hntdll, "NtCurrentTeb" );
@@ -3820,6 +4076,7 @@ START_TEST(virtual)
pNtUnmapViewOfSection = (void *)GetProcAddress( hntdll, "NtUnmapViewOfSection" );
pRtlAddVectoredExceptionHandler = (void *)GetProcAddress( hntdll, "RtlAddVectoredExceptionHandler" );
pRtlRemoveVectoredExceptionHandler = (void *)GetProcAddress( hntdll, "RtlRemoveVectoredExceptionHandler" );
+ pNtQuerySection = (void *)GetProcAddress( hntdll, "NtQuerySection" );
pNtProtectVirtualMemory = (void *)GetProcAddress( hntdll, "NtProtectVirtualMemory" );
pNtAllocateVirtualMemory = (void *)GetProcAddress( hntdll, "NtAllocateVirtualMemory" );
pNtFreeVirtualMemory = (void *)GetProcAddress( hntdll, "NtFreeVirtualMemory" );
@@ -3693,6 +3950,7 @@ START_TEST(virtual)
@@ -3829,6 +4086,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();
@@ -304,5 +304,5 @@ index d10d85d..ba49193 100644
test_VirtualAlloc_protection();
test_VirtualProtect();
--
2.4.2
2.7.1