Zhiyi Zhang : winefile: Set size before calling RegQueryValueExW().

Alexandre Julliard julliard at winehq.org
Wed Oct 20 15:58:39 CDT 2021


Module: wine
Branch: master
Commit: e45d51fddabfa9e5f5d2a19bb8df2e12134dcf45
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=e45d51fddabfa9e5f5d2a19bb8df2e12134dcf45

Author: Zhiyi Zhang <zzhang at codeweavers.com>
Date:   Wed Oct 20 10:07:14 2021 +0800

winefile: Set size before calling RegQueryValueExW().

The value in size may be invalid if previous RegQueryValueExW() calls failed.

Signed-off-by: Zhiyi Zhang <zzhang at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 programs/winefile/winefile.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/programs/winefile/winefile.c b/programs/winefile/winefile.c
index fa78237cccf..8ad785b924a 100644
--- a/programs/winefile/winefile.c
+++ b/programs/winefile/winefile.c
@@ -1220,20 +1220,22 @@ static windowOptions load_registry_settings(void)
         RegOpenKeyExW( HKEY_CURRENT_USER, registry_key,
                        0, KEY_QUERY_VALUE, &hKey );
 
-	size = sizeof(DWORD);
-
+        size = sizeof(opts.start_x);
         if( RegQueryValueExW( hKey, reg_start_x, NULL, &type,
                               (LPBYTE) &opts.start_x, &size ) != ERROR_SUCCESS )
 		opts.start_x = CW_USEDEFAULT;
 
+        size = sizeof(opts.start_y);
         if( RegQueryValueExW( hKey, reg_start_y, NULL, &type,
                               (LPBYTE) &opts.start_y, &size ) != ERROR_SUCCESS )
 		opts.start_y = CW_USEDEFAULT;
 
+        size = sizeof(opts.width);
         if( RegQueryValueExW( hKey, reg_width, NULL, &type,
                               (LPBYTE) &opts.width, &size ) != ERROR_SUCCESS )
 		opts.width = CW_USEDEFAULT;
 
+        size = sizeof(opts.height);
         if( RegQueryValueExW( hKey, reg_height, NULL, &type,
                               (LPBYTE) &opts.height, &size ) != ERROR_SUCCESS )
 		opts.height = CW_USEDEFAULT;




More information about the wine-cvs mailing list