fix #78 (#79)

Author: josef-poetzl

access-add-in/AccUnitLoader.accda

@@ -18,7 +18,7 @@ Option Compare Text
 Option Explicit
 
 'Version number
-Private Const APPLICATION_VERSION As String = "0.9.1002.241126"
+Private Const APPLICATION_VERSION As String = "0.9.1004.250112"
 
 Private Const APPLICATION_NAME As String = "ACLib AccUnit Loader"
 Private Const APPLICATION_FULLNAME As String = "Access Code Library - AccUnit Loader"

access-add-in/source/modules/_config_Application.bas

@@ -10,7 +10,7 @@ public class VbeAdapter : IDisposable
     {
         private OfficeApplicationHelper _officeApplicationHelper;
 
-        public event EventHandler MainWindowRButtonDown;
+        //public event EventHandler MainWindowRButtonDown;
 
         public OfficeApplicationHelper OfficeApplicationHelper
         {
@@ -20,8 +20,8 @@ public OfficeApplicationHelper OfficeApplicationHelper
                 using (new BlockLogger())
                 {
                     _officeApplicationHelper = value;
-                    HotKeys = new HotKeys((IntPtr)VBE.MainWindow.HWnd);
-                    SubclassVbeMainWindow();
+                    //HotKeys = new HotKeys((IntPtr)VBE.MainWindow.HWnd);
+                    //SubclassVbeMainWindow();
                 }
             }
         }
@@ -38,7 +38,7 @@ public _CodePane ActiveCodePane
         }
 
         #region subclassing
-
+        /*
         private void SubclassVbeMainWindow()
         {
             using (new BlockLogger())
@@ -122,7 +122,7 @@ private void CheckHotKeys(int wParam)
                 return;
             }
         }
-
+        */
         #endregion
 
         #region IDisposable Support

source/Common/Common.VBIDETools/VbeAdapter.cs

@@ -31,5 +31,5 @@
 // Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden,
 // indem Sie "*" wie unten gezeigt eingeben:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.9.3.0")]
-[assembly: AssemblyFileVersion("0.9.3.0")]
+[assembly: AssemblyVersion("0.9.4.0")]
+[assembly: AssemblyFileVersion("0.9.4.0")]

vbe-add-In/AccUnit.VbeAddIn/Properties/AssemblyInfo.cs

@@ -291,7 +291,7 @@ public void SubscribeToCommandBarAdapter(VbeCommandBarAdapter commandBarAdapter)
                     AddRunButtonsToAccUnitCommandBar(accUnitCommandbarAdapter);
                 }
 
-                VbeIntegrationManager.VbeAdapter.MainWindowRButtonDown += OnVbeMainWindowRButtonDown;
+                //VbeIntegrationManager.VbeAdapter.MainWindowRButtonDown += OnVbeMainWindowRButtonDown;
 
                 RegisterHotKeys();
             }
@@ -448,12 +448,15 @@ private void ApplyMaskedPicture(CommandBarButton button, Bitmap image, Bitmap ma
 
         private void RegisterHotKeys()
         {
+            //bug: 64 bit subclass => https://github.com/AccessCodeLib/AccUnit/issues/78 
+            /*
             var hotkeys = VbeIntegrationManager.VbeAdapter.HotKeys;
             var hotKey = hotkeys.RegisterHotKey(HotKey.ModKeys.Control | HotKey.ModKeys.Shift, (uint)Keys.T);
             hotKey.Pressed += RunCurrentTestsHotKeyPressed;
 
             hotKey = hotkeys.RegisterHotKey(HotKey.ModKeys.Control | HotKey.ModKeys.Shift, (uint)Keys.A);
             hotKey.Pressed += RunAllTestsHotKeyPressed;
+            */
         }
 
         private void RunCurrentTestsHotKeyPressed(object sender, HotKeyEventArgs e)
@@ -507,6 +510,7 @@ protected virtual void Dispose(bool disposing)
 
                 if (VbeIntegrationManager != null)
                 {
+                    /* issue #78 (sublass vbe main windows)
                     try
                     {
                         VbeIntegrationManager.VbeAdapter.MainWindowRButtonDown -= OnVbeMainWindowRButtonDown;
@@ -519,6 +523,8 @@ protected virtual void Dispose(bool disposing)
                     {
                         VbeIntegrationManager = null;
                     }
+                    */
+                    VbeIntegrationManager = null;
                 }
 
                 TestSuiteManager = null;