wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2024-11-21 16:46:54 -08:00
Code Issues Packages Projects Releases Wiki Activity

Removed patch to fix copy and paste errors in ws2_32 tests (accepted upstream).

Browse Source
This commit is contained in:
Sebastian Lackner 2014-12-01 22:04:19 +01:00
parent c67647eb73
commit f317ba0b0c
5 changed files with 4 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
debian/changelog vendored
View File

@ -1,6 +1,7 @@
wine-compholio (1.7.33) UNRELEASED; urgency=low
* Added additional tests for VerifyVersionInfoA.
* Added patch to fix condition handling in RtlVerifyVersionInfo.
* Removed patch to fix copy and paste errors in ws2_32 tests (accepted upstream).
-- Sebastian Lackner <sebastian@fds-team.de> Sun, 30 Nov 2014 18:19:00 +0100
wine-compholio (1.7.32) unstable; urgency=low

11
patches/Makefile
View File

@ -198,8 +198,7 @@ Exagear.ok: ntdll-WRITECOPY.ok
# |
# | Modified files:
# | * dlls/d3d9/tests/visual.c, dlls/kernel32/locale.c, dlls/netapi32/netapi32.c, dlls/winealsa.drv/mmdevdrv.c,
# | dlls/wined3d/glsl_shader.c, dlls/wined3d/resource.c, dlls/wined3d/swapchain.c, programs/wordpad/registry.c,
# | tools/makedep.c
# | dlls/wined3d/glsl_shader.c, dlls/wined3d/resource.c, dlls/wined3d/swapchain.c, tools/makedep.c
# |
.INTERMEDIATE: Miscellaneous.ok
Miscellaneous.ok:
@ -207,13 +206,11 @@ Miscellaneous.ok:
$(call APPLY_FILE,Miscellaneous/0002-kernel32-Silence-repeated-CompareStringEx-FIXME.patch)
$(call APPLY_FILE,Miscellaneous/0003-wined3d-Silence-repeated-wined3d_swapchain_present-F.patch)
$(call APPLY_FILE,Miscellaneous/0004-Appease-the-blessed-version-of-gcc-4.5-when-Werror-i.patch)
$(call APPLY_FILE,Miscellaneous/0005-wordpad-Check-for-array-index-before-using-it-in-reg.patch)
@( \
echo '+ { "Erich E. Hoover", "wined3d: Silence repeated resource_check_usage FIXME.", 2 },'; \
echo '+ { "Sebastian Lackner", "kernel32: Silence repeated CompareStringEx FIXME.", 1 },'; \
echo '+ { "Sebastian Lackner", "wined3d: Silence repeated wined3d_swapchain_present FIXME.", 1 },'; \
echo '+ { "Erich E. Hoover", "Appease the blessed version of gcc (4.5) when -Werror is enabled.", 1 },'; \
echo '+ { "Gerald Pfeifer", "wordpad: Check for array index before using it in registry_set_filelist.", 1 },'; \
) > Miscellaneous.ok
# Patchset Pipelight
@ -2030,14 +2027,12 @@ ws2_32-IP_Ordering.ok:
# Patchset ws2_32-Overlapping_FDS
# |
# | Modified files:
# | * dlls/ws2_32/socket.c, dlls/ws2_32/tests/sock.c
# | * dlls/ws2_32/socket.c
# |
.INTERMEDIATE: ws2_32-Overlapping_FDS.ok
ws2_32-Overlapping_FDS.ok:
$(call APPLY_FILE,ws2_32-Overlapping_FDS/0001-ws2_32-tests-Fix-several-copy-and-paste-errors.patch)
$(call APPLY_FILE,ws2_32-Overlapping_FDS/0002-ws2_32-Improve-implementation-of-get_poll_results.patch)
$(call APPLY_FILE,ws2_32-Overlapping_FDS/0001-ws2_32-Improve-implementation-of-get_poll_results.patch)
@( \
echo '+ { "Sebastian Lackner", "ws2_32/tests: Fix several copy and paste errors.", 1 },'; \
echo '+ { "Sebastian Lackner", "ws2_32: Improve implementation of get_poll_results.", 1 },'; \
) > ws2_32-Overlapping_FDS.ok

26
patches/Miscellaneous/0005-wordpad-Check-for-array-index-before-using-it-in-reg.patch
View File

@ -1,26 +0,0 @@
From 47bc6db7c7dcb5c396b505dbb3c18263858122d9 Mon Sep 17 00:00:00 2001
From: Gerald Pfeifer <gerald@pfeifer.com>
Date: Sat, 29 Nov 2014 12:59:26 +0100
Subject: wordpad: Check for array index before using it in
registry_set_filelist.
---
programs/wordpad/registry.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/programs/wordpad/registry.c b/programs/wordpad/registry.c
index 472ed4d..5b570e7 100644
--- a/programs/wordpad/registry.c
+++ b/programs/wordpad/registry.c
@@ -293,7 +293,7 @@ void registry_set_filelist(LPCWSTR newFile, HWND hMainWnd)
if(lstrcmpiW(newFile, pFiles[0]))
{
- for(i = 0; pFiles[i] && i < FILELIST_ENTRIES; i++)
+ for(i = 0; i < FILELIST_ENTRIES && pFiles[i]; i++)
{
if(!lstrcmpiW(pFiles[i], newFile))
{
--
2.1.3

0
patches/ws2_32-Overlapping_FDS/0002-ws2_32-Improve-implementation-of-get_poll_results.patch → patches/ws2_32-Overlapping_FDS/0001-ws2_32-Improve-implementation-of-get_poll_results.patch
View File

60
patches/ws2_32-Overlapping_FDS/0001-ws2_32-tests-Fix-several-copy-and-paste-errors.patch
View File

@ -1,60 +0,0 @@
From 93eaea5931b6aa60b1d4edf9c39cfc7274c47e39 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Sat, 29 Nov 2014 09:55:39 +0100
Subject: ws2_32/tests: Fix several copy and paste errors.
---
dlls/ws2_32/tests/sock.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c
index 106588d..16f98c0 100644
--- a/dlls/ws2_32/tests/sock.c
+++ b/dlls/ws2_32/tests/sock.c
@@ -3358,14 +3358,14 @@ static void test_select(void)
ret = select(maxfd+1, &readfds, &readfds, NULL, &select_timeout);
ok(ret == 2, "select returned %d\n", ret);
ok(FD_ISSET(fdWrite, &readfds), "fdWrite socket is not in the set\n");
- ok(FD_ISSET(fdRead, &readfds), "fdWrite socket is not in the set\n");
+ ok(FD_ISSET(fdRead, &readfds), "fdRead socket is not in the set\n");
ok(send(fdWrite, "test", 4, 0) == 4, "failed to send data\n");
FD_ZERO(&readfds);
FD_SET(fdRead, &readfds);
ret = select(fdRead+1, &readfds, NULL, NULL, &select_timeout);
ok(ret == 1, "select returned %d\n", ret);
- ok(FD_ISSET(fdRead, &readfds), "fdWrite socket is not in the set\n");
+ ok(FD_ISSET(fdRead, &readfds), "fdRead socket is not in the set\n");
FD_ZERO(&readfds);
FD_SET(fdWrite, &readfds);
@@ -3373,7 +3373,7 @@ static void test_select(void)
ret = select(maxfd+1, &readfds, &readfds, NULL, &select_timeout);
ok(ret == 2, "select returned %d\n", ret);
ok(FD_ISSET(fdWrite, &readfds), "fdWrite socket is not in the set\n");
- ok(FD_ISSET(fdRead, &readfds), "fdWrite socket is not in the set\n");
+ ok(FD_ISSET(fdRead, &readfds), "fdRead socket is not in the set\n");
while(1) {
FD_ZERO(&writefds);
@@ -3388,7 +3388,7 @@ static void test_select(void)
ret = select(maxfd+1, &readfds, &readfds, NULL, &select_timeout);
ok(ret == 1, "select returned %d\n", ret);
ok(!FD_ISSET(fdWrite, &readfds), "fdWrite socket is in the set\n");
- ok(FD_ISSET(fdRead, &readfds), "fdWrite socket is not in the set\n");
+ ok(FD_ISSET(fdRead, &readfds), "fdRead socket is not in the set\n");
ok(send(fdRead, "test", 4, 0) == 4, "failed to send data\n");
Sleep(100);
@@ -3398,7 +3398,7 @@ static void test_select(void)
ret = select(maxfd+1, &readfds, &readfds, NULL, &select_timeout);
ok(ret == 2, "select returned %d\n", ret);
ok(FD_ISSET(fdWrite, &readfds), "fdWrite socket is not in the set\n");
- ok(FD_ISSET(fdRead, &readfds), "fdWrite socket is not in the set\n");
+ ok(FD_ISSET(fdRead, &readfds), "fdRead socket is not in the set\n");
closesocket(fdRead);
closesocket(fdWrite);
--
2.1.3