python
diff --git a/‎Lib/ctypes/test/test_win32.py‎
Lines changed: 0 additions & 26 deletions b/‎Lib/ctypes/test/test_win32.py‎
Lines changed: 0 additions & 26 deletions
diff --git a/‎Modules/_ctypes/callproc.c‎
Lines changed: 2 additions & 37 deletions b/‎Modules/_ctypes/callproc.c‎
Lines changed: 2 additions & 37 deletions
diff --git a/‎Modules/_ctypes/libffi_msvc/LICENSE‎
Lines changed: 0 additions & 20 deletions b/‎Modules/_ctypes/libffi_msvc/LICENSE‎
Lines changed: 0 additions & 20 deletions
@@ -6,32 +6,6 @@
 
 import _ctypes_test
 
-if sys.platform == "win32" and sizeof(c_void_p) == sizeof(c_int):
-    # Only windows 32-bit has different calling conventions.
-
-    class WindowsTestCase(unittest.TestCase):
-        def test_callconv_1(self):
-            # Testing stdcall function
-
-            IsWindow = windll.user32.IsWindow
-            # ValueError: Procedure probably called with not enough arguments (4 bytes missing)
-            self.assertRaises(ValueError, IsWindow)
-
-            # This one should succeeed...
-            self.assertEqual(0, IsWindow(0))
-
-            # ValueError: Procedure probably called with too many arguments (8 bytes in excess)
-            self.assertRaises(ValueError, IsWindow, 0, 0, 0)
-
-        def test_callconv_2(self):
-            # Calling stdcall function as cdecl
-
-            IsWindow = cdll.user32.IsWindow
-
-            # ValueError: Procedure called with not enough arguments (4 bytes missing)
-            # or wrong calling convention
-            self.assertRaises(ValueError, IsWindow, None)
-
 if sys.platform == "win32":
     class FunctionCallTestCase(unittest.TestCase):
 
 
@@ -761,7 +761,6 @@ static int _call_function_pointer(int flags,
 	ffi_cif cif;
 	int cc;
 #ifdef MS_WIN32
-	int delta;
 #ifndef DONT_USE_SEH
 	DWORD dwExceptionCode = 0;
 	EXCEPTION_RECORD record;
@@ -812,9 +811,8 @@ static int _call_function_pointer(int flags,
 #ifndef DONT_USE_SEH
 	__try {
 #endif
-		delta =
 #endif
-			ffi_call(&cif, (void *)pProc, resmem, avalues);
+		ffi_call(&cif, (void *)pProc, resmem, avalues);
 #ifdef MS_WIN32
 #ifndef DONT_USE_SEH
 	}
@@ -846,35 +844,6 @@ static int _call_function_pointer(int flags,
 		return -1;
 	}
 #endif
-#ifdef MS_WIN64
-	if (delta != 0) {
-		PyErr_Format(PyExc_RuntimeError,
-			     "ffi_call failed with code %d",
-			     delta);
-		return -1;
-	}
-#else
-	if (delta < 0) {
-		if (flags & FUNCFLAG_CDECL)
-			PyErr_Format(PyExc_ValueError,
-				     "Procedure called with not enough "
-				     "arguments (%d bytes missing) "
-				     "or wrong calling convention",
-				     -delta);
-		else
-			PyErr_Format(PyExc_ValueError,
-				     "Procedure probably called with not enough "
-				     "arguments (%d bytes missing)",
-				     -delta);
-		return -1;
-	} else if (delta > 0) {
-		PyErr_Format(PyExc_ValueError,
-			     "Procedure probably called with too many "
-			     "arguments (%d bytes in excess)",
-			     delta);
-		return -1;
-	}
-#endif
 #endif
 	if ((flags & FUNCFLAG_PYTHONAPI) && PyErr_Occurred())
 		return -1;
@@ -1147,11 +1116,7 @@ PyObject *_ctypes_callproc(PPROC pProc,
 	}
 	for (i = 0; i < argcount; ++i) {
 		atypes[i] = args[i].ffi_type;
-		if (atypes[i]->type == FFI_TYPE_STRUCT 
-#ifdef _WIN64
-		    && atypes[i]->size <= sizeof(void *)
-#endif
-		    )
+		if (atypes[i]->type == FFI_TYPE_STRUCT)
 			avalues[i] = (void *)args[i].value.p;
 		else
 			avalues[i] = (void *)&args[i].value;