February 2021 - Wine-Commits

Zebediah Figura : ntdll: Implement NtQueryInformationToken(TokenLinkedToken).
by Alexandre Julliard Feb. 17, 2021

Feb. 17, 2021

Module: wine Branch: master Commit: ec9244f056b1063be602412a34a12d46f74debb2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec9244f056b1063be602412a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Feb 16 23:31:12 2021 -0600 ntdll: Implement NtQueryInformationToken(TokenLinkedToken). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/security.c | 11 +++++------ dlls/ntdll/unix/security.c | 14 +++++++++++++- include/wine/server_protocol.h | 19 ++++++++++++++++++- server/process.c | 2 +- server/protocol.def | 8 ++++++++ server/request.h | 6 ++++++ server/security.h | 2 +- server/token.c | 33 +++++++++++++++++++++++++++++++-- server/trace.c | 13 +++++++++++++ 9 files changed, 96 insertions(+), 12 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ec9244f056b1063be602…

1 0

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

Feb. 17, 2021

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 instruction pointer register in x86_64 syscall frame.
by Alexandre Julliard Feb. 17, 2021

Feb. 17, 2021

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

Jacek Caban : ntdll: Store eflags in x86_64 syscall frame.
by Alexandre Julliard Feb. 17, 2021

Feb. 17, 2021

Module: wine Branch: master Commit: 9bdd02de0c5cd370a48901ceede12ff946662295 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9bdd02de0c5cd370a48901ce… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 15 21:58:02 2021 +0100 ntdll: Store eflags 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 | 2 +- tools/winebuild/import.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 824cfb4febe..9366d8913c0 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -1947,7 +1947,7 @@ NTSTATUS WINAPI NtGetContextThread( HANDLE handle, CONTEXT *context ) context->Rsp = (ULONG64)&frame->ret_addr; context->Rbp = frame->rbp; context->Rip = frame->thunk_addr; - context->EFlags = 0x202; + context->EFlags = frame->eflags; __asm__( "movw %%cs,%0" : "=g" (context->SegCs) ); __asm__( "movw %%ss,%0" : "=g" (context->SegSs) ); context->ContextFlags |= CONTEXT_CONTROL; diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index c70470251a4..8c949a383e3 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -1508,7 +1508,9 @@ void output_syscalls( DLLSPEC *spec ) output_cfi( ".cfi_rel_offset %%rbp,0" ); output( "\tmovq %%rsp,%%rbp\n" ); output_cfi( ".cfi_def_cfa_register %%rbp" ); - output( "\tleaq -0x2a8(%%rbp),%%rsp\n" ); + output( "\tleaq -0x10(%%rbp),%%rsp\n" ); + output( "\tpushfq\n" ); + output( "\tsubq $0x280,%%rsp\n" ); output( "\tandq $~63,%%rsp\n" ); output( "\tmovq %%rbx,-0x90(%%rbp)\n" ); output_cfi( ".cfi_rel_offset %%rbx,-144" );

1 0

Alexandre Julliard : server: Merge the various token information queries.
by Alexandre Julliard Feb. 17, 2021

Feb. 17, 2021

Module: wine Branch: master Commit: 6f7b56a1980868354a0198a6209c89ac17eccad6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6f7b56a1980868354a0198a6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 17 17:10:15 2021 +0100 server: Merge the various token information queries. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/security.c | 17 ++++++++------- include/wine/server_protocol.h | 47 +++++++----------------------------------- server/protocol.def | 18 ++-------------- server/request.h | 35 +++++++++++-------------------- server/token.c | 37 +++------------------------------ server/trace.c | 37 ++++++--------------------------- 6 files changed, 41 insertions(+), 150 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6f7b56a1980868354a01…

1 0

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

Feb. 17, 2021

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

Alex Henrie : iphlpapi: Use RtlIpv4AddressToStringA instead of inet_ntoa.
by Alexandre Julliard Feb. 17, 2021

Feb. 17, 2021

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

Zebediah Figura : ntdll: Implement NtQueryInformationToken(TokenElevationType).
by Alexandre Julliard Feb. 17, 2021

Feb. 17, 2021

Module: wine Branch: master Commit: c96749790b064a08ce866b459acce70c12c78a71 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c96749790b064a08ce866b45… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Feb 16 23:31:11 2021 -0600 ntdll: Implement NtQueryInformationToken(TokenElevationType). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/security.c | 8 ++++++-- include/wine/server_protocol.h | 19 ++++++++++++++++++- server/protocol.def | 8 ++++++++ server/request.h | 6 ++++++ server/token.c | 20 +++++++++++++++++--- server/trace.c | 13 +++++++++++++ 6 files changed, 68 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/unix/security.c b/dlls/ntdll/unix/security.c index fc9cc9d4572..04f1b43a5cb 100644 --- a/dlls/ntdll/unix/security.c +++ b/dlls/ntdll/unix/security.c @@ -391,11 +391,15 @@ NTSTATUS WINAPI NtQueryInformationToken( HANDLE token, TOKEN_INFORMATION_CLASS c break; case TokenElevationType: + SERVER_START_REQ( get_token_elevation ) { TOKEN_ELEVATION_TYPE *type = info; - FIXME("QueryInformationToken( ..., TokenElevationType, ...) semi-stub\n"); - *type = TokenElevationTypeFull; + + req->handle = wine_server_obj_handle( token ); + status = wine_server_call( req ); + if (!status) *type = reply->elevation; } + SERVER_END_REQ; break; case TokenElevation: diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index ec34867caf1..bf9536ddcc8 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -4936,6 +4936,20 @@ struct get_token_statistics_reply +struct get_token_elevation_request +{ + struct request_header __header; + obj_handle_t handle; +}; +struct get_token_elevation_reply +{ + struct reply_header __header; + int elevation; + char __pad_12[4]; +}; + + + struct create_completion_request { struct request_header __header; @@ -5627,6 +5641,7 @@ enum request REQ_get_kernel_object_handle, REQ_make_process_system, REQ_get_token_statistics, + REQ_get_token_elevation, REQ_create_completion, REQ_open_completion, REQ_add_completion, @@ -5908,6 +5923,7 @@ union generic_request struct get_kernel_object_handle_request get_kernel_object_handle_request; struct make_process_system_request make_process_system_request; struct get_token_statistics_request get_token_statistics_request; + struct get_token_elevation_request get_token_elevation_request; struct create_completion_request create_completion_request; struct open_completion_request open_completion_request; struct add_completion_request add_completion_request; @@ -6187,6 +6203,7 @@ union generic_reply struct get_kernel_object_handle_reply get_kernel_object_handle_reply; struct make_process_system_reply make_process_system_reply; struct get_token_statistics_reply get_token_statistics_reply; + struct get_token_elevation_reply get_token_elevation_reply; struct create_completion_reply create_completion_reply; struct open_completion_reply open_completion_reply; struct add_completion_reply add_completion_reply; @@ -6220,7 +6237,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 678 +#define SERVER_PROTOCOL_VERSION 679 /* ### protocol_version end ### */ diff --git a/server/protocol.def b/server/protocol.def index fb3ee3a52de..43899bee240 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -3433,6 +3433,14 @@ struct handle_info @END +/* Get the token elevation type */ +(a)REQ(get_token_elevation) + obj_handle_t handle; /* handle to the token */ +(a)REPLY + int elevation; /* token elevation type */ +(a)END + + /* Create I/O completion port */ @REQ(create_completion) unsigned int access; /* desired access to a port */ diff --git a/server/request.h b/server/request.h index d1ff4cc7a82..4313b42ca52 100644 --- a/server/request.h +++ b/server/request.h @@ -364,6 +364,7 @@ DECL_HANDLER(release_kernel_object); DECL_HANDLER(get_kernel_object_handle); DECL_HANDLER(make_process_system); DECL_HANDLER(get_token_statistics); +DECL_HANDLER(get_token_elevation); DECL_HANDLER(create_completion); DECL_HANDLER(open_completion); DECL_HANDLER(add_completion); @@ -644,6 +645,7 @@ static const req_handler req_handlers[REQ_NB_REQUESTS] = (req_handler)req_get_kernel_object_handle, (req_handler)req_make_process_system, (req_handler)req_get_token_statistics, + (req_handler)req_get_token_elevation, (req_handler)req_create_completion, (req_handler)req_open_completion, (req_handler)req_add_completion, @@ -2105,6 +2107,10 @@ C_ASSERT( FIELD_OFFSET(struct get_token_statistics_reply, impersonation_level) = C_ASSERT( FIELD_OFFSET(struct get_token_statistics_reply, group_count) == 32 ); C_ASSERT( FIELD_OFFSET(struct get_token_statistics_reply, privilege_count) == 36 ); C_ASSERT( sizeof(struct get_token_statistics_reply) == 40 ); +C_ASSERT( FIELD_OFFSET(struct get_token_elevation_request, handle) == 12 ); +C_ASSERT( sizeof(struct get_token_elevation_request) == 16 ); +C_ASSERT( FIELD_OFFSET(struct get_token_elevation_reply, elevation) == 8 ); +C_ASSERT( sizeof(struct get_token_elevation_reply) == 16 ); C_ASSERT( FIELD_OFFSET(struct create_completion_request, access) == 12 ); C_ASSERT( FIELD_OFFSET(struct create_completion_request, concurrent) == 16 ); C_ASSERT( sizeof(struct create_completion_request) == 24 ); diff --git a/server/token.c b/server/token.c index 2ae1cb1780a..5499841dd50 100644 --- a/server/token.c +++ b/server/token.c @@ -126,6 +126,7 @@ struct token ACL *default_dacl; /* the default DACL to assign to objects created by this user */ TOKEN_SOURCE source; /* source of the token */ int impersonation_level; /* impersonation level this token is capable of if non-primary token */ + int elevation; /* elevation type */ }; struct privilege @@ -541,7 +542,7 @@ static struct token *create_token( unsigned primary, const SID *user, const LUID_AND_ATTRIBUTES *privs, unsigned int priv_count, const ACL *default_dacl, TOKEN_SOURCE source, const luid_t *modified_id, - int impersonation_level ) + int impersonation_level, int elevation ) { struct token *token = alloc_object( &token_ops ); if (token) @@ -563,6 +564,7 @@ static struct token *create_token( unsigned primary, const SID *user, token->impersonation_level = impersonation_level; token->default_dacl = NULL; token->primary_group = NULL; + token->elevation = elevation; /* copy user */ token->user = memdup( user, security_sid_len( user )); @@ -678,7 +680,7 @@ struct token *token_duplicate( struct token *src_token, unsigned primary, token = create_token( primary, src_token->user, NULL, 0, NULL, 0, src_token->default_dacl, src_token->source, modified_id, - impersonation_level ); + impersonation_level, src_token->elevation ); if (!token) return token; /* copy groups */ @@ -890,7 +892,7 @@ struct token *token_create_admin( void ) static const TOKEN_SOURCE admin_source = {"SeMgr", {0, 0}}; token = create_token( TRUE, user_sid, admin_groups, ARRAY_SIZE( admin_groups ), admin_privs, ARRAY_SIZE( admin_privs ), default_dacl, - admin_source, NULL, -1 ); + admin_source, NULL, -1, TokenElevationTypeFull ); /* we really need a primary group */ assert( token->primary_group ); } @@ -1665,3 +1667,15 @@ DECL_HANDLER(set_token_default_dacl) release_object( token ); } } + +DECL_HANDLER(get_token_elevation) +{ + struct token *token; + + if ((token = (struct token *)get_handle_obj( current->process, req->handle, + TOKEN_QUERY, &token_ops ))) + { + reply->elevation = token->elevation; + release_object( token ); + } +} diff --git a/server/trace.c b/server/trace.c index 4e83550d028..128dd1191f8 100644 --- a/server/trace.c +++ b/server/trace.c @@ -4184,6 +4184,16 @@ static void dump_get_token_statistics_reply( const struct get_token_statistics_r fprintf( stderr, ", privilege_count=%d", req->privilege_count ); } +static void dump_get_token_elevation_request( const struct get_token_elevation_request *req ) +{ + fprintf( stderr, " handle=%04x", req->handle ); +} + +static void dump_get_token_elevation_reply( const struct get_token_elevation_reply *req ) +{ + fprintf( stderr, " elevation=%d", req->elevation ); +} + static void dump_create_completion_request( const struct create_completion_request *req ) { fprintf( stderr, " access=%08x", req->access ); @@ -4696,6 +4706,7 @@ static const dump_func req_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_get_kernel_object_handle_request, (dump_func)dump_make_process_system_request, (dump_func)dump_get_token_statistics_request, + (dump_func)dump_get_token_elevation_request, (dump_func)dump_create_completion_request, (dump_func)dump_open_completion_request, (dump_func)dump_add_completion_request, @@ -4973,6 +4984,7 @@ static const dump_func reply_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_get_kernel_object_handle_reply, (dump_func)dump_make_process_system_reply, (dump_func)dump_get_token_statistics_reply, + (dump_func)dump_get_token_elevation_reply, (dump_func)dump_create_completion_reply, (dump_func)dump_open_completion_reply, NULL, @@ -5250,6 +5262,7 @@ static const char * const req_names[REQ_NB_REQUESTS] = { "get_kernel_object_handle", "make_process_system", "get_token_statistics", + "get_token_elevation", "create_completion", "open_completion", "add_completion",

1 0

Zebediah Figura : advapi32/tests: Add some tests for token elevation.
by Alexandre Julliard Feb. 17, 2021

Feb. 17, 2021

Module: wine Branch: master Commit: 133e061244be0800fd040c947ba0ad15cfe38f68 URL: https://source.winehq.org/git/wine.git/?a=commit;h=133e061244be0800fd040c94… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Feb 16 23:31:10 2021 -0600 advapi32/tests: Add some tests for token elevation. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/security.c | 263 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 263 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=133e061244be0800fd04…

1 0

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

Feb. 17, 2021

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