From: Toni Wilen <twilen@winuae.net>
Date: Tue, 11 Jul 2017 18:04:04 +0000 (+0300)
Subject: Separated ini handling.
X-Git-Tag: 3600~167
X-Git-Url: https://git.unchartedbackwaters.co.uk/w/?a=commitdiff_plain;h=f4108562820652a646b70c56d0ca807ad8d50457;p=francis%2Fwinuae.git

Separated ini handling.
---

diff --git a/include/ini.h b/include/ini.h
new file mode 100644
index 00000000..e76b6186
--- /dev/null
+++ b/include/ini.h
@@ -0,0 +1,28 @@
+struct ini_line
+{
+	int section_order;
+	TCHAR *section;
+	TCHAR *key;
+	TCHAR *value;
+};
+
+struct ini_data
+{
+	struct ini_line **inidata;
+	int inilines;
+};
+
+void ini_free(struct ini_data *ini);
+struct ini_data *ini_new(void);
+struct ini_data *ini_load(const TCHAR *path);
+bool ini_save(struct ini_data *ini, const TCHAR *path);
+
+void ini_addnewstring(struct ini_data *ini, const TCHAR *section, const TCHAR *key, const TCHAR *val);
+void ini_addnewdata(struct ini_data *ini, const TCHAR *section, const TCHAR *key, const uae_u8 *data, int len);
+void ini_addnewcomment(struct ini_data *ini, const TCHAR *section, const TCHAR *val);
+
+bool ini_getstring(struct ini_data *ini, const TCHAR *section, const TCHAR *key, TCHAR **out);
+bool ini_getsectionstring(struct ini_data *ini, const TCHAR *section, int idx, TCHAR **keyout, TCHAR **valout);
+bool ini_getdata(struct ini_data *ini, const TCHAR *section, const TCHAR *key, uae_u8 **out, int *size);
+bool ini_addstring(struct ini_data *ini, const TCHAR *section, const TCHAR *key, const TCHAR *val);
+bool ini_delete(struct ini_data *ini, const TCHAR *section, const TCHAR *key);
diff --git a/ini.cpp b/ini.cpp
new file mode 100644
index 00000000..364971df
--- /dev/null
+++ b/ini.cpp
@@ -0,0 +1,372 @@
+
+#include "sysconfig.h"
+#include "sysdeps.h"
+
+#include "ini.h"
+
+static TCHAR *initrim(TCHAR *s)
+{
+	while (*s != 0 && *s <= 32)
+		s++;
+	TCHAR *s2 = s;
+	while (*s2)
+		s2++;
+	while (s2 > s) {
+		s2--;
+		if (*s2 > 32)
+			break;
+		*s2 = 0;
+	}
+	return s;
+}
+
+void ini_free(struct ini_data *ini)
+{
+	for(int c = 0; c < ini->inilines; c++) {
+		struct ini_line *il = ini->inidata[c];
+		if (il) {
+			xfree(il->section);
+			xfree(il->key);
+			xfree(il->value);
+			xfree(il);
+		}
+		ini->inidata[c] = NULL;
+	}
+	xfree(ini);
+}
+
+static void ini_sort(struct ini_data *ini)
+{
+	for(int c1 = 0; c1 < ini->inilines; c1++) {
+		struct ini_line *il1 = ini->inidata[c1];
+		if (il1 == NULL)
+			continue;
+		for (int c2 = c1 + 1; c2 < ini->inilines; c2++) {
+			struct ini_line *il2 = ini->inidata[c2];
+			if (il2 == NULL)
+				continue;
+			int order = 0;
+			int sec = _tcsicmp(il1->section, il2->section);
+			if (sec) {
+				if (!il1->section_order && !il2->section_order)
+					order = sec;
+				else
+					order = il2->section_order - il1->section_order;
+			} else {
+				order = _tcsicmp(il1->key, il2->key);
+			}
+			if (order > 0) {
+				struct ini_line il;
+				memcpy(&il, il1, sizeof(struct ini_line));
+				memcpy(il1, il2, sizeof(struct ini_line));
+				memcpy(il2, &il, sizeof(struct ini_line));
+			}
+		}
+	}
+#if 0
+	for(int c1 = 0; c1 < inilines; c1++) {
+		struct ini_line *il1 = inidata[c1];
+		if (il1)
+			write_log(_T("[%s] %s %s\n"), il1->section, il1->key, il1->value);
+	}
+	write_log(_T("\n"));
+#endif
+}
+
+void ini_addnewcomment(struct ini_data *ini, const TCHAR *section, const TCHAR *val)
+{
+	ini_addnewstring(ini, section, _T(""), val);
+}
+
+void ini_addnewstring(struct ini_data *ini, const TCHAR *section, const TCHAR *key, const TCHAR *val)
+{
+	struct ini_line *il = xcalloc(struct ini_line, 1);
+	il->section = my_strdup(section);
+	if (!_tcsicmp(section, _T("WinUAE")))
+		il->section_order = 1;
+	il->key = my_strdup(key);
+	il->value = my_strdup(val);
+	int cnt = 0;
+	while (cnt < ini->inilines && ini->inidata[cnt])
+		cnt++;
+	if (cnt == ini->inilines) {
+		ini->inilines += 10;
+		ini->inidata = xrealloc(struct ini_line*, ini->inidata, ini->inilines);
+		int cnt2 = cnt;
+		while (cnt2 < ini->inilines) {
+			ini->inidata[cnt2++] = NULL;
+		}
+	}
+	ini->inidata[cnt] = il;
+}
+
+void ini_addnewdata(struct ini_data *ini, const TCHAR *section, const TCHAR *key, const uae_u8 *data, int len)
+{
+	TCHAR *s = xcalloc(TCHAR, len * 3);
+	_tcscpy(s, _T("\\\n"));
+	int w = 32;
+	for (int i = 0; i < len; i += w) {
+		if (i > 0)
+			_tcscat(s, _T(" \\\n"));
+		TCHAR *p = s + _tcslen(s);
+		for (int j = 0; j < w && j + i < len; j++) {
+			_stprintf (p, _T("%02X"), data[i + j]);
+			p += 2;
+		}
+		*p = 0;
+	}
+	ini_addnewstring(ini, section, key, s);
+	xfree(s);
+}
+
+static const uae_u8 bom[3] = { 0xef, 0xbb, 0xbf };
+
+struct ini_data *ini_new(void)
+{
+	struct ini_data *iniout = xcalloc(ini_data, 1);
+	return iniout;
+}
+
+struct ini_data *ini_load(const TCHAR *path)
+{
+	bool utf8 = false;
+	TCHAR section[MAX_DPATH];
+	uae_u8 tmp[3];
+	struct ini_data ini = { 0 };
+
+	FILE *f = _tfopen(path, _T("rb"));
+	if (!f)
+		return NULL;
+	int v = fread(tmp, 1, sizeof tmp, f);
+	fclose (f);
+	if (v == 3 && tmp[0] == 0xef && tmp[1] == 0xbb && tmp[2] == 0xbf) {
+		f = _tfopen (path, _T("rt, ccs=UTF-8"));
+	} else {
+		f = _tfopen (path, _T("rt"));
+	}
+	section[0] = 0;
+	for (;;) {
+		TCHAR tbuffer[MAX_DPATH];
+		tbuffer[0] = 0;
+		if (!fgetws(tbuffer, MAX_DPATH, f))
+			break;
+		TCHAR *s = initrim(tbuffer);
+		if (_tcslen(s) < 3)
+			continue;
+		if (s[0] == ';')
+			continue;
+		if (s[0] == '[' && s[_tcslen(s) - 1] == ']') {
+			s[_tcslen(s) - 1] = 0;
+			_tcscpy(section, s + 1);
+			continue;
+		}
+		if (section[0] == 0)
+			continue;
+		TCHAR *s1 = _tcschr(s, '=');
+		if (s1) {
+			*s1++ = 0;
+			TCHAR *s2 = initrim(tbuffer);
+			TCHAR *s3 = initrim(s1);
+			if (s3[0] == '\\' && s3[1] == 0) {
+				// multiline
+				xfree(s3);
+				s3 = NULL;
+				int len = MAX_DPATH;
+				TCHAR *otxt = xcalloc(TCHAR, len);
+				for (;;) {
+					tbuffer[0] = 0;
+					if (!fgetws(tbuffer, MAX_DPATH, f))
+						break;
+					s3 = initrim(tbuffer);
+					if (s3[0] == 0)
+						break;
+					if (_tcslen(otxt) + _tcslen(s3) + 1 >= len) {
+						len += MAX_DPATH;
+						otxt = xrealloc(TCHAR, otxt, len);
+					}
+					_tcscat(otxt, s3);
+					xfree(s3);
+					s3 = NULL;
+				}
+				xfree(s3);
+				ini_addnewstring(&ini, section, s2, otxt);
+			} else {
+				ini_addnewstring(&ini, section, s2, s3);
+			}
+		}
+	}
+	fclose(f);
+	ini_sort(&ini);
+	struct ini_data *iniout = xcalloc(ini_data, 1);
+	memcpy(iniout, &ini, sizeof(struct ini_data));
+	return iniout;
+}
+
+bool ini_save(struct ini_data *ini, const TCHAR *path)
+{
+	TCHAR section[MAX_DPATH];
+	TCHAR sep[2] = { '=', 0 };
+	TCHAR com[3] = { ';', ' ', 0 };
+	TCHAR lf[2] = {  10, 0 };
+	TCHAR left[2] = { '[', 0 };
+	TCHAR right[2] = { ']', 0 };
+
+	if (!ini)
+		return false;
+	ini_sort(ini);
+	FILE *f = _tfopen(path, _T("wt, ccs=UTF-8"));
+	if (!f)
+		return false;
+	section[0] = 0;
+	for (int c = 0; c < ini->inilines; c++) {
+		TCHAR out[MAX_DPATH];
+		struct ini_line *il = ini->inidata[c];
+		if (!il)
+			continue;
+		if (_tcscmp(il->section, section)) {
+			_tcscpy(out, lf);
+			_tcscat(out, left);
+			_tcscat(out, il->section);
+			_tcscat(out, right);
+			_tcscat(out, lf);
+			fputws(out, f);
+			_tcscpy(section, il->section);
+		}
+		if (il->key[0] == 0) {
+			fputws(com, f);
+		} else {
+			fputws(il->key, f);
+			fputws(sep, f);
+		}
+		fputws(il->value, f);
+		fputws(lf, f);
+	}
+	fclose(f);
+	return true;
+}
+
+bool ini_getstring(struct ini_data *ini, const TCHAR *section, const TCHAR *key, TCHAR **out)
+{
+	for (int c = 0; c < ini->inilines; c++) {
+		struct ini_line *il = ini->inidata[c];
+		if (il && !_tcscmp(section, il->section) && (key == NULL || !_tcscmp(key, il->key))) {
+			if (out) {
+				*out = my_strdup(il->value);
+			}
+			return true;
+		}
+	}
+	return false;
+}
+
+bool ini_getdata(struct ini_data *ini, const TCHAR *section, const TCHAR *key, uae_u8 **out, int *size)
+{
+	TCHAR *out2 = NULL;
+	uae_u8 *outp = NULL;
+	int len;
+	bool quoted = false;
+
+	if (!ini_getstring(ini, section, key, &out2))
+		return false;
+
+	len = _tcslen(out2);
+	outp = xcalloc(uae_u8, len);
+
+	int j = 0;
+	for (int i = 0; i < len; ) {
+		TCHAR c1 = _totupper(out2[i + 0]);
+		if (c1 == '\"') {
+			quoted = !quoted;
+			i++;
+		} else {
+			if (quoted) {
+				outp[j++] = (uae_u8)c1;
+				i++;
+			} else {
+				if (c1 == ' ') {
+					i++;
+					continue;
+				}
+				if (i + 1 >= len)
+					goto err;
+				TCHAR c2 = _totupper(out2[i + 1]);
+				if (c1 >= 'A')
+					c1 -= 'A' - 10;
+				else if (c1 >= '0')
+					c1 -= '0';
+				if (c1 > 15)
+					goto err;
+				if (c2 >= 'A')
+					c2 -= 'A' - 10;
+				else if (c2 >= '0')
+					c2 -= '0';
+				if (c2 > 15)
+					goto err;
+				outp[j++] = c1 * 16 + c2;
+				i += 2;
+			}
+		}
+	}
+	if (quoted)
+		goto err;
+	*out = outp;
+	*size = j;
+	return true;
+err:
+	xfree(out2);
+	xfree(outp);
+	return false;
+}
+
+bool ini_getsectionstring(struct ini_data *ini, const TCHAR *section, int idx, TCHAR **keyout, TCHAR **valout)
+{
+	for (int c = 0; c < ini->inilines; c++) {
+		struct ini_line *il = ini->inidata[c];
+		if (il && !_tcscmp(section, il->section)) {
+			if (idx == 0) {
+				if (keyout) {
+					*keyout = my_strdup(il->key);
+				}
+				if (valout) {
+					*valout = my_strdup(il->value);
+				}
+				return true;
+			}
+			idx--;
+		}
+	}
+	return false;
+}
+
+bool ini_addstring(struct ini_data *ini, const TCHAR *section, const TCHAR *key, const TCHAR *val)
+{
+	for (int c = 0; c < ini->inilines; c++) {
+		struct ini_line *il = ini->inidata[c];
+		if (il && !_tcscmp(section, il->section)) {
+			if (!_tcscmp(key, il->key)) {
+				xfree(il->value);
+				il->value = my_strdup(val);
+				return true;
+			}
+		}
+	}
+	ini_addnewstring(ini, section, key, val);
+	return true;
+}
+
+bool ini_delete(struct ini_data *ini, const TCHAR *section, const TCHAR *key)
+{
+	for (int c = 0; c < ini->inilines; c++) {
+		struct ini_line *il = ini->inidata[c];
+		if (il && !_tcscmp(section, il->section) && (key == NULL || !_tcscmp(key, il->key))) {
+			xfree(il->section);
+			xfree(il->key);
+			xfree(il->value);
+			xfree(il);
+			ini->inidata[c] = NULL;
+			return true;
+		}
+	}
+	return false;
+}
+
diff --git a/od-win32/registry.cpp b/od-win32/registry.cpp
index 93f1d1df..8a36878b 100644
--- a/od-win32/registry.cpp
+++ b/od-win32/registry.cpp
@@ -6,266 +6,14 @@
 #include <shlwapi.h>
 #include "win32.h"
 #include "registry.h"
-#include "crc32.h"
+#include "ini.h"
 
 static int inimode = 0;
 static TCHAR *inipath;
 
 #define ROOT_TREE _T("WinUAE")
 
-static struct ini_line **inidata;
-static int inilines;
-
-struct ini_line
-{
-	int section_order;
-	TCHAR *section;
-	TCHAR *key;
-	TCHAR *value;
-};
-
-static TCHAR *initrim(TCHAR *s)
-{
-	while (*s != 0 && *s <= 32)
-		s++;
-	TCHAR *s2 = s;
-	while (*s2)
-		s2++;
-	while (s2 > s) {
-		s2--;
-		if (*s2 > 32)
-			break;
-		*s2 = 0;
-	}
-	return s;
-}
-
-static void ini_free(void)
-{
-	for(int c = 0; c < inilines; c++) {
-		struct ini_line *il = inidata[c];
-		xfree(il->section);
-		xfree(il->key);
-		xfree(il->value);
-		xfree(il);
-		inidata[c] = NULL;
-	}
-}
-
-static void ini_sort(void)
-{
-	for(int c1 = 0; c1 < inilines; c1++) {
-		struct ini_line *il1 = inidata[c1];
-		if (il1 == NULL)
-			continue;
-		for (int c2 = c1 + 1; c2 < inilines; c2++) {
-			struct ini_line *il2 = inidata[c2];
-			if (il2 == NULL)
-				continue;
-			int order = 0;
-			int sec = _tcsicmp(il1->section, il2->section);
-			if (sec) {
-				if (!il1->section_order && !il2->section_order)
-					order = sec;
-				else
-					order = il2->section_order - il1->section_order;
-			} else {
-				order = _tcsicmp(il1->key, il2->key);
-			}
-			if (order > 0) {
-				struct ini_line il;
-				memcpy(&il, il1, sizeof(struct ini_line));
-				memcpy(il1, il2, sizeof(struct ini_line));
-				memcpy(il2, &il, sizeof(struct ini_line));
-			}
-		}
-	}
-#if 0
-	for(int c1 = 0; c1 < inilines; c1++) {
-		struct ini_line *il1 = inidata[c1];
-		if (il1)
-			write_log(_T("[%s] %s %s\n"), il1->section, il1->key, il1->value);
-	}
-	write_log(_T("\n"));
-#endif
-}
-
-static void ini_addnewstring(const TCHAR *section, const TCHAR *key, const TCHAR *val)
-{
-	struct ini_line *il = xcalloc(struct ini_line, 1);
-	il->section = my_strdup(section);
-	if (!_tcsicmp(section, ROOT_TREE))
-		il->section_order = 1;
-	il->key = my_strdup(key);
-	il->value = my_strdup(val);
-	int cnt = 0;
-	while (cnt < inilines && inidata[cnt])
-		cnt++;
-	if (cnt == inilines) {
-		inilines += 10;
-		inidata = xrealloc(struct ini_line*, inidata, inilines);
-		int cnt2 = cnt;
-		while (cnt2 < inilines) {
-			inidata[cnt2++] = NULL;
-		}
-	}
-	inidata[cnt] = il;
-}
-
-static const uae_u8 bom[3] = { 0xef, 0xbb, 0xbf };
-
-static void ini_load(const TCHAR *path)
-{
-	bool utf8 = false;
-	TCHAR section[MAX_DPATH];
-	uae_u8 tmp[3];
-
-	ini_free();
-
-	FILE *f = _tfopen(path, _T("rb"));
-	if (!f)
-		return;
-	int v = fread(tmp, 1, sizeof tmp, f);
-	fclose (f);
-	if (v == 3 && tmp[0] == 0xef && tmp[1] == 0xbb && tmp[2] == 0xbf) {
-		f = _tfopen (path, _T("rt, ccs=UTF-8"));
-	} else {
-		f = _tfopen (path, _T("rt"));
-	}
-	section[0] = 0;
-	for (;;) {
-		TCHAR tbuffer[MAX_DPATH];
-		tbuffer[0] = 0;
-		if (!fgetws(tbuffer, MAX_DPATH, f))
-			break;
-		TCHAR *s = initrim(tbuffer);
-		if (_tcslen(s) < 3)
-			continue;
-		if (s[0] == '[' && s[_tcslen(s) - 1] == ']') {
-			s[_tcslen(s) - 1] = 0;
-			_tcscpy(section, s + 1);
-			continue;
-		}
-		if (section[0] == 0)
-			continue;
-		TCHAR *s1 = _tcschr(s, '=');
-		if (s1) {
-			*s1++ = 0;
-			TCHAR *s2 = initrim(tbuffer);
-			TCHAR *s3 = initrim(s1);
-			ini_addnewstring(section, s2, s3);
-		}
-	}
-	fclose(f);
-	ini_sort();
-}
-
-static void ini_save(const TCHAR *path)
-{
-	TCHAR section[MAX_DPATH];
-	TCHAR sep[2] = { '=', 0 };
-	TCHAR lf[2] = {  10, 0 };
-	TCHAR left[2] = { '[', 0 };
-	TCHAR right[2] = { ']', 0 };
-
-	ini_sort();
-	FILE *f = _tfopen(path, _T("wt, ccs=UTF-8"));
-	if (!f)
-		return;
-	section[0] = 0;
-	for (int c = 0; c < inilines; c++) {
-		TCHAR out[MAX_DPATH];
-		struct ini_line *il = inidata[c];
-		if (!il)
-			continue;
-		if (_tcscmp(il->section, section)) {
-			_tcscpy(out, lf);
-			_tcscat(out, left);
-			_tcscat(out, il->section);
-			_tcscat(out, right);
-			_tcscat(out, lf);
-			fputws(out, f);
-			_tcscpy(section, il->section);
-		}
-		_tcscpy(out, il->key);
-		_tcscat(out, sep);
-		_tcscat(out, il->value);
-		_tcscat(out, lf);
-		fputws(out, f);
-	}
-	fclose(f);
-}
-
-static bool ini_getstring(const TCHAR *section, const TCHAR *key, TCHAR *out, int *max)
-{
-	for (int c = 0; c < inilines; c++) {
-		struct ini_line *il = inidata[c];
-		if (il && !_tcscmp(section, il->section) && (key == NULL || !_tcscmp(key, il->key))) {
-			if (out) {
-				_tcsncpy(out, il->value, *max);
-				out[*max - 1] = 0;
-				*max = _tcslen(out);
-			}
-			return true;
-		}
-	}
-	return false;
-}
-
-static bool ini_getsectionstring(const TCHAR *section, int idx, TCHAR *keyout, int *keysize, TCHAR *valout, int *valsize)
-{
-	for (int c = 0; c < inilines; c++) {
-		struct ini_line *il = inidata[c];
-		if (il && !_tcscmp(section, il->section)) {
-			if (idx == 0) {
-				if (keyout) {
-					_tcsncpy(keyout, il->key, *keysize);
-					keyout[*keysize - 1] = 0;
-					*keysize = _tcslen(keyout);
-				}
-				if (valout) {
-					_tcsncpy(valout, il->value, *valsize);
-					valout[*valsize - 1] = 0;
-					*valsize = _tcslen(valout);
-				}
-				return true;
-			}
-			idx--;
-		}
-	}
-	return false;
-}
-
-static bool ini_addstring(const TCHAR *section, const TCHAR *key, const TCHAR *val)
-{
-	for (int c = 0; c < inilines; c++) {
-		struct ini_line *il = inidata[c];
-		if (il && !_tcscmp(section, il->section)) {
-			if (!_tcscmp(key, il->key)) {
-				xfree(il->value);
-				il->value = my_strdup(val);
-				return true;
-			}
-		}
-	}
-	ini_addnewstring(section, key, val);
-	return true;
-}
-
-static void ini_delete(const TCHAR *section, const TCHAR *key)
-{
-	for (int c = 0; c < inilines; c++) {
-		struct ini_line *il = inidata[c];
-		if (il && !_tcscmp(section, il->section) && (key == NULL || !_tcscmp(key, il->key))) {
-			xfree(il->section);
-			xfree(il->key);
-			xfree(il->value);
-			xfree(il);
-			inidata[c] = NULL;
-		}
-	}
-}
-
+static struct ini_data *inidata;
 
 static HKEY gr (UAEREG *root)
 {
@@ -293,7 +41,7 @@ static TCHAR *gsn (UAEREG *root, const TCHAR *name)
 int regsetstr (UAEREG *root, const TCHAR *name, const TCHAR *str)
 {
 	if (inimode) {
-		int ret = ini_addstring(gs(root), name, str);
+		int ret = ini_addstring(inidata, gs(root), name, str);
 		return ret;
 	} else {
 		HKEY rk = gr (root);
@@ -309,7 +57,7 @@ int regsetint (UAEREG *root, const TCHAR *name, int val)
 		int ret;
 		TCHAR tmp[100];
 		_stprintf (tmp, _T("%d"), val);
-		ret = ini_addstring(gs(root), name, tmp);
+		ret = ini_addstring(inidata, gs(root), name, tmp);
 		return ret;
 	} else {
 		DWORD v = val;
@@ -324,12 +72,13 @@ int regqueryint (UAEREG *root, const TCHAR *name, int *val)
 {
 	if (inimode) {
 		int ret = 0;
-		TCHAR tmp[100];
+		TCHAR *tmp = NULL;
 		int size = sizeof tmp / sizeof(TCHAR);
-		if (ini_getstring(gs(root), name, tmp, &size)) {
+		if (ini_getstring(inidata, gs(root), name, &tmp)) {
 			*val = _tstol (tmp);
 			ret = 1;
 		}
+		xfree(tmp);
 		return ret;
 	} else {
 		DWORD dwType = REG_DWORD;
@@ -347,7 +96,7 @@ int regsetlonglong (UAEREG *root, const TCHAR *name, ULONGLONG val)
 		int ret;
 		TCHAR tmp[100];
 		_stprintf (tmp, _T("%I64d"), val);
-		ret = ini_addstring(gs(root), name, tmp);
+		ret = ini_addstring(inidata, gs(root), name, tmp);
 		return ret;
 	} else {
 		ULONGLONG v = val;
@@ -363,12 +112,13 @@ int regquerylonglong (UAEREG *root, const TCHAR *name, ULONGLONG *val)
 	*val = 0;
 	if (inimode) {
 		int ret = 0;
-		TCHAR tmp[100];
+		TCHAR *tmp = NULL;
 		int size = sizeof tmp / sizeof(TCHAR);
-		if (ini_getstring(gs(root), name, tmp, &size)) {
+		if (ini_getstring(inidata, gs(root), name, &tmp)) {
 			*val = _tstoi64 (tmp);
 			ret = 1;
 		}
+		xfree(tmp);
 		return ret;
 	} else {
 		DWORD dwType = REG_QWORD;
@@ -384,9 +134,12 @@ int regquerystr (UAEREG *root, const TCHAR *name, TCHAR *str, int *size)
 {
 	if (inimode) {
 		int ret = 0;
-		TCHAR *tmp = xmalloc (TCHAR, (*size) + 1);
-		if (ini_getstring(gs(root), name, tmp, size)) {
+		TCHAR *tmp = NULL;
+		if (ini_getstring(inidata, gs(root), name, &tmp)) {
+			if (_tcslen(tmp) > *size)
+				tmp[*size] = 0;
 			_tcscpy (str, tmp);
+			*size = _tcslen(str);
 			ret = 1;
 		}
 		xfree (tmp);
@@ -407,7 +160,21 @@ int regenumstr (UAEREG *root, int idx, TCHAR *name, int *nsize, TCHAR *str, int
 	name[0] = 0;
 	str[0] = 0;
 	if (inimode) {
-		int ret = ini_getsectionstring(gs(root), idx, name, nsize, str, size);
+		TCHAR *name2 = NULL;
+		TCHAR *str2 = NULL;
+		int ret = ini_getsectionstring(inidata, gs(root), idx, &name2, &str2);
+		if (ret) {
+			if (_tcslen(name2) >= *nsize) {
+				name2[*nsize] = 0;
+			}
+			if (_tcslen(str2) >= *size) {
+				str2[*size] = 0;
+			}
+			_tcscpy(name, name2);
+			_tcscpy(str, str2);
+		}
+		xfree(str2);
+		xfree(name2);
 		return ret;
 	} else {
 		DWORD nsize2 = *nsize;
@@ -453,7 +220,7 @@ int regsetdata (UAEREG *root, const TCHAR *name, const void *str, int size)
 		TCHAR *tmp = xmalloc (TCHAR, size * 2 + 1);
 		for (int i = 0; i < size; i++)
 			_stprintf (tmp + i * 2, _T("%02X"), in[i]); 
-		ret = ini_addstring(gs(root), name, tmp);
+		ret = ini_addstring(inidata, gs(root), name, tmp);
 		xfree (tmp);
 		return ret;
 	} else {
@@ -476,8 +243,8 @@ int regquerydata (UAEREG *root, const TCHAR *name, void *str, int *size)
 			goto err;
 		j = 0;
 		for (i = 0; i < _tcslen (tmp); i += 2) {
-			TCHAR c1 = toupper(tmp[i + 0]);
-			TCHAR c2 = toupper(tmp[i + 1]);
+			TCHAR c1 = _totupper(tmp[i + 0]);
+			TCHAR c2 = _totupper(tmp[i + 1]);
 			if (c1 >= 'A')
 				c1 -= 'A' - 10;
 			else if (c1 >= '0')
@@ -510,7 +277,7 @@ err:
 int regdelete (UAEREG *root, const TCHAR *name)
 {
 	if (inimode) {
-		ini_delete(gs(root), name);
+		ini_delete(inidata, gs(root), name);
 		return 1;
 	} else {
 		HKEY rk = gr (root);
@@ -523,9 +290,9 @@ int regdelete (UAEREG *root, const TCHAR *name)
 int regexists (UAEREG *root, const TCHAR *name)
 {
 	if (inimode) {
-		if (!inilines)
+		if (!inidata)
 			return 0;
-		int ret = ini_getstring(gs(root), name, NULL, NULL);
+		int ret = ini_getstring(inidata, gs(root), name, NULL);
 		return ret;
 	} else {
 		HKEY rk = gr (root);
@@ -541,7 +308,7 @@ void regdeletetree (UAEREG *root, const TCHAR *name)
 		TCHAR *s = gsn (root, name);
 		if (!s)
 			return;
-		ini_delete(s, NULL);
+		ini_delete(inidata, s, NULL);
 		xfree (s);
 	} else {
 		HKEY rk = gr (root);
@@ -558,7 +325,7 @@ int regexiststree (UAEREG *root, const TCHAR *name)
 		TCHAR *s = gsn (root, name);
 		if (!s)
 			return 0;
-		ret = ini_getstring(s, NULL, NULL, 0);
+		ret = ini_getstring(inidata, s, NULL, NULL);
 		xfree (s);
 		return ret;
 	} else {
@@ -617,7 +384,7 @@ void regclosetree (UAEREG *key)
 	if (!key)
 		return;
 	if (inimode)
-		ini_save(inipath);
+		ini_save(inidata, inipath);
 	if (key->fkey)
 		RegCloseKey (key->fkey);
 	xfree (key->inipath);
@@ -662,7 +429,7 @@ int reginitializeinit (TCHAR **pppath)
 
 	inimode = 1;
 	inipath = my_strdup (fpath);
-	ini_load(inipath);
+	inidata = ini_load(inipath);
 	if (!regexists (NULL, _T("Version")))
 		goto fail;
 	return 1;