- check and report invalid non-empty DMD/LDC installation folders

- mago: fix conditional breakpoints "not supported"

Author: rainers

CHANGES

@@ -1121,7 +1121,8 @@ unreleased Version 0.50.0
   * VS 16.1 Preview 2: ignore tracked files in *.delete.*.tlog as dependencies, too
   * now another installer available that includes DMD and LDC
   * installer no longer asks for DMD path when updating existing installation
-  * check for updates for Visual D, DMD and LDC, assisted download and install 
+  * check for updates for Visual D, DMD and LDC, assisted download and install
+  * check and report invalid non-empty DMD/LDC installation folders
   * experimental highlight references to the same symbol as the one at the caret
   * VC project:
     - new projects now determine Windows SDK automatically
@@ -1131,7 +1132,7 @@ unreleased Version 0.50.0
     - "New item" now also allows adding D module
     - new option for -extern-std=c++xx
   * visualdproj:
-    - Error List: classify warnings and deprecations according to the repective options
+    - Error List: classify warnings and deprecations according to the respective options
   * bugzilla 19930: visualdproj: fix building projects with "&|<>" in directory names
   * dparser:
     - add semantic coloring for module and package names
@@ -1143,3 +1144,4 @@ unreleased Version 0.50.0
     - demangle D symbol names
     - regression: use of registers in expression was lost at some point
     - show class and message for exceptions that the debugger breaks on
+    - fix conditional breakpoints "not supported"

visuald/dpackage.d

@@ -285,6 +285,7 @@ class Package : DisposingComObject,
 		mLangsvc = addref(newCom!LanguageService(this));
 		mProjFactory = addref(newCom!ProjectFactory(this));
 		mLibInfos = new LibraryInfos();
+		mCheckMessages = new UpdateMessages();
 	}
 
 	~this()
@@ -675,7 +676,7 @@ version(none)
 		}
 		if(nCmdID == CmdShowLangPage)
 		{
-			openSettingsPage("002A2DE9-8BB6-484D-9823-7E4AD4084715");
+			openSettingsPage(g_IntellisensePropertyPage);
 			return S_OK;
 		}
 		if(nCmdID == CmdShowWebsite)
@@ -699,6 +700,48 @@ version(none)
 	{
 		auto opts = GetGlobalOptions();
 
+		enum Result { kNotSet, kBinaryExists, kBinaryMissing }
+		Result checkInstalledBinary(CheckProduct prod)
+		{
+			string exe;
+			switch(prod)
+			{
+				case CheckProduct.DMD:
+					exe = opts.DMD.getCompilerPath(opts.DMD.InstallDir);
+					break;
+				case CheckProduct.GDC:
+					exe = opts.GDC.getCompilerPath(opts.GDC.InstallDir);
+					break;
+				case CheckProduct.LDC:
+					exe = opts.LDC.getCompilerPath(opts.LDC.InstallDir);
+					break;
+				default:
+					return Result.kNotSet;
+			}
+			if (exe.empty)
+				return Result.kNotSet;
+			if (std.file.exists(exe))
+				return Result.kBinaryExists;
+			return Result.kBinaryMissing;
+		}
+
+		void showMissingBinaryInfo(CheckProduct prod)
+		{
+			switch(prod)
+			{
+				case CheckProduct.DMD:
+					mCheckMessages.addMessage("Visual D: DMD installation directory invalid", "Goto DMD Setup Page",
+											  (int) { openSettingsPage(g_DmdDirPropertyPage); return true; });
+					break;
+				case CheckProduct.LDC:
+					mCheckMessages.addMessage("Visual D: LDC installation directory invalid", "Goto LDC Setup Page",
+											  (int) { openSettingsPage(g_LdcDirPropertyPage); return true; });
+					break;
+				default:
+					break;
+			}
+		}
+
 		string getInstalledVersion(CheckProduct prod)
 		{
 			switch(prod)
@@ -716,17 +759,31 @@ version(none)
 
 		string checkProduct(CheckProduct prod, ubyte freq)
 		{
+			if (prod != CheckProduct.VisualD)
+			{
+				auto res = checkInstalledBinary(prod);
+				if (res == Result.kNotSet)
+					return null;
+
+				if (res == Result.kBinaryMissing)
+				{
+					showMissingBinaryInfo(prod);
+					return null;
+				}
+			}
+
 			CheckFrequency frequency = cast(CheckFrequency)freq;
-			if (frequency != CheckFrequency.Never)
-				if (auto info = checkForUpdate(prod, toDuration(frequency), frequency))
-					if (info.updated)
-					{
-						string ver = getInstalledVersion(prod);
-						if (extractVersion(ver) >= extractVersion(info.name))
-							return null;
-						return info.name;
-					}
-			return null;
+			if (frequency == CheckFrequency.Never)
+				return null;
+
+			auto info = checkForUpdate(prod, toDuration(frequency), frequency);
+			if (!info || !info.updated)
+				return null;
+
+			string ver = getInstalledVersion(prod);
+			if (extractVersion(ver) >= extractVersion(info.name))
+				return null;
+			return info.name;
 		}
 
 		string[3] msgs;
@@ -745,30 +802,27 @@ version(none)
 				cnt++;
 			}
 
-		if (cnt == 1)
-			mUpdateCheckMessage = "New update available: " ~ message;
+		if (cnt > 1)
+			message = "Visual D: New update available: " ~ message;
 		else if (cnt > 1)
-			mUpdateCheckMessage = "New updates available: " ~ message;
-		else
-			mUpdateCheckMessage = null;
+			message = "Visual D: New updates available: " ~ message;
+
+		if (message)
+			mCheckMessages.addMessage(message, "Goto Update Page",
+									  (int) { openSettingsPage(g_UpdatePropertyPage); return true; });
 	}
 
 	void idleCheckUpdates()
 	{
-		if (!mHasMadeUpdateCheck &&
-		    (GetGlobalOptions().checkUpdatesVisualD != CheckFrequency.Never || 
-		     GetGlobalOptions().checkUpdatesDMD != CheckFrequency.Never || 
-		     GetGlobalOptions().checkUpdatesLDC != CheckFrequency.Never))
+		if (!mHasMadeUpdateCheck)
 		{
 			import core.thread;
 			mHasMadeUpdateCheck = true;
 			new Thread(&checkUpdates).start();
 		}
-		else if (mUpdateCheckMessage)
+		else if (mCheckMessages.hasMessages())
 		{
-			showInfoBar(mUpdateCheckMessage, "Goto Update Page",
-						(int) { openSettingsPage("002A2DE9-8BB6-484D-9829-7E4AD4084715"); return true; });
-			mUpdateCheckMessage = null;
+			mCheckMessages.showMessages();
 		}
 
 		if (mSaveOptionsInIdle)
@@ -1295,9 +1349,42 @@ private:
 	Library          mLibrary;
 	bool             mWantsUpdateLibInfos;
 
+	bool             mHasMadePatchCheck;
 	bool             mHasMadeUpdateCheck;
 	bool             mSaveOptionsInIdle;
-	string           mUpdateCheckMessage;
+	UpdateMessages   mCheckMessages;
+}
+
+class UpdateMessages
+{
+	static struct UpdateMessage
+	{
+		string message;
+		string action;
+		bool delegate(int) callback;
+	}
+
+	UpdateMessage[] messages;
+
+	void addMessage(string msg, string action, bool delegate(int) callback)
+	{
+		synchronized(this)
+			messages ~= UpdateMessage(msg, action, callback);
+	}
+	bool hasMessages() const
+	{
+		return messages.length > 0;
+	}
+
+	void showMessages()
+	{
+		synchronized(this)
+		{
+			foreach(m; messages)
+				showInfoBar(m.message, m.action, m.callback);
+			messages = null;
+		}
+	}
 }
 
 struct CompilerDirectories
@@ -1346,6 +1433,8 @@ struct CompilerDirectories
 	}
 	string getCompilerPath(string instdir)
 	{
+		if (instdir.empty)
+			return null;
 		string exe;
 		if (compiler == Compiler.DMD)
 		{

visuald/pkgutil.d

@@ -88,12 +88,15 @@ IVsOutputWindowPane getBuildOutputPane()
 	return pane;
 }
 
-void openSettingsPage(string pageGuid)
+void openSettingsPage(in GUID clsid)
 {
 	auto pIVsUIShell = ComPtr!(IVsUIShell)(queryService!(IVsUIShell), false);
+	if (!pIVsUIShell)
+		return;
+	wstring pageGuid = GUID2wstring(clsid);
 	VARIANT var;
 	var.vt = VT_BSTR;
-	var.bstrVal = allocBSTR(pageGuid);
+	var.bstrVal = allocwBSTR(pageGuid);
 	pIVsUIShell.PostExecCommand(&CMDSETID_StandardCommandSet97, cmdidToolsOptions, OLECMDEXECOPT_DODEFAULT, &var);
 	freeBSTR(var.bstrVal);
 }

visuald/register.d

@@ -821,10 +821,18 @@ HRESULT registerMago(in wchar* pszRegRoot, in bool useRanu)
 	wstring languageGuid = GUID2wstring(g_languageCLSID);
 	wstring vendorGuid = GUID2wstring(g_vendorCLSID);
 
-	scope RegKey keyEE = new RegKey(keyRoot, registrationRoot ~ "\\AD7Metrics\\ExpressionEvaluator\\"w ~ languageGuid ~ "\\"w ~ vendorGuid);
+	wstring eeKeyStr = registrationRoot ~ "\\AD7Metrics\\ExpressionEvaluator\\"w ~ languageGuid ~ "\\"w ~ vendorGuid;
+	scope RegKey keyEE = new RegKey(keyRoot, eeKeyStr);
 	keyEE.Set("Language"w, "D"w);
 	keyEE.Set("Name"w, "D"w);
 
+	// needed to avoid "D does not support conditional breakpoints", see
+	// https://github.com/Microsoft/ConcordExtensibilitySamples/issues/18
+	scope RegKey keyEEEngine = new RegKey(keyRoot, eeKeyStr ~ "\\Engine"w);
+	keyEE.Set("0"w, "{449EC4CC-30D2-4032-9256-EE18EB41B62B}"w); // COMPlusOnlyEng
+	keyEE.Set("1"w, "{92EF0900-2251-11D2-B72E-0000F87572EF}"w); // COMPlusNativeEng
+	keyEE.Set("2"w, "{3B476D35-A401-11D2-AAD4-00C04F990171}"w); // NativeOnlyEng
+
 	scope RegKey keyCV = new RegKey(keyRoot, registrationRoot ~ "\\Debugger\\CodeView Compilers\\68:*"w);
 	keyEE.Set("LanguageID"w, languageGuid);
 	keyEE.Set("VendorID"w, vendorGuid);

visuald/updates.d

@@ -47,6 +47,7 @@ enum CheckProduct
 	VisualD,
 	DMD,
 	LDC,
+	GDC,
 }
 
 struct UpdateInfo
@@ -410,9 +411,11 @@ VersionInfo extractVersion(string verstr)
 	try
 	{
 		__gshared static Regex!char re;
-		if(re.empty)
-			re = regex(`([0-9]+)\.([0-9]+)(\.([0-9]+))?([-\.]?([abr])?[a-z]*[-\.]?([0-9]*))?`);
-
+		synchronized
+		{
+			if (re.empty)
+				re = regex(`([0-9]+)\.([0-9]+)(\.([0-9]+))?([-\.]?([abr])?[a-z]*[-\.]?([0-9]*))?`);
+		}
 		auto rematch = match(verstr, re);
 		if (!rematch.empty)
 		{