From ab88743c25a024508e474d74316c1289e2830bd1 Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Mon, 20 Jun 2005 16:04:32 +0000 Subject: [PATCH] Moved a few registry keys from HKLM\Software\Wine to HKCU\Software\Wine for consistency. --- dlls/d3d8/d3d8_main.c | 4 ++-- dlls/gdi/driver.c | 4 ++-- dlls/shdocvw/shdocvw_main.c | 4 ++-- dlls/user/user_main.c | 4 ++-- dlls/wined3d/wined3d_main.c | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/d3d8/d3d8_main.c b/dlls/d3d8/d3d8_main.c index 84a471bf75..8352242152 100644 --- a/dlls/d3d8/d3d8_main.c +++ b/dlls/d3d8/d3d8_main.c @@ -82,8 +82,8 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) wine_tsx11_lock_ptr = (void *)GetProcAddress( mod, "wine_tsx11_lock" ); wine_tsx11_unlock_ptr = (void *)GetProcAddress( mod, "wine_tsx11_unlock" ); } - /* @@ Wine registry key: HKLM\Software\Wine\Direct3D */ - if ( !RegOpenKeyA( HKEY_LOCAL_MACHINE, "Software\\Wine\\Direct3D", &hkey) ) + /* @@ Wine registry key: HKCU\Software\Wine\Direct3D */ + if ( !RegOpenKeyA( HKEY_CURRENT_USER, "Software\\Wine\\Direct3D", &hkey) ) { if ( !RegQueryValueExA( hkey, "VertexShaderMode", 0, NULL, buffer, &size) ) { diff --git a/dlls/gdi/driver.c b/dlls/gdi/driver.c index 0d01f17be8..7f9ace5f8d 100644 --- a/dlls/gdi/driver.c +++ b/dlls/gdi/driver.c @@ -222,8 +222,8 @@ static struct graphics_driver *load_display_driver(void) } strcpy( buffer, "x11,tty" ); /* default value */ - /* @@ Wine registry key: HKLM\Software\Wine\Drivers */ - if (!RegOpenKeyA( HKEY_LOCAL_MACHINE, "Software\\Wine\\Drivers", &hkey )) + /* @@ Wine registry key: HKCU\Software\Wine\Drivers */ + if (!RegOpenKeyA( HKEY_CURRENT_USER, "Software\\Wine\\Drivers", &hkey )) { DWORD type, count = sizeof(buffer); RegQueryValueExA( hkey, "Graphics", 0, &type, buffer, &count ); diff --git a/dlls/shdocvw/shdocvw_main.c b/dlls/shdocvw/shdocvw_main.c index b7fe66bd0a..56552ed269 100644 --- a/dlls/shdocvw/shdocvw_main.c +++ b/dlls/shdocvw/shdocvw_main.c @@ -318,8 +318,8 @@ static DWORD WINAPI ThreadFunc( LPVOID info ) /* find the name of the thing to download */ szUrl[0] = 0; - /* @@ Wine registry key: HKLM\Software\Wine\shdocw */ - r = RegOpenKeyW( HKEY_LOCAL_MACHINE, szMozDlPath, &hkey ); + /* @@ Wine registry key: HKCU\Software\Wine\shdocw */ + r = RegOpenKeyW( HKEY_CURRENT_USER, szMozDlPath, &hkey ); if( r == ERROR_SUCCESS ) { sz = MAX_PATH; diff --git a/dlls/user/user_main.c b/dlls/user/user_main.c index 5ca814473b..87646f8d83 100644 --- a/dlls/user/user_main.c +++ b/dlls/user/user_main.c @@ -67,8 +67,8 @@ static BOOL load_driver(void) HKEY hkey; strcpy( buffer, "x11,tty" ); /* default value */ - /* @@ Wine registry key: HKLM\Software\Wine\Drivers */ - if (!RegOpenKeyA( HKEY_LOCAL_MACHINE, "Software\\Wine\\Drivers", &hkey )) + /* @@ Wine registry key: HKCU\Software\Wine\Drivers */ + if (!RegOpenKeyA( HKEY_CURRENT_USER, "Software\\Wine\\Drivers", &hkey )) { DWORD type, count = sizeof(buffer); RegQueryValueExA( hkey, "Graphics", 0, &type, buffer, &count ); diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 701b59721f..e421dbed98 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -64,8 +64,8 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) wine_tsx11_lock_ptr = (void *)GetProcAddress( mod, "wine_tsx11_lock" ); wine_tsx11_unlock_ptr = (void *)GetProcAddress( mod, "wine_tsx11_unlock" ); } - /* @@ Wine registry key: HKLM\Software\Wine\Direct3D */ - if ( !RegOpenKeyA( HKEY_LOCAL_MACHINE, "Software\\Wine\\Direct3D", &hkey) ) + /* @@ Wine registry key: HKCU\Software\Wine\Direct3D */ + if ( !RegOpenKeyA( HKEY_CURRENT_USER, "Software\\Wine\\Direct3D", &hkey) ) { if ( !RegQueryValueExA( hkey, "VertexShaderMode", 0, NULL, buffer, &size) ) {