1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
|
From 0f459a423fa1754bae5817940d62348b5197fda5 Mon Sep 17 00:00:00 2001
From: Naveen M K <naveen521kk@gmail.com>
Date: Thu, 17 Jun 2021 18:52:39 +0530
Subject: [PATCH 113/N] Add support for Windows 7 Python 3.9
---
Modules/posixmodule.c | 22 +++++++++++------
PC/getpathp.c | 57 +++++++++++++++++++++++++++++++++++++++----
configure.ac | 2 +-
3 files changed, 68 insertions(+), 13 deletions(-)
diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
index bf19ac8..215c81f 100644
--- a/Modules/posixmodule.c
+++ b/Modules/posixmodule.c
@@ -18,7 +18,7 @@
FSCTL_GET_REPARSE_POINT is not exported with WIN32_LEAN_AND_MEAN. */
# include <windows.h>
-# include <pathcch.h>
+# include <shlwapi.h>
#endif
#include "pycore_ceval.h" // _PyEval_ReInitThreads()
@@ -4402,7 +4402,6 @@ os__path_splitroot_impl(PyObject *module, path_t *path)
wchar_t *buffer;
wchar_t *end;
PyObject *result = NULL;
- HRESULT ret;
buffer = (wchar_t*)PyMem_Malloc(sizeof(wchar_t) * (wcslen(path->wide) + 1));
if (!buffer) {
@@ -4414,18 +4413,26 @@ os__path_splitroot_impl(PyObject *module, path_t *path)
}
Py_BEGIN_ALLOW_THREADS
- ret = PathCchSkipRoot(buffer, &end);
+ if (buffer[0] && buffer[1] == L':') {
+ if (buffer[2] == L'\\') {
+ end = &buffer[3];
+ } else {
+ end = &buffer[2];
+ }
+ } else {
+ end = PathSkipRootW(buffer);
+ }
Py_END_ALLOW_THREADS
- if (FAILED(ret)) {
+ if (!end || end == buffer) {
result = Py_BuildValue("sO", "", path->object);
- } else if (end != buffer) {
+ } else if (!*end) {
+ result = Py_BuildValue("Os", path->object, "");
+ } else {
size_t rootLen = (size_t)(end - buffer);
result = Py_BuildValue("NN",
PyUnicode_FromWideChar(path->wide, rootLen),
PyUnicode_FromWideChar(path->wide + rootLen, -1)
);
- } else {
- result = Py_BuildValue("Os", path->object, "");
}
PyMem_Free(buffer);
@@ -4433,6 +4440,7 @@ os__path_splitroot_impl(PyObject *module, path_t *path)
}
+
#endif /* MS_WINDOWS */
diff --git a/PC/getpathp.c b/PC/getpathp.c
index 53da3a6..40b0db3 100644
--- a/PC/getpathp.c
+++ b/PC/getpathp.c
@@ -90,7 +90,6 @@
#endif
#include <windows.h>
-#include <pathcch.h>
#include <shlwapi.h>
#ifdef HAVE_SYS_TYPES_H
@@ -250,14 +249,43 @@ ismodule(wchar_t *filename, int update_filename)
stuff as fits will be appended.
*/
+static int _PathCchCombineEx_Initialized = 0;
+typedef HRESULT(__stdcall *PPathCchCombineEx) (PWSTR pszPathOut, size_t cchPathOut,
+ PCWSTR pszPathIn, PCWSTR pszMore,
+ unsigned long dwFlags);
+static PPathCchCombineEx _PathCchCombineEx;
+
static void
join(wchar_t *buffer, const wchar_t *stuff)
{
- if (FAILED(PathCchCombineEx(buffer, MAXPATHLEN+1, buffer, stuff, 0))) {
- Py_FatalError("buffer overflow in getpathp.c's join()");
+ if (_PathCchCombineEx_Initialized == 0) {
+ HMODULE pathapi = LoadLibraryExW(L"api-ms-win-core-path-l1-1-0.dll", NULL,
+ LOAD_LIBRARY_SEARCH_SYSTEM32);
+ if (pathapi) {
+ _PathCchCombineEx = (PPathCchCombineEx)GetProcAddress(pathapi, "PathCchCombineEx");
+ }
+ else {
+ _PathCchCombineEx = NULL;
+ }
+ _PathCchCombineEx_Initialized = 1;
+ }
+
+ if (_PathCchCombineEx) {
+ if (FAILED(_PathCchCombineEx(buffer, MAXPATHLEN+1, buffer, stuff, 0))) {
+ Py_FatalError("buffer overflow in getpathp.c's join()");
+ }
+ } else {
+ if (!PathCombineW(buffer, buffer, stuff)) {
+ Py_FatalError("buffer overflow in getpathp.c's join()");
+ }
}
}
+static int _PathCchCanonicalizeEx_Initialized = 0;
+typedef HRESULT(__stdcall *PPathCchCanonicalizeEx) (PWSTR pszPathOut, size_t cchPathOut,
+ PCWSTR pszPathIn, unsigned long dwFlags);
+static PPathCchCanonicalizeEx _PathCchCanonicalizeEx;
+
/* Call PathCchCanonicalizeEx(path): remove navigation elements such as "."
and ".." to produce a direct, well-formed path. */
static PyStatus
@@ -267,8 +295,27 @@ canonicalize(wchar_t *buffer, const wchar_t *path)
return _PyStatus_NO_MEMORY();
}
- if (FAILED(PathCchCanonicalizeEx(buffer, MAXPATHLEN + 1, path, 0))) {
- return INIT_ERR_BUFFER_OVERFLOW();
+ if (_PathCchCanonicalizeEx_Initialized == 0) {
+ HMODULE pathapi = LoadLibraryExW(L"api-ms-win-core-path-l1-1-0.dll", NULL,
+ LOAD_LIBRARY_SEARCH_SYSTEM32);
+ if (pathapi) {
+ _PathCchCanonicalizeEx = (PPathCchCanonicalizeEx)GetProcAddress(pathapi, "PathCchCanonicalizeEx");
+ }
+ else {
+ _PathCchCanonicalizeEx = NULL;
+ }
+ _PathCchCanonicalizeEx_Initialized = 1;
+ }
+
+ if (_PathCchCanonicalizeEx) {
+ if (FAILED(_PathCchCanonicalizeEx(buffer, MAXPATHLEN + 1, path, 0))) {
+ return INIT_ERR_BUFFER_OVERFLOW();
+ }
+ }
+ else {
+ if (!PathCanonicalizeW(buffer, path)) {
+ return INIT_ERR_BUFFER_OVERFLOW();
+ }
}
return _PyStatus_OK();
}
diff --git a/configure.ac b/configure.ac
index dd6969d..23dd59b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5968,7 +5968,7 @@ AC_MSG_RESULT(done)
# For mingw build need additional library for linking
case $host in
*-*-mingw*)
- LIBS="$LIBS -lversion -lshlwapi -lpathcch"
+ LIBS="$LIBS -lversion -lshlwapi"
AC_PROG_AWK
if test "$AWK" = "gawk"; then
awk_extra_flag="--non-decimal-data"
--
2.33.0
|