diff --git a/patches/api-ms-win-Stub_DLLs/0005-api-ms-win-core-heap-l2-1-0-Add-dll.patch b/patches/api-ms-win-Stub_DLLs/0005-api-ms-win-core-heap-l2-1-0-Add-dll.patch deleted file mode 100644 index 7d8e1589..00000000 --- a/patches/api-ms-win-Stub_DLLs/0005-api-ms-win-core-heap-l2-1-0-Add-dll.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 55213631f626468dae79789336fb421aed983dc5 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Michael=20M=C3=BCller?= -Date: Sat, 16 Jan 2016 20:03:48 +0100 -Subject: api-ms-win-core-heap-l2-1-0: Add dll. - ---- - configure.ac | 1 + - dlls/api-ms-win-core-heap-l2-1-0/Makefile.in | 1 + - dlls/api-ms-win-core-heap-l2-1-0/api-ms-win-core-heap-l2-1-0.spec | 7 +++++++ - tools/make_specfiles | 1 + - 4 files changed, 10 insertions(+) - create mode 100644 dlls/api-ms-win-core-heap-l2-1-0/Makefile.in - create mode 100644 dlls/api-ms-win-core-heap-l2-1-0/api-ms-win-core-heap-l2-1-0.spec - -diff --git a/configure.ac b/configure.ac -index 6b777c0..35e0636 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -2676,6 +2676,7 @@ WINE_CONFIG_DLL(api-ms-win-core-file-l2-1-1) - WINE_CONFIG_DLL(api-ms-win-core-handle-l1-1-0) - WINE_CONFIG_DLL(api-ms-win-core-heap-l1-1-0) - WINE_CONFIG_DLL(api-ms-win-core-heap-l1-2-0) -+WINE_CONFIG_DLL(api-ms-win-core-heap-l2-1-0) - WINE_CONFIG_DLL(api-ms-win-core-heap-obsolete-l1-1-0) - WINE_CONFIG_DLL(api-ms-win-core-interlocked-l1-1-0) - WINE_CONFIG_DLL(api-ms-win-core-interlocked-l1-2-0) -diff --git a/dlls/api-ms-win-core-heap-l2-1-0/Makefile.in b/dlls/api-ms-win-core-heap-l2-1-0/Makefile.in -new file mode 100644 -index 0000000..3caed9e ---- /dev/null -+++ b/dlls/api-ms-win-core-heap-l2-1-0/Makefile.in -@@ -0,0 +1 @@ -+MODULE = api-ms-win-core-heap-l2-1-0.dll -diff --git a/dlls/api-ms-win-core-heap-l2-1-0/api-ms-win-core-heap-l2-1-0.spec b/dlls/api-ms-win-core-heap-l2-1-0/api-ms-win-core-heap-l2-1-0.spec -new file mode 100644 -index 0000000..81308d2 ---- /dev/null -+++ b/dlls/api-ms-win-core-heap-l2-1-0/api-ms-win-core-heap-l2-1-0.spec -@@ -0,0 +1,7 @@ -+@ stdcall GlobalAlloc(long long) kernel32.GlobalAlloc -+@ stdcall GlobalFree(long) kernel32.GlobalFree -+@ stdcall LocalAlloc(long long) kernel32.LocalAlloc -+@ stdcall LocalFree(long) kernel32.LocalFree -+@ stdcall LocalLock(long) kernel32.LocalLock -+@ stdcall LocalReAlloc(long long long) kernel32.LocalReAlloc -+@ stdcall LocalUnlock(long) kernel32.LocalUnlock -diff --git a/tools/make_specfiles b/tools/make_specfiles -index 0bae7d4..cd4269e 100755 ---- a/tools/make_specfiles -+++ b/tools/make_specfiles -@@ -169,6 +169,7 @@ my @dll_groups = - "api-ms-win-core-handle-l1-1-0", - "api-ms-win-core-heap-l1-1-0", - "api-ms-win-core-heap-l1-2-0", -+ "api-ms-win-core-heap-l2-1-0", - "api-ms-win-core-heap-obsolete-l1-1-0", - "api-ms-win-core-io-l1-1-0", - "api-ms-win-core-io-l1-1-1", --- -2.9.0 - diff --git a/patches/api-ms-win-Stub_DLLs/0013-api-ms-win-core-shlwapi-obsolete-l1-2-0-Add-dll.patch b/patches/api-ms-win-Stub_DLLs/0013-api-ms-win-core-shlwapi-obsolete-l1-2-0-Add-dll.patch deleted file mode 100644 index 1bc0ad5c..00000000 --- a/patches/api-ms-win-Stub_DLLs/0013-api-ms-win-core-shlwapi-obsolete-l1-2-0-Add-dll.patch +++ /dev/null @@ -1,113 +0,0 @@ -From 116f061509b35ca571b5a7b19477d82c94437502 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Michael=20M=C3=BCller?= -Date: Thu, 21 Jan 2016 00:52:33 +0100 -Subject: api-ms-win-core-shlwapi-obsolete-l1-2-0: Add dll. - ---- - configure.ac | 1 + - .../Makefile.in | 1 + - .../api-ms-win-core-shlwapi-obsolete-l1-2-0.spec | 58 ++++++++++++++++++++++ - tools/make_specfiles | 1 + - 4 files changed, 61 insertions(+) - create mode 100644 dlls/api-ms-win-core-shlwapi-obsolete-l1-2-0/Makefile.in - create mode 100644 dlls/api-ms-win-core-shlwapi-obsolete-l1-2-0/api-ms-win-core-shlwapi-obsolete-l1-2-0.spec - -diff --git a/configure.ac b/configure.ac -index b7361d1..1ceda28 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -2716,6 +2716,7 @@ WINE_CONFIG_DLL(api-ms-win-core-rtlsupport-l1-1-0) - WINE_CONFIG_DLL(api-ms-win-core-rtlsupport-l1-2-0) - WINE_CONFIG_DLL(api-ms-win-core-shlwapi-legacy-l1-1-0) - WINE_CONFIG_DLL(api-ms-win-core-shlwapi-obsolete-l1-1-0) -+WINE_CONFIG_DLL(api-ms-win-core-shlwapi-obsolete-l1-2-0) - WINE_CONFIG_DLL(api-ms-win-core-sidebyside-l1-1-0) - WINE_CONFIG_DLL(api-ms-win-core-string-l1-1-0) - WINE_CONFIG_DLL(api-ms-win-core-string-l2-1-0) -diff --git a/dlls/api-ms-win-core-shlwapi-obsolete-l1-2-0/Makefile.in b/dlls/api-ms-win-core-shlwapi-obsolete-l1-2-0/Makefile.in -new file mode 100644 -index 0000000..3f39b0b ---- /dev/null -+++ b/dlls/api-ms-win-core-shlwapi-obsolete-l1-2-0/Makefile.in -@@ -0,0 +1 @@ -+MODULE = api-ms-win-core-shlwapi-obsolete-l1-2-0.dll -\ No newline at end of file -diff --git a/dlls/api-ms-win-core-shlwapi-obsolete-l1-2-0/api-ms-win-core-shlwapi-obsolete-l1-2-0.spec b/dlls/api-ms-win-core-shlwapi-obsolete-l1-2-0/api-ms-win-core-shlwapi-obsolete-l1-2-0.spec -new file mode 100644 -index 0000000..8b8b520 ---- /dev/null -+++ b/dlls/api-ms-win-core-shlwapi-obsolete-l1-2-0/api-ms-win-core-shlwapi-obsolete-l1-2-0.spec -@@ -0,0 +1,58 @@ -+@ stdcall QISearch(long long long long) shlwapi.QISearch -+@ stdcall StrCSpnA(str str) shlwapi.StrCSpnA -+@ stdcall StrCSpnIA(str str) shlwapi.StrCSpnIA -+@ stdcall StrCSpnIW(wstr wstr) shlwapi.StrCSpnIW -+@ stdcall StrCSpnW(wstr wstr) shlwapi.StrCSpnW -+@ stdcall StrCatBuffA(str str long) shlwapi.StrCatBuffA -+@ stdcall StrCatBuffW(wstr wstr long) shlwapi.StrCatBuffW -+@ stdcall StrCatChainW(ptr long long wstr) shlwapi.StrCatChainW -+@ stdcall StrChrA(str long) shlwapi.StrChrA -+@ stdcall StrChrIA(str long) shlwapi.StrChrIA -+@ stdcall StrChrIW(wstr long) shlwapi.StrChrIW -+@ stub StrChrNIW -+@ stdcall StrChrNW(wstr long long) shlwapi.StrChrNW -+@ stdcall StrChrW(wstr long) shlwapi.StrChrW -+@ stdcall StrCmpCA(str str) shlwapi.StrCmpCA -+@ stdcall StrCmpCW(wstr wstr) shlwapi.StrCmpCW -+@ stdcall StrCmpICA(str str) shlwapi.StrCmpICA -+@ stdcall StrCmpICW(wstr wstr) shlwapi.StrCmpICW -+@ stdcall StrCmpIW(wstr wstr) shlwapi.StrCmpIW -+@ stdcall StrCmpLogicalW(wstr wstr) shlwapi.StrCmpLogicalW -+@ stdcall StrCmpNA(str str long) shlwapi.StrCmpNA -+@ stdcall StrCmpNCA(str ptr long) shlwapi.StrCmpNCA -+@ stdcall StrCmpNCW(wstr wstr long) shlwapi.StrCmpNCW -+@ stdcall StrCmpNIA(str str long) shlwapi.StrCmpNIA -+@ stdcall StrCmpNICA(long long long) shlwapi.StrCmpNICA -+@ stdcall StrCmpNICW(wstr wstr long) shlwapi.StrCmpNICW -+@ stdcall StrCmpNIW(wstr wstr long) shlwapi.StrCmpNIW -+@ stdcall StrCmpNW(wstr wstr long) shlwapi.StrCmpNW -+@ stdcall StrCmpW(wstr wstr) shlwapi.StrCmpW -+@ stdcall StrCpyNW(ptr wstr long) shlwapi.StrCpyNW -+@ stdcall StrDupA(str) shlwapi.StrDupA -+@ stdcall StrDupW(wstr) shlwapi.StrDupW -+@ stdcall StrIsIntlEqualA(long str str long) shlwapi.StrIsIntlEqualA -+@ stdcall StrIsIntlEqualW(long wstr wstr long) shlwapi.StrIsIntlEqualW -+@ stdcall StrPBrkA(str str) shlwapi.StrPBrkA -+@ stdcall StrPBrkW(wstr wstr) shlwapi.StrPBrkW -+@ stdcall StrRChrA(str str long) shlwapi.StrRChrA -+@ stdcall StrRChrIA(str str long) shlwapi.StrRChrIA -+@ stdcall StrRChrIW(wstr wstr long) shlwapi.StrRChrIW -+@ stdcall StrRChrW(wstr wstr long) shlwapi.StrRChrW -+@ stdcall StrRStrIA(str str str) shlwapi.StrRStrIA -+@ stdcall StrRStrIW(wstr wstr wstr) shlwapi.StrRStrIW -+@ stdcall StrSpnA(str str) shlwapi.StrSpnA -+@ stdcall StrSpnW(wstr wstr) shlwapi.StrSpnW -+@ stdcall StrStrA(str str) shlwapi.StrStrA -+@ stdcall StrStrIA(str str) shlwapi.StrStrIA -+@ stdcall StrStrIW(wstr wstr) shlwapi.StrStrIW -+@ stdcall StrStrNIW(wstr wstr long) shlwapi.StrStrNIW -+@ stdcall StrStrNW(wstr wstr long) shlwapi.StrStrNW -+@ stdcall StrStrW(wstr wstr) shlwapi.StrStrW -+@ stdcall StrToInt64ExA(str long ptr) shlwapi.StrToInt64ExA -+@ stdcall StrToInt64ExW(wstr long ptr) shlwapi.StrToInt64ExW -+@ stdcall StrToIntA(str) shlwapi.StrToIntA -+@ stdcall StrToIntExA(str long ptr) shlwapi.StrToIntExA -+@ stdcall StrToIntExW(wstr long ptr) shlwapi.StrToIntExW -+@ stdcall StrToIntW(wstr) shlwapi.StrToIntW -+@ stdcall StrTrimA(str str) shlwapi.StrTrimA -+@ stdcall StrTrimW(wstr wstr) shlwapi.StrTrimW -diff --git a/tools/make_specfiles b/tools/make_specfiles -index 8b202da..0f58756 100755 ---- a/tools/make_specfiles -+++ b/tools/make_specfiles -@@ -235,6 +235,7 @@ my @dll_groups = - "api-ms-win-core-registryuserspecific-l1-1-0", - "api-ms-win-core-shlwapi-legacy-l1-1-0", - "api-ms-win-core-shlwapi-obsolete-l1-1-0", -+ "api-ms-win-core-shlwapi-obsolete-l1-2-0", - "api-ms-win-core-url-l1-1-0", - ], - [ --- -2.9.0 - diff --git a/patches/dwrite-8bpp_Grayscale_Mode/0005-dwrite-Fix-8bpp-bitmap-copy.patch b/patches/dwrite-8bpp_Grayscale_Mode/0005-dwrite-Fix-8bpp-bitmap-copy.patch deleted file mode 100644 index f608cf71..00000000 --- a/patches/dwrite-8bpp_Grayscale_Mode/0005-dwrite-Fix-8bpp-bitmap-copy.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 210e76111bc8c35d13a99f265dca8591479e9ecf Mon Sep 17 00:00:00 2001 -From: Nikolay Sivov -Date: Thu, 7 Sep 2017 04:15:28 +0300 -Subject: dwrite: Fix 8bpp bitmap copy - -Spotted by Matteo. - -Signed-off-by: Nikolay Sivov ---- - dlls/dwrite/gdiinterop.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/dlls/dwrite/gdiinterop.c b/dlls/dwrite/gdiinterop.c -index 2e1811bd66d..ac1fc320356 100644 ---- a/dlls/dwrite/gdiinterop.c -+++ b/dlls/dwrite/gdiinterop.c -@@ -282,7 +282,7 @@ static void blit_8(struct dib_data *dib, const BYTE *src, const RECT *rect, DWOR - - for (y = rect->top; y < rect->bottom; y++) { - for (x = 0; x < src_width; x++) { -- if (src[x]) continue; -+ if (!src[x]) continue; - if (src[x] == DWRITE_ALPHA_MAX) - dst_ptr[x] = text_pixel; - else --- -2.14.1 - diff --git a/patches/dwrite-8bpp_Grayscale_Mode/definition b/patches/dwrite-8bpp_Grayscale_Mode/definition deleted file mode 100644 index 7b949f98..00000000 --- a/patches/dwrite-8bpp_Grayscale_Mode/definition +++ /dev/null @@ -1 +0,0 @@ -Fixes: [43319] Use 8bpp bitmaps in grayscale mode diff --git a/patches/ntdll-NtQueryVirtualMemory/0002-ntdll-Split-logic-for-MemoryBasicInformation-into-a-.patch b/patches/ntdll-NtQueryVirtualMemory/0002-ntdll-Split-logic-for-MemoryBasicInformation-into-a-.patch index 388a4b01..00f078bc 100644 --- a/patches/ntdll-NtQueryVirtualMemory/0002-ntdll-Split-logic-for-MemoryBasicInformation-into-a-.patch +++ b/patches/ntdll-NtQueryVirtualMemory/0002-ntdll-Split-logic-for-MemoryBasicInformation-into-a-.patch @@ -1,18 +1,18 @@ -From 0da9b9bdc6862bd2ebe58f64798f55dd1f83cf1b Mon Sep 17 00:00:00 2001 +From b96f68dff9f1daf7a2aa1427b16299bafb1a068a Mon Sep 17 00:00:00 2001 From: Dmitry Timoshkov Date: Sun, 28 May 2017 04:19:06 +0200 Subject: ntdll: Split logic for MemoryBasicInformation into a separate function. --- - dlls/ntdll/virtual.c | 64 ++++++++++++++++++++++++++++++---------------------- - 1 file changed, 37 insertions(+), 27 deletions(-) + dlls/ntdll/virtual.c | 65 ++++++++++++++++++++++++++++++---------------------- + 1 file changed, 37 insertions(+), 28 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c -index e826fa03c0c..9f9ed6bfe7e 100644 +index 2ac0c4394f7..5e92cbb50ea 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c -@@ -2240,41 +2240,18 @@ static int get_free_mem_state_callback( void *start, size_t size, void *arg ) +@@ -2439,40 +2439,16 @@ static int get_free_mem_state_callback( void *start, size_t size, void *arg ) return 1; } @@ -20,7 +20,7 @@ index e826fa03c0c..9f9ed6bfe7e 100644 - case c: \ - FIXME("(process=%p,addr=%p) Unimplemented information class: " #c "\n", process, addr); \ - return STATUS_INVALID_INFO_CLASS - +- -/*********************************************************************** - * NtQueryVirtualMemory (NTDLL.@) - * ZwQueryVirtualMemory (NTDLL.@) @@ -34,9 +34,8 @@ index e826fa03c0c..9f9ed6bfe7e 100644 + SIZE_T len, SIZE_T *res_len ) { struct file_view *view; - char *base, *alloc_base = 0; - struct list *ptr; - SIZE_T size = 0; + char *base, *alloc_base = 0, *alloc_end = working_set_limit; + struct wine_rb_entry *ptr; - MEMORY_BASIC_INFORMATION *info = buffer; sigset_t sigset; @@ -58,7 +57,7 @@ index e826fa03c0c..9f9ed6bfe7e 100644 if (process != NtCurrentProcess()) { NTSTATUS status; -@@ -2390,6 +2367,39 @@ NTSTATUS WINAPI NtQueryVirtualMemory( HANDLE process, LPCVOID addr, +@@ -2584,6 +2560,39 @@ NTSTATUS WINAPI NtQueryVirtualMemory( HANDLE process, LPCVOID addr, } @@ -99,5 +98,5 @@ index e826fa03c0c..9f9ed6bfe7e 100644 * NtLockVirtualMemory (NTDLL.@) * ZwLockVirtualMemory (NTDLL.@) -- -2.12.2 +2.14.1 diff --git a/patches/ntdll-NtQueryVirtualMemory/0003-ntdll-Implement-NtQueryVirtualMemory-MemorySectionNa.patch b/patches/ntdll-NtQueryVirtualMemory/0003-ntdll-Implement-NtQueryVirtualMemory-MemorySectionNa.patch index dcc0cd79..68971d21 100644 --- a/patches/ntdll-NtQueryVirtualMemory/0003-ntdll-Implement-NtQueryVirtualMemory-MemorySectionNa.patch +++ b/patches/ntdll-NtQueryVirtualMemory/0003-ntdll-Implement-NtQueryVirtualMemory-MemorySectionNa.patch @@ -1,4 +1,4 @@ -From 60d3299d2e2924023542dcb7245ddfd2f901b319 Mon Sep 17 00:00:00 2001 +From cf7fe40a5d1897b86b655b9bbe3686d77cd3bcd6 Mon Sep 17 00:00:00 2001 From: Dmitry Timoshkov Date: Sun, 28 May 2017 05:19:30 +0200 Subject: ntdll: Implement NtQueryVirtualMemory(MemorySectionName). (v3) @@ -10,13 +10,13 @@ Contains several improvements by Sebastian Lackner . 2 files changed, 109 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c -index 9f9ed6bfe7e..7d419de07b8 100644 +index 5e92cbb50ea..4ee48ec93ab 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c -@@ -2241,6 +2241,33 @@ static int get_free_mem_state_callback( void *start, size_t size, void *arg ) +@@ -2439,6 +2439,33 @@ static int get_free_mem_state_callback( void *start, size_t size, void *arg ) + return 1; } - +/* get the section mapping handle */ +static NTSTATUS get_section_mapping( HANDLE process, LPCVOID addr, HANDLE *mapping ) +{ @@ -47,7 +47,7 @@ index 9f9ed6bfe7e..7d419de07b8 100644 /* get basic information about a memory block */ static NTSTATUS get_basic_memory_info( HANDLE process, LPCVOID addr, MEMORY_BASIC_INFORMATION *info, -@@ -2367,6 +2394,84 @@ static NTSTATUS get_basic_memory_info( HANDLE process, LPCVOID addr, +@@ -2560,6 +2587,84 @@ static NTSTATUS get_basic_memory_info( HANDLE process, LPCVOID addr, } @@ -132,7 +132,7 @@ index 9f9ed6bfe7e..7d419de07b8 100644 #define UNIMPLEMENTED_INFO_CLASS(c) \ case c: \ FIXME("(process=%p,addr=%p) Unimplemented information class: " #c "\n", process, addr); \ -@@ -2388,8 +2493,10 @@ NTSTATUS WINAPI NtQueryVirtualMemory( HANDLE process, LPCVOID addr, +@@ -2581,8 +2686,10 @@ NTSTATUS WINAPI NtQueryVirtualMemory( HANDLE process, LPCVOID addr, case MemoryBasicInformation: return get_basic_memory_info( process, addr, buffer, len, res_len ); @@ -172,5 +172,5 @@ index e35a7b694cb..56bf11a9a85 100644 } -- -2.12.2 +2.14.1 diff --git a/patches/ntdll-NtQueryVirtualMemory/0006-ntdll-Allow-to-query-section-names-from-other-proces.patch b/patches/ntdll-NtQueryVirtualMemory/0006-ntdll-Allow-to-query-section-names-from-other-proces.patch index c1ba1945..ccfbe977 100644 --- a/patches/ntdll-NtQueryVirtualMemory/0006-ntdll-Allow-to-query-section-names-from-other-proces.patch +++ b/patches/ntdll-NtQueryVirtualMemory/0006-ntdll-Allow-to-query-section-names-from-other-proces.patch @@ -1,4 +1,4 @@ -From c0db9637afab090e25c807c011c632affdeb3097 Mon Sep 17 00:00:00 2001 +From b808bca5ed050a801ae03493788e8c8ec8e3cd38 Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Sun, 28 May 2017 05:44:38 +0200 Subject: ntdll: Allow to query section names from other processes. (v2) @@ -13,7 +13,7 @@ Subject: ntdll: Allow to query section names from other processes. (v2) 6 files changed, 69 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h -index c97b1e1f73f..52809112ce8 100644 +index ac81c9be9c8..ecee4a193d9 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 @@ -49,11 +49,11 @@ index c02a12ab19a..290d7582f65 100644 result->type = call->type; addr = wine_server_get_ptr( call->virtual_protect.addr ); diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c -index 82cb384a825..0e7df59281a 100644 +index 4ee48ec93ab..613caec6642 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c -@@ -2329,7 +2329,7 @@ static int get_free_mem_state_callback( void *start, size_t size, void *arg ) - +@@ -2440,7 +2440,7 @@ static int get_free_mem_state_callback( void *start, size_t size, void *arg ) + } /* get the section mapping handle */ -static NTSTATUS get_section_mapping( HANDLE process, LPCVOID addr, HANDLE *mapping ) @@ -61,7 +61,7 @@ index 82cb384a825..0e7df59281a 100644 { struct file_view *view; NTSTATUS status = STATUS_INVALID_ADDRESS; -@@ -2338,8 +2338,18 @@ static NTSTATUS get_section_mapping( HANDLE process, LPCVOID addr, HANDLE *mappi +@@ -2449,8 +2449,18 @@ static NTSTATUS get_section_mapping( HANDLE process, LPCVOID addr, HANDLE *mappi if (process != NtCurrentProcess()) { @@ -82,7 +82,7 @@ index 82cb384a825..0e7df59281a 100644 } base = ROUND_ADDR( addr, page_mask ); -@@ -2495,7 +2505,7 @@ static NTSTATUS get_section_name( HANDLE process, LPCVOID addr, +@@ -2601,7 +2611,7 @@ static NTSTATUS get_section_name( HANDLE process, LPCVOID addr, if (!addr || !info || !res_len) return STATUS_INVALID_PARAMETER; @@ -106,10 +106,11 @@ index 56bf11a9a85..23025eedab3 100644 SetLastError(0xdeadbeef); ret = pGetMappedFileNameA(NULL, hMod, szMapPath, sizeof(szMapPath)); -@@ -457,6 +461,20 @@ todo_wine +@@ -456,6 +460,20 @@ todo_wine + ok(memcmp(map_name, device_name, strlen(device_name)) == 0, "map name does not start with a device name: %s\n", map_name); } - SetLastError(0xdeadbeef); ++ SetLastError(0xdeadbeef); + ret = pGetMappedFileNameW(current_process, base, map_nameW, sizeof(map_nameW)/sizeof(map_nameW[0])); +todo_wine { + ok(ret, "GetMappedFileNameW error %d\n", GetLastError()); @@ -123,10 +124,9 @@ index 56bf11a9a85..23025eedab3 100644 + ok(memcmp(map_name, device_name, strlen(device_name)) == 0, "map name does not start with a device name: %s\n", map_name); + } + -+ SetLastError(0xdeadbeef); + SetLastError(0xdeadbeef); ret = pGetMappedFileNameA(GetCurrentProcess(), base + 0x2000, map_name, sizeof(map_name)); todo_wine { - ok(ret, "GetMappedFileName error %d\n", GetLastError()); @@ -501,6 +519,7 @@ todo_wine todo_wine ok(GetLastError() == ERROR_FILE_INVALID, "expected ERROR_FILE_INVALID, got %d\n", GetLastError()); @@ -147,32 +147,32 @@ index ca54b448ebb..504362702b8 100644 APC_VIRTUAL_PROTECT, APC_VIRTUAL_FLUSH, APC_VIRTUAL_LOCK, -@@ -506,6 +507,12 @@ typedef union +@@ -505,6 +506,12 @@ typedef union + client_ptr_t addr; /* requested address */ } virtual_query; struct - { ++ { + enum apc_type type; /* APC_VIRTUAL_SECTION */ + int __pad; + client_ptr_t addr; /* requested address */ + } virtual_section; + struct -+ { + { enum apc_type type; /* APC_VIRTUAL_PROTECT */ unsigned int prot; /* new protection flags */ - client_ptr_t addr; /* requested address */ -@@ -597,6 +604,12 @@ typedef union +@@ -596,6 +603,12 @@ typedef union + unsigned short alloc_type;/* resulting region allocation type */ } virtual_query; struct - { ++ { + enum apc_type type; /* APC_VIRTUAL_SECTION */ + unsigned int status; /* status returned by call */ + obj_handle_t mapping; /* resulting mapping */ + } virtual_section; + struct -+ { + { enum apc_type type; /* APC_VIRTUAL_PROTECT */ unsigned int status; /* status returned by call */ - client_ptr_t addr; /* resulting address */ diff --git a/server/thread.c b/server/thread.c index 903420bed3f..d3cbcc298c3 100644 --- a/server/thread.c @@ -201,5 +201,5 @@ index 903420bed3f..d3cbcc298c3 100644 break; case APC_MAP_VIEW: -- -2.13.1 +2.14.1 diff --git a/patches/ntdll-NtQueryVirtualMemory/0008-ntdll-Resolve-drive-symlinks-before-returning-sectio.patch b/patches/ntdll-NtQueryVirtualMemory/0008-ntdll-Resolve-drive-symlinks-before-returning-sectio.patch index d613afab..dd656f58 100644 --- a/patches/ntdll-NtQueryVirtualMemory/0008-ntdll-Resolve-drive-symlinks-before-returning-sectio.patch +++ b/patches/ntdll-NtQueryVirtualMemory/0008-ntdll-Resolve-drive-symlinks-before-returning-sectio.patch @@ -1,4 +1,4 @@ -From 68b5e9a9e9a4552c5bc04250d40d20fced0430a6 Mon Sep 17 00:00:00 2001 +From 9a69e1e68004fb9b430151c629855ea7df2b0a8c Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Sun, 28 May 2017 11:17:26 +0200 Subject: ntdll: Resolve drive symlinks before returning section name. @@ -36,7 +36,7 @@ index ecee4a193d9..e8586486a58 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 005e9b150d3..deff0da4549 100644 +index 613caec6642..467ce54eaaa 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -53,6 +53,7 @@ @@ -44,7 +44,7 @@ index 005e9b150d3..deff0da4549 100644 #include "wine/server.h" #include "wine/exception.h" +#include "wine/unicode.h" - #include "wine/list.h" + #include "wine/rbtree.h" #include "wine/debug.h" #include "ntdll_misc.h" @@ -152,6 +153,8 @@ static BYTE **pages_vprot; @@ -56,7 +56,7 @@ index 005e9b150d3..deff0da4549 100644 static struct file_view *view_block_start, *view_block_end, *next_free_view; static const size_t view_block_size = 0x100000; static void *preload_reserve_start; -@@ -2595,12 +2598,15 @@ static NTSTATUS get_section_name( HANDLE process, LPCVOID addr, +@@ -2602,12 +2605,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 005e9b150d3..deff0da4549 100644 if (!addr || !info || !res_len) return STATUS_INVALID_PARAMETER; -@@ -2650,14 +2656,34 @@ static NTSTATUS get_section_name( HANDLE process, LPCVOID addr, +@@ -2657,14 +2663,34 @@ static NTSTATUS get_section_name( HANDLE process, LPCVOID addr, } found: diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index d193f735..32aed497 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -52,7 +52,7 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "d003ed3b1743985282c8c8e9c597d77c4b47bb15" + echo "c9f72ccec2387da0c02fa1d35997fb914dcf4656" } # Show version information @@ -158,7 +158,6 @@ patch_enable_all () enable_dsound_Fast_Mixer="$1" enable_dsound_Revert_Cleanup="$1" enable_dwmapi_DwmSetIcon="$1" - enable_dwrite_8bpp_Grayscale_Mode="$1" enable_dxdiag_dontskip="$1" enable_dxdiagn_Display_Information="$1" enable_dxdiagn_Enumerate_DirectSound="$1" @@ -753,9 +752,6 @@ patch_enable () dwmapi-DwmSetIcon) enable_dwmapi_DwmSetIcon="$2" ;; - dwrite-8bpp_Grayscale_Mode) - enable_dwrite_8bpp_Grayscale_Mode="$2" - ;; dxdiag-dontskip) enable_dxdiag_dontskip="$2" ;; @@ -3405,31 +3401,27 @@ fi # | * [#40451] Add feclient dll # | # | Modified files: -# | * configure.ac, dlls/api-ms-win-core-heap-l2-1-0/Makefile.in, dlls/api-ms-win-core-heap-l2-1-0/api-ms-win-core- -# | heap-l2-1-0.spec, dlls/api-ms-win-core-quirks-l1-1-0/api-ms-win-core-quirks-l1-1-0.spec, dlls/api-ms-win-core-shlwapi- -# | obsolete-l1-2-0/Makefile.in, dlls/api-ms-win-core-shlwapi-obsolete-l1-2-0/api-ms-win-core-shlwapi-obsolete-l1-2-0.spec, -# | dlls/api-ms-win-rtcore-ntuser-draw-l1-1-0/Makefile.in, dlls/api-ms-win-rtcore-ntuser-draw-l1-1-0/api-ms-win-rtcore- -# | ntuser-draw-l1-1-0.spec, dlls/api-ms-win-rtcore-ntuser-window-l1-1-0/Makefile.in, dlls/api-ms-win-rtcore-ntuser- -# | window-l1-1-0/api-ms-win-rtcore-ntuser-window-l1-1-0.spec, dlls/api-ms-win-shcore-obsolete-l1-1-0/Makefile.in, dlls/api- -# | ms-win-shcore-obsolete-l1-1-0/api-ms-win-shcore-obsolete-l1-1-0.spec, dlls/api-ms-win-shcore-stream-l1-1-0/Makefile.in, -# | dlls/api-ms-win-shcore-stream-l1-1-0/api-ms-win-shcore-stream-l1-1-0.spec, dlls/api-ms-win-shcore- -# | thread-l1-1-0/Makefile.in, dlls/api-ms-win-shcore-thread-l1-1-0/api-ms-win-shcore-thread-l1-1-0.spec, dlls/ext-ms-win- -# | appmodel-usercontext-l1-1-0/Makefile.in, dlls/ext-ms-win-appmodel-usercontext-l1-1-0/ext-ms-win-appmodel- -# | usercontext-l1-1-0.spec, dlls/ext-ms-win-appmodel-usercontext-l1-1-0/main.c, dlls/ext-ms-win-ntuser- -# | mouse-l1-1-0/Makefile.in, dlls/ext-ms-win-ntuser-mouse-l1-1-0/ext-ms-win-ntuser-mouse-l1-1-0.spec, dlls/ext-ms-win- -# | rtcore-ntuser-syscolors-l1-1-0/Makefile.in, dlls/ext-ms-win-rtcore-ntuser-syscolors-l1-1-0/ext-ms-win-rtcore-ntuser- -# | syscolors-l1-1-0.spec, dlls/ext-ms-win-uxtheme-themes-l1-1-0/Makefile.in, dlls/ext-ms-win-uxtheme-themes-l1-1-0/ext-ms- -# | win-uxtheme-themes-l1-1-0.spec, dlls/ext-ms-win-xaml-pal-l1-1-0/Makefile.in, dlls/ext-ms-win-xaml-pal-l1-1-0/ext-ms-win- -# | xaml-pal-l1-1-0.spec, dlls/ext-ms-win-xaml-pal-l1-1-0/main.c, dlls/feclient/Makefile.in, dlls/feclient/feclient.spec, -# | dlls/feclient/main.c, dlls/iertutil/Makefile.in, dlls/iertutil/iertutil.spec, dlls/iertutil/main.c, -# | dlls/kernelbase/kernelbase.spec, dlls/kernelbase/main.c, dlls/shcore/Makefile.in, dlls/shcore/main.c, -# | dlls/shcore/shcore.spec, dlls/uiautomationcore/Makefile.in, dlls/uiautomationcore/uia_main.c, -# | dlls/uiautomationcore/uiautomationcore.spec, include/Makefile.in, include/shellscalingapi.h, -# | include/uiautomationcoreapi.h, tools/make_specfiles +# | * configure.ac, dlls/api-ms-win-core-quirks-l1-1-0/api-ms-win-core-quirks-l1-1-0.spec, dlls/api-ms-win-rtcore-ntuser- +# | draw-l1-1-0/Makefile.in, dlls/api-ms-win-rtcore-ntuser-draw-l1-1-0/api-ms-win-rtcore-ntuser-draw-l1-1-0.spec, dlls/api- +# | ms-win-rtcore-ntuser-window-l1-1-0/Makefile.in, dlls/api-ms-win-rtcore-ntuser-window-l1-1-0/api-ms-win-rtcore-ntuser- +# | window-l1-1-0.spec, dlls/api-ms-win-shcore-obsolete-l1-1-0/Makefile.in, dlls/api-ms-win-shcore-obsolete-l1-1-0/api-ms- +# | win-shcore-obsolete-l1-1-0.spec, dlls/api-ms-win-shcore-stream-l1-1-0/Makefile.in, dlls/api-ms-win-shcore-stream-l1-1-0 +# | /api-ms-win-shcore-stream-l1-1-0.spec, dlls/api-ms-win-shcore-thread-l1-1-0/Makefile.in, dlls/api-ms-win-shcore- +# | thread-l1-1-0/api-ms-win-shcore-thread-l1-1-0.spec, dlls/ext-ms-win-appmodel-usercontext-l1-1-0/Makefile.in, dlls/ext- +# | ms-win-appmodel-usercontext-l1-1-0/ext-ms-win-appmodel-usercontext-l1-1-0.spec, dlls/ext-ms-win-appmodel- +# | usercontext-l1-1-0/main.c, dlls/ext-ms-win-ntuser-mouse-l1-1-0/Makefile.in, dlls/ext-ms-win-ntuser-mouse-l1-1-0/ext-ms- +# | win-ntuser-mouse-l1-1-0.spec, dlls/ext-ms-win-rtcore-ntuser-syscolors-l1-1-0/Makefile.in, dlls/ext-ms-win-rtcore-ntuser- +# | syscolors-l1-1-0/ext-ms-win-rtcore-ntuser-syscolors-l1-1-0.spec, dlls/ext-ms-win-uxtheme-themes-l1-1-0/Makefile.in, dlls +# | /ext-ms-win-uxtheme-themes-l1-1-0/ext-ms-win-uxtheme-themes-l1-1-0.spec, dlls/ext-ms-win-xaml-pal-l1-1-0/Makefile.in, +# | dlls/ext-ms-win-xaml-pal-l1-1-0/ext-ms-win-xaml-pal-l1-1-0.spec, dlls/ext-ms-win-xaml-pal-l1-1-0/main.c, +# | dlls/feclient/Makefile.in, dlls/feclient/feclient.spec, dlls/feclient/main.c, dlls/iertutil/Makefile.in, +# | dlls/iertutil/iertutil.spec, dlls/iertutil/main.c, dlls/kernelbase/kernelbase.spec, dlls/kernelbase/main.c, +# | dlls/shcore/Makefile.in, dlls/shcore/main.c, dlls/shcore/shcore.spec, dlls/uiautomationcore/Makefile.in, +# | dlls/uiautomationcore/uia_main.c, dlls/uiautomationcore/uiautomationcore.spec, include/Makefile.in, +# | include/shellscalingapi.h, include/uiautomationcoreapi.h, tools/make_specfiles # | if test "$enable_api_ms_win_Stub_DLLs" -eq 1; then patch_apply api-ms-win-Stub_DLLs/0001-kernelbase-Add-dll-and-add-stub-for-QuirkIsEnabled.patch - patch_apply api-ms-win-Stub_DLLs/0005-api-ms-win-core-heap-l2-1-0-Add-dll.patch patch_apply api-ms-win-Stub_DLLs/0006-iertutil-Add-dll-and-add-stub-for-ordinal-811.patch patch_apply api-ms-win-Stub_DLLs/0007-shcore-Add-dll.patch patch_apply api-ms-win-Stub_DLLs/0008-api-ms-win-shcore-obsolete-l1-1-0-Add-dll.patch @@ -3437,7 +3429,6 @@ if test "$enable_api_ms_win_Stub_DLLs" -eq 1; then patch_apply api-ms-win-Stub_DLLs/0010-ext-ms-win-appmodel-usercontext-l1-1-0-Add-dll-and-a.patch patch_apply api-ms-win-Stub_DLLs/0011-api-ms-win-shcore-thread-l1-1-0-Add-dll.patch patch_apply api-ms-win-Stub_DLLs/0012-ext-ms-win-xaml-pal-l1-1-0-Add-stub-for-GetThemeServ.patch - patch_apply api-ms-win-Stub_DLLs/0013-api-ms-win-core-shlwapi-obsolete-l1-2-0-Add-dll.patch patch_apply api-ms-win-Stub_DLLs/0014-api-ms-win-shcore-stream-l1-1-0-Add-dll.patch patch_apply api-ms-win-Stub_DLLs/0015-ext-ms-win-ntuser-mouse-l1-1-0-Add-dll.patch patch_apply api-ms-win-Stub_DLLs/0016-ext-ms-win-uxtheme-themes-l1-1-0-Add-dll.patch @@ -3451,7 +3442,6 @@ if test "$enable_api_ms_win_Stub_DLLs" -eq 1; then patch_apply api-ms-win-Stub_DLLs/0027-uiautomationcore-Add-dll-and-stub-some-functions.patch ( printf '%s\n' '+ { "Michael Müller", "kernelbase: Add dll and add stub for QuirkIsEnabled.", 1 },'; - printf '%s\n' '+ { "Michael Müller", "api-ms-win-core-heap-l2-1-0: Add dll.", 1 },'; printf '%s\n' '+ { "Michael Müller", "iertutil: Add dll and add stub for ordinal 811.", 1 },'; printf '%s\n' '+ { "Sebastian Lackner", "shcore: Add dll.", 1 },'; printf '%s\n' '+ { "Michael Müller", "api-ms-win-shcore-obsolete-l1-1-0: Add dll.", 1 },'; @@ -3459,7 +3449,6 @@ if test "$enable_api_ms_win_Stub_DLLs" -eq 1; then printf '%s\n' '+ { "Michael Müller", "ext-ms-win-appmodel-usercontext-l1-1-0: Add dll and add stub for UserContextExtInitialize.", 1 },'; printf '%s\n' '+ { "Michael Müller", "api-ms-win-shcore-thread-l1-1-0: Add dll.", 1 },'; printf '%s\n' '+ { "Michael Müller", "ext-ms-win-xaml-pal-l1-1-0: Add stub for GetThemeServices.", 1 },'; - printf '%s\n' '+ { "Michael Müller", "api-ms-win-core-shlwapi-obsolete-l1-2-0: Add dll.", 1 },'; printf '%s\n' '+ { "Michael Müller", "api-ms-win-shcore-stream-l1-1-0: Add dll.", 1 },'; printf '%s\n' '+ { "Michael Müller", "ext-ms-win-ntuser-mouse-l1-1-0: Add dll.", 1 },'; printf '%s\n' '+ { "Michael Müller", "ext-ms-win-uxtheme-themes-l1-1-0: Add dll.", 1 },'; @@ -4677,21 +4666,6 @@ if test "$enable_dwmapi_DwmSetIcon" -eq 1; then ) >> "$patchlist" fi -# Patchset dwrite-8bpp_Grayscale_Mode -# | -# | This patchset fixes the following Wine bugs: -# | * [#43319] Use 8bpp bitmaps in grayscale mode -# | -# | Modified files: -# | * dlls/dwrite/gdiinterop.c -# | -if test "$enable_dwrite_8bpp_Grayscale_Mode" -eq 1; then - patch_apply dwrite-8bpp_Grayscale_Mode/0005-dwrite-Fix-8bpp-bitmap-copy.patch - ( - printf '%s\n' '+ { "Nikolay Sivov", "dwrite: Fix 8bpp bitmap copy.", 1 },'; - ) >> "$patchlist" -fi - # Patchset dxdiag-dontskip # | # | Modified files: