bpo-46217: Revert use of Windows constant that is newer than what we support (pythonGH-30473)

zooba · web-flow · commit d81182b8ec3b · 2022-01-08T00:06:53.000Z
diff --git a/Misc/NEWS.d/next/Windows/2022-01-07-22-55-11.bpo-46217.tgJEsB.rst b/Misc/NEWS.d/next/Windows/2022-01-07-22-55-11.bpo-46217.tgJEsB.rst
@@ -0,0 +1,2 @@
+Removed parameter that is unsupported on Windows 8.1 and early Windows 10
+and may have caused build or runtime failures.
diff --git a/Python/fileutils.c b/Python/fileutils.c
@@ -2129,7 +2129,7 @@ join_relfile(wchar_t *buffer, size_t bufsize,
 {
 #ifdef MS_WINDOWS
     if (FAILED(PathCchCombineEx(buffer, bufsize, dirname, relfile, 
-        PATHCCH_ALLOW_LONG_PATHS | PATHCCH_FORCE_ENABLE_LONG_NAME_PROCESS))) {
+        PATHCCH_ALLOW_LONG_PATHS))) {
         return -1;
     }
 #else

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+Removed parameter that is unsupported on Windows 8.1 and early Windows 10`
	`2`	`+and may have caused build or runtime failures.`
Original file line number	Diff line number	Diff line change
`@@ -2129,7 +2129,7 @@ join_relfile(wchar_t *buffer, size_t bufsize,`
`2129`	`2129`	`{`
`2130`	`2130`	`#ifdef MS_WINDOWS`
`2131`	`2131`	`if (FAILED(PathCchCombineEx(buffer, bufsize, dirname, relfile,`
`2132`		`- PATHCCH_ALLOW_LONG_PATHS \| PATHCCH_FORCE_ENABLE_LONG_NAME_PROCESS))) {`
	`2132`	`+ PATHCCH_ALLOW_LONG_PATHS))) {`
`2133`	`2133`	`return -1;`
`2134`	`2134`	`}`
`2135`	`2135`	`#else`