strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

CWS-TOOLING: integrate CWS cmcfixes66

Browse source
This commit is contained in:
Kurt Zenker 2009-11-13 19:16:08 +01:00
commit 3415c114d2
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
xmerge/source/activesync/XMergeFilter.cpp
View file

@ -343,11 +343,6 @@ TCHAR* CXMergeFilter::GetJavaBaseDir()
DWORD dwClassName = _MAX_PATH;
DWORD dwKeyName = _MAX_PATH;
// Locations shouldn't be greater than _MAX_PATH
TCHAR* szJavaHome = new TCHAR[_MAX_PATH + 1];
DWORD dwSize = _MAX_PATH + 1;
/*
* Java leaves registry keys at HKLM\SOFTWARE\JavaSoft.
*
@ -357,6 +352,10 @@ TCHAR* CXMergeFilter::GetJavaBaseDir()
if (lRet != ERROR_SUCCESS)
return NULL;
// Locations shouldn't be greater than _MAX_PATH
TCHAR* szJavaHome = new TCHAR[_MAX_PATH + 1];
DWORD dwSize = _MAX_PATH + 1;
/* use current version */
lRet = ::RegQueryValueEx(hKey, _T("CurrentVersion"), 0, NULL, (LPBYTE)szCurrentJava, &dwSize);
@ -376,6 +375,7 @@ TCHAR* CXMergeFilter::GetJavaBaseDir()
if (lRet != ERROR_SUCCESS)
{
RegCloseKey(hKey);
delete [] szJavaHome;
return NULL;
}
@ -387,7 +387,7 @@ TCHAR* CXMergeFilter::GetJavaBaseDir()
{
RegCloseKey(hDataKey);
RegCloseKey(hKey);
delete szJavaHome;
delete [] szJavaHome;
return NULL;
}
@ -400,7 +400,7 @@ TCHAR* CXMergeFilter::GetJavaBaseDir()
if (((dwAttrs & FILE_ATTRIBUTE_DIRECTORY) != FILE_ATTRIBUTE_DIRECTORY) || dwAttrs == INVALID_FILE_SIZE)
{
delete szJavaHome;
delete [] szJavaHome;
return NULL;
}