fixed some uninitialized variables warnings

svn path=/trunk/; revision=16938
This commit is contained in:
Thomas Bluemel 2005-08-01 09:23:13 +00:00
parent fc10b038f5
commit f928348d93

View file

@ -761,7 +761,7 @@ BOOL WINAPI SetupDiGetActualSectionToInstallA(
LPWSTR InfSectionNameW = NULL; LPWSTR InfSectionNameW = NULL;
PWSTR InfSectionWithExtW = NULL; PWSTR InfSectionWithExtW = NULL;
PWSTR ExtensionW; PWSTR ExtensionW;
BOOL bResult; BOOL bResult = FALSE;
TRACE("\n"); TRACE("\n");
@ -932,6 +932,8 @@ BOOL WINAPI SetupDiGetClassDescriptionExA(
goto end; goto end;
} }
} }
else
ClassDescriptionW = NULL;
if (MachineName) if (MachineName)
{ {
@ -2005,7 +2007,7 @@ BOOL WINAPI SetupDiGetDeviceRegistryPropertyA(
{ {
if (bIsStringProperty && PropertyBufferSize > 0) if (bIsStringProperty && PropertyBufferSize > 0)
{ {
if (WideCharToMultiByte(CP_ACP, 0, (LPWSTR)PropertyBufferW, RequiredSizeW / sizeof(WCHAR), PropertyBuffer, PropertyBufferSize, NULL, NULL) == 0) if (WideCharToMultiByte(CP_ACP, 0, (LPWSTR)PropertyBufferW, RequiredSizeW / sizeof(WCHAR), (LPSTR)PropertyBuffer, PropertyBufferSize, NULL, NULL) == 0)
{ {
/* Last error is already set by WideCharToMultiByte */ /* Last error is already set by WideCharToMultiByte */
bResult = FALSE; bResult = FALSE;
@ -2067,9 +2069,6 @@ BOOL WINAPI SetupDiGetDeviceRegistryPropertyW(
switch (Property) switch (Property)
{ {
LPCWSTR RegistryPropertyName;
DWORD BufferSize;
case SPDRP_CAPABILITIES: case SPDRP_CAPABILITIES:
case SPDRP_CLASS: case SPDRP_CLASS:
case SPDRP_CLASSGUID: case SPDRP_CLASSGUID:
@ -2087,6 +2086,9 @@ BOOL WINAPI SetupDiGetDeviceRegistryPropertyW(
case SPDRP_UI_NUMBER: case SPDRP_UI_NUMBER:
case SPDRP_UPPERFILTERS: case SPDRP_UPPERFILTERS:
{ {
LPCWSTR RegistryPropertyName;
DWORD BufferSize;
switch (Property) switch (Property)
{ {
case SPDRP_CAPABILITIES: case SPDRP_CAPABILITIES:
@ -2123,7 +2125,7 @@ BOOL WINAPI SetupDiGetDeviceRegistryPropertyW(
RegistryPropertyName = L"UpperFilters"; break; RegistryPropertyName = L"UpperFilters"; break;
default: default:
/* Should not happen */ /* Should not happen */
break; RegistryPropertyName = NULL; break;
} }
/* Open registry key name */ /* Open registry key name */