[commit] r2641 - in trunk/SDK/BON: Common Wizard/Templates/1033

[GMESRC Repository Notifications]

Author: ksmyth
Date: Thu Jul 21 14:28:20 2016
New Revision: 2641

Log:
VS Wizard improvements

Modified:
   trunk/SDK/BON/Common/ComponentDll.cpp
   trunk/SDK/BON/Common/ComponentObj.cpp
   trunk/SDK/BON/Wizard/Templates/1033/RawComponent.cpp

Modified: trunk/SDK/BON/Common/ComponentDll.cpp
==============================================================================
--- trunk/SDK/BON/Common/ComponentDll.cpp	Wed Jun 22 17:44:45 2016	(r2640)
+++ trunk/SDK/BON/Common/ComponentDll.cpp	Thu Jul 21 14:28:20 2016	(r2641)
@@ -143,7 +143,9 @@
 	AFX_MANAGE_STATE(AfxGetStaticModuleState());
 
 	if (!CUACUtils::isElevated()) {
+#if _MSC_VER < 1900 // VS 2015 outputs a good error message, which makes this unnecessary
 		AfxMessageBox(_T("Component registration requires elevated rights on Windows Vista or later."), MB_ICONSTOP | MB_OK);
+#endif
 		return SELFREG_E_CLASS;
 	}
 

Modified: trunk/SDK/BON/Common/ComponentObj.cpp
==============================================================================
--- trunk/SDK/BON/Common/ComponentObj.cpp	Wed Jun 22 17:44:45 2016	(r2640)
+++ trunk/SDK/BON/Common/ComponentObj.cpp	Thu Jul 21 14:28:20 2016	(r2641)
@@ -57,7 +57,9 @@
 extern const char* g_COCLASS_PROGIDA = COCLASS_PROGID;
 extern const wchar_t* g_COCLASS_PROGIDW = _OLESTR(COCLASS_PROGID);
 #ifdef UNICODE
-extern const TCHAR* g_COMPONENT_NAME = COMPONENT_NAME;
+// using L"" allows COMPONENT_NAME to be a L"" or "" string in Visual Studio 2015
+// for older versions, define COMPONENT_NAME as L"..."
+extern const TCHAR* g_COMPONENT_NAME = L"" COMPONENT_NAME;
 #else
 extern const char* g_COMPONENT_NAMEA = COMPONENT_NAME;
 extern const wchar_t* g_COMPONENT_NAMEW = _OLESTR(COMPONENT_NAME);

Modified: trunk/SDK/BON/Wizard/Templates/1033/RawComponent.cpp
==============================================================================
--- trunk/SDK/BON/Wizard/Templates/1033/RawComponent.cpp	Wed Jun 22 17:44:45 2016	(r2640)
+++ trunk/SDK/BON/Wizard/Templates/1033/RawComponent.cpp	Thu Jul 21 14:28:20 2016	(r2641)
@@ -10,11 +10,14 @@
 #include <GMECOM.h>
 #include <Console.h>
 #include "ComponentConfig.h"
-#ifndef __INTELLISENSE__
-#import "progid:Mga.MgaMetaFolder" no_implementation auto_search no_namespace no_search_namespace
-#import "progid:Mga.MgaFolders" no_implementation auto_search no_namespace no_search_namespace
-#import "progid:Mga.MgaMetaFolder" implementation_only auto_search no_namespace no_search_namespace
-#import "progid:Mga.MgaFolders" implementation_only auto_search no_namespace no_search_namespace
+#if _MSC_VER >= 1900 || !defined(__INTELLISENSE__)
+// #import Meta, Mga, GME libs
+#import "libid:0adeec71-d83a-11d3-b36b-005004d38590" no_implementation auto_search no_namespace no_search_namespace
+#import "libid:270b4f86-b17c-11d3-9ad1-00aa00b6fe26" no_implementation auto_search no_namespace no_search_namespace
+#import "libid:0adeec71-d83a-11d3-b36b-005004d38590" implementation_only auto_search no_namespace no_search_namespace
+#import "libid:270b4f86-b17c-11d3-9ad1-00aa00b6fe26" implementation_only auto_search no_namespace no_search_namespace
+// #import "libid:0ADEEC71-D83A-11D3-B36B-005004CC8592" no_implementation auto_search no_namespace no_search_namespace
+// #import "libid:0ADEEC71-D83A-11D3-B36B-005004CC8592" implementation_only auto_search no_namespace no_search_namespace
 #else
 // IntelliSense has a known issue with the above lines.
 //  http://connect.microsoft.com/VisualStudio/feedback/details/533526/vc-2010-intellisense-import-directive-using-libid-does-not-work