Always initialize variables

and adds more logging, to help debug issues with the context menu.

Close #51

Author: GurliGebis

ClassicEditWithNppExplorerCommandHandler.cpp

@@ -24,8 +24,8 @@ const EXPCMDSTATE ClassicEditWithNppExplorerCommandHandler::State(IShellItemArra
     UNREFERENCED_PARAMETER(psiItemArray);
 
     // First we get the current state, before we clear it.
-    CounterState currentState = state->GetState();
-    state->SetState(NotSet);
+    CounterState currentState = state->GetState(L"ClassicEditWithNppExplorerCommandHandler");
+    state->SetState(L"ClassicEditWithNppExplorerCommandHandler", NotSet);
 
     g_loggingHelper.LogMessage(L"ClassicEditWithNppExplorerCommandHandler::State", L"Current state: " + std::to_wstring(currentState));
 

ModernEditWithNppExplorerCommandHandler.cpp

@@ -23,9 +23,9 @@ const EXPCMDSTATE ModernEditWithNppExplorerCommandHandler::State(IShellItemArray
 {
     UNREFERENCED_PARAMETER(psiItemArray);
 
-    state->SetState(Set);
+    state->SetState(L"ModernEditWithNppExplorerCommandHandler", Set);
 
-    g_loggingHelper.LogMessage(L"ModernEditWithNppExplorerCommandHandler::State", L"Current state: " + std::to_wstring(state->GetState()));
+    g_loggingHelper.LogMessage(L"ModernEditWithNppExplorerCommandHandler::State", L"Current state: " + std::to_wstring(state->GetState(L"ModernEditWithNppExplorerCommandHandler")));
 
     return ECS_ENABLED;
 }

SharedState.cpp

@@ -46,15 +46,20 @@ SharedState::~SharedState()
     CloseHandle(hFileMapping);
 }
 
-CounterState SharedState::GetState() const
+CounterState SharedState::GetState(const wstring caller) const
 {
-    return *pState;
+    WaitForSingleObject(hMutex, INFINITE);
+    CounterState value = *pState;
+    g_loggingHelper.LogMessage(L"SharedState::GetState", L"Get shared state by caller: " + caller);
+    ReleaseMutex(hMutex);
+
+    return value;
 }
 
-void SharedState::SetState(CounterState state)
+void SharedState::SetState(const wstring caller, const CounterState state)
 {
     WaitForSingleObject(hMutex, INFINITE);
     *pState = state;
-    g_loggingHelper.LogMessage(L"SharedState::SetState", L"Set shared state to: " + to_wstring(state));
+    g_loggingHelper.LogMessage(L"SharedState::SetState", L"Set shared state to: " + to_wstring(state) + L" by caller: " + caller);
     ReleaseMutex(hMutex);
 }

SharedState.h

@@ -14,12 +14,12 @@ namespace NppShell::Helpers
         SharedState();
         ~SharedState();
 
-        CounterState GetState() const;
-        void SetState(CounterState state);
+        CounterState GetState(const wstring caller) const;
+        void SetState(const wstring caller, const CounterState state);
 
     private:
-        HANDLE hFileMapping;
-        HANDLE hMutex;
-        CounterState* pState;
+        HANDLE hFileMapping = 0;
+        HANDLE hMutex = 0;
+        CounterState* pState = 0;
     };
 }