6 files changed, 133 insertions, 2 deletions

diff --git a/linden/indra/llwindow/lldxhardware.cpp b/linden/indra/llwindow/lldxhardware.cpp
index 1a39e68..2aff052 100644
--- a/linden/indra/llwindow/lldxhardware.cpp
+++ b/linden/indra/llwindow/lldxhardware.cpp
@@ -411,6 +411,7 @@ BOOL LLDXHardware::getInfo(BOOL vram_only)
                         }
 
                         std::string device_name = get_string(device_containerp, L"szDescription");
+
                         std::string device_id = get_string(device_containerp, L"szDeviceID");
 
                         LLDXDevice *dxdevicep = new LLDXDevice;
@@ -451,6 +452,8 @@ BOOL LLDXHardware::getInfo(BOOL vram_only)
                         }
 
 
+
+
                         // Now, iterate through the related drivers
                         hr = device_containerp->GetChildContainer(L"Drivers", &driver_containerp);
                         if (FAILED(hr) || !driver_containerp)
@@ -468,6 +471,7 @@ BOOL LLDXHardware::getInfo(BOOL vram_only)
                         S32 file_num = 0;
                         for (file_num = 0; file_num < (S32)num_files; file_num++ )
                         {
+
                                 hr = driver_containerp->EnumChildContainerNames(file_num, wszContainer, 256);
                                 if (FAILED(hr))
                                 {
@@ -522,6 +526,104 @@ LCleanup:
     return ok;
 }
 
+LLSD LLDXHardware::getDisplayInfo()
+{
+        LLTimer hw_timer;
+    HRESULT       hr;
+        LLSD ret;
+    CoInitialize(NULL);
+
+    IDxDiagProvider *dx_diag_providerp = NULL;
+    IDxDiagContainer *dx_diag_rootp = NULL;
+        IDxDiagContainer *devices_containerp = NULL;
+        IDxDiagContainer *device_containerp = NULL;
+        IDxDiagContainer *file_containerp = NULL;
+        IDxDiagContainer *driver_containerp = NULL;
+
+    // CoCreate a IDxDiagProvider*
+        llinfos << "CoCreateInstance IID_IDxDiagProvider" << llendl;
+    hr = CoCreateInstance(CLSID_DxDiagProvider,
+                          NULL,
+                          CLSCTX_INPROC_SERVER,
+                          IID_IDxDiagProvider,
+                          (LPVOID*) &dx_diag_providerp);
+
+        if (FAILED(hr))
+        {
+                llwarns << "No DXDiag provider found!  DirectX 9 not installed!" << llendl;
+                gWriteDebug("No DXDiag provider found!  DirectX 9 not installed!\n");
+                goto LCleanup;
+        }
+    if (SUCCEEDED(hr)) // if FAILED(hr) then dx9 is not installed
+    {
+        // Fill out a DXDIAG_INIT_PARAMS struct and pass it to IDxDiagContainer::Initialize
+        // Passing in TRUE for bAllowWHQLChecks, allows dxdiag to check if drivers are 
+        // digital signed as logo'd by WHQL which may connect via internet to update 
+        // WHQL certificates.    
+        DXDIAG_INIT_PARAMS dx_diag_init_params;
+        ZeroMemory(&dx_diag_init_params, sizeof(DXDIAG_INIT_PARAMS));
+
+        dx_diag_init_params.dwSize                  = sizeof(DXDIAG_INIT_PARAMS);
+        dx_diag_init_params.dwDxDiagHeaderVersion   = DXDIAG_DX9_SDK_VERSION;
+        dx_diag_init_params.bAllowWHQLChecks        = TRUE;
+        dx_diag_init_params.pReserved               = NULL;
+
+                llinfos << "dx_diag_providerp->Initialize" << llendl;
+        hr = dx_diag_providerp->Initialize(&dx_diag_init_params);
+        if(FAILED(hr))
+                {
+            goto LCleanup;
+                }
+
+                llinfos << "dx_diag_providerp->GetRootContainer" << llendl;
+        hr = dx_diag_providerp->GetRootContainer( &dx_diag_rootp );
+        if(FAILED(hr) || !dx_diag_rootp)
+                {
+            goto LCleanup;
+                }
+
+                HRESULT hr;
+
+                // Get display driver information
+                llinfos << "dx_diag_rootp->GetChildContainer" << llendl;
+                hr = dx_diag_rootp->GetChildContainer(L"DxDiag_DisplayDevices", &devices_containerp);
+                if(FAILED(hr) || !devices_containerp)
+                {
+            goto LCleanup;
+                }
+
+                // Get device 0
+                llinfos << "devices_containerp->GetChildContainer" << llendl;
+                hr = devices_containerp->GetChildContainer(L"0", &device_containerp);
+                if(FAILED(hr) || !device_containerp)
+                {
+            goto LCleanup;
+                }
+                
+                // Get the English VRAM string
+                std::string ram_str = get_string(device_containerp, L"szDisplayMemoryEnglish");
+
+
+                // Dump the string as an int into the structure
+                char *stopstring;
+                ret["VRAM"] = strtol(ram_str.c_str(), &stopstring, 10);
+                std::string device_name = get_string(device_containerp, L"szDescription");
+                ret["DeviceName"] = device_name;
+                std::string device_driver=  get_string(device_containerp, L"szDriverVersion");
+                ret["DriverVersion"] = device_driver;
+        }
+LCleanup:
+        SAFE_RELEASE(file_containerp);
+        SAFE_RELEASE(driver_containerp);
+        SAFE_RELEASE(device_containerp);
+        SAFE_RELEASE(devices_containerp);
+    SAFE_RELEASE(dx_diag_rootp);
+    SAFE_RELEASE(dx_diag_providerp);
+    
+    CoUninitialize();
+        return ret;
+}
+
 void LLDXHardware::setWriteDebugFunc(void (*func)(const char*))
 {
         gWriteDebug = func;
diff --git a/linden/indra/llwindow/lldxhardware.h b/linden/indra/llwindow/lldxhardware.h
index 1d5d69d..e2a255d 100644
--- a/linden/indra/llwindow/lldxhardware.h
+++ b/linden/indra/llwindow/lldxhardware.h
@@ -36,6 +36,7 @@
 
 #include "stdtypes.h"
 #include "llstring.h"
+#include "llsd.h"
 
 class LLVersion
 {
@@ -93,6 +94,8 @@ public:
 
         S32 getVRAM() const { return mVRAM; }
 
+        LLSD getDisplayInfo();
+
         // Find a particular device that matches the following specs.
         // Empty strings indicate that you don't care.
         // You can separate multiple devices with '|' chars to indicate you want
diff --git a/linden/indra/llwindow/llgl.cpp b/linden/indra/llwindow/llgl.cpp
index 35f20d3..df87591 100644
--- a/linden/indra/llwindow/llgl.cpp
+++ b/linden/indra/llwindow/llgl.cpp
@@ -36,6 +36,8 @@
 
 #include "linden_common.h"
 
+#include "boost/tokenizer.hpp"
+
 #include "llsys.h"
 
 #include "llgl.h"
@@ -459,6 +461,23 @@ bool LLGLManager::initGL()
         return true;
 }
 
+void LLGLManager::getGLInfo(LLSD& info)
+{
+        info["GLInfo"]["GLVendor"] = LLString((const char *)glGetString(GL_VENDOR));
+        info["GLInfo"]["GLRenderer"] = LLString((const char *)glGetString(GL_RENDERER));
+        info["GLInfo"]["GLVersion"] = LLString((const char *)glGetString(GL_VERSION));
+
+#if !LL_MESA_HEADLESS
+        LLString all_exts = (const char *)gGLHExts.mSysExts;
+        boost::char_separator<char> sep(" ");
+        boost::tokenizer<boost::char_separator<char> > tok(all_exts, sep);
+        for(boost::tokenizer<boost::char_separator<char> >::iterator i = tok.begin(); i != tok.end(); ++i)
+        {
+                info["GLInfo"]["GLExtensions"].append(*i);
+        }
+#endif
+}
+
 LLString LLGLManager::getGLInfoString()
 {
         LLString info_str;
diff --git a/linden/indra/llwindow/llgl.h b/linden/indra/llwindow/llgl.h
index 2a23a23..a8e14b7 100644
--- a/linden/indra/llwindow/llgl.h
+++ b/linden/indra/llwindow/llgl.h
@@ -48,6 +48,8 @@
 
 #define LL_GL_ERRS llerrs
 
+class LLSD;
+
 // Manage GL extensions...
 class LLGLManager
 {
@@ -122,6 +124,7 @@ public:
         void getPixelFormat(); // Get the best pixel format
 
         LLString getGLInfoString();
+        void getGLInfo(LLSD& info);
 
         // In ALL CAPS
         LLString mGLVendor;
diff --git a/linden/indra/llwindow/llwindowwin32.cpp b/linden/indra/llwindow/llwindowwin32.cpp
index c84611b..1fa50de 100644
--- a/linden/indra/llwindow/llwindowwin32.cpp
+++ b/linden/indra/llwindow/llwindowwin32.cpp
@@ -93,6 +93,7 @@ BOOL	LLWindowWin32::sWinIMEOpened = FALSE;
 HKL             LLWindowWin32::sWinInputLocale = 0;
 DWORD   LLWindowWin32::sWinIMEConversionMode = IME_CMODE_NATIVE;
 DWORD   LLWindowWin32::sWinIMESentenceMode = IME_SMODE_AUTOMATIC;
+LLCoordWindow LLWindowWin32::sWinIMEWindowPosition(-1,-1);
 
 // The following class LLWinImm delegates Windows IMM APIs.
 // We need this because some language versions of Windows,
@@ -3381,7 +3382,8 @@ void LLWindowWin32::setLanguageTextInput( const LLCoordGL & position )
                 LLCoordWindow win_pos;
                 convertCoords( position, &win_pos );
 
-                if ( win_pos.mX >= 0 && win_pos.mY >= 0 )
+                if ( win_pos.mX >= 0 && win_pos.mY >= 0 && 
+                        (win_pos.mX != sWinIMEWindowPosition.mX) || (win_pos.mY != sWinIMEWindowPosition.mY) )
                 {
                         COMPOSITIONFORM ime_form;
                         memset( &ime_form, 0, sizeof(ime_form) );
@@ -3390,10 +3392,11 @@ void LLWindowWin32::setLanguageTextInput( const LLCoordGL & position )
                         ime_form.ptCurrentPos.y = win_pos.mY;
 
                         LLWinImm::setCompositionWindow( himc, &ime_form );
+
+                        sWinIMEWindowPosition.set( win_pos.mX, win_pos.mY );
                 }
 
                 LLWinImm::releaseContext(mWindowHandle, himc);
-
         }
 }
 
diff --git a/linden/indra/llwindow/llwindowwin32.h b/linden/indra/llwindow/llwindowwin32.h
index f1e977e..602e066 100644
--- a/linden/indra/llwindow/llwindowwin32.h
+++ b/linden/indra/llwindow/llwindowwin32.h
@@ -188,6 +188,7 @@ protected:
         static HKL              sWinInputLocale;
         static DWORD    sWinIMEConversionMode;
         static DWORD    sWinIMESentenceMode;
+        static LLCoordWindow sWinIMEWindowPosition;
 
         friend class LLWindowManager;
 };