wine-commits February 2021

wine-commits@winehq.org

2 participants
915 discussions

Zebediah Figura : advapi32/tests: Add a few tests for GetKernelObjectSecurity() parameter validation.
by Alexandre Julliard 17 Feb '21

17 Feb '21

Module: wine Branch: master Commit: 16955db2aa9cbc5cae72a8fc436af1a81bb3f103 URL: https://source.winehq.org/git/wine.git/?a=commit;h=16955db2aa9cbc5cae72a8fc… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Feb 16 23:31:09 2021 -0600 advapi32/tests: Add a few tests for GetKernelObjectSecurity() parameter validation. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/security.c | 90 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 90 insertions(+) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index f0b6c90390d..ce1c5500b2f 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -7930,6 +7930,95 @@ static void test_duplicate_token(void) CloseHandle(token); } +static void test_GetKernelObjectSecurity(void) +{ + /* Basic tests for parameter validation. */ + + SECURITY_DESCRIPTOR_CONTROL control; + DWORD size, ret_size, revision; + BOOL ret, present, defaulted; + PSECURITY_DESCRIPTOR sd; + PSID sid; + ACL *acl; + + SetLastError(0xdeadbeef); + size = 0xdeadbeef; + ret = GetKernelObjectSecurity(NULL, OWNER_SECURITY_INFORMATION, NULL, 0, &size); + ok(!ret, "expected failure\n"); + ok(GetLastError() == ERROR_INVALID_HANDLE, "got error %u\n", GetLastError()); + ok(size == 0xdeadbeef, "got size %u\n", size); + + SetLastError(0xdeadbeef); + ret = GetKernelObjectSecurity(GetCurrentProcess(), OWNER_SECURITY_INFORMATION, NULL, 0, NULL); + ok(!ret, "expected failure\n"); + ok(GetLastError() == ERROR_NOACCESS, "got error %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + size = 0xdeadbeef; + ret = GetKernelObjectSecurity(GetCurrentProcess(), OWNER_SECURITY_INFORMATION, NULL, 0, &size); + ok(!ret, "expected failure\n"); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got error %u\n", GetLastError()); + ok(size > 0 && size != 0xdeadbeef, "got size 0\n"); + + sd = malloc(size + 1); + + SetLastError(0xdeadbeef); + ret = GetKernelObjectSecurity(GetCurrentProcess(), OWNER_SECURITY_INFORMATION, sd, size - 1, &ret_size); + ok(!ret, "expected failure\n"); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got error %u\n", GetLastError()); + ok(ret_size == size, "expected size %u, got %u\n", size, ret_size); + + SetLastError(0xdeadbeef); + ret = GetKernelObjectSecurity(GetCurrentProcess(), OWNER_SECURITY_INFORMATION, sd, size + 1, &ret_size); + ok(ret, "expected success\n"); + ok(GetLastError() == 0xdeadbeef, "got error %u\n", GetLastError()); + ok(ret_size == size, "expected size %u, got %u\n", size, ret_size); + + free(sd); + + /* Calling the function with flags not defined succeeds and yields an empty + * descriptor. */ + + SetLastError(0xdeadbeef); + ret = GetKernelObjectSecurity(GetCurrentProcess(), 0x100000, NULL, 0, &size); + ok(!ret, "expected failure\n"); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got error %u\n", GetLastError()); + + sd = malloc(size); + SetLastError(0xdeadbeef); + ret = GetKernelObjectSecurity(GetCurrentProcess(), 0x100000, sd, size, &ret_size); + ok(ret, "expected success\n"); + ok(GetLastError() == 0xdeadbeef, "got error %u\n", GetLastError()); + ok(ret_size == size, "expected size %u, got %u\n", size, ret_size); + + ret = GetSecurityDescriptorControl(sd, &control, &revision); + ok(ret, "got error %u\n", GetLastError()); + todo_wine ok(control == SE_SELF_RELATIVE, "got control %#x\n", control); + ok(revision == SECURITY_DESCRIPTOR_REVISION1, "got revision %u\n", revision); + + ret = GetSecurityDescriptorOwner(sd, &sid, &defaulted); + ok(ret, "got error %u\n", GetLastError()); + ok(!sid, "expected no owner SID\n"); + ok(!defaulted, "expected owner not defaulted\n"); + + ret = GetSecurityDescriptorGroup(sd, &sid, &defaulted); + ok(ret, "got error %u\n", GetLastError()); + ok(!sid, "expected no group SID\n"); + ok(!defaulted, "expected group not defaulted\n"); + + ret = GetSecurityDescriptorDacl(sd, &present, &acl, &defaulted); + ok(ret, "got error %u\n", GetLastError()); + todo_wine ok(!present, "expeced no DACL present\n"); + /* the descriptor is defaulted only on Windows >= 7 */ + + ret = GetSecurityDescriptorSacl(sd, &present, &acl, &defaulted); + ok(ret, "got error %u\n", GetLastError()); + ok(!present, "expeced no SACL present\n"); + /* the descriptor is defaulted only on Windows >= 7 */ + + free(sd); +} + START_TEST(security) { init(); @@ -7996,6 +8085,7 @@ START_TEST(security) test_create_process_token(); test_pseudo_handle_security(); test_duplicate_token(); + test_GetKernelObjectSecurity(); /* Must be the last test, modifies process token */ test_token_security_descriptor();

1 0

Nikolay Sivov : dwrite/layout: Pass user features to shaping calls.
by Alexandre Julliard 17 Feb '21

17 Feb '21

Module: wine Branch: master Commit: aa1bd1e0a09d60e05f132e7c42ada904176f3a72 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa1bd1e0a09d60e05f132e7c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 17 13:33:24 2021 +0300 dwrite/layout: Pass user features to shaping calls. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 178 ++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 147 insertions(+), 31 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 12a2ce1726c..b2e16447334 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -648,7 +648,33 @@ static HRESULT layout_update_breakpoints_range(struct dwrite_textlayout *layout, return S_OK; } -static struct layout_range *get_layout_range_by_pos(struct dwrite_textlayout *layout, UINT32 pos); +static struct layout_range *get_layout_range_by_pos(struct dwrite_textlayout *layout, UINT32 pos) +{ + struct layout_range *cur; + + LIST_FOR_EACH_ENTRY(cur, &layout->ranges, struct layout_range, h.entry) + { + DWRITE_TEXT_RANGE *r = &cur->h.range; + if (r->startPosition <= pos && pos < r->startPosition + r->length) + return cur; + } + + return NULL; +} + +static struct layout_range_header *get_layout_range_header_by_pos(struct list *ranges, UINT32 pos) +{ + struct layout_range_header *cur; + + LIST_FOR_EACH_ENTRY(cur, ranges, struct layout_range_header, entry) + { + DWRITE_TEXT_RANGE *r = &cur->range; + if (r->startPosition <= pos && pos < r->startPosition + r->length) + return cur; + } + + return NULL; +} static inline DWRITE_LINE_BREAKPOINT get_effective_breakpoint(const struct dwrite_textlayout *layout, UINT32 pos) { @@ -940,14 +966,123 @@ struct shaping_context struct regular_layout_run *run; DWRITE_SHAPING_GLYPH_PROPERTIES *glyph_props; DWRITE_SHAPING_TEXT_PROPERTIES *text_props; + + struct + { + DWRITE_TYPOGRAPHIC_FEATURES **features; + unsigned int *range_lengths; + unsigned int range_count; + } user_features; }; +static void layout_shape_clear_user_features_context(struct shaping_context *context) +{ + unsigned int i; + + for (i = 0; i < context->user_features.range_count; ++i) + { + heap_free(context->user_features.features[i]->features); + heap_free(context->user_features.features[i]); + } + heap_free(context->user_features.features); + memset(&context->user_features, 0, sizeof(context->user_features)); +} + static void layout_shape_clear_context(struct shaping_context *context) { + layout_shape_clear_user_features_context(context); heap_free(context->glyph_props); heap_free(context->text_props); } +static HRESULT layout_shape_add_empty_user_features_range(struct shaping_context *context, unsigned int length) +{ + DWRITE_TYPOGRAPHIC_FEATURES *features; + unsigned int r = context->user_features.range_count; + + if (!(context->user_features.features[r] = heap_alloc_zero(sizeof(*features)))) + return E_OUTOFMEMORY; + + context->user_features.range_lengths[r] = length; + context->user_features.range_count++; + + return S_OK; +} + +static HRESULT layout_shape_get_user_features(struct dwrite_textlayout *layout, struct shaping_context *context) +{ + unsigned int i, f, start = 0, r, covered_length = 0, length, feature_count; + struct regular_layout_run *run = context->run; + DWRITE_TYPOGRAPHIC_FEATURES *features; + struct layout_range_iface *range; + IDWriteTypography *typography; + HRESULT hr = E_OUTOFMEMORY; + + range = (struct layout_range_iface *)get_layout_range_header_by_pos(&layout->typographies, 0); + if (range->h.range.length >= run->descr.stringLength && !range->iface) + return S_OK; + + if (!(context->user_features.features = heap_calloc(run->descr.stringLength, sizeof(*context->user_features.features)))) + goto failed; + if (!(context->user_features.range_lengths = heap_calloc(run->descr.stringLength, sizeof(*context->user_features.range_lengths)))) + goto failed; + + for (i = run->descr.textPosition; i < run->descr.textPosition + run->descr.stringLength; ++i) + { + range = (struct layout_range_iface *)get_layout_range_header_by_pos(&layout->typographies, i); + if (!range || !range->iface) continue; + + typography = (IDWriteTypography *)range->iface; + feature_count = IDWriteTypography_GetFontFeatureCount(typography); + if (!feature_count) + { + i = range->h.range.length - i + 1; + continue; + } + + if (start != i) + { + if (FAILED(hr = layout_shape_add_empty_user_features_range(context, i - start))) goto failed; + covered_length += i - start; + start += range->h.range.length; + } + + r = context->user_features.range_count; + if (!(features = context->user_features.features[r] = heap_alloc(sizeof(*features)))) + goto failed; + + context->user_features.range_lengths[r] = length = min(run->descr.textPosition + run->descr.stringLength, + range->h.range.startPosition + range->h.range.length) - i; + features->featureCount = feature_count; + if (!(features->features = heap_calloc(feature_count, sizeof(*features->features)))) + goto failed; + + for (f = 0; f < feature_count; ++f) + { + IDWriteTypography_GetFontFeature(typography, f, &features->features[f]); + } + + i += length; + covered_length += length; + context->user_features.range_count++; + } + + if (context->user_features.range_count && covered_length < run->descr.stringLength) + { + if (FAILED(hr = layout_shape_add_empty_user_features_range(context, run->descr.stringLength - covered_length))) + goto failed; + } + + hr = S_OK; + +failed: + + if (!context->user_features.range_count || FAILED(hr)) + layout_shape_clear_user_features_context(context); + + return hr; +} + static HRESULT layout_shape_get_glyphs(struct dwrite_textlayout *layout, struct shaping_context *context) { struct regular_layout_run *run = context->run; @@ -969,11 +1104,16 @@ static HRESULT layout_shape_get_glyphs(struct dwrite_textlayout *layout, struct if (!context->text_props || !context->glyph_props) return E_OUTOFMEMORY; + if (FAILED(hr = layout_shape_get_user_features(layout, context))) + return hr; + for (;;) { hr = IDWriteTextAnalyzer_GetGlyphs(context->analyzer, run->descr.string, run->descr.stringLength, run->run.fontFace, - run->run.isSideways, run->run.bidiLevel & 1, &run->sa, run->descr.localeName, NULL /* FIXME */, NULL, - NULL, 0, max_count, run->clustermap, context->text_props, run->glyphs, context->glyph_props, &run->glyphcount); + run->run.isSideways, run->run.bidiLevel & 1, &run->sa, run->descr.localeName, NULL /* FIXME */, + (const DWRITE_TYPOGRAPHIC_FEATURES **)context->user_features.features, context->user_features.range_lengths, + context->user_features.range_count, max_count, run->clustermap, context->text_props, run->glyphs, + context->glyph_props, &run->glyphcount); if (hr == E_NOT_SUFFICIENT_BUFFER) { heap_free(run->glyphs); @@ -1020,12 +1160,14 @@ static HRESULT layout_shape_get_positions(struct dwrite_textlayout *layout, stru context->text_props, run->descr.stringLength, run->run.glyphIndices, context->glyph_props, run->glyphcount, run->run.fontFace, run->run.fontEmSize, layout->ppdip, &layout->transform, layout->measuringmode == DWRITE_MEASURING_MODE_GDI_NATURAL, run->run.isSideways, run->run.bidiLevel & 1, - &run->sa, run->descr.localeName, NULL, NULL, 0, run->advances, run->offsets); + &run->sa, run->descr.localeName, (const DWRITE_TYPOGRAPHIC_FEATURES **)context->user_features.features, + context->user_features.range_lengths, context->user_features.range_count, run->advances, run->offsets); else hr = IDWriteTextAnalyzer_GetGlyphPlacements(context->analyzer, run->descr.string, run->descr.clusterMap, context->text_props, run->descr.stringLength, run->run.glyphIndices, context->glyph_props, run->glyphcount, run->run.fontFace, run->run.fontEmSize, run->run.isSideways, run->run.bidiLevel & 1, &run->sa, - run->descr.localeName, NULL, NULL, 0, run->advances, run->offsets); + run->descr.localeName, (const DWRITE_TYPOGRAPHIC_FEATURES **)context->user_features.features, + context->user_features.range_lengths, context->user_features.range_count, run->advances, run->offsets); if (FAILED(hr)) { @@ -1204,19 +1346,6 @@ static inline FLOAT get_cluster_range_width(struct dwrite_textlayout *layout, UI return width; } -static struct layout_range_header *get_layout_range_header_by_pos(struct list *ranges, UINT32 pos) -{ - struct layout_range_header *cur; - - LIST_FOR_EACH_ENTRY(cur, ranges, struct layout_range_header, entry) { - DWRITE_TEXT_RANGE *r = &cur->range; - if (r->startPosition <= pos && pos < r->startPosition + r->length) - return cur; - } - - return NULL; -} - static inline IUnknown *layout_get_effect_from_pos(struct dwrite_textlayout *layout, UINT32 pos) { struct layout_range_header *h = get_layout_range_header_by_pos(&layout->effects, pos); @@ -2483,19 +2612,6 @@ static struct layout_range_header *find_outer_range(struct list *ranges, const D return NULL; } -static struct layout_range *get_layout_range_by_pos(struct dwrite_textlayout *layout, UINT32 pos) -{ - struct layout_range *cur; - - LIST_FOR_EACH_ENTRY(cur, &layout->ranges, struct layout_range, h.entry) { - DWRITE_TEXT_RANGE *r = &cur->h.range; - if (r->startPosition <= pos && pos < r->startPosition + r->length) - return cur; - } - - return NULL; -} - static inline BOOL set_layout_range_iface_attr(IUnknown **dest, IUnknown *value) { if (*dest == value) return FALSE;

1 0

Nikolay Sivov : dwrite: Fix character range to glyph range matching for user features.
by Alexandre Julliard 17 Feb '21

17 Feb '21

Module: wine Branch: master Commit: d4784a9211a18f247e1698f79d1dd02338df068a URL: https://source.winehq.org/git/wine.git/?a=commit;h=d4784a9211a18f247e1698f7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 17 13:33:23 2021 +0300 dwrite: Fix character range to glyph range matching for user features. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 125b7353031..39943c52c9a 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -4733,7 +4733,7 @@ static void opentype_layout_get_glyph_range_for_text(struct scriptshaping_contex if (end_char >= context->length - 1) *end_glyph = context->glyph_count - 1; else - *end_glyph = context->u.buffer.clustermap[end_char + 1] - 1; + *end_glyph = context->u.buffer.clustermap[end_char] - 1; } static void opentype_layout_set_glyph_masks(struct scriptshaping_context *context, const struct shaping_features *features) @@ -4754,6 +4754,9 @@ static void opentype_layout_set_glyph_masks(struct scriptshaping_context *contex if (start_char >= context->length) break; + if (!context->user_features.range_lengths[r]) + continue; + opentype_layout_get_glyph_range_for_text(context, start_char, start_char + context->user_features.range_lengths[r], &start_glyph, &end_glyph); start_char += context->user_features.range_lengths[r];

1 0

Alex Henrie : iphlpapi: Use RtlIpv4AddressToStringA instead of inet_ntoa.
by Alexandre Julliard 17 Feb '21

17 Feb '21

Module: wine Branch: master Commit: 2d3b1c1288c8a0df5cdecd3929dbb69da0fee7c4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2d3b1c1288c8a0df5cdecd39… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Feb 16 22:56:29 2021 -0700 iphlpapi: Use RtlIpv4AddressToStringA instead of inet_ntoa. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/ifenum.c | 20 -------------------- dlls/iphlpapi/ifenum.h | 5 ----- dlls/iphlpapi/iphlpapi_main.c | 14 +++++++------- 3 files changed, 7 insertions(+), 32 deletions(-) diff --git a/dlls/iphlpapi/ifenum.c b/dlls/iphlpapi/ifenum.c index c3abdf0e536..288e04db7b8 100644 --- a/dlls/iphlpapi/ifenum.c +++ b/dlls/iphlpapi/ifenum.c @@ -35,14 +35,6 @@ #include <sys/socket.h> #endif -#ifdef HAVE_NETINET_IN_H -#include <netinet/in.h> -#endif - -#ifdef HAVE_ARPA_INET_H -#include <arpa/inet.h> -#endif - #ifdef HAVE_NET_IF_H #include <net/if.h> #endif @@ -1106,15 +1098,3 @@ ULONG v6addressesFromIndex(IF_INDEX index, SOCKET_ADDRESS **addrs, ULONG *num_ad } #endif - -char *toIPAddressString(unsigned int addr, char string[16]) -{ - if (string) { - struct in_addr iAddr; - - iAddr.s_addr = addr; - /* extra-anal, just to make auditors happy */ - lstrcpynA(string, inet_ntoa(iAddr), 16); - } - return string; -} diff --git a/dlls/iphlpapi/ifenum.h b/dlls/iphlpapi/ifenum.h index c6bf9575759..558dff64cb6 100644 --- a/dlls/iphlpapi/ifenum.h +++ b/dlls/iphlpapi/ifenum.h @@ -109,11 +109,6 @@ DWORD getIPAddrTable(PMIB_IPADDRTABLE *ppIpAddrTable, HANDLE heap, DWORD flags) ULONG v6addressesFromIndex(IF_INDEX index, SOCKET_ADDRESS **addrs, ULONG *num_addrs, SOCKET_ADDRESS **masks) DECLSPEC_HIDDEN; -/* Converts the network-order bytes in addr to a printable string. Returns - * string. - */ -char *toIPAddressString(unsigned int addr, char string[16]) DECLSPEC_HIDDEN; - DWORD getInterfaceMtuByName(const char *name, PDWORD mtu) DECLSPEC_HIDDEN; DWORD getInterfaceStatusByName(const char *name, INTERNAL_IF_OPER_STATUS *status) DECLSPEC_HIDDEN; diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index bd1fea02e19..09414d26dde 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -717,18 +717,18 @@ DWORD WINAPI GetAdaptersInfo(PIP_ADAPTER_INFO pAdapterInfo, PULONG pOutBufLen) for (i = 0; i < ipAddrTable->dwNumEntries; i++) { if (ipAddrTable->table[i].dwIndex == ptr->Index) { if (firstIPAddr) { - toIPAddressString(ipAddrTable->table[i].dwAddr, + RtlIpv4AddressToStringA((IN_ADDR *)&ipAddrTable->table[i].dwAddr, ptr->IpAddressList.IpAddress.String); - toIPAddressString(ipAddrTable->table[i].dwMask, + RtlIpv4AddressToStringA((IN_ADDR *)&ipAddrTable->table[i].dwMask, ptr->IpAddressList.IpMask.String); firstIPAddr = FALSE; } else { currentIPAddr->Next = nextIPAddr; currentIPAddr = nextIPAddr; - toIPAddressString(ipAddrTable->table[i].dwAddr, + RtlIpv4AddressToStringA((IN_ADDR *)&ipAddrTable->table[i].dwAddr, currentIPAddr->IpAddress.String); - toIPAddressString(ipAddrTable->table[i].dwMask, + RtlIpv4AddressToStringA((IN_ADDR *)&ipAddrTable->table[i].dwMask, currentIPAddr->IpMask.String); nextIPAddr++; } @@ -749,9 +749,9 @@ DWORD WINAPI GetAdaptersInfo(PIP_ADAPTER_INFO pAdapterInfo, PULONG pOutBufLen) && routeTable->table[i].u1.ForwardType == MIB_IPROUTE_TYPE_INDIRECT) { - toIPAddressString(routeTable->table[i].dwForwardNextHop, + RtlIpv4AddressToStringA((IN_ADDR *)&routeTable->table[i].dwForwardNextHop, ptr->GatewayList.IpAddress.String); - toIPAddressString(routeTable->table[i].dwForwardMask, + RtlIpv4AddressToStringA((IN_ADDR *)&routeTable->table[i].dwForwardMask, ptr->GatewayList.IpMask.String); } if (winsEnabled) { @@ -2224,7 +2224,7 @@ static DWORD get_dns_server_list(PIP_ADDR_STRING list, get_dns_servers( addr, num, TRUE ); for (i = 0, ptr = list; i < num; i++, ptr = ptr->Next) { - toIPAddressString(((struct sockaddr_in *)(addr + i))->sin_addr.s_addr, + RtlIpv4AddressToStringA((IN_ADDR *)&((struct sockaddr_in *)(addr + i))->sin_addr.s_addr, ptr->IpAddress.String); if (i == num - 1) ptr->Next = NULL;

1 0

Jacek Caban : winebuild: Restore x86_64 FPU context and nonvolatile registers in syscall dispatcher.
by Alexandre Julliard 17 Feb '21

17 Feb '21

Module: wine Branch: master Commit: be8729c9f57e555148c4dde7cc2001ae316d124b URL: https://source.winehq.org/git/wine.git/?a=commit;h=be8729c9f57e555148c4dde7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 15 21:59:16 2021 +0100 winebuild: Restore x86_64 FPU context and nonvolatile registers in syscall dispatcher. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_x86_64.c | 1 + tools/winebuild/import.c | 10 +++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 6e34e0d9979..892d208e43a 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -2152,6 +2152,7 @@ __ASM_GLOBAL_FUNC( call_raise_user_exception_dispatcher, "movq 0x8(%rax),%rbx\n\t" /* frame->rbx */ "movq 0x20(%rax),%rsi\n\t" /* frame->rsi */ "movq 0x28(%rax),%rdi\n\t" /* frame->rdi */ + "movq 0x50(%rax),%r12\n\t" /* frame->r12 */ "movq 0x98(%rax),%rbp\n\t" /* frame->rbp */ "movq $0,0x328(%rdx)\n\t" "leaq 0xa8(%rax),%rsp\n\t" diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 6b5f704c8f1..5645d3aa9af 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -1519,6 +1519,7 @@ void output_syscalls( DLLSPEC *spec ) output( "\tmovq %%rdi,-0x70(%%rbp)\n" ); output_cfi( ".cfi_rel_offset %%rdi,-112" ); output( "\tmovq %%r12,-0x48(%%rbp)\n" ); + output_cfi( ".cfi_rel_offset %%r12,-72" ); output( "\tmovq %%r13,-0x40(%%rbp)\n" ); output( "\tmovq %%r14,-0x38(%%rbp)\n" ); output( "\tmovq %%r15,-0x30(%%rbp)\n" ); @@ -1535,7 +1536,8 @@ void output_syscalls( DLLSPEC *spec ) output( "\tmovw %%fs,-0x1a(%%rbp)\n" ); output( "\tmovw %%ss,-0x8(%%rbp)\n" ); output( "\tmovw %%gs,-0x6(%%rbp)\n" ); - output( "\tfxsave64 (%%rsp)\n" ); + output( "\tmovq %%rsp,%%r12\n" ); + output( "\tfxsave64 (%%r12)\n" ); output( "\tmovq %%gs:0x30,%%rcx\n" ); output( "\tleaq -0x98(%%rbp),%%rbx\n" ); output( "\tmovq %%rbx,0x328(%%rcx)\n" ); /* amd64_thread_data()->syscall_frame */ @@ -1558,6 +1560,12 @@ void output_syscalls( DLLSPEC *spec ) output( "\tcallq *(%%r10,%%rax,8)\n" ); output( "2:\tmovq %%gs:0x30,%%rcx\n" ); output( "\tmovq $0,0x328(%%rcx)\n" ); + output( "\tfxrstor64 (%%r12)\n" ); + output( "\tmovq -0x30(%%rbp),%%r15\n" ); + output( "\tmovq -0x38(%%rbp),%%r14\n" ); + output( "\tmovq -0x40(%%rbp),%%r13\n" ); + output( "\tmovq -0x48(%%rbp),%%r12\n" ); + output_cfi( ".cfi_same_value %%r12" ); output( "\tmovq -0x70(%%rbp),%%rdi\n" ); output_cfi( ".cfi_same_value %%rdi" ); output( "\tmovq -0x78(%%rbp),%%rsi\n" );

1 0

Jacek Caban : winebuild: Restore all x86_64 control registers in syscall dispatcher.
by Alexandre Julliard 17 Feb '21

17 Feb '21

Module: wine Branch: master Commit: 9b6f715b28a5fad471a7c4800881f93ecf28787e URL: https://source.winehq.org/git/wine.git/?a=commit;h=9b6f715b28a5fad471a7c480… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 15 21:59:02 2021 +0100 winebuild: Restore all x86_64 control registers in syscall dispatcher. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/import.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 863d17c2734..6b5f704c8f1 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -1564,11 +1564,12 @@ void output_syscalls( DLLSPEC *spec ) output_cfi( ".cfi_same_value %%rsi" ); output( "\tmovq -0x90(%%rbp),%%rbx\n" ); output_cfi( ".cfi_same_value %%rbx" ); + output( "\tleaq -0x28(%%rbp),%%rsp\n" ); output_cfi( ".cfi_def_cfa_register %%rsp" ); - output( "\tleave\n" ); - output_cfi( ".cfi_adjust_cfa_offset -8" ); + output_cfi( ".cfi_adjust_cfa_offset 40" ); + output( "\tmovq (%%rbp),%%rbp\n" ); output_cfi( ".cfi_same_value %%rbp" ); - output( "\tret\n" ); + output( "\tiretq\n" ); output( "3:\tmovl $0x%x,%%eax\n", invalid_param ); output( "\tjmp 2b\n" ); break;

1 0

Jacek Caban : ntdll: Use syscall frame for volatile registers in x64_64 NtGetContextThread.
by Alexandre Julliard 17 Feb '21

17 Feb '21

Module: wine Branch: master Commit: b817eb3ec804d3e9fce698f8f4bbc6299deae6d8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b817eb3ec804d3e9fce698f8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 15 21:58:49 2021 +0100 ntdll: Use syscall frame for volatile registers in x64_64 NtGetContextThread. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_x86_64.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 35395283619..6e34e0d9979 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -1923,16 +1923,16 @@ NTSTATUS WINAPI NtGetContextThread( HANDLE handle, CONTEXT *context ) { if (needed_flags & CONTEXT_INTEGER) { - context->Rax = 0; + context->Rax = frame->rax; context->Rbx = frame->rbx; - context->Rcx = 0; - context->Rdx = 0; + context->Rcx = frame->rcx; + context->Rdx = frame->rdx; context->Rsi = frame->rsi; context->Rdi = frame->rdi; - context->R8 = 0; - context->R9 = 0; - context->R10 = 0; - context->R11 = 0; + context->R8 = frame->r8; + context->R9 = frame->r9; + context->R10 = frame->r10; + context->R11 = frame->r11; context->R12 = frame->r12; context->R13 = frame->r13; context->R14 = frame->r14;

1 0

Jacek Caban : ntdll: Store segment registers in x86_64 syscall frame.
by Alexandre Julliard 17 Feb '21

17 Feb '21

Module: wine Branch: master Commit: f72940de8e5709605e517f7fe4ac1605ca519c5e URL: https://source.winehq.org/git/wine.git/?a=commit;h=f72940de8e5709605e517f7f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 15 21:58:37 2021 +0100 ntdll: Store segment registers in x86_64 syscall frame. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_x86_64.c | 12 ++++++------ tools/winebuild/import.c | 6 ++++++ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 6477bf8a953..35395283619 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -1945,16 +1945,16 @@ NTSTATUS WINAPI NtGetContextThread( HANDLE handle, CONTEXT *context ) context->Rbp = frame->rbp; context->Rip = frame->rip; context->EFlags = frame->eflags; - __asm__( "movw %%cs,%0" : "=g" (context->SegCs) ); - __asm__( "movw %%ss,%0" : "=g" (context->SegSs) ); + context->SegCs = frame->cs; + context->SegSs = frame->ss; context->ContextFlags |= CONTEXT_CONTROL; } if (needed_flags & CONTEXT_SEGMENTS) { - __asm__( "movw %%ds,%0" : "=g" (context->SegDs) ); - __asm__( "movw %%es,%0" : "=g" (context->SegEs) ); - __asm__( "movw %%fs,%0" : "=g" (context->SegFs) ); - __asm__( "movw %%gs,%0" : "=g" (context->SegGs) ); + context->SegDs = frame->ds; + context->SegEs = frame->es; + context->SegFs = frame->fs; + context->SegGs = frame->gs; context->ContextFlags |= CONTEXT_SEGMENTS; } if (needed_flags & CONTEXT_FLOATING_POINT) diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 12ba189aa0a..863d17c2734 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -1529,6 +1529,12 @@ void output_syscalls( DLLSPEC *spec ) output( "\tmovq %%rbx,-0x28(%%rbp)\n" ); output( "\tleaq 0x10(%%rbp),%%rbx\n" ); output( "\tmovq %%rbx,-0x10(%%rbp)\n" ); + output( "\tmovw %%cs,-0x20(%%rbp)\n" ); + output( "\tmovw %%ds,-0x1e(%%rbp)\n" ); + output( "\tmovw %%es,-0x1c(%%rbp)\n" ); + output( "\tmovw %%fs,-0x1a(%%rbp)\n" ); + output( "\tmovw %%ss,-0x8(%%rbp)\n" ); + output( "\tmovw %%gs,-0x6(%%rbp)\n" ); output( "\tfxsave64 (%%rsp)\n" ); output( "\tmovq %%gs:0x30,%%rcx\n" ); output( "\tleaq -0x98(%%rbp),%%rbx\n" );

1 0

Jacek Caban : ntdll: Store stack pointer in x86_64 syscall frame.
by Alexandre Julliard 17 Feb '21

17 Feb '21

Module: wine Branch: master Commit: 4e5b61bb068f90b84d2b0a168162ac3f8f0e9af0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4e5b61bb068f90b84d2b0a16… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 15 21:58:27 2021 +0100 ntdll: Store stack pointer in x86_64 syscall frame. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_x86_64.c | 13 +++++-------- tools/winebuild/import.c | 2 ++ 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index d5a34c700f8..6477bf8a953 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -300,12 +300,9 @@ struct syscall_frame WORD gs; /* 0092 */ WORD pad[2]; /* 0094 */ ULONG64 rbp; /* 0098 */ - ULONG64 thunk_addr; - ULONG64 ret_addr; }; -/* Should match the offset in call_user_apc_dispatcher(). */ -C_ASSERT( offsetof( struct syscall_frame, ret_addr ) == 0xa8); +C_ASSERT( sizeof( struct syscall_frame ) == 0xa0); struct amd64_thread_data { @@ -1944,7 +1941,7 @@ NTSTATUS WINAPI NtGetContextThread( HANDLE handle, CONTEXT *context ) } if (needed_flags & CONTEXT_CONTROL) { - context->Rsp = (ULONG64)&frame->ret_addr; + context->Rsp = frame->rsp; context->Rbp = frame->rbp; context->Rip = frame->rip; context->EFlags = frame->eflags; @@ -2104,7 +2101,7 @@ __ASM_GLOBAL_FUNC( call_user_apc_dispatcher, "movq 0x98(%rcx),%rdx\n\t" /* context->Rsp */ "jmp 2f\n\t" "1:\tmovq 0x328(%rbx),%rax\n\t" /* amd64_thread_data()->syscall_frame */ - "leaq 0xa8(%rax),%rdx\n\t" /* &amd64_thread_data()->syscall_frame->ret_addr */ + "movq 0x88(%rax),%rdx\n\t" /* frame->rsp */ "2:\tsubq $0x510,%rdx\n\t" /* sizeof(struct apc_stack_layout) */ "andq $~0xf,%rdx\n\t" "addq $8,%rsp\n\t" /* pop return address */ @@ -2399,7 +2396,7 @@ static BOOL handle_syscall_fault( ucontext_t *sigcontext, EXCEPTION_RECORD *rec, { XMM_SAVE_AREA32 *fpu = FPU_sig(sigcontext); - TRACE( "returning to user mode ip=%016lx ret=%08x\n", frame->ret_addr, rec->ExceptionCode ); + TRACE( "returning to user mode ip=%016lx ret=%08x\n", frame->rip, rec->ExceptionCode ); RAX_sig(sigcontext) = rec->ExceptionCode; RBX_sig(sigcontext) = frame->rbx; RSI_sig(sigcontext) = frame->rsi; @@ -2409,7 +2406,7 @@ static BOOL handle_syscall_fault( ucontext_t *sigcontext, EXCEPTION_RECORD *rec, R13_sig(sigcontext) = frame->r13; R14_sig(sigcontext) = frame->r14; R15_sig(sigcontext) = frame->r15; - RSP_sig(sigcontext) = (ULONG_PTR)&frame->ret_addr; + RSP_sig(sigcontext) = frame->rsp; RIP_sig(sigcontext) = frame->rip; if (fpu) *fpu = get_syscall_xsave( frame )->xsave; amd64_thread_data()->syscall_frame = NULL; diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 2db414b3b30..12ba189aa0a 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -1527,6 +1527,8 @@ void output_syscalls( DLLSPEC *spec ) output( "\tsubq $0xb,0x8(%%rbp)\n" ); output( "\tmovq 0x8(%%rbp),%%rbx\n" ); output( "\tmovq %%rbx,-0x28(%%rbp)\n" ); + output( "\tleaq 0x10(%%rbp),%%rbx\n" ); + output( "\tmovq %%rbx,-0x10(%%rbp)\n" ); output( "\tfxsave64 (%%rsp)\n" ); output( "\tmovq %%gs:0x30,%%rcx\n" ); output( "\tleaq -0x98(%%rbp),%%rbx\n" );

1 0

Jacek Caban : ntdll: Store instruction pointer register in x86_64 syscall frame.
by Alexandre Julliard 17 Feb '21

17 Feb '21

Module: wine Branch: master Commit: accf7a09080eb38f75e5b730725ac987248d6e1f URL: https://source.winehq.org/git/wine.git/?a=commit;h=accf7a09080eb38f75e5b730… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 15 21:58:09 2021 +0100 ntdll: Store instruction pointer register in x86_64 syscall frame. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_x86_64.c | 4 ++-- tools/winebuild/import.c | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 9366d8913c0..d5a34c700f8 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -1946,7 +1946,7 @@ NTSTATUS WINAPI NtGetContextThread( HANDLE handle, CONTEXT *context ) { context->Rsp = (ULONG64)&frame->ret_addr; context->Rbp = frame->rbp; - context->Rip = frame->thunk_addr; + context->Rip = frame->rip; context->EFlags = frame->eflags; __asm__( "movw %%cs,%0" : "=g" (context->SegCs) ); __asm__( "movw %%ss,%0" : "=g" (context->SegSs) ); @@ -2410,7 +2410,7 @@ static BOOL handle_syscall_fault( ucontext_t *sigcontext, EXCEPTION_RECORD *rec, R14_sig(sigcontext) = frame->r14; R15_sig(sigcontext) = frame->r15; RSP_sig(sigcontext) = (ULONG_PTR)&frame->ret_addr; - RIP_sig(sigcontext) = frame->thunk_addr; + RIP_sig(sigcontext) = frame->rip; if (fpu) *fpu = get_syscall_xsave( frame )->xsave; amd64_thread_data()->syscall_frame = NULL; } diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 8c949a383e3..2db414b3b30 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -1522,10 +1522,12 @@ void output_syscalls( DLLSPEC *spec ) output( "\tmovq %%r13,-0x40(%%rbp)\n" ); output( "\tmovq %%r14,-0x38(%%rbp)\n" ); output( "\tmovq %%r15,-0x30(%%rbp)\n" ); - output( "\tfxsave64 (%%rsp)\n" ); /* Legends of Runeterra hooks the first system call return instruction, and * depends on us returning to it. Adjust the return address accordingly. */ output( "\tsubq $0xb,0x8(%%rbp)\n" ); + output( "\tmovq 0x8(%%rbp),%%rbx\n" ); + output( "\tmovq %%rbx,-0x28(%%rbp)\n" ); + output( "\tfxsave64 (%%rsp)\n" ); output( "\tmovq %%gs:0x30,%%rcx\n" ); output( "\tleaq -0x98(%%rbp),%%rbx\n" ); output( "\tmovq %%rbx,0x328(%%rcx)\n" ); /* amd64_thread_data()->syscall_frame */

1 0

← Newer
1
...
39
40
41
42
43
44
45
...
92
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2021