Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-24 17:34:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

hopefully fix something in CreateClassKey

Browse source 
svn path=/trunk/; revision=16415
This commit is contained in:
Gunnar Dalsnes 2005-07-04 21:54:36 +00:00
parent 199b9bce22
commit d8e78cc66b
1 changed files with 19 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
reactos/lib/setupapi/devinst.c
View file

@ -1308,12 +1308,7 @@ static HKEY CreateClassKey(HINF hInf)
lstrcpyW(FullBuffer, ControlClass); lstrcpyW(FullBuffer, ControlClass);
lstrcatW(FullBuffer, Buffer); lstrcatW(FullBuffer, Buffer);
if (RegOpenKeyExW(HKEY_LOCAL_MACHINE,
FullBuffer,
0,
KEY_ALL_ACCESS,
&hClassKey))
{
if (!SetupGetLineTextW(NULL, if (!SetupGetLineTextW(NULL,
hInf, hInf,
Version, Version,
@ -1322,10 +1317,11 @@ static HKEY CreateClassKey(HINF hInf)
MAX_PATH, MAX_PATH,
&RequiredSize)) &RequiredSize))
{ {
RegDeleteKeyW(HKEY_LOCAL_MACHINE, FullBuffer);
return INVALID_HANDLE_VALUE; return INVALID_HANDLE_VALUE;
} }
if (RegCreateKeyExW(HKEY_LOCAL_MACHINE, if (ERROR_SUCCESS != RegCreateKeyExW(HKEY_LOCAL_MACHINE,
FullBuffer, FullBuffer,
0, 0,
NULL, NULL,
@ -1335,12 +1331,11 @@ static HKEY CreateClassKey(HINF hInf)
&hClassKey, &hClassKey,
NULL)) NULL))
{ {
RegDeleteKeyW(HKEY_LOCAL_MACHINE, FullBuffer);
return INVALID_HANDLE_VALUE; return INVALID_HANDLE_VALUE;
} }
} if (ERROR_SUCCESS != RegSetValueExW(hClassKey,
if (RegSetValueExW(hClassKey,
Class, Class,
0, 0,
REG_SZ, REG_SZ,
@ -1348,8 +1343,7 @@ static HKEY CreateClassKey(HINF hInf)
RequiredSize * sizeof(WCHAR))) RequiredSize * sizeof(WCHAR)))
{ {
RegCloseKey(hClassKey); RegCloseKey(hClassKey);
RegDeleteKeyW(HKEY_LOCAL_MACHINE, RegDeleteKeyW(HKEY_LOCAL_MACHINE, FullBuffer);
FullBuffer);
return INVALID_HANDLE_VALUE; return INVALID_HANDLE_VALUE;
} }
@ -1397,6 +1391,7 @@ BOOL WINAPI SetupDiInstallClassW(
SetupCloseInfFile(hInf); SetupCloseInfFile(hInf);
return FALSE; return FALSE;
} }
RegCloseKey(hClassKey);
/* Try to append a layout file */ /* Try to append a layout file */