Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-28 10:04:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed RegQueryValueExA and marked as implemented.

Browse source 
svn path=/trunk/; revision=6312
This commit is contained in:
Filip Navara 2003-10-14 18:18:27 +00:00
parent 47419d0b98
commit 3889a8a8dd
1 changed files with 50 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

68
reactos/lib/advapi32/reg/reg.c
View file

@ -1,4 +1,4 @@
/* $Id: reg.c,v 1.30 2003/08/30 14:46:29 hbirr Exp $
/* $Id: reg.c,v 1.31 2003/10/14 18:18:27 navaraf Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS system libraries
@ -19,7 +19,7 @@
#include <windows.h>
#include <wchar.h>
#define NDEBUG
//#define NDEBUG
#include <debug.h>
/* DEFINES ******************************************************************/
@ -2180,7 +2180,7 @@ RegQueryValueExW (HKEY hKey,
/************************************************************************
* RegQueryValueExA
*
* @unimplemented
* @implemented
*/
LONG
STDCALL
@ -2192,69 +2192,65 @@ RegQueryValueExA(
LPBYTE lpData,
LPDWORD lpcbData)
{
WCHAR ValueNameBuffer[MAX_PATH+1];
UNICODE_STRING ValueName;
UNICODE_STRING ValueData;
ANSI_STRING AnsiString;
LONG ErrorCode;
DWORD ResultSize;
DWORD Type;
/* FIXME: HKEY_PERFORMANCE_DATA is special, see MS SDK */
if ((lpData) && (!lpcbData)) {
if ((lpData) && (!lpcbData))
{
SetLastError(ERROR_INVALID_PARAMETER);
return ERROR_INVALID_PARAMETER;
}
RtlInitUnicodeString(&ValueData, NULL);
if (lpData) {
ValueData.MaximumLength = *lpcbData * sizeof(WCHAR);
if (lpData)
{
ValueData.Length = ValueData.MaximumLength = *lpcbData * sizeof(WCHAR);
ValueData.Buffer = RtlAllocateHeap(
ProcessHeap,
0,
ValueData.MaximumLength);
if (!ValueData.Buffer) {
ValueData.Length);
if (!ValueData.Buffer)
{
SetLastError(ERROR_OUTOFMEMORY);
return ERROR_OUTOFMEMORY;
}
}
RtlInitAnsiString(&AnsiString, (LPSTR)lpValueName);
RtlInitUnicodeString(&ValueName, NULL);
ValueName.Buffer = &ValueNameBuffer[0];
ValueName.MaximumLength = sizeof(ValueNameBuffer);
RtlAnsiStringToUnicodeString(&ValueName, &AnsiString, FALSE);
if (lpcbData) {
ResultSize = *lpcbData;
} else {
ResultSize = 0;
else
{
ValueData.Buffer = NULL;
}
RtlCreateUnicodeStringFromAsciiz(&ValueName, (LPSTR)lpValueName);
ErrorCode = RegQueryValueExW(
hKey,
ValueName.Buffer,
lpReserved,
&Type,
lpType,
(LPBYTE)ValueData.Buffer,
&ResultSize);
if ((ErrorCode == ERROR_SUCCESS) && (ValueData.Buffer != NULL)) {
if (lpType) {
*lpType = Type;
}
if ((Type == REG_SZ) || (Type == REG_MULTI_SZ) || (Type == REG_EXPAND_SZ)) {
ValueData.Length = ResultSize;
(LPDWORD)&ValueData.Length);
if ((ErrorCode == ERROR_SUCCESS) && (ValueData.Buffer != NULL))
{
if (lpType && ((*lpType == REG_SZ) || (*lpType == REG_MULTI_SZ) || (*lpType == REG_EXPAND_SZ)))
{
RtlInitAnsiString(&AnsiString, NULL);
AnsiString.Buffer = lpData;
AnsiString.MaximumLength = *lpcbData;
RtlUnicodeStringToAnsiString(&AnsiString, &ValueData, FALSE);
*lpcbData = ValueData.Length / sizeof(WCHAR);
} else {
RtlMoveMemory(lpData, ValueData.Buffer, ResultSize);
RtlMoveMemory(lpData, ValueData.Buffer, *lpcbData);
*lpcbData = ValueData.Length;
}
}
if (lpcbData) {
*lpcbData = ResultSize;
}
if (ValueData.Buffer) {
if (ValueData.Buffer)
{
RtlFreeHeap(ProcessHeap, 0, ValueData.Buffer);
}
return ErrorCode;
}