[PATCH 4/5] wined3d: Avoid touching the output value on failure in get_config_key_dword();
Henri Verbeet
hverbeet at codeweavers.com
Sun Apr 23 10:57:28 CDT 2017
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
---
dlls/wined3d/wined3d_main.c | 17 ++++++++++++-----
1 file changed, 12 insertions(+), 5 deletions(-)
diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c
index 1a4e2f2..8f5da3c 100644
--- a/dlls/wined3d/wined3d_main.c
+++ b/dlls/wined3d/wined3d_main.c
@@ -127,13 +127,20 @@ static DWORD get_config_key(HKEY defkey, HKEY appkey, const char *name, char *bu
return ERROR_FILE_NOT_FOUND;
}
-static DWORD get_config_key_dword(HKEY defkey, HKEY appkey, const char *name, DWORD *data)
+static DWORD get_config_key_dword(HKEY defkey, HKEY appkey, const char *name, DWORD *value)
{
- DWORD type;
- DWORD size = sizeof(DWORD);
- if (appkey && !RegQueryValueExA(appkey, name, 0, &type, (BYTE *)data, &size) && (type == REG_DWORD)) return 0;
- if (defkey && !RegQueryValueExA(defkey, name, 0, &type, (BYTE *)data, &size) && (type == REG_DWORD)) return 0;
+ DWORD type, data, size;
+
+ size = sizeof(data);
+ if (appkey && !RegQueryValueExA(appkey, name, 0, &type, (BYTE *)&data, &size) && type == REG_DWORD) goto success;
+ size = sizeof(data);
+ if (defkey && !RegQueryValueExA(defkey, name, 0, &type, (BYTE *)&data, &size) && type == REG_DWORD) goto success;
+
return ERROR_FILE_NOT_FOUND;
+
+success:
+ *value = data;
+ return 0;
}
static BOOL wined3d_dll_init(HINSTANCE hInstDLL)
--
2.1.4
More information about the wine-patches
mailing list