Unified Diff: src/plugin/PluginSettings.cpp
Issue 5163581322559488:
Issue 1283 - wrong usage of memset, fix sizeof, make proper initializing (Closed)
Patch Set: remove intializating call
Created Oct. 13, 2014, 9:47 a.m.
Use n/p to move between diff chunks;
N/P to move between comments.
« src/plugin/PluginClass.cpp ('K')
|
« src/plugin/PluginClass.cpp ('k')
|
src/plugin/PluginSystem.cpp » ('j')
|
src/plugin/PluginSystem.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| Index: src/plugin/PluginSettings.cpp |
| =================================================================== |
| --- a/src/plugin/PluginSettings.cpp |
| +++ b/src/plugin/PluginSettings.cpp |
| @@ -231,17 +231,12 @@ |
| { |
| if (m_WindowsBuildNumber == 0) |
| { |
| - OSVERSIONINFOEX osvi; |
| - SYSTEM_INFO si; |
| - BOOL bOsVersionInfoEx; |
| - |
| - ZeroMemory(&si, sizeof(SYSTEM_INFO)); |
| - ZeroMemory(&osvi, sizeof(OSVERSIONINFOEX)); |
| - |
| - osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX); |
| - bOsVersionInfoEx = GetVersionEx((OSVERSIONINFO*) &osvi); |
| - |
| - m_WindowsBuildNumber = osvi.dwBuildNumber; |
| + OSVERSIONINFOEX osvi = {}; |
| + osvi.dwOSVersionInfoSize = sizeof(osvi); |
| + if (GetVersionExW(reinterpret_cast<OSVERSIONINFO*>(&osvi)) != 0) |
| + { |
| + m_WindowsBuildNumber = osvi.dwBuildNumber; |
| + } |
| } |
| return m_WindowsBuildNumber; |
« src/plugin/PluginClass.cpp ('K')
|
« src/plugin/PluginClass.cpp ('k')
|
src/plugin/PluginSystem.cpp » ('j')
|
src/plugin/PluginSystem.cpp » ('J')
