DISTRHO
/
PawPaw
mirror of https://github.com/DISTRHO/PawPaw
1
0
Fork 0
Code Issues 0 Releases 2 Wiki Activity
Cross-Platform build scripts for audio plugins
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
679 Commits
3 Branches
4.7MB
Tree: f95dfbbde9
Branches Tags
${ item.name }
Create branch ${ searchTerm }
from 'f95dfbbde9'
${ noResults }
PawPaw/patches/Python/win32/0560-mingw-use-posix-getpat...

402 lines
12KB
Raw Blame History 

  1. diff -Naur Python-3.8.0-orig/Include/pylifecycle.h Python-3.8.0/Include/pylifecycle.h

  2. --- Python-3.8.0-orig/Include/pylifecycle.h	2019-10-22 10:02:41.276120000 +0300

  3. +++ Python-3.8.0/Include/pylifecycle.h	2019-10-22 10:02:44.427325500 +0300

  4. @@ -53,7 +53,7 @@

  5.  PyAPI_FUNC(wchar_t *) Py_GetExecPrefix(void);

  6.  PyAPI_FUNC(wchar_t *) Py_GetPath(void);

  7.  PyAPI_FUNC(void)      Py_SetPath(const wchar_t *);

  8. -#ifdef MS_WINDOWS

  9. +#ifdef _MSC_VER

  10.  int _Py_CheckPython3(void);

  11.  #endif

  12.  

  13. diff -Naur Python-3.8.0-orig/Modules/getpath.c Python-3.8.0/Modules/getpath.c

  14. --- Python-3.8.0-orig/Modules/getpath.c	2019-10-14 16:34:47.000000000 +0300

  15. +++ Python-3.8.0/Modules/getpath.c	2019-10-22 10:02:44.848526300 +0300

  16. @@ -14,6 +14,11 @@

  17.  #  include <mach-o/dyld.h>

  18.  #endif

  19.  

  20. +#ifdef MS_WINDOWS

  21. +#include <windows.h>

  22. +#include <shlwapi.h>

  23. +#endif

  24. +

  25.  /* Search in some common locations for the associated Python libraries.

  26.   *

  27.   * Two directories must be found, the platform independent directory

  28. @@ -132,13 +137,39 @@

  29.      int prefix_found;         /* found platform independent libraries? */

  30.      int exec_prefix_found;    /* found the platform dependent libraries? */

  31.  

  32. +    wchar_t *dll_path;

  33.      int warnings;

  34.      const wchar_t *pythonpath_env;

  35.  } PyCalculatePath;

  36.  

  37.  static const wchar_t delimiter[2] = {DELIM, '\0'};

  38. -static const wchar_t separator[2] = {SEP, '\0'};

  39. +static wchar_t separator[2] = {SEP, '\0'};

  40.  

  41. +static int

  42. +is_sep(wchar_t ch)

  43. +{

  44. +#ifdef _WIN32

  45. +    return ch == SEP || ch == ALTSEP;

  46. +#else

  47. +    return ch == SEP;

  48. +#endif

  49. +}

  50. +

  51. +static int

  52. +is_absolute(const wchar_t *path)

  53. +{

  54. +#ifdef _WIN32

  55. +    size_t i = wcslen(path);

  56. +    if (i >= 3) {

  57. +        if (iswalpha(path[0]) && path[1] == L':' && is_sep(path[2])) {

  58. +            return 1;

  59. +        }

  60. +    }

  61. +    return 0;

  62. +#else

  63. +    return path[0] == SEP;

  64. +#endif

  65. +}

  66.  

  67.  /* Get file status. Encode the path to the locale encoding. */

  68.  static int

  69. @@ -161,7 +192,7 @@

  70.  reduce(wchar_t *dir)

  71.  {

  72.      size_t i = wcslen(dir);

  73. -    while (i > 0 && dir[i] != SEP) {

  74. +    while (i > 0 && !is_sep(dir[i])) {

  75.          --i;

  76.      }

  77.      dir[i] = '\0';

  78. @@ -241,14 +272,14 @@

  79.  joinpath(wchar_t *buffer, const wchar_t *stuff, size_t buflen)

  80.  {

  81.      size_t n, k;

  82. -    if (stuff[0] != SEP) {

  83. +    if (!is_sep(stuff[0])) {

  84.          n = wcslen(buffer);

  85.          if (n >= buflen) {

  86.              return PATHLEN_ERR();

  87.          }

  88.  

  89. -        if (n > 0 && buffer[n-1] != SEP) {

  90. -            buffer[n++] = SEP;

  91. +        if (n > 0 && !is_sep(buffer[n-1]) != SEP) {

  92. +            buffer[n++] = Py_GetSepW(buffer);

  93.          }

  94.      }

  95.      else {

  96. @@ -284,7 +315,7 @@

  97.  static PyStatus

  98.  copy_absolute(wchar_t *path, const wchar_t *p, size_t pathlen)

  99.  {

  100. -    if (p[0] == SEP) {

  101. +    if (is_absolute(p)) {

  102.          if (safe_wcscpy(path, p, pathlen) < 0) {

  103.              return PATHLEN_ERR();

  104.          }

  105. @@ -297,7 +328,7 @@

  106.              }

  107.              return _PyStatus_OK();

  108.          }

  109. -        if (p[0] == '.' && p[1] == SEP) {

  110. +        if (p[0] == '.' && is_sep(p[1])) {

  111.              p += 2;

  112.          }

  113.          PyStatus status = joinpath(path, p, pathlen);

  114. @@ -313,7 +344,7 @@

  115.  static PyStatus

  116.  absolutize(wchar_t *path, size_t path_len)

  117.  {

  118. -    if (path[0] == SEP) {

  119. +    if (is_absolute(path)) {

  120.          return _PyStatus_OK();

  121.      }

  122.  

  123. @@ -403,6 +434,7 @@

  124.          return status;

  125.      }

  126.  

  127. +    Py_NormalizeSepsW(path);

  128.      if (isfile(path)) {

  129.          /* Check VPATH to see if argv0_path is in the build directory.

  130.             VPATH can be empty. */

  131. @@ -427,6 +459,7 @@

  132.                  return status;

  133.              }

  134.  

  135. +            Py_NormalizeSepsW(prefix);

  136.              if (ismodule(prefix, prefix_len)) {

  137.                  *found = -1;

  138.                  reduce(prefix);

  139. @@ -529,12 +562,21 @@

  140.       * return the compiled-in defaults instead.

  141.       */

  142.      if (calculate->prefix_found > 0) {

  143. +#ifdef _WIN32

  144. +        wchar_t drive_root[3];

  145. +        memset(drive_root, 0, sizeof(drive_root));

  146. +        wcsncpy(drive_root, prefix, 3);

  147. +#endif

  148.          reduce(prefix);

  149.          reduce(prefix);

  150.          /* The prefix is the root directory, but reduce() chopped

  151.           * off the "/". */

  152.          if (!prefix[0]) {

  153. +#ifdef _WIN32

  154. +            wcsncpy(prefix, drive_root, 3);

  155. +#else

  156.              wcscpy(prefix, separator);

  157. +#endif

  158.          }

  159.          pathconfig->prefix = _PyMem_RawWcsdup(prefix);

  160.      }

  161. @@ -649,6 +691,7 @@

  162.  

  163.      /* Check for pybuilddir.txt */

  164.      assert(*found == 0);

  165. +    Py_NormalizeSepsW(exec_prefix);

  166.      status = calculate_pybuilddir(argv0_path, exec_prefix, exec_prefix_len,

  167.                                    found);

  168.      if (_PyStatus_EXCEPTION(status)) {

  169. @@ -734,6 +777,7 @@

  170.          if (_PyStatus_EXCEPTION(status)) {

  171.              return status;

  172.          }

  173. +        Py_NormalizeSepsW(exec_prefix);

  174.      }

  175.      /* If we found EXEC_PREFIX do *not* reduce it!  (Yet.) */

  176.      return _PyStatus_OK();

  177. @@ -746,11 +790,20 @@

  178.                            wchar_t *exec_prefix)

  179.  {

  180.      if (calculate->exec_prefix_found > 0) {

  181. +#ifdef _WIN32

  182. +        wchar_t drive_root[3];

  183. +        memset(drive_root, 0, sizeof(drive_root));

  184. +        wcsncpy(drive_root, exec_prefix, 3);

  185. +#endif

  186.          reduce(exec_prefix);

  187.          reduce(exec_prefix);

  188.          reduce(exec_prefix);

  189.          if (!exec_prefix[0]) {

  190. +#ifdef _WIN32

  191. +            wcsncpy(exec_prefix, drive_root, 3);

  192. +#else

  193.              wcscpy(exec_prefix, separator);

  194. +#endif

  195.          }

  196.  

  197.          pathconfig->exec_prefix = _PyMem_RawWcsdup(exec_prefix);

  198. @@ -767,6 +820,48 @@

  199.  }

  200.  

  201.  

  202. +#ifdef MS_WINDOWS

  203. +static int

  204. +GetWindowsModulePaths(wchar_t *progpath)

  205. +{

  206. +    int result = 0;

  207. +    wchar_t program_full_path[MAXPATHLEN+1];

  208. +    memset(program_full_path, 0, sizeof(program_full_path));

  209. +

  210. +    if (GetModuleFileNameW(NULL, program_full_path, MAXPATHLEN)) {

  211. +        result = 1;

  212. +        Py_NormalizeSepsW(program_full_path);

  213. +    }

  214. +

  215. +    wcscpy(progpath, program_full_path);

  216. +    return result;

  217. +}

  218. +

  219. +

  220. +wchar_t*

  221. +_Py_GetDLLPath(void)

  222. +{

  223. +    wchar_t dll_path[MAXPATHLEN+1];

  224. +    memset(dll_path, 0, sizeof(dll_path));

  225. +

  226. +#ifdef Py_ENABLE_SHARED

  227. +    extern HANDLE PyWin_DLLhModule;

  228. +    if (PyWin_DLLhModule) {

  229. +        if (GetModuleFileNameW(PyWin_DLLhModule, dll_path, MAXPATHLEN)) {

  230. +            Py_NormalizeSepsW(dll_path);

  231. +        } else {

  232. +            dll_path[0] = 0;

  233. +        }

  234. +    }

  235. +#else

  236. +    dll_path[0] = 0;

  237. +#endif

  238. +

  239. +    return _PyMem_RawWcsdup(dll_path);

  240. +}

  241. +#endif /* MS_WINDOWS */

  242. +

  243. +

  244.  static PyStatus

  245.  calculate_program_full_path(PyCalculatePath *calculate, _PyPathConfig *pathconfig)

  246.  {

  247. @@ -789,7 +884,7 @@

  248.       * other way to find a directory to start the search from.  If

  249.       * $PATH isn't exported, you lose.

  250.       */

  251. -    if (wcschr(pathconfig->program_name, SEP)) {

  252. +    if (wcschr(pathconfig->program_name, Py_GetSepW(pathconfig->program_name))) {

  253.          if (safe_wcscpy(program_full_path, pathconfig->program_name,

  254.                          program_full_path_len) < 0) {

  255.              return PATHLEN_ERR();

  256. @@ -821,6 +916,10 @@

  257.          PyMem_RawFree(path);

  258.      }

  259.  #endif /* __APPLE__ */

  260. +#ifdef MS_WINDOWS

  261. +    else if(GetWindowsModulePaths(program_full_path)) {

  262. +    }

  263. +#endif /* MS_WINDOWS */

  264.      else if (calculate->path_env) {

  265.          wchar_t *path = calculate->path_env;

  266.          while (1) {

  267. @@ -861,7 +960,7 @@

  268.      else {

  269.          program_full_path[0] = '\0';

  270.      }

  271. -    if (program_full_path[0] != SEP && program_full_path[0] != '\0') {

  272. +    if (!is_absolute(program_full_path)) {

  273.          status = absolutize(program_full_path, program_full_path_len);

  274.          if (_PyStatus_EXCEPTION(status)) {

  275.              return status;

  276. @@ -1071,6 +1170,7 @@

  277.      if (_PyStatus_EXCEPTION(status)) {

  278.          return status;

  279.      }

  280. +    Py_NormalizeSepsW(zip_path);

  281.  

  282.      /* Replace "00" with version */

  283.      size_t bufsz = wcslen(zip_path);

  284. @@ -1098,7 +1198,7 @@

  285.      while (1) {

  286.          wchar_t *delim = wcschr(defpath, DELIM);

  287.  

  288. -        if (defpath[0] != SEP) {

  289. +        if (!is_absolute(defpath)) {

  290.              /* Paths are relative to prefix */

  291.              bufsz += prefixsz;

  292.          }

  293. @@ -1115,6 +1215,11 @@

  294.  

  295.      bufsz += wcslen(zip_path) + 1;

  296.      bufsz += wcslen(exec_prefix) + 1;

  297. +#ifdef MS_WINDOWS

  298. +    if (is_absolute(prefix)) {

  299. +        bufsz += wcslen(prefix) + 1;

  300. +    }

  301. +#endif

  302.  

  303.      /* Allocate the buffer */

  304.      wchar_t *buf = PyMem_RawMalloc(bufsz * sizeof(wchar_t));

  305. @@ -1140,9 +1245,9 @@

  306.      while (1) {

  307.          wchar_t *delim = wcschr(defpath, DELIM);

  308.  

  309. -        if (defpath[0] != SEP) {

  310. +        if (!is_absolute(defpath)) {

  311.              wcscat(buf, prefix);

  312. -            if (prefixsz >= 2 && prefix[prefixsz - 2] != SEP &&

  313. +            if (prefixsz >= 2 && !is_sep(prefix[prefixsz - 2]) &&

  314.                  defpath[0] != (delim ? DELIM : L'\0'))

  315.              {

  316.                  /* not empty */

  317. @@ -1163,6 +1268,12 @@

  318.          defpath = delim + 1;

  319.      }

  320.      wcscat(buf, delimiter);

  321. +#ifdef MS_WINDOWS

  322. +    if (is_absolute(prefix)) {

  323. +        wcscat(buf, prefix);

  324. +        wcscat(buf, delimiter);

  325. +    }

  326. +#endif

  327.  

  328.      /* Finally, on goes the directory for dynamic-load modules */

  329.      wcscat(buf, exec_prefix);

  330. @@ -1188,16 +1299,20 @@

  331.      if (!calculate->pythonpath) {

  332.          return DECODE_LOCALE_ERR("PYTHONPATH define", len);

  333.      }

  334. +    Py_NormalizeSepsW(calculate->pythonpath);

  335.  

  336.      calculate->prefix = Py_DecodeLocale(PREFIX, &len);

  337.      if (!calculate->prefix) {

  338.          return DECODE_LOCALE_ERR("PREFIX define", len);

  339.      }

  340. +    Py_NormalizeSepsW(calculate->prefix);

  341.      calculate->exec_prefix = Py_DecodeLocale(EXEC_PREFIX, &len);

  342.      if (!calculate->exec_prefix) {

  343.          return DECODE_LOCALE_ERR("EXEC_PREFIX define", len);

  344.      }

  345. -    calculate->lib_python = Py_DecodeLocale("lib/python" VERSION, &len);

  346. +    Py_NormalizeSepsW(calculate->exec_prefix);

  347. +    const char *lib_python_VERSION = (Py_GetSepW(NULL) == L'/') ? "lib/python" VERSION : "lib\\python" VERSION;

  348. +    calculate->lib_python = Py_DecodeLocale(lib_python_VERSION, &len);

  349.      if (!calculate->lib_python) {

  350.          return DECODE_LOCALE_ERR("EXEC_PREFIX define", len);

  351.      }

  352. @@ -1215,6 +1330,7 @@

  353.      PyMem_RawFree(calculate->pythonpath);

  354.      PyMem_RawFree(calculate->prefix);

  355.      PyMem_RawFree(calculate->exec_prefix);

  356. +    PyMem_RawFree(calculate->dll_path);

  357.      PyMem_RawFree(calculate->lib_python);

  358.      PyMem_RawFree(calculate->path_env);

  359.  }

  360. @@ -1225,6 +1341,8 @@

  361.  {

  362.      PyStatus status;

  363.  

  364. +    calculate->dll_path = _Py_GetDLLPath();

  365. +

  366.      if (pathconfig->program_full_path == NULL) {

  367.          status = calculate_program_full_path(calculate, pathconfig);

  368.          if (_PyStatus_EXCEPTION(status)) {

  369. @@ -1343,6 +1461,7 @@

  370.  {

  371.      PyStatus status;

  372.      PyCalculatePath calculate;

  373. +    separator[0] = Py_GetSepW(NULL);

  374.      memset(&calculate, 0, sizeof(calculate));

  375.  

  376.      status = calculate_init(&calculate, config);

  377. diff -Naur Python-3.8.0-orig/Modules/posixmodule.c Python-3.8.0/Modules/posixmodule.c

  378. --- Python-3.8.0-orig/Modules/posixmodule.c	2019-10-22 10:02:42.087321400 +0300

  379. +++ Python-3.8.0/Modules/posixmodule.c	2019-10-22 10:02:45.238527000 +0300

  380. @@ -3691,7 +3691,7 @@

  381.          Py_END_ALLOW_THREADS

  382.          /* FindNextFile sets error to ERROR_NO_MORE_FILES if

  383.             it got to the end of the directory. */

  384. -        if (!result && GetLastError() != ERROR_NO_MORE_FILES) {

  385. +        if (!result && GetLastError() != 0 && GetLastError() != ERROR_NO_MORE_FILES) {

  386.              Py_DECREF(list);

  387.              list = path_error(path);

  388.              goto exit;

  389. diff -Naur Python-3.8.4-orig/Python/dynload_win.c Python-3.8.4/Python/dynload_win.c

  390. --- Python-3.8.4-orig/Python/dynload_win.c	2019-10-22 10:01:24.710185500 +0300

  391. +++ Python-3.8.4/Python/dynload_win.c	2019-10-22 10:02:45.644127700 +0300

  392. @@ -180,7 +180,9 @@

  393.      char funcname[258], *import_python;

  394.      const wchar_t *wpathname;

  395.  

  396. +#if defined(_MSC_VER)

  397.      _Py_CheckPython3();

  398. +#endif

  399.  

  400.      wpathname = _PyUnicode_AsUnicode(pathname);

  401.      if (wpathname == NULL)