Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-06-04 17:00:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

Initialize variables and close keys only if they were opened, based on wine code. Fixes CIDs 787, 788.

Browse source 
svn path=/trunk/; revision=36815
This commit is contained in:
Gregor Schneider 2008-10-18 21:38:25 +00:00
parent edb9e011a3
commit eb2c5f864c
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
reactos/dll/directx/devenum/devenum_main.c
View file

@ -299,7 +299,7 @@ static HRESULT register_clsids(int count, const register_info * pRegInfo, LPCWST
{ {
HRESULT res = S_OK; HRESULT res = S_OK;
WCHAR dll_module[MAX_PATH]; WCHAR dll_module[MAX_PATH];
LPOLESTR clsidString; LPOLESTR clsidString = NULL;
HKEY hkeyClsid; HKEY hkeyClsid;
HKEY hkeySub; HKEY hkeySub;
HKEY hkeyInproc32; HKEY hkeyInproc32;
@ -321,6 +321,7 @@ static HRESULT register_clsids(int count, const register_info * pRegInfo, LPCWST
for (i = 0; i < count; i++) for (i = 0; i < count; i++)
{ {
hkeySub = 0;
if (SUCCEEDED(res)) if (SUCCEEDED(res))
{ {
res = StringFromCLSID(pRegInfo[i].clsid, &clsidString); res = StringFromCLSID(pRegInfo[i].clsid, &clsidString);
@ -361,7 +362,7 @@ static HRESULT register_clsids(int count, const register_info * pRegInfo, LPCWST
(lstrlenW(pszThreadingModel) + 1) * sizeof(WCHAR)); (lstrlenW(pszThreadingModel) + 1) * sizeof(WCHAR));
RegCloseKey(hkeyInproc32); RegCloseKey(hkeyInproc32);
} }
RegCloseKey(hkeySub); if (hkeySub) RegCloseKey(hkeySub);
CoTaskMemFree(clsidString); CoTaskMemFree(clsidString);
clsidString = NULL; clsidString = NULL;
} }