Author: Philip Jenvey <[email protected]>
Branch: py3k
Changeset: r87301:16035fa70024
Date: 2016-09-21 20:00 -0700
http://bitbucket.org/pypy/pypy/changeset/16035fa70024/
Log: attempt to adapt missing parts of 29d14733e007 to cffi
diff --git a/lib_pypy/_pypy_winbase_build.py b/lib_pypy/_pypy_winbase_build.py
--- a/lib_pypy/_pypy_winbase_build.py
+++ b/lib_pypy/_pypy_winbase_build.py
@@ -83,6 +83,7 @@
BOOL WINAPI GetExitCodeProcess(HANDLE, LPDWORD);
BOOL WINAPI TerminateProcess(HANDLE, UINT);
HANDLE WINAPI GetStdHandle(DWORD);
+DWORD WINAPI GetModuleFileNameW(HANDLE, wchar_t *, DWORD);
""")
# --------------------
diff --git a/lib_pypy/_winapi.py b/lib_pypy/_winapi.py
--- a/lib_pypy/_winapi.py
+++ b/lib_pypy/_winapi.py
@@ -162,18 +162,19 @@
return int(_ffi.cast("intptr_t", res))
def CloseHandle(handle):
- res = _CloseHandle(handle)
+ res = _kernel32.CloseHandle(_ffi.cast("HANDLE", handle))
if not res:
raise _WinError()
def GetModuleFileName(module):
- buf = ctypes.create_unicode_buffer(_MAX_PATH)
- res = _GetModuleFileNameW(module, buf, _MAX_PATH)
+ buf = _ffi.new("wchar_t[]", _MAX_PATH)
+ res = _kernel32.GetModuleFileNameW(_ffi.cast("HANDLE", module),
+ buf, _MAX_PATH)
if not res:
raise _WinError()
- return buf.value
+ return _ffi.string(buf)
STD_INPUT_HANDLE = -10
STD_OUTPUT_HANDLE = -11
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
