June 2021 - Wine-commits - list.winehq.org

Alexandre Julliard : ntdll/tests: Add tests for RtlWow64GetCurrentCpuArea().
by Alexandre Julliard 30 Jun '21

30 Jun '21

Module: wine Branch: master Commit: c9d23a15cef7c8508bc9b82a9247b10a12d4fb49 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c9d23a15cef7c8508bc9b82a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 30 11:12:46 2021 +0200 ntdll/tests: Add tests for RtlWow64GetCurrentCpuArea(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/wow64.c | 130 +++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 127 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/tests/wow64.c b/dlls/ntdll/tests/wow64.c index d31afa373e2..b7b63f3fd8c 100644 --- a/dlls/ntdll/tests/wow64.c +++ b/dlls/ntdll/tests/wow64.c @@ -34,6 +34,7 @@ static NTSTATUS (WINAPI *pNtWow64WriteVirtualMemory64)(HANDLE,ULONG64,const void #endif static BOOL is_wow64; +static void *code_mem; static void init(void) { @@ -54,6 +55,8 @@ static void init(void) GET_PROC( NtWow64WriteVirtualMemory64 ); #endif #undef GET_PROC + + code_mem = VirtualAlloc( NULL, 65536, MEM_RESERVE | MEM_COMMIT, PAGE_EXECUTE_READWRITE ); } static void test_process_architecture( HANDLE process, USHORT expect_machine, USHORT expect_native ) @@ -463,6 +466,52 @@ static void test_cpu_area(void) #else /* _WIN64 */ +static const BYTE call_func64_code[] = +{ + 0x58, /* pop %eax */ + 0x0e, /* push %cs */ + 0x50, /* push %eax */ + 0x6a, 0x33, /* push $0x33 */ + 0xe8, 0x00, 0x00, 0x00, 0x00, /* call 1f */ + 0x83, 0x04, 0x24, 0x05, /* 1: addl $0x5,(%esp) */ + 0xcb, /* lret */ + /* in 64-bit mode: */ + 0x4c, 0x87, 0xf4, /* xchg %r14,%rsp */ + 0x55, /* push %rbp */ + 0x48, 0x89, 0xe5, /* mov %rsp,%rbp */ + 0x56, /* push %rsi */ + 0x57, /* push %rdi */ + 0x41, 0x8b, 0x4e, 0x10, /* mov 0x10(%r14),%ecx */ + 0x41, 0x8b, 0x76, 0x14, /* mov 0x14(%r14),%esi */ + 0x67, 0x8d, 0x04, 0xcd, 0, 0, 0, 0, /* lea 0x0(,%ecx,8),%eax */ + 0x83, 0xf8, 0x20, /* cmp $0x20,%eax */ + 0x7d, 0x05, /* jge 1f */ + 0xb8, 0x20, 0x00, 0x00, 0x00, /* mov $0x20,%eax */ + 0x48, 0x29, 0xc4, /* 1: sub %rax,%rsp */ + 0x48, 0x83, 0xe4, 0xf0, /* and $~15,%rsp */ + 0x48, 0x89, 0xe7, /* mov %rsp,%rdi */ + 0xf3, 0x48, 0xa5, /* rep movsq */ + 0x48, 0x8b, 0x0c, 0x24, /* mov (%rsp),%rcx */ + 0x48, 0x8b, 0x54, 0x24, 0x08, /* mov 0x8(%rsp),%rdx */ + 0x4c, 0x8b, 0x44, 0x24, 0x10, /* mov 0x10(%rsp),%r8 */ + 0x4c, 0x8b, 0x4c, 0x24, 0x18, /* mov 0x18(%rsp),%r9 */ + 0x41, 0xff, 0x56, 0x08, /* callq *0x8(%r14) */ + 0x48, 0x8d, 0x65, 0xf0, /* lea -0x10(%rbp),%rsp */ + 0x5f, /* pop %rdi */ + 0x5e, /* pop %rsi */ + 0x5d, /* pop %rbp */ + 0x4c, 0x87, 0xf4, /* xchg %r14,%rsp */ + 0xcb, /* lret */ +}; + +static NTSTATUS call_func64( ULONG64 func64, int nb_args, ULONG64 *args ) +{ + NTSTATUS (WINAPI *func)( ULONG64 func64, int nb_args, ULONG64 *args ) = code_mem; + + memcpy( code_mem, call_func64_code, sizeof(call_func64_code) ); + return func( func64, nb_args, args ); +} + static ULONG64 main_module, ntdll_module, wow64_module, wow64cpu_module, wow64win_module; static void enum_modules64( void (*func)(ULONG64,const WCHAR *) ) @@ -514,6 +563,53 @@ done: NtClose( process ); } +static ULONG64 get_proc_address64( ULONG64 module, const char *name ) +{ + IMAGE_DOS_HEADER dos; + IMAGE_NT_HEADERS64 nt; + IMAGE_EXPORT_DIRECTORY exports; + ULONG i, *names, *funcs; + USHORT *ordinals; + NTSTATUS status; + HANDLE process; + ULONG64 ret = 0; + char buffer[64]; + + if (!module) return 0; + process = OpenProcess( PROCESS_ALL_ACCESS, FALSE, GetCurrentProcessId() ); + ok( process != 0, "failed to open current process %u\n", GetLastError() ); + status = pNtWow64ReadVirtualMemory64( process, module, &dos, sizeof(dos), NULL ); + ok( !status, "NtWow64ReadVirtualMemory64 failed %x\n", status ); + status = pNtWow64ReadVirtualMemory64( process, module + dos.e_lfanew, &nt, sizeof(nt), NULL ); + ok( !status, "NtWow64ReadVirtualMemory64 failed %x\n", status ); + status = pNtWow64ReadVirtualMemory64( process, module + nt.OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_EXPORT].VirtualAddress, + &exports, sizeof(exports), NULL ); + ok( !status, "NtWow64ReadVirtualMemory64 failed %x\n", status ); + names = calloc( exports.NumberOfNames, sizeof(*names) ); + ordinals = calloc( exports.NumberOfNames, sizeof(*ordinals) ); + funcs = calloc( exports.NumberOfFunctions, sizeof(*funcs) ); + status = pNtWow64ReadVirtualMemory64( process, module + exports.AddressOfNames, + names, exports.NumberOfNames * sizeof(*names), NULL ); + ok( !status, "NtWow64ReadVirtualMemory64 failed %x\n", status ); + status = pNtWow64ReadVirtualMemory64( process, module + exports.AddressOfNameOrdinals, + ordinals, exports.NumberOfNames * sizeof(*ordinals), NULL ); + ok( !status, "NtWow64ReadVirtualMemory64 failed %x\n", status ); + status = pNtWow64ReadVirtualMemory64( process, module + exports.AddressOfFunctions, + funcs, exports.NumberOfFunctions * sizeof(*funcs), NULL ); + ok( !status, "NtWow64ReadVirtualMemory64 failed %x\n", status ); + for (i = 0; i < exports.NumberOfNames && !ret; i++) + { + status = pNtWow64ReadVirtualMemory64( process, module + names[i], buffer, sizeof(buffer), NULL ); + ok( !status, "NtWow64ReadVirtualMemory64 failed %x\n", status ); + if (!strcmp( buffer, name )) ret = module + funcs[ordinals[i]]; + } + free( funcs ); + free( ordinals ); + free( names ); + NtClose( process ); + return ret; +} + static void check_module( ULONG64 base, const WCHAR *name ) { if (base == (ULONG_PTR)GetModuleHandleW(0)) @@ -650,6 +746,35 @@ static void test_nt_wow64(void) NtClose( process ); } +static void test_cpu_area(void) +{ + TEB64 *teb64 = (TEB64 *)NtCurrentTeb()->GdiBatchCount; + ULONG64 ptr; + NTSTATUS status; + + if (!is_wow64) return; + if (!ntdll_module) return; + + if ((ptr = get_proc_address64( ntdll_module, "RtlWow64GetCurrentCpuArea" ))) + { + USHORT machine = 0xdead; + ULONG64 context, context_ex; + ULONG64 args[] = { (ULONG_PTR)&machine, (ULONG_PTR)&context, (ULONG_PTR)&context_ex }; + + status = call_func64( ptr, ARRAY_SIZE(args), args ); + ok( !status, "RtlWow64GetCpuAreaInfo failed %x\n", status ); + ok( machine == IMAGE_FILE_MACHINE_I386, "wrong machine %x\n", machine ); + ok( context == teb64->TlsSlots[WOW64_TLS_CPURESERVED] + 4, "wrong context %s / %s\n", + wine_dbgstr_longlong(context), wine_dbgstr_longlong(teb64->TlsSlots[WOW64_TLS_CPURESERVED]) ); + ok( !context_ex, "got context_ex %s\n", wine_dbgstr_longlong(context_ex) ); + args[0] = args[1] = args[2] = 0; + status = call_func64( ptr, ARRAY_SIZE(args), args ); + ok( !status, "RtlWow64GetCpuAreaInfo failed %x\n", status ); + } + else win_skip( "RtlWow64GetCpuAreaInfo not supported\n" ); + +} + #endif /* _WIN64 */ @@ -658,10 +783,9 @@ START_TEST(wow64) init(); test_query_architectures(); test_peb_teb(); -#ifdef _WIN64 - test_cpu_area(); -#else +#ifndef _WIN64 test_nt_wow64(); test_modules(); #endif + test_cpu_area(); }

1 0

Alexandre Julliard : ntdll: Implement RtlWow64GetCurrentCpuArea().
by Alexandre Julliard 30 Jun '21

30 Jun '21

Module: wine Branch: master Commit: 17716bc7f325e5f7606c74c0af8d425b98e60054 URL: https://source.winehq.org/git/wine.git/?a=commit;h=17716bc7f325e5f7606c74c0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 30 11:16:01 2021 +0200 ntdll: Implement RtlWow64GetCurrentCpuArea(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/process.c | 18 ++++++++++++++++++ include/winternl.h | 1 + 3 files changed, 20 insertions(+) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 0e1706f2dd2..42de54c895e 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1075,6 +1075,7 @@ @ stdcall RtlWow64EnableFsRedirection(long) @ stdcall RtlWow64EnableFsRedirectionEx(long ptr) @ stdcall -arch=win64 RtlWow64GetCpuAreaInfo(ptr long ptr) +@ stdcall -arch=win64 RtlWow64GetCurrentCpuArea(ptr ptr ptr) @ stdcall RtlWow64GetCurrentMachine() @ stdcall RtlWow64GetProcessMachines(long ptr ptr) @ stdcall -arch=win64 RtlWow64GetThreadContext(long ptr) diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index 3ed31e22100..e8b7785ce31 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -143,6 +143,24 @@ NTSTATUS WINAPI RtlWow64GetCpuAreaInfo( WOW64_CPURESERVED *cpu, ULONG reserved, } +/********************************************************************** + * RtlWow64GetCurrentCpuArea (NTDLL.@) + */ +NTSTATUS WINAPI RtlWow64GetCurrentCpuArea( USHORT *machine, void **context, void **context_ex ) +{ + WOW64_CPU_AREA_INFO info; + NTSTATUS status; + + if (!(status = RtlWow64GetCpuAreaInfo( NtCurrentTeb()->TlsSlots[WOW64_TLS_CPURESERVED], 0, &info ))) + { + if (machine) *machine = info.Machine; + if (context) *context = info.Context; + if (context_ex) *context_ex = *(void **)info.ContextEx; + } + return status; +} + + /****************************************************************************** * RtlWow64GetThreadContext (NTDLL.@) */ diff --git a/include/winternl.h b/include/winternl.h index 71be1f5816d..b07a5465d86 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -4404,6 +4404,7 @@ NTSYSAPI int __cdecl _strnicmp(LPCSTR,LPCSTR,size_t); #ifdef _WIN64 NTSYSAPI NTSTATUS WINAPI RtlWow64GetCpuAreaInfo(WOW64_CPURESERVED*,ULONG,WOW64_CPU_AREA_INFO*); +NTSYSAPI NTSTATUS WINAPI RtlWow64GetCurrentCpuArea(USHORT*,void**,void**); NTSYSAPI NTSTATUS WINAPI RtlWow64GetThreadContext(HANDLE,WOW64_CONTEXT*); NTSYSAPI NTSTATUS WINAPI RtlWow64SetThreadContext(HANDLE,const WOW64_CONTEXT*); #else

1 0

Zebediah Figura : advapi32/tests: Test the type and impersonation level of a linked token.
by Alexandre Julliard 30 Jun '21

30 Jun '21

Module: wine Branch: master Commit: 2cbed066096794b06bcbecd7db9975c50605d176 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2cbed066096794b06bcbecd7… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jun 30 00:01:05 2021 -0500 advapi32/tests: Test the type and impersonation level of a linked token. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/security.c | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 77748abe9ec..d39aaba7323 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -8139,6 +8139,12 @@ static void test_elevation(void) ret = GetTokenInformation(linked.LinkedToken, TokenElevation, &elevation, sizeof(elevation), &size); ok(ret, "got error %u\n", GetLastError()); ok(elevation.TokenIsElevated == TRUE, "got elevation %#x\n", elevation.TokenIsElevated); + ret = GetTokenInformation(linked.LinkedToken, TokenType, &type, sizeof(type), &size); + ok(ret, "got error %u\n", GetLastError()); + ok(type == TokenImpersonation, "got type %#x\n", type); + ret = GetTokenInformation(linked.LinkedToken, TokenImpersonationLevel, &type, sizeof(type), &size); + ok(ret, "got error %u\n", GetLastError()); + ok(type == SecurityIdentification, "got impersonation level %#x\n", type); /* Asking for the linked token again gives us a different token. */ ret = GetTokenInformation(token, TokenLinkedToken, &linked2, sizeof(linked2), &size); @@ -8194,6 +8200,12 @@ static void test_elevation(void) ret = GetTokenInformation(linked.LinkedToken, TokenElevation, &elevation, sizeof(elevation), &size); ok(ret, "got error %u\n", GetLastError()); ok(elevation.TokenIsElevated == FALSE, "got elevation %#x\n", elevation.TokenIsElevated); + ret = GetTokenInformation(linked.LinkedToken, TokenType, &type, sizeof(type), &size); + ok(ret, "got error %u\n", GetLastError()); + todo_wine ok(type == TokenImpersonation, "got type %#x\n", type); + ret = GetTokenInformation(linked.LinkedToken, TokenImpersonationLevel, &type, sizeof(type), &size); + todo_wine ok(ret, "got error %u\n", GetLastError()); + ok(type == SecurityIdentification, "got impersonation level %#x\n", type); /* Asking for the linked token again gives us a different token. */ ret = GetTokenInformation(token, TokenLinkedToken, &linked2, sizeof(linked2), &size); @@ -8249,10 +8261,18 @@ static void test_elevation(void) ret = GetTokenInformation(token2, TokenLinkedToken, &linked, sizeof(linked), &size); ok(ret, "got error %u\n", GetLastError()); if (type == TokenElevationTypeDefault) + { ok(!linked.LinkedToken, "expected no linked token\n"); + ret = GetTokenInformation(linked.LinkedToken, TokenType, &type, sizeof(type), &size); + ok(ret, "got error %u\n", GetLastError()); + ok(type == TokenImpersonation, "got type %#x\n", type); + ret = GetTokenInformation(linked.LinkedToken, TokenImpersonationLevel, &type, sizeof(type), &size); + ok(ret, "got error %u\n", GetLastError()); + ok(type == SecurityIdentification, "got impersonation level %#x\n", type); + CloseHandle(linked.LinkedToken); + } else ok(!!linked.LinkedToken, "expected a linked token\n"); - CloseHandle(linked.LinkedToken); CloseHandle(token2); ret = CreateRestrictedToken(token, 0, 0, NULL, 0, NULL, 0, NULL, &token2);

1 0

Huw Davies : nsiproxy: Introduce IOCTL_NSIPROXY_WINE_ENUMERATE_ALL.
by Alexandre Julliard 29 Jun '21

29 Jun '21

Module: wine Branch: master Commit: a907a141a938fc5afb546787c5482e681b7c3e54 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a907a141a938fc5afb546787… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jun 29 08:04:21 2021 +0100 nsiproxy: Introduce IOCTL_NSIPROXY_WINE_ENUMERATE_ALL. This differs from native, which passes struct nsi_enumerate_all_ex directly and relies on the kernel being able to access the user-space addresses. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/nsiproxy.sys/Makefile.in | 3 +- dlls/nsiproxy.sys/device.c | 54 ++++++++++++++++++++++++++++++++++++ dlls/nsiproxy.sys/nsi.c | 38 +++++++++++++++++++++++++ dlls/nsiproxy.sys/nsiproxy_private.h | 21 ++++++++++++++ include/wine/nsi.h | 20 +++++++++++++ 5 files changed, 135 insertions(+), 1 deletion(-) diff --git a/dlls/nsiproxy.sys/Makefile.in b/dlls/nsiproxy.sys/Makefile.in index d1913671f49..f382689d463 100644 --- a/dlls/nsiproxy.sys/Makefile.in +++ b/dlls/nsiproxy.sys/Makefile.in @@ -3,4 +3,5 @@ IMPORTS = ntoskrnl EXTRADLLFLAGS = -Wl,--subsystem,native C_SRCS = \ - device.c + device.c \ + nsi.c diff --git a/dlls/nsiproxy.sys/device.c b/dlls/nsiproxy.sys/device.c index ecd584bd1cb..4ce5ddd6d83 100644 --- a/dlls/nsiproxy.sys/device.c +++ b/dlls/nsiproxy.sys/device.c @@ -28,10 +28,60 @@ #include "winternl.h" #include "winioctl.h" #include "ddk/wdm.h" +#include "ifdef.h" +#include "netiodef.h" +#include "wine/nsi.h" #include "wine/debug.h" +#include "nsiproxy_private.h" WINE_DEFAULT_DEBUG_CHANNEL(nsi); +static void nsiproxy_enumerate_all( IRP *irp ) +{ + IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp ); + struct nsiproxy_enumerate_all *in = (struct nsiproxy_enumerate_all *)irp->AssociatedIrp.SystemBuffer; + DWORD in_len = irpsp->Parameters.DeviceIoControl.InputBufferLength; + void *out = irp->AssociatedIrp.SystemBuffer; + DWORD out_len = irpsp->Parameters.DeviceIoControl.OutputBufferLength; + struct nsi_enumerate_all_ex enum_all; + + if (in_len != sizeof(*in)) + { + irp->IoStatus.u.Status = STATUS_INVALID_PARAMETER; + return; + } + + if (out_len < sizeof(DWORD) + (in->key_size + in->rw_size + in->dynamic_size + in->static_size) * in->count) + { + irp->IoStatus.u.Status = STATUS_INVALID_PARAMETER; + return; + } + + enum_all.unknown[0] = 0; + enum_all.unknown[1] = 0; + enum_all.first_arg = in->first_arg; + enum_all.second_arg = in->second_arg; + enum_all.module = &in->module; + enum_all.table = in->table; + enum_all.key_data = (BYTE *)out + sizeof(DWORD); + enum_all.key_size = in->key_size; + enum_all.rw_data = (BYTE *)enum_all.key_data + in->key_size * in->count; + enum_all.rw_size = in->rw_size; + enum_all.dynamic_data = (BYTE *)enum_all.rw_data + in->rw_size * in->count; + enum_all.dynamic_size = in->dynamic_size; + enum_all.static_data = (BYTE *)enum_all.dynamic_data + in->dynamic_size * in->count; + enum_all.static_size = in->static_size; + enum_all.count = in->count; + + irp->IoStatus.u.Status = nsi_enumerate_all_ex( &enum_all ); + if (irp->IoStatus.u.Status == STATUS_SUCCESS || irp->IoStatus.u.Status == STATUS_MORE_ENTRIES) + { + irp->IoStatus.Information = out_len; + *(DWORD *)out = enum_all.count; + } + else irp->IoStatus.Information = 0; +} + static NTSTATUS WINAPI nsi_ioctl( DEVICE_OBJECT *device, IRP *irp ) { IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp ); @@ -43,6 +93,10 @@ static NTSTATUS WINAPI nsi_ioctl( DEVICE_OBJECT *device, IRP *irp ) switch (irpsp->Parameters.DeviceIoControl.IoControlCode) { + case IOCTL_NSIPROXY_WINE_ENUMERATE_ALL: + nsiproxy_enumerate_all( irp ); + break; + default: FIXME( "ioctl %x not supported\n", irpsp->Parameters.DeviceIoControl.IoControlCode ); irp->IoStatus.u.Status = STATUS_NOT_SUPPORTED; diff --git a/dlls/nsiproxy.sys/nsi.c b/dlls/nsiproxy.sys/nsi.c new file mode 100644 index 00000000000..7ff36c093ba --- /dev/null +++ b/dlls/nsiproxy.sys/nsi.c @@ -0,0 +1,38 @@ +/* + * nsiproxy.sys + * + * Copyright 2021 Huw Davies + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "windef.h" +#include "winbase.h" +#include "winternl.h" +#include "winioctl.h" +#include "ddk/wdm.h" +#include "ifdef.h" +#include "netiodef.h" +#include "wine/nsi.h" +#include "nsiproxy_private.h" + +NTSTATUS nsi_enumerate_all_ex( struct nsi_enumerate_all_ex *params ) +{ + return STATUS_NOT_IMPLEMENTED; +} diff --git a/dlls/nsiproxy.sys/nsiproxy_private.h b/dlls/nsiproxy.sys/nsiproxy_private.h new file mode 100644 index 00000000000..19b520d17cc --- /dev/null +++ b/dlls/nsiproxy.sys/nsiproxy_private.h @@ -0,0 +1,21 @@ +/* + * nsiproxy.sys + * + * Copyright 2021 Huw Davies + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +NTSTATUS nsi_enumerate_all_ex( struct nsi_enumerate_all_ex *params ) DECLSPEC_HIDDEN; diff --git a/include/wine/nsi.h b/include/wine/nsi.h index 31ece41d22f..799485fc284 100644 --- a/include/wine/nsi.h +++ b/include/wine/nsi.h @@ -19,6 +19,8 @@ #ifndef __WINE_NSI_H #define __WINE_NSI_H +#include "winioctl.h" + /* Undocumented NSI NDIS tables */ #define NSI_NDIS_IFINFO_TABLE 0 #define NSI_NDIS_INDEX_LUID_TABLE 2 @@ -92,6 +94,24 @@ struct nsi_ndis_ifinfo_static DWORD phys_medium_type; }; +/* Wine specific ioctl interface */ + +#define IOCTL_NSIPROXY_WINE_ENUMERATE_ALL CTL_CODE(FILE_DEVICE_NETWORK, 0x400, METHOD_BUFFERED, 0) + +/* input for IOCTL_NSIPROXY_WINE_ENUMERATE_ALL */ +struct nsiproxy_enumerate_all +{ + NPI_MODULEID module; + DWORD first_arg; + DWORD second_arg; + DWORD table; + DWORD key_size; + DWORD rw_size; + DWORD dynamic_size; + DWORD static_size; + DWORD count; +}; + /* Undocumented Nsi api */ #define NSI_PARAM_TYPE_RW 0

1 0

Huw Davies : nsi: Implement NsiEnumerateObjectsAllParameterEx().
by Alexandre Julliard 29 Jun '21

29 Jun '21

Module: wine Branch: master Commit: bc4db065c06764e0488e965134283131200bc33b URL: https://source.winehq.org/git/wine.git/?a=commit;h=bc4db065c06764e0488e9651… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jun 29 08:04:22 2021 +0100 nsi: Implement NsiEnumerateObjectsAllParameterEx(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/nsi/nsi.c | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 53 insertions(+), 2 deletions(-) diff --git a/dlls/nsi/nsi.c b/dlls/nsi/nsi.c index d3292af9ee3..981fcdba954 100644 --- a/dlls/nsi/nsi.c +++ b/dlls/nsi/nsi.c @@ -25,10 +25,16 @@ #include "iptypes.h" #include "netiodef.h" #include "wine/nsi.h" +#include "wine/heap.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(nsi); +static inline HANDLE get_nsi_device( void ) +{ + return CreateFileW( L"\\\\.\\Nsi", 0, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, NULL ); +} + DWORD WINAPI NsiAllocateAndGetTable( DWORD unk, const NPI_MODULEID *module, DWORD table, void **key_data, DWORD key_size, void **rw_data, DWORD rw_size, void **dynamic_data, DWORD dynamic_size, void **static_data, DWORD static_size, DWORD *count, DWORD unk2 ) @@ -46,7 +52,7 @@ DWORD WINAPI NsiEnumerateObjectsAllParameters( DWORD unk, DWORD unk2, const NPI_ struct nsi_enumerate_all_ex params; DWORD err; - FIXME( "%d %d %p %d %p %d %p %d %p %d %p %d %p: stub\n", unk, unk2, module, table, key_data, key_size, + TRACE( "%d %d %p %d %p %d %p %d %p %d %p %d %p\n", unk, unk2, module, table, key_data, key_size, rw_data, rw_size, dynamic_data, dynamic_size, static_data, static_size, count ); params.unknown[0] = 0; @@ -72,7 +78,52 @@ DWORD WINAPI NsiEnumerateObjectsAllParameters( DWORD unk, DWORD unk2, const NPI_ DWORD WINAPI NsiEnumerateObjectsAllParametersEx( struct nsi_enumerate_all_ex *params ) { - return ERROR_CALL_NOT_IMPLEMENTED; + DWORD out_size, received, err = ERROR_SUCCESS; + HANDLE device = get_nsi_device(); + struct nsiproxy_enumerate_all in; + BYTE *out, *ptr; + + if (device == INVALID_HANDLE_VALUE) return GetLastError(); + + out_size = sizeof(DWORD) + + (params->key_size + params->rw_size + params->dynamic_size + params->static_size) * params->count; + + out = heap_alloc( out_size ); + if (!out) + { + CloseHandle( device ); + return ERROR_OUTOFMEMORY; + } + + in.module = *params->module; + in.first_arg = params->first_arg; + in.second_arg = params->second_arg; + in.table = params->table; + in.key_size = params->key_size; + in.rw_size = params->rw_size; + in.dynamic_size = params->dynamic_size; + in.static_size = params->static_size; + in.count = params->count; + + if (!DeviceIoControl( device, IOCTL_NSIPROXY_WINE_ENUMERATE_ALL, &in, sizeof(in), out, out_size, &received, NULL )) + err = GetLastError(); + if (err == ERROR_SUCCESS || err == ERROR_MORE_DATA) + { + params->count = *(DWORD *)out; + ptr = out + sizeof(DWORD); + if (params->key_size) memcpy( params->key_data, ptr, params->key_size * params->count ); + ptr += params->key_size * in.count; + if (params->rw_size) memcpy( params->rw_data, ptr, params->rw_size * params->count ); + ptr += params->rw_size * in.count; + if (params->dynamic_size) memcpy( params->dynamic_data, ptr, params->dynamic_size * params->count ); + ptr += params->dynamic_size * in.count; + if (params->static_size) memcpy( params->static_data, ptr, params->static_size * params->count ); + } + + heap_free( out ); + CloseHandle( device ); + + return err; } void WINAPI NsiFreeTable( void *key_data, void *rw_data, void *dynamic_data, void *static_data )

1 0

Jacek Caban : gdi32/tests: Add metafile file creation tests.
by Alexandre Julliard 29 Jun '21

29 Jun '21

Module: wine Branch: master Commit: d19ac108f91d19f7dd06bb48a1c00dfaa07fd387 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d19ac108f91d19f7dd06bb48… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 29 13:41:30 2021 +0200 gdi32/tests: Add metafile file creation tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/metafile.c | 171 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 171 insertions(+) diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index 062eb4c8a44..dcd6cea0c2b 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -3015,6 +3015,175 @@ static void test_mf_Blank(void) ok( ret, "DeleteMetaFile(%p) error %d\n", hMetafile, GetLastError()); } +static void test_metafile_file(void) +{ + char temp_path[MAX_PATH]; + char mf_name[MAX_PATH]; + char buf[4096]; + HMETAFILE metafile; + POINT oldpoint; + DWORD size; + HANDLE file; + HDC dc; + BOOL ret; + + GetTempPathA(MAX_PATH, temp_path); + GetTempFileNameA(temp_path, "wmf", 0, mf_name); + + dc = CreateMetaFileA(mf_name); + ok(dc != 0, "CreateMetaFileA(NULL) error %d\n", GetLastError()); + + file = CreateFileA(mf_name, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, + OPEN_EXISTING, 0, NULL); + ok(file == INVALID_HANDLE_VALUE && GetLastError() == ERROR_SHARING_VIOLATION, + "CreateFile returned: %p %u\n", file, GetLastError()); + + file = CreateFileA(mf_name, 0, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, + OPEN_EXISTING, 0, NULL); + ok(file != INVALID_HANDLE_VALUE, "CreateFile failed: %u\n", GetLastError()); + + size = GetFileSize(file, NULL); + todo_wine + ok(!size, "size = %u\n", size); + + ret = MoveToEx(dc, 1, 1, NULL); + ok( ret, "MoveToEx error %d.\n", GetLastError()); + ret = LineTo(dc, 2, 2); + ok( ret, "LineTo error %d.\n", GetLastError()); + ret = MoveToEx(dc, 1, 1, &oldpoint); + ok( ret, "MoveToEx error %d.\n", GetLastError()); + ret = Ellipse(dc, 0, 0, 2, 2); + ok( ret, "Ellipse error %d.\n", GetLastError()); + + size = GetFileSize(file, NULL); + todo_wine + ok(!size, "size = %u\n", size); + + metafile = CloseMetaFile(dc); + size = GetFileSize(file, NULL); + ok(size == sizeof(MF_GRAPHICS_BITS), "size = %u\n", size); + + CloseHandle(file); + file = CreateFileA(mf_name, GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, + OPEN_EXISTING, 0, NULL); + todo_wine + ok(file == INVALID_HANDLE_VALUE && GetLastError() == ERROR_SHARING_VIOLATION, + "CreateFile returned: %p %u\n", file, GetLastError()); + if (file != INVALID_HANDLE_VALUE) CloseHandle(file); + file = CreateFileA(mf_name, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, + OPEN_EXISTING, 0, NULL); + ok(file != INVALID_HANDLE_VALUE, "CreateFile failed: %u\n", GetLastError()); + ret = ReadFile(file, buf, sizeof(buf), &size, NULL); + ok(ret, "ReadFile failed: %u\n", GetLastError()); + ok(size == sizeof(MF_GRAPHICS_BITS), "size = %u\n", size); + ok(!memcmp(buf, MF_GRAPHICS_BITS, sizeof(MF_GRAPHICS_BITS)), "unexpected file content\n"); + CloseHandle(file); + + if (compare_mf_bits(metafile, MF_GRAPHICS_BITS, sizeof(MF_GRAPHICS_BITS), "mf_Graphics") != 0) + { + dump_mf_bits(metafile, "mf_Graphics"); + EnumMetaFile(0, metafile, mf_enum_proc, 0); + } + + DeleteMetaFile(metafile); + + SetLastError(0xdeadbeef); + metafile = CloseMetaFile(dc); + todo_wine + ok(!metafile && GetLastError() == ERROR_INVALID_HANDLE, "CloseMetaFile returned %p (%u)\n", + metafile, GetLastError()); + + ret = DeleteFileA(mf_name); + ok(ret, "Could not delete file: %u\n", GetLastError()); +} + +static void test_enhmetafile_file(void) +{ + char temp_path[MAX_PATH]; + char mf_name[MAX_PATH]; + char buf[4096]; + HENHMETAFILE metafile; + POINT pts[4]; + DWORD size; + HANDLE file; + HDC dc; + BOOL ret; + + GetTempPathA(MAX_PATH, temp_path); + GetTempFileNameA(temp_path, "wmf", 0, mf_name); + + dc = CreateEnhMetaFileA(NULL, mf_name, NULL, NULL); + ok(dc != 0, "CreateMetaFileA(NULL) error %d\n", GetLastError()); + + file = CreateFileA(mf_name, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, + OPEN_EXISTING, 0, NULL); + ok(file == INVALID_HANDLE_VALUE && GetLastError() == ERROR_SHARING_VIOLATION, + "CreateFile returned: %p %u\n", file, GetLastError()); + + file = CreateFileA(mf_name, 0, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, + OPEN_EXISTING, 0, NULL); + ok(file != INVALID_HANDLE_VALUE, "CreateFile failed: %u\n", GetLastError()); + + size = GetFileSize(file, NULL); + todo_wine + ok(!size, "size = %u\n", size); + + pts[0].x = pts[0].y = 10; + pts[1].x = pts[1].y = 20; + pts[2].x = pts[2].y = 15; + pts[3].x = pts[3].y = 25; + ret = PolyBezierTo(dc, pts, 3); /* EMR_POLYBEZIERTO16 */ + ok( ret, "PolyBezierTo failed\n" ); + ret = PolyBezier(dc, pts, 4); /* EMR_POLYBEZIER16 */ + ok( ret, "PolyBezier failed\n" ); + + pts[0].x = pts[0].y = 32769; + ret = PolyBezier(dc, pts, 4); /* EMR_POLYBEZIER */ + ok( ret, "PolyBezier failed\n" ); + ret = PolyBezierTo(dc, pts, 3); /* EMR_POLYBEZIERTO */ + ok( ret, "PolyBezierTo failed\n" ); + + size = GetFileSize(file, NULL); + todo_wine + ok(!size, "size = %u\n", size); + + metafile = CloseEnhMetaFile(dc); + size = GetFileSize(file, NULL); + ok(size == sizeof(EMF_BEZIER_BITS), "size = %u\n", size); + + CloseHandle(file); + file = CreateFileA(mf_name, GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, + OPEN_EXISTING, 0, NULL); + todo_wine + ok(file == INVALID_HANDLE_VALUE && GetLastError() == ERROR_SHARING_VIOLATION, + "CreateFile returned: %p %u\n", file, GetLastError()); + if (file != INVALID_HANDLE_VALUE) CloseHandle(file); + file = CreateFileA(mf_name, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, + OPEN_EXISTING, 0, NULL); + ok(file != INVALID_HANDLE_VALUE, "CreateFile failed: %u\n", GetLastError()); + ret = ReadFile(file, buf, sizeof(buf), &size, NULL); + ok(ret, "ReadFile failed: %u\n", GetLastError()); + ok(size == sizeof(EMF_BEZIER_BITS), "size = %u\n", size); + CloseHandle(file); + + if (compare_emf_bits(metafile, EMF_BEZIER_BITS, sizeof(EMF_BEZIER_BITS), "emf_Bezier", FALSE) != 0) + { + dump_emf_bits(metafile, "emf_Bezier"); + dump_emf_records(metafile, "emf_Bezier"); + } + + DeleteEnhMetaFile(metafile); + + SetLastError(0xdeadbeef); + metafile = CloseEnhMetaFile(dc); + todo_wine + ok(!metafile && GetLastError() == ERROR_INVALID_HANDLE, "CloseMetaFile returned %p (%u)\n", + metafile, GetLastError()); + + ret = DeleteFileA(mf_name); + ok(ret, "Could not delete file: %u\n", GetLastError()); +} + static void test_CopyMetaFile(void) { HDC hdcMetafile; @@ -6107,6 +6276,7 @@ START_TEST(metafile) test_emf_GradientFill(); test_emf_WorldTransform(); test_emf_text_extents(); + test_enhmetafile_file(); /* For win-format metafiles (mfdrv) */ test_mf_SaveDC(); @@ -6120,6 +6290,7 @@ START_TEST(metafile) test_mf_clipping(); test_mf_GetPath(); test_mf_SetLayout(); + test_metafile_file(); /* For metafile conversions */ test_mf_conversions();

1 0

Jacek Caban : gdi32: Delay writing metafile file until CloseMetaFile is called.
by Alexandre Julliard 29 Jun '21

29 Jun '21

Module: wine Branch: master Commit: 0c9bc0ed6bc616c50e020552a93233e64e8a9262 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c9bc0ed6bc616c50e020552… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 29 13:41:41 2021 +0200 gdi32: Delay writing metafile file until CloseMetaFile is called. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/mfdrv/init.c | 50 +++++++++++---------------------------------- dlls/gdi32/tests/metafile.c | 2 -- 2 files changed, 12 insertions(+), 40 deletions(-) diff --git a/dlls/gdi32/mfdrv/init.c b/dlls/gdi32/mfdrv/init.c index fe7aae631d7..d64e754da84 100644 --- a/dlls/gdi32/mfdrv/init.c +++ b/dlls/gdi32/mfdrv/init.c @@ -325,7 +325,6 @@ HDC WINAPI CreateMetaFileW( LPCWSTR filename ) DC *dc; METAFILEDRV_PDEVICE *physDev; HANDLE hFile; - DWORD bytes_written; TRACE("%s\n", debugstr_w(filename) ); @@ -340,12 +339,6 @@ HDC WINAPI CreateMetaFileW( LPCWSTR filename ) free_dc_ptr( dc ); return 0; } - if (!WriteFile( hFile, physDev->mh, sizeof(*physDev->mh), - &bytes_written, NULL )) { - free_dc_ptr( dc ); - CloseHandle (hFile ); - return 0; - } physDev->hFile = hFile; /* Grow METAHEADER to include filename */ @@ -422,19 +415,13 @@ static DC *MFDRV_CloseMetaFile( HDC hdc ) if (physDev->mh->mtType == METAFILE_DISK) /* disk based metafile */ { - if (SetFilePointer(physDev->hFile, 0, NULL, FILE_BEGIN) != 0) { - free_dc_ptr( dc ); - return 0; - } - physDev->mh->mtType = METAFILE_MEMORY; /* This is what windows does */ - if (!WriteFile(physDev->hFile, physDev->mh, sizeof(*physDev->mh), + if (!WriteFile(physDev->hFile, physDev->mh, physDev->mh->mtSize * 2, &bytes_written, NULL)) { free_dc_ptr( dc ); return 0; } CloseHandle(physDev->hFile); - physDev->mh->mtType = METAFILE_DISK; } return dc; @@ -481,32 +468,19 @@ BOOL MFDRV_WriteRecord( PHYSDEV dev, METARECORD *mr, DWORD rlen) METAHEADER *mh; METAFILEDRV_PDEVICE *physDev = (METAFILEDRV_PDEVICE *)dev; - switch(physDev->mh->mtType) + len = physDev->mh->mtSize * 2 + rlen; + /* reallocate memory if needed */ + size = HeapSize( GetProcessHeap(), 0, physDev->mh ); + if (len > size) { - case METAFILE_MEMORY: - len = physDev->mh->mtSize * 2 + rlen; - /* reallocate memory if needed */ - size = HeapSize( GetProcessHeap(), 0, physDev->mh ); - if (len > size) - { - /*expand size*/ - size += size / 2 + rlen; - mh = HeapReAlloc( GetProcessHeap(), 0, physDev->mh, size); - if (!mh) return FALSE; - physDev->mh = mh; - TRACE("Reallocated metafile: new size is %d\n",size); - } - memcpy((WORD *)physDev->mh + physDev->mh->mtSize, mr, rlen); - break; - case METAFILE_DISK: - TRACE("Writing record to disk\n"); - if (!WriteFile(physDev->hFile, mr, rlen, NULL, NULL)) - return FALSE; - break; - default: - ERR("Unknown metafile type %d\n", physDev->mh->mtType ); - return FALSE; + /*expand size*/ + size += size / 2 + rlen; + mh = HeapReAlloc( GetProcessHeap(), 0, physDev->mh, size); + if (!mh) return FALSE; + physDev->mh = mh; + TRACE("Reallocated metafile: new size is %d\n",size); } + memcpy((WORD *)physDev->mh + physDev->mh->mtSize, mr, rlen); physDev->mh->mtSize += rlen / 2; physDev->mh->mtMaxRecord = max(physDev->mh->mtMaxRecord, rlen / 2); diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index dcd6cea0c2b..a3b51418ab7 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -3043,7 +3043,6 @@ static void test_metafile_file(void) ok(file != INVALID_HANDLE_VALUE, "CreateFile failed: %u\n", GetLastError()); size = GetFileSize(file, NULL); - todo_wine ok(!size, "size = %u\n", size); ret = MoveToEx(dc, 1, 1, NULL); @@ -3056,7 +3055,6 @@ static void test_metafile_file(void) ok( ret, "Ellipse error %d.\n", GetLastError()); size = GetFileSize(file, NULL); - todo_wine ok(!size, "size = %u\n", size); metafile = CloseMetaFile(dc);

1 0

Jacek Caban : gdi32: Remove no longer used disk-based metafile special-cases.
by Alexandre Julliard 29 Jun '21

29 Jun '21

Module: wine Branch: master Commit: 80aed7cae6fe88c10af73c5550f0157093ff8bc0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=80aed7cae6fe88c10af73c55… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 29 13:41:58 2021 +0200 gdi32: Remove no longer used disk-based metafile special-cases. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/gdi_private.h | 1 - dlls/gdi32/metafile.c | 79 ++---------------------------------------------- dlls/gdi32/mfdrv/init.c | 10 ++---- 3 files changed, 5 insertions(+), 85 deletions(-) diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 71493c185b6..62fd9045b98 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -464,7 +464,6 @@ extern void lp_to_dp( DC *dc, POINT *points, INT count ) DECLSPEC_HIDDEN; /* metafile.c */ extern HMETAFILE MF_Create_HMETAFILE(METAHEADER *mh) DECLSPEC_HIDDEN; -extern METAHEADER *MF_CreateMetaHeaderDisk(METAHEADER *mr, LPCVOID filename, BOOL unicode ) DECLSPEC_HIDDEN; /* Format of comment record added by GetWinMetaFileBits */ #include <pshpack2.h> diff --git a/dlls/gdi32/metafile.c b/dlls/gdi32/metafile.c index 1c831ef83ef..12fd10c98c9 100644 --- a/dlls/gdi32/metafile.c +++ b/dlls/gdi32/metafile.c @@ -60,15 +60,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(metafile); -#include "pshpack1.h" -typedef struct -{ - DWORD dw1, dw2, dw3; - WORD w4; - CHAR filename[0x100]; -} METAHEADERDISK; -#include "poppack.h" - /****************************************************************** * MF_AddHandle @@ -231,56 +222,6 @@ HMETAFILE WINAPI GetMetaFileW( LPCWSTR lpFilename ) } -/****************************************************************** - * MF_LoadDiskBasedMetaFile - * - * Creates a new memory-based metafile from a disk-based one. - */ -static METAHEADER *MF_LoadDiskBasedMetaFile(METAHEADER *mh) -{ - METAHEADERDISK *mhd; - HANDLE hfile; - METAHEADER *mh2; - - if(mh->mtType != METAFILE_DISK) { - ERR("Not a disk based metafile\n"); - return NULL; - } - mhd = (METAHEADERDISK *)((char *)mh + sizeof(METAHEADER)); - - if((hfile = CreateFileA(mhd->filename, GENERIC_READ, FILE_SHARE_READ, NULL, - OPEN_EXISTING, 0, 0)) == INVALID_HANDLE_VALUE) { - WARN("Can't open file of disk based metafile\n"); - return NULL; - } - mh2 = MF_ReadMetaFile(hfile); - CloseHandle(hfile); - return mh2; -} - -/****************************************************************** - * MF_CreateMetaHeaderDisk - * - * Take a memory based METAHEADER and change it to a disk based METAHEADER - * associated with filename. Note: Trashes contents of old one. - */ -METAHEADER *MF_CreateMetaHeaderDisk(METAHEADER *mh, LPCVOID filename, BOOL uni ) -{ - METAHEADERDISK *mhd; - - mh = HeapReAlloc( GetProcessHeap(), 0, mh, - sizeof(METAHEADER) + sizeof(METAHEADERDISK)); - mh->mtType = METAFILE_DISK; - mhd = (METAHEADERDISK *)((char *)mh + sizeof(METAHEADER)); - - if( uni ) - WideCharToMultiByte(CP_ACP, 0, filename, -1, - mhd->filename, sizeof mhd->filename, NULL, NULL); - else - lstrcpynA( mhd->filename, filename, sizeof mhd->filename ); - return mh; -} - /* return a copy of the metafile bits, to be freed with HeapFree */ static METAHEADER *get_metafile_bits( HMETAFILE hmf ) { @@ -288,13 +229,8 @@ static METAHEADER *get_metafile_bits( HMETAFILE hmf ) if (!mh) return NULL; - if (mh->mtType != METAFILE_DISK) - { - ret = HeapAlloc( GetProcessHeap(), 0, mh->mtSize * 2 ); - if (ret) memcpy( ret, mh, mh->mtSize * 2 ); - } - else ret = MF_LoadDiskBasedMetaFile( mh ); - + ret = HeapAlloc( GetProcessHeap(), 0, mh->mtSize * 2 ); + if (ret) memcpy( ret, mh, mh->mtSize * 2 ); GDI_ReleaseObj( hmf ); return ret; } @@ -1092,16 +1028,7 @@ UINT WINAPI GetMetaFileBitsEx( HMETAFILE hmf, UINT nSize, LPVOID buf ) TRACE("(%p,%d,%p)\n", hmf, nSize, buf); if (!mh) return 0; /* FIXME: error code */ - if(mh->mtType == METAFILE_DISK) - { - mh = MF_LoadDiskBasedMetaFile( mh ); - if (!mh) - { - GDI_ReleaseObj( hmf ); - return 0; - } - mf_copy = TRUE; - } + mfSize = mh->mtSize * 2; if (buf) { diff --git a/dlls/gdi32/mfdrv/init.c b/dlls/gdi32/mfdrv/init.c index d64e754da84..b093e1abd63 100644 --- a/dlls/gdi32/mfdrv/init.c +++ b/dlls/gdi32/mfdrv/init.c @@ -330,22 +330,17 @@ HDC WINAPI CreateMetaFileW( LPCWSTR filename ) if (!(dc = MFDRV_AllocMetaFile())) return 0; physDev = (METAFILEDRV_PDEVICE *)dc->physDev; + physDev->mh->mtType = METAFILE_MEMORY; if (filename) /* disk based metafile */ { - physDev->mh->mtType = METAFILE_DISK; if ((hFile = CreateFileW(filename, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0)) == INVALID_HANDLE_VALUE) { free_dc_ptr( dc ); return 0; } physDev->hFile = hFile; - - /* Grow METAHEADER to include filename */ - physDev->mh = MF_CreateMetaHeaderDisk(physDev->mh, filename, TRUE); } - else /* memory based metafile */ - physDev->mh->mtType = METAFILE_MEMORY; TRACE("returning %p\n", physDev->dev.hdc); ret = physDev->dev.hdc; @@ -413,9 +408,8 @@ static DC *MFDRV_CloseMetaFile( HDC hdc ) return 0; } - if (physDev->mh->mtType == METAFILE_DISK) /* disk based metafile */ + if (physDev->hFile) /* disk based metafile */ { - physDev->mh->mtType = METAFILE_MEMORY; /* This is what windows does */ if (!WriteFile(physDev->hFile, physDev->mh, physDev->mh->mtSize * 2, &bytes_written, NULL)) { free_dc_ptr( dc );

1 0

Jacek Caban : gdi32: Delay writing to enhanced metafile file until CreateEnhMetaFile is called.
by Alexandre Julliard 29 Jun '21

29 Jun '21

Module: wine Branch: master Commit: c359b4a0e96d06defef6c880cfbd4336739a4be2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c359b4a0e96d06defef6c880… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 29 13:42:09 2021 +0200 gdi32: Delay writing to enhanced metafile file until CreateEnhMetaFile is called. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/enhmfdrv/init.c | 41 +++++++++++------------------------------ dlls/gdi32/tests/metafile.c | 2 -- 2 files changed, 11 insertions(+), 32 deletions(-) diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c index 6c41aa88feb..ca50792fb57 100644 --- a/dlls/gdi32/enhmfdrv/init.c +++ b/dlls/gdi32/enhmfdrv/init.c @@ -196,8 +196,7 @@ static BOOL CDECL EMFDRV_DeleteDC( PHYSDEV dev ) */ BOOL EMFDRV_WriteRecord( PHYSDEV dev, EMR *emr ) { - DWORD len; - DWORD bytes_written; + DWORD len, size; ENHMETAHEADER *emh; EMFDRV_PDEVICE *physDev = get_emf_physdev( dev ); @@ -209,21 +208,16 @@ BOOL EMFDRV_WriteRecord( PHYSDEV dev, EMR *emr ) physDev->emh->nBytes += emr->nSize; physDev->emh->nRecords++; - if(physDev->hFile) { - if (!WriteFile(physDev->hFile, emr, emr->nSize, &bytes_written, NULL)) - return FALSE; - } else { - DWORD nEmfSize = HeapSize(GetProcessHeap(), 0, physDev->emh); - len = physDev->emh->nBytes; - if (len > nEmfSize) { - nEmfSize += (nEmfSize / 2) + emr->nSize; - emh = HeapReAlloc(GetProcessHeap(), 0, physDev->emh, nEmfSize); - if (!emh) return FALSE; - physDev->emh = emh; - } - memcpy((CHAR *)physDev->emh + physDev->emh->nBytes - emr->nSize, emr, - emr->nSize); + size = HeapSize(GetProcessHeap(), 0, physDev->emh); + len = physDev->emh->nBytes; + if (len > size) { + size += (size / 2) + emr->nSize; + emh = HeapReAlloc(GetProcessHeap(), 0, physDev->emh, size); + if (!emh) return FALSE; + physDev->emh = emh; } + memcpy((CHAR *)physDev->emh + physDev->emh->nBytes - emr->nSize, emr, + emr->nSize); return TRUE; } @@ -337,7 +331,6 @@ HDC WINAPI CreateEnhMetaFileW( EMFDRV_PDEVICE *physDev; HANDLE hFile; DWORD size = 0, length = 0; - DWORD bytes_written; int cap; TRACE("(%p %s %s %s)\n", hdc, debugstr_w(filename), wine_dbgstr_rect(rect), debugstr_w(description) ); @@ -439,11 +432,6 @@ HDC WINAPI CreateEnhMetaFileW( free_dc_ptr( dc ); return 0; } - if (!WriteFile( hFile, physDev->emh, size, &bytes_written, NULL )) { - free_dc_ptr( dc ); - CloseHandle( hFile ); - return 0; - } physDev->hFile = hFile; } @@ -508,14 +496,7 @@ HENHMETAFILE WINAPI CloseEnhMetaFile(HDC hdc) /* [in] metafile DC */ if (physDev->hFile) /* disk based metafile */ { - if (SetFilePointer(physDev->hFile, 0, NULL, FILE_BEGIN) != 0) - { - CloseHandle( physDev->hFile ); - free_dc_ptr( dc ); - return 0; - } - - if (!WriteFile(physDev->hFile, physDev->emh, sizeof(*physDev->emh), + if (!WriteFile(physDev->hFile, physDev->emh, physDev->emh->nBytes, NULL, NULL)) { CloseHandle( physDev->hFile ); diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index a3b51418ab7..fa00438ddfe 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -3123,7 +3123,6 @@ static void test_enhmetafile_file(void) ok(file != INVALID_HANDLE_VALUE, "CreateFile failed: %u\n", GetLastError()); size = GetFileSize(file, NULL); - todo_wine ok(!size, "size = %u\n", size); pts[0].x = pts[0].y = 10; @@ -3142,7 +3141,6 @@ static void test_enhmetafile_file(void) ok( ret, "PolyBezierTo failed\n" ); size = GetFileSize(file, NULL); - todo_wine ok(!size, "size = %u\n", size); metafile = CloseEnhMetaFile(dc);

1 0

Hans Leidekker : secur32: Use blocking mode for DTLS sessions.
by Alexandre Julliard 29 Jun '21

29 Jun '21

Module: wine Branch: master Commit: b8aaf86b2dbb8ecb3f7094cc40a0df89bb2add27 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b8aaf86b2dbb8ecb3f7094cc… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jun 29 13:56:41 2021 +0200 secur32: Use blocking mode for DTLS sessions. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/schannel.c | 7 +------ dlls/secur32/schannel_gnutls.c | 6 +----- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index 9c7e98b32a4..515f01d08a3 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -879,11 +879,6 @@ static inline SIZE_T read_record_size(const BYTE *buf, SIZE_T header_size) return (buf[header_size - 2] << 8) | buf[header_size - 1]; } -static inline BOOL is_dtls_context(const struct schan_context *ctx) -{ - return (ctx->header_size == HEADER_SIZE_DTLS); -} - /*********************************************************************** * InitializeSecurityContextW */ @@ -1011,7 +1006,7 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextW( return SEC_E_INCOMPLETE_MESSAGE; } } - else if (!is_dtls_context(ctx)) return SEC_E_INCOMPLETE_MESSAGE; + else return SEC_E_INCOMPLETE_MESSAGE; TRACE("Using expected_size %lu.\n", expected_size); } diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index 03124924644..bcf38e3f23f 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -292,10 +292,6 @@ static DWORD CDECL schan_get_enabled_protocols(void) static int pull_timeout(gnutls_transport_ptr_t transport, unsigned int timeout) { - struct schan_transport *t = (struct schan_transport *)transport; - SIZE_T count = 0; - - if (callbacks->get_buffer(t, &t->in, &count)) return 1; return 0; } @@ -309,7 +305,7 @@ static BOOL CDECL schan_create_session(schan_session *session, schan_credentials if (cred->enabled_protocols & (SP_PROT_DTLS1_0_CLIENT | SP_PROT_DTLS1_2_CLIENT)) { - flags |= GNUTLS_DATAGRAM | GNUTLS_NONBLOCK; + flags |= GNUTLS_DATAGRAM; } err = pgnutls_init(s, flags);

1 0