Merging r375 from trunk.

derceg · Aug 19, 2011 · 2b57891 · 2b57891
1 parent ec82c33
commit 2b57891
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/Explorer++/Explorer++/Misc.cpp b/Explorer++/Explorer++/Misc.cpp
@@ -1853,10 +1853,6 @@ BOOL Explorerplusplus::CheckItemSelection(void)
 	return FALSE;
 }
 
-/* Checks the version of the specified
-language DLL against the version of the
-main executable and returns TRUE if they
-match. */
 BOOL Explorerplusplus::VerifyLanguageVersion(TCHAR *szLanguageModule)
 {
 	TCHAR szImageName[MAX_PATH];
@@ -1877,9 +1873,16 @@ BOOL Explorerplusplus::VerifyLanguageVersion(TCHAR *szLanguageModule)
 
 		if(bSuccess1 && bSuccess2)
 		{
-			if((dwpvProcessLS == dwpvLanguageLS) &&
-				(dwpvProcessMS == dwpvLanguageMS))
+			/* For the version of the language DLL to match
+			the version of the executable, the major version,
+			minor version and micro version must match. The
+			build version is ignored. */
+			if(HIWORD(dwpvLanguageMS) == HIWORD(dwpvProcessMS) &&
+				LOWORD(dwpvLanguageMS) == LOWORD(dwpvProcessMS) &&
+				HIWORD(dwpvLanguageLS) == HIWORD(dwpvProcessLS))
+			{
 				return TRUE;
+			}
 		}
 	}
 

diff --git a/Explorer++/Helper/Helper.cpp b/Explorer++/Helper/Helper.cpp
@@ -2581,8 +2581,8 @@ DWORD *pdwProductVersionLS,DWORD *pdwProductVersionMS)
 
 			if(uLen > 0)
 			{
-				*pdwProductVersionLS = pvsffi->dwProductVersionMS;
-				*pdwProductVersionMS = pvsffi->dwProductVersionLS;
+				*pdwProductVersionLS = pvsffi->dwProductVersionLS;
+				*pdwProductVersionMS = pvsffi->dwProductVersionMS;
 
 				bSuccess = TRUE;
 			}