Respond to review

Author: CraftSpider

src/shims/sig.rs

@@ -19,6 +19,9 @@ pub struct ShimSig<'tcx, const ARGS: usize> {
 /// ```rust,ignore
 /// shim_sig!(extern "C" fn (*const T, i32) -> usize)
 /// ```
+///
+/// In type position, `winapi::` can be used as a shorthand for the full path used by
+/// `windows_ty_layout`.
 #[macro_export]
 macro_rules! shim_sig {
     (extern $abi:literal fn($($arg:ty),* $(,)?) -> $ret:ty) => {

src/shims/windows/foreign_items.rs

@@ -137,21 +137,10 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
     ) -> InterpResult<'tcx, EmulateItemResult> {
         let this = self.eval_context_mut();
 
-        // According to
-        // https://github.com/rust-lang/rust/blob/fb00adbdb69266f10df95a4527b767b0ad35ea48/compiler/rustc_target/src/spec/mod.rs#L2766-L2768,
-        // x86-32 Windows uses a different calling convention than other Windows targets
-        // for the "system" ABI.
-        // TODO: Use this in shim-sig instead of 'system'? Or is that good enough for ExternAbi?
-        // let sys_conv = if this.tcx.sess.target.arch == Arch::X86 {
-        //     CanonAbi::X86(X86Call::Stdcall)
-        // } else {
-        //     CanonAbi::C
-        // };
-
         // See `fn emulate_foreign_item_inner` in `shims/foreign_items.rs` for the general pattern.
 
         // Windows API stubs.
-        // HANDLE = isize
+        // HANDLE = *mut c_void (formerly: isize)
         // NTSTATUS = LONG = i32
         // DWORD = ULONG = u32
         // BOOL = i32

tests/pass-dep/getrandom.rs

@@ -12,7 +12,7 @@ fn main() {
     #[cfg(not(target_os = "solaris"))]
     getrandom_01::getrandom(&mut data).unwrap();
 
-    // TODO: getrandom 0.2 uses the wrong return type for BCrypteGenRandom
+    // On Windows, getrandom 0.2 uses the wrong return type for BCryptGenRandom
     #[cfg(not(target_os = "windows"))]
     getrandom_02::getrandom(&mut data).unwrap();