April 2024 - Wine-commits - list.winehq.org

Paul Gofman : winhttp: Set actual default receive response timeout to 21sec.
by Alexandre Julliard 09 Apr '24

09 Apr '24

Module: wine Branch: master Commit: 5f93179744610bf322ce407b5dbb46162f833aa5 URL: https://gitlab.winehq.org/wine/wine/-/commit/5f93179744610bf322ce407b5dbb46… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Apr 8 20:21:09 2024 -0600 winhttp: Set actual default receive response timeout to 21sec. --- dlls/winhttp/request.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 9fe8e1c4782..1b6cb1e2a45 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -43,6 +43,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(winhttp); #define DEFAULT_KEEP_ALIVE_TIMEOUT 30000 +#define ACTUAL_DEFAULT_RECEIVE_RESPONSE_TIMEOUT 21000 + +static int request_receive_response_timeout( struct request *req ) +{ + if (req->receive_response_timeout == -1) return ACTUAL_DEFAULT_RECEIVE_RESPONSE_TIMEOUT; + return req->receive_response_timeout; +} + static const WCHAR *attribute_table[] = { L"Mime-Version", /* WINHTTP_QUERY_MIME_VERSION = 0 */ @@ -1658,7 +1666,7 @@ static DWORD open_connection( struct request *request ) return ret; } netconn_set_timeout( netconn, TRUE, request->send_timeout ); - netconn_set_timeout( netconn, FALSE, request->receive_response_timeout ); + netconn_set_timeout( netconn, FALSE, request_receive_response_timeout( request )); request->netconn = netconn; @@ -1696,7 +1704,7 @@ static DWORD open_connection( struct request *request ) TRACE("using connection %p\n", netconn); netconn_set_timeout( netconn, TRUE, request->send_timeout ); - netconn_set_timeout( netconn, FALSE, request->receive_response_timeout ); + netconn_set_timeout( netconn, FALSE, request_receive_response_timeout( request )); request->netconn = netconn; } @@ -2329,7 +2337,7 @@ static DWORD send_request( struct request *request, const WCHAR *headers, DWORD if (!chunked && content_length <= optional_len) { - netconn_set_timeout( request->netconn, FALSE, request->receive_response_timeout ); + netconn_set_timeout( request->netconn, FALSE, request_receive_response_timeout( request )); request->read_reply_status = read_reply( request ); if (request->state == REQUEST_RESPONSE_STATE_READ_RESPONSE_QUEUED) request->state = REQUEST_RESPONSE_STATE_READ_RESPONSE_QUEUED_REPLY_RECEIVED; @@ -2932,7 +2940,7 @@ static DWORD receive_response( struct request *request ) } /* fallthrough */ case REQUEST_RESPONSE_STATE_READ_RESPONSE_QUEUED_REQUEST_SENT: - netconn_set_timeout( request->netconn, FALSE, request->receive_response_timeout ); + netconn_set_timeout( request->netconn, FALSE, request_receive_response_timeout( request )); request->read_reply_status = read_reply( request ); request->state = REQUEST_RESPONSE_STATE_REPLY_RECEIVED; break;

1 0

Paul Gofman : winhttp/tests: Add some tests for actual connection caching.
by Alexandre Julliard 09 Apr '24

09 Apr '24

Module: wine Branch: master Commit: 11b8243f062b651b25b3b62f771e32b7fe0d364c URL: https://gitlab.winehq.org/wine/wine/-/commit/11b8243f062b651b25b3b62f771e32… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Apr 8 22:35:05 2024 -0600 winhttp/tests: Add some tests for actual connection caching. --- dlls/winhttp/tests/winhttp.c | 114 ++++++++++++++++++++++++++++++++++++++----- 1 file changed, 102 insertions(+), 12 deletions(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 1724612202a..5d0ccd11f52 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -2197,6 +2197,12 @@ static const char okmsg[] = "Server: winetest\r\n" "\r\n"; +static const char okmsg_length0[] = +"HTTP/1.1 200 OK\r\n" +"Server: winetest\r\n" +"Content-length: 0\r\n" +"\r\n"; + static const char notokmsg[] = "HTTP/1.1 400 Bad Request\r\n" "\r\n"; @@ -2324,6 +2330,24 @@ static void create_websocket_accept(const char *key, char *buf, unsigned int buf CryptBinaryToStringA( (BYTE *)sha1, sizeof(sha1), CRYPT_STRING_BASE64, buf, &len); } +static int server_receive_request(int c, char *buffer, size_t buffer_size) +{ + int i, r; + + memset(buffer, 0, buffer_size); + for(i = 0; i < buffer_size - 1; i++) + { + r = recv(c, &buffer[i], 1, 0); + if (r != 1) + break; + if (i < 4) continue; + if (buffer[i - 2] == '\n' && buffer[i] == '\n' && + buffer[i - 3] == '\r' && buffer[i - 1] == '\r') + break; + } + return r; +} + static DWORD CALLBACK server_thread(LPVOID param) { struct server_info *si = param; @@ -2357,18 +2381,7 @@ static DWORD CALLBACK server_thread(LPVOID param) do { if (c == -1) c = accept(s, NULL, NULL); - - memset(buffer, 0, sizeof buffer); - for(i = 0; i < sizeof buffer - 1; i++) - { - r = recv(c, &buffer[i], 1, 0); - if (r != 1) - break; - if (i < 4) continue; - if (buffer[i - 2] == '\n' && buffer[i] == '\n' && - buffer[i - 3] == '\r' && buffer[i - 1] == '\r') - break; - } + server_receive_request(c, buffer, sizeof(buffer)); if (strstr(buffer, "GET /basic")) { send(c, okmsg, sizeof okmsg - 1, 0); @@ -2569,6 +2582,23 @@ static DWORD CALLBACK server_thread(LPVOID param) } send(c, okmsg, sizeof(okmsg) - 1, 0); } + + if (strstr(buffer, "GET /cached")) + { + send(c, okmsg_length0, sizeof okmsg_length0 - 1, 0); + r = server_receive_request(c, buffer, sizeof(buffer)); + ok(r > 0, "got %d.\n", r); + ok(!!strstr(buffer, "GET /cached"), "request not found.\n"); + send(c, okmsg_length0, sizeof okmsg_length0 - 1, 0); + r = server_receive_request(c, buffer, sizeof(buffer)); + todo_wine ok(!r, "got %d, buffer[0] %d.\n", r, buffer[0]); + } + if (strstr(buffer, "GET /notcached")) + { + send(c, okmsg, sizeof okmsg - 1, 0); + r = server_receive_request(c, buffer, sizeof(buffer)); + ok(!r, "got %d, buffer[0] %d.\n", r, buffer[0] ); + } shutdown(c, 2); closesocket(c); c = -1; @@ -5884,6 +5914,65 @@ static void test_client_cert_authentication(void) WinHttpCloseHandle( ses ); } +static void test_connection_cache(int port) +{ + HINTERNET ses, con, req; + DWORD status, size; + char buffer[256]; + BOOL ret; + + ses = WinHttpOpen(L"winetest", WINHTTP_ACCESS_TYPE_NO_PROXY, NULL, NULL, 0); + ok(ses != NULL, "failed to open session %lu\n", GetLastError()); + + con = WinHttpConnect(ses, L"localhost", port, 0); + ok(con != NULL, "failed to open a connection %lu\n", GetLastError()); + + req = WinHttpOpenRequest(con, L"GET", L"/cached", NULL, NULL, NULL, 0); + ok(req != NULL, "failed to open a request %lu\n", GetLastError()); + ret = WinHttpSendRequest(req, NULL, 0, NULL, 0, 0, 0); + ok(ret, "failed to send request %lu\n", GetLastError()); + ret = WinHttpReceiveResponse(req, NULL); + ok(ret, "failed to receive response %lu\n", GetLastError()); + size = sizeof(status); + ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_STATUS_CODE|WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL); + ok(ret, "failed to query status code %lu\n", GetLastError()); + ok(status == HTTP_STATUS_OK, "request failed unexpectedly %lu\n", status); + ret = WinHttpReadData(req, buffer, sizeof buffer, &size); + ok(ret, "failed to read data %lu\n", GetLastError()); + ok(!size, "got size %lu.\n", size); + WinHttpCloseHandle(req); + + req = WinHttpOpenRequest(con, L"GET", L"/cached", NULL, NULL, NULL, 0); + ok(req != NULL, "failed to open a request %lu\n", GetLastError()); + ret = WinHttpSendRequest(req, L"Connection: close", ~0ul, NULL, 0, 0, 0); + ok(ret, "failed to send request %lu\n", GetLastError()); + ret = WinHttpReceiveResponse(req, NULL); + ok(ret, "failed to receive response %lu\n", GetLastError()); + size = sizeof(status); + ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_STATUS_CODE|WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL); + ok(ret, "failed to query status code %lu\n", GetLastError()); + ok(status == HTTP_STATUS_OK, "request failed unexpectedly %lu\n", status); + ret = WinHttpReadData(req, buffer, sizeof buffer, &size); + ok(ret, "failed to read data %lu\n", GetLastError()); + ok(!size, "got size %lu.\n", size); + WinHttpCloseHandle(req); + + req = WinHttpOpenRequest(con, L"GET", L"/notcached", NULL, NULL, NULL, 0); + ok(req != NULL, "failed to open a request %lu\n", GetLastError()); + ret = WinHttpSendRequest(req, L"Connection: close", ~0ul, NULL, 0, 0, 0); + ok(ret, "failed to send request %lu\n", GetLastError()); + ret = WinHttpReceiveResponse(req, NULL); + ok(ret, "failed to receive response %lu\n", GetLastError()); + size = sizeof(status); + ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_STATUS_CODE|WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL); + ok(ret, "failed to query status code %lu\n", GetLastError()); + ok(status == HTTP_STATUS_OK, "request failed unexpectedly %lu\n", status); + WinHttpCloseHandle(req); + + WinHttpCloseHandle(con); + WinHttpCloseHandle(ses); +} + START_TEST (winhttp) { struct server_info si; @@ -5951,6 +6040,7 @@ START_TEST (winhttp) test_websocket(si.port); test_redirect(si.port); test_WinHttpGetProxyForUrl(si.port); + test_connection_cache(si.port); /* send the basic request again to shutdown the server thread */ test_basic_request(si.port, NULL, L"/quit");

1 0

Paul Gofman : winhttp: Do not cache connection if suggested by request headers.
by Alexandre Julliard 09 Apr '24

09 Apr '24

Module: wine Branch: master Commit: ff97d3976ec0ee5444afddecfca5198cf2e53a1c URL: https://gitlab.winehq.org/wine/wine/-/commit/ff97d3976ec0ee5444afddecfca519… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Apr 8 22:45:08 2024 -0600 winhttp: Do not cache connection if suggested by request headers. --- dlls/winhttp/request.c | 20 +++++++++----------- dlls/winhttp/tests/winhttp.c | 2 +- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 1b6cb1e2a45..207f1ec5c61 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -1922,7 +1922,7 @@ static DWORD refill_buffer( struct request *request, BOOL notify ) static void finished_reading( struct request *request ) { - BOOL close = FALSE, notify; + BOOL close = FALSE, close_request_headers; WCHAR connection[20]; DWORD size = sizeof(connection); @@ -1937,18 +1937,16 @@ static void finished_reading( struct request *request ) } else if (!wcscmp( request->version, L"HTTP/1.0" )) close = TRUE; - if (close) + size = sizeof(connection); + close_request_headers = + (!query_headers( request, WINHTTP_QUERY_CONNECTION | WINHTTP_QUERY_FLAG_REQUEST_HEADERS, NULL, connection, &size, NULL ) + || !query_headers( request, WINHTTP_QUERY_PROXY_CONNECTION | WINHTTP_QUERY_FLAG_REQUEST_HEADERS, NULL, connection, &size, NULL )) + && !wcsicmp( connection, L"close" ); + if (close || close_request_headers) { - size = sizeof(connection); - notify = (!query_headers( request, WINHTTP_QUERY_CONNECTION | WINHTTP_QUERY_FLAG_REQUEST_HEADERS, - NULL, connection, &size, NULL ) - || !query_headers( request, WINHTTP_QUERY_PROXY_CONNECTION | WINHTTP_QUERY_FLAG_REQUEST_HEADERS, - NULL, connection, &size, NULL )) - && !wcsicmp( connection, L"close" ); - - if (notify) send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_CLOSING_CONNECTION, 0, 0 ); + if (close_request_headers) send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_CLOSING_CONNECTION, 0, 0 ); netconn_release( request->netconn ); - if (notify) send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_CONNECTION_CLOSED, 0, 0 ); + if (close_request_headers) send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_CONNECTION_CLOSED, 0, 0 ); } else cache_connection( request->netconn ); diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 5d0ccd11f52..ee01fd5ec72 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -2591,7 +2591,7 @@ static DWORD CALLBACK server_thread(LPVOID param) ok(!!strstr(buffer, "GET /cached"), "request not found.\n"); send(c, okmsg_length0, sizeof okmsg_length0 - 1, 0); r = server_receive_request(c, buffer, sizeof(buffer)); - todo_wine ok(!r, "got %d, buffer[0] %d.\n", r, buffer[0]); + ok(!r, "got %d, buffer[0] %d.\n", r, buffer[0]); } if (strstr(buffer, "GET /notcached")) {

1 0

Paul Gofman : wow64: Support generic xstate in call_user_exception_dispatcher().
by Alexandre Julliard 09 Apr '24

09 Apr '24

Module: wine Branch: master Commit: 34e49897a39812837bc4c1cdcf4ca274185483c0 URL: https://gitlab.winehq.org/wine/wine/-/commit/34e49897a39812837bc4c1cdcf4ca2… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Apr 8 16:52:19 2024 -0600 wow64: Support generic xstate in call_user_exception_dispatcher(). --- dlls/wow64/syscall.c | 26 ++++++-------------------- 1 file changed, 6 insertions(+), 20 deletions(-) diff --git a/dlls/wow64/syscall.c b/dlls/wow64/syscall.c index 40eb5327934..9ad1194b21e 100644 --- a/dlls/wow64/syscall.c +++ b/dlls/wow64/syscall.c @@ -197,17 +197,12 @@ static void __attribute__((used)) call_user_exception_dispatcher( EXCEPTION_RECO ULONG context_ptr; /* 004 */ EXCEPTION_RECORD32 rec; /* 008 */ I386_CONTEXT context; /* 058 */ - CONTEXT_EX32 context_ex; /* 324 */ - BYTE xstate[sizeof(XSTATE)+64]; /* 33c */ - DWORD align; /* 4bc */ } *stack; I386_CONTEXT ctx = { CONTEXT_I386_ALL }; CONTEXT_EX *context_ex, *src_ex = NULL; - ULONG flags; + ULONG flags, context_length; C_ASSERT( offsetof(struct exc_stack_layout32, context) == 0x58 ); - C_ASSERT( offsetof(struct exc_stack_layout32, xstate) == 0x33c ); - C_ASSERT( sizeof(struct exc_stack_layout32) == 0x4c0 ); pBTCpuGetContext( GetCurrentThread(), GetCurrentProcess(), NULL, &ctx ); @@ -231,29 +226,20 @@ static void __attribute__((used)) call_user_exception_dispatcher( EXCEPTION_RECO flags = ctx.ContextFlags; if (src_ex) flags |= CONTEXT_I386_XSTATE; - stack = (struct exc_stack_layout32 *)ULongToPtr( ctx.Esp & ~3 ) - 1; + RtlGetExtendedContextLength( flags, &context_length ); + + stack = (struct exc_stack_layout32 *)ULongToPtr( (ctx.Esp - offsetof(struct exc_stack_layout32, context) - context_length) & ~3 ); stack->rec_ptr = PtrToUlong( &stack->rec ); stack->context_ptr = PtrToUlong( &stack->context ); stack->rec = *rec; stack->context = ctx; RtlInitializeExtendedContext( &stack->context, flags, &context_ex ); + if (src_ex) RtlCopyExtendedContext( context_ex, WOW64_CONTEXT_XSTATE, src_ex ); + /* adjust Eip for breakpoints in software emulation (hardware exceptions already adjust Rip) */ if (rec->ExceptionCode == EXCEPTION_BREAKPOINT && (wow64info->CpuFlags & WOW64_CPUFLAGS_SOFTWARE)) stack->context.Eip--; - if (src_ex) - { - XSTATE *src_xs = (XSTATE *)((char *)src_ex + src_ex->XState.Offset); - XSTATE *dst_xs = (XSTATE *)((char *)context_ex + context_ex->XState.Offset); - - dst_xs->Mask = src_xs->Mask & ~(ULONG64)3; - dst_xs->CompactionMask = src_xs->CompactionMask; - if ((dst_xs->Mask & 4) && - src_ex->XState.Length >= sizeof(XSTATE) && - context_ex->XState.Length >= sizeof(XSTATE)) - memcpy( &dst_xs->YmmContext, &src_xs->YmmContext, sizeof(dst_xs->YmmContext) ); - } - ctx.Esp = PtrToUlong( stack ); ctx.Eip = pLdrSystemDllInitBlock->pKiUserExceptionDispatcher; ctx.EFlags &= ~(0x100|0x400|0x40000);

1 0

Paul Gofman : ntdll: Preserve untouched parts of xstate in set_thread_wow64_context().
by Alexandre Julliard 09 Apr '24

09 Apr '24

Module: wine Branch: master Commit: 14a51fa4460d958efc22c2fe108d90c37b6465c1 URL: https://gitlab.winehq.org/wine/wine/-/commit/14a51fa4460d958efc22c2fe108d90… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Apr 8 17:37:00 2024 -0600 ntdll: Preserve untouched parts of xstate in set_thread_wow64_context(). --- dlls/ntdll/unix/signal_x86_64.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index d8d16917942..4fc2727595d 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -1281,9 +1281,11 @@ NTSTATUS set_thread_wow64_context( HANDLE handle, const void *ctx, ULONG size ) { CONTEXT_EX *context_ex = (CONTEXT_EX *)(context + 1); XSAVE_AREA_HEADER *xs = (XSAVE_AREA_HEADER *)((char *)context_ex + context_ex->XState.Offset); + UINT64 mask = frame->xstate.Mask; if (xstate_compaction_enabled) frame->xstate.CompactionMask |= xstate_extended_features(); copy_xstate( &frame->xstate, xs, xs->Mask ); + if (xs->CompactionMask) frame->xstate.Mask |= mask & ~xs->CompactionMask; frame->restore_flags |= CONTEXT_XSTATE; } return STATUS_SUCCESS;

1 0

Brendan Shanks : winecoreaudio: Correctly handle devices whose UID contains non-ASCII characters.
by Alexandre Julliard 09 Apr '24

09 Apr '24

Module: wine Branch: master Commit: a630b125ef4429c1c52c1272eba8b7939e7e6857 URL: https://gitlab.winehq.org/wine/wine/-/commit/a630b125ef4429c1c52c1272eba8b7… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Fri Apr 5 22:05:52 2024 -0700 winecoreaudio: Correctly handle devices whose UID contains non-ASCII characters. --- dlls/winecoreaudio.drv/coreaudio.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/winecoreaudio.drv/coreaudio.c b/dlls/winecoreaudio.drv/coreaudio.c index d78744455a8..a79a0d16839 100644 --- a/dlls/winecoreaudio.drv/coreaudio.c +++ b/dlls/winecoreaudio.drv/coreaudio.c @@ -325,7 +325,12 @@ static NTSTATUS unix_get_endpoint_ids(void *args) for(i = 0; i < params->num; i++){ const SIZE_T name_len = CFStringGetLength(info[i].name) + 1; - const SIZE_T device_len = CFStringGetLength(info[i].uid) + 1; + CFIndex device_len; + + CFStringGetBytes(info[i].uid, CFRangeMake(0, CFStringGetLength(info[i].uid)), kCFStringEncodingUTF8, + 0, false, NULL, 0, &device_len); + device_len++; /* for null terminator */ + needed += name_len * sizeof(WCHAR) + ((device_len + 1) & ~1); if(needed <= params->size){ @@ -336,7 +341,8 @@ static NTSTATUS unix_get_endpoint_ids(void *args) offset += name_len * sizeof(WCHAR); endpoint->device = offset; - CFStringGetCString(info[i].uid, (char *)params->endpoints + offset, params->size - offset, kCFStringEncodingUTF8); + CFStringGetBytes(info[i].uid, CFRangeMake(0, CFStringGetLength(info[i].uid)), kCFStringEncodingUTF8, + 0, false, (UInt8 *)params->endpoints + offset, params->size - offset, NULL); ((char *)params->endpoints)[offset + device_len - 1] = '\0'; offset += (device_len + 1) & ~1;

1 0

Dmitry Timoshkov : widl: In old style typelibs all types are public.
by Alexandre Julliard 09 Apr '24

09 Apr '24

Module: wine Branch: master Commit: b8921b414e867b1df01cd2ee2365ed8a3ab524f0 URL: https://gitlab.winehq.org/wine/wine/-/commit/b8921b414e867b1df01cd2ee2365ed… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Apr 3 19:13:17 2024 +0300 widl: In old style typelibs all types are public. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- tools/widl/write_sltg.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/tools/widl/write_sltg.c b/tools/widl/write_sltg.c index ac4db609919..7380d94016c 100644 --- a/tools/widl/write_sltg.c +++ b/tools/widl/write_sltg.c @@ -411,11 +411,6 @@ static void append_data(struct sltg_data *block, const void *data, int size) block->size = new_size; } -static void add_typedef_typeinfo(struct sltg_typelib *typelib, type_t *type) -{ - error("add_typedef_typeinfo: %s not implemented\n", type->name); -} - static void add_module_typeinfo(struct sltg_typelib *typelib, type_t *type) { error("add_module_typeinfo: %s not implemented\n", type->name); @@ -996,12 +991,8 @@ static void add_statement(struct sltg_typelib *typelib, const statement_t *stmt) LIST_FOR_EACH_ENTRY(ref, stmt->u.type_list, typeref_t, entry) { - /* if the type is public then add the typedef, otherwise attempt - * to add the aliased type */ - if (is_attr(ref->type->attrs, ATTR_PUBLIC)) - add_typedef_typeinfo(typelib, ref->type); - else - add_type_typeinfo(typelib, type_alias_get_aliasee_type(ref->type)); + /* in old style typelibs all types are public */ + add_type_typeinfo(typelib, ref->type); } break; }

1 0

Dmitry Timoshkov : widl: Add support for recursive type references to SLTG typelib generator.
by Alexandre Julliard 09 Apr '24

09 Apr '24

Module: wine Branch: master Commit: 61583ec2cd89688fd4b706e50d4a2be0c41ef8df URL: https://gitlab.winehq.org/wine/wine/-/commit/61583ec2cd89688fd4b706e50d4a2b… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jan 14 15:16:37 2016 +0800 widl: Add support for recursive type references to SLTG typelib generator. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- tools/widl/write_sltg.c | 53 ++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 44 insertions(+), 9 deletions(-) diff --git a/tools/widl/write_sltg.c b/tools/widl/write_sltg.c index 7380d94016c..220fd933704 100644 --- a/tools/widl/write_sltg.c +++ b/tools/widl/write_sltg.c @@ -183,6 +183,12 @@ struct sltg_hrefinfo #include "poppack.h" +static void add_structure_typeinfo(struct sltg_typelib *typelib, type_t *type); +static void add_interface_typeinfo(struct sltg_typelib *typelib, type_t *type); +static void add_enum_typeinfo(struct sltg_typelib *typelib, type_t *type); +static void add_union_typeinfo(struct sltg_typelib *typelib, type_t *type); +static void add_coclass_typeinfo(struct sltg_typelib *typelib, type_t *type); + static void init_sltg_data(struct sltg_data *data) { data->size = 0; @@ -644,8 +650,8 @@ static int local_href(struct sltg_hrefmap *hrefmap, int typelib_href) return href << 2; } -static short write_var_desc(struct sltg_data *data, type_t *type, short flags, short base_offset, - int *size_instance, struct sltg_hrefmap *hrefmap) +static short write_var_desc(struct sltg_typelib *typelib, struct sltg_data *data, type_t *type, short flags, + short base_offset, int *size_instance, struct sltg_hrefmap *hrefmap) { short vt, vt_flags, desc_offset; @@ -737,10 +743,10 @@ static short write_var_desc(struct sltg_data *data, type_t *type, short flags, s chat("write_var_desc: vt VT_PTR | 0x0400\n"); vt = VT_PTR | 0x0400; append_data(data, &vt, sizeof(vt)); - write_var_desc(data, ref, 0, base_offset, size_instance, hrefmap); + write_var_desc(typelib, data, ref, 0, base_offset, size_instance, hrefmap); } else - write_var_desc(data, ref, 0x0e00, base_offset, size_instance, hrefmap); + write_var_desc(typelib, data, ref, 0x0e00, base_offset, size_instance, hrefmap); return desc_offset; } @@ -759,6 +765,33 @@ static short write_var_desc(struct sltg_data *data, type_t *type, short flags, s chat("write_var_desc: VT_USERDEFINED, type %p, name %s, real type %d, href %d\n", type, type->name, type_get_type(type), type->typelib_idx); + if (type->typelib_idx == -1) + { + chat("write_var_desc: trying to ref not added type\n"); + + switch (type_get_type(type)) + { + case TYPE_STRUCT: + add_structure_typeinfo(typelib, type); + break; + case TYPE_INTERFACE: + add_interface_typeinfo(typelib, type); + break; + case TYPE_ENUM: + add_enum_typeinfo(typelib, type); + break; + case TYPE_UNION: + add_union_typeinfo(typelib, type); + break; + case TYPE_COCLASS: + add_coclass_typeinfo(typelib, type); + break; + default: + error("write_var_desc: VT_USERDEFINED - unhandled type %d\n", + type_get_type(type)); + } + } + if (type->typelib_idx == -1) error("write_var_desc: trying to ref not added type\n"); @@ -816,6 +849,8 @@ static void add_structure_typeinfo(struct sltg_typelib *typelib, type_t *type) int member_offset, var_count = 0, var_data_size = 0, size_instance = 0; short *type_desc_offset = NULL; + if (type->typelib_idx != -1) return; + chat("add_structure_typeinfo: type %p, type->name %s\n", type, type->name); type->typelib_idx = typelib->block_count; @@ -825,8 +860,6 @@ static void add_structure_typeinfo(struct sltg_typelib *typelib, type_t *type) init_sltg_data(&data); - index_name = add_typeinfo_block(typelib, type, TKIND_RECORD); - if (type_struct_get_fields(type)) { int i = 0; @@ -841,13 +874,13 @@ static void add_structure_typeinfo(struct sltg_typelib *typelib, type_t *type) { short base_offset; - chat("add_structure_typeinfo: var %p, name %s, type %p\n", - var, var->name, var->declspec.type); + chat("add_structure_typeinfo: var %p (%s), type %p (%s)\n", + var, var->name, var->declspec.type, var->declspec.type->name); init_sltg_data(&var_data[i]); base_offset = var_data_size + (i + 1) * sizeof(struct sltg_variable); - type_desc_offset[i] = write_var_desc(&var_data[i], var->declspec.type, 0, base_offset, &size_instance, &hrefmap); + type_desc_offset[i] = write_var_desc(typelib, &var_data[i], var->declspec.type, 0, base_offset, &size_instance, &hrefmap); dump_var_desc(var_data[i].data, var_data[i].size); if (var_data[i].size > sizeof(short)) @@ -856,6 +889,8 @@ static void add_structure_typeinfo(struct sltg_typelib *typelib, type_t *type) } } + index_name = add_typeinfo_block(typelib, type, TKIND_RECORD); + init_typeinfo(&ti, type, TKIND_RECORD, &hrefmap); append_data(&data, &ti, sizeof(ti));

1 0

Dmitry Timoshkov : widl: Add support for interfaces to SLTG typelib generator.
by Alexandre Julliard 09 Apr '24

09 Apr '24

Module: wine Branch: master Commit: 7db6c30aead9d034c3d88f4b972000f46907990a URL: https://gitlab.winehq.org/wine/wine/-/commit/7db6c30aead9d034c3d88f4b972000… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jan 19 17:01:01 2016 +0800 widl: Add support for interfaces to SLTG typelib generator. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- tools/widl/write_sltg.c | 432 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 418 insertions(+), 14 deletions(-)

1 0

Dmitry Timoshkov : widl: Add support for inherited interfaces to SLTG typelib generator.
by Alexandre Julliard 09 Apr '24

09 Apr '24

Module: wine Branch: master Commit: 1d0eb24ce1513b0327db227a7f375e8be48a7043 URL: https://gitlab.winehq.org/wine/wine/-/commit/1d0eb24ce1513b0327db227a7f375e… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jan 19 18:44:00 2016 +0800 widl: Add support for inherited interfaces to SLTG typelib generator. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- tools/widl/write_sltg.c | 90 +++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 73 insertions(+), 17 deletions(-) diff --git a/tools/widl/write_sltg.c b/tools/widl/write_sltg.c index ec233a119f3..94ebf678edb 100644 --- a/tools/widl/write_sltg.c +++ b/tools/widl/write_sltg.c @@ -205,6 +205,22 @@ struct sltg_function #endif }; +struct sltg_impl_info +{ + short res00; + short next; + short res04; + char impltypeflags; + char res07; + short res08; + short ref; + short res0c; + short res0e; + short res10; + short res12; + short pos; +}; + #include "poppack.h" static void add_structure_typeinfo(struct sltg_typelib *typelib, type_t *type); @@ -1244,18 +1260,39 @@ static int add_func_desc(struct sltg_typelib *typelib, struct sltg_data *data, v return data->size - old_size; } +static void write_impl_href(struct sltg_data *data, short href) +{ + struct sltg_impl_info impl_info; + + impl_info.res00 = 0x004a; + impl_info.next = -1; + impl_info.res04 = -1; + impl_info.impltypeflags = 0; + impl_info.res07 = 0x80; + impl_info.res08 = 0x0012; + impl_info.ref = href; + impl_info.res0c = 0x4001; + impl_info.res0e = -2; /* 0xfffe */ + impl_info.res10 = -1; + impl_info.res12 = 0x001d; + impl_info.pos = 0; + + append_data(data, &impl_info, sizeof(impl_info)); +} + static void add_interface_typeinfo(struct sltg_typelib *typelib, type_t *iface) { const statement_t *stmt_func; importinfo_t *ref_importinfo = NULL; - type_t *inherit; + short inherit_href = -1; struct sltg_data data; struct sltg_hrefmap hrefmap; const char *index_name; struct sltg_typeinfo_header ti; struct sltg_member_header member; struct sltg_tail tail; - int member_offset, base_offset, func_count, func_data_size, i; + int member_offset, base_offset, func_data_size, i; + int func_count, inherited_func_count = 0; if (iface->typelib_idx != -1) return; @@ -1273,13 +1310,16 @@ static void add_interface_typeinfo(struct sltg_typelib *typelib, type_t *iface) return; } - inherit = type_iface_get_inherit(iface); + hrefmap.href_count = 0; + hrefmap.href = NULL; - if (inherit) + if (type_iface_get_inherit(iface)) { - chat("add_interface_typeinfo: inheriting from base interface %s\n", inherit->name); + type_t *inherit; - warning("inheriting from base interface %s is not implemented\n", inherit->name); + inherit = type_iface_get_inherit(iface); + + chat("add_interface_typeinfo: inheriting from base interface %s\n", inherit->name); ref_importinfo = find_importinfo(typelib->typelib, inherit->name); @@ -1288,6 +1328,14 @@ static void add_interface_typeinfo(struct sltg_typelib *typelib, type_t *iface) if (ref_importinfo) error("support for imported interfaces is not implemented\n"); + + inherit_href = local_href(&hrefmap, inherit->typelib_idx); + + while (inherit) + { + inherited_func_count += list_count(type_iface_get_stmts(inherit)); + inherit = type_iface_get_inherit(inherit); + } } /* check typelib_idx again, it could have been added while resolving the parent interface */ @@ -1296,9 +1344,6 @@ static void add_interface_typeinfo(struct sltg_typelib *typelib, type_t *iface) iface->typelib_idx = typelib->block_count; /* pass 1: calculate function descriptions data size */ - hrefmap.href_count = 0; - hrefmap.href = NULL; - init_sltg_data(&data); STATEMENTS_FOR_EACH_FUNC(stmt_func, type_iface_get_stmts(iface)) @@ -1321,19 +1366,21 @@ static void add_interface_typeinfo(struct sltg_typelib *typelib, type_t *iface) write_hrefmap(&data, &hrefmap); member_offset = data.size; + base_offset = 0; member.res00 = 0x0001; member.res02 = 0xffff; member.res04 = 0x01; member.extra = func_data_size; + if (inherit_href != -1) + { + member.extra += sizeof(struct sltg_impl_info); + base_offset += sizeof(struct sltg_impl_info); + } append_data(&data, &member, sizeof(member)); - base_offset = 0; - - /* inheriting from base interface is not implemented yet - if (type_iface_get_inherit(iface)) - add_impl_type(typeinfo, type_iface_get_inherit(iface), ref_importinfo); - */ + if (inherit_href != -1) + write_impl_href(&data, inherit_href); i = 0; @@ -1341,7 +1388,8 @@ static void add_interface_typeinfo(struct sltg_typelib *typelib, type_t *iface) { if (i == func_count - 1) i |= 0x80000000; - base_offset += add_func_desc(typelib, &data, stmt_func->u.var, i, base_offset, &hrefmap); + base_offset += add_func_desc(typelib, &data, stmt_func->u.var, + inherited_func_count + i, base_offset, &hrefmap); i++; } @@ -1352,10 +1400,18 @@ static void add_interface_typeinfo(struct sltg_typelib *typelib, type_t *iface) tail.funcs_bytes = func_data_size; tail.cbSizeInstance = pointer_size; tail.cbAlignment = pointer_size; - tail.cbSizeVft = func_count * pointer_size; + tail.cbSizeVft = (inherited_func_count + func_count) * pointer_size; tail.type_bytes = data.size - member_offset - sizeof(member); tail.res24 = 0; tail.res26 = 0; + if (inherit_href != -1) + { + tail.cImplTypes++; + tail.impls_off = 0; + tail.impls_bytes = 0; + + tail.funcs_off += sizeof(struct sltg_impl_info); + } append_data(&data, &tail, sizeof(tail)); add_block(typelib, data.data, data.size, index_name);

1 0