fix

youknowone · youknowone · commit 6fd5ee77c8ce · 2026-02-22T17:26:19.000+09:00
diff --git a/crates/vm/src/stdlib/_winapi.rs b/crates/vm/src/stdlib/_winapi.rs
@@ -1160,7 +1160,7 @@ mod _winapi {
         initial_state: bool,
         name: Option<PyStrRef>,
         vm: &VirtualMachine,
-    ) -> PyResult<Option<WinHandle>> {
+    ) -> PyResult<WinHandle> {
         use windows_sys::Win32::System::Threading::CreateEventW as WinCreateEventW;
 
         let _ = security_attributes; // Ignored, always NULL
@@ -1181,7 +1181,7 @@ mod _winapi {
             return Err(vm.new_last_os_error());
         }
 
-        Ok(Some(WinHandle(handle)))
+        Ok(WinHandle(handle))
     }
 
     /// SetEvent - Set the specified event object to the signaled state.
@@ -1961,6 +1961,7 @@ mod _winapi {
         if err != 0 {
             return Err(vm.new_os_error(err as i32));
         }
+        scopeguard::defer! { unsafe { RegCloseKey(hkcr) }; }
 
         let mut i: u32 = 0;
         let mut entries: Vec<(String, String)> = Vec::new();
@@ -2007,7 +2008,6 @@ mod _winapi {
                 continue;
             }
             if err != 0 {
-                unsafe { RegCloseKey(hkcr) };
                 return Err(vm.new_os_error(err as i32));
             }
 
@@ -2051,8 +2051,6 @@ mod _winapi {
             }
         }
 
-        unsafe { RegCloseKey(hkcr) };
-
         // Process remaining entries
         for (mime_type, ext) in entries {
             on_type_read.call((vm.ctx.new_str(mime_type), vm.ctx.new_str(ext)), vm)?;
diff --git a/src/settings.rs b/src/settings.rs
@@ -260,10 +260,13 @@ pub fn parse_opts() -> Result<(Settings, RunMode), lexopt::Error> {
 
     settings.check_hash_pycs_mode = args.check_hash_based_pycs;
 
-    if let Some(val) = get_env("PYTHONUTF8") {
-        settings.utf8_mode = match val.to_str() {
-            Some("1") | Some("") => 1,
-            Some("0") => 0,
+    if let Some(val) = get_env("PYTHONUTF8")
+        && let Some(val_str) = val.to_str()
+        && !val_str.is_empty()
+    {
+        settings.utf8_mode = match val_str {
+            "1" => 1,
+            "0" => 0,
             _ => {
                 error!(
                     "Fatal Python error: config_init_utf8_mode: \

Original file line number	Diff line number	Diff line change
`@@ -1160,7 +1160,7 @@ mod _winapi {`
`1160`	`1160`	`initial_state: bool,`
`1161`	`1161`	`name: Option<PyStrRef>,`
`1162`	`1162`	`vm: &VirtualMachine,`
`1163`		`- ) -> PyResult<Option<WinHandle>> {`
	`1163`	`+ ) -> PyResult<WinHandle> {`
`1164`	`1164`	`use windows_sys::Win32::System::Threading::CreateEventW as WinCreateEventW;`
`1165`	`1165`
`1166`	`1166`	`let _ = security_attributes; // Ignored, always NULL`
`@@ -1181,7 +1181,7 @@ mod _winapi {`
`1181`	`1181`	`return Err(vm.new_last_os_error());`
`1182`	`1182`	`}`
`1183`	`1183`
`1184`		`- Ok(Some(WinHandle(handle)))`
	`1184`	`+ Ok(WinHandle(handle))`
`1185`	`1185`	`}`
`1186`	`1186`
`1187`	`1187`	`/// SetEvent - Set the specified event object to the signaled state.`
`@@ -1961,6 +1961,7 @@ mod _winapi {`
`1961`	`1961`	`if err != 0 {`
`1962`	`1962`	`return Err(vm.new_os_error(err as i32));`
`1963`	`1963`	`}`
	`1964`	`+ scopeguard::defer! { unsafe { RegCloseKey(hkcr) }; }`
`1964`	`1965`
`1965`	`1966`	`let mut i: u32 = 0;`
`1966`	`1967`	`let mut entries: Vec<(String, String)> = Vec::new();`
`@@ -2007,7 +2008,6 @@ mod _winapi {`
`2007`	`2008`	`continue;`
`2008`	`2009`	`}`
`2009`	`2010`	`if err != 0 {`
`2010`		`- unsafe { RegCloseKey(hkcr) };`
`2011`	`2011`	`return Err(vm.new_os_error(err as i32));`
`2012`	`2012`	`}`
`2013`	`2013`
`@@ -2051,8 +2051,6 @@ mod _winapi {`
`2051`	`2051`	`}`
`2052`	`2052`	`}`
`2053`	`2053`
`2054`		`- unsafe { RegCloseKey(hkcr) };`
`2055`		`-`
`2056`	`2054`	`// Process remaining entries`
`2057`	`2055`	`for (mime_type, ext) in entries {`
`2058`	`2056`	`on_type_read.call((vm.ctx.new_str(mime_type), vm.ctx.new_str(ext)), vm)?;`