pythongh-114435: Add test skip when running as admin.

zooba · zooba · commit c08870cb410e · 2024-01-25T23:00:01.000Z
Also makes _winapi.CreateFile unconditionally use Unicode.
diff --git a/Lib/test/test_os.py b/Lib/test/test_os.py
@@ -3122,6 +3122,23 @@ def cleanup():
             print("File:", filename)
             print("stat with access:", stat1)
 
+        # We should now not be able to open the file.
+        # If we can, the test isn't going to be useful.
+        try:
+            _winapi.CloseHandle(_winapi.CreateFile(
+                filename,
+                0x80, # FILE_READ_ATTRIBUTES
+                0,
+                0,
+                _winapi.OPEN_EXISTING,
+                0x02000000, # FILE_FLAG_BACKUP_SEMANTICS
+                0,
+            ))
+        except PermissionError:
+            pass
+        else:
+            self.skipTest("Still had access to inaccessible file")
+
         # First test - we shouldn't raise here, because we still have access to
         # the directory and can extract enough information from its metadata.
         stat2 = os.stat(filename)
diff --git a/Modules/_winapi.c b/Modules/_winapi.c
@@ -441,7 +441,7 @@ _winapi_ConnectNamedPipe_impl(PyObject *module, HANDLE handle,
 /*[clinic input]
 _winapi.CreateFile -> HANDLE
 
-    file_name: LPCTSTR
+    file_name: LPCWSTR
     desired_access: DWORD
     share_mode: DWORD
     security_attributes: LPSECURITY_ATTRIBUTES
@@ -452,12 +452,12 @@ _winapi.CreateFile -> HANDLE
 [clinic start generated code]*/
 
 static HANDLE
-_winapi_CreateFile_impl(PyObject *module, LPCTSTR file_name,
+_winapi_CreateFile_impl(PyObject *module, LPCWSTR file_name,
                         DWORD desired_access, DWORD share_mode,
                         LPSECURITY_ATTRIBUTES security_attributes,
                         DWORD creation_disposition,
                         DWORD flags_and_attributes, HANDLE template_file)
-/*[clinic end generated code: output=417ddcebfc5a3d53 input=6423c3e40372dbd5]*/
+/*[clinic end generated code: output=818c811e5e04d550 input=1fa870ed1c2e3d69]*/
 {
     HANDLE handle;
 
@@ -468,14 +468,15 @@ _winapi_CreateFile_impl(PyObject *module, LPCTSTR file_name,
     }
 
     Py_BEGIN_ALLOW_THREADS
-    handle = CreateFile(file_name, desired_access,
-                        share_mode, security_attributes,
-                        creation_disposition,
-                        flags_and_attributes, template_file);
+    handle = CreateFileW(file_name, desired_access,
+                         share_mode, security_attributes,
+                         creation_disposition,
+                         flags_and_attributes, template_file);
     Py_END_ALLOW_THREADS
 
-    if (handle == INVALID_HANDLE_VALUE)
+    if (handle == INVALID_HANDLE_VALUE) {
         PyErr_SetFromWindowsErr(0);
+    }
 
     return handle;
 }
diff --git a/Modules/clinic/_winapi.c.h b/Modules/clinic/_winapi.c.h
