ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

urlmon: Avoid accessing an uninitialized variable (valgrind). 

Also a bit of code clean up.
This commit is contained in:
Jacek Caban 2011-06-03 11:40:23 +02:00 committed by Alexandre Julliard
parent 21f74fc1bb
commit e21c5282e0
1 changed files with 18 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
dlls/urlmon/internet.c
View File

@ -549,39 +549,34 @@ static HRESULT set_internet_feature(INTERNETFEATURELIST feature, DWORD flags, BO
static BOOL get_feature_from_reg(HKEY feature_control, LPCWSTR feature_name, LPCWSTR process_name, BOOL *enabled) static BOOL get_feature_from_reg(HKEY feature_control, LPCWSTR feature_name, LPCWSTR process_name, BOOL *enabled)
{ {
BOOL ret = FALSE; DWORD type, value, size;
HKEY feature; HKEY feature;
DWORD res; DWORD res;
static const WCHAR wildcardW[] = {'*',0}; static const WCHAR wildcardW[] = {'*',0};
res = RegOpenKeyW(feature_control, feature_name, &feature); res = RegOpenKeyW(feature_control, feature_name, &feature);
if(res == ERROR_SUCCESS) { if(res != ERROR_SUCCESS)
DWORD type, value, size; return FALSE;
size = sizeof(DWORD);
res = RegQueryValueExW(feature, process_name, NULL, &type, (BYTE*)&value, &size);
if(res != ERROR_SUCCESS || type != REG_DWORD) {
size = sizeof(DWORD); size = sizeof(DWORD);
res = RegQueryValueExW(feature, process_name, NULL, &type, (BYTE*)&value, &size); res = RegQueryValueExW(feature, wildcardW, NULL, &type, (BYTE*)&value, &size);
if(type != REG_DWORD)
WARN("Unexpected registry value type %d (expected REG_DWORD) for %s\n", type, debugstr_w(process_name));
if(res == ERROR_SUCCESS && type == REG_DWORD) {
*enabled = value == 1;
ret = TRUE;
} else {
size = sizeof(DWORD);
res = RegQueryValueExW(feature, wildcardW, NULL, &type, (BYTE*)&value, &size);
if(type != REG_DWORD)
WARN("Unexpected registry value type %d (expected REG_DWORD) for %s\n", type, debugstr_w(wildcardW));
if(res == ERROR_SUCCESS && type == REG_DWORD) {
*enabled = value == 1;
ret = TRUE;
}
}
RegCloseKey(feature);
} }
return ret; RegCloseKey(feature);
if(res != ERROR_SUCCESS)
return FALSE;
if(type != REG_DWORD) {
WARN("Unexpected registry value type %d (expected REG_DWORD) for %s\n", type, debugstr_w(wildcardW));
return FALSE;
}
*enabled = value == 1;
return TRUE;
} }
/* Assumes 'process_features_cs' is held. */ /* Assumes 'process_features_cs' is held. */