Clean up some code in ANCM (#49718)

Misc code cleanup in ANCM.

Author: adityamandaleeka

src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/globalmodule.cpp

@@ -63,7 +63,7 @@ ASPNET_CORE_GLOBAL_MODULE::OnGlobalConfigurationChange(
         // We need this duplicate setting because the global module is unable to read the app settings disallowRotationOnConfigChange value.
         if (m_pApplicationManager && m_pApplicationManager->ShouldRecycleOnConfigChange())
         {
-            m_pApplicationManager->RecycleApplicationFromManager(pwszChangePath);   
+            m_pApplicationManager->RecycleApplicationFromManager(pwszChangePath);
         }
     }
 

src/Servers/IIS/AspNetCoreModuleV2/CommonLib/HandleWrapper.h

@@ -20,13 +20,6 @@ struct NullHandleTraits
     static void Close(HANDLE handle) noexcept { CloseHandle(handle); }
 };
 
-struct FindFileHandleTraits
-{
-    using HandleType = HANDLE;
-    static constexpr HANDLE DefaultHandle = nullptr;
-    static void Close(HANDLE handle) noexcept { FindClose(handle); }
-};
-
 struct ModuleHandleTraits
 {
     using HandleType = HMODULE;

src/Servers/IIS/AspNetCoreModuleV2/CommonLib/debugutil.cpp

@@ -357,21 +357,18 @@ DebugPrintW(
 
         OutputDebugString( strOutput.QueryStr() );
 
-        if (IsEnabled(ASPNETCORE_DEBUG_FLAG_CONSOLE) || g_logFile != INVALID_HANDLE_VALUE)
+        if (IsEnabled(ASPNETCORE_DEBUG_FLAG_CONSOLE))
         {
-            if (IsEnabled(ASPNETCORE_DEBUG_FLAG_CONSOLE))
-            {
-                WriteFileEncoded(GetConsoleOutputCP(), g_stdOutHandle, strOutput.QueryStr());
-            }
+            WriteFileEncoded(GetConsoleOutputCP(), g_stdOutHandle, strOutput.QueryStr());
+        }
 
-            if (g_logFile != INVALID_HANDLE_VALUE)
-            {
-                SRWExclusiveLock lock(g_logFileLock);
+        if (g_logFile != INVALID_HANDLE_VALUE)
+        {
+            SRWExclusiveLock lock(g_logFileLock);
 
-                SetFilePointer(g_logFile, 0, nullptr, FILE_END);
-                WriteFileEncoded(CP_UTF8, g_logFile, strOutput.QueryStr());
-                FlushFileBuffers(g_logFile);
-            }
+            SetFilePointer(g_logFile, 0, nullptr, FILE_END);
+            WriteFileEncoded(CP_UTF8, g_logFile, strOutput.QueryStr());
+            FlushFileBuffers(g_logFile);
         }
 
         if (IsEnabled(ASPNETCORE_DEBUG_FLAG_EVENTLOG))

src/Servers/IIS/AspNetCoreModuleV2/CommonLib/file_utility.cpp

@@ -11,30 +11,23 @@
 HRESULT
 FILE_UTILITY::IsPathUnc(
     __in  LPCWSTR       pszPath,
-    __out BOOL *        pfIsUnc
+    __out bool*         pfIsUnc
 )
 {
-    HRESULT hr = S_OK;
-    STRU strTempPath;
-
-    if ( pszPath == NULL || pfIsUnc == NULL )
+    if (pszPath == nullptr || pfIsUnc == nullptr)
     {
-        hr = E_INVALIDARG;
-        goto Finished;
+        return E_INVALIDARG;
     }
 
-    hr = MakePathCanonicalizationProof( (LPWSTR) pszPath, &strTempPath );
-    if ( FAILED(hr) )
+    STRU strTempPath;
+    HRESULT hr = MakePathCanonicalizationProof(pszPath, &strTempPath );
+    if (FAILED(hr))
     {
-        goto Finished;
+        return hr;
     }
 
-    //
-    // MakePathCanonicalizationProof will map \\?\UNC, \\.\UNC and \\ to \\?\UNC
-    //
-    (*pfIsUnc) = ( _wcsnicmp( strTempPath.QueryStr(), L"\\\\?\\UNC\\", 8 /* sizeof \\?\UNC\ */) == 0 );
-
-Finished:
+    // MakePathCanonicalizationProof will map \\?\UNC, \\.\UNC and \\ to \\?\UNC (which is 8 characters)
+    *pfIsUnc = (_wcsnicmp(strTempPath.QueryStr(), L"\\\\?\\UNC\\", 8) == 0);
 
     return hr;
 }
@@ -103,69 +96,57 @@ FILE_UTILITY::ConvertPathToFullPath(
     return hr;
 }
 
+// Ensures that the specified directory path exists, creating it if necessary. If any part of the directory
+// creation fails and the directory does not already exist, it returns an error obtained from GetLastError.
+// If all directories are successfully created or already exist, it returns S_OK.
 HRESULT
-FILE_UTILITY::EnsureDirectoryPathExist(
-    _In_  LPCWSTR pszPath
+FILE_UTILITY::EnsureDirectoryPathExists(
+    _In_ const LPCWSTR pszPath
 )
 {
-    HRESULT hr = S_OK;
-    STRU    struPath;
-    DWORD   dwPosition = 0;
-    BOOL    fDone = FALSE;
-    BOOL    fUnc = FALSE;
-
+    STRU struPath;
     struPath.Copy(pszPath);
-    hr = IsPathUnc(pszPath, &fUnc);
+
+    bool isUnc = false;
+    HRESULT hr = IsPathUnc(pszPath, &isUnc);
     if (FAILED(hr))
     {
-        goto Finished;
-    }
-    if (fUnc)
-    {
-        // "\\?\UNC\"
-        dwPosition = 8;
+        return hr;
     }
-    else if (struPath.IndexOf(L'?', 0) != -1)
-    {
-        // sceanrio "\\?\"
-        dwPosition = 4;
-    }
-    while (!fDone)
+
+    // Initialize position based on the type of the path.
+    DWORD position = isUnc ? 8 // Skip "\\?\UNC\"
+                   : (struPath.IndexOf(L'?', 0) != -1) ? 4 // Skip "\\?\"
+                   : 0; // Skip nothing
+
+    // Traverse the path string, creating directories as we go.
+    while (true)
     {
-        dwPosition = struPath.IndexOf(L'\\', dwPosition + 1);
-        if (dwPosition == -1)
-        {
-            // not found '/'
-            fDone = TRUE;
-            goto Finished;
-        }
-        else if (dwPosition ==0)
+        position = struPath.IndexOf(L'\\', position + 1);
+        if (position == -1)
         {
-            hr = ERROR_INTERNAL_ERROR;
-            goto Finished;
+            // Didn't find a path separator, so we're done.
+            return S_OK;
         }
-        else if (struPath.QueryStr()[dwPosition-1] == L':')
+
+        // position is >= 1 here since we started searching at position + 1
+        if (struPath.QueryStr()[position - 1] == L':')
         {
-            //  skip volume case
+            // Skip the volume case
             continue;
         }
-        else
-        {
-            struPath.QueryStr()[dwPosition] = L'\0';
-        }
 
-        if (!CreateDirectory(struPath.QueryStr(), NULL) &&
-            ERROR_ALREADY_EXISTS != GetLastError())
+        // Temporarily terminate the string at the current path separator
+        struPath.QueryStr()[position] = L'\0';
+        if (!CreateDirectory(struPath.QueryStr(), nullptr) && GetLastError() != ERROR_ALREADY_EXISTS)
         {
-            hr = HRESULT_FROM_WIN32(GetLastError());
-            fDone = TRUE;
-            goto Finished;
+            // Unable to create directory and it doesn't already exist
+            return HRESULT_FROM_WIN32(GetLastError());
         }
-        struPath.QueryStr()[dwPosition] = L'\\';
-    }
 
-Finished:
-    return hr;
+        // Restore the path separator
+        struPath.QueryStr()[position] = L'\\';
+    }
 }
 
 std::string FILE_UTILITY::GetHtml(HMODULE module, int page, USHORT statusCode, USHORT subStatusCode, const std::string& specificReasonPhrase, const std::string& solution)

src/Servers/IIS/AspNetCoreModuleV2/CommonLib/file_utility.h

@@ -22,7 +22,7 @@ class FILE_UTILITY
 
     static
     HRESULT
-    EnsureDirectoryPathExist(
+    EnsureDirectoryPathExists(
         _In_  LPCWSTR pszPath
     );
 
@@ -40,7 +40,7 @@ class FILE_UTILITY
     HRESULT
     IsPathUnc(
         __in  LPCWSTR       pszPath,
-        __out BOOL *        pfIsUnc
+        __out bool *        pfIsUnc
     );
 };
 

src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/serverprocess.cpp

@@ -1086,7 +1086,7 @@ SERVER_PROCESS::SetupStdHandles(
         goto Finished;
     }
 
-    hr = FILE_UTILITY::EnsureDirectoryPathExist(struPath.QueryStr());
+    hr = FILE_UTILITY::EnsureDirectoryPathExists(struPath.QueryStr());
     if (FAILED_LOG(hr))
     {
         goto Finished;