WIP test on windows

Author: RalfJung

.travis.yml

@@ -1,26 +1,23 @@
 language: rust
 cache: cargo
+rust:
+- nightly
 
 os:
-- osx
 - linux
+- osx
 
-rust:
-- nightly
 before_script:
-# mac os weirdness (https://github.com/travis-ci/travis-ci/issues/6307)
-- curl -sSL https://rvm.io/mpapis.asc | gpg --import -
-- rvm get stable
 # in a cronjob, use latest (not pinned) nightly
 - if [ "$TRAVIS_EVENT_TYPE" = cron ]; then rustup override set nightly; fi
-# actual travis code
+# prepare
 - export PATH=$HOME/.local/bin:$PATH
 - rustup target add i686-unknown-linux-gnu
 - rustup target add i686-pc-windows-gnu
 - rustup target add i686-pc-windows-msvc
 - rustup component add rust-src
 - cargo install xargo || echo "skipping xargo install"
-- export RUST_SYSROOT=$HOME/rust
+
 script:
 - set -e
 - |
@@ -56,6 +53,7 @@ script:
 - |
   # and run all tests with full mir
   cargo test --release --all-features
+
 notifications:
   email:
     on_success: never

src/fn_call.rs

@@ -634,14 +634,16 @@ impl<'a, 'mir, 'tcx: 'mir + 'a> EvalContextExt<'tcx> for EvalContext<'a, 'mir, '
                 let ptr_size = self.memory.pointer_size();
                 self.write_scalar(dest, Scalar::from_int(1, ptr_size), dest_ty)?;
             },
-            "GetModuleHandleW" |
-            "GetProcAddress" |
             "InitializeCriticalSection" |
             "EnterCriticalSection" |
-            "TryEnterCriticalSection" |
             "LeaveCriticalSection" |
             "DeleteCriticalSection" |
             "SetLastError" => {
+                // Function does not return anything, nothing to do
+            },
+            "GetModuleHandleW" |
+            "GetProcAddress" |
+            "TryEnterCriticalSection" => {
                 // pretend these do not exist/nothing happened, by returning zero
                 let ptr_size = self.memory.pointer_size();
                 self.write_scalar(dest, Scalar::from_int(0, ptr_size), dest_ty)?;