diff options
| author | Sefa Eyeoglu <contact@scrumplex.net> | 2022-07-20 10:07:10 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-20 10:07:10 +0200 |
| commit | e78c7af7158846decae06959d6b4ffe327438ee9 (patch) | |
| tree | 7371913aff334cc30bf855b1b95450652c4a70cd | |
| parent | c86610b917d2935426c0813bead01b610b913fae (diff) | |
| parent | 8fc1653b0c3dbc75f12127099b41182269bc3d8a (diff) | |
| download | PrismLauncher-e78c7af7158846decae06959d6b4ffe327438ee9.tar.gz PrismLauncher-e78c7af7158846decae06959d6b4ffe327438ee9.tar.bz2 PrismLauncher-e78c7af7158846decae06959d6b4ffe327438ee9.zip | |
Merge pull request #936 from Scrumplex/fix-windows-crap-2
| -rw-r--r-- | launcher/java/JavaUtils.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/launcher/java/JavaUtils.cpp b/launcher/java/JavaUtils.cpp index 749c9c88..e7013142 100644 --- a/launcher/java/JavaUtils.cpp +++ b/launcher/java/JavaUtils.cpp @@ -203,7 +203,7 @@ QList<JavaInstallPtr> JavaUtils::FindJavaFromRegistryKey(DWORD keyType, QString // Read the current type version from the registry. // This will be used to find any key that contains the JavaHome value. - TCHAR subKeyName[255]; + WCHAR subKeyName[255]; DWORD subKeyNameSize, numSubKeys, retCode; // Get the number of subkeys @@ -229,12 +229,11 @@ QList<JavaInstallPtr> JavaUtils::FindJavaFromRegistryKey(DWORD keyType, QString KEY_READ | KEY_WOW64_64KEY, &newKey) == ERROR_SUCCESS) { // Read the JavaHome value to find where Java is installed. - TCHAR *value = NULL; DWORD valueSz = 0; - if (RegQueryValueExW(newKey, keyJavaDir.toStdWString().c_str(), NULL, NULL, (BYTE *)value, - &valueSz) == ERROR_MORE_DATA) + if (RegQueryValueExW(newKey, keyJavaDir.toStdWString().c_str(), NULL, NULL, NULL, + &valueSz) == ERROR_SUCCESS) { - value = new TCHAR[valueSz]; + WCHAR *value = new WCHAR[valueSz]; RegQueryValueExW(newKey, keyJavaDir.toStdWString().c_str(), NULL, NULL, (BYTE *)value, &valueSz); |