February 2020 - Wine-commits

Olivier F. R. Dierick : shell32: Add a helper function to create 'My Stuff' sub dirs in 'My Documents'.
by Alexandre Julliard 21 Feb '20

21 Feb '20

Module: wine Branch: master Commit: 7642388153992fc7f1efbe5688397ff2607d4c37 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7642388153992fc7f1efbe56… Author: Olivier F. R. Dierick <o.dierick(a)piezo-forte.be> Date: Wed Feb 19 00:16:38 2020 +0100 shell32: Add a helper function to create 'My Stuff' sub dirs in 'My Documents'. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=22974 Signed-off-by: Olivier F. R. Dierick <o.dierick(a)piezo-forte.be> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shellpath.c | 40 +++++++++++++++++++++++++++++----------- 1 file changed, 29 insertions(+), 11 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index 8caf68dc55..0a31ee76d7 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -4050,6 +4050,33 @@ static inline BOOL _SHAppendToUnixPath(char *szBasePath, LPCWSTR pwszSubPath) { return TRUE; } +/****************************************************************************** + * _SHCreateMyDocumentsSubDirs [Internal] + * + * Create real directories for various shell folders under 'My Documents'. For + * Windows and homeless styles. Fails silently for already existing sub dirs. + * + * PARAMS + * aidsMyStuff [I] Array of IDS_* resources to create sub dirs for. + * num [I] Number of elements in aidsMyStuff. + * szPersonalTarget [I] Unix path to 'My Documents' directory. + */ +static void _SHCreateMyDocumentsSubDirs(const UINT * aidsMyStuff, const UINT num, const char * szPersonalTarget) +{ + char szMyStuffTarget[FILENAME_MAX]; + UINT i; + + if (aidsMyStuff && szPersonalTarget) + { + for (i = 0; i < num; i++) + { + strcpy(szMyStuffTarget, szPersonalTarget); + if (_SHAppendToUnixPath(szMyStuffTarget, MAKEINTRESOURCEW(aidsMyStuff[i]))) + mkdir(szMyStuffTarget, 0777); + } + } +} + /****************************************************************************** * _SHCreateSymbolicLinks [Internal] * @@ -4122,12 +4149,7 @@ static void _SHCreateSymbolicLinks(void) * 'My Pictures', 'My Videos', 'My Music' etc. or fail silently * if they already exist. */ - for (i = 0; i < ARRAY_SIZE(aidsMyStuff); i++) - { - strcpy(szMyStuffTarget, szPersonalTarget); - if (_SHAppendToUnixPath(szMyStuffTarget, MAKEINTRESOURCEW(aidsMyStuff[i]))) - mkdir(szMyStuffTarget, 0777); - } + _SHCreateMyDocumentsSubDirs(aidsMyStuff, ARRAY_SIZE(aidsMyStuff), szPersonalTarget); break; } @@ -4163,11 +4185,7 @@ static void _SHCreateSymbolicLinks(void) * they already exist. */ pszHome = NULL; strcpy(szPersonalTarget, pszPersonal); - for (i = 0; i < ARRAY_SIZE(aidsMyStuff); i++) { - strcpy(szMyStuffTarget, szPersonalTarget); - if (_SHAppendToUnixPath(szMyStuffTarget, MAKEINTRESOURCEW(aidsMyStuff[i]))) - mkdir(szMyStuffTarget, 0777); - } + _SHCreateMyDocumentsSubDirs(aidsMyStuff, ARRAY_SIZE(aidsMyStuff), szPersonalTarget); } /* Create symbolic links for 'My Pictures', 'My Videos', 'My Music' etc. */

1 0

Olivier F. R. Dierick : shell32: Add a helper function to create a shell folder from CSIDL and return its unix path.
by Alexandre Julliard 21 Feb '20

21 Feb '20

Module: wine Branch: master Commit: a08d3fe10e38fb7e2e3916797216a6a266c6f1f3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a08d3fe10e38fb7e2e391679… Author: Olivier F. R. Dierick <o.dierick(a)piezo-forte.be> Date: Wed Feb 19 00:16:39 2020 +0100 shell32: Add a helper function to create a shell folder from CSIDL and return its unix path. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=22974 Signed-off-by: Olivier F. R. Dierick <o.dierick(a)piezo-forte.be> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shellpath.c | 38 ++++++++++++++++++++++++-------------- 1 file changed, 24 insertions(+), 14 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index 0a31ee76d7..428b3be24f 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -4050,6 +4050,26 @@ static inline BOOL _SHAppendToUnixPath(char *szBasePath, LPCWSTR pwszSubPath) { return TRUE; } +/****************************************************************************** + * _SHGetFolderUnixPath [Internal] + * + * Create a shell folder and get its unix path. + * + * PARAMS + * nFolder [I] CSIDL identifying the folder. + */ +static inline char * _SHGetFolderUnixPath(const int nFolder) +{ + WCHAR wszTempPath[MAX_PATH]; + HRESULT hr; + + hr = SHGetFolderPathW(NULL, nFolder, NULL, + SHGFP_TYPE_DEFAULT, wszTempPath); + if (FAILED(hr)) return NULL; + + return wine_get_unix_file_name(wszTempPath); +} + /****************************************************************************** * _SHCreateMyDocumentsSubDirs [Internal] * @@ -4115,22 +4135,17 @@ static void _SHCreateSymbolicLinks(void) "PICTURES", "VIDEOS", "MUSIC", "DOWNLOAD", "TEMPLATES", "DOCUMENTS", "DESKTOP" }; static const unsigned int num = ARRAY_SIZE(xdg_dirs); - WCHAR wszTempPath[MAX_PATH]; char szPersonalTarget[FILENAME_MAX], *pszPersonal; char szMyStuffTarget[FILENAME_MAX], *pszMyStuff; char szDesktopTarget[FILENAME_MAX], *pszDesktop; struct stat statFolder; const char *pszHome; - HRESULT hr; char ** xdg_results; char * xdg_desktop_dir; UINT i; /* Create all necessary profile sub-dirs up to 'My Documents' and get the unix path. */ - hr = SHGetFolderPathW(NULL, CSIDL_PERSONAL|CSIDL_FLAG_CREATE, NULL, - SHGFP_TYPE_DEFAULT, wszTempPath); - if (FAILED(hr)) return; - pszPersonal = wine_get_unix_file_name(wszTempPath); + pszPersonal = _SHGetFolderUnixPath(CSIDL_PERSONAL|CSIDL_FLAG_CREATE); if (!pszPersonal) return; _SHGetXDGUserDirs(xdg_dirs, num, &xdg_results); @@ -4192,11 +4207,7 @@ static void _SHCreateSymbolicLinks(void) for (i=0; i < ARRAY_SIZE(aidsMyStuff); i++) { /* Create the current 'My Whatever' folder and get its unix path. */ - hr = SHGetFolderPathW(NULL, acsidlMyStuff[i]|CSIDL_FLAG_CREATE, NULL, - SHGFP_TYPE_DEFAULT, wszTempPath); - if (FAILED(hr)) continue; - - pszMyStuff = wine_get_unix_file_name(wszTempPath); + pszMyStuff = _SHGetFolderUnixPath(acsidlMyStuff[i]|CSIDL_FLAG_CREATE); if (!pszMyStuff) continue; while (1) @@ -4245,9 +4256,8 @@ static void _SHCreateSymbolicLinks(void) (_SHAppendToUnixPath(szDesktopTarget, DesktopW) && !stat(szDesktopTarget, &statFolder) && S_ISDIR(statFolder.st_mode))) { - hr = SHGetFolderPathW(NULL, CSIDL_DESKTOPDIRECTORY|CSIDL_FLAG_CREATE, NULL, - SHGFP_TYPE_DEFAULT, wszTempPath); - if (SUCCEEDED(hr) && (pszDesktop = wine_get_unix_file_name(wszTempPath))) + pszDesktop = _SHGetFolderUnixPath(CSIDL_DESKTOPDIRECTORY|CSIDL_FLAG_CREATE); + if (pszDesktop) { remove(pszDesktop); if (xdg_desktop_dir)

1 0

Olivier F. R. Dierick : shell32: Move 'My Documents' symbolic link creation in a separate function.
by Alexandre Julliard 21 Feb '20

21 Feb '20

Module: wine Branch: master Commit: fe89ae49659292a39c38363a64e44e0dd4aadb43 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fe89ae49659292a39c38363a… Author: Olivier F. R. Dierick <o.dierick(a)piezo-forte.be> Date: Wed Feb 19 00:16:40 2020 +0100 shell32: Move 'My Documents' symbolic link creation in a separate function. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=22974 Signed-off-by: Olivier F. R. Dierick <o.dierick(a)piezo-forte.be> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shellpath.c | 125 +++++++++++++++++++++++++++++++---------------- 1 file changed, 83 insertions(+), 42 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index 428b3be24f..f790afa2df 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -4098,51 +4098,23 @@ static void _SHCreateMyDocumentsSubDirs(const UINT * aidsMyStuff, const UINT num } /****************************************************************************** - * _SHCreateSymbolicLinks [Internal] + * _SHCreateMyDocumentsSymbolicLink [Internal] * - * Sets up symbol links for various shell folders to point into the user's home - * directory. We do an educated guess about what the user would probably want: - * - If there is a 'My Documents' directory in $HOME, the user probably wants - * wine's 'My Documents' to point there. Furthermore, we infer that the user - * is a Windows lover and has no problem with wine creating subfolders for - * 'My Pictures', 'My Music', 'My Videos' etc. under '$HOME/My Documents', if - * those do not already exist. We put appropriate symbolic links in place for - * those, too. - * - If there is no 'My Documents' directory in $HOME, we let 'My Documents' - * point directly to $HOME. We assume the user to be a unix hacker who does not - * want wine to create anything anywhere besides the .wine directory. So, if - * there already is a 'My Music' directory in $HOME, we symlink the 'My Music' - * shell folder to it. But if not, then we check XDG_MUSIC_DIR - "well known" - * directory, and try to link to that. If that fails, then we symlink to - * $HOME directly. The same holds for 'My Pictures', 'My Videos' etc. - * - The Desktop shell folder is symlinked to XDG_DESKTOP_DIR. If that does not - * exist, then we try '$HOME/Desktop'. If that does not exist, then we leave - * it alone. - * ('My Music',... above in fact means LoadString(IDS_MYMUSIC)) + * Sets up a symbolic link for the 'My Documents' shell folder to point into + * the users home directory. + * + * PARAMS + * aidsMyStuff [I] Array of IDS_* resources to create sub dirs for. + * aids_num [I] Number of elements in aidsMyStuff. */ -static void _SHCreateSymbolicLinks(void) +static void _SHCreateMyDocumentsSymbolicLink(const UINT * aidsMyStuff, const UINT aids_num) { - static const UINT aidsMyStuff[] = { - IDS_MYPICTURES, IDS_MYVIDEOS, IDS_MYMUSIC, IDS_DOWNLOADS, IDS_TEMPLATES - }; - static const WCHAR * const MyOSXStuffW[] = { - PicturesW, MoviesW, MusicW, DownloadsW, TemplatesW - }; - static const int acsidlMyStuff[] = { - CSIDL_MYPICTURES, CSIDL_MYVIDEO, CSIDL_MYMUSIC, CSIDL_DOWNLOADS, CSIDL_TEMPLATES - }; - static const char * const xdg_dirs[] = { - "PICTURES", "VIDEOS", "MUSIC", "DOWNLOAD", "TEMPLATES", "DOCUMENTS", "DESKTOP" - }; + static const char * const xdg_dirs[] = { "DOCUMENTS" }; static const unsigned int num = ARRAY_SIZE(xdg_dirs); char szPersonalTarget[FILENAME_MAX], *pszPersonal; - char szMyStuffTarget[FILENAME_MAX], *pszMyStuff; - char szDesktopTarget[FILENAME_MAX], *pszDesktop; struct stat statFolder; const char *pszHome; char ** xdg_results; - char * xdg_desktop_dir; - UINT i; /* Create all necessary profile sub-dirs up to 'My Documents' and get the unix path. */ pszPersonal = _SHGetFolderUnixPath(CSIDL_PERSONAL|CSIDL_FLAG_CREATE); @@ -4164,16 +4136,16 @@ static void _SHCreateSymbolicLinks(void) * 'My Pictures', 'My Videos', 'My Music' etc. or fail silently * if they already exist. */ - _SHCreateMyDocumentsSubDirs(aidsMyStuff, ARRAY_SIZE(aidsMyStuff), szPersonalTarget); + _SHCreateMyDocumentsSubDirs(aidsMyStuff, aids_num, szPersonalTarget); break; } /* Try to point to the XDG Documents folder */ - if (xdg_results && xdg_results[num-2] && - !stat(xdg_results[num-2], &statFolder) && + if (xdg_results && xdg_results[0] && + !stat(xdg_results[0], &statFolder) && S_ISDIR(statFolder.st_mode)) { - strcpy(szPersonalTarget, xdg_results[num-2]); + strcpy(szPersonalTarget, xdg_results[0]); break; } @@ -4200,9 +4172,78 @@ static void _SHCreateSymbolicLinks(void) * they already exist. */ pszHome = NULL; strcpy(szPersonalTarget, pszPersonal); - _SHCreateMyDocumentsSubDirs(aidsMyStuff, ARRAY_SIZE(aidsMyStuff), szPersonalTarget); + _SHCreateMyDocumentsSubDirs(aidsMyStuff, aids_num, szPersonalTarget); } + heap_free(pszPersonal); + + _SHFreeXDGUserDirs(num, xdg_results); +} + +/****************************************************************************** + * _SHCreateSymbolicLinks [Internal] + * + * Sets up symbol links for various shell folders to point into the user's home + * directory. We do an educated guess about what the user would probably want: + * - If there is a 'My Documents' directory in $HOME, the user probably wants + * wine's 'My Documents' to point there. Furthermore, we infer that the user + * is a Windows lover and has no problem with wine creating subfolders for + * 'My Pictures', 'My Music', 'My Videos' etc. under '$HOME/My Documents', if + * those do not already exist. We put appropriate symbolic links in place for + * those, too. + * - If there is no 'My Documents' directory in $HOME, we let 'My Documents' + * point directly to $HOME. We assume the user to be a unix hacker who does not + * want wine to create anything anywhere besides the .wine directory. So, if + * there already is a 'My Music' directory in $HOME, we symlink the 'My Music' + * shell folder to it. But if not, then we check XDG_MUSIC_DIR - "well known" + * directory, and try to link to that. If that fails, then we symlink to + * $HOME directly. The same holds for 'My Pictures', 'My Videos' etc. + * - The Desktop shell folder is symlinked to XDG_DESKTOP_DIR. If that does not + * exist, then we try '$HOME/Desktop'. If that does not exist, then we leave + * it alone. + * ('My Music',... above in fact means LoadString(IDS_MYMUSIC)) + */ +static void _SHCreateSymbolicLinks(void) +{ + static const UINT aidsMyStuff[] = { + IDS_MYPICTURES, IDS_MYVIDEOS, IDS_MYMUSIC, IDS_DOWNLOADS, IDS_TEMPLATES + }; + static const WCHAR * const MyOSXStuffW[] = { + PicturesW, MoviesW, MusicW, DownloadsW, TemplatesW + }; + static const int acsidlMyStuff[] = { + CSIDL_MYPICTURES, CSIDL_MYVIDEO, CSIDL_MYMUSIC, CSIDL_DOWNLOADS, CSIDL_TEMPLATES + }; + static const char * const xdg_dirs[] = { + "PICTURES", "VIDEOS", "MUSIC", "DOWNLOAD", "TEMPLATES", "DESKTOP" + }; + static const unsigned int num = ARRAY_SIZE(xdg_dirs); + char szPersonalTarget[FILENAME_MAX], *pszPersonal; + char szMyStuffTarget[FILENAME_MAX], *pszMyStuff; + char szDesktopTarget[FILENAME_MAX], *pszDesktop; + struct stat statFolder; + const char *pszHome; + char ** xdg_results; + char * xdg_desktop_dir; + UINT i; + + _SHCreateMyDocumentsSymbolicLink(aidsMyStuff, ARRAY_SIZE(aidsMyStuff)); + + /* Create all necessary profile sub-dirs up to 'My Documents' and get the unix path. */ + pszPersonal = _SHGetFolderUnixPath(CSIDL_PERSONAL|CSIDL_FLAG_CREATE); + if (!pszPersonal) return; + + strcpy(szPersonalTarget, pszPersonal); + if (!stat(pszPersonal, &statFolder) && S_ISLNK(statFolder.st_mode)) + { + int cLen = readlink(pszPersonal, szPersonalTarget, FILENAME_MAX-1); + if (cLen >= 0) szPersonalTarget[cLen] = '\0'; + } + + _SHGetXDGUserDirs(xdg_dirs, num, &xdg_results); + + pszHome = getenv("HOME"); + /* Create symbolic links for 'My Pictures', 'My Videos', 'My Music' etc. */ for (i=0; i < ARRAY_SIZE(aidsMyStuff); i++) {

1 0

Olivier F. R. Dierick : shell32: Move 'My Stuff' symbolic link creation in a separate generic function.
by Alexandre Julliard 21 Feb '20

21 Feb '20

Module: wine Branch: master Commit: c6d8f1ac28e2cf3d703acd6d0a8f76289cf20adb URL: https://source.winehq.org/git/wine.git/?a=commit;h=c6d8f1ac28e2cf3d703acd6d… Author: Olivier F. R. Dierick <o.dierick(a)piezo-forte.be> Date: Wed Feb 19 00:16:41 2020 +0100 shell32: Move 'My Stuff' symbolic link creation in a separate generic function. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=22974 Signed-off-by: Olivier F. R. Dierick <o.dierick(a)piezo-forte.be> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shellpath.c | 101 ++++++++++++++++++++++++++++++++++------------- 1 file changed, 73 insertions(+), 28 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index f790afa2df..e9835dbe03 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -4181,29 +4181,15 @@ static void _SHCreateMyDocumentsSymbolicLink(const UINT * aidsMyStuff, const UIN } /****************************************************************************** - * _SHCreateSymbolicLinks [Internal] + * _SHCreateMyStuffSymbolicLink [Internal] * - * Sets up symbol links for various shell folders to point into the user's home - * directory. We do an educated guess about what the user would probably want: - * - If there is a 'My Documents' directory in $HOME, the user probably wants - * wine's 'My Documents' to point there. Furthermore, we infer that the user - * is a Windows lover and has no problem with wine creating subfolders for - * 'My Pictures', 'My Music', 'My Videos' etc. under '$HOME/My Documents', if - * those do not already exist. We put appropriate symbolic links in place for - * those, too. - * - If there is no 'My Documents' directory in $HOME, we let 'My Documents' - * point directly to $HOME. We assume the user to be a unix hacker who does not - * want wine to create anything anywhere besides the .wine directory. So, if - * there already is a 'My Music' directory in $HOME, we symlink the 'My Music' - * shell folder to it. But if not, then we check XDG_MUSIC_DIR - "well known" - * directory, and try to link to that. If that fails, then we symlink to - * $HOME directly. The same holds for 'My Pictures', 'My Videos' etc. - * - The Desktop shell folder is symlinked to XDG_DESKTOP_DIR. If that does not - * exist, then we try '$HOME/Desktop'. If that does not exist, then we leave - * it alone. - * ('My Music',... above in fact means LoadString(IDS_MYMUSIC)) + * Sets up a symbolic link for one of the 'My Whatever' shell folders to point + * into the users home directory. + * + * PARAMS + * nFolder [I] CSIDL identifying the folder. */ -static void _SHCreateSymbolicLinks(void) +static void _SHCreateMyStuffSymbolicLink(int nFolder) { static const UINT aidsMyStuff[] = { IDS_MYPICTURES, IDS_MYVIDEOS, IDS_MYMUSIC, IDS_DOWNLOADS, IDS_TEMPLATES @@ -4215,19 +4201,19 @@ static void _SHCreateSymbolicLinks(void) CSIDL_MYPICTURES, CSIDL_MYVIDEO, CSIDL_MYMUSIC, CSIDL_DOWNLOADS, CSIDL_TEMPLATES }; static const char * const xdg_dirs[] = { - "PICTURES", "VIDEOS", "MUSIC", "DOWNLOAD", "TEMPLATES", "DESKTOP" + "PICTURES", "VIDEOS", "MUSIC", "DOWNLOAD", "TEMPLATES" }; static const unsigned int num = ARRAY_SIZE(xdg_dirs); char szPersonalTarget[FILENAME_MAX], *pszPersonal; char szMyStuffTarget[FILENAME_MAX], *pszMyStuff; - char szDesktopTarget[FILENAME_MAX], *pszDesktop; struct stat statFolder; const char *pszHome; char ** xdg_results; - char * xdg_desktop_dir; + DWORD folder = nFolder & CSIDL_FOLDER_MASK; UINT i; - _SHCreateMyDocumentsSymbolicLink(aidsMyStuff, ARRAY_SIZE(aidsMyStuff)); + for (i = 0; i < ARRAY_SIZE(acsidlMyStuff) && acsidlMyStuff[i] != folder; i++); + if (i >= ARRAY_SIZE(acsidlMyStuff)) return; /* Create all necessary profile sub-dirs up to 'My Documents' and get the unix path. */ pszPersonal = _SHGetFolderUnixPath(CSIDL_PERSONAL|CSIDL_FLAG_CREATE); @@ -4239,17 +4225,17 @@ static void _SHCreateSymbolicLinks(void) int cLen = readlink(pszPersonal, szPersonalTarget, FILENAME_MAX-1); if (cLen >= 0) szPersonalTarget[cLen] = '\0'; } + heap_free(pszPersonal); _SHGetXDGUserDirs(xdg_dirs, num, &xdg_results); pszHome = getenv("HOME"); - /* Create symbolic links for 'My Pictures', 'My Videos', 'My Music' etc. */ - for (i=0; i < ARRAY_SIZE(aidsMyStuff); i++) + while (1) { /* Create the current 'My Whatever' folder and get its unix path. */ pszMyStuff = _SHGetFolderUnixPath(acsidlMyStuff[i]|CSIDL_FLAG_CREATE); - if (!pszMyStuff) continue; + if (!pszMyStuff) break; while (1) { @@ -4283,8 +4269,67 @@ static void _SHCreateSymbolicLinks(void) remove(pszMyStuff); symlink(szMyStuffTarget, pszMyStuff); heap_free(pszMyStuff); + break; } + _SHFreeXDGUserDirs(num, xdg_results); +} + +/****************************************************************************** + * _SHCreateSymbolicLinks [Internal] + * + * Sets up symbol links for various shell folders to point into the user's home + * directory. We do an educated guess about what the user would probably want: + * - If there is a 'My Documents' directory in $HOME, the user probably wants + * wine's 'My Documents' to point there. Furthermore, we infer that the user + * is a Windows lover and has no problem with wine creating subfolders for + * 'My Pictures', 'My Music', 'My Videos' etc. under '$HOME/My Documents', if + * those do not already exist. We put appropriate symbolic links in place for + * those, too. + * - If there is no 'My Documents' directory in $HOME, we let 'My Documents' + * point directly to $HOME. We assume the user to be a unix hacker who does not + * want wine to create anything anywhere besides the .wine directory. So, if + * there already is a 'My Music' directory in $HOME, we symlink the 'My Music' + * shell folder to it. But if not, then we check XDG_MUSIC_DIR - "well known" + * directory, and try to link to that. If that fails, then we symlink to + * $HOME directly. The same holds for 'My Pictures', 'My Videos' etc. + * - The Desktop shell folder is symlinked to XDG_DESKTOP_DIR. If that does not + * exist, then we try '$HOME/Desktop'. If that does not exist, then we leave + * it alone. + * ('My Music',... above in fact means LoadString(IDS_MYMUSIC)) + */ +static void _SHCreateSymbolicLinks(void) +{ + static const UINT aidsMyStuff[] = { + IDS_MYPICTURES, IDS_MYVIDEOS, IDS_MYMUSIC, IDS_DOWNLOADS, IDS_TEMPLATES + }; + static const int acsidlMyStuff[] = { + CSIDL_MYPICTURES, CSIDL_MYVIDEO, CSIDL_MYMUSIC, CSIDL_DOWNLOADS, CSIDL_TEMPLATES + }; + static const char * const xdg_dirs[] = { "DESKTOP" }; + static const unsigned int num = ARRAY_SIZE(xdg_dirs); + char *pszPersonal; + char szDesktopTarget[FILENAME_MAX], *pszDesktop; + struct stat statFolder; + const char *pszHome; + char ** xdg_results; + char * xdg_desktop_dir; + UINT i; + + _SHCreateMyDocumentsSymbolicLink(aidsMyStuff, ARRAY_SIZE(aidsMyStuff)); + + /* Create symbolic links for 'My Pictures', 'My Videos', 'My Music' etc. */ + for (i=0; i < ARRAY_SIZE(acsidlMyStuff); i++) + _SHCreateMyStuffSymbolicLink(acsidlMyStuff[i]); + + /* Create all necessary profile sub-dirs up to 'My Documents' and get the unix path. */ + pszPersonal = _SHGetFolderUnixPath(CSIDL_PERSONAL|CSIDL_FLAG_CREATE); + if (!pszPersonal) return; + + _SHGetXDGUserDirs(xdg_dirs, num, &xdg_results); + + pszHome = getenv("HOME"); + /* Last but not least, the Desktop folder */ if (pszHome) strcpy(szDesktopTarget, pszHome);

1 0

Olivier F. R. Dierick : shell32: Move 'Desktop' symbolic link creation to a separate function.
by Alexandre Julliard 21 Feb '20

21 Feb '20

Module: wine Branch: master Commit: 60915a5544def2dd224bdd3e1d34fbfb0161a8e6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=60915a5544def2dd224bdd3e… Author: Olivier F. R. Dierick <o.dierick(a)piezo-forte.be> Date: Wed Feb 19 00:16:42 2020 +0100 shell32: Move 'Desktop' symbolic link creation to a separate function. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=22974 Signed-off-by: Olivier F. R. Dierick <o.dierick(a)piezo-forte.be> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shellpath.c | 84 +++++++++++++++++++++++++++--------------------- 1 file changed, 48 insertions(+), 36 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index e9835dbe03..2012ecbe35 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -4276,36 +4276,13 @@ static void _SHCreateMyStuffSymbolicLink(int nFolder) } /****************************************************************************** - * _SHCreateSymbolicLinks [Internal] + * _SHCreateDesktopSymbolicLink [Internal] * - * Sets up symbol links for various shell folders to point into the user's home - * directory. We do an educated guess about what the user would probably want: - * - If there is a 'My Documents' directory in $HOME, the user probably wants - * wine's 'My Documents' to point there. Furthermore, we infer that the user - * is a Windows lover and has no problem with wine creating subfolders for - * 'My Pictures', 'My Music', 'My Videos' etc. under '$HOME/My Documents', if - * those do not already exist. We put appropriate symbolic links in place for - * those, too. - * - If there is no 'My Documents' directory in $HOME, we let 'My Documents' - * point directly to $HOME. We assume the user to be a unix hacker who does not - * want wine to create anything anywhere besides the .wine directory. So, if - * there already is a 'My Music' directory in $HOME, we symlink the 'My Music' - * shell folder to it. But if not, then we check XDG_MUSIC_DIR - "well known" - * directory, and try to link to that. If that fails, then we symlink to - * $HOME directly. The same holds for 'My Pictures', 'My Videos' etc. - * - The Desktop shell folder is symlinked to XDG_DESKTOP_DIR. If that does not - * exist, then we try '$HOME/Desktop'. If that does not exist, then we leave - * it alone. - * ('My Music',... above in fact means LoadString(IDS_MYMUSIC)) + * Sets up a symbolic link for the 'Desktop' shell folder to point into the + * users home directory. */ -static void _SHCreateSymbolicLinks(void) +static void _SHCreateDesktopSymbolicLink(void) { - static const UINT aidsMyStuff[] = { - IDS_MYPICTURES, IDS_MYVIDEOS, IDS_MYMUSIC, IDS_DOWNLOADS, IDS_TEMPLATES - }; - static const int acsidlMyStuff[] = { - CSIDL_MYPICTURES, CSIDL_MYVIDEO, CSIDL_MYMUSIC, CSIDL_DOWNLOADS, CSIDL_TEMPLATES - }; static const char * const xdg_dirs[] = { "DESKTOP" }; static const unsigned int num = ARRAY_SIZE(xdg_dirs); char *pszPersonal; @@ -4314,13 +4291,6 @@ static void _SHCreateSymbolicLinks(void) const char *pszHome; char ** xdg_results; char * xdg_desktop_dir; - UINT i; - - _SHCreateMyDocumentsSymbolicLink(aidsMyStuff, ARRAY_SIZE(aidsMyStuff)); - - /* Create symbolic links for 'My Pictures', 'My Videos', 'My Music' etc. */ - for (i=0; i < ARRAY_SIZE(acsidlMyStuff); i++) - _SHCreateMyStuffSymbolicLink(acsidlMyStuff[i]); /* Create all necessary profile sub-dirs up to 'My Documents' and get the unix path. */ pszPersonal = _SHGetFolderUnixPath(CSIDL_PERSONAL|CSIDL_FLAG_CREATE); @@ -4330,14 +4300,13 @@ static void _SHCreateSymbolicLinks(void) pszHome = getenv("HOME"); - /* Last but not least, the Desktop folder */ if (pszHome) strcpy(szDesktopTarget, pszHome); else strcpy(szDesktopTarget, pszPersonal); heap_free(pszPersonal); - xdg_desktop_dir = xdg_results ? xdg_results[num - 1] : NULL; + xdg_desktop_dir = xdg_results ? xdg_results[0] : NULL; if (xdg_desktop_dir || (_SHAppendToUnixPath(szDesktopTarget, DesktopW) && !stat(szDesktopTarget, &statFolder) && S_ISDIR(statFolder.st_mode))) @@ -4357,6 +4326,49 @@ static void _SHCreateSymbolicLinks(void) _SHFreeXDGUserDirs(num, xdg_results); } +/****************************************************************************** + * _SHCreateSymbolicLinks [Internal] + * + * Sets up symbol links for various shell folders to point into the user's home + * directory. We do an educated guess about what the user would probably want: + * - If there is a 'My Documents' directory in $HOME, the user probably wants + * wine's 'My Documents' to point there. Furthermore, we infer that the user + * is a Windows lover and has no problem with wine creating subfolders for + * 'My Pictures', 'My Music', 'My Videos' etc. under '$HOME/My Documents', if + * those do not already exist. We put appropriate symbolic links in place for + * those, too. + * - If there is no 'My Documents' directory in $HOME, we let 'My Documents' + * point directly to $HOME. We assume the user to be a unix hacker who does not + * want wine to create anything anywhere besides the .wine directory. So, if + * there already is a 'My Music' directory in $HOME, we symlink the 'My Music' + * shell folder to it. But if not, then we check XDG_MUSIC_DIR - "well known" + * directory, and try to link to that. If that fails, then we symlink to + * $HOME directly. The same holds for 'My Pictures', 'My Videos' etc. + * - The Desktop shell folder is symlinked to XDG_DESKTOP_DIR. If that does not + * exist, then we try '$HOME/Desktop'. If that does not exist, then we leave + * it alone. + * ('My Music',... above in fact means LoadString(IDS_MYMUSIC)) + */ +static void _SHCreateSymbolicLinks(void) +{ + static const UINT aidsMyStuff[] = { + IDS_MYPICTURES, IDS_MYVIDEOS, IDS_MYMUSIC, IDS_DOWNLOADS, IDS_TEMPLATES + }; + static const int acsidlMyStuff[] = { + CSIDL_MYPICTURES, CSIDL_MYVIDEO, CSIDL_MYMUSIC, CSIDL_DOWNLOADS, CSIDL_TEMPLATES + }; + UINT i; + + _SHCreateMyDocumentsSymbolicLink(aidsMyStuff, ARRAY_SIZE(aidsMyStuff)); + + /* Create symbolic links for 'My Pictures', 'My Videos', 'My Music' etc. */ + for (i=0; i < ARRAY_SIZE(acsidlMyStuff); i++) + _SHCreateMyStuffSymbolicLink(acsidlMyStuff[i]); + + /* Last but not least, the Desktop folder */ + _SHCreateDesktopSymbolicLink(); +} + /****************************************************************************** * SHGetFolderPathW [SHELL32.@] *

1 0

Olivier F. R. Dierick : shell32: Add a function to create one specific symbolic link at a time for user dirs.
by Alexandre Julliard 21 Feb '20

21 Feb '20

Module: wine Branch: master Commit: 9cb47e882123dfdbc0f93ef0d7fb0068edda80d0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9cb47e882123dfdbc0f93ef0… Author: Olivier F. R. Dierick <o.dierick(a)piezo-forte.be> Date: Wed Feb 19 00:16:43 2020 +0100 shell32: Add a function to create one specific symbolic link at a time for user dirs. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=22974 Signed-off-by: Olivier F. R. Dierick <o.dierick(a)piezo-forte.be> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shellpath.c | 46 +++++++++++++++++++++++++++++++++++----------- 1 file changed, 35 insertions(+), 11 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index 2012ecbe35..d32529bae3 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -4326,6 +4326,39 @@ static void _SHCreateDesktopSymbolicLink(void) _SHFreeXDGUserDirs(num, xdg_results); } +/****************************************************************************** + * _SHCreateSymbolicLink [Internal] + * + * Sets up a symbolic link for one of the special shell folders to point into + * the users home directory. + * + * PARAMS + * nFolder [I] CSIDL identifying the folder. + */ +static void _SHCreateSymbolicLink(int nFolder) +{ + static const UINT aidsMyStuff[] = { + IDS_MYPICTURES, IDS_MYVIDEOS, IDS_MYMUSIC, IDS_DOWNLOADS, IDS_TEMPLATES + }; + DWORD folder = nFolder & CSIDL_FOLDER_MASK; + + switch (folder) { + case CSIDL_PERSONAL: + _SHCreateMyDocumentsSymbolicLink(aidsMyStuff, ARRAY_SIZE(aidsMyStuff)); + break; + case CSIDL_MYPICTURES: + case CSIDL_MYVIDEO: + case CSIDL_MYMUSIC: + case CSIDL_DOWNLOADS: + case CSIDL_TEMPLATES: + _SHCreateMyStuffSymbolicLink(folder); + break; + case CSIDL_DESKTOPDIRECTORY: + _SHCreateDesktopSymbolicLink(); + break; + } +} + /****************************************************************************** * _SHCreateSymbolicLinks [Internal] * @@ -4351,22 +4384,13 @@ static void _SHCreateDesktopSymbolicLink(void) */ static void _SHCreateSymbolicLinks(void) { - static const UINT aidsMyStuff[] = { - IDS_MYPICTURES, IDS_MYVIDEOS, IDS_MYMUSIC, IDS_DOWNLOADS, IDS_TEMPLATES - }; static const int acsidlMyStuff[] = { - CSIDL_MYPICTURES, CSIDL_MYVIDEO, CSIDL_MYMUSIC, CSIDL_DOWNLOADS, CSIDL_TEMPLATES + CSIDL_MYPICTURES, CSIDL_MYVIDEO, CSIDL_MYMUSIC, CSIDL_DOWNLOADS, CSIDL_TEMPLATES, CSIDL_PERSONAL, CSIDL_DESKTOPDIRECTORY }; UINT i; - _SHCreateMyDocumentsSymbolicLink(aidsMyStuff, ARRAY_SIZE(aidsMyStuff)); - - /* Create symbolic links for 'My Pictures', 'My Videos', 'My Music' etc. */ for (i=0; i < ARRAY_SIZE(acsidlMyStuff); i++) - _SHCreateMyStuffSymbolicLink(acsidlMyStuff[i]); - - /* Last but not least, the Desktop folder */ - _SHCreateDesktopSymbolicLink(); + _SHCreateSymbolicLink(acsidlMyStuff[i]); } /******************************************************************************

1 0

Olivier F. R. Dierick : shell32: Create user folder symlinks on lookup and only if it's missing.
by Alexandre Julliard 21 Feb '20

21 Feb '20

Module: wine Branch: master Commit: 2aad95254c19df21fc0f7c4413ca3874c8d87997 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2aad95254c19df21fc0f7c44… Author: Olivier F. R. Dierick <o.dierick(a)piezo-forte.be> Date: Wed Feb 19 00:16:44 2020 +0100 shell32: Create user folder symlinks on lookup and only if it's missing. Change the logic so that when a user folder already exists in the prefix, as a real directory or symbolic link, it's left as-is. Also create a symbolic link, instead of a real directory, when looking up a user folder that is currently missing. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=22974 Signed-off-by: Olivier F. R. Dierick <o.dierick(a)piezo-forte.be> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shellpath.c | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index d32529bae3..71267ecf58 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -4116,8 +4116,8 @@ static void _SHCreateMyDocumentsSymbolicLink(const UINT * aidsMyStuff, const UIN const char *pszHome; char ** xdg_results; - /* Create all necessary profile sub-dirs up to 'My Documents' and get the unix path. */ - pszPersonal = _SHGetFolderUnixPath(CSIDL_PERSONAL|CSIDL_FLAG_CREATE); + /* Get the unix path of 'My Documents'. */ + pszPersonal = _SHGetFolderUnixPath(CSIDL_PERSONAL|CSIDL_FLAG_DONT_VERIFY); if (!pszPersonal) return; _SHGetXDGUserDirs(xdg_dirs, num, &xdg_results); @@ -4161,8 +4161,8 @@ static void _SHCreateMyDocumentsSymbolicLink(const UINT * aidsMyStuff, const UIN break; } - /* Replace 'My Documents' directory with a symlink or fail silently if not empty. */ - remove(pszPersonal); + /* Create symbolic link to 'My Documents' or fail silently if a directory + * or symlink exists. */ symlink(szPersonalTarget, pszPersonal); } else @@ -4233,8 +4233,8 @@ static void _SHCreateMyStuffSymbolicLink(int nFolder) while (1) { - /* Create the current 'My Whatever' folder and get its unix path. */ - pszMyStuff = _SHGetFolderUnixPath(acsidlMyStuff[i]|CSIDL_FLAG_CREATE); + /* Get the current 'My Whatever' folder unix path. */ + pszMyStuff = _SHGetFolderUnixPath(acsidlMyStuff[i]|CSIDL_FLAG_DONT_VERIFY); if (!pszMyStuff) break; while (1) @@ -4266,7 +4266,6 @@ static void _SHCreateMyStuffSymbolicLink(int nFolder) strcpy(szMyStuffTarget, szPersonalTarget); break; } - remove(pszMyStuff); symlink(szMyStuffTarget, pszMyStuff); heap_free(pszMyStuff); break; @@ -4311,10 +4310,9 @@ static void _SHCreateDesktopSymbolicLink(void) (_SHAppendToUnixPath(szDesktopTarget, DesktopW) && !stat(szDesktopTarget, &statFolder) && S_ISDIR(statFolder.st_mode))) { - pszDesktop = _SHGetFolderUnixPath(CSIDL_DESKTOPDIRECTORY|CSIDL_FLAG_CREATE); + pszDesktop = _SHGetFolderUnixPath(CSIDL_DESKTOPDIRECTORY|CSIDL_FLAG_DONT_VERIFY); if (pszDesktop) { - remove(pszDesktop); if (xdg_desktop_dir) symlink(xdg_desktop_dir, pszDesktop); else @@ -4599,6 +4597,10 @@ HRESULT WINAPI SHGetFolderPathAndSubDirW( goto end; } + /* create symbolic links rather than directories for specific + * user shell folders */ + _SHCreateSymbolicLink(folder); + /* create directory/directories */ ret = SHCreateDirectoryExW(hwndOwner, szBuildPath, NULL); if (ret && ret != ERROR_ALREADY_EXISTS) @@ -5232,6 +5234,10 @@ HRESULT WINAPI SHGetKnownFolderPath(REFKNOWNFOLDERID rfid, DWORD flags, HANDLE t goto failed; } + /* create symbolic links rather than directories for specific + * user shell folders */ + _SHCreateSymbolicLink(folder); + /* create directory/directories */ ret = SHCreateDirectoryExW(NULL, pathW, NULL); if (ret && ret != ERROR_ALREADY_EXISTS)

1 0

Francois Gouget : advapi32/tests: Simplify the name of the test unit for child processes.
by Alexandre Julliard 21 Feb '20

21 Feb '20

Module: wine Branch: master Commit: efb5050894b8d49c3c4e8fa861ab9767f991cebe URL: https://source.winehq.org/git/wine.git/?a=commit;h=efb5050894b8d49c3c4e8fa8… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Feb 20 19:20:23 2020 +0100 advapi32/tests: Simplify the name of the test unit for child processes. The official name (shown by --list) has no path nor extension. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/security.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index afcdb6328e..d003a7f1a0 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -3010,7 +3010,7 @@ static void test_process_security(void) CHECK_SET_SECURITY( event, DACL_SECURITY_INFORMATION, ERROR_SUCCESS ); test_group_equal( event, UsersSid, __LINE__ ); - sprintf(buffer, "%s tests/security.c test", myARGV[0]); + sprintf(buffer, "%s security test", myARGV[0]); memset(&startup, 0, sizeof(startup)); startup.cb = sizeof(startup); startup.dwFlags = STARTF_USESHOWWINDOW; @@ -7186,7 +7186,7 @@ static void test_token_security_descriptor(void) startup.dwFlags = STARTF_USESHOWWINDOW; startup.wShowWindow = SW_SHOWNORMAL; - sprintf(buffer, "%s tests/security.c test_token_sd", myARGV[0]); + sprintf(buffer, "%s security test_token_sd", myARGV[0]); ret = CreateProcessA(NULL, buffer, NULL, NULL, FALSE, 0, NULL, NULL, &startup, &info); ok(ret, "CreateProcess failed with error %u\n", GetLastError()); winetest_wait_child_process(info.hProcess);

1 0

Gabriel Ivăncescu : jscript: Initialize the script context in SetScriptSite.
by Alexandre Julliard 21 Feb '20

21 Feb '20

Module: wine Branch: master Commit: 522340aeb3ea3611f9302743b6392381c5f28464 URL: https://source.winehq.org/git/wine.git/?a=commit;h=522340aeb3ea3611f9302743… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Feb 20 21:26:38 2020 +0100 jscript: Initialize the script context in SetScriptSite. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/jscript.c | 98 +++++++++++++++++++++++++------------------------- 1 file changed, 48 insertions(+), 50 deletions(-) diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index 8f97fa818d..8fc39c292c 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -57,6 +57,7 @@ typedef struct { DWORD version; BOOL html_mode; BOOL is_encode; + BOOL is_initialized; IActiveScriptSite *site; @@ -343,23 +344,6 @@ static void exec_queued_code(JScript *This) clear_script_queue(This); } -static HRESULT set_ctx_site(JScript *This) -{ - HRESULT hres; - - This->ctx->lcid = This->lcid; - - hres = init_global(This->ctx); - if(FAILED(hres)) - return hres; - - IActiveScriptSite_AddRef(This->site); - This->ctx->site = This->site; - - change_state(This, SCRIPTSTATE_INITIALIZED); - return S_OK; -} - static void decrease_state(JScript *This, SCRIPTSTATE state) { if(This->ctx) { @@ -641,6 +625,35 @@ static HRESULT WINAPI JScript_SetScriptSite(IActiveScript *iface, if(InterlockedCompareExchange(&This->thread_id, GetCurrentThreadId(), 0)) return E_UNEXPECTED; + if(!This->ctx) { + script_ctx_t *ctx = heap_alloc_zero(sizeof(script_ctx_t)); + if(!ctx) + return E_OUTOFMEMORY; + + ctx->ref = 1; + ctx->state = SCRIPTSTATE_UNINITIALIZED; + ctx->active_script = &This->IActiveScript_iface; + ctx->safeopt = This->safeopt; + ctx->version = This->version; + ctx->html_mode = This->html_mode; + ctx->acc = jsval_undefined(); + heap_pool_init(&ctx->tmp_heap); + + hres = create_jscaller(ctx); + if(FAILED(hres)) { + heap_free(ctx); + return hres; + } + + ctx->last_match = jsstr_empty(); + + ctx = InterlockedCompareExchangePointer((void**)&This->ctx, ctx, NULL); + if(ctx) { + script_release(ctx); + return E_UNEXPECTED; + } + } + This->site = pass; IActiveScriptSite_AddRef(This->site); @@ -648,7 +661,18 @@ static HRESULT WINAPI JScript_SetScriptSite(IActiveScript *iface, if(hres == S_OK) This->lcid = lcid; - return This->ctx ? set_ctx_site(This) : S_OK; + This->ctx->lcid = This->lcid; + + hres = init_global(This->ctx); + if(FAILED(hres)) + return hres; + + IActiveScriptSite_AddRef(This->site); + This->ctx->site = This->site; + + if(This->is_initialized) + change_state(This, SCRIPTSTATE_INITIALIZED); + return S_OK; } static HRESULT WINAPI JScript_GetScriptSite(IActiveScript *iface, REFIID riid, @@ -677,7 +701,7 @@ static HRESULT WINAPI JScript_SetScriptState(IActiveScript *iface, SCRIPTSTATE s return S_OK; } - if(!This->ctx) + if(!This->is_initialized || !This->ctx) return E_UNEXPECTED; switch(ss) { @@ -900,42 +924,16 @@ static ULONG WINAPI JScriptParse_Release(IActiveScriptParse *iface) static HRESULT WINAPI JScriptParse_InitNew(IActiveScriptParse *iface) { JScript *This = impl_from_IActiveScriptParse(iface); - script_ctx_t *ctx; - HRESULT hres; TRACE("(%p)\n", This); - if(This->ctx) + if(This->is_initialized) return E_UNEXPECTED; + This->is_initialized = TRUE; - ctx = heap_alloc_zero(sizeof(script_ctx_t)); - if(!ctx) - return E_OUTOFMEMORY; - - ctx->ref = 1; - ctx->state = SCRIPTSTATE_UNINITIALIZED; - ctx->active_script = &This->IActiveScript_iface; - ctx->safeopt = This->safeopt; - ctx->version = This->version; - ctx->html_mode = This->html_mode; - ctx->acc = jsval_undefined(); - heap_pool_init(&ctx->tmp_heap); - - hres = create_jscaller(ctx); - if(FAILED(hres)) { - heap_free(ctx); - return hres; - } - - ctx->last_match = jsstr_empty(); - - ctx = InterlockedCompareExchangePointer((void**)&This->ctx, ctx, NULL); - if(ctx) { - script_release(ctx); - return E_UNEXPECTED; - } - - return This->site ? set_ctx_site(This) : S_OK; + if(This->site) + change_state(This, SCRIPTSTATE_INITIALIZED); + return S_OK; } static HRESULT WINAPI JScriptParse_AddScriptlet(IActiveScriptParse *iface,

1 0

Gabriel Ivăncescu : jscript: Move the clear_script_queue up to SCRIPTSTATE_INITIALIZED.
by Alexandre Julliard 21 Feb '20

21 Feb '20

Module: wine Branch: master Commit: 3c517f502b2d73590dd9585f74c7943e98f9a36f URL: https://source.winehq.org/git/wine.git/?a=commit;h=3c517f502b2d73590dd9585f… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Feb 20 21:26:41 2020 +0100 jscript: Move the clear_script_queue up to SCRIPTSTATE_INITIALIZED. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/jscript.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index 8fc39c292c..98fe759fc2 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -363,6 +363,8 @@ static void decrease_state(JScript *This, SCRIPTSTATE state) return; /* FALLTHROUGH */ case SCRIPTSTATE_INITIALIZED: + clear_script_queue(This); + if(This->ctx->host_global) { IDispatch_Release(This->ctx->host_global); This->ctx->host_global = NULL; @@ -402,7 +404,6 @@ static void decrease_state(JScript *This, SCRIPTSTATE state) /* FALLTHROUGH */ case SCRIPTSTATE_UNINITIALIZED: change_state(This, state); - clear_script_queue(This); break; default: assert(0);

1 0