September 2020 - Wine-devel

[PATCH 4/5] kernel32: Use IOCTL_CONDRV_READ_CONSOLE in ReadConsoleW when possible.
by Jacek Caban 14 Sep '20

14 Sep '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/console.c | 7 +++++++ server/console.c | 10 +++++++--- 2 files changed, 14 insertions(+), 3 deletions(-)

1 0

[PATCH 3/5] conhost: Add support for ENABLE_LINE_INPUT.
by Jacek Caban 14 Sep '20

14 Sep '20

Imported from kernel32/readline.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/conhost/conhost.c | 613 ++++++++++++++++++++++++++++++++++++- 1 file changed, 612 insertions(+), 1 deletion(-)

1 0

[PATCH 2/5] conhost: Add support for ENABLE_ECHO_INPUT.
by Jacek Caban 14 Sep '20

14 Sep '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/conhost/conhost.c | 98 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 93 insertions(+), 5 deletions(-)

1 0

[PATCH 1/5] conhost: Introduce IOCTL_CONDRV_READ_CONSOLE ioctl.
by Jacek Caban 14 Sep '20

14 Sep '20

Partially based on kernel32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/wine/condrv.h | 17 +-- programs/conhost/conhost.c | 211 ++++++++++++++++++++++++++++++++++--- 2 files changed, 203 insertions(+), 25 deletions(-)

1 0

[PATCH] httpapi: Stub HttpSetUrlGroupProperty(HttpServerTimeoutsProperty property)
by Chris Maxwell 14 Sep '20

14 Sep '20

Accept HttpServerTimeoutsProperty as valid, but WARN ignoring it and report success to caller. This solves a problem in a particular application that fails if a Not Implemented error is returned: Application performs DotNet calls listener = new HttpListener(); listener.TimeoutManager.IdleConnection = TIMEOUT_IDLE; which goes through a number of levels of DotNet 4.6.1 to end up calling HttpSetUrlGroupProperty with the HttpServerTimeoutsProperty inducing "Not Implemented" error. My solution, in the style of LoggingProperty portion of commit 52c6070ea5e47d254253dea6f977746d3588e619?hp=4c5f325333da4562b18af8ea846c780221ff319c, is to accept the TimeoutsProperty, WARN ignoring it, and report success. I would suggest this as sufficient rather than implementing a whole infrastructure for detecting timeout in the request queue and such because to now there has apparently not been a need for this to implement full scale Internet webserving applications. The requirements for this particular application is to offer a service that can be called back to with the results of an SSO service so timeouts will be vanishingly rare. This gets the application running to the next step as it does on Windows without loss of functionality. The downside is that attempting to run an application that does actually need timeout functionality will appear to work until it hangs, rather than placing a pressure point on the Wine Project to implement the contemplated web server API infrastructure. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49819 Signed-off-by: Chris Maxwell <maxwellc(a)gmail.com> --- dlls/httpapi/httpapi_main.c | 11 +++++++++++ include/http.h | 11 +++++++++++ 2 files changed, 22 insertions(+) diff --git a/dlls/httpapi/httpapi_main.c b/dlls/httpapi/httpapi_main.c index 6be4d11d35..b31e13e6ce 100644 --- a/dlls/httpapi/httpapi_main.c +++ b/dlls/httpapi/httpapi_main.c @@ -676,6 +676,17 @@ ULONG WINAPI HttpSetUrlGroupProperty(HTTP_URL_GROUP_ID id, HTTP_SERVER_PROPERTY case HttpServerLoggingProperty: WARN("Ignoring logging property.\n"); return ERROR_SUCCESS; + case HttpServerTimeoutsProperty: + { + const HTTP_TIMEOUT_LIMIT_INFO *info = value; + + TRACE("Attempt to change ServerTimeoutProperty (flag=%x, body=%u, drain=%u, reqq=%u, idle=%u, headw=%u, minsend=%u\n", + info->Flags, info->EntityBody, info->DrainEntityBody, info->RequestQueue, + info->IdleConnection, info->HeaderWait, info->MinSendRate); + + WARN("Ignoring timeout property.\n"); + return ERROR_SUCCESS; + } default: FIXME("Unhandled property %u.\n", property); return ERROR_CALL_NOT_IMPLEMENTED; diff --git a/include/http.h b/include/http.h index 3ab57f70bf..fa3d4d02df 100644 --- a/include/http.h +++ b/include/http.h @@ -429,6 +429,17 @@ typedef struct _HTTP_BINDING_INFO HANDLE RequestQueueHandle; } HTTP_BINDING_INFO, *PHTTP_BINDING_INFO; +typedef struct _HTTP_TIMEOUT_LIMIT_INFO +{ + HTTP_PROPERTY_FLAGS Flags; + USHORT EntityBody; + USHORT DrainEntityBody; + USHORT RequestQueue; + USHORT IdleConnection; + USHORT HeaderWait; + USHORT MinSendRate; +} HTTP_TIMEOUT_LIMIT_INFO, *PHTTP_TIMEOUT_LIMIT_INFO; + typedef enum _HTTP_QOS_SETTING_TYPE { HttpQosSettingTypeBandwidth, -- 2.25.1

2 1

[PATCH 1/5] server: Create the Afd device.
by Zebediah Figura 14 Sep '20

14 Sep '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- This is inspired by Jacek's work on the console device. The idea is, similarly, to replace most direct server calls with ioctls. It may also make sense to move the socket ioctls (as well as send/recv) handled in the client to ntdll.so, in the event that they can't be moved to the server due to performance concerns. In that case they would be handled much like cdrom/serial/tape ioctls. This would allow us to move all unix I/O out of ws2_32, as well as get rid of some of the effectively duplicated code dealing with overlapped I/O. server/directory.c | 6 ++++- server/file.h | 1 + server/sock.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 64 insertions(+), 1 deletion(-) diff --git a/server/directory.c b/server/directory.c index 198fc48ece2..c66d10b1928 100644 --- a/server/directory.c +++ b/server/directory.c @@ -373,10 +373,12 @@ void init_directories(void) static const WCHAR mailslotW[] = {'M','a','i','l','S','l','o','t'}; static const WCHAR condrvW[] = {'C','o','n','D','r','v'}; static const WCHAR nullW[] = {'N','u','l','l'}; + static const WCHAR afdW[] = {'A','f','d'}; static const struct unicode_str named_pipe_str = {named_pipeW, sizeof(named_pipeW)}; static const struct unicode_str mailslot_str = {mailslotW, sizeof(mailslotW)}; static const struct unicode_str condrv_str = {condrvW, sizeof(condrvW)}; static const struct unicode_str null_str = {nullW, sizeof(nullW)}; + static const struct unicode_str afd_str = {afdW, sizeof(afdW)}; /* events */ static const WCHAR event_low_memW[] = {'L','o','w','M','e','m','o','r','y','C','o','n','d','i','t','i','o','n'}; @@ -404,7 +406,7 @@ void init_directories(void) struct directory *dir_driver, *dir_device, *dir_global, *dir_kernel; struct object *link_dosdev, *link_global, *link_nul, *link_pipe, *link_mailslot; struct object *link_conin, *link_conout, *link_con; - struct object *named_pipe_device, *mailslot_device, *null_device, *user_data_mapping, *console_device; + struct object *named_pipe_device, *mailslot_device, *null_device, *user_data_mapping, *console_device, *socket_device; struct keyed_event *keyed_event; unsigned int i; @@ -422,11 +424,13 @@ void init_directories(void) named_pipe_device = create_named_pipe_device( &dir_device->obj, &named_pipe_str ); mailslot_device = create_mailslot_device( &dir_device->obj, &mailslot_str ); console_device = create_console_device( &dir_device->obj, &condrv_str ); + socket_device = create_socket_device( &dir_device->obj, &afd_str ); null_device = create_unix_device( &dir_device->obj, &null_str, "/dev/null" ); make_object_static( named_pipe_device ); make_object_static( mailslot_device ); make_object_static( null_device ); make_object_static( console_device ); + make_object_static( socket_device ); /* sessions */ create_session( 0 ); diff --git a/server/file.h b/server/file.h index b02c9fe6037..5fb4e5614b9 100644 --- a/server/file.h +++ b/server/file.h @@ -179,6 +179,7 @@ extern struct object *create_user_data_mapping( struct object *root, const struc extern struct object *create_named_pipe_device( struct object *root, const struct unicode_str *name ); extern struct object *create_mailslot_device( struct object *root, const struct unicode_str *name ); extern struct object *create_console_device( struct object *root, const struct unicode_str *name ); +extern struct object *create_socket_device( struct object *root, const struct unicode_str *name ); extern struct object *create_unix_device( struct object *root, const struct unicode_str *name, const char *unix_path ); diff --git a/server/sock.c b/server/sock.c index 1a53ce4b091..115448574ee 100644 --- a/server/sock.c +++ b/server/sock.c @@ -1164,6 +1164,64 @@ static void sock_release_ifchange( struct sock *sock ) } } +static struct object_type *socket_device_get_type( struct object *obj ); +static void socket_device_dump( struct object *obj, int verbose ); +static struct object *socket_device_lookup_name( struct object *obj, struct unicode_str *name, unsigned int attr ); +static struct object *socket_device_open_file( struct object *obj, unsigned int access, + unsigned int sharing, unsigned int options ); + +static const struct object_ops socket_device_ops = +{ + sizeof(struct ifchange), /* size */ + socket_device_dump, /* dump */ + socket_device_get_type, /* get_type */ + no_add_queue, /* add_queue */ + NULL, /* remove_queue */ + NULL, /* signaled */ + no_satisfied, /* satisfied */ + no_signal, /* signal */ + no_get_fd, /* get_fd */ + default_fd_map_access, /* map_access */ + default_get_sd, /* get_sd */ + default_set_sd, /* set_sd */ + socket_device_lookup_name, /* lookup_name */ + directory_link_name, /* link_name */ + default_unlink_name, /* unlink_name */ + socket_device_open_file, /* open_file */ + no_kernel_obj_list, /* get_kernel_obj_list */ + no_close_handle, /* close_handle */ + no_destroy /* destroy */ +}; + +static struct object_type *socket_device_get_type( struct object *obj ) +{ + static const WCHAR name[] = {'D','e','v','i','c','e'}; + static const struct unicode_str str = { name, sizeof(name) }; + return get_object_type( &str ); +} + +static void socket_device_dump( struct object *obj, int verbose ) +{ + fputs( "Socket device\n", stderr ); +} + +static struct object *socket_device_lookup_name( struct object *obj, struct unicode_str *name, unsigned int attr ) +{ + return NULL; +} + +static struct object *socket_device_open_file( struct object *obj, unsigned int access, + unsigned int sharing, unsigned int options ) +{ + set_error( STATUS_NOT_IMPLEMENTED ); + return NULL; +} + +struct object *create_socket_device( struct object *root, const struct unicode_str *name ) +{ + return create_named_object( root, &socket_device_ops, name, 0, NULL ); +} + /* create a socket */ DECL_HANDLER(create_socket) { -- 2.28.0

3 6

[PATCH vkd3d] vkd3d: Print VK_MEMORY_HEAP_MULTI_INSTANCE_BIT in debug_vk_memory_heap_flags().
by Zebediah Figura 14 Sep '20

14 Sep '20

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- libs/vkd3d/utils.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/vkd3d/utils.c b/libs/vkd3d/utils.c index 916f83e..d70a8fd 100644 --- a/libs/vkd3d/utils.c +++ b/libs/vkd3d/utils.c @@ -704,6 +704,7 @@ const char *debug_vk_memory_heap_flags(VkMemoryHeapFlags flags) buffer[0] = '\0'; #define FLAG_TO_STR(f) if (flags & f) { strcat(buffer, " | "#f); flags &= ~f; } FLAG_TO_STR(VK_MEMORY_HEAP_DEVICE_LOCAL_BIT) + FLAG_TO_STR(VK_MEMORY_HEAP_MULTI_INSTANCE_BIT) #undef FLAG_TO_STR if (flags) FIXME("Unrecognized flag(s) %#x.\n", flags); -- 2.28.0

2 1

[PATCH] shell32/tests: Test IShellLink_SetPath with a relative nonexistent file.
by Myah Caron 14 Sep '20

14 Sep '20

Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> --- Tested on Windows 10, discovered while writing 192566. dlls/shell32/tests/shelllink.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/shell32/tests/shelllink.c b/dlls/shell32/tests/shelllink.c index e4f176237f4..e17b1f67187 100644 --- a/dlls/shell32/tests/shelllink.c +++ b/dlls/shell32/tests/shelllink.c @@ -171,6 +171,19 @@ static void test_get_set(void) ok(r == S_FALSE, "GetPath failed (0x%08x)\n", r); ok(*buffer=='\0', "GetPath returned '%s'\n", buffer); + str="nonexistent_file"; + r = IShellLinkA_SetPath(sl, str); + todo_wine ok(r == S_OK, "SetPath failed (0x%08x)\n", r); + + r = SHGetFolderPathA(NULL, CSIDL_DESKTOP, NULL, 0, mypath); + ok(r == S_OK, "SHGetFolderPath failed (0x%08x)\n", r); + strcat(mypath, "\\nonexistent_file"); + + strcpy(buffer,"garbage"); + r = IShellLinkA_GetPath(sl, buffer, sizeof(buffer), NULL, SLGP_RAWPATH); + ok(r == S_OK, "GetPath failed (0x%08x)\n", r); + todo_wine ok(lstrcmpiA(buffer, mypath)==0, "GetPath returned '%s'\n", buffer); + /* Win98 returns S_FALSE, but WinXP returns S_OK */ str="c:\\nonexistent\\file"; r = IShellLinkA_SetPath(sl, str); -- 2.28.0

1 0

[PATCH v4 3/3] shell32: Implement ShellLinkObject::get_Path.
by Myah Caron 14 Sep '20

14 Sep '20

Wine-bug: https://bugs.winehq.org/show_bug.cgi?id=49591 Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> --- v4: no change. dlls/shell32/shelldispatch.c | 15 +++++++++++++-- dlls/shell32/tests/shelldispatch.c | 2 +- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/shelldispatch.c b/dlls/shell32/shelldispatch.c index 9bc40fcc9c5..e07a9f690f0 100644 --- a/dlls/shell32/shelldispatch.c +++ b/dlls/shell32/shelldispatch.c @@ -735,9 +735,20 @@ static HRESULT WINAPI ShellLinkObject_Invoke(IShellLinkDual2 *iface, DISPID disp static HRESULT WINAPI ShellLinkObject_get_Path(IShellLinkDual2 *iface, BSTR *pbs) { - FIXME("(%p, %p)\n", iface, pbs); + ShellLinkObjectImpl *This = impl_from_IShellLinkDual(iface); + WCHAR path[MAX_PATH]; + HRESULT hr; - return E_NOTIMPL; + TRACE("(%p, %p)\n", iface, pbs); + + *pbs = NULL; + + hr = IShellLinkW_GetPath(This->shell_link, path, MAX_PATH, NULL, 0); + if (hr != S_OK) + return hr; + + *pbs = SysAllocString(path); + return hr; } static HRESULT WINAPI ShellLinkObject_put_Path(IShellLinkDual2 *iface, BSTR bs) diff --git a/dlls/shell32/tests/shelldispatch.c b/dlls/shell32/tests/shelldispatch.c index ae1cf086270..33ada2d80cc 100644 --- a/dlls/shell32/tests/shelldispatch.c +++ b/dlls/shell32/tests/shelldispatch.c @@ -1500,7 +1500,7 @@ static void test_ShellLinkObject(void) str = NULL; hr = IShellLinkDual2_get_Path(sld, &str); - todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08x\n", hr); if (hr == S_OK) { ok(!wcscmp(str, empty_path), "got %s (wanted %s)\n", wine_dbgstr_w(str), wine_dbgstr_w(empty_path)); -- 2.28.0

1 0

[PATCH v4 2/3] shell32: Implement FolderItem::get_GetLink.
by Myah Caron 14 Sep '20

14 Sep '20

Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> --- v4: - Remove persist_file from Impl (following Nikolay's comment). - Release shell_link on error. dlls/shell32/shelldispatch.c | 66 +++++++++++++++++++++++++++++- dlls/shell32/tests/shelldispatch.c | 4 +- 2 files changed, 66 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/shelldispatch.c b/dlls/shell32/shelldispatch.c index afe1348bdec..9bc40fcc9c5 100644 --- a/dlls/shell32/shelldispatch.c +++ b/dlls/shell32/shelldispatch.c @@ -106,6 +106,8 @@ typedef struct { typedef struct { IShellLinkDual2 IShellLinkDual2_iface; LONG ref; + + IShellLinkW *shell_link; } ShellLinkObjectImpl; static inline ShellDispatch *impl_from_IShellDispatch6(IShellDispatch6 *iface) @@ -671,6 +673,7 @@ static ULONG WINAPI ShellLinkObject_Release(IShellLinkDual2 *iface) if (!ref) { + if (This->shell_link) IShellLinkW_Release(This->shell_link); heap_free(This); } return ref; @@ -878,6 +881,52 @@ static const IShellLinkDual2Vtbl ShellLinkObjectVtbl = { ShellLinkObject_get_Target, }; +static HRESULT ShellLinkObject_Constructor(FolderItemImpl *item, IShellLinkDual2 **link) +{ + HRESULT hr; + IPersistFile *persist_file = NULL; + ShellLinkObjectImpl *This; + + TRACE("%p\n", item); + + *link = NULL; + + This = heap_alloc(sizeof(*This)); + if (!This) return E_OUTOFMEMORY; + This->IShellLinkDual2_iface.lpVtbl = &ShellLinkObjectVtbl; + This->ref = 1; + + This->shell_link = NULL; + hr = CoCreateInstance(&CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER, + &IID_IShellLinkW, (LPVOID*)&This->shell_link); + if (FAILED(hr)) + { + heap_free(This); + return hr; + } + + hr = IShellLinkW_QueryInterface(This->shell_link, &IID_IPersistFile, + (LPVOID*)&persist_file); + if (FAILED(hr)) + { + IShellLinkW_Release(This->shell_link); + heap_free(This); + return hr; + } + + hr = IPersistFile_Load(persist_file, item->path, STGM_READ); + IPersistFile_Release(persist_file); + if (FAILED(hr)) + { + IShellLinkW_Release(This->shell_link); + heap_free(This); + return hr; + } + + *link = (IShellLinkDual2 *)&This->IShellLinkDual2_iface; + return S_OK; +} + static HRESULT WINAPI FolderItemImpl_QueryInterface(FolderItem2 *iface, REFIID riid, LPVOID *ppv) { @@ -1064,10 +1113,23 @@ static HRESULT WINAPI FolderItemImpl_get_Path(FolderItem2 *iface, BSTR *path) static HRESULT WINAPI FolderItemImpl_get_GetLink(FolderItem2 *iface, IDispatch **ppid) { - FIXME("(%p,%p)\n", iface, ppid); + IShellLinkDual2 *link; + HRESULT hr; + FolderItemImpl *This = impl_from_FolderItem(iface); + + TRACE("(%p,%p)\n", iface, ppid); *ppid = NULL; - return E_NOTIMPL; + + if (!(This->attributes & SFGAO_LINK)) + return E_NOTIMPL; + + hr = ShellLinkObject_Constructor(This, &link); + if (hr != S_OK) + return hr; + + *ppid = (IDispatch*)link; + return S_OK; } static HRESULT WINAPI FolderItemImpl_get_GetFolder(FolderItem2 *iface, diff --git a/dlls/shell32/tests/shelldispatch.c b/dlls/shell32/tests/shelldispatch.c index 28b0b186b8e..ae1cf086270 100644 --- a/dlls/shell32/tests/shelldispatch.c +++ b/dlls/shell32/tests/shelldispatch.c @@ -1492,8 +1492,8 @@ static void test_ShellLinkObject(void) dispatch = NULL; hr = FolderItem_get_GetLink(item, &dispatch); - todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); - todo_wine ok(dispatch != NULL, "got %p\n", dispatch); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(dispatch != NULL, "got %p\n", dispatch); if (dispatch) { sld = (IShellLinkDual2*)dispatch; -- 2.28.0

1 0