mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2024-09-13 09:17:20 -07:00
Rebase against e69d9ec3c4e8829c5c18cea7d8348171d51dcd76.
This commit is contained in:
Sebastian Lackner
parent
3d3effd8b3
commit
9dcb352d8d
@ -263,7 +263,7 @@ for more details.*
|
||||
* Show windows version when collecting system info in winedbg
|
||||
* Silence repeated FIXME message in surface_cpu_blt
|
||||
* Silence repeated LocaleNameToLCID/LCIDToLocaleName unsupported flags FIXMEs ([Wine Bug #30076](https://bugs.winehq.org/show_bug.cgi?id=30076))
|
||||
* Skip invalid entries in GetPrivateProfileString16 ([Wine Bug #9919](https://bugs.winehq.org/show_bug.cgi?id=9919))
|
||||
* ~~Skip invalid entries in GetPrivateProfileString16~~ ([Wine Bug #9919](https://bugs.winehq.org/show_bug.cgi?id=9919))
|
||||
* Skip unknown item when decoding a CMS certificate ([Wine Bug #34388](https://bugs.winehq.org/show_bug.cgi?id=34388))
|
||||
* Software support for Environmental Audio Extensions (EAX)
|
||||
* Start SERVICE_FILE_SYSTEM_DRIVER services with winedevice ([Wine Bug #35824](https://bugs.winehq.org/show_bug.cgi?id=35824))
|
||||
|
||||
@ -1,40 +0,0 @@
|
||||
From 29e32e5ad41bbd4a2c19202bea2175cfb11c17b1 Mon Sep 17 00:00:00 2001
|
||||
From: Bruno Jesus <00cpxxx@gmail.com>
|
||||
Date: Sat, 28 Nov 2015 22:47:38 +0100
|
||||
Subject: krnl386.exe16: Skip invalid entries in GetPrivateProfileString16.
|
||||
|
||||
---
|
||||
dlls/krnl386.exe16/file.c | 10 +++++++++-
|
||||
1 file changed, 9 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/dlls/krnl386.exe16/file.c b/dlls/krnl386.exe16/file.c
|
||||
index 77908c2..b66b753 100644
|
||||
--- a/dlls/krnl386.exe16/file.c
|
||||
+++ b/dlls/krnl386.exe16/file.c
|
||||
@@ -539,6 +539,9 @@ INT16 WINAPI GetPrivateProfileString16( LPCSTR section, LPCSTR entry,
|
||||
LPCSTR def_val, LPSTR buffer,
|
||||
UINT16 len, LPCSTR filename )
|
||||
{
|
||||
+ TRACE("(%s, %s, %s, %p, %u, %s)\n", debugstr_a(section), debugstr_a(entry),
|
||||
+ debugstr_a(def_val), buffer, len, debugstr_a(filename));
|
||||
+
|
||||
if (!section)
|
||||
{
|
||||
if (buffer && len) buffer[0] = 0;
|
||||
@@ -572,7 +575,12 @@ INT16 WINAPI GetPrivateProfileString16( LPCSTR section, LPCSTR entry,
|
||||
{
|
||||
char *p = strchr( src, '=' );
|
||||
|
||||
- if (!p) p = src + strlen(src);
|
||||
+ /* A valid entry is formed by name = value */
|
||||
+ if (!p)
|
||||
+ {
|
||||
+ src += strlen(src) + 1;
|
||||
+ continue;
|
||||
+ }
|
||||
if (p - src < len)
|
||||
{
|
||||
memcpy( buffer, src, p - src );
|
||||
--
|
||||
2.6.2
|
||||
|
||||
@ -1 +0,0 @@
|
||||
Fixes: [9919] Skip invalid entries in GetPrivateProfileString16
|
||||
@ -52,7 +52,7 @@ usage()
|
||||
# Get the upstream commit sha
|
||||
upstream_commit()
|
||||
{
|
||||
echo "66d8e38ba4c5d67ae6e287cac557acfeae8b5bcd"
|
||||
echo "e69d9ec3c4e8829c5c18cea7d8348171d51dcd76"
|
||||
}
|
||||
|
||||
# Show version information
|
||||
@ -166,7 +166,6 @@ patch_enable_all ()
|
||||
enable_kernel32_SetFileInformationByHandle="$1"
|
||||
enable_kernel32_TimezoneInformation_Registry="$1"
|
||||
enable_kernel32_VerifyVersionInfo="$1"
|
||||
enable_krnl386_exe_GetPrivateProfileString="$1"
|
||||
enable_libs_Debug_Channel="$1"
|
||||
enable_libs_Unicode_Collation="$1"
|
||||
enable_makedep_PARENTSPEC="$1"
|
||||
@ -610,9 +609,6 @@ patch_enable ()
|
||||
kernel32-VerifyVersionInfo)
|
||||
enable_kernel32_VerifyVersionInfo="$2"
|
||||
;;
|
||||
krnl386.exe-GetPrivateProfileString)
|
||||
enable_krnl386_exe_GetPrivateProfileString="$2"
|
||||
;;
|
||||
libs-Debug_Channel)
|
||||
enable_libs_Debug_Channel="$2"
|
||||
;;
|
||||
@ -3665,21 +3661,6 @@ if test "$enable_kernel32_VerifyVersionInfo" -eq 1; then
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset krnl386.exe-GetPrivateProfileString
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
# | * [#9919] Skip invalid entries in GetPrivateProfileString16
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * dlls/krnl386.exe16/file.c
|
||||
# |
|
||||
if test "$enable_krnl386_exe_GetPrivateProfileString" -eq 1; then
|
||||
patch_apply krnl386.exe-GetPrivateProfileString/0001-krnl386.exe16-Skip-invalid-entries-in-GetPrivateProf.patch
|
||||
(
|
||||
echo '+ { "Bruno Jesus", "krnl386.exe16: Skip invalid entries in GetPrivateProfileString16.", 1 },';
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset libs-Debug_Channel
|
||||
# |
|
||||
# | Modified files:
|
||||
|
||||
@ -175,7 +175,7 @@ index ea26745..e0d9b3e 100644
|
||||
* dest [I] path to target file to move to
|
||||
*
|
||||
* RETURNS
|
||||
* ERORR_SUCCESS if successful
|
||||
* ERROR_SUCCESS if successful
|
||||
*/
|
||||
-static DWORD SHNotifyMoveFileW(LPCWSTR src, LPCWSTR dest)
|
||||
+static DWORD SHNotifyMoveFileW(FILE_OPERATION *op, LPCWSTR src, LPCWSTR dest)
|
||||
|
||||
@ -84,7 +84,7 @@ index 36822a4..9342762 100644
|
||||
return E_FAIL;
|
||||
}
|
||||
|
||||
-/* For default Pulseaudio render device, OR together all of the
|
||||
-/* For default PulseAudio render device, OR together all of the
|
||||
- * PKEY_AudioEndpoint_PhysicalSpeakers values of the sinks. */
|
||||
+static BOOL get_device_guid(EDataFlow flow, const char *device, GUID *guid)
|
||||
+{
|
||||
@ -154,7 +154,7 @@ index 36822a4..9342762 100644
|
||||
+ GUID guid;
|
||||
+
|
||||
+ if (i) {
|
||||
+ /* For default Pulseaudio render device, OR together all of the
|
||||
+ /* For default PulseAudio render device, OR together all of the
|
||||
+ * PKEY_AudioEndpoint_PhysicalSpeakers values of the sinks. */
|
||||
g_phys_speakers_mask |= pulse_channel_map_to_channel_mask(&i->channel_map);
|
||||
+
|
||||
|
||||
@ -56,7 +56,7 @@ index ca60dcb..03cfed5 100644
|
||||
if (i) {
|
||||
+ channel_mask = pulse_channel_map_to_channel_mask(&i->channel_map);
|
||||
+
|
||||
/* For default Pulseaudio render device, OR together all of the
|
||||
/* For default PulseAudio render device, OR together all of the
|
||||
* PKEY_AudioEndpoint_PhysicalSpeakers values of the sinks. */
|
||||
- g_phys_speakers_mask |= pulse_channel_map_to_channel_mask(&i->channel_map);
|
||||
+ speaker = list_head(&g_phys_speakers);
|
||||
|
||||
@ -4,6 +4,8 @@ wine-staging (1.8~rc3) UNRELEASED; urgency=low
|
||||
(accepted upstream).
|
||||
* Removed patch to fix access violation in MSYS2 git when cloning repository
|
||||
(accepted upstream).
|
||||
* Removed patch to skip invalid entries in GetPrivateProfileString16 (accepted
|
||||
upstream).
|
||||
-- Sebastian Lackner <sebastian@fds-team.de> Tue, 01 Dec 2015 02:35:10 +0100
|
||||
|
||||
wine-staging (1.8~rc2) unstable; urgency=low
|
||||
|
||||
Loading…
Reference in New Issue
Block a user