Resolved most errors under vc100 compiler

indra/plugins/base_basic/basic_plugin_base.cpp

@@ -37,6 +37,9 @@
 
 #include "linden_common.h"
 #include "basic_plugin_base.h"
+#ifdef WIN32
+#include <windows.h>
+#endif
 
 
 // TODO: Make sure that the only symbol exported from this library is LLPluginInitEntryPoint

indra/plugins/base_media/media_plugin_base.cpp

@@ -142,9 +142,3 @@ void MediaPluginBase::sendStatus()
 # define LLSYMEXPORT /**/
 #endif
 
-#ifdef WIN32
-int WINAPI DllEntryPoint( HINSTANCE hInstance, unsigned long reason, void* params )
-{
-	return 1;
-}
-#endif

indra/plugins/filepicker/CMakeLists.txt

@@ -9,12 +9,16 @@ include(Linking)
 include(PluginAPI)
 include(BasicPluginBase)
 include(UI)
+include(LLWindow)
+include(LLMath)
 
 include_directories(
     ${LLPLUGIN_INCLUDE_DIRS}
     ${LLCOMMON_INCLUDE_DIRS}
     ${BASIC_PLUGIN_BASE_INCLUDE_DIRS}
 	${LLUI_INCLUDE_DIRS}
+	${LLWINDOW_INCLUDE_DIRS}
+	${LLMATH_INCLUDE_DIRS}
 )
 
 ### basic_plugin_filepicker
@@ -50,11 +54,21 @@ add_library(basic_plugin_filepicker
     ${basic_plugin_filepicker_SOURCE_FILES}
 )
 
+if (WINDOWS)
+  set(WINDOWS_API_LIBRARIES
+      ole32
+	  comdlg32
+      )
+else (WINDOWS)
+  set(WINDOWS_API_LIBRARIES "")
+endif (WINDOWS)
+
 target_link_libraries(basic_plugin_filepicker
   ${LLPLUGIN_LIBRARIES}
   ${LLCOMMON_LIBRARIES}
   ${BASIC_PLUGIN_BASE_LIBRARIES}
   ${UI_LIBRARIES}
+  ${WINDOWS_API_LIBRARIES}
 )
 
 add_dependencies(basic_plugin_filepicker

indra/plugins/filepicker/legacy.h

@@ -64,6 +64,8 @@ namespace LLWindowSDL {
 
 // Need commdlg.h for OPENFILENAMEA
 #ifdef LL_WINDOWS
+#include <windows.h>
+#include <WinUser.h>
 #include <commdlg.h>
 #endif
 

indra/plugins/filepicker/lldirpicker.cpp

@@ -35,7 +35,6 @@
 #include "llpreprocessor.h"
 #include "llerror.h"
 #include "basic_plugin_base.h"      // For PLS_INFOS etc.
-#include "legacy.h"
 
 #if LL_LINUX || LL_SOLARIS
 # include "llfilepicker.h"
@@ -71,6 +70,7 @@ static int CALLBACK BrowseCallbackProc(HWND hwnd, UINT uMsg, LPARAM lParam, LPAR
 	{
 		SendMessage(hwnd, BFFM_SETSELECTION, TRUE, lpData);
 	}
+	return (uMsg == BFFM_VALIDATEFAILED);
 }
 
 BOOL LLDirPicker::getDir(std::string const& folder)
@@ -85,7 +85,7 @@ BOOL LLDirPicker::getDir(std::string const& folder)
 	memset(&bi, 0, sizeof(bi));
 
 	bi.ulFlags   = BIF_USENEWUI;
-	bi.hwndOwner = (HWND)gViewerWindow->getPlatformWindow();
+	bi.hwndOwner = NULL;//GetCurrentProcess();
 	bi.lpszTitle = NULL;
 	llutf16string tstring = utf8str_to_utf16str(folder);
 	bi.lParam = (LPARAM)tstring.c_str();

indra/plugins/filepicker/lldirpicker.h

@@ -38,6 +38,7 @@
 #define LL_LLDIRPICKER_H
 
 #include "stdtypes.h"
+#include "legacy.h"
 
 #if LL_DARWIN
 #include <Carbon/Carbon.h>
@@ -52,11 +53,6 @@
 
 #endif
 
-// Need commdlg.h for OPENDIRNAMEA
-#ifdef LL_WINDOWS
-#include <commdlg.h>
-#endif
-
 #if LL_LINUX || LL_SOLARIS
 #include "llfilepicker.h"
 #endif

indra/plugins/filepicker/llfilepicker.cpp

@@ -35,7 +35,6 @@
 #include "llpreprocessor.h"
 #include "llerror.h"
 #include "basic_plugin_base.h"		// For PLS_INFOS etc.
-#include "legacy.h"
 
 //
 // Globals
@@ -694,7 +693,6 @@ bool LLFilePickerBase::getSaveFile(ESaveFilter filter, std::string const& filena
 			std::string filename = utf16str_to_utf8str(llutf16string(mFilesW));
 			mFiles.push_back(filename);
 		}
-		gKeyboard->resetKeys();
 	}
 
 	return success;

indra/plugins/webkit/media_plugin_webkit.cpp

@@ -323,13 +323,7 @@ private:
 
 		// append details to agent string
 		LLQtWebKit::getInstance()->setBrowserAgentId( mUserAgent );
-
-// Viewer 2+ -- MC
-#if LL_WINDOWS
-		// Set up window open behavior
-		LLQtWebKit::getInstance()->setWindowOpenBehavior(mBrowserWindowId, LLQtWebKit::WOB_SIMULATE_BLANK_HREF_CLICK);
-#endif
-		
+	
 #if !LL_QTWEBKIT_USES_PIXMAPS
 		// don't flip bitmap
 		LLQtWebKit::getInstance()->flipWindow( mBrowserWindowId, true );