You've already forked wine-staging
mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2025-09-12 18:50:20 -07:00
Rebase against aaddf1365a3371263827206eedf1464a83562c00.
[msi-Fix_Stack_Alignment] Removed patch to fix stack alignment in CUSTOMPROC_wrapper function (accepted upstream). [ntdll-FSCTL_PIPE_LISTEN] Removed patch to avoid updating iosb.Status after FSCTL_PIPE_LISTEN call (accepted upstream). [user32-FlashWindowEx] Removed patch to avoid dereferencing NULL pointer in a trace (accepted upstream). [windowscodecs-PNG_Fixes] Removed patch to fix a copy/paste mistake (accepted upstream). [winex11-Desktop_Resolution] Removed patch to allow 320x240 as supported resolution in desktop mode (accepted upstream).
This commit is contained in:
Sebastian Lackner
File diff suppressed because it is too large
Load Diff
@@ -4,5 +4,4 @@ Fixes: Set NamedPipeState to FILE_PIPE_CLOSING_STATE on broken pipe in NtQueryIn
|
||||
FIxes: Return proper status codes when NtReadFile/NtWriteFile is called on closed (but not disconnected) pipe
|
||||
Depends: rpcrt4-Pipe_Transport
|
||||
Depends: server-Desktop_Refcount
|
||||
Depends: ntdll-FSCTL_PIPE_LISTEN
|
||||
Category: stable
|
||||
|
||||
@@ -1,25 +0,0 @@
|
||||
From 2e8e5ea86b19ca4f95c0f07b79c6f201b61f7b09 Mon Sep 17 00:00:00 2001
|
||||
From: Sebastian Lackner <sebastian@fds-team.de>
|
||||
Date: Tue, 15 Mar 2016 17:41:24 +0100
|
||||
Subject: msi: Fix stack alignment in CUSTOMPROC_wrapper.
|
||||
|
||||
Spotted by Dmitry Timoshkov.
|
||||
---
|
||||
dlls/msi/custom.c | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c
|
||||
index 4e934bd..35a1b5c 100644
|
||||
--- a/dlls/msi/custom.c
|
||||
+++ b/dlls/msi/custom.c
|
||||
@@ -539,6 +539,7 @@ __ASM_GLOBAL_FUNC( CUSTOMPROC_wrapper,
|
||||
__ASM_CFI(".cfi_rel_offset %ebp,0\n\t")
|
||||
"movl %esp,%ebp\n\t"
|
||||
__ASM_CFI(".cfi_def_cfa_register %ebp\n\t")
|
||||
+ "subl $4,%esp\n\t"
|
||||
"pushl 12(%ebp)\n\t"
|
||||
"movl 8(%ebp),%eax\n\t"
|
||||
"call *%eax\n\t"
|
||||
--
|
||||
2.7.1
|
||||
|
||||
@@ -1,55 +0,0 @@
|
||||
From 82da5b425ae379825eecd6a3437a2d2e6b88890e Mon Sep 17 00:00:00 2001
|
||||
From: Sebastian Lackner <sebastian@fds-team.de>
|
||||
Date: Sun, 13 Mar 2016 20:28:15 +0100
|
||||
Subject: ntdll/tests: Add tests for iosb.Status value after pending
|
||||
FSCTL_PIPE_LISTEN call.
|
||||
|
||||
---
|
||||
dlls/ntdll/tests/pipe.c | 20 +++++++++++++++++---
|
||||
1 file changed, 17 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/dlls/ntdll/tests/pipe.c b/dlls/ntdll/tests/pipe.c
|
||||
index 7c30408..5b19ad3 100644
|
||||
--- a/dlls/ntdll/tests/pipe.c
|
||||
+++ b/dlls/ntdll/tests/pipe.c
|
||||
@@ -277,10 +277,9 @@ static void test_overlapped(void)
|
||||
ok(!res, "NtCreateNamedPipeFile returned %x\n", res);
|
||||
|
||||
memset(&iosb, 0x55, sizeof(iosb));
|
||||
-
|
||||
-/* try with event and apc */
|
||||
res = listen_pipe(hPipe, hEvent, &iosb, TRUE);
|
||||
ok(res == STATUS_PENDING, "NtFsControlFile returned %x\n", res);
|
||||
+ ok(U(iosb).Status == 0x55555555, "iosb.Status got changed to %x\n", U(iosb).Status);
|
||||
|
||||
hClient = CreateFileW(testpipe, GENERIC_READ | GENERIC_WRITE, 0, 0, OPEN_EXISTING, 0, 0);
|
||||
ok(hClient != INVALID_HANDLE_VALUE, "can't open pipe, GetLastError: %x\n", GetLastError());
|
||||
@@ -294,9 +293,24 @@ static void test_overlapped(void)
|
||||
|
||||
ok(ioapc_called, "IOAPC didn't run\n");
|
||||
|
||||
- CloseHandle(hEvent);
|
||||
CloseHandle(hPipe);
|
||||
CloseHandle(hClient);
|
||||
+
|
||||
+ res = create_pipe(&hPipe, FILE_SHARE_READ | FILE_SHARE_WRITE, 0 /* OVERLAPPED */);
|
||||
+ ok(!res, "NtCreateNamedPipeFile returned %x\n", res);
|
||||
+
|
||||
+ hClient = CreateFileW(testpipe, GENERIC_READ | GENERIC_WRITE, 0, 0, OPEN_EXISTING, 0, 0);
|
||||
+ ok(hClient != INVALID_HANDLE_VALUE, "can't open pipe, GetLastError: %x\n", GetLastError());
|
||||
+
|
||||
+ memset(&iosb, 0x55, sizeof(iosb));
|
||||
+ res = listen_pipe(hPipe, hEvent, &iosb, TRUE);
|
||||
+ ok(res == STATUS_PIPE_CONNECTED, "NtFsControlFile returned %x\n", res);
|
||||
+ todo_wine ok(U(iosb).Status == 0x55555555, "iosb.Status got changed to %x\n", U(iosb).Status);
|
||||
+
|
||||
+ CloseHandle(hPipe);
|
||||
+ CloseHandle(hClient);
|
||||
+
|
||||
+ CloseHandle(hEvent);
|
||||
}
|
||||
|
||||
static BOOL userapc_called;
|
||||
--
|
||||
2.7.1
|
||||
|
||||
@@ -1,90 +0,0 @@
|
||||
From 8617c09525a481c382abe15d7a6c9386e80f49ae Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
|
||||
Date: Sun, 13 Mar 2016 20:38:10 +0100
|
||||
Subject: kernel32/tests: Add additional tests for overlapped handling of
|
||||
CreateNamedPipe.
|
||||
|
||||
---
|
||||
dlls/kernel32/tests/pipe.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++
|
||||
1 file changed, 59 insertions(+)
|
||||
|
||||
diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c
|
||||
index 60336f8..77381f2 100644
|
||||
--- a/dlls/kernel32/tests/pipe.c
|
||||
+++ b/dlls/kernel32/tests/pipe.c
|
||||
@@ -2091,6 +2091,64 @@ static void test_overlapped(void)
|
||||
CloseHandle(thread);
|
||||
}
|
||||
|
||||
+static void test_overlapped_error(void)
|
||||
+{
|
||||
+ HANDLE pipe, file, event;
|
||||
+ DWORD err, numbytes;
|
||||
+ OVERLAPPED overlapped;
|
||||
+ BOOL ret;
|
||||
+
|
||||
+ event = CreateEventA(NULL, TRUE, FALSE, NULL);
|
||||
+ ok(event != NULL, "CreateEventA failed with %u\n", GetLastError());
|
||||
+
|
||||
+ pipe = CreateNamedPipeA(PIPENAME, PIPE_ACCESS_DUPLEX | FILE_FLAG_OVERLAPPED,
|
||||
+ PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE | PIPE_WAIT,
|
||||
+ 1, 1024, 1024, NMPWAIT_WAIT_FOREVER, NULL);
|
||||
+ ok(pipe != INVALID_HANDLE_VALUE, "CreateNamedPipe failed with %u\n", GetLastError());
|
||||
+
|
||||
+ memset(&overlapped, 0, sizeof(overlapped));
|
||||
+ overlapped.hEvent = event;
|
||||
+ ret = ConnectNamedPipe(pipe, &overlapped);
|
||||
+ err = GetLastError();
|
||||
+ ok(ret == FALSE, "ConnectNamedPipe succeeded\n");
|
||||
+ ok(err == ERROR_IO_PENDING, "expected ERROR_IO_PENDING, got %u\n", err);
|
||||
+
|
||||
+ file = CreateFileA(PIPENAME, GENERIC_READ | GENERIC_WRITE, 0, NULL,
|
||||
+ OPEN_EXISTING, FILE_FLAG_OVERLAPPED, 0);
|
||||
+ ok(file != INVALID_HANDLE_VALUE, "CreateFile failed with %u\n", GetLastError());
|
||||
+
|
||||
+ numbytes = 0xdeadbeef;
|
||||
+ ret = GetOverlappedResult(pipe, &overlapped, &numbytes, TRUE);
|
||||
+ ok(ret == TRUE, "GetOverlappedResult failed\n");
|
||||
+ ok(numbytes == 0, "expected 0, got %u\n", numbytes);
|
||||
+ ok(overlapped.Internal == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %08lx\n", overlapped.Internal);
|
||||
+
|
||||
+ CloseHandle(file);
|
||||
+ CloseHandle(pipe);
|
||||
+
|
||||
+ pipe = CreateNamedPipeA(PIPENAME, PIPE_ACCESS_DUPLEX | FILE_FLAG_OVERLAPPED,
|
||||
+ PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE | PIPE_WAIT,
|
||||
+ 1, 1024, 1024, NMPWAIT_WAIT_FOREVER, NULL);
|
||||
+ ok(pipe != INVALID_HANDLE_VALUE, "CreateNamedPipe failed with %u\n", GetLastError());
|
||||
+
|
||||
+ file = CreateFileA(PIPENAME, GENERIC_READ | GENERIC_WRITE, 0, NULL,
|
||||
+ OPEN_EXISTING, FILE_FLAG_OVERLAPPED, 0);
|
||||
+ ok(file != INVALID_HANDLE_VALUE, "CreateFile failed with %u\n", GetLastError());
|
||||
+
|
||||
+ memset(&overlapped, 0, sizeof(overlapped));
|
||||
+ overlapped.hEvent = event;
|
||||
+ ret = ConnectNamedPipe(pipe, &overlapped);
|
||||
+ err = GetLastError();
|
||||
+ ok(ret == FALSE, "ConnectNamedPipe succeeded\n");
|
||||
+ ok(err == ERROR_PIPE_CONNECTED, "expected ERROR_PIPE_CONNECTED, got %u\n", err);
|
||||
+ todo_wine ok(overlapped.Internal == STATUS_PENDING, "expected STATUS_PENDING, got %08lx\n", overlapped.Internal);
|
||||
+
|
||||
+ CloseHandle(file);
|
||||
+ CloseHandle(pipe);
|
||||
+
|
||||
+ CloseHandle(event);
|
||||
+}
|
||||
+
|
||||
static void test_NamedPipeHandleState(void)
|
||||
{
|
||||
HANDLE server, client;
|
||||
@@ -2372,6 +2430,7 @@ START_TEST(pipe)
|
||||
test_CloseHandle();
|
||||
test_impersonation();
|
||||
test_overlapped();
|
||||
+ test_overlapped_error();
|
||||
test_NamedPipeHandleState();
|
||||
test_readfileex_pending();
|
||||
}
|
||||
--
|
||||
2.7.1
|
||||
|
||||
@@ -1,62 +0,0 @@
|
||||
From 98592ff61773a99e32b58e9da7df0fd221bcb9c0 Mon Sep 17 00:00:00 2001
|
||||
From: Sebastian Lackner <sebastian@fds-team.de>
|
||||
Date: Sun, 13 Mar 2016 20:42:03 +0100
|
||||
Subject: ntdll: Do not update iosb.Status after FSCTL_PIPE_LISTEN call.
|
||||
|
||||
---
|
||||
dlls/kernel32/tests/pipe.c | 2 +-
|
||||
dlls/ntdll/file.c | 2 +-
|
||||
dlls/ntdll/tests/pipe.c | 4 ++--
|
||||
3 files changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c
|
||||
index 77381f2..a896843 100644
|
||||
--- a/dlls/kernel32/tests/pipe.c
|
||||
+++ b/dlls/kernel32/tests/pipe.c
|
||||
@@ -2141,7 +2141,7 @@ static void test_overlapped_error(void)
|
||||
err = GetLastError();
|
||||
ok(ret == FALSE, "ConnectNamedPipe succeeded\n");
|
||||
ok(err == ERROR_PIPE_CONNECTED, "expected ERROR_PIPE_CONNECTED, got %u\n", err);
|
||||
- todo_wine ok(overlapped.Internal == STATUS_PENDING, "expected STATUS_PENDING, got %08lx\n", overlapped.Internal);
|
||||
+ ok(overlapped.Internal == STATUS_PENDING, "expected STATUS_PENDING, got %08lx\n", overlapped.Internal);
|
||||
|
||||
CloseHandle(file);
|
||||
CloseHandle(pipe);
|
||||
diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c
|
||||
index 46fea51..f9e7b3e 100644
|
||||
--- a/dlls/ntdll/file.c
|
||||
+++ b/dlls/ntdll/file.c
|
||||
@@ -1802,7 +1802,7 @@ NTSTATUS WINAPI NtFsControlFile(HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc
|
||||
default:
|
||||
status = server_ioctl_file( handle, event, apc, apc_context, io, code,
|
||||
in_buffer, in_size, out_buffer, out_size );
|
||||
- break;
|
||||
+ return status;
|
||||
}
|
||||
|
||||
if (status != STATUS_PENDING) io->u.Status = status;
|
||||
diff --git a/dlls/ntdll/tests/pipe.c b/dlls/ntdll/tests/pipe.c
|
||||
index 5b19ad3..77c451b 100644
|
||||
--- a/dlls/ntdll/tests/pipe.c
|
||||
+++ b/dlls/ntdll/tests/pipe.c
|
||||
@@ -305,7 +305,7 @@ static void test_overlapped(void)
|
||||
memset(&iosb, 0x55, sizeof(iosb));
|
||||
res = listen_pipe(hPipe, hEvent, &iosb, TRUE);
|
||||
ok(res == STATUS_PIPE_CONNECTED, "NtFsControlFile returned %x\n", res);
|
||||
- todo_wine ok(U(iosb).Status == 0x55555555, "iosb.Status got changed to %x\n", U(iosb).Status);
|
||||
+ ok(U(iosb).Status == 0x55555555, "iosb.Status got changed to %x\n", U(iosb).Status);
|
||||
|
||||
CloseHandle(hPipe);
|
||||
CloseHandle(hClient);
|
||||
@@ -388,7 +388,7 @@ static void test_alertable(void)
|
||||
todo_wine ok(res == STATUS_CANCELLED, "NtFsControlFile returned %x\n", res);
|
||||
|
||||
ok(userapc_called, "user apc didn't run\n");
|
||||
- todo_wine ok(U(iosb).Status == 0x55555555, "iosb.Status got changed to %x\n", U(iosb).Status);
|
||||
+ ok(U(iosb).Status == 0x55555555, "iosb.Status got changed to %x\n", U(iosb).Status);
|
||||
ok(WaitForSingleObjectEx(hEvent, 0, TRUE) == WAIT_TIMEOUT, "hEvent signaled\n");
|
||||
ok(!ioapc_called, "IOAPC ran\n");
|
||||
|
||||
--
|
||||
2.7.1
|
||||
|
||||
@@ -1 +0,0 @@
|
||||
Fixes: Do not update iosb.Status after FSCTL_PIPE_LISTEN call
|
||||
@@ -1,4 +1,4 @@
|
||||
From 0a7a9cfce718a28567b87a5bf6776632af629d41 Mon Sep 17 00:00:00 2001
|
||||
From 9976a678df5baaa8722f5be1b49962de5bbad9bb Mon Sep 17 00:00:00 2001
|
||||
From: "Erich E. Hoover" <erich.e.hoover@gmail.com>
|
||||
Date: Thu, 16 Jan 2014 20:56:49 -0700
|
||||
Subject: ntdll: Add support for junction point creation.
|
||||
@@ -12,7 +12,7 @@ Subject: ntdll: Add support for junction point creation.
|
||||
create mode 100644 include/ntifs.h
|
||||
|
||||
diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c
|
||||
index fecec13..d8bb01b 100644
|
||||
index 93863ac..8c44514 100644
|
||||
--- a/dlls/ntdll/file.c
|
||||
+++ b/dlls/ntdll/file.c
|
||||
@@ -103,12 +103,14 @@
|
||||
@@ -30,7 +30,7 @@ index fecec13..d8bb01b 100644
|
||||
#define SECSPERDAY 86400
|
||||
#define SECS_1601_TO_1970 ((369 * 365 + 89) * (ULONGLONG)SECSPERDAY)
|
||||
|
||||
@@ -1655,6 +1657,76 @@ NTSTATUS WINAPI SYSCALL(NtDeviceIoControlFile)(HANDLE handle, HANDLE event,
|
||||
@@ -1652,6 +1654,76 @@ NTSTATUS WINAPI SYSCALL(NtDeviceIoControlFile)(HANDLE handle, HANDLE event,
|
||||
}
|
||||
|
||||
|
||||
@@ -107,7 +107,7 @@ index fecec13..d8bb01b 100644
|
||||
/**************************************************************************
|
||||
* NtFsControlFile [NTDLL.@]
|
||||
* ZwFsControlFile [NTDLL.@]
|
||||
@@ -1803,11 +1875,30 @@ NTSTATUS WINAPI SYSCALL(NtFsControlFile)(HANDLE handle, HANDLE event, PIO_APC_RO
|
||||
@@ -1805,11 +1877,30 @@ NTSTATUS WINAPI SYSCALL(NtFsControlFile)(HANDLE handle, HANDLE event, PIO_APC_RO
|
||||
}
|
||||
break;
|
||||
}
|
||||
@@ -135,11 +135,11 @@ index fecec13..d8bb01b 100644
|
||||
+ break;
|
||||
+ }
|
||||
+
|
||||
case FSCTL_PIPE_LISTEN:
|
||||
case FSCTL_PIPE_WAIT:
|
||||
default:
|
||||
status = server_ioctl_file( handle, event, apc, apc_context, io, code,
|
||||
diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c
|
||||
index 55e34ad..71e10c2 100644
|
||||
index fcbf8df..644065f 100644
|
||||
--- a/dlls/ntdll/tests/file.c
|
||||
+++ b/dlls/ntdll/tests/file.c
|
||||
@@ -37,6 +37,7 @@
|
||||
@@ -150,7 +150,7 @@ index 55e34ad..71e10c2 100644
|
||||
|
||||
#ifndef IO_COMPLETION_ALL_ACCESS
|
||||
#define IO_COMPLETION_ALL_ACCESS 0x001F0003
|
||||
@@ -4273,6 +4274,98 @@ static void test_query_ea(void)
|
||||
@@ -4240,6 +4241,98 @@ static void test_query_ea(void)
|
||||
#undef EA_BUFFER_SIZE
|
||||
}
|
||||
|
||||
@@ -249,17 +249,17 @@ index 55e34ad..71e10c2 100644
|
||||
START_TEST(file)
|
||||
{
|
||||
HMODULE hkernel32 = GetModuleHandleA("kernel32.dll");
|
||||
@@ -4332,4 +4425,5 @@ START_TEST(file)
|
||||
@@ -4299,4 +4392,5 @@ START_TEST(file)
|
||||
test_query_volume_information_file();
|
||||
test_query_attribute_information_file();
|
||||
test_query_ea();
|
||||
+ test_junction_points();
|
||||
}
|
||||
diff --git a/include/Makefile.in b/include/Makefile.in
|
||||
index c5563a2..1e60e08 100644
|
||||
index ac10691..03c3776 100644
|
||||
--- a/include/Makefile.in
|
||||
+++ b/include/Makefile.in
|
||||
@@ -493,6 +493,7 @@ SRCDIR_INCLUDES = \
|
||||
@@ -508,6 +508,7 @@ HEADER_SRCS = \
|
||||
ntddstor.h \
|
||||
ntdef.h \
|
||||
ntdsapi.h \
|
||||
@@ -326,5 +326,5 @@ index 0000000..db07c28
|
||||
+
|
||||
+#endif /* __WINE_NTIFS_H */
|
||||
--
|
||||
2.6.1
|
||||
2.7.1
|
||||
|
||||
|
||||
@@ -51,7 +51,7 @@ usage()
|
||||
# Get the upstream commit sha
|
||||
upstream_commit()
|
||||
{
|
||||
echo "dad56c7dc6ed0421e282e97f196bd195749d12ff"
|
||||
echo "aaddf1365a3371263827206eedf1464a83562c00"
|
||||
}
|
||||
|
||||
# Show version information
|
||||
@@ -188,7 +188,6 @@ patch_enable_all ()
|
||||
enable_mpr_WNetGetUniversalNameW="$1"
|
||||
enable_mscoree_CorValidateImage="$1"
|
||||
enable_mshtml_HTMLLocation_put_hash="$1"
|
||||
enable_msi_Fix_Stack_Alignment="$1"
|
||||
enable_msidb_Implementation="$1"
|
||||
enable_msvcr120__SetWinRTOutOfMemoryExceptionCallback="$1"
|
||||
enable_msvcrt_Math_Precision="$1"
|
||||
@@ -205,7 +204,6 @@ patch_enable_all ()
|
||||
enable_ntdll_DllRedirects="$1"
|
||||
enable_ntdll_EtwRegisterTraceGuids="$1"
|
||||
enable_ntdll_Exception="$1"
|
||||
enable_ntdll_FSCTL_PIPE_LISTEN="$1"
|
||||
enable_ntdll_FileDispositionInformation="$1"
|
||||
enable_ntdll_FileFsFullSizeInformation="$1"
|
||||
enable_ntdll_FileFsVolumeInformation="$1"
|
||||
@@ -325,7 +323,6 @@ patch_enable_all ()
|
||||
enable_user32_Dialog_Owner="$1"
|
||||
enable_user32_Dialog_Paint_Event="$1"
|
||||
enable_user32_DrawTextExW="$1"
|
||||
enable_user32_FlashWindowEx="$1"
|
||||
enable_user32_GetSystemMetrics="$1"
|
||||
enable_user32_Invalidate_Key_State="$1"
|
||||
enable_user32_ListBox_Size="$1"
|
||||
@@ -374,7 +371,6 @@ patch_enable_all ()
|
||||
enable_winex11_CandidateWindowPos="$1"
|
||||
enable_winex11_Clipboard_HTML="$1"
|
||||
enable_winex11_DefaultDisplayFrequency="$1"
|
||||
enable_winex11_Desktop_Resolution="$1"
|
||||
enable_winex11_Window_Groups="$1"
|
||||
enable_winex11_Window_Style="$1"
|
||||
enable_winex11_XEMBED="$1"
|
||||
@@ -741,9 +737,6 @@ patch_enable ()
|
||||
mshtml-HTMLLocation_put_hash)
|
||||
enable_mshtml_HTMLLocation_put_hash="$2"
|
||||
;;
|
||||
msi-Fix_Stack_Alignment)
|
||||
enable_msi_Fix_Stack_Alignment="$2"
|
||||
;;
|
||||
msidb-Implementation)
|
||||
enable_msidb_Implementation="$2"
|
||||
;;
|
||||
@@ -792,9 +785,6 @@ patch_enable ()
|
||||
ntdll-Exception)
|
||||
enable_ntdll_Exception="$2"
|
||||
;;
|
||||
ntdll-FSCTL_PIPE_LISTEN)
|
||||
enable_ntdll_FSCTL_PIPE_LISTEN="$2"
|
||||
;;
|
||||
ntdll-FileDispositionInformation)
|
||||
enable_ntdll_FileDispositionInformation="$2"
|
||||
;;
|
||||
@@ -1152,9 +1142,6 @@ patch_enable ()
|
||||
user32-DrawTextExW)
|
||||
enable_user32_DrawTextExW="$2"
|
||||
;;
|
||||
user32-FlashWindowEx)
|
||||
enable_user32_FlashWindowEx="$2"
|
||||
;;
|
||||
user32-GetSystemMetrics)
|
||||
enable_user32_GetSystemMetrics="$2"
|
||||
;;
|
||||
@@ -1299,9 +1286,6 @@ patch_enable ()
|
||||
winex11-DefaultDisplayFrequency)
|
||||
enable_winex11_DefaultDisplayFrequency="$2"
|
||||
;;
|
||||
winex11-Desktop_Resolution)
|
||||
enable_winex11_Desktop_Resolution="$2"
|
||||
;;
|
||||
winex11-Window_Groups)
|
||||
enable_winex11_Window_Groups="$2"
|
||||
;;
|
||||
@@ -2242,16 +2226,12 @@ if test "$enable_ntdll_ApiSetQueryApiSetPresence" -eq 1; then
|
||||
fi
|
||||
|
||||
if test "$enable_kernel32_Named_Pipe" -eq 1; then
|
||||
if test "$enable_ntdll_FSCTL_PIPE_LISTEN" -gt 1; then
|
||||
abort "Patchset ntdll-FSCTL_PIPE_LISTEN disabled, but kernel32-Named_Pipe depends on that."
|
||||
fi
|
||||
if test "$enable_rpcrt4_Pipe_Transport" -gt 1; then
|
||||
abort "Patchset rpcrt4-Pipe_Transport disabled, but kernel32-Named_Pipe depends on that."
|
||||
fi
|
||||
if test "$enable_server_Desktop_Refcount" -gt 1; then
|
||||
abort "Patchset server-Desktop_Refcount disabled, but kernel32-Named_Pipe depends on that."
|
||||
fi
|
||||
enable_ntdll_FSCTL_PIPE_LISTEN=1
|
||||
enable_rpcrt4_Pipe_Transport=1
|
||||
enable_server_Desktop_Refcount=1
|
||||
fi
|
||||
@@ -4076,22 +4056,6 @@ if test "$enable_kernel32_LocaleNameToLCID" -eq 1; then
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset ntdll-FSCTL_PIPE_LISTEN
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * dlls/kernel32/tests/pipe.c, dlls/ntdll/file.c, dlls/ntdll/tests/pipe.c
|
||||
# |
|
||||
if test "$enable_ntdll_FSCTL_PIPE_LISTEN" -eq 1; then
|
||||
patch_apply ntdll-FSCTL_PIPE_LISTEN/0001-ntdll-tests-Add-tests-for-iosb.Status-value-after-pe.patch
|
||||
patch_apply ntdll-FSCTL_PIPE_LISTEN/0002-kernel32-tests-Add-additional-tests-for-overlapped-h.patch
|
||||
patch_apply ntdll-FSCTL_PIPE_LISTEN/0003-ntdll-Do-not-update-iosb.Status-after-FSCTL_PIPE_LIS.patch
|
||||
(
|
||||
echo '+ { "Sebastian Lackner", "ntdll/tests: Add tests for iosb.Status value after pending FSCTL_PIPE_LISTEN call.", 1 },';
|
||||
echo '+ { "Michael Müller", "kernel32/tests: Add additional tests for overlapped handling of CreateNamedPipe.", 1 },';
|
||||
echo '+ { "Sebastian Lackner", "ntdll: Do not update iosb.Status after FSCTL_PIPE_LISTEN call.", 1 },';
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset rpcrt4-Pipe_Transport
|
||||
# |
|
||||
# | Modified files:
|
||||
@@ -4133,7 +4097,7 @@ fi
|
||||
# Patchset kernel32-Named_Pipe
|
||||
# |
|
||||
# | This patchset has the following (direct or indirect) dependencies:
|
||||
# | * ntdll-FSCTL_PIPE_LISTEN, rpcrt4-Pipe_Transport, server-Desktop_Refcount
|
||||
# | * rpcrt4-Pipe_Transport, server-Desktop_Refcount
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
# | * [#17195] Support for named pipe message mode (Linux only)
|
||||
@@ -4465,18 +4429,6 @@ if test "$enable_mshtml_HTMLLocation_put_hash" -eq 1; then
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset msi-Fix_Stack_Alignment
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * dlls/msi/custom.c
|
||||
# |
|
||||
if test "$enable_msi_Fix_Stack_Alignment" -eq 1; then
|
||||
patch_apply msi-Fix_Stack_Alignment/0001-msi-Fix-stack-alignment-in-CUSTOMPROC_wrapper.patch
|
||||
(
|
||||
echo '+ { "Sebastian Lackner", "msi: Fix stack alignment in CUSTOMPROC_wrapper.", 1 },';
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset msidb-Implementation
|
||||
# |
|
||||
# | Modified files:
|
||||
@@ -5309,7 +5261,7 @@ fi
|
||||
# Patchset ntdll-WriteWatches
|
||||
# |
|
||||
# | This patchset has the following (direct or indirect) dependencies:
|
||||
# | * ntdll-FSCTL_PIPE_LISTEN, rpcrt4-Pipe_Transport, server-Desktop_Refcount, kernel32-Named_Pipe, ws2_32-WriteWatches
|
||||
# | * rpcrt4-Pipe_Transport, server-Desktop_Refcount, kernel32-Named_Pipe, ws2_32-WriteWatches
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * dlls/kernel32/tests/virtual.c, dlls/ntdll/file.c
|
||||
@@ -5955,7 +5907,7 @@ fi
|
||||
# Patchset server-Pipe_ObjectName
|
||||
# |
|
||||
# | This patchset has the following (direct or indirect) dependencies:
|
||||
# | * ntdll-FSCTL_PIPE_LISTEN, rpcrt4-Pipe_Transport, server-Desktop_Refcount, kernel32-Named_Pipe
|
||||
# | * rpcrt4-Pipe_Transport, server-Desktop_Refcount, kernel32-Named_Pipe
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * dlls/ntdll/tests/om.c, server/named_pipe.c, server/object.c, server/object.h
|
||||
@@ -6744,18 +6696,6 @@ if test "$enable_user32_DrawTextExW" -eq 1; then
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset user32-FlashWindowEx
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * dlls/user32/win.c
|
||||
# |
|
||||
if test "$enable_user32_FlashWindowEx" -eq 1; then
|
||||
patch_apply user32-FlashWindowEx/0001-user32-Avoid-dereferencing-NULL-pointer-in-a-trace.patch
|
||||
(
|
||||
echo '+ { "Dmitry Timoshkov", "user32: Avoid dereferencing NULL pointer in a trace.", 1 },';
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset user32-GetSystemMetrics
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
@@ -7106,10 +7046,8 @@ fi
|
||||
# | * dlls/windowscodecs/pngformat.c
|
||||
# |
|
||||
if test "$enable_windowscodecs_PNG_Fixes" -eq 1; then
|
||||
patch_apply windowscodecs-PNG_Fixes/0001-windowscodecs-Fix-a-copy-paste-mistake.patch
|
||||
patch_apply windowscodecs-PNG_Fixes/0002-windowscodecs-Allocate-correct-amount-of-memory-for-.patch
|
||||
patch_apply windowscodecs-PNG_Fixes/0001-windowscodecs-Allocate-correct-amount-of-memory-for-.patch
|
||||
(
|
||||
echo '+ { "Dmitry Timoshkov", "windowscodecs: Fix a copy/paste mistake.", 1 },';
|
||||
echo '+ { "Dmitry Timoshkov", "windowscodecs: Allocate correct amount of memory for PNG image data.", 1 },';
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
@@ -7460,21 +7398,6 @@ if test "$enable_winex11_DefaultDisplayFrequency" -eq 1; then
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset winex11-Desktop_Resolution
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
# | * [#32979] Allow 320x240 as supported resolution in desktop mode
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * dlls/winex11.drv/desktop.c
|
||||
# |
|
||||
if test "$enable_winex11_Desktop_Resolution" -eq 1; then
|
||||
patch_apply winex11-Desktop_Resolution/0001-winex11-Add-320x240-as-supported-resolution-in-deskt.patch
|
||||
(
|
||||
echo '+ { "Michael Müller", "winex11: Add 320x240 as supported resolution in desktop mode.", 1 },';
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset winex11-Window_Groups
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
|
||||
@@ -1,34 +0,0 @@
|
||||
From 57462a28a49782e3ef8b0efefab99d336b7d67a2 Mon Sep 17 00:00:00 2001
|
||||
From: Dmitry Timoshkov <dmitry@baikal.ru>
|
||||
Date: Thu, 31 Mar 2016 10:09:03 +0800
|
||||
Subject: user32: Avoid dereferencing NULL pointer in a trace.
|
||||
|
||||
---
|
||||
dlls/user32/win.c | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/dlls/user32/win.c b/dlls/user32/win.c
|
||||
index 33aedbd..43ab5ed 100644
|
||||
--- a/dlls/user32/win.c
|
||||
+++ b/dlls/user32/win.c
|
||||
@@ -3472,7 +3472,7 @@ BOOL WINAPI FlashWindowEx( PFLASHWINFO pfinfo )
|
||||
{
|
||||
WND *wndPtr;
|
||||
|
||||
- TRACE( "%p\n", pfinfo->hwnd );
|
||||
+ TRACE( "%p\n", pfinfo );
|
||||
|
||||
if (!pfinfo)
|
||||
{
|
||||
@@ -3485,7 +3485,7 @@ BOOL WINAPI FlashWindowEx( PFLASHWINFO pfinfo )
|
||||
SetLastError( ERROR_INVALID_PARAMETER );
|
||||
return FALSE;
|
||||
}
|
||||
- FIXME( "%p - semi-stub\n", pfinfo );
|
||||
+ FIXME( "%p - semi-stub\n", pfinfo->hwnd );
|
||||
|
||||
if (IsIconic( pfinfo->hwnd ))
|
||||
{
|
||||
--
|
||||
2.7.1
|
||||
|
||||
@@ -1,25 +0,0 @@
|
||||
From 976652bfa10c79b935b7061243b1561d6dc0e605 Mon Sep 17 00:00:00 2001
|
||||
From: Dmitry Timoshkov <dmitry@baikal.ru>
|
||||
Date: Wed, 6 Apr 2016 17:50:48 +0800
|
||||
Subject: windowscodecs: Fix a copy/paste mistake.
|
||||
|
||||
---
|
||||
dlls/windowscodecs/pngformat.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c
|
||||
index 4f5cb94..cd9165b 100644
|
||||
--- a/dlls/windowscodecs/pngformat.c
|
||||
+++ b/dlls/windowscodecs/pngformat.c
|
||||
@@ -532,7 +532,7 @@ static HRESULT WINAPI PngDecoder_Initialize(IWICBitmapDecoder *iface, IStream *p
|
||||
}
|
||||
|
||||
This->end_info = ppng_create_info_struct(This->png_ptr);
|
||||
- if (!This->info_ptr)
|
||||
+ if (!This->end_info)
|
||||
{
|
||||
ppng_destroy_read_struct(&This->png_ptr, &This->info_ptr, NULL);
|
||||
This->png_ptr = NULL;
|
||||
--
|
||||
2.7.1
|
||||
|
||||
@@ -1,27 +0,0 @@
|
||||
From 268ba3b1b3d37eed28e68ec6a64c568d8de7cde2 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
|
||||
Date: Thu, 31 Mar 2016 22:33:14 +0200
|
||||
Subject: winex11: Add 320x240 as supported resolution in desktop mode.
|
||||
|
||||
---
|
||||
dlls/winex11.drv/desktop.c | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c
|
||||
index 72916c8..034d7f3 100644
|
||||
--- a/dlls/winex11.drv/desktop.c
|
||||
+++ b/dlls/winex11.drv/desktop.c
|
||||
@@ -37,8 +37,8 @@ static unsigned int dd_mode_count;
|
||||
static unsigned int max_width;
|
||||
static unsigned int max_height;
|
||||
|
||||
-static const unsigned int widths[] = {320, 400, 512, 640, 800, 1024, 1152, 1280, 1280, 1400, 1600};
|
||||
-static const unsigned int heights[] = {200, 300, 384, 480, 600, 768, 864, 960, 1024, 1050, 1200};
|
||||
+static const unsigned int widths[] = {320, 320, 400, 512, 640, 800, 1024, 1152, 1280, 1280, 1400, 1600};
|
||||
+static const unsigned int heights[] = {200, 240, 300, 384, 480, 600, 768, 864, 960, 1024, 1050, 1200};
|
||||
#define NUM_DESKTOP_MODES (sizeof(widths) / sizeof(widths[0]))
|
||||
|
||||
#define _NET_WM_STATE_REMOVE 0
|
||||
--
|
||||
2.7.1
|
||||
|
||||
@@ -1 +0,0 @@
|
||||
Fixes: [32979] Allow 320x240 as supported resolution in desktop mode
|
||||
Reference in New Issue
Block a user