commit a57befe72d00ae4e24a82ad18b453cbaedf053f6
author Dmitry Timoshkov <dmitry@codeweavers.com> Thu Jun 14 19:24:02 2001 +0000
committer Alexandre Julliard <julliard@winehq.org> Thu Jun 14 19:24:02 2001 +0000
tree b86ff33f923ffe7c58887e81bfecf3de3da1c39b
parent 183eae9096ed346f2649bdb32cf75dc7c0b5851b

Replace more PROFILE_ functions by RegQueryValueExA.

windows/sysmetrics.c

diff --git a/windows/sysmetrics.c b/windows/sysmetrics.c
index cdf59c0..80656ef 100644
--- a/windows/sysmetrics.c
+++ b/windows/sysmetrics.c
@@ -6,19 +6,40 @@
  */
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <assert.h>
 
 #include "windef.h"
 #include "wingdi.h"
 #include "wine/winuser16.h"
 #include "winbase.h"
+#include "winreg.h"
 #include "winuser.h"
-#include "options.h"
 #include "user.h"
 #include "sysmetrics.h"
 
 static int sysMetrics[SM_WINE_CMETRICS+1];
 
+static int SYSMETRICS_GetProfileInt(const char *section, const char *key,
+				    int default_value)
+{
+    int ret = default_value;
+    char buffer[1024];
+    HKEY hkey;
+
+    strcpy(buffer, "Software\\Wine\\Wine\\Config\\");
+    strncat(buffer, section, sizeof(buffer) - strlen(buffer));
+
+    if(!RegOpenKeyA(HKEY_LOCAL_MACHINE, buffer, &hkey))
+    {
+	DWORD type, count = sizeof(buffer);
+	if(!RegQueryValueExA(hkey, key, 0, &type, buffer, &count))
+	    ret = atoi(buffer);
+	RegCloseKey(hkey);
+    }
+    return ret;
+}
+
 /***********************************************************************
  *           SYSMETRICS_Init
  *
@@ -48,21 +69,21 @@
     sysMetrics[SM_WINE_BPP] = GetDeviceCaps( hdc, BITSPIXEL );
     if (TWEAK_WineLook > WIN31_LOOK)
 	sysMetrics[SM_CXVSCROLL] =
-	    PROFILE_GetWineIniInt("Tweak.Layout", "ScrollBarWidth", 16);
+	    SYSMETRICS_GetProfileInt("Tweak.Layout", "ScrollBarWidth", 16);
     else
 	sysMetrics[SM_CXVSCROLL] =
-	    PROFILE_GetWineIniInt("Tweak.Layout", "ScrollBarWidth", 17);
+	    SYSMETRICS_GetProfileInt("Tweak.Layout", "ScrollBarWidth", 17);
     sysMetrics[SM_CYHSCROLL] = sysMetrics[SM_CXVSCROLL];
     if (TWEAK_WineLook > WIN31_LOOK)
 	sysMetrics[SM_CYCAPTION] =
-	    PROFILE_GetWineIniInt("Tweak.Layout", "CaptionHeight", 19);
+	    SYSMETRICS_GetProfileInt("Tweak.Layout", "CaptionHeight", 19);
     else
 	sysMetrics[SM_CYCAPTION] =
-	    PROFILE_GetWineIniInt("Tweak.Layout", "CaptionHeight", 20);
+	    SYSMETRICS_GetProfileInt("Tweak.Layout", "CaptionHeight", 20);
     sysMetrics[SM_CXBORDER] = 1;
     sysMetrics[SM_CYBORDER] = sysMetrics[SM_CXBORDER];
     sysMetrics[SM_CXDLGFRAME] =
-	PROFILE_GetWineIniInt("Tweak.Layout", "DialogFrameWidth",
+	SYSMETRICS_GetProfileInt("Tweak.Layout", "DialogFrameWidth",
 			      (TWEAK_WineLook > WIN31_LOOK) ? 3 : 4);
     sysMetrics[SM_CYDLGFRAME] = sysMetrics[SM_CXDLGFRAME];
     sysMetrics[SM_CYVTHUMB] = sysMetrics[SM_CXVSCROLL] - 1;
@@ -71,10 +92,10 @@
     sysMetrics[SM_CYICON] = 32;
     if (TWEAK_WineLook > WIN31_LOOK)
 	sysMetrics[SM_CYMENU] =
-	    PROFILE_GetWineIniInt("Tweak.Layout", "MenuHeight", 19);
+	    SYSMETRICS_GetProfileInt("Tweak.Layout", "MenuHeight", 19);
     else
 	sysMetrics[SM_CYMENU] =
-	    PROFILE_GetWineIniInt("Tweak.Layout", "MenuHeight", 18);
+	    SYSMETRICS_GetProfileInt("Tweak.Layout", "MenuHeight", 18);
     sysMetrics[SM_CXFULLSCREEN] = sysMetrics[SM_CXSCREEN];
     sysMetrics[SM_CYFULLSCREEN] =
 	sysMetrics[SM_CYSCREEN] - sysMetrics[SM_CYCAPTION];