Add initial scaffolding for WinIO support

Author: Mistuke

.github/workflows/haskell.yml

@@ -67,7 +67,7 @@ jobs:
       fail-fast: false
       matrix:
         os:  [ 'ubuntu-latest', 'macOS-latest', 'windows-latest' ]
-        ghc: [ '8.10', '9.0', '9.2', '9.4', '9.6' ]
+        ghc: [ '9.0', '9.2', '9.4', '9.6' ]
 
     steps:
     - uses: actions/checkout@v3

CHANGELOG.md

@@ -1,3 +1,8 @@
+## Version 3.2.0.0
+
+* Basic support for WINIO
+  [#509](https://github.com/haskell/network/pull/509)
+
 ## Version 3.1.4.0
 
 * Install and use afunix_compat.h header.

Network/Socket/Fcntl.hs

@@ -51,6 +51,7 @@ getCloseOnExec fd = do
 --   Since 2.7.0.0.
 getNonBlock :: CInt -> IO Bool
 #if defined(mingw32_HOST_OS)
+-- | TODO: Query socket for async flag
 getNonBlock _ = return False
 #else
 getNonBlock fd = do

Network/Socket/Handle.hs

@@ -20,6 +20,7 @@ import Network.Socket.Types
 -- cooperate with peer's 'gracefulClose', i.e. proper shutdown
 -- sequence with appropriate handshakes specified by the protocol.
 
+-- TODO: WinIO doesn't use fd, add support
 socketToHandle :: Socket -> IOMode -> IO Handle
 socketToHandle s mode = invalidateSocket s err $ \oldfd -> do
     h <- fdToHandle' oldfd (Just GHC.IO.Device.Stream) True (show s) mode True{-bin-}

cbits/cmsg.c

@@ -38,6 +38,9 @@ WSASendMsg (SOCKET s, LPWSAMSG lpMsg, DWORD flags,
     DWORD len;
     if (WSAIoctl(s, SIO_GET_EXTENSION_FUNCTION_POINTER,
         &WSASendMsgGUID, sizeof(WSASendMsgGUID), &ptr_SendMsg,
+        /* Sadly we can't perform this async for now as C code can't wait for
+           completion events from the Haskell RTS.  This needs to be moved to
+           Haskell on a re-designed async Network.  */
         sizeof(ptr_SendMsg), &len, NULL, NULL) != 0)
       return -1;
   }
@@ -58,6 +61,9 @@ WSARecvMsg (SOCKET s, LPWSAMSG lpMsg, LPDWORD lpdwNumberOfBytesRecvd,
     DWORD len;
     if (WSAIoctl(s, SIO_GET_EXTENSION_FUNCTION_POINTER,
         &WSARecvMsgGUID, sizeof(WSARecvMsgGUID), &ptr_RecvMsg,
+        /* Sadly we can't perform this async for now as C code can't wait for
+           completion events from the Haskell RTS.  This needs to be moved to
+           Haskell on a re-designed async Network.  */
         sizeof(ptr_RecvMsg), &len, NULL, NULL) != 0)
       return -1;
   }

network.cabal

@@ -1,22 +1,10 @@
 cabal-version:      1.18
 name:               network
-version:            3.1.4.0
+version:            3.2.0
 license:            BSD3
 license-file:       LICENSE
-maintainer:         Kazu Yamamoto, Evan Borden
-
-tested-with:
-    GHC == 9.6.1
-    GHC == 9.4.4
-    GHC == 9.2.7
-    GHC == 9.0.2
-    GHC == 8.10.7
-    GHC == 8.8.4
-    GHC == 8.6.5
-    GHC == 8.4.4
-    GHC == 8.2.2
-    GHC == 8.0.2
-
+maintainer:         Kazu Yamamoto, Tamar Christina
+tested-with:        ghc ==9.6.2 ghc ==9.4.5 ghc ==9.2.7 ghc ==9.0.2
 homepage:           https://github.com/haskell/network
 bug-reports:        https://github.com/haskell/network/issues
 synopsis:           Low-level networking interface
@@ -50,11 +38,6 @@ description:
 
 category:           Network
 build-type:         Configure
-
-extra-doc-files:
-    README.md
-    CHANGELOG.md
-
 extra-source-files:
     examples/*.hs
     tests/*.hs
@@ -79,6 +62,10 @@ extra-tmp-files:
     network.buildinfo
     include/HsNetworkConfig.h
 
+extra-doc-files:
+    README.md
+    CHANGELOG.md
+
 source-repository head
     type:     git
     location: https://github.com/haskell/network.git
@@ -124,17 +111,17 @@ library
     include-dirs:     include
     includes:         HsNet.h HsNetDef.h alignment.h win32defs.h
     install-includes: HsNet.h HsNetDef.h alignment.h win32defs.h
-    if os(windows)
-        includes:         afunix_compat.h
-        install-includes: afunix_compat.h
-
     ghc-options:      -Wall -fwarn-tabs
     build-depends:
         base >=4.9 && <5,
         bytestring >=0.10 && <0.12,
         deepseq,
         directory
 
+    if os(windows)
+        includes:         afunix_compat.h
+        install-includes: afunix_compat.h
+
     if !os(windows)
         other-modules:
             Network.Socket.ByteString.Lazy.Posix
@@ -168,12 +155,16 @@ library
             iphlpapi
             mswsock
 
-        if impl(ghc >=7.10)
+        build-depends:   temporary
+
+        if impl(ghc >=7.10 && <9.0)
             cpp-options: -D_WIN32_WINNT=0x0600
             cc-options:  -D_WIN32_WINNT=0x0600
 
-        build-depends:
-            temporary
+        if impl(ghc >=9.0)
+            cpp-options:   -D_WIN32_WINNT=0x0601
+            cc-options:    -D_WIN32_WINNT=0x0601
+            build-depends: Win32 >=2.12.0.1
 
 test-suite spec
     type:             exitcode-stdio-1.0
@@ -198,5 +189,8 @@ test-suite spec
         hspec >=2.6,
         QuickCheck
 
+    if os(windows) && impl(ghc >=9.0)
+        ghc-options: -with-rtsopts=--io-manager=native
+
     if flag(devel)
         cpp-options: -DDEVELOPMENT