November 2019 - Wine-commits

Zebediah Figura : http.sys: Allow receiving entity body data.
by Alexandre Julliard 04 Nov '19

04 Nov '19

Module: wine Branch: master Commit: 92008978498037167e478725934c4c4b12095958 URL: https://source.winehq.org/git/wine.git/?a=commit;h=92008978498037167e478725… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Nov 3 20:20:37 2019 -0600 http.sys: Allow receiving entity body data. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/http.sys/http.c | 56 +++++++++++++++++++++++++++++++++++++++++++++++++--- include/wine/http.h | 7 +++++++ 2 files changed, 60 insertions(+), 3 deletions(-) diff --git a/dlls/http.sys/http.c b/dlls/http.sys/http.c index 41f9f15bba..91d81400e6 100644 --- a/dlls/http.sys/http.c +++ b/dlls/http.sys/http.c @@ -411,9 +411,9 @@ static NTSTATUS complete_irp(struct connection *conn, IRP *irp) const struct http_receive_request_params params = *(struct http_receive_request_params *)irp->AssociatedIrp.SystemBuffer; DWORD irp_size = (params.bits == 32) ? sizeof(struct http_request_32) : sizeof(struct http_request_64); + ULONG cooked_len, host_len, abs_path_len, query_len, chunk_len = 0, offset, processed; IO_STACK_LOCATION *stack = IoGetCurrentIrpStackLocation(irp); const DWORD output_len = stack->Parameters.DeviceIoControl.OutputBufferLength; - ULONG cooked_len, host_len, abs_path_len, query_len, chunk_len = 0, offset; const char *p, *name, *value, *host, *abs_path, *query; USHORT unk_headers_count = 0, unk_header_idx; int name_len, value_len, len; @@ -758,8 +758,10 @@ static NTSTATUS complete_irp(struct connection *conn, IRP *irp) assert(offset == irp->IoStatus.Information); conn->available = FALSE; - memmove(conn->buffer, conn->buffer + conn->req_len, conn->len - conn->req_len); - conn->len -= conn->req_len; + processed = conn->req_len - (conn->content_len - chunk_len); + memmove(conn->buffer, conn->buffer + processed, conn->len - processed); + conn->content_len -= chunk_len; + conn->len -= processed; return STATUS_SUCCESS; } @@ -1216,6 +1218,13 @@ static NTSTATUS http_send_response(struct request_queue *queue, IRP *irp) { if (send(conn->socket, response->buffer, response->len, 0) >= 0) { + if (conn->content_len) + { + /* Discard whatever entity body is left. */ + memmove(conn->buffer, conn->buffer + conn->content_len, conn->len - conn->content_len); + conn->len -= conn->content_len; + } + conn->queue = NULL; conn->req_id = HTTP_NULL_ID; WSAEventSelect(conn->socket, request_event, FD_READ | FD_CLOSE); @@ -1242,6 +1251,44 @@ static NTSTATUS http_send_response(struct request_queue *queue, IRP *irp) return STATUS_CONNECTION_INVALID; } +static NTSTATUS http_receive_body(struct request_queue *queue, IRP *irp) +{ + const struct http_receive_body_params *params = irp->AssociatedIrp.SystemBuffer; + IO_STACK_LOCATION *stack = IoGetCurrentIrpStackLocation(irp); + const DWORD output_len = stack->Parameters.DeviceIoControl.OutputBufferLength; + struct connection *conn; + NTSTATUS ret; + + TRACE("id %s, bits %u.\n", wine_dbgstr_longlong(params->id), params->bits); + + EnterCriticalSection(&http_cs); + + if ((conn = get_connection(params->id))) + { + TRACE("%u bits remaining.\n", conn->content_len); + + if (conn->content_len) + { + ULONG len = min(conn->content_len, output_len); + memcpy(irp->AssociatedIrp.SystemBuffer, conn->buffer, len); + memmove(conn->buffer, conn->buffer + len, conn->len - len); + conn->content_len -= len; + conn->len -= len; + + irp->IoStatus.Information = len; + ret = STATUS_SUCCESS; + } + else + ret = STATUS_END_OF_FILE; + } + else + ret = STATUS_CONNECTION_INVALID; + + LeaveCriticalSection(&http_cs); + + return ret; +} + static NTSTATUS WINAPI dispatch_ioctl(DEVICE_OBJECT *device, IRP *irp) { IO_STACK_LOCATION *stack = IoGetCurrentIrpStackLocation(irp); @@ -1262,6 +1309,9 @@ static NTSTATUS WINAPI dispatch_ioctl(DEVICE_OBJECT *device, IRP *irp) case IOCTL_HTTP_SEND_RESPONSE: ret = http_send_response(queue, irp); break; + case IOCTL_HTTP_RECEIVE_BODY: + ret = http_receive_body(queue, irp); + break; default: FIXME("Unhandled ioctl %#x.\n", stack->Parameters.DeviceIoControl.IoControlCode); ret = STATUS_NOT_IMPLEMENTED; diff --git a/include/wine/http.h b/include/wine/http.h index eb75d8f60e..d8039dea07 100644 --- a/include/wine/http.h +++ b/include/wine/http.h @@ -27,6 +27,7 @@ #define IOCTL_HTTP_REMOVE_URL CTL_CODE(FILE_DEVICE_UNKNOWN, 0x801, METHOD_BUFFERED, 0) #define IOCTL_HTTP_RECEIVE_REQUEST CTL_CODE(FILE_DEVICE_UNKNOWN, 0x802, METHOD_BUFFERED, 0) #define IOCTL_HTTP_SEND_RESPONSE CTL_CODE(FILE_DEVICE_UNKNOWN, 0x803, METHOD_BUFFERED, 0) +#define IOCTL_HTTP_RECEIVE_BODY CTL_CODE(FILE_DEVICE_UNKNOWN, 0x804, METHOD_BUFFERED, 0) struct http_add_url_params { @@ -49,4 +50,10 @@ struct http_response char buffer[1]; }; +struct http_receive_body_params +{ + HTTP_REQUEST_ID id; + ULONG bits; +}; + #endif

1 0

Zebediah Figura : httpapi: Implement HttpReceiveRequestEntityBody().
by Alexandre Julliard 04 Nov '19

04 Nov '19

Module: wine Branch: master Commit: c1a62e0167835e85d4abcb4c362be25f492d4cb1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c1a62e0167835e85d4abcb4c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Nov 3 20:20:38 2019 -0600 httpapi: Implement HttpReceiveRequestEntityBody(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48017 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/httpapi/httpapi_main.c | 31 ++++++++++-- dlls/httpapi/tests/httpapi.c | 118 ++++++++++++++++++++++++++++++++++++++++++- include/http.h | 2 + 3 files changed, 147 insertions(+), 4 deletions(-) diff --git a/dlls/httpapi/httpapi_main.c b/dlls/httpapi/httpapi_main.c index 47b5d8a2bb..0449d53045 100644 --- a/dlls/httpapi/httpapi_main.c +++ b/dlls/httpapi/httpapi_main.c @@ -284,12 +284,37 @@ ULONG WINAPI HttpRemoveUrl(HANDLE queue, const WCHAR *url) ULONG WINAPI HttpReceiveRequestEntityBody(HANDLE queue, HTTP_REQUEST_ID id, ULONG flags, void *buffer, ULONG size, ULONG *ret_size, OVERLAPPED *ovl) { - *ret_size = 0; + struct http_receive_body_params params = + { + .id = id, + .bits = sizeof(void *) * 8, + }; + ULONG ret = ERROR_SUCCESS; + OVERLAPPED sync_ovl; - FIXME("stub: queue %p, id %s, flags %#x, buffer %p, size %#x, ret_size %p, ovl %p.\n", + TRACE("queue %p, id %s, flags %#x, buffer %p, size %#x, ret_size %p, ovl %p.\n", queue, wine_dbgstr_longlong(id), flags, buffer, size, ret_size, ovl); - return ERROR_HANDLE_EOF; + if (flags) + FIXME("Ignoring flags %#x.\n", flags); + + if (!ovl) + { + sync_ovl.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); + ovl = &sync_ovl; + } + + if (!DeviceIoControl(queue, IOCTL_HTTP_RECEIVE_BODY, &params, sizeof(params), buffer, size, NULL, ovl)) + ret = GetLastError(); + + if (ovl == &sync_ovl) + { + if (!GetOverlappedResult(queue, ovl, ret_size, TRUE)) + ret = GetLastError(); + CloseHandle(sync_ovl.hEvent); + } + + return ret; } /*********************************************************************** diff --git a/dlls/httpapi/tests/httpapi.c b/dlls/httpapi/tests/httpapi.c index 5c3b4ec13c..c506023ee7 100644 --- a/dlls/httpapi/tests/httpapi.c +++ b/dlls/httpapi/tests/httpapi.c @@ -546,12 +546,13 @@ static void test_v1_short_buffer(void) static void test_v1_entity_body(void) { - char DECLSPEC_ALIGN(8) req_buffer[4096], response_buffer[2048], req_body[2048]; + char DECLSPEC_ALIGN(8) req_buffer[4096], response_buffer[2048], req_body[2048], recv_body[2000]; HTTP_REQUEST_V1 *req = (HTTP_REQUEST_V1 *)req_buffer; HTTP_RESPONSE_V1 response = {}; HTTP_DATA_CHUNK chunks[2] = {}; ULONG ret, chunk_size; unsigned int i; + OVERLAPPED ovl; DWORD ret_size; HANDLE queue; SOCKET s; @@ -571,6 +572,8 @@ static void test_v1_entity_body(void) "Content-Length: 2048\r\n" "\r\n"; + ovl.hEvent = CreateEventA(NULL, TRUE, FALSE, NULL); + for (i = 0; i < sizeof(req_body); ++i) req_body[i] = i / 111; @@ -708,6 +711,119 @@ static void test_v1_entity_body(void) send_response_v1(queue, req->RequestId, s); + /* Test HttpReceiveRequestEntityBody(). */ + + ret = send(s, post_req, sizeof(post_req), 0); + ok(ret == sizeof(post_req), "send() returned %d.\n", ret); + Sleep(100); + + ret = HttpReceiveHttpRequest(queue, HTTP_NULL_ID, 0, (HTTP_REQUEST *)req, sizeof(req_buffer), &ret_size, NULL); + ok(!ret, "Got error %u.\n", ret); + + ret = HttpReceiveRequestEntityBody(queue, HTTP_NULL_ID, 0, recv_body, sizeof(recv_body), &ret_size, NULL); + ok(ret == ERROR_CONNECTION_INVALID, "Got error %u.\n", ret); + + ret_size = 0xdeadbeef; + ret = HttpReceiveRequestEntityBody(queue, req->RequestId, 0, recv_body, sizeof(recv_body), &ret_size, NULL); + ok(!ret, "Got error %u.\n", ret); + ok(ret_size == 5, "Got size %u.\n", ret_size); + ok(!memcmp(recv_body, "ping", 5), "Entity body didn't match.\n"); + + ret_size = 0xdeadbeef; + ret = HttpReceiveRequestEntityBody(queue, req->RequestId, 0, recv_body, sizeof(recv_body), &ret_size, NULL); + ok(ret == ERROR_HANDLE_EOF, "Got error %u.\n", ret); + ok(ret_size == 0xdeadbeef || !ret_size /* Win10+ */, "Got size %u.\n", ret_size); + + send_response_v1(queue, req->RequestId, s); + + ret = HttpReceiveRequestEntityBody(queue, req->RequestId, 0, recv_body, sizeof(recv_body), &ret_size, NULL); + ok(ret == ERROR_CONNECTION_INVALID, "Got error %u.\n", ret); + + ret = send(s, post_req, sizeof(post_req), 0); + ok(ret == sizeof(post_req), "send() returned %d.\n", ret); + Sleep(100); + + ret = HttpReceiveHttpRequest(queue, HTTP_NULL_ID, 0, (HTTP_REQUEST *)req, sizeof(req_buffer), &ret_size, NULL); + ok(!ret, "Got error %u.\n", ret); + + memset(recv_body, 0xcc, sizeof(recv_body)); + ret_size = 0xdeadbeef; + ret = HttpReceiveRequestEntityBody(queue, req->RequestId, 0, recv_body, 2, &ret_size, NULL); + ok(!ret, "Got error %u.\n", ret); + ok(ret_size == 2, "Got size %u.\n", ret_size); + ok(!memcmp(recv_body, "pi", 2), "Entity body didn't match.\n"); + + ret_size = 0xdeadbeef; + ret = HttpReceiveRequestEntityBody(queue, req->RequestId, 0, recv_body, 4, &ret_size, NULL); + ok(!ret, "Got error %u.\n", ret); + ok(ret_size == 3, "Got size %u.\n", ret_size); + ok(!memcmp(recv_body, "ng", 3), "Entity body didn't match.\n"); + + ret_size = 0xdeadbeef; + ret = HttpReceiveRequestEntityBody(queue, req->RequestId, 0, recv_body, sizeof(recv_body), &ret_size, NULL); + ok(ret == ERROR_HANDLE_EOF, "Got error %u.\n", ret); + ok(ret_size == 0xdeadbeef || !ret_size /* Win10+ */, "Got size %u.\n", ret_size); + + send_response_v1(queue, req->RequestId, s); + + ret = send(s, post_req, sizeof(post_req), 0); + ok(ret == sizeof(post_req), "send() returned %d.\n", ret); + Sleep(100); + + ret = HttpReceiveHttpRequest(queue, HTTP_NULL_ID, 0, (HTTP_REQUEST *)req, sizeof(req_buffer), &ret_size, NULL); + ok(!ret, "Got error %u.\n", ret); + + memset(recv_body, 0xcc, sizeof(recv_body)); + ret_size = 0xdeadbeef; + ret = HttpReceiveRequestEntityBody(queue, req->RequestId, 0, recv_body, sizeof(recv_body), NULL, &ovl); + ok(!ret || ret == ERROR_IO_PENDING, "Got error %u.\n", ret); + ret = GetOverlappedResult(queue, &ovl, &ret_size, TRUE); + ok(ret, "Got error %u.\n", GetLastError()); + ok(ret_size == 5, "Got size %u.\n", ret_size); + ok(!memcmp(recv_body, "ping", 5), "Entity body didn't match.\n"); + + ret = HttpReceiveRequestEntityBody(queue, req->RequestId, 0, recv_body, sizeof(recv_body), NULL, &ovl); + ok(ret == ERROR_HANDLE_EOF, "Got error %u.\n", ret); + + send_response_v1(queue, req->RequestId, s); + + ret = send(s, post_req, sizeof(post_req), 0); + ok(ret == sizeof(post_req), "send() returned %d.\n", ret); + Sleep(100); + + ret = HttpReceiveHttpRequest(queue, HTTP_NULL_ID, HTTP_RECEIVE_REQUEST_FLAG_COPY_BODY, + (HTTP_REQUEST *)req, sizeof(req_buffer), &ret_size, NULL); + ok(!ret, "Got error %u.\n", ret); + + ret = HttpReceiveRequestEntityBody(queue, req->RequestId, 0, recv_body, sizeof(recv_body), NULL, &ovl); + ok(ret == ERROR_HANDLE_EOF, "Got error %u.\n", ret); + + send_response_v1(queue, req->RequestId, s); + + ret = send(s, post_req2, strlen(post_req2), 0); + ok(ret == strlen(post_req2), "send() returned %d.\n", ret); + ret = send(s, req_body, sizeof(req_body), 0); + ok(ret == sizeof(req_body), "send() returned %d.\n", ret); + + Sleep(100); + + ret = HttpReceiveHttpRequest(queue, HTTP_NULL_ID, HTTP_RECEIVE_REQUEST_FLAG_COPY_BODY, + (HTTP_REQUEST *)req, 2000, &ret_size, NULL); + ok(!ret, "Got error %u.\n", ret); + ok(ret_size == 2000, "Got size %u.\n", ret_size); + ok(req->Flags == HTTP_REQUEST_FLAG_MORE_ENTITY_BODY_EXISTS, "Got flags %#x.\n", req->Flags); + chunk_size = req->pEntityChunks[0].FromMemory.BufferLength; + + memset(recv_body, 0xcc, sizeof(recv_body)); + ret_size = 0xdeadbeef; + ret = HttpReceiveRequestEntityBody(queue, req->RequestId, 0, recv_body, sizeof(recv_body), &ret_size, NULL); + ok(!ret, "Got error %u.\n", ret); + ok(ret_size == 2048 - chunk_size, "Got size %u.\n", ret_size); + ok(!memcmp(recv_body, req_body + chunk_size, ret_size), "Entity body didn't match.\n"); + + send_response_v1(queue, req->RequestId, s); + + CloseHandle(ovl.hEvent); ret = HttpRemoveUrl(queue, localhost_urlW); ok(!ret, "Got error %u.\n", ret); closesocket(s); diff --git a/include/http.h b/include/http.h index 49eb557fae..394167fd68 100644 --- a/include/http.h +++ b/include/http.h @@ -46,6 +46,8 @@ typedef struct _HTTPAPI_VERSION #define HTTP_RECEIVE_REQUEST_FLAG_COPY_BODY 0x00000001 #define HTTP_RECEIVE_REQUEST_FLAG_FLUSH_BODY 0x00000002 +#define HTTP_RECEIVE_REQUEST_ENTITY_BODY_FLAG_FILL_BUFFER 0x00000001 + #define HTTP_REQUEST_FLAG_MORE_ENTITY_BODY_EXISTS 0x00000001 #define HTTP_REQUEST_FLAG_IP_ROUTED 0x00000002 #define HTTP_REQUEST_FLAG_HTTP2 0x00000004

1 0

Nikolay Sivov : mf: Add MFCreateVideoRendererActivate().
by Alexandre Julliard 04 Nov '19

04 Nov '19

Module: wine Branch: master Commit: fef1d403c5dc18722883361e95f7b0f3a5e68b58 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fef1d403c5dc18722883361e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 4 16:04:33 2019 +0300 mf: Add MFCreateVideoRendererActivate(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/main.c | 24 ++++++++++++++++++++++++ dlls/mf/mf.spec | 2 +- dlls/mf/tests/mf.c | 12 ++++++++++++ include/mfidl.idl | 1 + 4 files changed, 38 insertions(+), 1 deletion(-) diff --git a/dlls/mf/main.c b/dlls/mf/main.c index 2e6dc78290..251d59e1c0 100644 --- a/dlls/mf/main.c +++ b/dlls/mf/main.c @@ -1144,3 +1144,27 @@ HRESULT WINAPI MFEnumDeviceSources(IMFAttributes *attributes, IMFActivate ***sou return S_OK; } + +static HRESULT evr_create_object(IMFAttributes *attributes, void *user_context, IUnknown **obj) +{ + FIXME("%p, %p, %p.\n", attributes, user_context, obj); + + return E_NOTIMPL; +} + +static void evr_free_private(void *user_context) +{ +} + +static const struct activate_funcs evr_activate_funcs = +{ + evr_create_object, + evr_free_private, +}; + +HRESULT WINAPI MFCreateVideoRendererActivate(HWND hwnd, IMFActivate **activate) +{ + TRACE("%p, %p.\n", hwnd, activate); + + return create_activation_object(hwnd, &evr_activate_funcs, activate); +} diff --git a/dlls/mf/mf.spec b/dlls/mf/mf.spec index f13a2451fb..a8dd314aa3 100644 --- a/dlls/mf/mf.spec +++ b/dlls/mf/mf.spec @@ -67,7 +67,7 @@ @ stub MFCreateTranscodeTopology @ stub MFCreateUrlmonSchemePlugin @ stub MFCreateVideoRenderer -@ stub MFCreateVideoRendererActivate +@ stdcall MFCreateVideoRendererActivate(long ptr) @ stub MFCreateWMAEncoderActivate @ stub MFCreateWMVEncoderActivate @ stdcall MFEnumDeviceSources(ptr ptr ptr) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 0428c22ed3..b353df780b 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -2584,6 +2584,17 @@ if (SUCCEEDED(hr)) CoUninitialize(); } +static void test_evr(void) +{ + IMFActivate *activate; + HRESULT hr; + + hr = MFCreateVideoRendererActivate(NULL, &activate); + ok(hr == S_OK, "Failed to create activate object, hr %#x.\n", hr); + + IMFActivate_Release(activate); +} + START_TEST(mf) { test_topology(); @@ -2597,4 +2608,5 @@ START_TEST(mf) test_video_processor(); test_quality_manager(); test_sar(); + test_evr(); } diff --git a/include/mfidl.idl b/include/mfidl.idl index 9c14c5604b..da43399828 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -586,6 +586,7 @@ cpp_quote("HRESULT WINAPI MFCreateSystemTimeSource(IMFPresentationTimeSource **t cpp_quote("HRESULT WINAPI MFCreateTopology(IMFTopology **topology);") cpp_quote("HRESULT WINAPI MFCreateTopologyNode(MF_TOPOLOGY_TYPE node_type, IMFTopologyNode **node);") cpp_quote("HRESULT WINAPI MFCreateTopoLoader(IMFTopoLoader **loader);") +cpp_quote("HRESULT WINAPI MFCreateVideoRendererActivate(HWND hwnd, IMFActivate **activate);") cpp_quote("HRESULT WINAPI MFEnumDeviceSources(IMFAttributes *attributes, IMFActivate ***sources, UINT32 *count);") cpp_quote("HRESULT WINAPI MFGetSupportedMimeTypes(PROPVARIANT *array);") cpp_quote("HRESULT WINAPI MFGetService(IUnknown *object, REFGUID service, REFIID iid, void **obj);")

1 0

Martin Storsjo : kernel32: Add a special case to EnumProcessModules for the local process.
by Alexandre Julliard 04 Nov '19

04 Nov '19

Module: wine Branch: master Commit: fbda8db334f0703c0e66a2b84dda6bb56537f50b URL: https://source.winehq.org/git/wine.git/?a=commit;h=fbda8db334f0703c0e66a2b8… Author: Martin Storsjo <martin(a)martin.st> Date: Wed Oct 30 14:13:34 2019 +0200 kernel32: Add a special case to EnumProcessModules for the local process. LLVM's libunwind uses EnumProcessModules for locating .eh_frame sections when unwinding dwarf exceptions (used on i686). When running wine in docker (without adding custom additional permissions), EnumProcessModules currently fails as it uses ReadProcessMemory, which requires the SYS_PTRACE capability. The current implementation also is slower than necessary (by a couple orders of magnituide), for accessing the current process. Currently, unwinding 10000 exception throws with libunwind on i686 takes 24 seconds when run in wine, while it runs in less than 0.1 second with this patch. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/module.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c index b7f19ffe36..45814dbff3 100644 --- a/dlls/kernel32/module.c +++ b/dlls/kernel32/module.c @@ -555,6 +555,40 @@ BOOL WINAPI K32EnumProcessModules(HANDLE process, HMODULE *lphModule, DWORD size = 0; INT ret; + if (process == GetCurrentProcess()) + { + PPEB_LDR_DATA ldr_data = NtCurrentTeb()->Peb->LdrData; + PLIST_ENTRY head = &ldr_data->InLoadOrderModuleList; + PLIST_ENTRY entry = head->Flink; + + if (cb && !lphModule) + { + SetLastError(ERROR_NOACCESS); + return FALSE; + } + while (entry != head) + { + PLDR_MODULE table_entry = (PLDR_MODULE) + ((PBYTE)entry - offsetof(LDR_MODULE, InLoadOrderModuleList)); + if (cb >= sizeof(HMODULE)) + { + *lphModule++ = table_entry->BaseAddress; + cb -= sizeof(HMODULE); + } + size += sizeof(HMODULE); + entry = entry->Flink; + } + + if (!needed) + { + SetLastError(ERROR_NOACCESS); + return FALSE; + } + *needed = size; + + return TRUE; + } + if (!init_module_iterator(&iter, process)) return FALSE;

1 0

Andrew Eikum : hid: Move preparsed data definition to global header.
by Alexandre Julliard 04 Nov '19

04 Nov '19

Module: wine Branch: master Commit: b466419c32550cac59f4b6a891d02255eb94c5f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b466419c32550cac59f4b6a8… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Oct 30 14:25:58 2019 -0500 hid: Move preparsed data definition to global header. PHIDP_PREPARSED_DATA is supposed to be an opaque pointer, but the size is accessible through user32.GetRawInputDeviceInfo(RIDI_PREPARSEDDATA), so we will need to know the struct layout in user32, too. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hid/hidp.c | 2 +- dlls/hidclass.sys/hid.h | 2 +- dlls/hidclass.sys/parse.h | 69 ---------------------------------- dlls/hid/parse.h => include/wine/hid.h | 0 4 files changed, 2 insertions(+), 71 deletions(-) diff --git a/dlls/hid/hidp.c b/dlls/hid/hidp.c index 59a4078c6c..9d631912c8 100644 --- a/dlls/hid/hidp.c +++ b/dlls/hid/hidp.c @@ -32,7 +32,7 @@ #include "hidusage.h" #include "ddk/hidpi.h" -#include "parse.h" +#include "wine/hid.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(hidp); diff --git a/dlls/hidclass.sys/hid.h b/dlls/hidclass.sys/hid.h index 86d7bdf98f..36d13c009d 100644 --- a/dlls/hidclass.sys/hid.h +++ b/dlls/hidclass.sys/hid.h @@ -29,7 +29,7 @@ #include "ddk/hidpi.h" #include "cfgmgr32.h" #include "wine/list.h" -#include "parse.h" +#include "wine/hid.h" #define DEFAULT_POLL_INTERVAL 200 #define MAX_POLL_INTERVAL_MSEC 10000 diff --git a/dlls/hidclass.sys/parse.h b/dlls/hidclass.sys/parse.h deleted file mode 100644 index 319105d286..0000000000 --- a/dlls/hidclass.sys/parse.h +++ /dev/null @@ -1,69 +0,0 @@ -/* - * Wine internal HID structures - * - * Copyright 2015 Aric Stewart - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#ifndef __WINE_PARSE_H -#define __WINE_PARSE_H - -#define HID_MAGIC 0x8491759 - -typedef enum __WINE_ELEMENT_TYPE { - UnknownElement = 0, - ButtonElement, - ValueElement, -} WINE_ELEMENT_TYPE; - -typedef struct __WINE_ELEMENT -{ - WINE_ELEMENT_TYPE ElementType; - UINT valueStartBit; - UINT bitCount; - union { - HIDP_VALUE_CAPS value; - HIDP_BUTTON_CAPS button; - } caps; -} WINE_HID_ELEMENT; - -typedef struct __WINE_HID_REPORT -{ - UCHAR reportID; - DWORD bitSize; - DWORD elementCount; - DWORD elementIdx; -} WINE_HID_REPORT; - -typedef struct __WINE_HIDP_PREPARSED_DATA -{ - DWORD magic; - DWORD dwSize; - HIDP_CAPS caps; - - DWORD elementOffset; - DWORD reportCount[3]; - BYTE reportIdx[3][256]; - - WINE_HID_REPORT reports[1]; -} WINE_HIDP_PREPARSED_DATA, *PWINE_HIDP_PREPARSED_DATA; - -#define HID_INPUT_REPORTS(d) ((d)->reports) -#define HID_OUTPUT_REPORTS(d) ((d)->reports + (d)->reportCount[0]) -#define HID_FEATURE_REPORTS(d) ((d)->reports + (d)->reportCount[0] + (d)->reportCount[1]) -#define HID_ELEMS(d) ((WINE_HID_ELEMENT*)((BYTE*)(d) + (d)->elementOffset)) - -#endif /* __WINE_PARSE_H */ diff --git a/dlls/hid/parse.h b/include/wine/hid.h similarity index 100% rename from dlls/hid/parse.h rename to include/wine/hid.h

1 0

Alexandre Julliard : widl: Add strmake() helper.
by Alexandre Julliard 04 Nov '19

04 Nov '19

Module: wine Branch: master Commit: 264d8884d5d3c6ee4cfd5df5650293d841364166 URL: https://source.winehq.org/git/wine.git/?a=commit;h=264d8884d5d3c6ee4cfd5df5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Nov 2 13:34:01 2019 +0100 widl: Add strmake() helper. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/parser.y | 24 ++++-------------------- tools/widl/register.c | 3 +-- tools/widl/utils.c | 19 +++++++++++++++++++ tools/widl/utils.h | 1 + 4 files changed, 25 insertions(+), 22 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 59875a5b16..5f6eb50878 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -2038,11 +2038,8 @@ var_t *find_const(const char *name, int f) char *gen_name(void) { - static const char format[] = "__WIDL_%s_generated_name_%08lX"; static unsigned long n = 0; static const char *file_id; - static size_t size; - char *name; if (! file_id) { @@ -2052,13 +2049,8 @@ char *gen_name(void) for (; *dst; ++dst) if (! isalnum((unsigned char) *dst)) *dst = '_'; - - size = sizeof format - 7 + strlen(file_id) + 8; } - - name = xmalloc(size); - sprintf(name, format, file_id, n++); - return name; + return strmake("__WIDL_%s_generated_name_%08lX", file_id, n++); } struct allowed_attr @@ -2727,14 +2719,6 @@ static void check_functions(const type_t *iface, int is_inside_library) } } -static char *concat_str(const char *prefix, const char *str) -{ - char *ret = xmalloc(strlen(prefix) + strlen(str) + 1); - strcpy(ret, prefix); - strcat(ret, str); - return ret; -} - static int async_iface_attrs(attr_list_t *attrs, const attr_t *attr) { switch(attr->type) @@ -2774,7 +2758,7 @@ static void check_async_uuid(type_t *iface) if (!inherit) error_loc("async_uuid applied to an interface with incompatible parent\n"); - async_iface = get_type(TYPE_INTERFACE, concat_str("Async", iface->name), iface->namespace, 0); + async_iface = get_type(TYPE_INTERFACE, strmake("Async%s", iface->name), iface->namespace, 0); async_iface->attrs = map_attrs(iface->attrs, async_iface_attrs); STATEMENTS_FOR_EACH_FUNC( stmt, type_iface_get_stmts(iface) ) @@ -2791,13 +2775,13 @@ static void check_async_uuid(type_t *iface) finish_args = append_var(finish_args, copy_var(arg, strdup(arg->name), arg_out_attrs)); } - begin_func = copy_var(func, concat_str("Begin_", func->name), NULL); + begin_func = copy_var(func, strmake("Begin_%s", func->name), NULL); begin_func->declspec.type = type_new_function(begin_args); begin_func->declspec.type->attrs = func->attrs; begin_func->declspec.type->details.function->retval = func->declspec.type->details.function->retval; stmts = append_statement(stmts, make_statement_declaration(begin_func)); - finish_func = copy_var(func, concat_str("Finish_", func->name), NULL); + finish_func = copy_var(func, strmake("Finish_%s", func->name), NULL); finish_func->declspec.type = type_new_function(finish_args); finish_func->declspec.type->attrs = func->attrs; finish_func->declspec.type->details.function->retval = func->declspec.type->details.function->retval; diff --git a/tools/widl/register.c b/tools/widl/register.c index 1c369e7c5e..f65cbddf53 100644 --- a/tools/widl/register.c +++ b/tools/widl/register.c @@ -321,8 +321,7 @@ void output_typelib_regscript( const typelib_t *typelib ) if (expr) { sprintf(id_part, "\\%d", expr->cval); - resname = xmalloc( strlen(typelib_name) + 20 ); - sprintf(resname, "%s\\%d", typelib_name, expr->cval); + resname = strmake("%s\\%d", typelib_name, expr->cval); } put_str( indent, "'%x' { %s = s '%%MODULE%%%s' }\n", lcid_expr ? lcid_expr->cval : 0, pointer_size == 8 ? "win64" : "win32", id_part ); diff --git a/tools/widl/utils.c b/tools/widl/utils.c index 20c63064c7..ea92372c8c 100644 --- a/tools/widl/utils.c +++ b/tools/widl/utils.c @@ -226,6 +226,25 @@ void *xrealloc(void *p, size_t size) return res; } +char *strmake( const char* fmt, ... ) +{ + int n; + size_t size = 100; + va_list ap; + + for (;;) + { + char *p = xmalloc( size ); + va_start( ap, fmt ); + n = vsnprintf( p, size, fmt, ap ); + va_end( ap ); + if (n == -1) size *= 2; + else if ((size_t)n >= size) size = n + 1; + else return p; + free( p ); + } +} + char *xstrdup(const char *str) { char *s; diff --git a/tools/widl/utils.h b/tools/widl/utils.h index 74dba11d3c..3740665650 100644 --- a/tools/widl/utils.h +++ b/tools/widl/utils.h @@ -44,6 +44,7 @@ void error_loc_info(const loc_info_t *, const char *s, ...) __attribute__((forma void warning(const char *s, ...) __attribute__((format (printf, 1, 2))); void warning_loc_info(const loc_info_t *, const char *s, ...) __attribute__((format (printf, 2, 3))); void chat(const char *s, ...) __attribute__((format (printf, 1, 2))); +char *strmake(const char* fmt, ...) __attribute__((__format__ (__printf__, 1, 2 ))); char *dup_basename(const char *name, const char *ext); size_t widl_getline(char **linep, size_t *lenp, FILE *fp);

1 0

Alexandre Julliard : widl: Add --sysroot and --nostdinc options.
by Alexandre Julliard 04 Nov '19

04 Nov '19

Module: wine Branch: master Commit: 5f39d36a6c134bab77cea8f2e91c313e066eeffe URL: https://source.winehq.org/git/wine.git/?a=commit;h=5f39d36a6c134bab77cea8f2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Nov 2 13:34:27 2019 +0100 widl: Add --sysroot and --nostdinc options. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/Makefile.in | 2 +- tools/widl/widl.c | 34 ++++++++++++++++++++++++++++------ tools/widl/widl.man.in | 5 +++++ 3 files changed, 34 insertions(+), 7 deletions(-) diff --git a/tools/widl/Makefile.in b/tools/widl/Makefile.in index e06d6cc5b3..80a12601de 100644 --- a/tools/widl/Makefile.in +++ b/tools/widl/Makefile.in @@ -19,7 +19,7 @@ C_SRCS = \ LEX_SRCS = parser.l BISON_SRCS = parser.y -widl_EXTRADEFS = -DDEFAULT_INCLUDE_DIR=\"${includedir}/wine/windows/\" +widl_EXTRADEFS = -DINCLUDEDIR=\"${includedir}\" EXTRALIBS = -lwpp diff --git a/tools/widl/widl.c b/tools/widl/widl.c index f5fa20c884..aa6697135b 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -60,6 +60,8 @@ static const char usage[] = " --local-stubs=file Write empty stubs for call_as/local methods to file\n" " -m32, -m64 Set the target architecture (Win32 or Win64)\n" " -N Do not preprocess input\n" +" --nostdinc Do not search the standard include path\n" +" --ns_prefix Prefix namespaces with ABI namespace\n" " --oldnames Use old naming conventions\n" " -o, --output=NAME Set the output file name\n" " -Otype Type of stubs to generate (-Os, -Oi, -Oif)\n" @@ -69,8 +71,7 @@ static const char usage[] = " --prefix-server=p Prefix names of server functions with 'p'\n" " -r Generate registration script\n" " -robust Ignored, present for midl compatibility\n" -" --winrt Enable Windows Runtime mode\n" -" --ns_prefix Prefix namespaces with ABI namespace\n" +" --sysroot=DIR Prefix include paths with DIR\n" " -s Generate server stub\n" " -t Generate typelib\n" " -u Generate interface identifiers file\n" @@ -79,6 +80,7 @@ static const char usage[] = " --win32, --win64 Set the target architecture (Win32 or Win64)\n" " --win32-align n Set win32 structure alignment to 'n'\n" " --win64-align n Set win64 structure alignment to 'n'\n" +" --winrt Enable Windows Runtime mode\n" "Debug level 'n' is a bitmask with following meaning:\n" " * 0x01 Tell which resource is parsed (verbose mode)\n" " * 0x02 Dump internal structures\n" @@ -125,6 +127,7 @@ int win32_packing = 8; int win64_packing = 8; int winrt_mode = 0; int use_abi_namespace = 0; +static int stdinc = 1; static enum stub_mode stub_mode = MODE_Os; char *input_name; @@ -163,6 +166,7 @@ enum { DLLDATA_OPTION, DLLDATA_ONLY_OPTION, LOCAL_STUBS_OPTION, + NOSTDINC_OPTION, PREFIX_ALL_OPTION, PREFIX_CLIENT_OPTION, PREFIX_SERVER_OPTION, @@ -170,6 +174,7 @@ enum { RT_NS_PREFIX, RT_OPTION, ROBUST_OPTION, + SYSROOT_OPTION, WIN32_OPTION, WIN64_OPTION, WIN32_ALIGN_OPTION, @@ -185,6 +190,7 @@ static const struct option long_options[] = { { "dlldata-only", 0, NULL, DLLDATA_ONLY_OPTION }, { "help", 0, NULL, PRINT_HELP }, { "local-stubs", 1, NULL, LOCAL_STUBS_OPTION }, + { "nostdinc", 0, NULL, NOSTDINC_OPTION }, { "ns_prefix", 0, NULL, RT_NS_PREFIX }, { "oldnames", 0, NULL, OLDNAMES_OPTION }, { "output", 0, NULL, 'o' }, @@ -192,6 +198,7 @@ static const struct option long_options[] = { { "prefix-client", 1, NULL, PREFIX_CLIENT_OPTION }, { "prefix-server", 1, NULL, PREFIX_SERVER_OPTION }, { "robust", 0, NULL, ROBUST_OPTION }, + { "sysroot", 1, NULL, SYSROOT_OPTION }, { "target", 0, NULL, 'b' }, { "winrt", 0, NULL, RT_OPTION }, { "win32", 0, NULL, WIN32_OPTION }, @@ -567,10 +574,11 @@ void write_id_data(const statement_list_t *stmts) int main(int argc,char *argv[]) { - int optc; + int i, optc; int ret = 0; int opti = 0; char *output_name = NULL; + const char *sysroot = ""; signal( SIGTERM, exit_on_signal ); signal( SIGINT, exit_on_signal ); @@ -593,6 +601,9 @@ int main(int argc,char *argv[]) do_everything = 0; local_stubs_name = xstrdup(optarg); break; + case NOSTDINC_OPTION: + stdinc = 0; + break; case OLDNAMES_OPTION: old_names = 1; break; @@ -615,6 +626,9 @@ int main(int argc,char *argv[]) case RT_NS_PREFIX: use_abi_namespace = 1; break; + case SYSROOT_OPTION: + sysroot = xstrdup(optarg); + break; case WIN32_OPTION: pointer_size = 4; break; @@ -733,9 +747,17 @@ int main(int argc,char *argv[]) } } -#ifdef DEFAULT_INCLUDE_DIR - wpp_add_include_path(DEFAULT_INCLUDE_DIR); -#endif + if (stdinc) + { + static const char *incl_dirs[] = { INCLUDEDIR, "/usr/include", "/usr/local/include" }; + + for (i = 0; i < ARRAY_SIZE(incl_dirs); i++) + { + if (i && !strcmp( incl_dirs[i], incl_dirs[0] )) continue; + wpp_add_include_path( strmake( "%s%s/wine/msvcrt", sysroot, incl_dirs[i] )); + wpp_add_include_path( strmake( "%s%s/wine/windows", sysroot, incl_dirs[i] )); + } + } switch (target_cpu) { diff --git a/tools/widl/widl.man.in b/tools/widl/widl.man.in index ec81488a0e..010b7f04e2 100644 --- a/tools/widl/widl.man.in +++ b/tools/widl/widl.man.in @@ -41,6 +41,11 @@ specification is in the standard autoconf format as returned by \fBconfig.sub\fR. .IP "\fB-m32, -m64, --win32, --win64\fR" Force the target architecture to 32-bit or 64-bit. +.IP \fB\-\-sysroot=\fIdir\fR +Prefix the standard include paths with \fIdir\fR. +.IP \fB\-\-nostdinc\fR +Do not search standard include paths like /usr/include and +/usr/local/include. .PP .B Header options: .IP "\fB-h\fR"

1 0

Alexandre Julliard : makefiles: Pass --nostdinc also to widl.
by Alexandre Julliard 04 Nov '19

04 Nov '19

Module: wine Branch: master Commit: 42cf6cce4bfdb1f4eb0b9b1b086310204a3bbb3a URL: https://source.winehq.org/git/wine.git/?a=commit;h=42cf6cce4bfdb1f4eb0b9b1b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Nov 2 13:47:32 2019 +0100 makefiles: Pass --nostdinc also to widl. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/makedep.c b/tools/makedep.c index 67dfea43bb..13c2bd2342 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2786,6 +2786,7 @@ static void output_source_idl( struct makefile *make, struct incl_file *source, output( ": %s\n", tools_path( make, "widl" )); output( "\t%s -o $@", tools_path( make, "widl" ) ); output_filenames( target_flags ); + output_filename( "--nostdinc" ); output_filenames( defines ); output_filenames( get_expanded_make_var_array( make, "EXTRAIDLFLAGS" )); output_filenames( get_expanded_file_local_var( make, obj, "EXTRAIDLFLAGS" ));

1 0

Alexandre Julliard : ntdll: Initialize MxCsr for new threads on x86.
by Alexandre Julliard 04 Nov '19

04 Nov '19

Module: wine Branch: master Commit: 1b3fa021909fcb13d1517a8df0b84b6a225e6b98 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b3fa021909fcb13d1517a8d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Nov 2 14:34:17 2019 +0100 ntdll: Initialize MxCsr for new threads on x86. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_i386.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index fd761246c5..e9dd0de2fc 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -2716,6 +2716,7 @@ static void init_thread_context( CONTEXT *context, LPTHREAD_START_ROUTINE entry, context->Eip = (DWORD)relay; context->FloatSave.ControlWord = 0x27f; ((XMM_SAVE_AREA32 *)context->ExtendedRegisters)->ControlWord = 0x27f; + ((XMM_SAVE_AREA32 *)context->ExtendedRegisters)->MxCsr = 0x1f80; } @@ -2741,7 +2742,7 @@ PCONTEXT DECLSPEC_HIDDEN attach_thread( LPTHREAD_START_ROUTINE entry, void *arg, ctx = (CONTEXT *)((char *)NtCurrentTeb()->Tib.StackBase - 16) - 1; init_thread_context( ctx, entry, arg, relay ); } - ctx->ContextFlags = CONTEXT_FULL; + ctx->ContextFlags = CONTEXT_FULL | CONTEXT_FLOATING_POINT | CONTEXT_EXTENDED_REGISTERS; LdrInitializeThunk( ctx, (void **)&ctx->Eax, 0, 0 ); return ctx; }

1 0

Alexandre Julliard : ntdll: Fix FPU initialization for new threads on x86-64.
by Alexandre Julliard 04 Nov '19

04 Nov '19

Module: wine Branch: master Commit: 0b2e65f53aeb4fbda660828ad06bff554fccb1d5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0b2e65f53aeb4fbda660828a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Nov 2 14:34:25 2019 +0100 ntdll: Fix FPU initialization for new threads on x86-64. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48019 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_x86_64.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 9645c5266c..c372f65b34 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -4195,12 +4195,13 @@ static void init_thread_context( CONTEXT *context, LPTHREAD_START_ROUTINE entry, { __asm__( "movw %%cs,%0" : "=m" (context->SegCs) ); __asm__( "movw %%ss,%0" : "=m" (context->SegSs) ); - __asm__( "fxsave %0" : "=m" (context->u.FltSave) ); context->Rcx = (ULONG_PTR)entry; context->Rdx = (ULONG_PTR)arg; context->Rsp = (ULONG_PTR)NtCurrentTeb()->Tib.StackBase - 0x28; context->Rip = (ULONG_PTR)relay; context->EFlags = 0x200; + context->u.FltSave.ControlWord = 0x27f; + context->u.FltSave.MxCsr = context->MxCsr = 0x1f80; }

1 0