Skip to content

W
wine-cw
Commit 302cd456 authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files
Options

Moved debugging config options to HKCU\Software\Wine\Debug.

parent 8b4b4b3a
Hide whitespace changes
Inline Side-by-side
Showing with 18 additions and 18 deletions
dlls/kernel/relay16.c
View file @ 302cd456
...@@ -109,30 +109,30 @@ void RELAY16_InitDebugLists(void) ...@@ -109,30 +109,30 @@ void RELAY16_InitDebugLists(void)
OBJECT_ATTRIBUTES attr; OBJECT_ATTRIBUTES attr;
UNICODE_STRING name; UNICODE_STRING name;
char buffer[1024]; char buffer[1024];
HKEY hkey; HKEY root, hkey;
DWORD count; DWORD count;
WCHAR *str; WCHAR *str;
static const WCHAR configW[] = {'M','a','c','h','i','n','e','\\', static const WCHAR configW[] = {'S','o','f','t','w','a','r','e','\\',
'S','o','f','t','w','a','r','e','\\',
'W','i','n','e','\\', 'W','i','n','e','\\',
'W','i','n','e','\\',
'C','o','n','f','i','g','\\',
'D','e','b','u','g',0}; 'D','e','b','u','g',0};
static const WCHAR RelayIncludeW[] = {'R','e','l','a','y','I','n','c','l','u','d','e',0}; static const WCHAR RelayIncludeW[] = {'R','e','l','a','y','I','n','c','l','u','d','e',0};
static const WCHAR RelayExcludeW[] = {'R','e','l','a','y','E','x','c','l','u','d','e',0}; static const WCHAR RelayExcludeW[] = {'R','e','l','a','y','E','x','c','l','u','d','e',0};
static const WCHAR SnoopIncludeW[] = {'S','n','o','o','p','I','n','c','l','u','d','e',0}; static const WCHAR SnoopIncludeW[] = {'S','n','o','o','p','I','n','c','l','u','d','e',0};
static const WCHAR SnoopExcludeW[] = {'S','n','o','o','p','E','x','c','l','u','d','e',0}; static const WCHAR SnoopExcludeW[] = {'S','n','o','o','p','E','x','c','l','u','d','e',0};
RtlOpenCurrentUser( KEY_ALL_ACCESS, &root );
attr.Length = sizeof(attr); attr.Length = sizeof(attr);
attr.RootDirectory = 0; attr.RootDirectory = root;
attr.ObjectName = &name; attr.ObjectName = &name;
attr.Attributes = 0; attr.Attributes = 0;
attr.SecurityDescriptor = NULL; attr.SecurityDescriptor = NULL;
attr.SecurityQualityOfService = NULL; attr.SecurityQualityOfService = NULL;
RtlInitUnicodeString( &name, configW ); RtlInitUnicodeString( &name, configW );
/* @@ Wine registry key: HKLM\Software\Wine\Wine\Config\Debug */ /* @@ Wine registry key: HKCU\Software\Wine\Debug */
if (NtOpenKey( &hkey, KEY_ALL_ACCESS, &attr )) return; if (NtOpenKey( &hkey, KEY_ALL_ACCESS, &attr )) hkey = 0;
NtClose( root );
if (!hkey) return;
str = (WCHAR *)((KEY_VALUE_PARTIAL_INFORMATION *)buffer)->Data; str = (WCHAR *)((KEY_VALUE_PARTIAL_INFORMATION *)buffer)->Data;
RtlInitUnicodeString( &name, RelayIncludeW ); RtlInitUnicodeString( &name, RelayIncludeW );
......
dlls/ntdll/relay.c
View file @ 302cd456
...@@ -113,14 +113,11 @@ void RELAY_InitDebugLists(void) ...@@ -113,14 +113,11 @@ void RELAY_InitDebugLists(void)
OBJECT_ATTRIBUTES attr; OBJECT_ATTRIBUTES attr;
UNICODE_STRING name; UNICODE_STRING name;
char buffer[1024]; char buffer[1024];
HKEY hkey; HKEY root, hkey;
DWORD count; DWORD count;
WCHAR *str; WCHAR *str;
static const WCHAR configW[] = {'M','a','c','h','i','n','e','\\', static const WCHAR configW[] = {'S','o','f','t','w','a','r','e','\\',
'S','o','f','t','w','a','r','e','\\',
'W','i','n','e','\\', 'W','i','n','e','\\',
'W','i','n','e','\\',
'C','o','n','f','i','g','\\',
'D','e','b','u','g',0}; 'D','e','b','u','g',0};
static const WCHAR RelayIncludeW[] = {'R','e','l','a','y','I','n','c','l','u','d','e',0}; static const WCHAR RelayIncludeW[] = {'R','e','l','a','y','I','n','c','l','u','d','e',0};
static const WCHAR RelayExcludeW[] = {'R','e','l','a','y','E','x','c','l','u','d','e',0}; static const WCHAR RelayExcludeW[] = {'R','e','l','a','y','E','x','c','l','u','d','e',0};
...@@ -131,16 +128,19 @@ void RELAY_InitDebugLists(void) ...@@ -131,16 +128,19 @@ void RELAY_InitDebugLists(void)
static const WCHAR SnoopFromIncludeW[] = {'S','n','o','o','p','F','r','o','m','I','n','c','l','u','d','e',0}; static const WCHAR SnoopFromIncludeW[] = {'S','n','o','o','p','F','r','o','m','I','n','c','l','u','d','e',0};
static const WCHAR SnoopFromExcludeW[] = {'S','n','o','o','p','F','r','o','m','E','x','c','l','u','d','e',0}; static const WCHAR SnoopFromExcludeW[] = {'S','n','o','o','p','F','r','o','m','E','x','c','l','u','d','e',0};
RtlOpenCurrentUser( KEY_ALL_ACCESS, &root );
attr.Length = sizeof(attr); attr.Length = sizeof(attr);
attr.RootDirectory = 0; attr.RootDirectory = root;
attr.ObjectName = &name; attr.ObjectName = &name;
attr.Attributes = 0; attr.Attributes = 0;
attr.SecurityDescriptor = NULL; attr.SecurityDescriptor = NULL;
attr.SecurityQualityOfService = NULL; attr.SecurityQualityOfService = NULL;
RtlInitUnicodeString( &name, configW ); RtlInitUnicodeString( &name, configW );
/* @@ Wine registry key: HKLM\Software\Wine\Wine\Config\Debug */ /* @@ Wine registry key: HKCU\Software\Wine\Debug */
if (NtOpenKey( &hkey, KEY_ALL_ACCESS, &attr )) return; if (NtOpenKey( &hkey, KEY_ALL_ACCESS, &attr )) hkey = 0;
NtClose( root );
if (!hkey) return;
str = (WCHAR *)((KEY_VALUE_PARTIAL_INFORMATION *)buffer)->Data; str = (WCHAR *)((KEY_VALUE_PARTIAL_INFORMATION *)buffer)->Data;
RtlInitUnicodeString( &name, RelayIncludeW ); RtlInitUnicodeString( &name, RelayIncludeW );
......
dlls/user/spy.c
View file @ 302cd456
...@@ -2584,8 +2584,8 @@ int SPY_Init(void) ...@@ -2584,8 +2584,8 @@ int SPY_Init(void)
if (!TRACE_ON(message)) return TRUE; if (!TRACE_ON(message)) return TRUE;
indent_tls_index = TlsAlloc(); indent_tls_index = TlsAlloc();
/* @@ Wine registry key: HKLM\Software\Wine\Wine\Config\Debug */ /* @@ Wine registry key: HKCU\Software\Wine\Debug */
if(!RegOpenKeyA(HKEY_LOCAL_MACHINE, "Software\\Wine\\Wine\\Config\\Debug", &hkey)) if(!RegOpenKeyA(HKEY_CURRENT_USER, "Software\\Wine\\Debug", &hkey))
{ {
DWORD type, count = sizeof(buffer); DWORD type, count = sizeof(buffer);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment