wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-01-28 22:04:43 -08:00
Code Issues Packages Projects Releases Wiki Activity

Removed several patches (accepted upstream).

Browse Source
This commit is contained in:
Sebastian Lackner 2014-11-17 15:17:34 +01:00
parent 54b4500a85
commit d31c55702c
4 changed files with 2 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debian/changelog vendored
View File

@ -1,5 +1,7 @@
wine-compholio (1.7.32) UNRELEASED; urgency=low
* Added patch to ensure dbghelp always checks for debug symbols in BINDIR.
* Removed patch to close server fd is there is no space in thread inflight fd list (accepted upstream).
* Removed patch to fix bugs in StrStr functions (accepted upstream).
-- Sebastian Lackner <sebastian@fds-team.de> Sat, 15 Nov 2014 20:21:53 +0100
wine-compholio (1.7.31) unstable; urgency=low

26
patches/Makefile
View File

@ -82,7 +82,6 @@ PATCHLIST := \
server-ACL_Compat.ok \
server-Address_Change_Notification.ok \
server-CreateProcess_ACLs.ok \
server-Fix_Leak.ok \
server-Inherited_ACLs.ok \
server-Misc_ACL.ok \
server-OpenProcess.ok \
@ -96,7 +95,6 @@ PATCHLIST := \
shell32-SHCreateSessionKey.ok \
shell32-SHFileOperation.ok \
shlwapi-PathIsDirectoryEmptyW.ok \
shlwapi-StrStrIW.ok \
shlwapi-UrlCombine.ok \
user32-Dialog_Paint_Event.ok \
user32-DrawTextExW.ok \
@ -1254,18 +1252,6 @@ server-CreateProcess_ACLs.ok:
echo '+ { "Joris van der Wel", "advapi32/tests: Add additional tests for passing a thread sd to CreateProcess.", 1 },'; \
) > server-CreateProcess_ACLs.ok
# Patchset server-Fix_Leak
# |
# | Modified files:
# | * server/thread.c
# |
.INTERMEDIATE: server-Fix_Leak.ok
server-Fix_Leak.ok:
$(call APPLY_FILE,server-Fix_Leak/0001-server-Close-fd-if-there-is-no-space-in-thread-infli.patch)
@( \
echo '+ { "Sebastian Lackner", "server: Close fd if there is no space in thread inflight fd list.", 1 },'; \
) > server-Fix_Leak.ok
# Patchset server-Inherited_ACLs
# |
# | This patchset fixes the following Wine bugs:
@ -1468,18 +1454,6 @@ shlwapi-PathIsDirectoryEmptyW.ok:
echo '+ { "Michael Müller", "shlwapi: Correctly treat '\''.'\'' when enumerating files in PathIsDirectoryEmptyW.", 1 },'; \
) > shlwapi-PathIsDirectoryEmptyW.ok
# Patchset shlwapi-StrStrIW
# |
# | Modified files:
# | * dlls/shlwapi/string.c
# |
.INTERMEDIATE: shlwapi-StrStrIW.ok
shlwapi-StrStrIW.ok:
$(call APPLY_FILE,shlwapi-StrStrIW/0001-shlwapi-Workaround-for-bugs-in-CompareStringW.patch)
@( \
echo '+ { "Sebastian Lackner", "shlwapi: Workaround for bugs in CompareStringW.", 1 },'; \
) > shlwapi-StrStrIW.ok
# Patchset shlwapi-UrlCombine
# |
# | Modified files:

25
patches/server-Fix_Leak/0001-server-Close-fd-if-there-is-no-space-in-thread-infli.patch
View File

@ -1,25 +0,0 @@
From 3df51527f28634f01e0f4f3af284544885d98e99 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Sat, 15 Nov 2014 01:04:29 +0100
Subject: server: Close fd if there is no space in thread inflight fd list.
---
server/thread.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/server/thread.c b/server/thread.c
index 50d6940..97860ee 100644
--- a/server/thread.c
+++ b/server/thread.c
@@ -1047,6 +1047,8 @@ int thread_add_inflight_fd( struct thread *thread, int client, int server )
thread->inflight[i].server = server;
return i;
}
+
+ close( server );
return -1;
}
--
2.1.3

40
patches/shlwapi-StrStrIW/0001-shlwapi-Workaround-for-bugs-in-CompareStringW.patch
View File

@ -1,40 +0,0 @@
From afc8ef8ffca3da82a5bb56ee5b496f5d33195c6a Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Sat, 15 Nov 2014 14:59:49 +0100
Subject: shlwapi: Workaround for bugs in CompareStringW.
---
dlls/shlwapi/string.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/dlls/shlwapi/string.c b/dlls/shlwapi/string.c
index b4b5b8a..72789fc 100644
--- a/dlls/shlwapi/string.c
+++ b/dlls/shlwapi/string.c
@@ -670,6 +670,7 @@ LPSTR WINAPI StrStrIA(LPCSTR lpszStr, LPCSTR lpszSearch)
LPWSTR WINAPI StrStrIW(LPCWSTR lpszStr, LPCWSTR lpszSearch)
{
int iLen;
+ int jLen;
TRACE("(%s,%s)\n", debugstr_w(lpszStr), debugstr_w(lpszSearch));
@@ -678,11 +679,14 @@ LPWSTR WINAPI StrStrIW(LPCWSTR lpszStr, LPCWSTR lpszSearch)
iLen = strlenW(lpszSearch);
- while (*lpszStr)
+ /* Workaround for bugs in CompareStringW */
+ jLen = strlenW(lpszStr);
+ while (jLen >= iLen)
{
if (!StrCmpNIW(lpszStr, lpszSearch, iLen))
return (LPWSTR)lpszStr;
lpszStr++;
+ jLen--;
}
return NULL;
}
--
2.1.3