December 2019 - Wine-Commits

Conor McCarthy : vkd3d: Add SetViewInstanceMask() to the ID3D12GraphicsCommandList1 interface.
by Alexandre Julliard Dec. 6, 2019

Dec. 6, 2019

Module: vkd3d Branch: master Commit: 9c64642468fbf17dcec07220a2ec5bf1aed9ce3b URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=9c64642468fbf17dcec0722… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Fri Dec 6 22:51:15 2019 +0330 vkd3d: Add SetViewInstanceMask() to the ID3D12GraphicsCommandList1 interface. This method was missing in version 10.0.15063.0 of the SDK, but is present in version 10.0.18362.0, without a UUID change. Presumably that means this was simply an omission in the older header, rather than an API change in the newer header. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_d3d12.idl | 2 ++ libs/vkd3d/command.c | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/include/vkd3d_d3d12.idl b/include/vkd3d_d3d12.idl index ec8b83d..b887480 100644 --- a/include/vkd3d_d3d12.idl +++ b/include/vkd3d_d3d12.idl @@ -2000,6 +2000,8 @@ interface ID3D12GraphicsCommandList1 : ID3D12GraphicsCommandList UINT dst_sub_resource_idx, UINT dst_x, UINT dst_y, ID3D12Resource *src_resource, UINT src_sub_resource_idx, D3D12_RECT *src_rect, DXGI_FORMAT format, D3D12_RESOLVE_MODE mode); + + void SetViewInstanceMask(UINT mask); } typedef enum D3D12_TILE_RANGE_FLAGS diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 75af27d..d6feecf 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -5483,6 +5483,11 @@ static void STDMETHODCALLTYPE d3d12_command_list_ResolveSubresourceRegion(ID3D12 src_resource, src_sub_resource_idx, src_rect, format, mode); } +static void STDMETHODCALLTYPE d3d12_command_list_SetViewInstanceMask(ID3D12GraphicsCommandList1 *iface, UINT mask) +{ + FIXME("iface %p, mask %#x stub!\n", iface, mask); +} + static const struct ID3D12GraphicsCommandList1Vtbl d3d12_command_list_vtbl = { /* IUnknown methods */ @@ -5556,6 +5561,7 @@ static const struct ID3D12GraphicsCommandList1Vtbl d3d12_command_list_vtbl = d3d12_command_list_OMSetDepthBounds, d3d12_command_list_SetSamplePositions, d3d12_command_list_ResolveSubresourceRegion, + d3d12_command_list_SetViewInstanceMask, }; static struct d3d12_command_list *unsafe_impl_from_ID3D12CommandList(ID3D12CommandList *iface)

1 0

Conor McCarthy : vkd3d: Remove redundant GetCopyableFootprints() resource size alignment checks.
by Alexandre Julliard Dec. 6, 2019

Dec. 6, 2019

Module: vkd3d Branch: master Commit: a59f1982adeca99b64d28fd89fa7118a246558c0 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=a59f1982adeca99b64d28fd… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Fri Dec 6 16:11:36 2019 +1000 vkd3d: Remove redundant GetCopyableFootprints() resource size alignment checks. The alignments are now checked in d3d12_resource_validate_desc(). Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/device.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 96ab6b7..757d4ac 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -3218,13 +3218,6 @@ static void STDMETHODCALLTYPE d3d12_device_GetCopyableFootprints(ID3D12Device *i return; } - if (align(desc->Width, format->block_width) != desc->Width - || align(desc->Height, format->block_height) != desc->Height) - { - WARN("Resource size (%"PRIu64"x%u) not aligned to format block size.\n", desc->Width, desc->Height); - return; - } - offset = 0; total = 0; for (i = 0; i < sub_resource_count; ++i)

1 0

Julian Rüger : German translation for release 4.0.3.
by Alexandre Julliard Dec. 6, 2019

Dec. 6, 2019

Module: website Branch: master Commit: 40fa8a0639dc311a467fb657de3c8de8d6900470 URL: https://source.winehq.org/git/website.git/?a=commit;h=40fa8a0639dc311a467fb… Author: Julian Rüger <jr98(a)gmx.net> Date: Fri Dec 6 11:21:23 2019 +0100 German translation for release 4.0.3. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/de/2019112501.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/news/de/2019112501.xml b/news/de/2019112501.xml new file mode 100644 index 00000000..19ff6745 --- /dev/null +++ b/news/de/2019112501.xml @@ -0,0 +1,13 @@ +<news> +<date>25. November 2019</date> +<title>Wine 4.0.3 freigegeben</title> +<body> + Die Wartungsversion 4.0.3 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/4.0.3">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Diverse Fehlerkorrekturen</li> + <li>Aktualisierung der nationalen Sprachunterstützungsdateien (NLS)</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/4.0/wine-4.0.3.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Julian Rüger : German translation for release 4.21.
by Alexandre Julliard Dec. 6, 2019

Dec. 6, 2019

Module: website Branch: master Commit: 90d0854a716337b1a8e9c1e970a60a20e046ce83 URL: https://source.winehq.org/git/website.git/?a=commit;h=90d0854a716337b1a8e9c… Author: Julian Rüger <jr98(a)gmx.net> Date: Fri Dec 6 11:24:42 2019 +0100 German translation for release 4.21. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/de/2019112901.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/de/2019112901.xml b/news/de/2019112901.xml new file mode 100644 index 00000000..3f5f1778 --- /dev/null +++ b/news/de/2019112901.xml @@ -0,0 +1,15 @@ +<news> +<date>29. November 2019</date> +<title>Wine 4.21 freigegeben</title> +<body> + Die Entwicklungsversion 4.21 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/4.21">Neuerungen (en)</a> in dieser Version: +<ul> + <li>HTTP-Proxykonfiguration per DHCP.</li> + <li>Parameterblock-Unterstützung in D3DX9.</li> + <li>Konvertierung einiger weiterer DLLs zu PE.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/4.x/wine-4.21.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Julian Rüger : German translation for release 4.20.
by Alexandre Julliard Dec. 6, 2019

Dec. 6, 2019

Module: website Branch: master Commit: aed1476412a4ad82f7e16431d59ac73d9cfd8984 URL: https://source.winehq.org/git/website.git/?a=commit;h=aed1476412a4ad82f7e16… Author: Julian Rüger <jr98(a)gmx.net> Date: Fri Dec 6 11:19:33 2019 +0100 German translation for release 4.20. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/de/2019111501.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/de/2019111501.xml b/news/de/2019111501.xml new file mode 100644 index 00000000..95a0964c --- /dev/null +++ b/news/de/2019111501.xml @@ -0,0 +1,16 @@ +<news> +<date>15. November 2019</date> +<title>Wine 4.20 freigegeben</title> +<body> + Die Entwicklungsversion 4.20 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/4.20">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Neue Version der Mono-Engine mit einem FNA-Update.</li> + <li>Code-Persistenz in VBScript und JScript.</li> + <li>Aktualisierung der Vulkan-Spezifikation.</li> + <li>Verbesserte Unterstützung von LLVM-MinGW.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/4.x/wine-4.20.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Paul Gofman : include: Add STARTUPINFOEX structure definition.
by Alexandre Julliard Dec. 5, 2019

Dec. 5, 2019

Module: wine Branch: master Commit: fe22ef495f3f2e59fb6b5f0a7ed0e99711dac68e URL: https://source.winehq.org/git/wine.git/?a=commit;h=fe22ef495f3f2e59fb6b5f0a… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Thu Dec 5 16:38:53 2019 +0300 include: Add STARTUPINFOEX structure definition. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winbase.h | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/include/winbase.h b/include/winbase.h index 2d01dcb606..7b7f9f26bd 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1736,6 +1736,21 @@ typedef enum _PROC_THREAD_ATTRIBUTE_NUM #define SYMBOLIC_LINK_FLAG_DIRECTORY (0x1) #define VALID_SYMBOLIC_LINK_FLAGS SYMBOLIC_LINK_FLAG_DIRECTORY +typedef struct _STARTUPINFOEXA +{ + STARTUPINFOA StartupInfo; + LPPROC_THREAD_ATTRIBUTE_LIST lpAttributeList; +} STARTUPINFOEXA, *LPSTARTUPINFOEXA; + +typedef struct _STARTUPINFOEXW +{ + STARTUPINFOW StartupInfo; + LPPROC_THREAD_ATTRIBUTE_LIST lpAttributeList; +} STARTUPINFOEXW, *LPSTARTUPINFOEXW; + +DECL_WINELIB_TYPE_AW(STARTUPINFOEX) +DECL_WINELIB_TYPE_AW(LPSTARTUPINFOEX) + typedef void *PUMS_CONTEXT; typedef void *PUMS_COMPLETION_LIST; typedef PRTL_UMS_SCHEDULER_ENTRY_POINT PUMS_SCHEDULER_ENTRY_POINT;

1 0

Piotr Caban : kernel32: Set all %eax bits on Wow64EnableWow64FsRedirection return.
by Alexandre Julliard Dec. 5, 2019

Dec. 5, 2019

Module: wine Branch: master Commit: 7ca1c4900e42d608150822ef87a7ce2847a59b6f URL: https://source.winehq.org/git/wine.git/?a=commit;h=7ca1c4900e42d608150822ef… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Dec 5 20:09:04 2019 +0100 kernel32: Set all %eax bits on Wow64EnableWow64FsRedirection return. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47565 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/path.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 172be2a6e2..04fa5f2e7a 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1603,7 +1603,7 @@ # @ stub WerpStringLookup @ stdcall WideCharToMultiByte(long long wstr long ptr long ptr ptr) @ stdcall WinExec(str long) -@ stdcall Wow64EnableWow64FsRedirection(long) +@ stdcall Wow64EnableWow64FsRedirection(long) KERNEL32_Wow64EnableWow64FsRedirection @ stdcall -import Wow64DisableWow64FsRedirection(ptr) @ stdcall Wow64GetThreadContext(long ptr) # @ stub Wow64GetThreadSelectorEntry diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index 4f05118739..c50b631d7c 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -851,8 +851,10 @@ UINT WINAPI GetSystemDirectoryA( LPSTR path, UINT count ) /*********************************************************************** * Wow64EnableWow64FsRedirection (KERNEL32.@) + * + * Microsoft C++ Redistributable installers are depending on all %eax bits being set. */ -BOOLEAN WINAPI Wow64EnableWow64FsRedirection( BOOLEAN enable ) +DWORD /*BOOLEAN*/ WINAPI KERNEL32_Wow64EnableWow64FsRedirection( BOOLEAN enable ) { return set_ntstatus( RtlWow64EnableFsRedirection( enable )); }

1 0

Nikolay Sivov : dwrite: Use IDWriteFactory7 for gdiinterop.
by Alexandre Julliard Dec. 5, 2019

Dec. 5, 2019

Module: wine Branch: master Commit: 5c39a118c434577fa4f1d4720dca7c72d6a831ab URL: https://source.winehq.org/git/wine.git/?a=commit;h=5c39a118c434577fa4f1d472… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Dec 5 11:56:05 2019 +0300 dwrite: Use IDWriteFactory7 for gdiinterop. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 4 +- dlls/dwrite/gdiinterop.c | 162 +++++++++++++++++++++++-------------------- dlls/dwrite/main.c | 8 +-- 3 files changed, 93 insertions(+), 81 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5c39a118c434577fa4f1…

1 0

Alex Henrie : shell32: Symlink the Downloads and Templates folders too.
by Alexandre Julliard Dec. 5, 2019

Dec. 5, 2019

Module: wine Branch: master Commit: 477ff7e034e882cf0dc24aa0b459ec957608a1c3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=477ff7e034e882cf0dc24aa0… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Dec 2 19:17:56 2019 -0700 shell32: Symlink the Downloads and Templates folders too. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shellpath.c | 52 +++++++++++++++++++++++++++++++----------------- 1 file changed, 34 insertions(+), 18 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index d9d65cbaed..06be794812 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -4366,6 +4366,12 @@ static inline BOOL _SHAppendToUnixPath(char *szBasePath, LPCWSTR pwszSubPath) { case IDS_MYVIDEOS: lstrcpyW(wszSubPath, My_VideosW); break; + case IDS_DOWNLOADS: + lstrcpyW(wszSubPath, DownloadsW); + break; + case IDS_TEMPLATES: + lstrcpyW(wszSubPath, TemplatesW); + break; default: ERR("LoadString(%d) failed!\n", LOWORD(pwszSubPath)); return FALSE; @@ -4392,21 +4398,21 @@ static inline BOOL _SHAppendToUnixPath(char *szBasePath, LPCWSTR pwszSubPath) { /****************************************************************************** * _SHCreateSymbolicLinks [Internal] * - * Sets up symbol links for various shell folders to point into the users home + * 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 imply that the user - * is a Windows lover and has no problem with wine creating 'My Pictures', - * 'My Music' and 'My Videos' subfolders under '$HOME/My Documents', if those - * do not already exits. We put appropriate symbolic links in place for those, - * too. + * 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 fo 'My Pictures' and 'My Videos'. + * $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. @@ -4414,10 +4420,18 @@ static inline BOOL _SHAppendToUnixPath(char *szBasePath, LPCWSTR pwszSubPath) { */ static void _SHCreateSymbolicLinks(void) { - UINT aidsMyStuff[] = { IDS_MYPICTURES, IDS_MYVIDEOS, IDS_MYMUSIC }, i; - const WCHAR* MyOSXStuffW[] = { PicturesW, MoviesW, MusicW }; - int acsidlMyStuff[] = { CSIDL_MYPICTURES, CSIDL_MYVIDEO, CSIDL_MYMUSIC }; - static const char * const xdg_dirs[] = { "PICTURES", "VIDEOS", "MUSIC", "DOCUMENTS", "DESKTOP" }; + 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 unsigned int num = ARRAY_SIZE(xdg_dirs); WCHAR wszTempPath[MAX_PATH]; char szPersonalTarget[FILENAME_MAX], *pszPersonal; @@ -4428,6 +4442,7 @@ static void _SHCreateSymbolicLinks(void) 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, @@ -4449,9 +4464,9 @@ static void _SHCreateSymbolicLinks(void) if (_SHAppendToUnixPath(szPersonalTarget, MAKEINTRESOURCEW(IDS_PERSONAL)) && !stat(szPersonalTarget, &statFolder) && S_ISDIR(statFolder.st_mode)) { - /* '$HOME/My Documents' exists. Create 'My Pictures', - * 'My Videos' and 'My Music' subfolders or fail silently if - * they already exist. + /* '$HOME/My Documents' exists. Create subfolders for + * 'My Pictures', 'My Videos', 'My Music' etc. or fail silently + * if they already exist. */ for (i = 0; i < ARRAY_SIZE(aidsMyStuff); i++) { @@ -4489,8 +4504,9 @@ static void _SHCreateSymbolicLinks(void) } else { - /* '$HOME' doesn't exist. Create 'My Pictures', 'My Videos' and 'My Music' subdirs - * in '%USERPROFILE%\\My Documents' or fail silently if they already exist. */ + /* '$HOME' doesn't exist. Create subdirs for 'My Pictures', 'My Videos', + * 'My Music' etc. in '%USERPROFILE%\My Documents' or fail silently if + * they already exist. */ pszHome = NULL; strcpy(szPersonalTarget, pszPersonal); for (i = 0; i < ARRAY_SIZE(aidsMyStuff); i++) { @@ -4500,7 +4516,7 @@ static void _SHCreateSymbolicLinks(void) } } - /* Create symbolic links for 'My Pictures', 'My Videos' and 'My Music'. */ + /* Create symbolic links for 'My Pictures', 'My Videos', 'My Music' etc. */ for (i=0; i < ARRAY_SIZE(aidsMyStuff); i++) { /* Create the current 'My Whatever' folder and get its unix path. */ @@ -6136,7 +6152,7 @@ HRESULT SHELL_RegisterShellFolders(void) HRESULT hr; /* Set up '$HOME' targeted symlinks for 'My Documents', 'My Pictures', - * 'My Videos', 'My Music' and 'Desktop' in advance, so that the + * 'My Videos', 'My Music', 'Desktop' etc. in advance, so that the * _SHRegister*ShellFolders() functions will find everything nice and clean * and thus will not attempt to create them in the profile directory. */ _SHCreateSymbolicLinks();

1 0

Alexandre Julliard : server: Determine the server directory in the server itself.
by Alexandre Julliard Dec. 5, 2019

Dec. 5, 2019

Module: wine Branch: master Commit: fe13f7a3b0d0ad709676aa046cb4c9da260900cf URL: https://source.winehq.org/git/wine.git/?a=commit;h=fe13f7a3b0d0ad709676aa04… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 5 21:57:52 2019 +0100 server: Determine the server directory in the server itself. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/mach.c | 2 +- server/request.c | 80 +++++++++++++++++++++++++++++++++++--------------------- server/request.h | 1 + 3 files changed, 52 insertions(+), 31 deletions(-) diff --git a/server/mach.c b/server/mach.c index 9d8d911cb7..e5a532dc6c 100644 --- a/server/mach.c +++ b/server/mach.c @@ -90,7 +90,7 @@ void init_tracing_mechanism(void) server_mach_port, MACH_MSG_TYPE_MAKE_SEND ) != KERN_SUCCESS) fatal_error("Error inserting rights\n"); - if (bootstrap_register(bp, (char*)wine_get_server_dir(), server_mach_port) != KERN_SUCCESS) + if (bootstrap_register(bp, server_dir, server_mach_port) != KERN_SUCCESS) fatal_error("Can't check in server_mach_port\n"); mach_port_deallocate(mach_task_self(), bp); } diff --git a/server/request.c b/server/request.c index 5610d392cf..4aad126eec 100644 --- a/server/request.c +++ b/server/request.c @@ -127,6 +127,7 @@ static const struct fd_ops master_socket_fd_ops = struct thread *current = NULL; /* thread handling the current request */ unsigned int global_error = 0; /* global error code for when no thread is current */ timeout_t server_start_time = 0; /* server startup time */ +char *server_dir = NULL; /* server directory */ int server_dir_fd = -1; /* file descriptor for the server dir */ int config_dir_fd = -1; /* file descriptor for the config dir */ @@ -603,7 +604,7 @@ static void create_dir( const char *name, struct stat *st ) if (lstat( name, st ) == -1) { if (errno != ENOENT) - fatal_error( "lstat %s: %s", name, strerror( errno )); + fatal_error( "lstat %s: %s\n", name, strerror( errno )); if (mkdir( name, 0700 ) == -1 && errno != EEXIST) fatal_error( "mkdir %s: %s\n", name, strerror( errno )); if (lstat( name, st ) == -1) @@ -615,22 +616,52 @@ static void create_dir( const char *name, struct stat *st ) } /* create the server directory and chdir to it */ -static void create_server_dir( const char *dir ) +static char *create_server_dir( int force ) { - char *p, *server_dir; + const char *config_dir = wine_get_config_dir(); + char *p; struct stat st, st2; + size_t len = sizeof("/server-") + 2 * sizeof(st.st_dev) + 2 * sizeof(st.st_ino) + 2; - if (!(server_dir = strdup( dir ))) fatal_error( "out of memory\n" ); - - /* first create the base directory if needed */ + if (chdir( config_dir ) == -1) + { + if (errno != ENOENT || force) fatal_error( "chdir to %s: %s\n", config_dir, strerror( errno )); + return NULL; + } + if ((config_dir_fd = open( ".", O_RDONLY )) == -1) + fatal_error( "open %s: %s\n", config_dir, strerror( errno )); - p = strrchr( server_dir, '/' ); - *p = 0; - create_dir( server_dir, &st ); + /* create the base directory if needed */ + +#ifdef __ANDROID__ /* there's no /tmp dir on Android */ + len += strlen( config_dir ) + sizeof("/.wineserver"); + if (!(server_dir = malloc( len ))) fatal_error( "out of memory\n" ); + strcpy( server_dir, config_dir ); + strcat( server_dir, "/.wineserver" ); +#else + len += sizeof("/tmp/.wine-") + 12; + if (!(server_dir = malloc( len ))) fatal_error( "out of memory\n" ); + sprintf( server_dir, "/tmp/.wine-%u", getuid() ); +#endif + create_dir( server_dir, &st2 ); /* now create the server directory */ - *p = '/'; + strcat( server_dir, "/server-" ); + p = server_dir + strlen(server_dir); + + if (st.st_dev != (unsigned long)st.st_dev) + p += sprintf( p, "%lx%08lx-", (unsigned long)((unsigned long long)st.st_dev >> 32), + (unsigned long)st.st_dev ); + else + p += sprintf( p, "%lx-", (unsigned long)st.st_dev ); + + if (st.st_ino != (unsigned long)st.st_ino) + sprintf( p, "%lx%08lx", (unsigned long)((unsigned long long)st.st_ino >> 32), + (unsigned long)st.st_ino ); + else + sprintf( p, "%lx", (unsigned long)st.st_ino ); + create_dir( server_dir, &st ); if (chdir( server_dir ) == -1) @@ -642,7 +673,7 @@ static void create_server_dir( const char *dir ) if (st.st_dev != st2.st_dev || st.st_ino != st2.st_ino) fatal_error( "chdir did not end up in %s\n", server_dir ); - free( server_dir ); + return server_dir; } /* create the lock file and return its file descriptor */ @@ -654,29 +685,28 @@ static int create_server_lock(void) if (lstat( server_lock_name, &st ) == -1) { if (errno != ENOENT) - fatal_error( "lstat %s/%s: %s", wine_get_server_dir(), server_lock_name, strerror( errno )); + fatal_error( "lstat %s/%s: %s\n", server_dir, server_lock_name, strerror( errno )); } else { if (!S_ISREG(st.st_mode)) - fatal_error( "%s/%s is not a regular file\n", wine_get_server_dir(), server_lock_name ); + fatal_error( "%s/%s is not a regular file\n", server_dir, server_lock_name ); } if ((fd = open( server_lock_name, O_CREAT|O_TRUNC|O_WRONLY, 0600 )) == -1) - fatal_error( "error creating %s/%s: %s", wine_get_server_dir(), server_lock_name, strerror( errno )); + fatal_error( "error creating %s/%s: %s\n", server_dir, server_lock_name, strerror( errno )); return fd; } /* wait for the server lock */ int wait_for_lock(void) { - const char *server_dir = wine_get_server_dir(); int fd, r; struct flock fl; + server_dir = create_server_dir( 0 ); if (!server_dir) return 0; /* no server dir, so no lock to wait on */ - create_server_dir( server_dir ); fd = create_server_lock(); fl.l_type = F_WRLCK; @@ -692,14 +722,13 @@ int wait_for_lock(void) /* kill the wine server holding the lock */ int kill_lock_owner( int sig ) { - const char *server_dir = wine_get_server_dir(); int fd, i, ret = 0; pid_t pid = 0; struct flock fl; + server_dir = create_server_dir( 0 ); if (!server_dir) return 0; /* no server dir, nothing to do */ - create_server_dir( server_dir ); fd = create_server_lock(); for (i = 1; i <= 20; i++) @@ -760,7 +789,7 @@ static void acquire_lock(void) "Warning: a previous instance of the wine server seems to have crashed.\n" "Please run 'gdb %s %s/core',\n" "type 'backtrace' at the gdb prompt and report the results. Thanks.\n\n", - server_argv0, wine_get_server_dir() ); + server_argv0, server_dir ); } unlink( server_socket_name ); /* we got the lock, we can safely remove the socket */ got_lock = 1; @@ -780,7 +809,7 @@ static void acquire_lock(void) case EAGAIN: exit(2); /* we didn't get the lock, exit with special status */ default: - fatal_error( "fcntl %s/%s: %s", wine_get_server_dir(), server_lock_name, strerror( errno )); + fatal_error( "fcntl %s/%s: %s\n", server_dir, server_lock_name, strerror( errno )); } /* it seems we can't use locks on this fs, so we will use the socket existence as lock */ close( fd ); @@ -817,8 +846,6 @@ static void acquire_lock(void) /* open the master server socket and start waiting for new clients */ void open_master_socket(void) { - const char *server_dir = wine_get_server_dir(); - const char *config_dir = wine_get_config_dir(); int fd, pid, status, sync_pipe[2]; char dummy; @@ -830,14 +857,7 @@ void open_master_socket(void) fd = open( "/dev/null", O_RDWR ); while (fd >= 0 && fd <= 2) fd = dup( fd ); - if (!server_dir) - fatal_error( "directory %s cannot be accessed\n", config_dir ); - if (chdir( config_dir ) == -1) - fatal_error( "chdir to %s: %s\n", config_dir, strerror( errno )); - if ((config_dir_fd = open( ".", O_RDONLY )) == -1) - fatal_error( "open %s: %s\n", config_dir, strerror( errno )); - - create_server_dir( server_dir ); + server_dir = create_server_dir( 1 ); if (!foreground) { diff --git a/server/request.h b/server/request.h index 2930b31d72..90a3180a6c 100644 --- a/server/request.h +++ b/server/request.h @@ -60,6 +60,7 @@ extern void close_master_socket( timeout_t timeout ); extern void shutdown_master_socket(void); extern int wait_for_lock(void); extern int kill_lock_owner( int sig ); +extern char *server_dir; extern int server_dir_fd, config_dir_fd; extern void trace_request(void);

1 0