Merge Windows transaction guard cleanup

Author: JohnHeikens

scripts/test.sh

@@ -346,7 +346,11 @@ for test_dir in "$TESTS_DIR"/*/; do
         has_expected_diagnostics=true
     fi
 
-    # Compile within the cross-platform ten-second regression budget.
+    # Native Windows compiler processes have higher startup and I/O overhead.
+    compile_timeout=10
+    if [[ "$is_windows" == "true" ]]; then
+        compile_timeout=20
+    fi
     rm -f "$output_binary"
     if [[ -f "$stack_limit_file" && "$is_windows" != "true" ]]; then
         stack_limit_kb=$(<"$stack_limit_file")
@@ -357,9 +361,9 @@ for test_dir in "$TESTS_DIR"/*/; do
             failures+=("$test_name")
             continue
         fi
-        compile_output=$( (ulimit -s "$stack_limit_kb"; run_with_timeout 10 "$COMPILER" "$source_file" -o "$output_binary") 2>&1)
+        compile_output=$( (ulimit -s "$stack_limit_kb"; run_with_timeout "$compile_timeout" "$COMPILER" "$source_file" -o "$output_binary") 2>&1)
     else
-        compile_output=$(run_with_timeout 10 "$COMPILER" "$source_file" -o "$output_binary" 2>&1)
+        compile_output=$(run_with_timeout "$compile_timeout" "$COMPILER" "$source_file" -o "$output_binary" 2>&1)
     fi
     compile_exit=$?
     if [[ $compile_exit -eq 124 ]]; then

src/runtime/filesystemTransactionWindows.c

@@ -326,11 +326,16 @@ static int split_target(
 	return -1;
 }
 
+static void release_parent_guard(DynlexWindowsStaging *staging) {
+	if (staging->parent != INVALID_HANDLE_VALUE)
+		CloseHandle(staging->parent);
+	staging->parent = INVALID_HANDLE_VALUE;
+}
+
 static void destroy_staging(DynlexWindowsStaging *staging) {
 	if (staging->staging != INVALID_HANDLE_VALUE)
 		CloseHandle(staging->staging);
-	if (staging->parent != INVALID_HANDLE_VALUE)
-		CloseHandle(staging->parent);
+	release_parent_guard(staging);
 	free(staging->parent_path);
 	free(staging->destination_name);
 	free(staging->destination_path);
@@ -485,6 +490,7 @@ static int delete_stage(DynlexWindowsStaging *staging, int32_t failure_operation
 	CloseHandle(staging->staging);
 	staging->staging = INVALID_HANDLE_VALUE;
 	staging->stage_name_present = false;
+	release_parent_guard(staging);
 	return 0;
 }
 
@@ -751,6 +757,7 @@ int dynlex_filesystem_staging_commit(
 		staging->state = DYNLEX_FILESYSTEM_STAGING_CLEANUP_FAILED;
 		return -1;
 	}
+	release_parent_guard(staging);
 	*cleanup_succeeded = 1;
 	staging->state = DYNLEX_FILESYSTEM_STAGING_COMMITTED;
 	return 0;