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

This commit is contained in:
Vitaly Lipatov 2008-09-17 16:58:52 +04:00 committed by Alexandre Julliard
parent 403221c228
commit 977b7d398e
1 changed files with 3 additions and 3 deletions

View File

@ -115,7 +115,7 @@ static char *get_wine_inf_path(void)
} }
/* update the timestamp if different from the reference time */ /* 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; BOOL ret = FALSE;
int fd, count; int fd, count;
@ -132,7 +132,7 @@ static BOOL update_timestamp( const char *config_dir, unsigned long timestamp, i
{ {
buffer[count] = 0; buffer[count] = 0;
if (!strncmp( buffer, "disable", sizeof("disable")-1 )) goto done; 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 ); lseek( fd, 0, SEEK_SET );
ftruncate( fd, 0 ); ftruncate( fd, 0 );
@ -681,7 +681,7 @@ static void update_wineprefix( int force )
goto done; goto done;
} }
if (update_timestamp( config_dir, st.st_mtime, force )) if (update_timestamp( config_dir, st.st_mtime ) || force)
{ {
WCHAR *buffer; WCHAR *buffer;
DWORD len = MultiByteToWideChar( CP_UNIXCP, 0, inf_path, -1, NULL, 0 ); DWORD len = MultiByteToWideChar( CP_UNIXCP, 0, inf_path, -1, NULL, 0 );