Hans Leidekker : wineboot: Also process Run keys from the 32-bit registry view.
Alexandre Julliard
julliard at winehq.org
Fri Apr 19 17:30:45 CDT 2019
Module: wine
Branch: master
Commit: 6c486058f8a174c25e85a27f17f4468796bef0ba
URL: https://source.winehq.org/git/wine.git/?a=commit;h=6c486058f8a174c25e85a27f17f4468796bef0ba
Author: Hans Leidekker <hans at codeweavers.com>
Date: Tue Apr 16 11:27:38 2019 +0200
wineboot: Also process Run keys from the 32-bit registry view.
Signed-off-by: Hans Leidekker <hans at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
programs/wineboot/wineboot.c | 153 ++++++++++++++++++++-----------------------
1 file changed, 72 insertions(+), 81 deletions(-)
diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c
index b85a3b6..0b544e5 100644
--- a/programs/wineboot/wineboot.c
+++ b/programs/wineboot/wineboot.c
@@ -90,6 +90,7 @@ extern BOOL shutdown_all_desktops( BOOL force );
extern void kill_processes( BOOL kill_desktop );
static WCHAR windowsdir[MAX_PATH];
+static const BOOL is_64bit = sizeof(void *) > sizeof(int);
/* retrieve the (unix) path to the wine.inf file */
static char *get_wine_inf_path(void)
@@ -765,119 +766,109 @@ static DWORD runCmd(LPWSTR cmdline, LPCWSTR dir, BOOL wait, BOOL minimized)
return exit_code;
}
-/*
- * Process a "Run" type registry key.
- * hkRoot is the HKEY from which "Software\Microsoft\Windows\CurrentVersion" is
- * opened.
- * szKeyName is the key holding the actual entries.
- * bDelete tells whether we should delete each value right before executing it.
- * bSynchronous tells whether we should wait for the prog to complete before
- * going on to the next prog.
- */
-static BOOL ProcessRunKeys( HKEY hkRoot, LPCWSTR szKeyName, BOOL bDelete,
- BOOL bSynchronous )
+static void process_run_key( HKEY key, const WCHAR *keyname, BOOL delete, BOOL synchronous )
{
- static const WCHAR WINKEY_NAME[]={'S','o','f','t','w','a','r','e','\\',
- 'M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\',
- 'C','u','r','r','e','n','t','V','e','r','s','i','o','n',0};
- HKEY hkWin, hkRun;
- DWORD res, dispos;
- DWORD i, nMaxCmdLine=0, nMaxValue=0;
- WCHAR *szCmdLine=NULL;
- WCHAR *szValue=NULL;
-
- if (hkRoot==HKEY_LOCAL_MACHINE)
- WINE_TRACE("processing %s entries under HKLM\n",wine_dbgstr_w(szKeyName) );
- else
- WINE_TRACE("processing %s entries under HKCU\n",wine_dbgstr_w(szKeyName) );
+ HKEY runkey;
+ LONG res;
+ DWORD disp, i, max_cmdline = 0, max_value = 0;
+ WCHAR *cmdline = NULL, *value = NULL;
- if (RegCreateKeyExW( hkRoot, WINKEY_NAME, 0, NULL, 0, KEY_READ, NULL, &hkWin, NULL ) != ERROR_SUCCESS)
- return TRUE;
+ if (RegCreateKeyExW( key, keyname, 0, NULL, 0, delete ? KEY_ALL_ACCESS : KEY_READ, NULL, &runkey, &disp ))
+ return;
- if ((res = RegCreateKeyExW( hkWin, szKeyName, 0, NULL, 0, bDelete ? KEY_ALL_ACCESS : KEY_READ,
- NULL, &hkRun, &dispos )) != ERROR_SUCCESS)
- {
- RegCloseKey( hkWin );
- return TRUE;
- }
- RegCloseKey( hkWin );
- if (dispos == REG_CREATED_NEW_KEY) goto end;
+ if (disp == REG_CREATED_NEW_KEY)
+ goto end;
- if( (res=RegQueryInfoKeyW( hkRun, NULL, NULL, NULL, NULL, NULL, NULL, &i, &nMaxValue,
- &nMaxCmdLine, NULL, NULL ))!=ERROR_SUCCESS )
+ if (RegQueryInfoKeyW( runkey, NULL, NULL, NULL, NULL, NULL, NULL, &i, &max_value, &max_cmdline, NULL, NULL ))
goto end;
- if( i==0 )
+ if (!i)
{
- WINE_TRACE("No commands to execute.\n");
-
- res=ERROR_SUCCESS;
+ WINE_TRACE( "No commands to execute.\n" );
goto end;
}
-
- if( (szCmdLine=HeapAlloc(GetProcessHeap(),0,nMaxCmdLine))==NULL )
+ if (!(cmdline = HeapAlloc( GetProcessHeap(), 0, max_cmdline )))
{
- WINE_ERR("Couldn't allocate memory for the commands to be executed\n");
-
- res=ERROR_NOT_ENOUGH_MEMORY;
+ WINE_ERR( "Couldn't allocate memory for the commands to be executed.\n" );
goto end;
}
-
- if( (szValue=HeapAlloc(GetProcessHeap(),0,(++nMaxValue)*sizeof(*szValue)))==NULL )
+ if (!(value = HeapAlloc( GetProcessHeap(), 0, ++max_value * sizeof(*value) )))
{
- WINE_ERR("Couldn't allocate memory for the value names\n");
-
- res=ERROR_NOT_ENOUGH_MEMORY;
+ WINE_ERR( "Couldn't allocate memory for the value names.\n" );
goto end;
}
-
- while( i>0 )
- {
- DWORD nValLength=nMaxValue, nDataLength=nMaxCmdLine;
- DWORD type;
- --i;
+ while (i)
+ {
+ DWORD len = max_value, len_data = max_cmdline, type;
- if( (res=RegEnumValueW( hkRun, i, szValue, &nValLength, 0, &type,
- (LPBYTE)szCmdLine, &nDataLength ))!=ERROR_SUCCESS )
+ if ((res = RegEnumValueW( runkey, --i, value, &len, 0, &type, (BYTE *)cmdline, &len_data )))
{
- WINE_ERR("Couldn't read in value %d - %d\n", i, res );
-
+ WINE_ERR( "Couldn't read value %u (%d).\n", i, res );
continue;
}
-
- if( bDelete && (res=RegDeleteValueW( hkRun, szValue ))!=ERROR_SUCCESS )
+ if (delete && (res = RegDeleteValueW( runkey, value )))
{
- WINE_ERR("Couldn't delete value - %d, %d. Running command anyways.\n", i, res );
+ WINE_ERR( "Couldn't delete value %u (%d). Running command anyways.\n", i, res );
}
-
- if( type!=REG_SZ )
+ if (type != REG_SZ)
{
- WINE_ERR("Incorrect type of value #%d (%d)\n", i, type );
-
+ WINE_ERR( "Incorrect type of value %u (%u).\n", i, type );
continue;
}
-
- if( (res=runCmd(szCmdLine, NULL, bSynchronous, FALSE ))==INVALID_RUNCMD_RETURN )
+ if (runCmd( cmdline, NULL, synchronous, FALSE ) == INVALID_RUNCMD_RETURN)
{
- WINE_ERR("Error running cmd %s (%d)\n", wine_dbgstr_w(szCmdLine), GetLastError() );
+ WINE_ERR( "Error running cmd %s (%u).\n", wine_dbgstr_w(cmdline), GetLastError() );
}
-
- WINE_TRACE("Done processing cmd #%d\n", i);
+ WINE_TRACE( "Done processing cmd %u.\n", i );
}
- res=ERROR_SUCCESS;
-
end:
- HeapFree( GetProcessHeap(), 0, szValue );
- HeapFree( GetProcessHeap(), 0, szCmdLine );
-
- if( hkRun!=NULL )
- RegCloseKey( hkRun );
+ HeapFree( GetProcessHeap(), 0, value );
+ HeapFree( GetProcessHeap(), 0, cmdline );
+ RegCloseKey( runkey );
+ WINE_TRACE( "Done.\n" );
+}
- WINE_TRACE("done\n");
+/*
+ * Process a "Run" type registry key.
+ * hkRoot is the HKEY from which "Software\Microsoft\Windows\CurrentVersion" is
+ * opened.
+ * szKeyName is the key holding the actual entries.
+ * bDelete tells whether we should delete each value right before executing it.
+ * bSynchronous tells whether we should wait for the prog to complete before
+ * going on to the next prog.
+ */
+static void ProcessRunKeys( HKEY root, const WCHAR *keyname, BOOL delete, BOOL synchronous )
+{
+ static const WCHAR keypathW[] =
+ {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\',
+ 'W','i','n','d','o','w','s','\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n',0};
+ HKEY key;
- return res==ERROR_SUCCESS;
+ if (root == HKEY_LOCAL_MACHINE)
+ {
+ WINE_TRACE( "Processing %s entries under HKLM.\n", wine_dbgstr_w(keyname) );
+ if (!RegCreateKeyExW( root, keypathW, 0, NULL, 0, KEY_READ, NULL, &key, NULL ))
+ {
+ process_run_key( key, keyname, delete, synchronous );
+ RegCloseKey( key );
+ }
+ if (is_64bit && !RegCreateKeyExW( root, keypathW, 0, NULL, 0, KEY_READ|KEY_WOW64_32KEY, NULL, &key, NULL ))
+ {
+ process_run_key( key, keyname, delete, synchronous );
+ RegCloseKey( key );
+ }
+ }
+ else
+ {
+ WINE_TRACE( "Processing %s entries under HKCU.\n", wine_dbgstr_w(keyname) );
+ if (!RegCreateKeyExW( root, keypathW, 0, NULL, 0, KEY_READ, NULL, &key, NULL ))
+ {
+ process_run_key( key, keyname, delete, synchronous );
+ RegCloseKey( key );
+ }
+ }
}
/*
More information about the wine-cvs
mailing list