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

Zebediah Figura : httpapi: Implement HttpAddUrl().
by Alexandre Julliard 23 Aug '19

23 Aug '19

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

Zebediah Figura : httpapi: Implement HttpRemoveUrl().
by Alexandre Julliard 23 Aug '19

23 Aug '19

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 23 Aug '19

23 Aug '19

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 23 Aug '19

23 Aug '19

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

Alexandre Julliard : Wine release 4.0.2
by Alexandre Julliard 23 Aug '19

23 Aug '19

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

Vijay Kiran Kamuju : ntdll: Report system information SystemPerformanceInformation info class.
by Alexandre Julliard 23 Aug '19

23 Aug '19

Module: wine Branch: stable Commit: 95f94568158caaf4fefe2e14f21bb3f0701577c9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=95f94568158caaf4fefe2e14… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Tue Apr 16 11:27:16 2019 +0200 ntdll: Report system information SystemPerformanceInformation info class. Based on patch from Michael Müller. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 99ba65a1ea2c1546a61c3ed40996cbfee9d25f69) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntdll/nt.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index dcf9123..12f1ab5 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -2312,6 +2312,37 @@ NTSTATUS WINAPI NtQuerySystemInformation( spi.IdleTime.QuadPart = ++idle; } + if ((fp = fopen("/proc/meminfo", "r"))) + { + ULONG64 totalram, freeram, totalswap, freeswap; + char line[64]; + while (fgets(line, sizeof(line), fp)) + { + if(sscanf(line, "MemTotal: %llu kB", &totalram) == 1) + { + totalram *= 1024; + } + else if(sscanf(line, "MemFree: %llu kB", &freeram) == 1) + { + freeram *= 1024; + } + else if(sscanf(line, "SwapTotal: %llu kB", &totalswap) == 1) + { + totalswap *= 1024; + } + else if(sscanf(line, "SwapFree: %llu kB", &freeswap) == 1) + { + freeswap *= 1024; + break; + } + } + fclose(fp); + + spi.AvailablePages = freeram / page_size; + spi.TotalCommittedPages = (totalram + totalswap - freeram - freeswap) / page_size; + spi.TotalCommitLimit = (totalram + totalswap) / page_size; + } + if (Length >= len) { if (!SystemInformation) ret = STATUS_ACCESS_VIOLATION;

1 0

Zebediah Figura : widl: Correctly set the import library offset for all imported types.
by Alexandre Julliard 23 Aug '19

23 Aug '19

Module: wine Branch: stable Commit: 20a434478a7ef207de12af68a82357a6de07c8e9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=20a434478a7ef207de12af68… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 17 00:14:55 2019 -0500 widl: Correctly set the import library offset for all imported types. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47031 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 6c64d02117ecb9b259a55237f145fc9d5e70cdad) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- tools/widl/widltypes.h | 1 + tools/widl/write_msft.c | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index 37792b2..50c4b2f 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -497,6 +497,7 @@ struct _importinfo_t { }; struct _importlib_t { + int offset; char *name; int version; diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index cb4f0f3..4dcbc03 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -702,15 +702,15 @@ static void alloc_importinfo(msft_typelib_t *typelib, importinfo_t *importinfo) guid_idx = ctl2_alloc_guid(typelib, &guid); - alloc_importfile(typelib, guid_idx, importlib->version&0xffff, - importlib->version>>16, importlib->name); + importlib->offset = alloc_importfile(typelib, guid_idx, importlib->version & 0xffff, + importlib->version >> 16, importlib->name); } if(importinfo->offset == -1 || !(importinfo->flags & MSFT_IMPINFO_OFFSET_IS_GUID)) { MSFT_ImpInfo impinfo; impinfo.flags = importinfo->flags; - impinfo.oImpFile = 0; + impinfo.oImpFile = importlib->offset; if(importinfo->flags & MSFT_IMPINFO_OFFSET_IS_GUID) { MSFT_GuidEntry guid;

1 0

Louis Lenders : kernel32: Add DECLSPEC_HOTPATCH to CreateActCtx.
by Alexandre Julliard 23 Aug '19

23 Aug '19

Module: wine Branch: stable Commit: 6c8534b5e997485f3c877b4aad4927b5cc7daec5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6c8534b5e997485f3c877b4a… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Tue Apr 23 20:11:14 2019 +0200 kernel32: Add DECLSPEC_HOTPATCH to CreateActCtx. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47051 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit d4421f9c0bf42d45154a4a9d037ce51f264756c8) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/actctx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/actctx.c b/dlls/kernel32/actctx.c index 17067ed..bd2345d 100644 --- a/dlls/kernel32/actctx.c +++ b/dlls/kernel32/actctx.c @@ -38,7 +38,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(actctx); * * Create an activation context. */ -HANDLE WINAPI CreateActCtxA(PCACTCTXA pActCtx) +HANDLE WINAPI DECLSPEC_HOTPATCH CreateActCtxA(PCACTCTXA pActCtx) { ACTCTXW actw; SIZE_T len; @@ -114,7 +114,7 @@ done: * * Create an activation context. */ -HANDLE WINAPI CreateActCtxW(PCACTCTXW pActCtx) +HANDLE WINAPI DECLSPEC_HOTPATCH CreateActCtxW(PCACTCTXW pActCtx) { NTSTATUS status; HANDLE hActCtx;

1 0

Hans Leidekker : wbemprox: Implement Win32_OperatingSystem.SystemDrive.
by Alexandre Julliard 23 Aug '19

23 Aug '19

Module: wine Branch: stable Commit: b1f4c5ea0c5788857f1adb8b458147c73a2e883b URL: https://source.winehq.org/git/wine.git/?a=commit;h=b1f4c5ea0c5788857f1adb8b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Apr 24 12:58:11 2019 +0200 wbemprox: Implement Win32_OperatingSystem.SystemDrive. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47065 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit fb26388b0a8efc05b3e479db837a380759153267) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wbemprox/builtin.c | 12 ++++++++++++ dlls/wbemprox/tests/query.c | 11 +++++++++++ 2 files changed, 23 insertions(+) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index a7dd23b..67ca289 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -394,6 +394,8 @@ static const WCHAR prop_suitemaskW[] = {'S','u','i','t','e','M','a','s','k',0}; static const WCHAR prop_systemdirectoryW[] = {'S','y','s','t','e','m','D','i','r','e','c','t','o','r','y',0}; +static const WCHAR prop_systemdriveW[] = + {'S','y','s','t','e','m','D','r','i','v','e',0}; static const WCHAR prop_systemnameW[] = {'S','y','s','t','e','m','N','a','m','e',0}; static const WCHAR prop_tagW[] = @@ -597,6 +599,7 @@ static const struct column col_os[] = { prop_servicepackminorW, CIM_UINT16, VT_I4 }, { prop_suitemaskW, CIM_UINT32, VT_I4 }, { prop_systemdirectoryW, CIM_STRING|COL_FLAG_DYNAMIC }, + { prop_systemdriveW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_totalvirtualmemorysizeW, CIM_UINT64 }, { prop_totalvisiblememorysizeW, CIM_UINT64 }, { prop_versionW, CIM_STRING|COL_FLAG_DYNAMIC } @@ -1023,6 +1026,7 @@ struct record_operatingsystem UINT16 servicepackminor; UINT32 suitemask; const WCHAR *systemdirectory; + const WCHAR *systemdrive; UINT64 totalvirtualmemorysize; UINT64 totalvisiblememorysize; const WCHAR *version; @@ -3021,6 +3025,13 @@ static WCHAR *get_systemdirectory(void) Wow64RevertWow64FsRedirection( redir ); return ret; } +static WCHAR *get_systemdrive(void) +{ + WCHAR *ret = heap_alloc( 3 * sizeof(WCHAR) ); /* "c:" */ + if (ret && GetEnvironmentVariableW( prop_systemdriveW, ret, 3 )) return ret; + heap_free( ret ); + return NULL; +} static WCHAR *get_codeset(void) { static const WCHAR fmtW[] = {'%','u',0}; @@ -3162,6 +3173,7 @@ static enum fill_status fill_os( struct table *table, const struct expr *cond ) rec->servicepackminor = ver.wServicePackMinor; rec->suitemask = 272; /* Single User + Terminal */ rec->systemdirectory = get_systemdirectory(); + rec->systemdrive = get_systemdrive(); rec->totalvirtualmemorysize = get_total_physical_memory() / 1024; rec->totalvisiblememorysize = rec->totalvirtualmemorysize; rec->version = get_osversion( &ver ); diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 7819f85..945fb15 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1192,6 +1192,8 @@ static void test_Win32_OperatingSystem( IWbemServices *services ) {'S','e','r','v','i','c','e','P','a','c','k','M','a','j','o','r','V','e','r','s','i','o','n',0}; static const WCHAR servicepackminorW[] = {'S','e','r','v','i','c','e','P','a','c','k','M','i','n','o','r','V','e','r','s','i','o','n',0}; + static const WCHAR systemdriveW[] = + {'S','y','s','t','e','m','D','r','i','v','e',0}; static const WCHAR totalvisiblememorysizeW[] = {'T','o','t','a','l','V','i','s','i','b','l','e','M','e','m','o','r','y','S','i','z','e',0}; static const WCHAR totalvirtualmemorysizeW[] = @@ -1347,6 +1349,15 @@ static void test_Win32_OperatingSystem( IWbemServices *services ) trace( "totalvirtualmemorysize %s\n", wine_dbgstr_w(V_BSTR(&val)) ); VariantClear( &val ); + type = 0xdeadbeef; + VariantInit( &val ); + hr = IWbemClassObject_Get( obj, systemdriveW, 0, &val, &type, NULL ); + ok( hr == S_OK, "failed to get version %08x\n", hr ); + ok( V_VT( &val ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &val ) ); + ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); + trace( "systemdrive: %s\n", wine_dbgstr_w(V_BSTR( &val )) ); + VariantClear( &val ); + IWbemClassObject_Release( obj ); IEnumWbemClassObject_Release( result ); SysFreeString( query );

1 0

Vijay Kiran Kamuju : wpcap: Fix compile warnings for redefinition of PCAP_OPENFLAG_PROMISCUOUS.
by Alexandre Julliard 23 Aug '19

23 Aug '19

Module: wine Branch: stable Commit: 551cba7c313e062e74a75293b51651b0b6f9cfda URL: https://source.winehq.org/git/wine.git/?a=commit;h=551cba7c313e062e74a75293… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Fri May 3 18:49:48 2019 +0200 wpcap: Fix compile warnings for redefinition of PCAP_OPENFLAG_PROMISCUOUS. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 660399b8fd905a208f192781723f7fe881b132fe) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wpcap/wpcap.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wpcap/wpcap.c b/dlls/wpcap/wpcap.c index f163235..6450a0e 100644 --- a/dlls/wpcap/wpcap.c +++ b/dlls/wpcap/wpcap.c @@ -254,7 +254,9 @@ int CDECL wine_pcap_next_ex(pcap_t *p, struct pcap_pkthdr **pkt_header, const un return pcap_next_ex(p, pkt_header, pkt_data); } +#ifndef PCAP_OPENFLAG_PROMISCUOUS #define PCAP_OPENFLAG_PROMISCUOUS 1 +#endif pcap_t* CDECL wine_pcap_open(const char *source, int snaplen, int flags, int read_timeout, void *auth, char *errbuf)

1 0