reactos/wine
1
0
Fork 0
mirror of https://github.com/reactos/wine.git synced 2025-01-27 06:53:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

OleRegGetUserType did return an unterminated ASCII string instead of an

Browse Source 
OLESTR (wide characters).
This commit is contained in:
Gavriel State 2000-04-04 18:54:06 +00:00 committed by Alexandre Julliard
parent ef76a1c97d
commit 6edc9517a4
1 changed files with 29 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
dlls/ole32/ole2.c
View File

@ -392,13 +392,14 @@ HRESULT WINAPI OleRegGetUserType(
DWORD dwFormOfType,
LPOLESTR* pszUserType)
{
char xclsid[50];
char keyName[60];
DWORD dwKeyType;
DWORD cbData;
HKEY clsidKey;
LONG hres;
char xclsid[50];
char keyName[60];
DWORD dwKeyType;
DWORD cbData;
HKEY clsidKey;
LONG hres;
LPBYTE buffer;
HRESULT retVal;
/*
* Initialize the out parameter.
*/
@ -446,7 +447,7 @@ HRESULT WINAPI OleRegGetUserType(
/*
* Allocate a buffer for the registry value.
*/
*pszUserType = CoTaskMemAlloc(cbData);
*pszUserType = CoTaskMemAlloc(cbData*2);
if (*pszUserType==NULL)
{
@ -454,24 +455,41 @@ HRESULT WINAPI OleRegGetUserType(
return E_OUTOFMEMORY;
}
buffer = HeapAlloc(GetProcessHeap(), 0, cbData);
if (buffer == NULL)
{
RegCloseKey(clsidKey);
CoTaskMemFree(*pszUserType);
*pszUserType=NULL;
return E_OUTOFMEMORY;
}
hres = RegQueryValueExA(clsidKey,
"",
NULL,
&dwKeyType,
(LPBYTE)*pszUserType,
buffer,
&cbData);
RegCloseKey(clsidKey);
if (hres!=ERROR_SUCCESS)
{
CoTaskMemFree(*pszUserType);
*pszUserType=NULL;
return REGDB_E_READREGDB;
retVal = REGDB_E_READREGDB;
}
else
{
lstrcpyAtoW(*pszUserType, buffer);
retVal = S_OK;
}
HeapFree(GetProcessHeap(), 0, buffer);
return S_OK;
return retVal;
}
/***********************************************************************