mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2025-01-28 22:04:43 -08:00
Rebase against 66d8e38ba4c5d67ae6e287cac557acfeae8b5bcd.
This commit is contained in:
parent
eb1820cd45
commit
3d3effd8b3
@ -52,9 +52,9 @@ for more details.*
|
||||
* Add implementation for mfplat.MFTRegister ([Wine Bug #37811](https://bugs.winehq.org/show_bug.cgi?id=37811))
|
||||
* Add implementation for msidb commandline tool
|
||||
* Add implementation for shlwapi.AssocGetPerceivedType
|
||||
* Add information for delayed end of DST in Europe/Istanbul
|
||||
* ~~Add information for delayed end of DST in Europe/Istanbul~~
|
||||
* Add nvapi stubs required for GPU PhysX support
|
||||
* Add partial implementation of ITfThreadMgrEx_ActivateEx ([Wine Bug #39564](https://bugs.winehq.org/show_bug.cgi?id=39564))
|
||||
* ~~Add partial implementation of ITfThreadMgrEx_ActivateEx~~ ([Wine Bug #39564](https://bugs.winehq.org/show_bug.cgi?id=39564))
|
||||
* Add performance library registry keys needed by MS SQL Server Management Studio Express 2008 R2 ([Wine Bug #33661](https://bugs.winehq.org/show_bug.cgi?id=33661))
|
||||
* Add semi-stub for FileFsVolumeInformation information class ([Wine Bug #21466](https://bugs.winehq.org/show_bug.cgi?id=21466))
|
||||
* Add shell32 placeholder icons to match offsets with Windows ([Wine Bug #30185](https://bugs.winehq.org/show_bug.cgi?id=30185))
|
||||
@ -134,7 +134,7 @@ for more details.*
|
||||
* Fake success in kernel32.SetFileCompletionNotificationModes ([Wine Bug #38960](https://bugs.winehq.org/show_bug.cgi?id=38960))
|
||||
* Fallback to default comspec when %COMSPEC% is not set
|
||||
* Fallback to system ping command when CAP_NET_RAW is not available ([Wine Bug #8332](https://bugs.winehq.org/show_bug.cgi?id=8332))
|
||||
* Fix access violation in MSYS2 git when cloning repository
|
||||
* ~~Fix access violation in MSYS2 git when cloning repository~~
|
||||
* Fix broken textures in XIII Century: Death or Glory ([Wine Bug #25419](https://bugs.winehq.org/show_bug.cgi?id=25419))
|
||||
* Fix calculation of listbox size when horizontal scrollbar is present ([Wine Bug #38142](https://bugs.winehq.org/show_bug.cgi?id=38142))
|
||||
* Fix caps lock state issues with multiple processes ([Wine Bug #35907](https://bugs.winehq.org/show_bug.cgi?id=35907))
|
||||
|
@ -1,126 +0,0 @@
|
||||
From c215f96c76ba4352e79bde6b4422d46ead6b5a85 Mon Sep 17 00:00:00 2001
|
||||
From: Matteo Bruni <mbruni@codeweavers.com>
|
||||
Date: Fri, 13 Nov 2015 00:33:37 +0100
|
||||
Subject: msctf: Add a partial implementation of ITfThreadMgrEx_ActivateEx().
|
||||
|
||||
---
|
||||
dlls/msctf/tests/inputprocessor.c | 16 +++++++++++--
|
||||
dlls/msctf/threadmgr.c | 47 +++++++++++++++++++++------------------
|
||||
2 files changed, 39 insertions(+), 24 deletions(-)
|
||||
|
||||
diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c
|
||||
index c01d5bc..58d4d26 100644
|
||||
--- a/dlls/msctf/tests/inputprocessor.c
|
||||
+++ b/dlls/msctf/tests/inputprocessor.c
|
||||
@@ -1409,6 +1409,7 @@ static void test_startSession(void)
|
||||
ITfContext *cxt,*cxt2,*cxt3,*cxtTest;
|
||||
ITextStoreACP *ts;
|
||||
TfClientId cid2 = 0;
|
||||
+ ITfThreadMgrEx *tmex;
|
||||
|
||||
hr = ITfThreadMgr_Deactivate(g_tm);
|
||||
ok(hr == E_UNEXPECTED,"Deactivate should have failed with E_UNEXPECTED\n");
|
||||
@@ -1421,10 +1422,21 @@ static void test_startSession(void)
|
||||
test_ShouldActivate = FALSE;
|
||||
hr = ITfThreadMgr_Activate(g_tm,&cid2);
|
||||
ok(SUCCEEDED(hr),"Failed to Activate\n");
|
||||
- ok (cid == cid2, "Second activate client ID does not match\n");
|
||||
+ ok(cid == cid2, "Second activate client ID does not match\n");
|
||||
+
|
||||
+ hr = ITfThreadMgr_QueryInterface(g_tm, &IID_ITfThreadMgrEx, (void **)&tmex);
|
||||
+ ok(SUCCEEDED(hr), "Unable to acquire ITfThreadMgrEx interface\n");
|
||||
+
|
||||
+ hr = ITfThreadMgrEx_ActivateEx(tmex, &cid2, 0);
|
||||
+ ok(SUCCEEDED(hr), "Failed to Activate\n");
|
||||
+ ok(cid == cid2, "ActivateEx client ID does not match\n");
|
||||
+
|
||||
+ ITfThreadMgrEx_Release(tmex);
|
||||
|
||||
hr = ITfThreadMgr_Deactivate(g_tm);
|
||||
- ok(SUCCEEDED(hr),"Failed to Deactivate\n");
|
||||
+ ok(SUCCEEDED(hr), "Failed to Deactivate\n");
|
||||
+ hr = ITfThreadMgr_Deactivate(g_tm);
|
||||
+ ok(SUCCEEDED(hr), "Failed to Deactivate\n");
|
||||
|
||||
test_EnumDocumentMgr(g_tm,NULL,NULL);
|
||||
|
||||
diff --git a/dlls/msctf/threadmgr.c b/dlls/msctf/threadmgr.c
|
||||
index d997cda..91deb8d 100644
|
||||
--- a/dlls/msctf/threadmgr.c
|
||||
+++ b/dlls/msctf/threadmgr.c
|
||||
@@ -327,29 +327,15 @@ static ULONG WINAPI ThreadMgr_Release(ITfThreadMgrEx *iface)
|
||||
* ITfThreadMgr functions
|
||||
*****************************************************/
|
||||
|
||||
-static HRESULT WINAPI ThreadMgr_fnActivate(ITfThreadMgrEx *iface, TfClientId *ptid)
|
||||
+static HRESULT WINAPI ThreadMgr_Activate(ITfThreadMgrEx *iface, TfClientId *id)
|
||||
{
|
||||
ThreadMgr *This = impl_from_ITfThreadMgrEx(iface);
|
||||
|
||||
- TRACE("(%p) %p\n",This, ptid);
|
||||
-
|
||||
- if (!ptid)
|
||||
- return E_INVALIDARG;
|
||||
-
|
||||
- if (!processId)
|
||||
- {
|
||||
- GUID guid;
|
||||
- CoCreateGuid(&guid);
|
||||
- ITfClientId_GetClientId(&This->ITfClientId_iface, &guid, &processId);
|
||||
- }
|
||||
-
|
||||
- activate_textservices((ITfThreadMgr *)iface);
|
||||
- This->activationCount++;
|
||||
- *ptid = processId;
|
||||
- return S_OK;
|
||||
+ TRACE("(%p) %p\n", This, id);
|
||||
+ return ITfThreadMgrEx_ActivateEx(iface, id, 0);
|
||||
}
|
||||
|
||||
-static HRESULT WINAPI ThreadMgr_fnDeactivate(ITfThreadMgrEx *iface)
|
||||
+static HRESULT WINAPI ThreadMgr_Deactivate(ITfThreadMgrEx *iface)
|
||||
{
|
||||
ThreadMgr *This = impl_from_ITfThreadMgrEx(iface);
|
||||
TRACE("(%p)\n",This);
|
||||
@@ -597,8 +583,25 @@ static HRESULT WINAPI ThreadMgr_ActivateEx(ITfThreadMgrEx *iface, TfClientId *id
|
||||
{
|
||||
ThreadMgr *This = impl_from_ITfThreadMgrEx(iface);
|
||||
|
||||
- FIXME("STUB:(%p)\n", This);
|
||||
- return E_NOTIMPL;
|
||||
+ TRACE("(%p) %p, %#x\n", This, id, flags);
|
||||
+
|
||||
+ if (!id)
|
||||
+ return E_INVALIDARG;
|
||||
+
|
||||
+ if (flags)
|
||||
+ FIXME("Unimplemented flags %#x\n", flags);
|
||||
+
|
||||
+ if (!processId)
|
||||
+ {
|
||||
+ GUID guid;
|
||||
+ CoCreateGuid(&guid);
|
||||
+ ITfClientId_GetClientId(&This->ITfClientId_iface, &guid, &processId);
|
||||
+ }
|
||||
+
|
||||
+ activate_textservices((ITfThreadMgr *)iface);
|
||||
+ This->activationCount++;
|
||||
+ *id = processId;
|
||||
+ return S_OK;
|
||||
}
|
||||
|
||||
static HRESULT WINAPI ThreadMgr_GetActiveFlags(ITfThreadMgrEx *iface, DWORD *flags)
|
||||
@@ -614,8 +617,8 @@ static const ITfThreadMgrExVtbl ThreadMgrExVtbl =
|
||||
ThreadMgr_QueryInterface,
|
||||
ThreadMgr_AddRef,
|
||||
ThreadMgr_Release,
|
||||
- ThreadMgr_fnActivate,
|
||||
- ThreadMgr_fnDeactivate,
|
||||
+ ThreadMgr_Activate,
|
||||
+ ThreadMgr_Deactivate,
|
||||
ThreadMgr_CreateDocumentMgr,
|
||||
ThreadMgr_EnumDocumentMgrs,
|
||||
ThreadMgr_GetFocus,
|
||||
--
|
||||
2.6.2
|
||||
|
@ -1 +0,0 @@
|
||||
Fixes: [39564] Add partial implementation of ITfThreadMgrEx_ActivateEx
|
@ -1,26 +0,0 @@
|
||||
From bedf1085f5229c85f990f3c0f41c62a47fef6c40 Mon Sep 17 00:00:00 2001
|
||||
From: Sebastian Lackner <sebastian@fds-team.de>
|
||||
Date: Sat, 28 Nov 2015 21:28:26 +0100
|
||||
Subject: ntdll: Commit new guard pages in virtual_handle_stack_fault. (resend)
|
||||
|
||||
Signed-off-by: Sebastian Lackner <sebastian@fds-team.de>
|
||||
---
|
||||
dlls/ntdll/virtual.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c
|
||||
index 4d4bc3b..d6319d82 100644
|
||||
--- a/dlls/ntdll/virtual.c
|
||||
+++ b/dlls/ntdll/virtual.c
|
||||
@@ -1550,7 +1550,7 @@ BOOL virtual_handle_stack_fault( void *addr )
|
||||
if ((char *)page >= (char *)NtCurrentTeb()->DeallocationStack + 2*page_size)
|
||||
{
|
||||
vprot = view->prot[((char *)page - page_size - (char *)view->base) >> page_shift];
|
||||
- VIRTUAL_SetProt( view, (char *)page - page_size, page_size, vprot | VPROT_GUARD );
|
||||
+ VIRTUAL_SetProt( view, (char *)page - page_size, page_size, vprot | VPROT_COMMITTED | VPROT_GUARD );
|
||||
}
|
||||
ret = TRUE;
|
||||
}
|
||||
--
|
||||
2.6.2
|
||||
|
@ -1,107 +0,0 @@
|
||||
From 2a4736b15317859868a6d0133d60443325605703 Mon Sep 17 00:00:00 2001
|
||||
From: Sebastian Lackner <sebastian@fds-team.de>
|
||||
Date: Sat, 28 Nov 2015 21:28:48 +0100
|
||||
Subject: kernel32/tests: Add tests for committing stack guard pages. (v2)
|
||||
|
||||
Signed-off-by: Sebastian Lackner <sebastian@fds-team.de>
|
||||
---
|
||||
dlls/kernel32/tests/virtual.c | 76 +++++++++++++++++++++++++++++++++++++++++++
|
||||
1 file changed, 76 insertions(+)
|
||||
|
||||
diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c
|
||||
index e80ba38..e614bde 100644
|
||||
--- a/dlls/kernel32/tests/virtual.c
|
||||
+++ b/dlls/kernel32/tests/virtual.c
|
||||
@@ -2048,6 +2048,81 @@ static void test_guard_page(void)
|
||||
VirtualFree( base, 0, MEM_FREE );
|
||||
}
|
||||
|
||||
+static DWORD WINAPI stack_commit_func( void *arg )
|
||||
+{
|
||||
+ volatile char *p = (char *)&p;
|
||||
+
|
||||
+ /* trigger all guard pages, to ensure that the pages are committed */
|
||||
+ while (p >= (char *)pNtCurrentTeb()->DeallocationStack + 3 * 0x1000)
|
||||
+ {
|
||||
+ p[0] |= 0;
|
||||
+ p -= 0x1000;
|
||||
+ }
|
||||
+
|
||||
+ ok( arg == (void *)0xdeadbeef, "expected 0xdeadbeef, got %p\n", arg );
|
||||
+ return 42;
|
||||
+}
|
||||
+
|
||||
+static void test_stack_commit(void)
|
||||
+{
|
||||
+ static const char code_call_on_stack[] = {
|
||||
+ 0x55, /* pushl %ebp */
|
||||
+ 0x56, /* pushl %esi */
|
||||
+ 0x89, 0xe6, /* movl %esp,%esi */
|
||||
+ 0x8b, 0x4c, 0x24, 0x0c, /* movl 12(%esp),%ecx - func */
|
||||
+ 0x8b, 0x54, 0x24, 0x10, /* movl 16(%esp),%edx - arg */
|
||||
+ 0x8b, 0x44, 0x24, 0x14, /* movl 20(%esp),%eax - stack */
|
||||
+ 0x83, 0xe0, 0xf0, /* andl $~15,%eax */
|
||||
+ 0x83, 0xe8, 0x0c, /* subl $12,%eax */
|
||||
+ 0x89, 0xc4, /* movl %eax,%esp */
|
||||
+ 0x52, /* pushl %edx */
|
||||
+ 0x31, 0xed, /* xorl %ebp,%ebp */
|
||||
+ 0xff, 0xd1, /* call *%ecx */
|
||||
+ 0x89, 0xf4, /* movl %esi,%esp */
|
||||
+ 0x5e, /* popl %esi */
|
||||
+ 0x5d, /* popl %ebp */
|
||||
+ 0xc2, 0x0c, 0x00 }; /* ret $12 */
|
||||
+
|
||||
+ DWORD (WINAPI *call_on_stack)( DWORD (WINAPI *func)(void *), void *arg, void *stack );
|
||||
+ void *old_stack, *old_stack_base, *old_stack_limit;
|
||||
+ void *new_stack, *new_stack_base;
|
||||
+ DWORD result;
|
||||
+
|
||||
+ if (!pNtCurrentTeb)
|
||||
+ {
|
||||
+ win_skip( "NtCurrentTeb not supported\n" );
|
||||
+ return;
|
||||
+ }
|
||||
+
|
||||
+ call_on_stack = VirtualAlloc( 0, 0x1000, MEM_RESERVE | MEM_COMMIT, PAGE_EXECUTE_READWRITE );
|
||||
+ ok( call_on_stack != NULL, "VirtualAlloc failed %u\n", GetLastError() );
|
||||
+ memcpy( call_on_stack, code_call_on_stack, sizeof(code_call_on_stack) );
|
||||
+
|
||||
+ /* allocate a new stack, only the first guard page is committed */
|
||||
+ new_stack = VirtualAlloc( 0, 0x400000, MEM_RESERVE, PAGE_READWRITE );
|
||||
+ ok( new_stack != NULL, "VirtualAlloc failed %u\n", GetLastError() );
|
||||
+ new_stack_base = (char *)new_stack + 0x400000;
|
||||
+ VirtualAlloc( (char *)new_stack_base - 0x1000, 0x1000, MEM_COMMIT, PAGE_READWRITE | PAGE_GUARD );
|
||||
+
|
||||
+ old_stack = pNtCurrentTeb()->DeallocationStack;
|
||||
+ old_stack_base = pNtCurrentTeb()->Tib.StackBase;
|
||||
+ old_stack_limit = pNtCurrentTeb()->Tib.StackLimit;
|
||||
+
|
||||
+ pNtCurrentTeb()->DeallocationStack = new_stack;
|
||||
+ pNtCurrentTeb()->Tib.StackBase = new_stack_base;
|
||||
+ pNtCurrentTeb()->Tib.StackLimit = new_stack_base;
|
||||
+
|
||||
+ result = call_on_stack( stack_commit_func, (void *)0xdeadbeef, new_stack_base );
|
||||
+ ok( result == 42, "expected 42, got %u\n", result );
|
||||
+
|
||||
+ pNtCurrentTeb()->DeallocationStack = old_stack;
|
||||
+ pNtCurrentTeb()->Tib.StackBase = old_stack_base;
|
||||
+ pNtCurrentTeb()->Tib.StackLimit = old_stack_limit;
|
||||
+
|
||||
+ VirtualFree( new_stack, 0, MEM_FREE );
|
||||
+ VirtualFree( call_on_stack, 0, MEM_FREE );
|
||||
+}
|
||||
+
|
||||
DWORD num_execute_fault_calls;
|
||||
|
||||
static DWORD execute_fault_seh_handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_RECORD *frame,
|
||||
@@ -3772,6 +3847,7 @@ START_TEST(virtual)
|
||||
test_write_watch();
|
||||
#ifdef __i386__
|
||||
test_guard_page();
|
||||
+ test_stack_commit();
|
||||
/* The following tests should be executed as a last step, and in exactly this
|
||||
* order, since ATL thunk emulation cannot be enabled anymore on Windows. */
|
||||
test_atl_thunk_emulation( MEM_EXECUTE_OPTION_ENABLE );
|
||||
--
|
||||
2.6.2
|
||||
|
@ -1 +0,0 @@
|
||||
Fixes: Fix access violation in MSYS2 git when cloning repository
|
@ -54,7 +54,7 @@ index 238c953..4a112ef 100644
|
||||
@@ -689,7 +689,7 @@
|
||||
@ stub MmLockPagableImageSection
|
||||
@ stdcall MmLockPagableSectionByHandle(ptr)
|
||||
@ stdcall MmMapIoSpace(long long long long)
|
||||
@ stdcall MmMapIoSpace(int64 long long)
|
||||
-@ stub MmMapLockedPages
|
||||
+@ stdcall MmMapLockedPages(ptr long)
|
||||
@ stdcall MmMapLockedPagesSpecifyCache(ptr long long ptr long long)
|
||||
|
@ -52,13 +52,13 @@ usage()
|
||||
# Get the upstream commit sha
|
||||
upstream_commit()
|
||||
{
|
||||
echo "e6c67c52757508ce92c3819bb14e87c2ab21fa20"
|
||||
echo "66d8e38ba4c5d67ae6e287cac557acfeae8b5bcd"
|
||||
}
|
||||
|
||||
# Show version information
|
||||
version()
|
||||
{
|
||||
echo "Wine Staging 1.8-rc2"
|
||||
echo "Wine Staging 1.8-rc3 (unreleased)"
|
||||
echo "Copyright (C) 2014-2015 the Wine Staging project authors."
|
||||
echo ""
|
||||
echo "Patchset to be applied on upstream Wine:"
|
||||
@ -175,7 +175,6 @@ patch_enable_all ()
|
||||
enable_mountmgr_DosDevices="$1"
|
||||
enable_mpr_WNetGetUniversalNameW="$1"
|
||||
enable_mscoree_CorValidateImage="$1"
|
||||
enable_msctf_ITfThreadMgrEx_ActivateEx="$1"
|
||||
enable_mshtml_HTMLLocation_put_hash="$1"
|
||||
enable_msidb_Implementation="$1"
|
||||
enable_msvcrt_Math_Precision="$1"
|
||||
@ -208,7 +207,6 @@ patch_enable_all ()
|
||||
enable_ntdll_ProcessQuotaLimits="$1"
|
||||
enable_ntdll_Purist_Mode="$1"
|
||||
enable_ntdll_RtlIpStringToAddress="$1"
|
||||
enable_ntdll_Stack_Fault="$1"
|
||||
enable_ntdll_Status_Mapping="$1"
|
||||
enable_ntdll_Syscall_Wrappers="$1"
|
||||
enable_ntdll_SystemHandleInformation="$1"
|
||||
@ -296,7 +294,6 @@ patch_enable_all ()
|
||||
enable_uxtheme_GTK_Theming="$1"
|
||||
enable_version_VerQueryValue="$1"
|
||||
enable_wbemdisp_ISWbemSecurity="$1"
|
||||
enable_wine_inf_Dynamic_DST="$1"
|
||||
enable_wine_inf_Performance="$1"
|
||||
enable_wine_inf_ProfileList_UserSID="$1"
|
||||
enable_wineboot_DriveSerial="$1"
|
||||
@ -640,9 +637,6 @@ patch_enable ()
|
||||
mscoree-CorValidateImage)
|
||||
enable_mscoree_CorValidateImage="$2"
|
||||
;;
|
||||
msctf-ITfThreadMgrEx_ActivateEx)
|
||||
enable_msctf_ITfThreadMgrEx_ActivateEx="$2"
|
||||
;;
|
||||
mshtml-HTMLLocation_put_hash)
|
||||
enable_mshtml_HTMLLocation_put_hash="$2"
|
||||
;;
|
||||
@ -739,9 +733,6 @@ patch_enable ()
|
||||
ntdll-RtlIpStringToAddress)
|
||||
enable_ntdll_RtlIpStringToAddress="$2"
|
||||
;;
|
||||
ntdll-Stack_Fault)
|
||||
enable_ntdll_Stack_Fault="$2"
|
||||
;;
|
||||
ntdll-Status_Mapping)
|
||||
enable_ntdll_Status_Mapping="$2"
|
||||
;;
|
||||
@ -1003,9 +994,6 @@ patch_enable ()
|
||||
wbemdisp-ISWbemSecurity)
|
||||
enable_wbemdisp_ISWbemSecurity="$2"
|
||||
;;
|
||||
wine.inf-Dynamic_DST)
|
||||
enable_wine_inf_Dynamic_DST="$2"
|
||||
;;
|
||||
wine.inf-Performance)
|
||||
enable_wine_inf_Performance="$2"
|
||||
;;
|
||||
@ -3819,21 +3807,6 @@ if test "$enable_mscoree_CorValidateImage" -eq 1; then
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset msctf-ITfThreadMgrEx_ActivateEx
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
# | * [#39564] Add partial implementation of ITfThreadMgrEx_ActivateEx
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * dlls/msctf/tests/inputprocessor.c, dlls/msctf/threadmgr.c
|
||||
# |
|
||||
if test "$enable_msctf_ITfThreadMgrEx_ActivateEx" -eq 1; then
|
||||
patch_apply msctf-ITfThreadMgrEx_ActivateEx/0001-msctf-Add-a-partial-implementation-of-ITfThreadMgrEx.patch
|
||||
(
|
||||
echo '+ { "Matteo Bruni", "msctf: Add a partial implementation of ITfThreadMgrEx_ActivateEx().", 1 },';
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset mshtml-HTMLLocation_put_hash
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
@ -4373,20 +4346,6 @@ if test "$enable_ntdll_RtlIpStringToAddress" -eq 1; then
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset ntdll-Stack_Fault
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * dlls/kernel32/tests/virtual.c, dlls/ntdll/virtual.c
|
||||
# |
|
||||
if test "$enable_ntdll_Stack_Fault" -eq 1; then
|
||||
patch_apply ntdll-Stack_Fault/0001-ntdll-Commit-new-guard-pages-in-virtual_handle_stack.patch
|
||||
patch_apply ntdll-Stack_Fault/0002-kernel32-tests-Add-tests-for-committing-stack-guard-.patch
|
||||
(
|
||||
echo '+ { "Sebastian Lackner", "ntdll: Commit new guard pages in virtual_handle_stack_fault.", 1 },';
|
||||
echo '+ { "Sebastian Lackner", "kernel32/tests: Add tests for committing stack guard pages.", 2 },';
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset ntdll-Status_Mapping
|
||||
# |
|
||||
# | Modified files:
|
||||
@ -5737,18 +5696,6 @@ if test "$enable_wbemdisp_ISWbemSecurity" -eq 1; then
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset wine.inf-Dynamic_DST
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * loader/wine.inf.in
|
||||
# |
|
||||
if test "$enable_wine_inf_Dynamic_DST" -eq 1; then
|
||||
patch_apply wine.inf-Dynamic_DST/0001-wine.inf-Add-information-for-delayed-end-of-DST-in-E.patch
|
||||
(
|
||||
echo '+ { "Sebastian Lackner", "wine.inf: Add information for delayed end of DST in Europe/Istanbul.", 1 },';
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset wine.inf-Performance
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
|
@ -1,25 +0,0 @@
|
||||
From 6008262f4361906dc6c591340787ad38ecc05e4c Mon Sep 17 00:00:00 2001
|
||||
From: Sebastian Lackner <sebastian@fds-team.de>
|
||||
Date: Sat, 28 Nov 2015 22:00:28 +0100
|
||||
Subject: wine.inf: Add information for delayed end of DST in Europe/Istanbul.
|
||||
|
||||
Signed-off-by: Sebastian Lackner <sebastian@fds-team.de>
|
||||
---
|
||||
loader/wine.inf.in | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/loader/wine.inf.in b/loader/wine.inf.in
|
||||
index 7773377..58a8d1d 100644
|
||||
--- a/loader/wine.inf.in
|
||||
+++ b/loader/wine.inf.in
|
||||
@@ -3084,6 +3084,7 @@ HKLM,%CurrentVersionNT%\Time Zones\Turkey Standard Time,"Display",,"Europe/Istan
|
||||
HKLM,%CurrentVersionNT%\Time Zones\Turkey Standard Time,"Dlt",,"Turkey Daylight Time"
|
||||
HKLM,%CurrentVersionNT%\Time Zones\Turkey Standard Time,"Std",,"Turkey Standard Time"
|
||||
HKLM,%CurrentVersionNT%\Time Zones\Turkey Standard Time,"TZI",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,04,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,03,00,00,00,00,00,00,00
|
||||
+HKLM,%CurrentVersionNT%\Time Zones\Turkey Standard Time\Dynamic DST,"2015",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,df,07,0b,00,00,00,08,00,04,00,00,00,00,00,00,00,df,07,03,00,00,00,1d,00,03,00,00,00,00,00,00,00
|
||||
HKLM,%CurrentVersionNT%\Time Zones\Ulaanbaatar Standard Time,"Display",,"Asia/Ulaanbaatar"
|
||||
HKLM,%CurrentVersionNT%\Time Zones\Ulaanbaatar Standard Time,"Dlt",,"Ulaanbaatar Daylight Time"
|
||||
HKLM,%CurrentVersionNT%\Time Zones\Ulaanbaatar Standard Time,"Std",,"Ulaanbaatar Standard Time"
|
||||
--
|
||||
2.6.2
|
||||
|
@ -1 +0,0 @@
|
||||
Fixes: Add information for delayed end of DST in Europe/Istanbul
|
File diff suppressed because it is too large
Load Diff
@ -1,3 +1,11 @@
|
||||
wine-staging (1.8~rc3) UNRELEASED; urgency=low
|
||||
* Removed patch for delayed end of DST in Europe/Istanbul (accepted upstream).
|
||||
* Removed patch to add partial implementation of ITfThreadMgrEx_ActivateEx
|
||||
(accepted upstream).
|
||||
* Removed patch to fix access violation in MSYS2 git when cloning repository
|
||||
(accepted upstream).
|
||||
-- Sebastian Lackner <sebastian@fds-team.de> Tue, 01 Dec 2015 02:35:10 +0100
|
||||
|
||||
wine-staging (1.8~rc2) unstable; urgency=low
|
||||
* Updated patch to commit page when handling stack fault, and add tests.
|
||||
* Removed patch to revert "prepare GLresources before calling
|
||||
|
Loading…
x
Reference in New Issue
Block a user