From: Hirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp>
Date: Wed, 20 Aug 2008 16:18:19 +0000 (+0000)
Subject: Reverted r65901 and uses GetVolumeInformationW because string in py3k is unicode.
X-Git-Tag: v3.0b3~4
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ca765d582810664818a0bfbd1a5a0c435ec334cc;p=python

Reverted r65901 and uses GetVolumeInformationW because string in py3k is unicode.
See http://mail.python.org/pipermail/python-checkins/2008-August/073116.html
---

diff --git a/Lib/test/test_os.py b/Lib/test/test_os.py
index c566705404..e9b0652ab0 100644
--- a/Lib/test/test_os.py
+++ b/Lib/test/test_os.py
@@ -301,13 +301,9 @@ class StatAttributeTests(unittest.TestCase):
         def get_file_system(path):
             root = os.path.splitdrive(os.path.abspath(path))[0] + '\\'
             import ctypes
-            from ctypes.wintypes import LPCWSTR, LPWSTR, DWORD
-            LPDWORD = ctypes.POINTER(DWORD)
-            f = ctypes.windll.kernel32.GetVolumeInformationW
-            f.argtypes = (LPCWSTR, LPWSTR, DWORD,
-                LPDWORD, LPDWORD, LPDWORD, LPWSTR, DWORD)
+            kernel32 = ctypes.windll.kernel32
             buf = ctypes.create_unicode_buffer("", 100)
-            if f(root, None, 0, None, None, None, buf, len(buf)):
+            if kernel32.GetVolumeInformationW(root, None, 0, None, None, None, buf, len(buf)):
                 return buf.value
 
         if get_file_system(support.TESTFN) == "NTFS":