mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2025-01-28 22:04:43 -08:00
Removed multiple patchsets (accepted upstream).
This commit is contained in:
Sebastian Lackner
parent
2821e85d06
commit
13a3cadc66
12
README.md
12
README.md
@ -75,7 +75,7 @@ for more details.*
|
||||
* Add support for CopyFileEx progress callback ([Wine Bug #22692](https://bugs.winehq.org/show_bug.cgi?id=22692))
|
||||
* Add support for GetPropValue to PulseAudio backend
|
||||
* Adobe Reader needs ITextSelection_fnGetDuplicate implementation
|
||||
* Allow NULL pointer as keystate argument in ToUnicodeEx ([Wine Bug #38353](https://bugs.winehq.org/show_bug.cgi?id=38353))
|
||||
* ~~Allow NULL pointer as keystate argument in ToUnicodeEx~~ ([Wine Bug #38353](https://bugs.winehq.org/show_bug.cgi?id=38353))
|
||||
* Allow selection of audio device for PulseAudio backend
|
||||
* Allow special characters in pipe names ([Wine Bug #28995](https://bugs.winehq.org/show_bug.cgi?id=28995))
|
||||
* Allow to cancel a file operation via progress callback ([Wine Bug #22690](https://bugs.winehq.org/show_bug.cgi?id=22690))
|
||||
@ -88,7 +88,7 @@ for more details.*
|
||||
* Avoid race-conditions in NtReadFile() operations with write watches.
|
||||
* Avoid race-conditions of async WSARecv() operations with write watches.
|
||||
* Avoid race-conditions with write watches in WS2_async_accept.
|
||||
* Avoid spam of FIXME messages for PsLookupProcessByProcessId stub ([Wine Bug #36821](https://bugs.winehq.org/show_bug.cgi?id=36821))
|
||||
* ~~Avoid spam of FIXME messages for PsLookupProcessByProcessId stub~~ ([Wine Bug #36821](https://bugs.winehq.org/show_bug.cgi?id=36821))
|
||||
* Avseq crashes when multisampling is enabled ([Wine Bug #31998](https://bugs.winehq.org/show_bug.cgi?id=31998))
|
||||
* Basic handling of write watches triggered while we're on the signal stack.
|
||||
* Basic support for CUDA
|
||||
@ -98,7 +98,7 @@ for more details.*
|
||||
* D3DCompileShader should filter specific warning messages ([Wine Bug #33770](https://bugs.winehq.org/show_bug.cgi?id=33770))
|
||||
* Do not append duplicate NULL characters when importing keys with regedit ([Wine Bug #37575](https://bugs.winehq.org/show_bug.cgi?id=37575))
|
||||
* Do not fail when a used context is passed to wglShareLists ([Wine Bug #11436](https://bugs.winehq.org/show_bug.cgi?id=11436))
|
||||
* Don't return an error in WS_select when EINTR happens during timeout
|
||||
* ~~Don't return an error in WS_select when EINTR happens during timeout~~
|
||||
* EA Origin needs support for job objects ([Wine Bug #33723](https://bugs.winehq.org/show_bug.cgi?id=33723))
|
||||
* Emulate access to KI_USER_SHARED_DATA kernel page on x86_64 ([Wine Bug #33849](https://bugs.winehq.org/show_bug.cgi?id=33849))
|
||||
* Enforce that surfaces are flushed after ReleaseDC
|
||||
@ -111,7 +111,7 @@ for more details.*
|
||||
* Fix NULL dereference in ICSeqCompressFrameStart ([Wine Bug #27595](https://bugs.winehq.org/show_bug.cgi?id=27595))
|
||||
* Fix access violation when calling GetStringTypeW with NULL src. ([Wine Bug #37759](https://bugs.winehq.org/show_bug.cgi?id=37759))
|
||||
* Fix black screen on startup introduced by pixelformat changes. ([Wine Bug #35950](https://bugs.winehq.org/show_bug.cgi?id=35950))
|
||||
* Fix calculation of 3D sound source ([Wine Bug #38041](https://bugs.winehq.org/show_bug.cgi?id=38041))
|
||||
* ~~Fix calculation of 3D sound source~~ ([Wine Bug #38041](https://bugs.winehq.org/show_bug.cgi?id=38041))
|
||||
* Fix caps lock state issues with multiple processes ([Wine Bug #35907](https://bugs.winehq.org/show_bug.cgi?id=35907))
|
||||
* Fix comparison of punctuation characters in lstrcmp ([Wine Bug #10767](https://bugs.winehq.org/show_bug.cgi?id=10767))
|
||||
* Fix compatibility of Uplay with gnutls28 ([Wine Bug #38134](https://bugs.winehq.org/show_bug.cgi?id=38134))
|
||||
@ -131,7 +131,7 @@ for more details.*
|
||||
* Fix handling of empty section and key name for profile files. ([Wine Bug #8036](https://bugs.winehq.org/show_bug.cgi?id=8036))
|
||||
* Fix handling of invert_y in DrawTextExW ([Wine Bug #22109](https://bugs.winehq.org/show_bug.cgi?id=22109))
|
||||
* Fix handling of window attributes for WS_EX_LAYERED | WS_EX_COMPOSITED ([Wine Bug #37876](https://bugs.winehq.org/show_bug.cgi?id=37876))
|
||||
* Fix invalid memory access in get_registry_locale_info ([Wine Bug #38344](https://bugs.winehq.org/show_bug.cgi?id=38344))
|
||||
* ~~Fix invalid memory access in get_registry_locale_info~~ ([Wine Bug #38344](https://bugs.winehq.org/show_bug.cgi?id=38344))
|
||||
* Fix issues with dragging layers between images in Adobe Photoshop 7.0 ([Wine Bug #12007](https://bugs.winehq.org/show_bug.cgi?id=12007))
|
||||
* Fix missing video introduced by pixelformat changes. ([Wine Bug #36900](https://bugs.winehq.org/show_bug.cgi?id=36900))
|
||||
* Fix multithreading issues with fullscreen clipping ([Wine Bug #38087](https://bugs.winehq.org/show_bug.cgi?id=38087))
|
||||
@ -206,7 +206,7 @@ for more details.*
|
||||
* Return correct IMediaSeeking stream positions in quartz ([Wine Bug #23174](https://bugs.winehq.org/show_bug.cgi?id=23174))
|
||||
* Return correct device type for cd devices without medium
|
||||
* Return correct values for GetThreadTimes function ([Wine Bug #20230](https://bugs.winehq.org/show_bug.cgi?id=20230))
|
||||
* Return more context attributes in schan_InitializeSecurityContextW ([Wine Bug #37527](https://bugs.winehq.org/show_bug.cgi?id=37527))
|
||||
* ~~Return more context attributes in schan_InitializeSecurityContextW~~ ([Wine Bug #37527](https://bugs.winehq.org/show_bug.cgi?id=37527))
|
||||
* SO_CONNECT_TIME returns the appropriate time
|
||||
* Scrolling causes mouse and screen to lock in Call to Power II ([Wine Bug #34559](https://bugs.winehq.org/show_bug.cgi?id=34559))
|
||||
* Send WM_PAINT event during dialog creation ([Wine Bug #35652](https://bugs.winehq.org/show_bug.cgi?id=35652))
|
||||
|
||||
5
debian/changelog
vendored
5
debian/changelog
vendored
@ -2,6 +2,11 @@ wine-staging (1.7.41) UNRELEASED; urgency=low
|
||||
* Disable DXVA2 controls in winecfg when support is not compiled in.
|
||||
* Added patch to enable/disable EAX support via winecfg.
|
||||
* Added tests for RtlIpv6AddressToString and RtlIpv6AddressToStringEx.
|
||||
* Removed patches to fix invalid memory access in get_registry_locale_info (accepted upstream).
|
||||
* Removed patches to avoid repeated FIXMEs in PsLookupProcessByProcessId stub (accepted upstream).
|
||||
* Removed patches to return more context attributes in schan_InitializeSecurityContextW (accepted upstream).
|
||||
* Removed patches to allow NULL pointer as keystate in ToUnicodeEx (accepted upstream).
|
||||
* Removed patches to avoid returning an error in WS_select when EINTR happens during timeout (accepted upstream).
|
||||
* Partially remove advapi32-Revert_DACL patches.
|
||||
-- Sebastian Lackner <sebastian@fds-team.de> Sun, 05 Apr 2015 03:11:58 +0200
|
||||
|
||||
|
||||
@ -1,66 +0,0 @@
|
||||
From a0b63f4c0c9695606fe8466cb9574ebfb9230d7b Mon Sep 17 00:00:00 2001
|
||||
From: Stas Cymbalov <dummyunit@gmail.com>
|
||||
Date: Sun, 22 Mar 2015 18:22:49 +0300
|
||||
Subject: dsound: Fix angle to sound source calculation.
|
||||
|
||||
This patch fixes incorrect sound positioning in dsound.
|
||||
As of now, angle to sound source is calculated as angle between
|
||||
vDistance and vOrientFront.
|
||||
This leads to incorrect results for all sources that are not in the
|
||||
same plane as speakers.
|
||||
In extreme case: for sources directly above or below origin, angle is
|
||||
calculated to -90 degrees, and they are played in the left speaker.
|
||||
|
||||
This patch changes angle calculation: angle to sound source is
|
||||
calculated as angle between vDistance and plane given by vectors
|
||||
vOrientFront and vOrientTop.
|
||||
---
|
||||
dlls/dsound/sound3d.c | 25 ++++++++++++++-----------
|
||||
1 file changed, 14 insertions(+), 11 deletions(-)
|
||||
|
||||
diff --git a/dlls/dsound/sound3d.c b/dlls/dsound/sound3d.c
|
||||
index 9a0226a..ffd4d45 100644
|
||||
--- a/dlls/dsound/sound3d.c
|
||||
+++ b/dlls/dsound/sound3d.c
|
||||
@@ -112,7 +112,6 @@ static inline D3DVALUE AngleBetweenVectorsRad (const D3DVECTOR *a, const D3DVECT
|
||||
|
||||
cos = product/(la*lb);
|
||||
angle = acos(cos);
|
||||
- if (cos < 0.0f) { angle -= M_PI; }
|
||||
TRACE("angle between (%f,%f,%f) and (%f,%f,%f) = %f radians (%f degrees)\n", a->x, a->y, a->z, b->x,
|
||||
b->y, b->z, angle, RadToDeg(angle));
|
||||
return angle;
|
||||
@@ -264,16 +263,20 @@ void DSOUND_Calc3DBuffer(IDirectSoundBufferImpl *dsb)
|
||||
else
|
||||
{
|
||||
vLeft = VectorProduct(&dsb->device->ds3dl.vOrientFront, &dsb->device->ds3dl.vOrientTop);
|
||||
- flAngle = AngleBetweenVectorsRad(&dsb->device->ds3dl.vOrientFront, &vDistance);
|
||||
- flAngle2 = AngleBetweenVectorsRad(&vLeft, &vDistance);
|
||||
-
|
||||
- /* AngleBetweenVectorsRad performs a dot product, which gives us the cosine of the angle
|
||||
- * between two vectors. Unfortunately, because cos(theta) = cos(-theta), we've no idea from
|
||||
- * this whether the sound is to our left or to our right. We have to perform another dot
|
||||
- * product, with a vector at right angles to the initial one, to get the correct angle.
|
||||
- * The angle should be between -180 degrees and 180 degrees. */
|
||||
- if (flAngle < 0.0f) { flAngle += M_PI; }
|
||||
- if (flAngle2 > 0.0f) { flAngle = -flAngle; }
|
||||
+ /* To calculate angle to sound source we need to:
|
||||
+ * 1) Get angle between vDistance and a plane on which angle to sound source should be 0.
|
||||
+ * Such a plane is given by vectors vOrientFront and vOrientTop, and angle between vector
|
||||
+ * and a plane equals to M_PI_2 - angle between vector and normal to this plane (vLeft in this case).
|
||||
+ * 2) Determine if the source is behind or in front of us by calculating angle between vDistance
|
||||
+ * and vOrientFront.
|
||||
+ */
|
||||
+ flAngle = AngleBetweenVectorsRad(&vLeft, &vDistance);
|
||||
+ flAngle2 = AngleBetweenVectorsRad(&dsb->device->ds3dl.vOrientFront, &vDistance);
|
||||
+ if (flAngle2 > M_PI_2)
|
||||
+ flAngle = -flAngle;
|
||||
+ flAngle -= M_PI_2;
|
||||
+ if (flAngle < -M_PI)
|
||||
+ flAngle += 2*M_PI;
|
||||
}
|
||||
TRACE("panning: Angle = %f rad, lPan = %d\n", flAngle, dsb->volpan.lPan);
|
||||
|
||||
--
|
||||
2.3.3
|
||||
|
||||
@ -1 +0,0 @@
|
||||
Fixes: [38041] Fix calculation of 3D sound source
|
||||
@ -1,45 +0,0 @@
|
||||
From dc6ade01aa4c28b675218453d7da818af1a6f827 Mon Sep 17 00:00:00 2001
|
||||
From: Sebastian Lackner <sebastian@fds-team.de>
|
||||
Date: Sun, 23 Nov 2014 22:50:34 +0100
|
||||
Subject: include: Automatically detect if tests are running under Wine when
|
||||
WINETEST_PLATFORM is not specified.
|
||||
|
||||
---
|
||||
include/wine/test.h | 14 +++++++++++++-
|
||||
1 file changed, 13 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/include/wine/test.h b/include/wine/test.h
|
||||
index f8b608f..567229a 100644
|
||||
--- a/include/wine/test.h
|
||||
+++ b/include/wine/test.h
|
||||
@@ -618,6 +618,14 @@ static LONG CALLBACK exc_filter( EXCEPTION_POINTERS *ptrs )
|
||||
return EXCEPTION_EXECUTE_HANDLER;
|
||||
}
|
||||
|
||||
+/* check if we're running under wine */
|
||||
+static BOOL running_under_wine(void)
|
||||
+{
|
||||
+ HMODULE module = GetModuleHandleA( "ntdll.dll" );
|
||||
+ if (!module) return FALSE;
|
||||
+ return (GetProcAddress( module, "wine_server_call" ) != NULL);
|
||||
+}
|
||||
+
|
||||
#ifdef __GNUC__
|
||||
void _fpreset(void) {} /* override the mingw fpu init code */
|
||||
#endif
|
||||
@@ -632,7 +640,11 @@ int main( int argc, char **argv )
|
||||
winetest_argc = argc;
|
||||
winetest_argv = argv;
|
||||
|
||||
- if (GetEnvironmentVariableA( "WINETEST_PLATFORM", p, sizeof(p) )) winetest_platform = strdup(p);
|
||||
+ if (GetEnvironmentVariableA( "WINETEST_PLATFORM", p, sizeof(p) ))
|
||||
+ winetest_platform = strdup(p);
|
||||
+ else if (running_under_wine())
|
||||
+ winetest_platform = "wine";
|
||||
+
|
||||
if (GetEnvironmentVariableA( "WINETEST_DEBUG", p, sizeof(p) )) winetest_debug = atoi(p);
|
||||
if (GetEnvironmentVariableA( "WINETEST_INTERACTIVE", p, sizeof(p) )) winetest_interactive = atoi(p);
|
||||
if (GetEnvironmentVariableA( "WINETEST_REPORT_SUCCESS", p, sizeof(p) )) report_success = atoi(p);
|
||||
--
|
||||
2.1.3
|
||||
|
||||
@ -1,46 +0,0 @@
|
||||
From 702df8220cc4393c65e280d3706311dd0a41ded1 Mon Sep 17 00:00:00 2001
|
||||
From: Sebastian Lackner <sebastian@fds-team.de>
|
||||
Date: Fri, 3 Apr 2015 14:44:27 +0200
|
||||
Subject: kernel32: Fix calculation of returned buffer in
|
||||
get_registry_locale_info.
|
||||
|
||||
Fixes a regression introduced by 8826ba1bc86fefa22c543608585ae8f3b4310a5f.
|
||||
We cannot decide if we have to append a terminating null char unless we have queried again with a bigger buffer.
|
||||
---
|
||||
dlls/kernel32/locale.c | 13 +++++++++++--
|
||||
1 file changed, 11 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c
|
||||
index afc5b9d..7798b91 100644
|
||||
--- a/dlls/kernel32/locale.c
|
||||
+++ b/dlls/kernel32/locale.c
|
||||
@@ -1177,6 +1177,17 @@ static INT get_registry_locale_info( struct registry_value *registry_value, LPWS
|
||||
|
||||
status = NtQueryValueKey( hkey, &nameW, KeyValuePartialInformation, info, size, &size );
|
||||
|
||||
+ /* try again with a bigger buffer when we have to return the correct size */
|
||||
+ if (status == STATUS_BUFFER_OVERFLOW && !buffer && size > info_size)
|
||||
+ {
|
||||
+ KEY_VALUE_PARTIAL_INFORMATION *new_info;
|
||||
+ if ((new_info = HeapReAlloc( GetProcessHeap(), 0, info, size )))
|
||||
+ {
|
||||
+ info = new_info;
|
||||
+ status = NtQueryValueKey( hkey, &nameW, KeyValuePartialInformation, info, size, &size );
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
NtClose( hkey );
|
||||
|
||||
if (!status)
|
||||
@@ -1207,8 +1218,6 @@ static INT get_registry_locale_info( struct registry_value *registry_value, LPWS
|
||||
if (status == STATUS_BUFFER_OVERFLOW && !buffer)
|
||||
{
|
||||
ret = (size - info_size) / sizeof(WCHAR);
|
||||
- if (!ret || ((WCHAR *)&info->Data)[ret-1])
|
||||
- ret++;
|
||||
}
|
||||
else if (status == STATUS_OBJECT_NAME_NOT_FOUND)
|
||||
{
|
||||
--
|
||||
2.3.3
|
||||
|
||||
@ -1 +0,0 @@
|
||||
Fixes: [38344] Fix invalid memory access in get_registry_locale_info
|
||||
@ -1,27 +0,0 @@
|
||||
From 7c0c2b354c261c898ac9acfea575cc022a1bbb34 Mon Sep 17 00:00:00 2001
|
||||
From: Sebastian Lackner <sebastian@fds-team.de>
|
||||
Date: Fri, 27 Mar 2015 08:15:14 +0100
|
||||
Subject: ntoskrnl: Avoid repeated FIXME messages in
|
||||
PsLookupProcessByProcessId.
|
||||
|
||||
---
|
||||
dlls/ntoskrnl.exe/ntoskrnl.c | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c
|
||||
index 95dcdc9..bb26424 100644
|
||||
--- a/dlls/ntoskrnl.exe/ntoskrnl.c
|
||||
+++ b/dlls/ntoskrnl.exe/ntoskrnl.c
|
||||
@@ -1885,7 +1885,8 @@ NTSTATUS WINAPI PsSetLoadImageNotifyRoutine(PLOAD_IMAGE_NOTIFY_ROUTINE routine)
|
||||
*/
|
||||
NTSTATUS WINAPI PsLookupProcessByProcessId(HANDLE processid, PEPROCESS *process)
|
||||
{
|
||||
- FIXME("(%p %p) stub\n", processid, process);
|
||||
+ static int once;
|
||||
+ if (!once++) FIXME("(%p %p) stub\n", processid, process);
|
||||
return STATUS_NOT_IMPLEMENTED;
|
||||
}
|
||||
|
||||
--
|
||||
2.3.3
|
||||
|
||||
@ -1 +0,0 @@
|
||||
Fixes: [36821] Avoid spam of FIXME messages for PsLookupProcessByProcessId stub
|
||||
@ -95,7 +95,6 @@ patch_enable_all ()
|
||||
enable_ddraw_Hotpatch="$1"
|
||||
enable_ddraw_d3d_execute_buffer="$1"
|
||||
enable_dinput_Events="$1"
|
||||
enable_dsound_3DSound="$1"
|
||||
enable_dsound_EAX="$1"
|
||||
enable_dsound_Fast_Mixer="$1"
|
||||
enable_dxgi_GetDesc="$1"
|
||||
@ -107,7 +106,6 @@ patch_enable_all ()
|
||||
enable_gdiplus_GdipCreateEffect="$1"
|
||||
enable_gdiplus_GdipCreateRegionRgnData="$1"
|
||||
enable_imagehlp_BindImageEx="$1"
|
||||
enable_include_Winetest="$1"
|
||||
enable_iphlpapi_TCP_Table="$1"
|
||||
enable_kernel32_CompareStringEx="$1"
|
||||
enable_kernel32_Console_Handles="$1"
|
||||
@ -125,7 +123,6 @@ patch_enable_all ()
|
||||
enable_kernel32_Profile="$1"
|
||||
enable_kernel32_SetFileInformationByHandle="$1"
|
||||
enable_kernel32_VerifyVersionInfo="$1"
|
||||
enable_kernel32_get_registry_locale_info="$1"
|
||||
enable_libs_Unicode_Collation="$1"
|
||||
enable_makedep_PARENTSPEC="$1"
|
||||
enable_mmdevapi_AEV_Stubs="$1"
|
||||
@ -163,7 +160,6 @@ patch_enable_all ()
|
||||
enable_ntdll_WriteWatches="$1"
|
||||
enable_ntoskrnl_DriverTest="$1"
|
||||
enable_ntoskrnl_Emulator="$1"
|
||||
enable_ntoskrnl_PsLookupProcessByProcessId="$1"
|
||||
enable_ntoskrnl_Stubs="$1"
|
||||
enable_nvapi_Stub_DLL="$1"
|
||||
enable_nvcuda_CUDA_Support="$1"
|
||||
@ -175,7 +171,6 @@ patch_enable_all ()
|
||||
enable_riched20_IText_Interface="$1"
|
||||
enable_secur32_ANSI_NTLM_Credentials="$1"
|
||||
enable_secur32_Gnutls28_Compat="$1"
|
||||
enable_secur32_Schannel_ContextAttr="$1"
|
||||
enable_server_ACL_Compat="$1"
|
||||
enable_server_Address_List_Change="$1"
|
||||
enable_server_ClipCursor="$1"
|
||||
@ -239,7 +234,6 @@ patch_enable_all ()
|
||||
enable_winex11_CandidateWindowPos="$1"
|
||||
enable_winex11_Clipboard_HTML="$1"
|
||||
enable_winex11_Thread_Data="$1"
|
||||
enable_winex11_ToUnicodeEx="$1"
|
||||
enable_winex11_Window_Groups="$1"
|
||||
enable_winex11_Window_Style="$1"
|
||||
enable_winex11_XEMBED="$1"
|
||||
@ -250,7 +244,6 @@ patch_enable_all ()
|
||||
enable_ws2_32_APC_Performance="$1"
|
||||
enable_ws2_32_Connect_Time="$1"
|
||||
enable_ws2_32_TransmitFile="$1"
|
||||
enable_ws2_32_WS_select="$1"
|
||||
enable_ws2_32_WriteWatches="$1"
|
||||
enable_ws2_32_getaddrinfo="$1"
|
||||
enable_wtsapi32_EnumerateProcesses="$1"
|
||||
@ -359,9 +352,6 @@ patch_enable ()
|
||||
dinput-Events)
|
||||
enable_dinput_Events="$2"
|
||||
;;
|
||||
dsound-3DSound)
|
||||
enable_dsound_3DSound="$2"
|
||||
;;
|
||||
dsound-EAX)
|
||||
enable_dsound_EAX="$2"
|
||||
;;
|
||||
@ -395,9 +385,6 @@ patch_enable ()
|
||||
imagehlp-BindImageEx)
|
||||
enable_imagehlp_BindImageEx="$2"
|
||||
;;
|
||||
include-Winetest)
|
||||
enable_include_Winetest="$2"
|
||||
;;
|
||||
iphlpapi-TCP_Table)
|
||||
enable_iphlpapi_TCP_Table="$2"
|
||||
;;
|
||||
@ -449,9 +436,6 @@ patch_enable ()
|
||||
kernel32-VerifyVersionInfo)
|
||||
enable_kernel32_VerifyVersionInfo="$2"
|
||||
;;
|
||||
kernel32-get_registry_locale_info)
|
||||
enable_kernel32_get_registry_locale_info="$2"
|
||||
;;
|
||||
libs-Unicode_Collation)
|
||||
enable_libs_Unicode_Collation="$2"
|
||||
;;
|
||||
@ -563,9 +547,6 @@ patch_enable ()
|
||||
ntoskrnl-Emulator)
|
||||
enable_ntoskrnl_Emulator="$2"
|
||||
;;
|
||||
ntoskrnl-PsLookupProcessByProcessId)
|
||||
enable_ntoskrnl_PsLookupProcessByProcessId="$2"
|
||||
;;
|
||||
ntoskrnl-Stubs)
|
||||
enable_ntoskrnl_Stubs="$2"
|
||||
;;
|
||||
@ -599,9 +580,6 @@ patch_enable ()
|
||||
secur32-Gnutls28_Compat)
|
||||
enable_secur32_Gnutls28_Compat="$2"
|
||||
;;
|
||||
secur32-Schannel_ContextAttr)
|
||||
enable_secur32_Schannel_ContextAttr="$2"
|
||||
;;
|
||||
server-ACL_Compat)
|
||||
enable_server_ACL_Compat="$2"
|
||||
;;
|
||||
@ -791,9 +769,6 @@ patch_enable ()
|
||||
winex11-Thread_Data)
|
||||
enable_winex11_Thread_Data="$2"
|
||||
;;
|
||||
winex11-ToUnicodeEx)
|
||||
enable_winex11_ToUnicodeEx="$2"
|
||||
;;
|
||||
winex11-Window_Groups)
|
||||
enable_winex11_Window_Groups="$2"
|
||||
;;
|
||||
@ -824,9 +799,6 @@ patch_enable ()
|
||||
ws2_32-TransmitFile)
|
||||
enable_ws2_32_TransmitFile="$2"
|
||||
;;
|
||||
ws2_32-WS_select)
|
||||
enable_ws2_32_WS_select="$2"
|
||||
;;
|
||||
ws2_32-WriteWatches)
|
||||
enable_ws2_32_WriteWatches="$2"
|
||||
;;
|
||||
@ -1876,21 +1848,6 @@ if test "$enable_dinput_Events" -eq 1; then
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset dsound-3DSound
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
# | * [#38041] Fix calculation of 3D sound source
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * dlls/dsound/sound3d.c
|
||||
# |
|
||||
if test "$enable_dsound_3DSound" -eq 1; then
|
||||
patch_apply dsound-3DSound/0001-dsound-Fix-angle-to-sound-source-calculation.patch
|
||||
(
|
||||
echo '+ { "Stas Cymbalov", "dsound: Fix angle to sound source calculation.", 1 },';
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset dsound-Fast_Mixer
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
@ -1970,18 +1927,6 @@ if test "$enable_dxgi_GetDesc" -eq 1; then
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset makedep-PARENTSPEC
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * tools/makedep.c
|
||||
# |
|
||||
if test "$enable_makedep_PARENTSPEC" -eq 1; then
|
||||
patch_apply makedep-PARENTSPEC/0001-makedep-Add-support-for-PARENTSPEC-Makefile-variable.patch
|
||||
(
|
||||
echo '+ { "Sebastian Lackner", "makedep: Add support for PARENTSPEC Makefile variable.", 1 },';
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset ntdll-DllRedirects
|
||||
# |
|
||||
# | Modified files:
|
||||
@ -2002,6 +1947,18 @@ if test "$enable_ntdll_DllRedirects" -eq 1; then
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset makedep-PARENTSPEC
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * tools/makedep.c
|
||||
# |
|
||||
if test "$enable_makedep_PARENTSPEC" -eq 1; then
|
||||
patch_apply makedep-PARENTSPEC/0001-makedep-Add-support-for-PARENTSPEC-Makefile-variable.patch
|
||||
(
|
||||
echo '+ { "Sebastian Lackner", "makedep: Add support for PARENTSPEC Makefile variable.", 1 },';
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset wined3d-CSMT_Helper
|
||||
# |
|
||||
# | Modified files:
|
||||
@ -2641,18 +2598,6 @@ if test "$enable_imagehlp_BindImageEx" -eq 1; then
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset include-Winetest
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * include/wine/test.h
|
||||
# |
|
||||
if test "$enable_include_Winetest" -eq 1; then
|
||||
patch_apply include-Winetest/0001-include-Automatically-detect-if-tests-are-running-un.patch
|
||||
(
|
||||
echo '+ { "Sebastian Lackner", "include: Automatically detect if tests are running under Wine when WINETEST_PLATFORM is not specified.", 1 },';
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset iphlpapi-TCP_Table
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
@ -2697,6 +2642,20 @@ if test "$enable_kernel32_Console_Handles" -eq 1; then
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset kernel32-SetFileInformationByHandle
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * dlls/kernel32/file.c, include/winbase.h
|
||||
# |
|
||||
if test "$enable_kernel32_SetFileInformationByHandle" -eq 1; then
|
||||
patch_apply kernel32-SetFileInformationByHandle/0001-include-Declare-a-couple-more-file-information-class.patch
|
||||
patch_apply kernel32-SetFileInformationByHandle/0002-kernel32-Implement-SetFileInformationByHandle.patch
|
||||
(
|
||||
echo '+ { "Michael Müller", "include: Declare a couple more file information class structures.", 1 },';
|
||||
echo '+ { "Michael Müller", "kernel32: Implement SetFileInformationByHandle.", 1 },';
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset server-File_Permissions
|
||||
# |
|
||||
# | Modified files:
|
||||
@ -2734,20 +2693,6 @@ if test "$enable_ntdll_FileDispositionInformation" -eq 1; then
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset kernel32-SetFileInformationByHandle
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * dlls/kernel32/file.c, include/winbase.h
|
||||
# |
|
||||
if test "$enable_kernel32_SetFileInformationByHandle" -eq 1; then
|
||||
patch_apply kernel32-SetFileInformationByHandle/0001-include-Declare-a-couple-more-file-information-class.patch
|
||||
patch_apply kernel32-SetFileInformationByHandle/0002-kernel32-Implement-SetFileInformationByHandle.patch
|
||||
(
|
||||
echo '+ { "Michael Müller", "include: Declare a couple more file information class structures.", 1 },';
|
||||
echo '+ { "Michael Müller", "kernel32: Implement SetFileInformationByHandle.", 1 },';
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset kernel32-CopyFileEx
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
@ -2983,21 +2928,6 @@ if test "$enable_kernel32_VerifyVersionInfo" -eq 1; then
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset kernel32-get_registry_locale_info
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
# | * [#38344] Fix invalid memory access in get_registry_locale_info
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * dlls/kernel32/locale.c
|
||||
# |
|
||||
if test "$enable_kernel32_get_registry_locale_info" -eq 1; then
|
||||
patch_apply kernel32-get_registry_locale_info/0001-kernel32-Fix-calculation-of-returned-buffer-in-get_r.patch
|
||||
(
|
||||
echo '+ { "Sebastian Lackner", "kernel32: Fix calculation of returned buffer in get_registry_locale_info.", 1 },';
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset libs-Unicode_Collation
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
@ -3557,21 +3487,6 @@ if test "$enable_ntoskrnl_Emulator" -eq 1; then
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset ntoskrnl-PsLookupProcessByProcessId
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
# | * [#36821] Avoid spam of FIXME messages for PsLookupProcessByProcessId stub
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * dlls/ntoskrnl.exe/ntoskrnl.c
|
||||
# |
|
||||
if test "$enable_ntoskrnl_PsLookupProcessByProcessId" -eq 1; then
|
||||
patch_apply ntoskrnl-PsLookupProcessByProcessId/0001-ntoskrnl-Avoid-repeated-FIXME-messages-in-PsLookupPr.patch
|
||||
(
|
||||
echo '+ { "Sebastian Lackner", "ntoskrnl: Avoid repeated FIXME messages in PsLookupProcessByProcessId.", 1 },';
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset ntoskrnl-Stubs
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
@ -3842,21 +3757,6 @@ if test "$enable_secur32_Gnutls28_Compat" -eq 1; then
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset secur32-Schannel_ContextAttr
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
# | * [#37527] Return more context attributes in schan_InitializeSecurityContextW
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * dlls/secur32/schannel.c
|
||||
# |
|
||||
if test "$enable_secur32_Schannel_ContextAttr" -eq 1; then
|
||||
patch_apply secur32-Schannel_ContextAttr/0001-secur32-Return-more-context-attributes-in-schan_Init.patch
|
||||
(
|
||||
echo '+ { "Sebastian Lackner", "secur32: Return more context attributes in schan_InitializeSecurityContextW.", 1 },';
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset server-Stored_ACLs
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
@ -3963,6 +3863,21 @@ if test "$enable_server_CreateProcess_ACLs" -eq 1; then
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset server-OpenProcess
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
# | * [#37087] Return an error when trying to open a terminated process
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * server/process.c, server/process.h
|
||||
# |
|
||||
if test "$enable_server_OpenProcess" -eq 1; then
|
||||
patch_apply server-OpenProcess/0001-server-Return-error-when-opening-a-terminating-proce.patch
|
||||
(
|
||||
echo '+ { "Michael Müller", "server: Return error when opening a terminating process.", 3 },';
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset server-Misc_ACL
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
@ -3980,21 +3895,6 @@ if test "$enable_server_Misc_ACL" -eq 1; then
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset server-OpenProcess
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
# | * [#37087] Return an error when trying to open a terminated process
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * server/process.c, server/process.h
|
||||
# |
|
||||
if test "$enable_server_OpenProcess" -eq 1; then
|
||||
patch_apply server-OpenProcess/0001-server-Return-error-when-opening-a-terminating-proce.patch
|
||||
(
|
||||
echo '+ { "Michael Müller", "server: Return error when opening a terminating process.", 3 },';
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset server-JobObjects
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
@ -4010,14 +3910,12 @@ if test "$enable_server_JobObjects" -eq 1; then
|
||||
patch_apply server-JobObjects/0003-kernel32-tests-Add-tests-for-waiting-on-an-job-objec.patch
|
||||
patch_apply server-JobObjects/0004-server-Implement-waiting-for-job-objects.patch
|
||||
patch_apply server-JobObjects/0005-ntdll-Implement-NtQueryInformationJobObject-stub-fun.patch
|
||||
patch_apply server-JobObjects/0006-ntdll-Return-STATUS_SUCCESS-from-SetInformationJobOb.patch
|
||||
(
|
||||
echo '+ { "Andrew Cook", "server: Implement remaining wineserver calls for job objects.", 1 },';
|
||||
echo '+ { "Andrew Cook", "server: Implement JOB_OBJECT_LIMIT_KILL_ON_JOB_CLOSE.", 1 },';
|
||||
echo '+ { "Sebastian Lackner", "kernel32/tests: Add tests for waiting on an job object.", 1 },';
|
||||
echo '+ { "Sebastian Lackner", "server: Implement waiting for job objects.", 1 },';
|
||||
echo '+ { "Sebastian Lackner", "ntdll: Implement NtQueryInformationJobObject stub function.", 1 },';
|
||||
echo '+ { "Andrew Cook", "ntdll: Return STATUS_SUCCESS from SetInformationJobObject.", 1 },';
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
@ -4777,21 +4675,6 @@ if test "$enable_winex11_Thread_Data" -eq 1; then
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset winex11-ToUnicodeEx
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
# | * [#38353] Allow NULL pointer as keystate argument in ToUnicodeEx
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * dlls/winex11.drv/keyboard.c
|
||||
# |
|
||||
if test "$enable_winex11_ToUnicodeEx" -eq 1; then
|
||||
patch_apply winex11-ToUnicodeEx/0001-winex11-Allow-NULL-pointer-as-keystate-in-X11DRV_ToU.patch
|
||||
(
|
||||
echo '+ { "Sebastian Lackner", "winex11: Allow NULL pointer as keystate in X11DRV_ToUnicodeEx.", 1 },';
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset winex11-Window_Groups
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
@ -4942,18 +4825,6 @@ if test "$enable_ws2_32_TransmitFile" -eq 1; then
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset ws2_32-WS_select
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * dlls/ws2_32/socket.c
|
||||
# |
|
||||
if test "$enable_ws2_32_WS_select" -eq 1; then
|
||||
patch_apply ws2_32-WS_select/0001-ws2_32-Don-t-return-an-error-in-WS_select-when-EINTR.patch
|
||||
(
|
||||
echo '+ { "Michael Müller", "ws2_32: Don'\''t return an error in WS_select when EINTR happens during timeout.", 1 },';
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset ws2_32-getaddrinfo
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
|
||||
@ -1,34 +0,0 @@
|
||||
From f7577766e160ac55faacd0fadf20fd9ebfb47e3a Mon Sep 17 00:00:00 2001
|
||||
From: Sebastian Lackner <sebastian@fds-team.de>
|
||||
Date: Tue, 11 Nov 2014 08:50:46 +0100
|
||||
Subject: secur32: Return more context attributes in
|
||||
schan_InitializeSecurityContextW.
|
||||
|
||||
---
|
||||
dlls/secur32/schannel.c | 8 ++++++++
|
||||
1 file changed, 8 insertions(+)
|
||||
|
||||
diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c
|
||||
index 5b86a75..12d4c8d 100644
|
||||
--- a/dlls/secur32/schannel.c
|
||||
+++ b/dlls/secur32/schannel.c
|
||||
@@ -908,8 +908,16 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextW(
|
||||
}
|
||||
|
||||
*pfContextAttr = 0;
|
||||
+ if (ctx->req_ctx_attr & ISC_REQ_REPLAY_DETECT)
|
||||
+ *pfContextAttr |= ISC_RET_REPLAY_DETECT;
|
||||
+ if (ctx->req_ctx_attr & ISC_REQ_SEQUENCE_DETECT)
|
||||
+ *pfContextAttr |= ISC_RET_SEQUENCE_DETECT;
|
||||
+ if (ctx->req_ctx_attr & ISC_REQ_CONFIDENTIALITY)
|
||||
+ *pfContextAttr |= ISC_RET_CONFIDENTIALITY;
|
||||
if (ctx->req_ctx_attr & ISC_REQ_ALLOCATE_MEMORY)
|
||||
*pfContextAttr |= ISC_RET_ALLOCATED_MEMORY;
|
||||
+ if (ctx->req_ctx_attr & ISC_REQ_STREAM)
|
||||
+ *pfContextAttr |= ISC_RET_STREAM;
|
||||
|
||||
return ret;
|
||||
}
|
||||
--
|
||||
2.1.3
|
||||
|
||||
@ -1 +0,0 @@
|
||||
Fixes: [37527] Return more context attributes in schan_InitializeSecurityContextW
|
||||
@ -1,26 +0,0 @@
|
||||
From 2e080477fe74a95265befb02dee6bd1c07d712cc Mon Sep 17 00:00:00 2001
|
||||
From: Andrew Cook <ariscop@gmail.com>
|
||||
Date: Sat, 4 Apr 2015 18:02:53 +1100
|
||||
Subject: ntdll: Return STATUS_SUCCESS from SetInformationJobObject
|
||||
|
||||
Fixes #38351
|
||||
---
|
||||
dlls/ntdll/sync.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c
|
||||
index 5d1c5f2..8566799 100644
|
||||
--- a/dlls/ntdll/sync.c
|
||||
+++ b/dlls/ntdll/sync.c
|
||||
@@ -728,7 +728,7 @@ NTSTATUS WINAPI NtSetInformationJobObject( HANDLE handle, JOBOBJECTINFOCLASS cla
|
||||
|
||||
default:
|
||||
FIXME( "stub: %p %u %p %u\n", handle, class, info, len );
|
||||
- return STATUS_NOT_IMPLEMENTED;
|
||||
+ return STATUS_SUCCESS;
|
||||
}
|
||||
|
||||
return status;
|
||||
--
|
||||
2.3.3
|
||||
|
||||
@ -1,88 +0,0 @@
|
||||
From e9507c2b46cd5ca8de228abffcbb3d1505a4d331 Mon Sep 17 00:00:00 2001
|
||||
From: Sebastian Lackner <sebastian@fds-team.de>
|
||||
Date: Sat, 4 Apr 2015 22:29:58 +0200
|
||||
Subject: winex11: Allow NULL pointer as keystate in X11DRV_ToUnicodeEx.
|
||||
|
||||
---
|
||||
dlls/winex11.drv/keyboard.c | 45 ++++++++++++++++++++++++---------------------
|
||||
1 file changed, 24 insertions(+), 21 deletions(-)
|
||||
|
||||
diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c
|
||||
index 1323e19..5737f40 100644
|
||||
--- a/dlls/winex11.drv/keyboard.c
|
||||
+++ b/dlls/winex11.drv/keyboard.c
|
||||
@@ -2463,7 +2463,7 @@ INT CDECL X11DRV_ToUnicodeEx(UINT virtKey, UINT scanCode, const BYTE *lpKeyState
|
||||
if (!match_x11_keyboard_layout(hkl))
|
||||
FIXME_(key)("keyboard layout %p is not supported\n", hkl);
|
||||
|
||||
- if ((lpKeyState[VK_MENU] & 0x80) && (lpKeyState[VK_CONTROL] & 0x80))
|
||||
+ if (lpKeyState && (lpKeyState[VK_MENU] & 0x80) && (lpKeyState[VK_CONTROL] & 0x80))
|
||||
{
|
||||
TRACE_(key)("Ctrl+Alt+[key] won't generate a character\n");
|
||||
return 0;
|
||||
@@ -2486,25 +2486,28 @@ INT CDECL X11DRV_ToUnicodeEx(UINT virtKey, UINT scanCode, const BYTE *lpKeyState
|
||||
|
||||
EnterCriticalSection( &kbd_section );
|
||||
|
||||
- if (lpKeyState[VK_SHIFT] & 0x80)
|
||||
+ if (lpKeyState)
|
||||
{
|
||||
- TRACE_(key)("ShiftMask = %04x\n", ShiftMask);
|
||||
- e.state |= ShiftMask;
|
||||
- }
|
||||
- if (lpKeyState[VK_CAPITAL] & 0x01)
|
||||
- {
|
||||
- TRACE_(key)("LockMask = %04x\n", LockMask);
|
||||
- e.state |= LockMask;
|
||||
- }
|
||||
- if (lpKeyState[VK_CONTROL] & 0x80)
|
||||
- {
|
||||
- TRACE_(key)("ControlMask = %04x\n", ControlMask);
|
||||
- e.state |= ControlMask;
|
||||
- }
|
||||
- if (lpKeyState[VK_NUMLOCK] & 0x01)
|
||||
- {
|
||||
- TRACE_(key)("NumLockMask = %04x\n", NumLockMask);
|
||||
- e.state |= NumLockMask;
|
||||
+ if (lpKeyState[VK_SHIFT] & 0x80)
|
||||
+ {
|
||||
+ TRACE_(key)("ShiftMask = %04x\n", ShiftMask);
|
||||
+ e.state |= ShiftMask;
|
||||
+ }
|
||||
+ if (lpKeyState[VK_CAPITAL] & 0x01)
|
||||
+ {
|
||||
+ TRACE_(key)("LockMask = %04x\n", LockMask);
|
||||
+ e.state |= LockMask;
|
||||
+ }
|
||||
+ if (lpKeyState[VK_CONTROL] & 0x80)
|
||||
+ {
|
||||
+ TRACE_(key)("ControlMask = %04x\n", ControlMask);
|
||||
+ e.state |= ControlMask;
|
||||
+ }
|
||||
+ if (lpKeyState[VK_NUMLOCK] & 0x01)
|
||||
+ {
|
||||
+ TRACE_(key)("NumLockMask = %04x\n", NumLockMask);
|
||||
+ e.state |= NumLockMask;
|
||||
+ }
|
||||
}
|
||||
|
||||
/* Restore saved AltGr state */
|
||||
@@ -2680,13 +2683,13 @@ INT CDECL X11DRV_ToUnicodeEx(UINT virtKey, UINT scanCode, const BYTE *lpKeyState
|
||||
lpChar[0] = 0;
|
||||
ret = 0;
|
||||
}
|
||||
- else if((lpKeyState[VK_SHIFT] & 0x80) /* Shift is pressed */
|
||||
+ else if (lpKeyState && (lpKeyState[VK_SHIFT] & 0x80) /* Shift is pressed */
|
||||
&& (keysym == XK_KP_Decimal))
|
||||
{
|
||||
lpChar[0] = 0;
|
||||
ret = 0;
|
||||
}
|
||||
- else if((lpKeyState[VK_CONTROL] & 0x80) /* Control is pressed */
|
||||
+ else if (lpKeyState && (lpKeyState[VK_CONTROL] & 0x80) /* Control is pressed */
|
||||
&& (keysym == XK_Return || keysym == XK_KP_Enter))
|
||||
{
|
||||
lpChar[0] = '\n';
|
||||
--
|
||||
2.3.3
|
||||
|
||||
@ -1 +0,0 @@
|
||||
Fixes: [38353] Allow NULL pointer as keystate argument in ToUnicodeEx
|
||||
@ -1,30 +0,0 @@
|
||||
From c3996fd61ba65678d9cfefed715a137b697a72a1 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
|
||||
Date: Sat, 28 Mar 2015 20:47:52 +0100
|
||||
Subject: ws2_32: Don't return an error in WS_select when EINTR happens during
|
||||
timeout.
|
||||
|
||||
---
|
||||
dlls/ws2_32/socket.c | 6 +++++-
|
||||
1 file changed, 5 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c
|
||||
index e7e3de5..d99e566 100644
|
||||
--- a/dlls/ws2_32/socket.c
|
||||
+++ b/dlls/ws2_32/socket.c
|
||||
@@ -4601,7 +4601,11 @@ int WINAPI WS_select(int nfds, WS_fd_set *ws_readfds,
|
||||
}
|
||||
|
||||
timeout = torig - (tv2.tv_sec * 1000) - (tv2.tv_usec + 999) / 1000;
|
||||
- if (timeout <= 0) break;
|
||||
+ if (timeout <= 0)
|
||||
+ {
|
||||
+ ret = 0;
|
||||
+ break;
|
||||
+ }
|
||||
} else break;
|
||||
}
|
||||
release_poll_fds( ws_readfds, ws_writefds, ws_exceptfds, pollfds );
|
||||
--
|
||||
2.1.0
|
||||
|
||||
@ -1 +0,0 @@
|
||||
Fixes: Don't return an error in WS_select when EINTR happens during timeout
|
||||
Loading…
x
Reference in New Issue
Block a user