From 8b8a34731d29122057d6a80dcd1e56135fc09e6b Mon Sep 17 00:00:00 2001 From: Robert Tingirica Date: Tue, 28 Oct 2014 12:29:39 +0200 Subject: [PATCH] Fixed ctypes/wintypes issue The c_void_p and HRESULT are not accessible from wintypes in Python3. This patch fixes the issue and it keeps functionality for Python27 Change-Id: I0a1c5d0770a66529528d1e2f7f1ba08368e53fe7 --- cloudbaseinit/utils/windows/vds.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/cloudbaseinit/utils/windows/vds.py b/cloudbaseinit/utils/windows/vds.py index dd804ce9..6c62e982 100644 --- a/cloudbaseinit/utils/windows/vds.py +++ b/cloudbaseinit/utils/windows/vds.py @@ -71,11 +71,11 @@ class VDS_DISK_PROP(ctypes.Structure): ("BusType", ctypes.c_int), ("PartitionStyle", ctypes.c_int), ("switch_type", VDS_DISK_PROP_SWITCH_TYPE), - ("pwszDiskAddress", wintypes.c_void_p), - ("pwszName", wintypes.c_void_p), - ("pwszFriendlyName", wintypes.c_void_p), - ("pwszAdaptorName", wintypes.c_void_p), - ("pwszDevicePath", wintypes.c_void_p), + ("pwszDiskAddress", ctypes.c_void_p), + ("pwszName", ctypes.c_void_p), + ("pwszFriendlyName", ctypes.c_void_p), + ("pwszAdaptorName", ctypes.c_void_p), + ("pwszDevicePath", ctypes.c_void_p), ] @@ -101,7 +101,7 @@ class VDS_VOLUME_PROP(ctypes.Structure): ("ullSize", wintypes.ULARGE_INTEGER), ("ulFlags", wintypes.ULONG), ("RecommendedFileSystemType", ctypes.c_int), - ("pwszName", wintypes.c_void_p), + ("pwszName", ctypes.c_void_p), ] @@ -278,12 +278,12 @@ class IVdsAsync(comtypes.IUnknown): comtypes.COMMETHOD([], comtypes.HRESULT, 'Cancel'), comtypes.COMMETHOD([], comtypes.HRESULT, 'Wait', (['out'], ctypes.POINTER( - wintypes.HRESULT), 'pHrResult'), + ctypes.HRESULT), 'pHrResult'), (['out'], ctypes.POINTER(VDS_ASYNC_OUTPUT), 'pAsyncOut')), comtypes.COMMETHOD([], comtypes.HRESULT, 'QueryStatus', (['out'], ctypes.POINTER( - wintypes.HRESULT), 'pHrResult'), + ctypes.HRESULT), 'pHrResult'), (['out'], ctypes.POINTER(wintypes.ULONG), 'pulPercentCompleted')), ]