Merge pull request #36 from unknownv2/develop

refactor: Remove WaitForDebuger flag option from CLR initialization
unknownv2 · Nov 6, 2018 · ca85d91 · ca85d91
2 parents f1853d7 + e4bc8e9
commit ca85d91
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 25 deletions.
diff --git a/src/corerundll.cpp b/src/corerundll.cpp
@@ -446,7 +446,6 @@ PrintModules (
     }
 
     // Release the handle to the process.
-
     CloseHandle(hProcess);
 
     return 0;
@@ -623,7 +622,6 @@ BOOLEAN
 StartHost(
     IN CONST WCHAR   *dllPath,
     IN       Logger  &log,
-    IN CONST BOOLEAN waitForDebugger,
     _Inout_  HRESULT &exitCode,
     IN CONST WCHAR   *coreRoot,
     IN CONST WCHAR   *coreLibraries
@@ -634,23 +632,6 @@ StartHost(
         return false;
     }
 
-    if (waitForDebugger)
-    {
-        if (!IsDebuggerPresent())
-        {
-            log << W("Waiting for the debugger to attach. Press any key to continue ...") << Logger::endl;
-            getchar();
-            if (IsDebuggerPresent())
-            {
-                log << "Debugger is attached." << Logger::endl;
-            }
-            else
-            {
-                log << "Debugger failed to attach." << Logger::endl;
-            }
-        }
-    }
-
     // Assume failure
     exitCode = E_FAIL;
 
@@ -917,7 +898,6 @@ HRESULT
 StartCoreCLRInternal (
     IN CONST WCHAR   *dllPath,
     IN CONST BOOLEAN verbose,
-    IN CONST BOOLEAN waitForDebugger,
     IN CONST WCHAR   *coreRoot,
     IN CONST WCHAR   *coreLibraries
     )
@@ -936,7 +916,6 @@ StartCoreCLRInternal (
         StartHost(
             dllPath,
             *log,
-            waitForDebugger,
             exitCode, 
             coreRoot,
             coreLibraries);
@@ -956,7 +935,6 @@ StartCoreCLR(
         return StartCoreCLRInternal(
             args->BinaryFilePath,
             args->Verbose,
-            args->WaitForDebugger,
             args->CoreRootPath,
             args->CoreLibrariesPath);
     }

diff --git a/src/corerundll.h b/src/corerundll.h
@@ -21,8 +21,7 @@
 struct BinaryLoaderArgs
 {
     BOOLEAN    Verbose;
-    BOOLEAN    WaitForDebugger;
-    BOOLEAN    Reserved[6];
+    BOOLEAN    Reserved[7];
     WCHAR      BinaryFilePath[MAX_PATH];
     WCHAR      CoreRootPath[MAX_PATH];
     WCHAR      CoreLibrariesPath[MAX_PATH];

diff --git a/tests/assembly-test.cpp b/tests/assembly-test.cpp
@@ -23,7 +23,6 @@ TEST(TestCoreCLRHost, TestDotNetAssemblyExecution) {
     BinaryLoaderArgs binaryLoaderArgs = { 0 };
     AssemblyFunctionCall assemblyFunctionCall = { 0 };
     binaryLoaderArgs.Verbose = true;
-    binaryLoaderArgs.WaitForDebugger = false;
     wcscpy_s(binaryLoaderArgs.BinaryFilePath, MAX_PATH, dotnetAssemblyName);
 
     WCHAR coreCLRInstallPath[MAX_PATH];