saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Let memcopy make the null bytes, better py3 support

Browse source
This commit is contained in:
Daniel A. Wozniak 2019-02-15 02:21:34 +00:00
parent 22a04c1287
commit c811a70907
No known key found for this signature in database
GPG key ID: 166B9D2C06C82D61
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
salt/platform/win.py
View file

@ -355,13 +355,16 @@ class ContiguousUnicode(ctypes.Structure):
return buf[:length]
return None
def _set_unicode_buffer(self, value):
def _set_unicode_buffer(self, values):
cls = type(self)
wchar_size = ctypes.sizeof(WCHAR)
bufsize = (len(value) + 1) * wchar_size
bufsize = (len('\x00'.join(values)) + 1) * wchar_size
ctypes.resize(self, ctypes.sizeof(cls) + bufsize)
addr = ctypes.addressof(self) + ctypes.sizeof(cls)
ctypes.memmove(addr, value, bufsize)
for value in values:
bufsize = (len(value) + 1) * wchar_size
ctypes.memmove(addr, value, bufsize)
addr += bufsize
def _set_unicode_string(self, name, value):
values = []
@ -370,7 +373,7 @@ class ContiguousUnicode(ctypes.Structure):
values.append(value or '')
else:
values.append(getattr(self, n) or '')
self._set_unicode_buffer('\x00'.join(values))
self._set_unicode_buffer(values)
cls = type(self)
wchar_size = ctypes.sizeof(WCHAR)