wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-04-13 14:42:51 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against b32c3243782477f7cc6dc5a189a3e4a5dacce1c8.

Browse Source
This commit is contained in:
Sebastian Lackner
2017-09-07 20:12:14 +02:00
parent 34f5330124
commit 7709f6b37c
17 changed files with 103 additions and 751 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
patches/ntdll-NtQueryVirtualMemory/0008-ntdll-Resolve-drive-symlinks-before-returning-sectio.patch
View File

@ -1,4 +1,4 @@
From 2ea8d5c16d9ab714f8cecde6cd6b2ff51738535a Mon Sep 17 00:00:00 2001
From 6933f5fa85dac92bc6aa20946c42fb55d1465485 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Sun, 28 May 2017 11:17:26 +0200
Subject: ntdll: Resolve drive symlinks before returning section name.
@ -24,7 +24,7 @@ index 97b42398bb0..c0b2a1ea83e 100644
OBJECT_ATTRIBUTES attr;
UNICODE_STRING targetW;
diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h
index 0e7749af4c3..e56a781fc29 100644
index a4daeed3adf..3f4142ee1c5 100644
--- a/dlls/ntdll/ntdll_misc.h
+++ b/dlls/ntdll/ntdll_misc.h
@@ -161,6 +161,7 @@ extern NTSTATUS nt_to_unix_file_name_attr( const OBJECT_ATTRIBUTES *attr, ANSI_S
@ -36,7 +36,7 @@ index 0e7749af4c3..e56a781fc29 100644
extern void virtual_get_system_info( SYSTEM_BASIC_INFORMATION *info ) DECLSPEC_HIDDEN;
extern NTSTATUS virtual_create_builtin_view( void *base ) DECLSPEC_HIDDEN;
diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c
index 80700437a45..1f3be783fb3 100644
index b42da879a4b..59239b986c9 100644
--- a/dlls/ntdll/virtual.c
+++ b/dlls/ntdll/virtual.c
@@ -53,6 +53,7 @@
@ -47,16 +47,16 @@ index 80700437a45..1f3be783fb3 100644
#include "wine/list.h"
#include "wine/debug.h"
#include "ntdll_misc.h"
@@ -146,6 +147,8 @@ static const BOOL is_win64 = (sizeof(void *) > sizeof(int));
#define VIRTUAL_HEAP_SIZE (sizeof(void*)*1024*1024)
@@ -154,6 +155,8 @@ static BYTE **pages_vprot;
static BYTE *pages_vprot;
#endif
+#define MAX_DIR_ENTRY_LEN 255 /* max length of a directory entry in chars */
+
static HANDLE virtual_heap;
static void *preload_reserve_start;
static void *preload_reserve_end;
@@ -2409,12 +2412,15 @@ static NTSTATUS get_section_name( HANDLE process, LPCVOID addr,
@@ -2589,12 +2592,15 @@ static NTSTATUS get_section_name( HANDLE process, LPCVOID addr,
MEMORY_SECTION_NAME *info,
SIZE_T len, SIZE_T *res_len )
{
@ -73,7 +73,7 @@ index 80700437a45..1f3be783fb3 100644
if (!addr || !info || !res_len) return STATUS_INVALID_PARAMETER;
@@ -2464,14 +2470,34 @@ static NTSTATUS get_section_name( HANDLE process, LPCVOID addr,
@@ -2644,14 +2650,34 @@ static NTSTATUS get_section_name( HANDLE process, LPCVOID addr,
}
found:
@ -159,5 +159,5 @@ index 0751bb24fb8..dd592a9ab21 100644
SetLastError(0xdeadbeef);
--
2.12.2
2.14.1