[PATCH 2/3] typecast warnings in gtk-gui.c

[Lubomir I. Ivanov]

From: "Lubomir I. Ivanov" <neolit123 at gmail.com>

Signed-off-by: Lubomir I. Ivanov <neolit123 at gmail.com>
---
 gtk-gui.c |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/gtk-gui.c b/gtk-gui.c
index c78d7e6..a9571bf 100644
--- a/gtk-gui.c
+++ b/gtk-gui.c
@@ -419,7 +419,7 @@ static void preferences_dialog(GtkWidget *w, gpointer data)
 		gconf_client_set_string(gconf, GCONF_NAME(divelist_font), divelist_font, NULL);
 #else
 		HKEY hkey;
-		LONG success = RegCreateKeyEx(HKEY_CURRENT_USER, TEXT("Software\\subsurface"),
+		LONG success = RegCreateKeyEx(HKEY_CURRENT_USER, (LPCTSTR)"Software\\subsurface",
 					0L, NULL, REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS,
 					NULL, &hkey, NULL);
 		if (success != ERROR_SUCCESS)
@@ -428,7 +428,7 @@ static void preferences_dialog(GtkWidget *w, gpointer data)
 
 #define StoreInReg(_key, _val) { \
 			value = (_val) ;				\
-			RegSetValueEx(hkey, TEXT(_key), 0, REG_DWORD, &value, 4); \
+			RegSetValueEx(hkey, (LPCTSTR)_key, 0, REG_DWORD, (BYTE *)&value, 4); \
 		}
 
 		StoreInReg("feet", output_units.length == FEET);
@@ -440,7 +440,7 @@ static void preferences_dialog(GtkWidget *w, gpointer data)
 		StoreInReg("nitrox", visible_cols.nitrox);
 		StoreInReg("sac", visible_cols.sac);
 		StoreInReg("otu", visible_cols.otu);
-		RegSetValueEx(hkey, TEXT("divelist_font"), 0, REG_SZ, divelist_font, strlen(divelist_font));
+		RegSetValueEx(hkey, (LPCTSTR)"divelist_font", 0, REG_SZ, divelist_font, strlen(divelist_font));
 		if (RegFlushKey(hkey) != ERROR_SUCCESS)
 			printf("RegFlushKey failed %ld\n");
 		RegCloseKey(hkey);
@@ -731,7 +731,7 @@ static int get_from_registry(HKEY hkey, const char *key)
 	DWORD len = 4;
 	LONG success;
 
-	success = RegQueryValueEx(hkey, TEXT(key), NULL, NULL,
+	success = RegQueryValueEx(hkey, (LPCTSTR)key, NULL, NULL,
 				(LPBYTE) &value, &len );
 	if (success != ERROR_SUCCESS)
 		return FALSE; /* that's what happens the first time we start */
@@ -786,7 +786,7 @@ void init_ui(int *argcp, char ***argvp)
 	LONG success;
 	HKEY hkey;
 
-	success = RegOpenKeyEx(	HKEY_CURRENT_USER, TEXT("Software\\subsurface"), 0,
+	success = RegOpenKeyEx(	HKEY_CURRENT_USER, (LPCTSTR)"Software\\subsurface", 0,
 			KEY_QUERY_VALUE, &hkey);
 
 	output_units.length = get_from_registry(hkey, "feet");
@@ -801,11 +801,11 @@ void init_ui(int *argcp, char ***argvp)
 
 	divelist_font = malloc(80);
 	len = 80;
-	success = RegQueryValueEx(hkey, TEXT("divelist_font"), NULL, NULL,
+	success = RegQueryValueEx(hkey, (LPCTSTR)"divelist_font", NULL, NULL,
 				(LPBYTE) divelist_font, &len );
 	if (success != ERROR_SUCCESS) {
 		/* that's what happens the first time we start - just use the default */
-		free(divelist_font);
+		free((char *)divelist_font);
 		divelist_font = NULL;
 	}
 	RegCloseKey(hkey);
-- 
1.7.6.msysgit.0