August 2019 - Wine-Commits - list.winehq.org

Zebediah Figura : httpapi: Implement HttpRemoveUrl().
by Alexandre Julliard Aug. 23, 2019

Aug. 23, 2019

Module: wine Branch: master Commit: 4f714df9d6d948039ed1bccce14b9ef738bca2cb URL: https://source.winehq.org/git/wine.git/?a=commit;h=4f714df9d6d948039ed1bccc… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Aug 22 22:35:26 2019 -0500 httpapi: Implement HttpRemoveUrl(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/httpapi/httpapi_main.c | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/dlls/httpapi/httpapi_main.c b/dlls/httpapi/httpapi_main.c index cc52273..5f2a307 100644 --- a/dlls/httpapi/httpapi_main.c +++ b/dlls/httpapi/httpapi_main.c @@ -218,10 +218,30 @@ ULONG WINAPI HttpAddUrl(HANDLE queue, const WCHAR *url, void *reserved) /*********************************************************************** * HttpRemoveUrl (HTTPAPI.@) */ -ULONG WINAPI HttpRemoveUrl(HANDLE queue, const WCHAR *url) +ULONG WINAPI HttpRemoveUrl(HANDLE queue, const WCHAR *urlW) { - FIXME("queue %p, url %s, stub!\n", queue, debugstr_w(url)); - return ERROR_CALL_NOT_IMPLEMENTED; + ULONG ret = ERROR_SUCCESS; + OVERLAPPED ovl = {}; + char *url; + int len; + + TRACE("queue %p, url %s.\n", queue, debugstr_w(urlW)); + + if (!queue) + return ERROR_INVALID_PARAMETER; + + len = WideCharToMultiByte(CP_ACP, 0, urlW, -1, NULL, 0, NULL, NULL); + if (!(url = heap_alloc(len))) + return ERROR_OUTOFMEMORY; + WideCharToMultiByte(CP_ACP, 0, urlW, -1, url, len, NULL, NULL); + + ovl.hEvent = (HANDLE)((ULONG_PTR)CreateEventW(NULL, TRUE, FALSE, NULL) | 1); + + if (!DeviceIoControl(queue, IOCTL_HTTP_REMOVE_URL, url, len, NULL, 0, NULL, &ovl)) + ret = GetLastError(); + CloseHandle(ovl.hEvent); + heap_free(url); + return ret; } /***********************************************************************

1 0

Zebediah Figura : http.sys: Listen for connections on addresses associated with each request queue.
by Alexandre Julliard Aug. 23, 2019

Aug. 23, 2019

Module: wine Branch: master Commit: 9fd1b0c228cd019e05ffd7b207e7883feda04a82 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9fd1b0c228cd019e05ffd7b2… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Aug 22 22:35:27 2019 -0500 http.sys: Listen for connections on addresses associated with each request queue. Ultimately we'll want to move the listening socket list out of the request_queue structure, since multiple request queues can share the same address. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/http.sys/Makefile.in | 2 +- dlls/http.sys/http.c | 129 ++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 127 insertions(+), 4 deletions(-) diff --git a/dlls/http.sys/Makefile.in b/dlls/http.sys/Makefile.in index 449ebae..a170957 100644 --- a/dlls/http.sys/Makefile.in +++ b/dlls/http.sys/Makefile.in @@ -1,5 +1,5 @@ MODULE = http.sys -IMPORTS = ntoskrnl +IMPORTS = ntoskrnl ws2_32 EXTRADLLFLAGS = -Wl,--subsystem,native -mno-cygwin C_SRCS = \ diff --git a/dlls/http.sys/http.c b/dlls/http.sys/http.c index e57cce9..bfec4cf 100644 --- a/dlls/http.sys/http.c +++ b/dlls/http.sys/http.c @@ -41,22 +41,89 @@ WINE_DEFAULT_DEBUG_CHANNEL(http); DECLARE_CRITICAL_SECTION(http_cs); +static HANDLE request_thread, request_event; +static BOOL thread_stop; + +struct connection +{ + struct list entry; /* in "connections" below */ + + int socket; +}; + +static struct list connections = LIST_INIT(connections); + struct request_queue { struct list entry; HTTP_URL_CONTEXT context; char *url; + int socket; }; static struct list request_queues = LIST_INIT(request_queues); +static void accept_connection(int socket) +{ + struct connection *conn; + ULONG true = 1; + int peer; + + if ((peer = accept(socket, NULL, NULL)) == -1) + return; + + if (!(conn = heap_alloc_zero(sizeof(*conn)))) + { + ERR("Failed to allocate memory.\n"); + shutdown(peer, SD_BOTH); + closesocket(peer); + return; + } + WSAEventSelect(peer, request_event, FD_READ | FD_CLOSE); + ioctlsocket(peer, FIONBIO, &true); + conn->socket = peer; + list_add_head(&connections, &conn->entry); +} + +static void close_connection(struct connection *conn) +{ + shutdown(conn->socket, SD_BOTH); + closesocket(conn->socket); + list_remove(&conn->entry); + heap_free(conn); +} + +static DWORD WINAPI request_thread_proc(void *arg) +{ + struct request_queue *queue; + + TRACE("Starting request thread.\n"); + + while (!WaitForSingleObject(request_event, INFINITE)) + { + EnterCriticalSection(&http_cs); + + LIST_FOR_EACH_ENTRY(queue, &request_queues, struct request_queue, entry) + { + if (queue->socket != -1) + accept_connection(queue->socket); + } + + LeaveCriticalSection(&http_cs); + } + + TRACE("Stopping request thread.\n"); + + return 0; +} static NTSTATUS http_add_url(struct request_queue *queue, IRP *irp) { const struct http_add_url_params *params = irp->AssociatedIrp.SystemBuffer; - unsigned short port; + struct sockaddr_in addr; char *url, *endptr; - int count = 0; + int s, count = 0; + ULONG true = 1; const char *p; TRACE("host %s, context %s.\n", debugstr_a(params->url), wine_dbgstr_longlong(params->context)); @@ -69,7 +136,7 @@ static NTSTATUS http_add_url(struct request_queue *queue, IRP *irp) else if (strncmp(params->url, "http://", 7) || !strchr(params->url + 7, ':') || params->url[strlen(params->url) - 1] != '/') return STATUS_INVALID_PARAMETER; - if (!(port = strtol(strchr(params->url + 7, ':') + 1, &endptr, 10)) || *endptr != '/') + if (!(addr.sin_port = htons(strtol(strchr(params->url + 7, ':') + 1, &endptr, 10))) || *endptr != '/') return STATUS_INVALID_PARAMETER; if (!(url = heap_alloc(strlen(params->url)))) @@ -97,6 +164,37 @@ static NTSTATUS http_add_url(struct request_queue *queue, IRP *irp) return STATUS_NOT_IMPLEMENTED; } + if ((s = socket(AF_INET, SOCK_STREAM, 0)) == -1) + { + ERR("Failed to create socket, error %u.\n", WSAGetLastError()); + LeaveCriticalSection(&http_cs); + heap_free(url); + return STATUS_UNSUCCESSFUL; + } + + addr.sin_family = AF_INET; + addr.sin_addr.S_un.S_addr = INADDR_ANY; + if (bind(s, (struct sockaddr *)&addr, sizeof(addr)) == -1) + { + ERR("Failed to bind socket, error %u.\n", WSAGetLastError()); + LeaveCriticalSection(&http_cs); + closesocket(s); + heap_free(url); + return STATUS_UNSUCCESSFUL; + } + + if (listen(s, SOMAXCONN) == -1) + { + ERR("Failed to listen to port %u, error %u.\n", addr.sin_port, WSAGetLastError()); + LeaveCriticalSection(&http_cs); + closesocket(s); + heap_free(url); + return STATUS_OBJECT_NAME_COLLISION; + } + + ioctlsocket(s, FIONBIO, &true); + WSAEventSelect(s, request_event, FD_ACCEPT); + queue->socket = s; queue->url = url; queue->context = params->context; @@ -178,6 +276,11 @@ static void close_queue(struct request_queue *queue) { EnterCriticalSection(&http_cs); list_remove(&queue->entry); + if (queue->socket != -1) + { + shutdown(queue->socket, SD_BOTH); + closesocket(queue->socket); + } LeaveCriticalSection(&http_cs); heap_free(queue->url); @@ -200,12 +303,26 @@ static NTSTATUS WINAPI dispatch_close(DEVICE_OBJECT *device, IRP *irp) static void WINAPI unload(DRIVER_OBJECT *driver) { struct request_queue *queue, *queue_next; + struct connection *conn, *conn_next; + + thread_stop = TRUE; + SetEvent(request_event); + WaitForSingleObject(request_thread, INFINITE); + CloseHandle(request_thread); + CloseHandle(request_event); + + LIST_FOR_EACH_ENTRY_SAFE(conn, conn_next, &connections, struct connection, entry) + { + close_connection(conn); + } LIST_FOR_EACH_ENTRY_SAFE(queue, queue_next, &request_queues, struct request_queue, entry) { close_queue(queue); } + WSACleanup(); + IoDeleteDevice(device_obj); NtClose(directory_obj); } @@ -216,6 +333,7 @@ NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, UNICODE_STRING *path) static const WCHAR directory_nameW[] = {'\\','D','e','v','i','c','e','\\','H','t','t','p',0}; OBJECT_ATTRIBUTES attr = {sizeof(attr)}; UNICODE_STRING string; + WSADATA wsadata; NTSTATUS ret; TRACE("driver %p, path %s.\n", driver, debugstr_w(path->Buffer)); @@ -238,5 +356,10 @@ NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, UNICODE_STRING *path) driver->MajorFunction[IRP_MJ_DEVICE_CONTROL] = dispatch_ioctl; driver->DriverUnload = unload; + WSAStartup(MAKEWORD(1,1), &wsadata); + + request_event = CreateEventW(NULL, FALSE, FALSE, NULL); + request_thread = CreateThread(NULL, 0, request_thread_proc, NULL, 0, NULL); + return STATUS_SUCCESS; }

1 0

Zebediah Figura : http.sys: Receive data from connected sockets.
by Alexandre Julliard Aug. 23, 2019

Aug. 23, 2019

Module: wine Branch: master Commit: fb6956c7d147e18e2e106f3ffd6727d9cb65d306 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fb6956c7d147e18e2e106f3f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Aug 22 22:35:28 2019 -0500 http.sys: Receive data from connected sockets. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/http.sys/http.c | 83 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 83 insertions(+) diff --git a/dlls/http.sys/http.c b/dlls/http.sys/http.c index bfec4cf..5e29db0 100644 --- a/dlls/http.sys/http.c +++ b/dlls/http.sys/http.c @@ -49,6 +49,9 @@ struct connection struct list entry; /* in "connections" below */ int socket; + + char *buffer; + unsigned int len, size; }; static struct list connections = LIST_INIT(connections); @@ -79,6 +82,15 @@ static void accept_connection(int socket) closesocket(peer); return; } + if (!(conn->buffer = heap_alloc(8192))) + { + ERR("Failed to allocate buffer memory.\n"); + heap_free(conn); + shutdown(peer, SD_BOTH); + closesocket(peer); + return; + } + conn->size = 8192; WSAEventSelect(peer, request_event, FD_READ | FD_CLOSE); ioctlsocket(peer, FIONBIO, &true); conn->socket = peer; @@ -93,8 +105,74 @@ static void close_connection(struct connection *conn) heap_free(conn); } +/* Upon receiving a request, parse it to ensure that it is a valid HTTP request, + * and mark down some information that we will use later. Returns 1 if we parsed + * a complete request, 0 if incomplete, -1 if invalid. */ +static int parse_request(struct connection *conn) +{ + FIXME("Not implemented.\n"); + return -1; +} + +static void receive_data(struct connection *conn) +{ + int len, ret; + + /* We might be waiting for an IRP, but always call recv() anyway, since we + * might have been woken up by the socket closing. */ + if ((len = recv(conn->socket, conn->buffer + conn->len, conn->size - conn->len, 0)) <= 0) + { + if (WSAGetLastError() == WSAEWOULDBLOCK) + return; /* nothing to receive */ + else if (!len) + TRACE("Connection was shut down by peer.\n"); + else + ERR("Got error %u; shutting down connection.\n", WSAGetLastError()); + close_connection(conn); + return; + } + conn->len += len; + + TRACE("Received %u bytes of data.\n", len); + + if (!(ret = parse_request(conn))) + { + ULONG available; + ioctlsocket(conn->socket, FIONREAD, &available); + if (available) + { + TRACE("%u more bytes of data available, trying with larger buffer.\n", available); + if (!(conn->buffer = heap_realloc(conn->buffer, conn->len + available))) + { + ERR("Failed to allocate %u bytes of memory.\n", conn->len + available); + close_connection(conn); + return; + } + conn->size = conn->len + available; + + if ((len = recv(conn->socket, conn->buffer + conn->len, conn->size - conn->len, 0)) < 0) + { + ERR("Got error %u; shutting down connection.\n", WSAGetLastError()); + close_connection(conn); + return; + } + TRACE("Received %u bytes of data.\n", len); + conn->len += len; + ret = parse_request(conn); + } + } + if (!ret) + TRACE("Request is incomplete, waiting for more data.\n"); + else if (ret < 0) + { + WARN("Failed to parse request; shutting down connection.\n"); + close_connection(conn); + } +} + static DWORD WINAPI request_thread_proc(void *arg) { + struct connection *conn, *cursor; struct request_queue *queue; TRACE("Starting request thread.\n"); @@ -109,6 +187,11 @@ static DWORD WINAPI request_thread_proc(void *arg) accept_connection(queue->socket); } + LIST_FOR_EACH_ENTRY_SAFE(conn, cursor, &connections, struct connection, entry) + { + receive_data(conn); + } + LeaveCriticalSection(&http_cs); }

1 0

Zebediah Figura : httpapi: Implement HttpAddUrl().
by Alexandre Julliard Aug. 23, 2019

Aug. 23, 2019

Module: wine Branch: master Commit: 6bde953714a0e476203f6da6dea92a3d7122c2b6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6bde953714a0e476203f6da6… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Aug 22 22:35:25 2019 -0500 httpapi: Implement HttpAddUrl(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/httpapi/httpapi_main.c | 36 ++++++++++++++++++++++++++++-------- 1 file changed, 28 insertions(+), 8 deletions(-) diff --git a/dlls/httpapi/httpapi_main.c b/dlls/httpapi/httpapi_main.c index 4536aa8..cc52273 100644 --- a/dlls/httpapi/httpapi_main.c +++ b/dlls/httpapi/httpapi_main.c @@ -18,13 +18,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" +#include "wine/http.h" #include "winternl.h" -#include "http.h" #include "wine/debug.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(httpapi); @@ -186,13 +183,36 @@ ULONG WINAPI HttpCreateHttpHandle(HANDLE *handle, ULONG reserved) FILE_ATTRIBUTE_NORMAL, 0, FILE_OPEN, FILE_NON_DIRECTORY_FILE, NULL, 0)); } +static ULONG add_url(HANDLE queue, const WCHAR *urlW, HTTP_URL_CONTEXT context) +{ + struct http_add_url_params *params; + ULONG ret = ERROR_SUCCESS; + OVERLAPPED ovl; + int len; + + len = WideCharToMultiByte(CP_ACP, 0, urlW, -1, NULL, 0, NULL, NULL); + if (!(params = heap_alloc(offsetof(struct http_add_url_params, url[len])))) + return ERROR_OUTOFMEMORY; + WideCharToMultiByte(CP_ACP, 0, urlW, -1, params->url, len, NULL, NULL); + params->context = context; + + ovl.hEvent = (HANDLE)((ULONG_PTR)CreateEventW(NULL, TRUE, FALSE, NULL) | 1); + + if (!DeviceIoControl(queue, IOCTL_HTTP_ADD_URL, params, + offsetof(struct http_add_url_params, url[len]), NULL, 0, NULL, &ovl)) + ret = GetLastError(); + CloseHandle(ovl.hEvent); + return ret; +} + /*********************************************************************** * HttpAddUrl (HTTPAPI.@) */ -ULONG WINAPI HttpAddUrl( HANDLE handle, PCWSTR url, PVOID reserved ) +ULONG WINAPI HttpAddUrl(HANDLE queue, const WCHAR *url, void *reserved) { - FIXME( "(%p, %s, %p): stub!\n", handle, debugstr_w(url), reserved ); - return ERROR_CALL_NOT_IMPLEMENTED; + TRACE("queue %p, url %s, reserved %p.\n", queue, debugstr_w(url), reserved); + + return add_url(queue, url, 0); } /***********************************************************************

1 0

Alexandre Julliard : Wine release 4.0.2
by Alexandre Julliard Aug. 23, 2019

Aug. 23, 2019

Module: website Branch: master Commit: c6850108cb54722727da4d3ce8c872c5b2f36ca1 URL: https://source.winehq.org/git/website.git/?a=commit;h=c6850108cb54722727da4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 23 16:31:33 2019 +0200 Wine release 4.0.2 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2019082301.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/news/en/2019082301.xml b/news/en/2019082301.xml new file mode 100644 index 0000000..2c4a9ed --- /dev/null +++ b/news/en/2019082301.xml @@ -0,0 +1,12 @@ +<news> +<date>August 23, 2019</date> +<title>Wine 4.0.2 Released</title> +<body> + The Wine maintenance release 4.0.2 is now available. + <a href="{$root}/announce/4.0.2">What's new</a> in this release: +<ul> + <li>Various bug fixes</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/4.0/wine-4.0.2.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Zhiyi Zhang : dinput: Fix a possible deadlock at exit.
by Alexandre Julliard Aug. 23, 2019

Aug. 23, 2019

Module: wine Branch: stable Commit: cf4883de1354df1061b4834b4d99615dfe8dedfb URL: https://source.winehq.org/git/wine.git/?a=commit;h=cf4883de1354df1061b4834b… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Apr 11 18:28:40 2019 +0800 dinput: Fix a possible deadlock at exit. This fix another deadlock issue with dinput. The old implementation of dinput waits for a hook thread to exit during its uninitialization, which will never return during DLL_THREAD_DETACH. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 886d28de974b0b012be87cf8552806dc65ef3ea9) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dinput/dinput_main.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 65aaf92..1b2020c 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -1781,7 +1781,7 @@ static DWORD WINAPI hook_thread_proc(void *param) DispatchMessageW(&msg); } - return 0; + FreeLibraryAndExitThread(DINPUT_instance, 0); } static DWORD hook_thread_id; @@ -1798,15 +1798,16 @@ static CRITICAL_SECTION dinput_hook_crit = { &dinput_critsect_debug, -1, 0, 0, 0 static BOOL check_hook_thread(void) { static HANDLE hook_thread; + HMODULE module; EnterCriticalSection(&dinput_hook_crit); TRACE("IDirectInputs left: %d\n", list_count(&direct_input_list)); if (!list_empty(&direct_input_list) && !hook_thread) { + GetModuleHandleExW(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, (const WCHAR*)DINPUT_instance, &module); hook_thread_event = CreateEventW(NULL, FALSE, FALSE, NULL); hook_thread = CreateThread(NULL, 0, hook_thread_proc, hook_thread_event, 0, &hook_thread_id); - LeaveCriticalSection(&dinput_hook_crit); } else if (list_empty(&direct_input_list) && hook_thread) { @@ -1821,16 +1822,11 @@ static BOOL check_hook_thread(void) hook_thread_id = 0; PostThreadMessageW(tid, WM_USER+0x10, 0, 0); - LeaveCriticalSection(&dinput_hook_crit); - - /* wait for hook thread to exit */ - WaitForSingleObject(hook_thread, INFINITE); CloseHandle(hook_thread); hook_thread = NULL; } - else - LeaveCriticalSection(&dinput_hook_crit); + LeaveCriticalSection(&dinput_hook_crit); return hook_thread_id != 0; }

1 0

Tim Schumacher : winejoystick: Add support for wheel axes.
by Alexandre Julliard Aug. 23, 2019

Aug. 23, 2019

Module: wine Branch: stable Commit: 4fcf59e0f2c2a5b4a10d60f45557c02ee4de8e03 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4fcf59e0f2c2a5b4a10d60f4… Author: Tim Schumacher <timschumi(a)gmx.de> Date: Sun Mar 31 13:02:27 2019 +0200 winejoystick: Add support for wheel axes. Wheel, gas, and brake are replacements for X, Y and Z in wheel-like joysticks. Remap them internally to send inputs as X, Y, and Z. Signed-off-by: Tim Schumacher <timschumi(a)gmx.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 905e7b0e2ef99c7ccfa5a3dda0844d5ea40afc77) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winejoystick.drv/joystick_linux.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/winejoystick.drv/joystick_linux.c b/dlls/winejoystick.drv/joystick_linux.c index 287f4be..7c24040 100644 --- a/dlls/winejoystick.drv/joystick_linux.c +++ b/dlls/winejoystick.drv/joystick_linux.c @@ -280,10 +280,13 @@ static const WCHAR ini[] = {'W','i','n','e',' ','J','o','y','s','t','i','c','k', switch (jstck->axesMap[i]) { case 0: /* X */ case 1: /* Y */ + case 8: /* Wheel */ + case 9: /* Gas */ lpCaps->wNumAxes++; break; case 2: /* Z */ case 6: /* Throttle */ + case 10: /* Brake */ lpCaps->wNumAxes++; lpCaps->wCaps |= JOYCAPS_HASZ; break; @@ -365,13 +368,16 @@ LRESULT driver_joyGetPosEx(DWORD_PTR dwDevID, LPJOYINFOEX lpInfo) if (ev.type == (JS_EVENT_AXIS)) { switch (jstck->axesMap[ev.number]) { case 0: /* X */ + case 8: /* Wheel */ jstck->x = ev.value; break; case 1: /* Y */ + case 9: /* Gas */ jstck->y = ev.value; break; case 2: /* Z */ case 6: /* Throttle */ + case 10: /* Brake */ jstck->z = ev.value; break; case 5: /* Rz */

1 0

Alistair Leslie-Hughes : dinput: Allow enumeration of joysticks with DirectX 3.
by Alexandre Julliard Aug. 23, 2019

Aug. 23, 2019

Module: wine Branch: stable Commit: 20f2d0726b916c30a7c2b175bdf0b0c88b584c69 URL: https://source.winehq.org/git/wine.git/?a=commit;h=20f2d0726b916c30a7c2b175… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri May 10 03:46:11 2019 +0000 dinput: Allow enumeration of joysticks with DirectX 3. Star Wars: Rogue 3D requests a DirectX 3.0 version 0108:trace:dinput:DirectInputCreateEx (0x400000,0300,{9a4cb684-236d-11d3-8e9d-00c04f6844ae},0x7acfa0,(nil)) and then tries to interate over all Joysticks. When using modern windows, the current tests show that this is the correct behaviour. However, it's possible to use a shim to allow older games, like the one above, to interate over joysticks. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit fe4db5309e3754a96873d959736b5c9099a5ef38) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dinput/joystick_linux.c | 4 ++-- dlls/dinput/joystick_linuxinput.c | 4 ++-- dlls/dinput/joystick_osx.c | 4 ++-- dlls/dinput/tests/joystick.c | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index c4efc93..32ea3ed 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -380,7 +380,7 @@ static HRESULT joydev_enum_deviceA(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINS } if ((dwDevType == 0) || - ((dwDevType == DIDEVTYPE_JOYSTICK) && (version > 0x0300 && version < 0x0800)) || + ((dwDevType == DIDEVTYPE_JOYSTICK) && (version >= 0x0300 && version < 0x0800)) || (((dwDevType == DI8DEVCLASS_GAMECTRL) || (dwDevType == DI8DEVTYPE_JOYSTICK)) && (version >= 0x0800))) { /* check whether we have a joystick */ if ((fd = open(joystick_devices[id].device, O_RDONLY)) == -1) @@ -409,7 +409,7 @@ static HRESULT joydev_enum_deviceW(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINS } if ((dwDevType == 0) || - ((dwDevType == DIDEVTYPE_JOYSTICK) && (version > 0x0300 && version < 0x0800)) || + ((dwDevType == DIDEVTYPE_JOYSTICK) && (version >= 0x0300 && version < 0x0800)) || (((dwDevType == DI8DEVCLASS_GAMECTRL) || (dwDevType == DI8DEVTYPE_JOYSTICK)) && (version >= 0x0800))) { /* check whether we have a joystick */ if ((fd = open(joystick_devices[id].device, O_RDONLY)) == -1) diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index 910e755..2ceb2eb 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -407,7 +407,7 @@ static HRESULT joydev_enum_deviceA(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINS } if (!((dwDevType == 0) || - ((dwDevType == DIDEVTYPE_JOYSTICK) && (version > 0x0300 && version < 0x0800)) || + ((dwDevType == DIDEVTYPE_JOYSTICK) && (version >= 0x0300 && version < 0x0800)) || (((dwDevType == DI8DEVCLASS_GAMECTRL) || (dwDevType == DI8DEVTYPE_JOYSTICK)) && (version >= 0x0800)))) return S_FALSE; @@ -432,7 +432,7 @@ static HRESULT joydev_enum_deviceW(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINS } if (!((dwDevType == 0) || - ((dwDevType == DIDEVTYPE_JOYSTICK) && (version > 0x0300 && version < 0x0800)) || + ((dwDevType == DIDEVTYPE_JOYSTICK) && (version >= 0x0300 && version < 0x0800)) || (((dwDevType == DI8DEVCLASS_GAMECTRL) || (dwDevType == DI8DEVTYPE_JOYSTICK)) && (version >= 0x0800)))) return S_FALSE; diff --git a/dlls/dinput/joystick_osx.c b/dlls/dinput/joystick_osx.c index 0701b9f..ad66434 100644 --- a/dlls/dinput/joystick_osx.c +++ b/dlls/dinput/joystick_osx.c @@ -953,7 +953,7 @@ static HRESULT joydev_enum_deviceA(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINS device = get_device_ref(id); if ((dwDevType == 0) || - ((dwDevType == DIDEVTYPE_JOYSTICK) && (version > 0x0300 && version < 0x0800)) || + ((dwDevType == DIDEVTYPE_JOYSTICK) && (version >= 0x0300 && version < 0x0800)) || (((dwDevType == DI8DEVCLASS_GAMECTRL) || (dwDevType == DI8DEVTYPE_JOYSTICK)) && (version >= 0x0800))) { if (dwFlags & DIEDFL_FORCEFEEDBACK) { @@ -997,7 +997,7 @@ static HRESULT joydev_enum_deviceW(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINS device = get_device_ref(id); if ((dwDevType == 0) || - ((dwDevType == DIDEVTYPE_JOYSTICK) && (version > 0x0300 && version < 0x0800)) || + ((dwDevType == DIDEVTYPE_JOYSTICK) && (version >= 0x0300 && version < 0x0800)) || (((dwDevType == DI8DEVCLASS_GAMECTRL) || (dwDevType == DI8DEVTYPE_JOYSTICK)) && (version >= 0x0800))) { if (dwFlags & DIEDFL_FORCEFEEDBACK) { diff --git a/dlls/dinput/tests/joystick.c b/dlls/dinput/tests/joystick.c index 69e95d0..57647c2 100644 --- a/dlls/dinput/tests/joystick.c +++ b/dlls/dinput/tests/joystick.c @@ -298,7 +298,7 @@ static BOOL CALLBACK EnumJoysticks(const DIDEVICEINSTANCEA *lpddi, void *pvRef) DIPROPDWORD dip_gain_set, dip_gain_get; struct effect_enum effect_data; - ok(data->version > 0x0300, "Joysticks not supported in version 0x%04x\n", data->version); + ok(data->version >= 0x0300, "Joysticks not supported in version 0x%04x\n", data->version); hr = IDirectInput_CreateDevice(data->pDI, &lpddi->guidInstance, NULL, NULL); ok(hr==E_POINTER,"IDirectInput_CreateDevice() should have returned "

1 0

Alistair Leslie-Hughes : dinput: Handle setting DIPROP_CALIBRATIONMODE mode in generic implementation.
by Alexandre Julliard Aug. 23, 2019

Aug. 23, 2019

Module: wine Branch: stable Commit: 88316ea8119d7a36a072f1f6372080c1f267ede2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=88316ea8119d7a36a072f1f6… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue May 14 01:10:39 2019 +0000 dinput: Handle setting DIPROP_CALIBRATIONMODE mode in generic implementation. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47183 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 132cf25ed6df160db9df479fb7974c00110aaa58) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dinput/joystick.c | 5 +++++ dlls/dinput/joystick_linuxinput.c | 5 ----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/dinput/joystick.c b/dlls/dinput/joystick.c index 0ec1ceb..0b2ee1a 100644 --- a/dlls/dinput/joystick.c +++ b/dlls/dinput/joystick.c @@ -395,6 +395,11 @@ HRESULT WINAPI JoystickWGenericImpl_SetProperty(LPDIRECTINPUTDEVICE8W iface, REF } break; } + case (DWORD_PTR)DIPROP_CALIBRATIONMODE: { + LPCDIPROPDWORD pd = (LPCDIPROPDWORD)ph; + FIXME("DIPROP_CALIBRATIONMODE(%d)\n", pd->dwData); + break; + } default: return IDirectInputDevice2WImpl_SetProperty(iface, rguid, ph); } diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index 2ceb2eb..b4c38fa 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -923,11 +923,6 @@ static HRESULT WINAPI JoystickWImpl_SetProperty(LPDIRECTINPUTDEVICE8W iface, REF if (IS_DIPROP(rguid)) { switch (LOWORD(rguid)) { - case (DWORD_PTR)DIPROP_CALIBRATIONMODE: { - LPCDIPROPDWORD pd = (LPCDIPROPDWORD)ph; - FIXME("DIPROP_CALIBRATIONMODE(%d)\n", pd->dwData); - break; - } case (DWORD_PTR)DIPROP_AUTOCENTER: { LPCDIPROPDWORD pd = (LPCDIPROPDWORD)ph;

1 0

Alistair Leslie-Hughes : vbscript: Move variable declaration outside of for.
by Alexandre Julliard Aug. 23, 2019

Aug. 23, 2019

Module: wine Branch: stable Commit: 6d7c890e8307d8f7a214adf2dd3a87932567a86e URL: https://source.winehq.org/git/wine.git/?a=commit;h=6d7c890e8307d8f7a214adf2… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Feb 28 22:37:25 2019 +0000 vbscript: Move variable declaration outside of for. This stops a compile error under gcc 4.8.4. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit b75627ec1060e4a539cdbbdb6626876d61429970) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/vbscript/tests/run.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index 7f1fd4c..1858246 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -828,8 +828,9 @@ static HRESULT WINAPI testObj_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD { "resume", DISPID_TESTOBJ_KEYWORD, NULL }, { "goto", DISPID_TESTOBJ_KEYWORD, NULL }, }; + int i; - for (int i = 0; i < ARRAY_SIZE(dispids); i++) { + for (i = 0; i < ARRAY_SIZE(dispids); i++) { if(!stricmp_wa(bstrName, dispids[i].name)) { dispid_t *d = &dispids[i]; if(d->expect) {

1 0