Vitaly Lipatov : wineboot: Do registry update with wineboot --update in any case.

[Alexandre Julliard]

Module: wine
Branch: stable
Commit: d40aded70a4051517ff7d94c827e76e7fd6da3c1
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=d40aded70a4051517ff7d94c82...

Author: Vitaly Lipatov <lav(a)etersoft.ru>
Date:   Wed Sep 17 16:58:52 2008 +0400

wineboot: Do registry update with wineboot --update in any case.
(cherry picked from commit 977b7d398e1eaa13dfaf9f11dbaf3e70678b3449)

---

 programs/wineboot/wineboot.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c
index 717a175..2201ed5 100644
--- a/programs/wineboot/wineboot.c
+++ b/programs/wineboot/wineboot.c
@@ -115,7 +115,7 @@ static char *get_wine_inf_path(void)
 }
 
 /* update the timestamp if different from the reference time */
-static BOOL update_timestamp( const char *config_dir, unsigned long timestamp, int force )
+static BOOL update_timestamp( const char *config_dir, unsigned long timestamp )
 {
     BOOL ret = FALSE;
     int fd, count;
@@ -132,7 +132,7 @@ static BOOL update_timestamp( const char *config_dir, unsigned long timestamp, i
         {
             buffer[count] = 0;
             if (!strncmp( buffer, "disable", sizeof("disable")-1 )) goto done;
-            if (!force && timestamp == strtoul( buffer, NULL, 10 )) goto done;
+            if (timestamp == strtoul( buffer, NULL, 10 )) goto done;
         }
         lseek( fd, 0, SEEK_SET );
         ftruncate( fd, 0 );
@@ -681,7 +681,7 @@ static void update_wineprefix( int force )
         goto done;
     }
 
-    if (update_timestamp( config_dir, st.st_mtime, force ))
+    if (update_timestamp( config_dir, st.st_mtime ) || force)
     {
         WCHAR *buffer;
         DWORD len = MultiByteToWideChar( CP_UNIXCP, 0, inf_path, -1, NULL, 0 );