From 10354d4cb5818f8ced6c0815d341aa72c51a62a6 Mon Sep 17 00:00:00 2001 From: "Erich E. Hoover" Date: Fri, 25 Jul 2014 18:39:43 -0600 Subject: [PATCH] Move 09-TransmitFile to ws2_32-TransmitFile. --- patches/Makefile | 50 +++++++++---------- ...001-ws2_32-Add-stub-for-TransmitFile.patch | 0 ...r-invalid-parameters-in-TransmitFile.patch | 0 ...ent-a-basic-synchronous-TransmitFile.patch | 0 ...synchronous-support-for-TransmitFile.patch | 0 ...rt-for-TF_DISCONNECT-and-TF_REUSE_SO.patch | 0 .../definition | 0 7 files changed, 25 insertions(+), 25 deletions(-) rename patches/{09-TransmitFile => ws2_32-TransmitFile}/0001-ws2_32-Add-stub-for-TransmitFile.patch (100%) rename patches/{09-TransmitFile => ws2_32-TransmitFile}/0002-ws2_32-Check-for-invalid-parameters-in-TransmitFile.patch (100%) rename patches/{09-TransmitFile => ws2_32-TransmitFile}/0003-ws2_32-Implement-a-basic-synchronous-TransmitFile.patch (100%) rename patches/{09-TransmitFile => ws2_32-TransmitFile}/0004-ws2_32-Add-asynchronous-support-for-TransmitFile.patch (100%) rename patches/{09-TransmitFile => ws2_32-TransmitFile}/0005-ws2_32-Add-support-for-TF_DISCONNECT-and-TF_REUSE_SO.patch (100%) rename patches/{09-TransmitFile => ws2_32-TransmitFile}/definition (100%) diff --git a/patches/Makefile b/patches/Makefile index 82d044b2..db2242ff 100644 --- a/patches/Makefile +++ b/patches/Makefile @@ -5,8 +5,7 @@ CURDIR ?= ${.CURDIR} PATCH := $(CURDIR)/../debian/tools/gitapply.sh -d $(DESTDIR) -PATCHLIST := 09-TransmitFile.ok \ - 10-Missing_Fonts.ok \ +PATCHLIST := 10-Missing_Fonts.ok \ 12-FD_Cache.ok \ 13-Misc_ACL.ok \ 14-UrlCombineW.ok \ @@ -27,7 +26,8 @@ PATCHLIST := 09-TransmitFile.ok \ server-Stored_ACLs.ok \ shell32-Default_Folder_ACLs.ok \ winepulse-PulseAudio_Support.ok \ - winex11-XEMBED.ok + winex11-XEMBED.ok \ + ws2_32-TransmitFile.ok .PHONY: install install: @@ -48,28 +48,6 @@ clean: .NOTPARALLEL: -# Patchset 09-TransmitFile -# | -# | Included patches: -# | * Implement TransmitFile. [by Erich E. Hoover] -# | -# | This patchset fixes the following Wine bugs: -# | * [#5048] Multiple applications and games need support for ws2_32 SIO_GET_EXTENSION_FUNCTION_POINTER TransmitFile -# | (WSAID_TRANSMITFILE) -# | -# | Modified files: -# | * dlls/ws2_32/socket.c, dlls/ws2_32/tests/sock.c, include/winsock.h, server/protocol.def, server/sock.c -# | -09-TransmitFile.ok: - $(PATCH) < 09-TransmitFile/0001-ws2_32-Add-stub-for-TransmitFile.patch - $(PATCH) < 09-TransmitFile/0002-ws2_32-Check-for-invalid-parameters-in-TransmitFile.patch - $(PATCH) < 09-TransmitFile/0003-ws2_32-Implement-a-basic-synchronous-TransmitFile.patch - $(PATCH) < 09-TransmitFile/0004-ws2_32-Add-asynchronous-support-for-TransmitFile.patch - $(PATCH) < 09-TransmitFile/0005-ws2_32-Add-support-for-TF_DISCONNECT-and-TF_REUSE_SO.patch - ( \ - echo "+ { \"09-TransmitFile\", \"Erich E. Hoover\", \"Implement TransmitFile.\" },"; \ - ) > 09-TransmitFile.ok - # Patchset 10-Missing_Fonts # | # | Included patches: @@ -503,3 +481,25 @@ winex11-XEMBED.ok: echo "+ { \"winex11-XEMBED\", \"Sebastian Lackner\", \"Update gl_drawable for embedded windows.\" },"; \ ) > winex11-XEMBED.ok +# Patchset ws2_32-TransmitFile +# | +# | Included patches: +# | * Implement TransmitFile. [by Erich E. Hoover] +# | +# | This patchset fixes the following Wine bugs: +# | * [#5048] Multiple applications and games need support for ws2_32 SIO_GET_EXTENSION_FUNCTION_POINTER TransmitFile +# | (WSAID_TRANSMITFILE) +# | +# | Modified files: +# | * dlls/ws2_32/socket.c, dlls/ws2_32/tests/sock.c, include/winsock.h, server/protocol.def, server/sock.c +# | +ws2_32-TransmitFile.ok: + $(PATCH) < ws2_32-TransmitFile/0001-ws2_32-Add-stub-for-TransmitFile.patch + $(PATCH) < ws2_32-TransmitFile/0002-ws2_32-Check-for-invalid-parameters-in-TransmitFile.patch + $(PATCH) < ws2_32-TransmitFile/0003-ws2_32-Implement-a-basic-synchronous-TransmitFile.patch + $(PATCH) < ws2_32-TransmitFile/0004-ws2_32-Add-asynchronous-support-for-TransmitFile.patch + $(PATCH) < ws2_32-TransmitFile/0005-ws2_32-Add-support-for-TF_DISCONNECT-and-TF_REUSE_SO.patch + ( \ + echo "+ { \"ws2_32-TransmitFile\", \"Erich E. Hoover\", \"Implement TransmitFile.\" },"; \ + ) > ws2_32-TransmitFile.ok + diff --git a/patches/09-TransmitFile/0001-ws2_32-Add-stub-for-TransmitFile.patch b/patches/ws2_32-TransmitFile/0001-ws2_32-Add-stub-for-TransmitFile.patch similarity index 100% rename from patches/09-TransmitFile/0001-ws2_32-Add-stub-for-TransmitFile.patch rename to patches/ws2_32-TransmitFile/0001-ws2_32-Add-stub-for-TransmitFile.patch diff --git a/patches/09-TransmitFile/0002-ws2_32-Check-for-invalid-parameters-in-TransmitFile.patch b/patches/ws2_32-TransmitFile/0002-ws2_32-Check-for-invalid-parameters-in-TransmitFile.patch similarity index 100% rename from patches/09-TransmitFile/0002-ws2_32-Check-for-invalid-parameters-in-TransmitFile.patch rename to patches/ws2_32-TransmitFile/0002-ws2_32-Check-for-invalid-parameters-in-TransmitFile.patch diff --git a/patches/09-TransmitFile/0003-ws2_32-Implement-a-basic-synchronous-TransmitFile.patch b/patches/ws2_32-TransmitFile/0003-ws2_32-Implement-a-basic-synchronous-TransmitFile.patch similarity index 100% rename from patches/09-TransmitFile/0003-ws2_32-Implement-a-basic-synchronous-TransmitFile.patch rename to patches/ws2_32-TransmitFile/0003-ws2_32-Implement-a-basic-synchronous-TransmitFile.patch diff --git a/patches/09-TransmitFile/0004-ws2_32-Add-asynchronous-support-for-TransmitFile.patch b/patches/ws2_32-TransmitFile/0004-ws2_32-Add-asynchronous-support-for-TransmitFile.patch similarity index 100% rename from patches/09-TransmitFile/0004-ws2_32-Add-asynchronous-support-for-TransmitFile.patch rename to patches/ws2_32-TransmitFile/0004-ws2_32-Add-asynchronous-support-for-TransmitFile.patch diff --git a/patches/09-TransmitFile/0005-ws2_32-Add-support-for-TF_DISCONNECT-and-TF_REUSE_SO.patch b/patches/ws2_32-TransmitFile/0005-ws2_32-Add-support-for-TF_DISCONNECT-and-TF_REUSE_SO.patch similarity index 100% rename from patches/09-TransmitFile/0005-ws2_32-Add-support-for-TF_DISCONNECT-and-TF_REUSE_SO.patch rename to patches/ws2_32-TransmitFile/0005-ws2_32-Add-support-for-TF_DISCONNECT-and-TF_REUSE_SO.patch diff --git a/patches/09-TransmitFile/definition b/patches/ws2_32-TransmitFile/definition similarity index 100% rename from patches/09-TransmitFile/definition rename to patches/ws2_32-TransmitFile/definition