ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use TEB static buffer for Unicode conversion.

This commit is contained in:
Alexandre Julliard 2001-03-23 19:12:01 +00:00
parent 3c6c20f89d
commit ab5e975907
1 changed files with 19 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
dlls/advapi32/registry.c
View File

@ -83,7 +83,7 @@ DWORD WINAPI RegCreateKeyExA( HKEY hkey, LPCSTR name, DWORD reserved, LPSTR clas
LPHKEY retkey, LPDWORD dispos ) LPHKEY retkey, LPDWORD dispos )
{ {
OBJECT_ATTRIBUTES attr; OBJECT_ATTRIBUTES attr;
UNICODE_STRING nameW, classW; UNICODE_STRING classW;
ANSI_STRING nameA, classA; ANSI_STRING nameA, classA;
NTSTATUS status; NTSTATUS status;
@ -92,22 +92,21 @@ DWORD WINAPI RegCreateKeyExA( HKEY hkey, LPCSTR name, DWORD reserved, LPSTR clas
attr.Length = sizeof(attr); attr.Length = sizeof(attr);
attr.RootDirectory = hkey; attr.RootDirectory = hkey;
attr.ObjectName = &nameW; attr.ObjectName = &NtCurrentTeb()->StaticUnicodeString;
attr.Attributes = 0; attr.Attributes = 0;
attr.SecurityDescriptor = NULL; attr.SecurityDescriptor = NULL;
attr.SecurityQualityOfService = NULL; attr.SecurityQualityOfService = NULL;
RtlInitAnsiString( &nameA, name ); RtlInitAnsiString( &nameA, name );
RtlInitAnsiString( &classA, class ); RtlInitAnsiString( &classA, class );
/* FIXME: should use Unicode buffer in TEB */ if (!(status = RtlAnsiStringToUnicodeString( &NtCurrentTeb()->StaticUnicodeString,
if (!(status = RtlAnsiStringToUnicodeString( &nameW, &nameA, TRUE ))) &nameA, FALSE )))
{ {
if (!(status = RtlAnsiStringToUnicodeString( &classW, &classA, TRUE ))) if (!(status = RtlAnsiStringToUnicodeString( &classW, &classA, TRUE )))
{ {
status = NtCreateKey( retkey, access, &attr, 0, &classW, options, dispos ); status = NtCreateKey( retkey, access, &attr, 0, &classW, options, dispos );
RtlFreeUnicodeString( &classW ); RtlFreeUnicodeString( &classW );
} }
RtlFreeUnicodeString( &nameW );
} }
return RtlNtStatusToDosError( status ); return RtlNtStatusToDosError( status );
} }
@ -179,23 +178,21 @@ DWORD WINAPI RegOpenKeyExW( HKEY hkey, LPCWSTR name, DWORD reserved, REGSAM acce
DWORD WINAPI RegOpenKeyExA( HKEY hkey, LPCSTR name, DWORD reserved, REGSAM access, LPHKEY retkey ) DWORD WINAPI RegOpenKeyExA( HKEY hkey, LPCSTR name, DWORD reserved, REGSAM access, LPHKEY retkey )
{ {
OBJECT_ATTRIBUTES attr; OBJECT_ATTRIBUTES attr;
UNICODE_STRING nameW;
STRING nameA; STRING nameA;
NTSTATUS status; NTSTATUS status;
attr.Length = sizeof(attr); attr.Length = sizeof(attr);
attr.RootDirectory = hkey; attr.RootDirectory = hkey;
attr.ObjectName = &nameW; attr.ObjectName = &NtCurrentTeb()->StaticUnicodeString;
attr.Attributes = 0; attr.Attributes = 0;
attr.SecurityDescriptor = NULL; attr.SecurityDescriptor = NULL;
attr.SecurityQualityOfService = NULL; attr.SecurityQualityOfService = NULL;
RtlInitAnsiString( &nameA, name ); RtlInitAnsiString( &nameA, name );
/* FIXME: should use Unicode buffer in TEB */ if (!(status = RtlAnsiStringToUnicodeString( &NtCurrentTeb()->StaticUnicodeString,
if (!(status = RtlAnsiStringToUnicodeString( &nameW, &nameA, TRUE ))) &nameA, FALSE )))
{ {
status = NtOpenKey( retkey, access, &attr ); status = NtOpenKey( retkey, access, &attr );
RtlFreeUnicodeString( &nameW );
} }
return RtlNtStatusToDosError( status ); return RtlNtStatusToDosError( status );
} }
@ -662,7 +659,6 @@ DWORD WINAPI RegSetValueExW( HKEY hkey, LPCWSTR name, DWORD reserved,
DWORD WINAPI RegSetValueExA( HKEY hkey, LPCSTR name, DWORD reserved, DWORD type, DWORD WINAPI RegSetValueExA( HKEY hkey, LPCSTR name, DWORD reserved, DWORD type,
CONST BYTE *data, DWORD count ) CONST BYTE *data, DWORD count )
{ {
UNICODE_STRING nameW;
ANSI_STRING nameA; ANSI_STRING nameA;
WCHAR *dataW = NULL; WCHAR *dataW = NULL;
NTSTATUS status; NTSTATUS status;
@ -684,11 +680,10 @@ DWORD WINAPI RegSetValueExA( HKEY hkey, LPCSTR name, DWORD reserved, DWORD type,
} }
RtlInitAnsiString( &nameA, name ); RtlInitAnsiString( &nameA, name );
/* FIXME: should use Unicode buffer in TEB */ if (!(status = RtlAnsiStringToUnicodeString( &NtCurrentTeb()->StaticUnicodeString,
if (!(status = RtlAnsiStringToUnicodeString( &nameW, &nameA, TRUE ))) &nameA, FALSE )))
{ {
status = NtSetValueKey( hkey, &nameW, 0, type, data, count ); status = NtSetValueKey( hkey, &NtCurrentTeb()->StaticUnicodeString, 0, type, data, count );
RtlFreeUnicodeString( &nameW );
} }
if (dataW) HeapFree( GetProcessHeap(), 0, dataW ); if (dataW) HeapFree( GetProcessHeap(), 0, dataW );
return RtlNtStatusToDosError( status ); return RtlNtStatusToDosError( status );
@ -834,7 +829,6 @@ DWORD WINAPI RegQueryValueExA( HKEY hkey, LPCSTR name, LPDWORD reserved, LPDWORD
{ {
NTSTATUS status; NTSTATUS status;
ANSI_STRING nameA; ANSI_STRING nameA;
UNICODE_STRING nameW;
DWORD total_size; DWORD total_size;
char buffer[256], *buf_ptr = buffer; char buffer[256], *buf_ptr = buffer;
KEY_VALUE_PARTIAL_INFORMATION *info = (KEY_VALUE_PARTIAL_INFORMATION *)buffer; KEY_VALUE_PARTIAL_INFORMATION *info = (KEY_VALUE_PARTIAL_INFORMATION *)buffer;
@ -846,12 +840,12 @@ DWORD WINAPI RegQueryValueExA( HKEY hkey, LPCSTR name, LPDWORD reserved, LPDWORD
if ((data && !count) || reserved) return ERROR_INVALID_PARAMETER; if ((data && !count) || reserved) return ERROR_INVALID_PARAMETER;
RtlInitAnsiString( &nameA, name ); RtlInitAnsiString( &nameA, name );
/* FIXME: should use Unicode buffer in TEB */ if ((status = RtlAnsiStringToUnicodeString( &NtCurrentTeb()->StaticUnicodeString,
if ((status = RtlAnsiStringToUnicodeString( &nameW, &nameA, TRUE ))) &nameA, FALSE )))
return RtlNtStatusToDosError(status); return RtlNtStatusToDosError(status);
status = NtQueryValueKey( hkey, &nameW, KeyValuePartialInformation, status = NtQueryValueKey( hkey, &NtCurrentTeb()->StaticUnicodeString,
buffer, sizeof(buffer), &total_size ); KeyValuePartialInformation, buffer, sizeof(buffer), &total_size );
if (status && status != STATUS_BUFFER_OVERFLOW) goto done; if (status && status != STATUS_BUFFER_OVERFLOW) goto done;
/* we need to fetch the contents for a string type even if not requested, /* we need to fetch the contents for a string type even if not requested,
@ -868,8 +862,8 @@ DWORD WINAPI RegQueryValueExA( HKEY hkey, LPCSTR name, LPDWORD reserved, LPDWORD
goto done; goto done;
} }
info = (KEY_VALUE_PARTIAL_INFORMATION *)buf_ptr; info = (KEY_VALUE_PARTIAL_INFORMATION *)buf_ptr;
status = NtQueryValueKey( hkey, &nameW, KeyValuePartialInformation, status = NtQueryValueKey( hkey, &NtCurrentTeb()->StaticUnicodeString,
buf_ptr, total_size, &total_size ); KeyValuePartialInformation, buf_ptr, total_size, &total_size );
} }
if (status) goto done; if (status) goto done;
@ -907,7 +901,6 @@ DWORD WINAPI RegQueryValueExA( HKEY hkey, LPCSTR name, LPDWORD reserved, LPDWORD
done: done:
if (buf_ptr != buffer) HeapFree( GetProcessHeap(), 0, buf_ptr ); if (buf_ptr != buffer) HeapFree( GetProcessHeap(), 0, buf_ptr );
RtlFreeUnicodeString( &nameW );
return RtlNtStatusToDosError(status); return RtlNtStatusToDosError(status);
} }
@ -1178,16 +1171,14 @@ DWORD WINAPI RegDeleteValueW( HKEY hkey, LPCWSTR name )
*/ */
DWORD WINAPI RegDeleteValueA( HKEY hkey, LPCSTR name ) DWORD WINAPI RegDeleteValueA( HKEY hkey, LPCSTR name )
{ {
UNICODE_STRING nameW;
STRING nameA; STRING nameA;
NTSTATUS status; NTSTATUS status;
RtlInitAnsiString( &nameA, name ); RtlInitAnsiString( &nameA, name );
/* FIXME: should use Unicode buffer in TEB */ if (!(status = RtlAnsiStringToUnicodeString( &NtCurrentTeb()->StaticUnicodeString,
if (!(status = RtlAnsiStringToUnicodeString( &nameW, &nameA, TRUE ))) &nameA, FALSE )))
{ {
status = NtDeleteValueKey( hkey, &nameW ); status = NtDeleteValueKey( hkey, &NtCurrentTeb()->StaticUnicodeString );
RtlFreeUnicodeString( &nameW );
} }
return RtlNtStatusToDosError( status ); return RtlNtStatusToDosError( status );
} }