summaryrefslogtreecommitdiffstats
path: root/windows.c
diff options
context:
space:
mode:
authorGravatar Dirk Hohndel <dirk@hohndel.org>2011-11-25 19:48:53 -0800
committerGravatar Dirk Hohndel <dirk@hohndel.org>2011-11-25 19:48:53 -0800
commitd2654d4951a01efd36f4189aeb02a791f20fa94d (patch)
treef79c0026261e0f17f6723c0d165a326e131fbdba /windows.c
parenta9d1f318b5d1974b882b0cebc9db291f5c0d1c62 (diff)
downloadsubsurface-d2654d4951a01efd36f4189aeb02a791f20fa94d.tar.gz
Fix the Windows preferences support
Now that I can test Windows binaries again, the bugs were rather easy to spot. Because of the different flow of the opening, writing and closing of the registry key my first attempt got things wrong - we simply always create the key with all access rights; if it exists Windows will just open it for us. The second bug was a cut'n'paste error. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'windows.c')
-rw-r--r--windows.c16
1 files changed, 6 insertions, 10 deletions
diff --git a/windows.c b/windows.c
index 91323ebe8..b8eafb6de 100644
--- a/windows.c
+++ b/windows.c
@@ -22,15 +22,11 @@ void subsurface_open_conf(void)
{
LONG success;
- success = RegOpenKeyEx(HKEY_CURRENT_USER, TEXT("Software\\subsurface"), 0,
- KEY_QUERY_VALUE, &hkey);
- if (success != ERROR_SUCCESS) {
- success = RegCreateKeyEx(HKEY_CURRENT_USER, TEXT("Software\\subsurface"),
- 0L, NULL, REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS,
- NULL, &hkey, NULL);
- if (success != ERROR_SUCCESS)
- printf("CreateKey Software\\subsurface failed %ld\n", success);
- }
+ success = RegCreateKeyEx(HKEY_CURRENT_USER, TEXT("Software\\subsurface"),
+ 0L, NULL, REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS,
+ NULL, &hkey, NULL);
+ if (success != ERROR_SUCCESS)
+ printf("CreateKey Software\\subsurface failed %ld\n", success);
}
void subsurface_set_conf(char *name, pref_type_t type, const void *value)
@@ -38,7 +34,7 @@ void subsurface_set_conf(char *name, pref_type_t type, const void *value)
switch (type) {
case PREF_BOOL:
/* we simply store the value as DWORD */
- RegSetValueEx(hkey, TEXT(name), 0, REG_DWORD, value, 4);
+ RegSetValueEx(hkey, TEXT(name), 0, REG_DWORD, &value, 4);
break;
case PREF_STRING:
RegSetValueEx(hkey, TEXT(name), 0, REG_SZ, value, strlen(value));