From b9c986f586600a05cf304eb3507d9486e564410e 2012-05-13 23:02:10
From: Min RK <benjaminrk@gmail.com>
Date: 2012-05-13 23:02:10
Subject: [PATCH] Merge pull request #1709 from jstenar/arg_split_fix

fixes #1708, failing test in arg_split on windows

There were a conflicting defintion of CommandLineToArgvW.res_type in _process_win32 and _process_win32_controller. This PR fixes the issue.
---

diff --git a/IPython/utils/_process_win32.py b/IPython/utils/_process_win32.py
index 1565d34..c66a912 100644
--- a/IPython/utils/_process_win32.py
+++ b/IPython/utils/_process_win32.py
@@ -156,7 +156,7 @@ def getoutput(cmd):
 try:
     CommandLineToArgvW = ctypes.windll.shell32.CommandLineToArgvW
     CommandLineToArgvW.arg_types = [LPCWSTR, POINTER(c_int)]
-    CommandLineToArgvW.res_types = [POINTER(LPCWSTR)]
+    CommandLineToArgvW.restype = POINTER(LPCWSTR)
     LocalFree = ctypes.windll.kernel32.LocalFree
     LocalFree.res_type = HLOCAL
     LocalFree.arg_types = [HLOCAL]
@@ -178,7 +178,7 @@ try:
         argvn = c_int()
         result_pointer = CommandLineToArgvW(py3compat.cast_unicode(commandline.lstrip()), ctypes.byref(argvn))
         result_array_type = LPCWSTR * argvn.value
-        result = [arg for arg in result_array_type.from_address(result_pointer)]
+        result = [arg for arg in result_array_type.from_address(ctypes.addressof(result_pointer.contents))]
         retval = LocalFree(result_pointer)
         return result
 except AttributeError: