wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-09-12 18:50:20 -07: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
Download Patch File Download Diff File Expand all files Collapse all files

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