Automated merge for avatar-pipeline pull

--HG--
branch : avatar-pipeline

1 files changed, 66 insertions, 66 deletions

diff --git a/indra/llcommon/llsys.cpp b/indra/llcommon/llsys.cpp
index cba8cf85b0..0272c55db2 100644
--- a/indra/llcommon/llsys.cpp
+++ b/indra/llcommon/llsys.cpp
@@ -77,72 +77,72 @@ static const S32 CPUINFO_BUFFER_SIZE = 16383;
 LLCPUInfo gSysCPU;
 
 #if LL_WINDOWS
-#ifndef DLLVERSIONINFO

-typedef struct _DllVersionInfo

-{

-    DWORD cbSize;

-    DWORD dwMajorVersion;

-    DWORD dwMinorVersion;

-    DWORD dwBuildNumber;

-    DWORD dwPlatformID;

-}DLLVERSIONINFO;

-#endif

-

-#ifndef DLLGETVERSIONPROC

-typedef int (FAR WINAPI *DLLGETVERSIONPROC) (DLLVERSIONINFO *);

-#endif

-

-bool get_shell32_dll_version(DWORD& major, DWORD& minor, DWORD& build_number)

-{

-	bool result = false;

-	const U32 BUFF_SIZE = 32767;

-	WCHAR tempBuf[BUFF_SIZE];

-	if(GetSystemDirectory((LPWSTR)&tempBuf, BUFF_SIZE))

-	{

-		

-		std::basic_string<WCHAR> shell32_path(tempBuf);

-

-		// Shell32.dll contains the DLLGetVersion function. 

-		// according to msdn its not part of the API

-		// so you have to go in and get it.

-		// http://msdn.microsoft.com/en-us/library/bb776404(VS.85).aspx

-		shell32_path += TEXT("\\shell32.dll");

-

-		HMODULE hDllInst = LoadLibrary(shell32_path.c_str());   //load the DLL

-		if(hDllInst) 

-		{  // Could successfully load the DLL

-			DLLGETVERSIONPROC pDllGetVersion;

-			/*

-			You must get this function explicitly because earlier versions of the DLL

-			don't implement this function. That makes the lack of implementation of the

-			function a version marker in itself.

-			*/

-			pDllGetVersion = (DLLGETVERSIONPROC) GetProcAddress(hDllInst, 

-																"DllGetVersion");

-

-			if(pDllGetVersion) 

-			{    

-				// DLL supports version retrieval function

-				DLLVERSIONINFO    dvi;

-

-				ZeroMemory(&dvi, sizeof(dvi));

-				dvi.cbSize = sizeof(dvi);

-				HRESULT hr = (*pDllGetVersion)(&dvi);

-

-				if(SUCCEEDED(hr)) 

-				{ // Finally, the version is at our hands

-					major = dvi.dwMajorVersion;

-					minor = dvi.dwMinorVersion;

-					build_number = dvi.dwBuildNumber;

-					result = true;

-				} 

-			} 

-

-			FreeLibrary(hDllInst);  // Release DLL

-		} 

-	}

-	return result;

-}

+#ifndef DLLVERSIONINFO
+typedef struct _DllVersionInfo
+{
+    DWORD cbSize;
+    DWORD dwMajorVersion;
+    DWORD dwMinorVersion;
+    DWORD dwBuildNumber;
+    DWORD dwPlatformID;
+}DLLVERSIONINFO;
+#endif
+
+#ifndef DLLGETVERSIONPROC
+typedef int (FAR WINAPI *DLLGETVERSIONPROC) (DLLVERSIONINFO *);
+#endif
+
+bool get_shell32_dll_version(DWORD& major, DWORD& minor, DWORD& build_number)
+{
+	bool result = false;
+	const U32 BUFF_SIZE = 32767;
+	WCHAR tempBuf[BUFF_SIZE];
+	if(GetSystemDirectory((LPWSTR)&tempBuf, BUFF_SIZE))
+	{
+		
+		std::basic_string<WCHAR> shell32_path(tempBuf);
+
+		// Shell32.dll contains the DLLGetVersion function. 
+		// according to msdn its not part of the API
+		// so you have to go in and get it.
+		// http://msdn.microsoft.com/en-us/library/bb776404(VS.85).aspx
+		shell32_path += TEXT("\\shell32.dll");
+
+		HMODULE hDllInst = LoadLibrary(shell32_path.c_str());   //load the DLL
+		if(hDllInst) 
+		{  // Could successfully load the DLL
+			DLLGETVERSIONPROC pDllGetVersion;
+			/*
+			You must get this function explicitly because earlier versions of the DLL
+			don't implement this function. That makes the lack of implementation of the
+			function a version marker in itself.
+			*/
+			pDllGetVersion = (DLLGETVERSIONPROC) GetProcAddress(hDllInst, 
+																"DllGetVersion");
+
+			if(pDllGetVersion) 
+			{    
+				// DLL supports version retrieval function
+				DLLVERSIONINFO    dvi;
+
+				ZeroMemory(&dvi, sizeof(dvi));
+				dvi.cbSize = sizeof(dvi);
+				HRESULT hr = (*pDllGetVersion)(&dvi);
+
+				if(SUCCEEDED(hr)) 
+				{ // Finally, the version is at our hands
+					major = dvi.dwMajorVersion;
+					minor = dvi.dwMinorVersion;
+					build_number = dvi.dwBuildNumber;
+					result = true;
+				} 
+			} 
+
+			FreeLibrary(hDllInst);  // Release DLL
+		} 
+	}
+	return result;
+}
 #endif // LL_WINDOWS
 
 LLOSInfo::LLOSInfo() :