aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/src
diff options
context:
space:
mode:
authorEgor Tensin <Egor.Tensin@gmail.com>2016-12-12 13:55:44 +0300
committerEgor Tensin <Egor.Tensin@gmail.com>2016-12-12 13:55:44 +0300
commit357c2cad11e5ded0a1c74edb364e32abe0178c6c (patch)
treef10143685c896877ef3012cc11f3c37f918c8189 /src
parentrefactoring (diff)
downloadwindows-env-357c2cad11e5ded0a1c74edb364e32abe0178c6c.tar.gz
windows-env-357c2cad11e5ded0a1c74edb364e32abe0178c6c.zip
preserve types of registry values
Diffstat (limited to '')
-rw-r--r--src/Windows/Environment.hs2
-rw-r--r--src/Windows/Registry.hs49
2 files changed, 43 insertions, 8 deletions
diff --git a/src/Windows/Environment.hs b/src/Windows/Environment.hs
index 490e2d4..8597d42 100644
--- a/src/Windows/Environment.hs
+++ b/src/Windows/Environment.hs
@@ -50,7 +50,7 @@ query profile name = Registry.getExpandedString (profileKeyPath profile) name
engrave :: Profile -> VarName -> VarValue -> IO (Either IOError ())
engrave profile name value = finally doEngrave notifyEnvironmentUpdate
where
- doEngrave = Registry.setExpandableString (profileKeyPath profile) name value
+ doEngrave = Registry.setStringPreserveType (profileKeyPath profile) name value
wipe :: Profile -> VarName -> IO (Either IOError ())
wipe profile name = finally doWipe notifyEnvironmentUpdate
diff --git a/src/Windows/Registry.hs b/src/Windows/Registry.hs
index 8a7f3fd..cb44ffe 100644
--- a/src/Windows/Registry.hs
+++ b/src/Windows/Registry.hs
@@ -6,6 +6,8 @@
--
-- Low-level utility functions for reading and writing registry values.
+{-# OPTIONS_GHC -XTupleSections #-}
+
module Windows.Registry
( IsKeyPath(..)
, RootKey(..)
@@ -43,7 +45,7 @@ import Foreign.ForeignPtr (withForeignPtr)
import Foreign.Marshal.Alloc (alloca, allocaBytes)
import Foreign.Marshal.Array (peekArray, pokeArray)
import Foreign.Storable (peek, poke)
-import System.IO.Error (catchIOError)
+import System.IO.Error (catchIOError, isDoesNotExistError)
import qualified System.Win32.Types as WinAPI
import qualified System.Win32.Registry as WinAPI
@@ -160,9 +162,20 @@ queryValue keyPath valueName =
allocaBytes valueSize $ \bufferPtr -> do
WinAPI.failUnlessSuccess "RegQueryValueExW" $
c_RegQueryValueEx keyHandlePtr valueNamePtr WinAPI.nullPtr valueTypePtr bufferPtr valueSizePtr
- buffer <- peekArray valueSize bufferPtr
- valueType <- peek valueTypePtr
- return (toEnum $ fromIntegral valueType, B.pack buffer)
+ buffer <- B.pack <$> peekArray valueSize bufferPtr
+ valueType <- toEnum . fromIntegral <$> peek valueTypePtr
+ return (valueType, buffer)
+
+queryType :: IsKeyPath a => a -> ValueName -> IO (Either IOError ValueType)
+queryType keyPath valueName =
+ openCloseCatch keyPath $ \keyHandle ->
+ withForeignPtr keyHandle $ \keyHandlePtr ->
+ WinAPI.withTString valueName $ \valueNamePtr ->
+ alloca $ \valueTypePtr -> do
+ WinAPI.failUnlessSuccess "RegQueryValueExW" $
+ c_RegQueryValueEx keyHandlePtr valueNamePtr WinAPI.nullPtr valueTypePtr WinAPI.nullPtr WinAPI.nullPtr
+ valueType <- toEnum . fromIntegral <$> peek valueTypePtr
+ return valueType
data GetValueFlag = RestrictAny
| RestrictNone
@@ -207,12 +220,25 @@ getValue keyPath valueName flags =
WinAPI.failUnlessSuccess "RegGetValueW" $
c_RegGetValue keyHandlePtr WinAPI.nullPtr valueNamePtr rawFlags valueTypePtr bufferPtr valueSizePtr
bufferSize <- fromIntegral <$> peek valueSizePtr
- buffer <- peekArray bufferSize bufferPtr
- valueType <- peek valueTypePtr
- return (toEnum $ fromIntegral valueType, B.pack buffer)
+ buffer <- B.pack <$> peekArray bufferSize bufferPtr
+ valueType <- toEnum . fromIntegral <$> peek valueTypePtr
+ return (valueType, buffer)
where
rawFlags = fromIntegral $ foldr (.|.) 0 $ map fromEnum flags
+getType :: IsKeyPath a => a -> ValueName -> [GetValueFlag] -> IO (Either IOError ValueType)
+getType keyPath valueName flags =
+ openCloseCatch keyPath $ \keyHandle ->
+ withForeignPtr keyHandle $ \keyHandlePtr ->
+ WinAPI.withTString valueName $ \valueNamePtr ->
+ alloca $ \valueTypePtr -> do
+ WinAPI.failUnlessSuccess "RegGetValueW" $
+ c_RegGetValue keyHandlePtr WinAPI.nullPtr valueNamePtr rawFlags valueTypePtr WinAPI.nullPtr WinAPI.nullPtr
+ valueType <- toEnum . fromIntegral <$> peek valueTypePtr
+ return valueType
+ where
+ rawFlags = fromIntegral $ foldr (.|.) 0 $ map fromEnum $ DoNotExpand : flags
+
getExpandedString :: IsKeyPath a => a -> ValueName -> IO (Either IOError String)
getExpandedString keyPath valueName = do
valueData <- getValue keyPath valueName [RestrictString, RestrictExpandableString]
@@ -240,6 +266,15 @@ setExpandableString :: IsKeyPath a => a -> ValueName -> String -> IO (Either IOE
setExpandableString keyPath valueName valueData =
setValue keyPath valueName (TypeExpandableString, encodeString valueData)
+setStringPreserveType :: IsKeyPath a => a -> ValueName -> String -> IO (Either IOError ())
+setStringPreserveType keyPath valueName valueData = do
+ valueType <- stringIfMissing <$> getType keyPath valueName [RestrictString, RestrictExpandableString]
+ either (return . Left) (setValue keyPath valueName . (, encodeString valueData)) valueType
+ where
+ stringIfMissing (Left e) | isDoesNotExistError e = Right TypeString
+ | otherwise = Left e
+ stringIfMissing (Right x) = Right x
+
deleteValue :: IsKeyPath a => a -> ValueName -> IO (Either IOError ())
deleteValue keyPath valueName =
openCloseCatch keyPath $ \keyHandle ->