@@ -27,14 +27,14 @@ static int GetDllVersion(const wchar_t* path, Version* out_version) {
27
27
}
28
28
29
29
VS_FIXEDFILEINFO * fileInfo ;
30
- UINT len = 0 ;
30
+ UINT len = 0 ;
31
31
if ( !VerQueryValueA (buffer , "\\" , (LPVOID * )& fileInfo , & len ) ) {
32
32
c4log (kC4DefaultLog , kC4LogVerbose , "VerQueryValueA failed: %lu" , GetLastError ());
33
33
free (buffer );
34
34
return 0 ;
35
35
}
36
36
37
- if (fileInfo ) {
37
+ if ( fileInfo ) {
38
38
out_version -> major = HIWORD (fileInfo -> dwFileVersionMS );
39
39
out_version -> minor = LOWORD (fileInfo -> dwFileVersionMS );
40
40
out_version -> build = HIWORD (fileInfo -> dwFileVersionLS );
@@ -58,17 +58,15 @@ static int CompareVersions(const Version* a, const Version* b) {
58
58
59
59
void CheckCppRuntime () {
60
60
HMODULE hMod = GetModuleHandleA ("msvcp140.dll" );
61
- if (!hMod ) {
62
- hMod = LoadLibraryA ("msvcp140d.dll" );
63
- }
61
+ if ( !hMod ) { hMod = LoadLibraryA ("msvcp140d.dll" ); }
64
62
65
63
if ( !hMod ) {
66
64
c4log (kC4DefaultLog , kC4LogWarning , "msvcp140.dll not loaded yet, unable to check version..." );
67
65
return ;
68
66
}
69
67
70
68
wchar_t path [MAX_PATH ];
71
- if (GetModuleFileNameW (hMod , path , MAX_PATH ) == 0 ) {
69
+ if ( GetModuleFileNameW (hMod , path , MAX_PATH ) == 0 ) {
72
70
c4log (kC4DefaultLog , kC4LogWarning , "Unable to determine msvcp140.dll filename to check version..." );
73
71
return ;
74
72
}
@@ -83,8 +81,8 @@ void CheckCppRuntime() {
83
81
int cmp = CompareVersions (& loaded , & expected );
84
82
if ( cmp < 0 ) {
85
83
c4log (kC4DefaultLog , kC4LogWarning , "msvcp140.dll version is older than expected: %u.%u.%u.%u < %u.%u.%u.%u" ,
86
- loaded .major , loaded .minor , loaded .revision , loaded .build ,
87
- expected . major , expected . minor , expected .revision , expected .build );
84
+ loaded .major , loaded .minor , loaded .revision , loaded .build , expected . major , expected . minor ,
85
+ expected .revision , expected .build );
88
86
c4log (kC4DefaultLog , kC4LogWarning , "This may cause instability in your application" );
89
87
}
90
88
}
0 commit comments