diff --git a/Win32-services.cabal b/Win32-services.cabal --- a/Win32-services.cabal +++ b/Win32-services.cabal @@ -1,6 +1,6 @@ name: Win32-services category: System -version: 0.2.5 +version: 0.2.5.1 cabal-version: >= 1.16 build-type: Simple author: Michael Steele @@ -22,7 +22,7 @@ official API: . * Only services running within their own process are supported. These are - processes of the 'WIN32_OWN_PROCESS' type. + processes of the "WIN32_OWN_PROCESS" type. . * In cases where multiple versions of the same function exist (for compatibility), this binding only offers one of them. @@ -64,7 +64,7 @@ . running = SERVICE_STATUS WIN32_OWN_PROCESS RUNNING [ACCEPT_STOP] nO_ERROR 0 0 0 stopped = SERVICE_STATUS WIN32_OWN_PROCESS STOPPED [] nO_ERROR 0 0 0 - stopPending = SERVICE_STATUS WIN32_OWN_PROCESS START_PENDING [ACCEPT_STOP] nO_ERROR 0 0 0 + stopPending = SERVICE_STATUS WIN32_OWN_PROCESS STOP_PENDING [ACCEPT_STOP] nO_ERROR 0 0 0 @ . @ diff --git a/changelog b/changelog --- a/changelog +++ b/changelog @@ -1,5 +1,14 @@ # 0.2 series +## 0.2.5.1 + +* bugfix in "simple" example. + +## 0.2.5 + +* Update library dependencies to support GHC 7.10.1. +* Remove dependency on "errors" library. + ## 0.2.4 * bug fix: eRROR_SERVICE_SPECIFIC_ERROR was mapped to the wrong code. diff --git a/examples/simple.hs b/examples/simple.hs --- a/examples/simple.hs +++ b/examples/simple.hs @@ -19,4 +19,4 @@ running = SERVICE_STATUS WIN32_OWN_PROCESS RUNNING [ACCEPT_STOP] nO_ERROR 0 0 0 stopped = SERVICE_STATUS WIN32_OWN_PROCESS STOPPED [] nO_ERROR 0 0 0 -stopPending = SERVICE_STATUS WIN32_OWN_PROCESS START_PENDING [ACCEPT_STOP] nO_ERROR 0 0 0 +stopPending = SERVICE_STATUS WIN32_OWN_PROCESS STOP_PENDING [ACCEPT_STOP] nO_ERROR 0 0 0 diff --git a/src/System/Win32/SystemServices/Services.hs b/src/System/Win32/SystemServices/Services.hs --- a/src/System/Win32/SystemServices/Services.hs +++ b/src/System/Win32/SystemServices/Services.hs @@ -120,6 +120,9 @@ -- This is the service name that the service control program specified in -- the CreateService function when creating the service. -> DWORD + -- ^ + -- [@waitHint@] The estimated time required for a pending start, stop, + -- pause, or continue operation, in milliseconds. -> HandlerFunction -> ServiceMainFunction -- ^ This is a callback function that will be called by the operating diff --git a/src/System/Win32/SystemServices/Services/SERVICE_ACCEPT.hs b/src/System/Win32/SystemServices/Services/SERVICE_ACCEPT.hs --- a/src/System/Win32/SystemServices/Services/SERVICE_ACCEPT.hs +++ b/src/System/Win32/SystemServices/Services/SERVICE_ACCEPT.hs @@ -1,3 +1,6 @@ +-- We refer to otherwise unused modules in documentation. +{-# OPTIONS_GHC -fno-warn-unused-imports #-} + module System.Win32.SystemServices.Services.SERVICE_ACCEPT ( SERVICE_ACCEPT (..) , pokeServiceAccept @@ -10,38 +13,41 @@ import Import +-- Imported for haddocks +import qualified System.Win32.SystemServices.Services.SERVICE_CONTROL as C + -- | The control codes the service accepts and processes in its handler -- function (See 'HandlerFunction'). By default, all services accept the --- 'INTERROGATE' value. To accept the 'DEVICEEVENT' value, the service must +-- 'C.INTERROGATE' value. To accept the 'DEVICEEVENT' value, the service must -- register to receive device events by using the -- 'registerDeviceNotification' function. data SERVICE_ACCEPT -- | The service is a network component that can accept changes in its -- binding without being stopped and restarted. This control code allows - -- the service to receive 'NETBINDADD', 'NETBINDREMOVE', 'NETBINDENABLE' - -- , and 'NETBINDDISABLE' notifications. + -- the service to receive 'C.NETBINDADD', 'C.NETBINDREMOVE', + -- 'C.NETBINDENABLE', and 'C.NETBINDDISABLE' notifications. = ACCEPT_NETBINDCHANGE -- | The service can reread its startup parameters without being stopped -- and restarted. This control code allows the service to receive - -- 'PARAMCHANGE' notifications. + -- 'C.PARAMCHANGE' notifications. | ACCEPT_PARAMCHANGE -- | The service can be paused and continued. This control code allows the - -- service to receive 'PAUSE' and 'CONTINUE' notifications. + -- service to receive 'C.PAUSE' and 'C.CONTINUE' notifications. | ACCEPT_PAUSE_CONTINUE -- | MSDN documentation says that this function is not supported on -- Windows Server 2003 or Windows XP/2000. The support status on other -- versions is unknown to me. -- -- The service can perform preshutdown tasks. This control code enables - -- the service to receive 'PRESHUTDOWN' notifications. + -- the service to receive 'C.PRESHUTDOWN' notifications. -- Note that only the system can send it. | ACCEPT_PRESHUTDOWN -- | The service is notified when system shutdown occurs. This control - -- code allows the service to receive 'SHUTDOWN' notifications. Note + -- code allows the service to receive 'C.SHUTDOWN' notifications. Note -- that only the system can send it. | ACCEPT_SHUTDOWN -- | The service can be stopped. This control code allows the service to - -- receive 'STOP' notifications. + -- receive 'C.STOP' notifications. | ACCEPT_STOP deriving (Show) diff --git a/src/System/Win32/SystemServices/Services/SERVICE_STATUS.hs b/src/System/Win32/SystemServices/Services/SERVICE_STATUS.hs --- a/src/System/Win32/SystemServices/Services/SERVICE_STATUS.hs +++ b/src/System/Win32/SystemServices/Services/SERVICE_STATUS.hs @@ -70,13 +70,13 @@ -- line being printed to stderr and process termination on a left value. -- Service applications do not have stderr. est <- peekServiceType (pST ptr) - eca <- peekServiceState (pCS ptr) - case (,) <$> est <*> eca of + ecs <- peekServiceState (pCS ptr) + case (,) <$> est <*> ecs of Left e -> do -- runScript would call this on error. hPutStrLn stderr e exitFailure - Right (st, ca) -> SERVICE_STATUS st ca + Right (st, cs) -> SERVICE_STATUS st cs <$> (peekServiceAccept . pCA) ptr <*> (peek . pEC) ptr <*> (peek . pSSEC) ptr