Nikolay Sivov : winemine: Fix loading program state from registry.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 136d6755de498e0c2417738a8801570d14ca4292
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=136d6755de498e0c2417738a88...

Author: Nikolay Sivov 
Date:   Tue Nov 10 21:38:15 2015 +0300

winemine: Fix loading program state from registry.

Signed-off-by: Nikolay Sivov 
Signed-off-by: Alexandre Julliard

---

programs/winemine/main.c | 24 ++++++++----------------
 1 file changed, 8 insertions(+), 16 deletions(-)

diff --git a/programs/winemine/main.c b/programs/winemine/main.c
index 7ccae07..706e208 100644
--- a/programs/winemine/main.c
+++ b/programs/winemine/main.c
@@ -80,38 +80,31 @@ static void LoadBoard( BOARD *p_board )
     RegOpenKeyExW( HKEY_CURRENT_USER, registry_key, 0, KEY_QUERY_VALUE, &hkey );

size = sizeof( p_board->pos.x );
-    if( !RegQueryValueExW( hkey, xposW, NULL, &type,
-            (LPBYTE) &p_board->pos.x, &size ) == ERROR_SUCCESS )
+    if( RegQueryValueExW( hkey, xposW, NULL, &type, (BYTE*) &p_board->pos.x, &size ) )
    p_board->pos.x = 0;

size = sizeof( p_board->pos.y );
-    if( !RegQueryValueExW( hkey, yposW, NULL, &type,
-            (LPBYTE) &p_board->pos.y, &size ) == ERROR_SUCCESS )
+    if( RegQueryValueExW( hkey, yposW, NULL, &type, (BYTE*) &p_board->pos.y, &size ) )
         p_board->pos.y = 0;

size = sizeof( p_board->rows );
-    if( !RegQueryValueExW( hkey, heightW, NULL, &type,
-            (LPBYTE) &p_board->rows, &size ) == ERROR_SUCCESS )
+    if( RegQueryValueExW( hkey, heightW, NULL, &type, (BYTE*) &p_board->rows, &size ) )
         p_board->rows = BEGINNER_ROWS;

size = sizeof( p_board->cols );
-    if( !RegQueryValueExW( hkey, widthW, NULL, &type,
-            (LPBYTE) &p_board->cols, &size ) == ERROR_SUCCESS )
+    if( RegQueryValueExW( hkey, widthW, NULL, &type, (BYTE*) &p_board->cols, &size ) )
         p_board->cols = BEGINNER_COLS;

size = sizeof( p_board->mines );
-    if( !RegQueryValueExW( hkey, minesW, NULL, &type,
-            (LPBYTE) &p_board->mines, &size ) == ERROR_SUCCESS )
+    if( RegQueryValueExW( hkey, minesW, NULL, &type, (BYTE*) &p_board->mines, &size ) )
         p_board->mines = BEGINNER_MINES;

size = sizeof( p_board->difficulty );
-    if( !RegQueryValueExW( hkey, difficultyW, NULL, &type,
-            (LPBYTE) &p_board->difficulty, &size ) == ERROR_SUCCESS )
+    if( RegQueryValueExW( hkey, difficultyW, NULL, &type, (BYTE*) &p_board->difficulty, &size ) )
         p_board->difficulty = BEGINNER;

size = sizeof( p_board->IsMarkQ );
-    if( !RegQueryValueExW( hkey, markW, NULL, &type,
-            (LPBYTE) &p_board->IsMarkQ, &size ) == ERROR_SUCCESS )
+    if( RegQueryValueExW( hkey, markW, NULL, &type, (BYTE*) &p_board->IsMarkQ, &size ) )
         p_board->IsMarkQ = TRUE;

for( i = 0; i < 3; i++ ) {
@@ -127,8 +120,7 @@ static void LoadBoard( BOARD *p_board )
     for( i = 0; i < 3; i++ ) {
         wsprintfW( key_name, timeW, i+1 );
         size = sizeof( p_board->best_time[i] );
-        if( !RegQueryValueExW( hkey, key_name, NULL, &type,
-                (LPBYTE) &p_board->best_time[i], &size ) == ERROR_SUCCESS )
+        if( RegQueryValueExW( hkey, key_name, NULL, &type, (BYTE*) &p_board->best_time[i], &size ) )
             p_board->best_time[i] = 999;
     }
     RegCloseKey( hkey );