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

Huw Davies : nsiproxy: Create the nsi device.
by Alexandre Julliard June 29, 2021

June 29, 2021

Module: wine Branch: master Commit: 393e953b319ca98bad914d9ddab65995b8e52e95 URL: https://source.winehq.org/git/wine.git/?a=commit;h=393e953b319ca98bad914d9d… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jun 29 08:04:19 2021 +0100 nsiproxy: Create the nsi device. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 + configure.ac | 1 + dlls/nsiproxy.sys/Makefile.in | 6 +++ dlls/nsiproxy.sys/device.c | 87 +++++++++++++++++++++++++++++++++++++ dlls/nsiproxy.sys/nsiproxy.sys.spec | 1 + loader/wine.inf.in | 13 ++++++ 6 files changed, 110 insertions(+) diff --git a/configure b/configure index 789a7e568cb..25089c31e18 100755 --- a/configure +++ b/configure @@ -1526,6 +1526,7 @@ enable_normaliz enable_npmshtml enable_npptools enable_nsi +enable_nsiproxy_sys enable_ntdll enable_ntdsapi enable_ntoskrnl_exe @@ -20822,6 +20823,7 @@ wine_fn_config_makefile dlls/npmshtml enable_npmshtml wine_fn_config_makefile dlls/npptools enable_npptools wine_fn_config_makefile dlls/nsi enable_nsi wine_fn_config_makefile dlls/nsi/tests enable_tests +wine_fn_config_makefile dlls/nsiproxy.sys enable_nsiproxy_sys wine_fn_config_makefile dlls/ntdll enable_ntdll wine_fn_config_makefile dlls/ntdll/tests enable_tests wine_fn_config_makefile dlls/ntdsapi enable_ntdsapi diff --git a/configure.ac b/configure.ac index 6aa5c513a96..5c4f0c8a6cb 100644 --- a/configure.ac +++ b/configure.ac @@ -3498,6 +3498,7 @@ WINE_CONFIG_MAKEFILE(dlls/npmshtml) WINE_CONFIG_MAKEFILE(dlls/npptools) WINE_CONFIG_MAKEFILE(dlls/nsi) WINE_CONFIG_MAKEFILE(dlls/nsi/tests) +WINE_CONFIG_MAKEFILE(dlls/nsiproxy.sys) WINE_CONFIG_MAKEFILE(dlls/ntdll) WINE_CONFIG_MAKEFILE(dlls/ntdll/tests) WINE_CONFIG_MAKEFILE(dlls/ntdsapi) diff --git a/dlls/nsiproxy.sys/Makefile.in b/dlls/nsiproxy.sys/Makefile.in new file mode 100644 index 00000000000..d1913671f49 --- /dev/null +++ b/dlls/nsiproxy.sys/Makefile.in @@ -0,0 +1,6 @@ +MODULE = nsiproxy.sys +IMPORTS = ntoskrnl +EXTRADLLFLAGS = -Wl,--subsystem,native + +C_SRCS = \ + device.c diff --git a/dlls/nsiproxy.sys/device.c b/dlls/nsiproxy.sys/device.c new file mode 100644 index 00000000000..ecd584bd1cb --- /dev/null +++ b/dlls/nsiproxy.sys/device.c @@ -0,0 +1,87 @@ +/* + * 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> + +#define NONAMELESSUNION +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "windef.h" +#include "winbase.h" +#include "winternl.h" +#include "winioctl.h" +#include "ddk/wdm.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(nsi); + +static NTSTATUS WINAPI nsi_ioctl( DEVICE_OBJECT *device, IRP *irp ) +{ + IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp ); + + TRACE( "ioctl %x insize %u outsize %u\n", + irpsp->Parameters.DeviceIoControl.IoControlCode, + irpsp->Parameters.DeviceIoControl.InputBufferLength, + irpsp->Parameters.DeviceIoControl.OutputBufferLength ); + + switch (irpsp->Parameters.DeviceIoControl.IoControlCode) + { + default: + FIXME( "ioctl %x not supported\n", irpsp->Parameters.DeviceIoControl.IoControlCode ); + irp->IoStatus.u.Status = STATUS_NOT_SUPPORTED; + break; + } + + IoCompleteRequest( irp, IO_NO_INCREMENT ); + return STATUS_SUCCESS; +} + +static int add_device( DRIVER_OBJECT *driver ) +{ + static const WCHAR name_str[] = {'\\','D','e','v','i','c','e','\\','N','s','i',0}; + static const WCHAR link_str[] = {'\\','?','?','\\','N','s','i',0}; + UNICODE_STRING name, link; + DEVICE_OBJECT *device; + NTSTATUS status; + + RtlInitUnicodeString( &name, name_str ); + RtlInitUnicodeString( &link, link_str ); + + if (!(status = IoCreateDevice( driver, 0, &name, FILE_DEVICE_NETWORK, FILE_DEVICE_SECURE_OPEN, FALSE, &device ))) + status = IoCreateSymbolicLink( &link, &name ); + if (status) + { + FIXME( "failed to create device error %x\n", status ); + return 0; + } + + return 1; +} + +NTSTATUS WINAPI DriverEntry( DRIVER_OBJECT *driver, UNICODE_STRING *path ) +{ + TRACE( "(%p, %s)\n", driver, debugstr_w( path->Buffer ) ); + + driver->MajorFunction[IRP_MJ_DEVICE_CONTROL] = nsi_ioctl; + + add_device( driver ); + + return STATUS_SUCCESS; +} diff --git a/dlls/nsiproxy.sys/nsiproxy.sys.spec b/dlls/nsiproxy.sys/nsiproxy.sys.spec new file mode 100644 index 00000000000..590a204a2b0 --- /dev/null +++ b/dlls/nsiproxy.sys/nsiproxy.sys.spec @@ -0,0 +1 @@ +# no exported functions diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 437c723a5e2..defaba008e2 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -165,6 +165,7 @@ AddService=Schedule,0,TaskSchedulerService AddService=Winmgmt,0,WinmgmtService AddService=wuauserv,0,wuauService AddService=NDIS,0x800,NDISService +AddService=nsiproxy,0x800,NsiProxyService [DefaultInstall.NT.Services] AddService=BITS,0,BITSService @@ -184,6 +185,7 @@ AddService=Schedule,0,TaskSchedulerService AddService=Winmgmt,0,WinmgmtService AddService=wuauserv,0,wuauService AddService=NDIS,0x800,NDISService +AddService=nsiproxy,0x800,NsiProxyService [DefaultInstall.ntamd64.Services] AddService=BITS,0,BITSService @@ -203,6 +205,7 @@ AddService=Schedule,0,TaskSchedulerService AddService=Winmgmt,0,WinmgmtService AddService=wuauserv,0,wuauService AddService=NDIS,0x800,NDISService +AddService=nsiproxy,0x800,NsiProxyService [DefaultInstall.ntarm64.Services] AddService=BITS,0,BITSService @@ -222,6 +225,7 @@ AddService=Schedule,0,TaskSchedulerService AddService=Winmgmt,0,WinmgmtService AddService=wuauserv,0,wuauService AddService=NDIS,0x800,NDISService +AddService=nsiproxy,0x800,NsiProxyService [Strings] MciExtStr="Software\Microsoft\Windows NT\CurrentVersion\MCI Extensions" @@ -3779,6 +3783,15 @@ StartType=2 ErrorControl=1 LoadOrderGroup="System Bus Extender" +[NsiProxyService] +Description="NSI proxy service" +DisplayName="NSI Proxy" +ServiceBinary="%12%\nsiproxy.sys" +ServiceType=1 +StartType=2 +ErrorControl=1 +LoadOrderGroup="System Bus Extender" + [RpcSsService] Description="RPC service" DisplayName="Remote Procedure Call (RPC)"

1 0

Huw Davies : nsi: Add a stub implementation of NsiGetParameterEx().
by Alexandre Julliard June 29, 2021

June 29, 2021

Module: wine Branch: master Commit: f4a0b90f03b10a1a241eca055b6bed53d1ff984e URL: https://source.winehq.org/git/wine.git/?a=commit;h=f4a0b90f03b10a1a241eca05… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jun 29 08:04:18 2021 +0100 nsi: Add a stub implementation of NsiGetParameterEx(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/nsi/nsi.c | 20 ++++++++++++++++++++ dlls/nsi/nsi.spec | 2 +- dlls/nsi/tests/nsi.c | 37 +++++++++++++++++++++++++++++++++++++ include/wine/nsi.h | 16 ++++++++++++++++ 4 files changed, 74 insertions(+), 1 deletion(-) diff --git a/dlls/nsi/nsi.c b/dlls/nsi/nsi.c index 4e55721475b..d3292af9ee3 100644 --- a/dlls/nsi/nsi.c +++ b/dlls/nsi/nsi.c @@ -115,7 +115,27 @@ DWORD WINAPI NsiGetAllParametersEx( struct nsi_get_all_parameters_ex *params ) DWORD WINAPI NsiGetParameter( DWORD unk, const NPI_MODULEID *module, DWORD table, const void *key, DWORD key_size, DWORD param_type, void *data, DWORD data_size, DWORD data_offset ) { + struct nsi_get_parameter_ex params; + FIXME( "%d %p %d %p %d %d %p %d %d: stub\n", unk, module, table, key, key_size, param_type, data, data_size, data_offset ); + + params.unknown[0] = 0; + params.unknown[1] = 0; + params.module = module; + params.table = table; + params.first_arg = unk; + params.unknown2 = 0; + params.key = key; + params.key_size = key_size; + params.param_type = param_type; + params.data = data; + params.data_size = data_size; + params.data_offset = data_offset; + return NsiGetParameterEx( &params ); +} + +DWORD WINAPI NsiGetParameterEx( struct nsi_get_parameter_ex *params ) +{ return ERROR_CALL_NOT_IMPLEMENTED; } diff --git a/dlls/nsi/nsi.spec b/dlls/nsi/nsi.spec index 376d25438aa..ba326572fb8 100644 --- a/dlls/nsi/nsi.spec +++ b/dlls/nsi/nsi.spec @@ -13,7 +13,7 @@ @ stub NsiGetAllPersistentParametersWithMask @ stub NsiObjectSecurity @ stdcall NsiGetParameter(long ptr long ptr long long ptr long long) -@ stub NsiGetParameterEx +@ stdcall NsiGetParameterEx(ptr) @ stub NsiRegisterChangeNotification @ stub NsiRegisterChangeNotificationEx @ stub NsiRequestChangeNotification diff --git a/dlls/nsi/tests/nsi.c b/dlls/nsi/tests/nsi.c index 7c2c57b9548..51b149e9f65 100644 --- a/dlls/nsi/tests/nsi.c +++ b/dlls/nsi/tests/nsi.c @@ -41,6 +41,7 @@ static void test_nsi_api( void ) struct nsi_ndis_ifinfo_dynamic *dyn_tbl, *dyn, get_dyn, *enum_dyn_tbl, *enum_dyn; struct nsi_ndis_ifinfo_static *stat_tbl, *stat, get_stat, *enum_stat_tbl, *enum_stat; struct nsi_get_all_parameters_ex get_all_params; + struct nsi_get_parameter_ex get_param; struct nsi_enumerate_all_ex enum_params; DWORD err, count, i, rw_size, enum_count; NET_LUID *luid_tbl, *enum_luid_tbl; @@ -129,6 +130,42 @@ todo_wine FIELD_OFFSET(struct nsi_ndis_ifinfo_static, if_guid) ); ok( !err, "got %d\n", err ); ok( IsEqualGUID( &get_stat.if_guid, &stat->if_guid ), "mismatch\n" ); + + memset( &get_rw, 0xcc, sizeof(get_rw) ); + memset( &get_dyn, 0xcc, sizeof(get_dyn) ); + memset( &get_stat, 0xcc, sizeof(get_stat) ); + + memset( &get_param, 0, sizeof(get_param) ); + get_param.first_arg = 1; + get_param.module = &NPI_MS_NDIS_MODULEID; + get_param.table = NSI_NDIS_IFINFO_TABLE; + get_param.key = luid_tbl + i; + get_param.key_size = sizeof(*luid_tbl); + + get_param.param_type = NSI_PARAM_TYPE_RW; + get_param.data = &get_rw.alias; + get_param.data_size = sizeof(get_rw.alias); + get_param.data_offset = FIELD_OFFSET(struct nsi_ndis_ifinfo_rw, alias); + err = NsiGetParameterEx( &get_param ); + ok( !err, "got %d\n", err ); + ok( get_rw.alias.Length == rw->alias.Length, "mismatch\n" ); + ok( !memcmp( get_rw.alias.String, rw->alias.String, rw->alias.Length ), "mismatch\n" ); + + get_param.param_type = NSI_PARAM_TYPE_STATIC; + get_param.data = &get_stat.if_index; + get_param.data_size = sizeof(get_stat.if_index); + get_param.data_offset = FIELD_OFFSET(struct nsi_ndis_ifinfo_static, if_index); + err = NsiGetParameterEx( &get_param ); + ok( !err, "got %d\n", err ); + ok( get_stat.if_index == stat->if_index, "mismatch\n" ); + + get_param.param_type = NSI_PARAM_TYPE_STATIC; + get_param.data = &get_stat.if_guid; + get_param.data_size = sizeof(get_stat.if_guid); + get_param.data_offset = FIELD_OFFSET(struct nsi_ndis_ifinfo_static, if_guid); + err = NsiGetParameterEx( &get_param ); + ok( !err, "got %d\n", err ); + ok( IsEqualGUID( &get_stat.if_guid, &stat->if_guid ), "mismatch\n" ); winetest_pop_context(); } diff --git a/include/wine/nsi.h b/include/wine/nsi.h index 81d221324e9..31ece41d22f 100644 --- a/include/wine/nsi.h +++ b/include/wine/nsi.h @@ -133,6 +133,21 @@ struct nsi_get_all_parameters_ex DWORD static_size; }; +struct nsi_get_parameter_ex +{ + void *unknown[2]; + const NPI_MODULEID *module; + DWORD_PTR table; + DWORD first_arg; + DWORD unknown2; + const void *key; + DWORD key_size; + DWORD_PTR param_type; + void *data; + DWORD data_size; + DWORD data_offset; +}; + 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 ); @@ -148,5 +163,6 @@ DWORD WINAPI NsiGetAllParameters( DWORD unk, const NPI_MODULEID *module, DWORD t DWORD WINAPI NsiGetAllParametersEx( struct nsi_get_all_parameters_ex *params ); DWORD WINAPI NsiGetParameter( DWORD unk, const NPI_MODULEID *module, DWORD table, const void *key, DWORD key_size, DWORD param_type, void *data, DWORD data_size, DWORD data_offset ); +DWORD WINAPI NsiGetParameterEx( struct nsi_get_parameter_ex *params ); #endif /* __WINE_NSI_H */

1 0

Alexandre Julliard : server: Remove the no longer used pid/tid fields in the init_thread request.
by Alexandre Julliard June 29, 2021

June 29, 2021

Module: wine Branch: master Commit: cc63b76833aa96e573800ff5b4dd6c7f01f324f7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cc63b76833aa96e573800ff5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 28 11:41:06 2021 +0200 server: Remove the no longer used pid/tid fields in the init_thread request. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/server_protocol.h | 6 ++---- server/protocol.def | 2 -- server/request.h | 6 ++---- server/thread.c | 2 -- server/trace.c | 4 +--- 5 files changed, 5 insertions(+), 15 deletions(-) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 51ee6ee4aa3..1720eef506e 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -952,10 +952,8 @@ struct init_thread_request struct init_thread_reply { struct reply_header __header; - process_id_t pid; - thread_id_t tid; int suspend; - char __pad_20[4]; + char __pad_12[4]; }; @@ -6236,7 +6234,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 718 +#define SERVER_PROTOCOL_VERSION 719 /* ### protocol_version end ### */ diff --git a/server/protocol.def b/server/protocol.def index 557311e2b3f..762be1fa7c0 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -924,8 +924,6 @@ typedef struct client_ptr_t teb; /* TEB of new thread (in thread address space) */ client_ptr_t entry; /* entry point (in thread address space) */ @REPLY - process_id_t pid; /* process id of the new thread's process */ - thread_id_t tid; /* thread id of the new thread */ int suspend; /* is thread suspended? */ @END diff --git a/server/request.h b/server/request.h index 0221cbd33ae..1c45ac34cc7 100644 --- a/server/request.h +++ b/server/request.h @@ -758,10 +758,8 @@ C_ASSERT( FIELD_OFFSET(struct init_thread_request, wait_fd) == 20 ); C_ASSERT( FIELD_OFFSET(struct init_thread_request, teb) == 24 ); C_ASSERT( FIELD_OFFSET(struct init_thread_request, entry) == 32 ); C_ASSERT( sizeof(struct init_thread_request) == 40 ); -C_ASSERT( FIELD_OFFSET(struct init_thread_reply, pid) == 8 ); -C_ASSERT( FIELD_OFFSET(struct init_thread_reply, tid) == 12 ); -C_ASSERT( FIELD_OFFSET(struct init_thread_reply, suspend) == 16 ); -C_ASSERT( sizeof(struct init_thread_reply) == 24 ); +C_ASSERT( FIELD_OFFSET(struct init_thread_reply, suspend) == 8 ); +C_ASSERT( sizeof(struct init_thread_reply) == 16 ); C_ASSERT( FIELD_OFFSET(struct terminate_process_request, handle) == 12 ); C_ASSERT( FIELD_OFFSET(struct terminate_process_request, exit_code) == 16 ); C_ASSERT( sizeof(struct terminate_process_request) == 24 ); diff --git a/server/thread.c b/server/thread.c index 703b23d73d1..f9535a7b25b 100644 --- a/server/thread.c +++ b/server/thread.c @@ -1457,8 +1457,6 @@ DECL_HANDLER(init_thread) generate_debug_event( current, DbgCreateThreadStateChange, &req->entry ); set_thread_affinity( current, current->affinity ); - reply->pid = get_process_id( current->process ); - reply->tid = get_thread_id( current ); reply->suspend = (current->suspend || current->process->suspend || current->context != NULL); } diff --git a/server/trace.c b/server/trace.c index bbdf17feb1a..55068d1179b 100644 --- a/server/trace.c +++ b/server/trace.c @@ -1545,9 +1545,7 @@ static void dump_init_thread_request( const struct init_thread_request *req ) static void dump_init_thread_reply( const struct init_thread_reply *req ) { - fprintf( stderr, " pid=%04x", req->pid ); - fprintf( stderr, ", tid=%04x", req->tid ); - fprintf( stderr, ", suspend=%d", req->suspend ); + fprintf( stderr, " suspend=%d", req->suspend ); } static void dump_terminate_process_request( const struct terminate_process_request *req )

1 0

Alexandre Julliard : ntdll: Don't rely on get_thread_context() updating the context flags.
by Alexandre Julliard June 29, 2021

June 29, 2021

Module: wine Branch: master Commit: 7404ef3ef5f0fccf08e37f2f189e421b810ffe99 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7404ef3ef5f0fccf08e37f2f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 29 14:46:30 2021 +0200 ntdll: Don't rely on get_thread_context() updating the context flags. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_arm.c | 66 +++++++------- dlls/ntdll/unix/signal_arm64.c | 48 +++++----- dlls/ntdll/unix/signal_i386.c | 3 +- dlls/ntdll/unix/signal_x86_64.c | 193 +++++++++++++++++++--------------------- 4 files changed, 146 insertions(+), 164 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7404ef3ef5f0fccf08e3…

1 0

Alexandre Julliard : ntdll: Implement NtWow64AllocateVirtualMemory64().
by Alexandre Julliard June 29, 2021

June 29, 2021

Module: wine Branch: master Commit: 19f19d0e2e5c049c21ed9cb925c3d9da24a0f23a URL: https://source.winehq.org/git/wine.git/?a=commit;h=19f19d0e2e5c049c21ed9cb9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 28 20:25:03 2021 +0200 ntdll: Implement NtWow64AllocateVirtualMemory64(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 2 ++ dlls/ntdll/tests/wow64.c | 69 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/unix/virtual.c | 57 +++++++++++++++++++++++++++++++++++++++ include/winternl.h | 1 + 4 files changed, 129 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=19f19d0e2e5c049c21ed…

1 0

Alexandre Julliard : ntdll: Implement NtWow64Read/WriteVirtualMemory64().
by Alexandre Julliard June 29, 2021

June 29, 2021

Module: wine Branch: master Commit: bfd2d1d77d8efd7dfc0613140e6281c924c3a1c7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bfd2d1d77d8efd7dfc061314… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 28 20:24:56 2021 +0200 ntdll: Implement NtWow64Read/WriteVirtualMemory64(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 4 +++ dlls/ntdll/tests/wow64.c | 42 +++++++++++++++++++++++++++++ dlls/ntdll/unix/virtual.c | 67 +++++++++++++++++++++++++++++++++++++++++++++++ include/winternl.h | 16 +++++------ 4 files changed, 121 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index bd72f50b864..70e752eb43b 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -430,6 +430,8 @@ @ stdcall -syscall NtWaitForSingleObject(long long ptr) @ stub NtWaitHighEventPair @ stub NtWaitLowEventPair +@ stdcall -syscall -arch=win32 NtWow64ReadVirtualMemory64(long int64 ptr int64 ptr) +@ stdcall -syscall -arch=win32 NtWow64WriteVirtualMemory64(long int64 ptr int64 ptr) @ stdcall -syscall NtWriteFile(long long ptr ptr ptr ptr long ptr ptr) @ stdcall -syscall NtWriteFileGather(long long ptr ptr ptr ptr long ptr ptr) @ stub NtWriteRequestData @@ -1444,6 +1446,8 @@ @ stdcall -private -syscall ZwWaitForSingleObject(long long ptr) NtWaitForSingleObject @ stub ZwWaitHighEventPair @ stub ZwWaitLowEventPair +@ stdcall -syscall -arch=win32 ZwWow64ReadVirtualMemory64(long int64 ptr int64 ptr) NtWow64ReadVirtualMemory64 +@ stdcall -syscall -arch=win32 ZwWow64WriteVirtualMemory64(long int64 ptr int64 ptr) NtWow64WriteVirtualMemory64 @ stdcall -private -syscall ZwWriteFile(long long ptr ptr ptr ptr long ptr ptr) NtWriteFile @ stdcall -private -syscall ZwWriteFileGather(long long ptr ptr ptr ptr long ptr ptr) NtWriteFileGather @ stub ZwWriteRequestData diff --git a/dlls/ntdll/tests/wow64.c b/dlls/ntdll/tests/wow64.c index 17082d2d329..8146ab0363e 100644 --- a/dlls/ntdll/tests/wow64.c +++ b/dlls/ntdll/tests/wow64.c @@ -27,6 +27,9 @@ static NTSTATUS (WINAPI *pRtlWow64GetProcessMachines)(HANDLE,WORD*,WORD*); static NTSTATUS (WINAPI *pRtlWow64IsWowGuestMachineSupported)(USHORT,BOOLEAN*); #ifdef _WIN64 static NTSTATUS (WINAPI *pRtlWow64GetCpuAreaInfo)(WOW64_CPURESERVED*,ULONG,WOW64_CPU_AREA_INFO*); +#else +static NTSTATUS (WINAPI *pNtWow64ReadVirtualMemory64)(HANDLE,ULONG64,void*,ULONG64,ULONG64*); +static NTSTATUS (WINAPI *pNtWow64WriteVirtualMemory64)(HANDLE,ULONG64,const void *,ULONG64,ULONG64*); #endif static BOOL is_wow64; @@ -44,6 +47,9 @@ static void init(void) GET_PROC( RtlWow64IsWowGuestMachineSupported ); #ifdef _WIN64 GET_PROC( RtlWow64GetCpuAreaInfo ); +#else + GET_PROC( NtWow64ReadVirtualMemory64 ); + GET_PROC( NtWow64WriteVirtualMemory64 ); #endif #undef GET_PROC } @@ -453,6 +459,40 @@ static void test_cpu_area(void) else win_skip( "RtlWow64GetCpuAreaInfo not supported\n" ); } +#else /* _WIN64 */ + +static void test_nt_wow64(void) +{ + const char str[] = "hello wow64"; + char buffer[100]; + NTSTATUS status; + ULONG64 res; + HANDLE process = OpenProcess( PROCESS_ALL_ACCESS, FALSE, GetCurrentProcessId() ); + + ok( process != 0, "failed to open current process %u\n", GetLastError() ); + if (pNtWow64ReadVirtualMemory64) + { + status = pNtWow64ReadVirtualMemory64( process, (ULONG_PTR)str, buffer, sizeof(str), &res ); + ok( !status, "NtWow64ReadVirtualMemory64 failed %x\n", status ); + ok( res == sizeof(str), "wrong size %s\n", wine_dbgstr_longlong(res) ); + ok( !strcmp( buffer, str ), "wrong data %s\n", debugstr_a(buffer) ); + status = pNtWow64WriteVirtualMemory64( process, (ULONG_PTR)buffer, " bye ", 5, &res ); + ok( !status, "NtWow64WriteVirtualMemory64 failed %x\n", status ); + ok( res == 5, "wrong size %s\n", wine_dbgstr_longlong(res) ); + ok( !strcmp( buffer, " bye wow64" ), "wrong data %s\n", debugstr_a(buffer) ); + /* current process pseudo-handle is broken on some Windows versions */ + status = pNtWow64ReadVirtualMemory64( GetCurrentProcess(), (ULONG_PTR)str, buffer, sizeof(str), &res ); + ok( !status || broken( status == STATUS_INVALID_HANDLE ), + "NtWow64ReadVirtualMemory64 failed %x\n", status ); + status = pNtWow64WriteVirtualMemory64( GetCurrentProcess(), (ULONG_PTR)buffer, " bye ", 5, &res ); + ok( !status || broken( status == STATUS_INVALID_HANDLE ), + "NtWow64WriteVirtualMemory64 failed %x\n", status ); + } + else win_skip( "NtWow64ReadVirtualMemory64 not supported\n" ); + + NtClose( process ); +} + #endif /* _WIN64 */ @@ -463,5 +503,7 @@ START_TEST(wow64) test_peb_teb(); #ifdef _WIN64 test_cpu_area(); +#else + test_nt_wow64(); #endif } diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 52af195aa56..d42cf74208a 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -4833,3 +4833,70 @@ NTSTATUS WINAPI NtCreatePagingFile( UNICODE_STRING *name, LARGE_INTEGER *min_siz FIXME( "(%s %p %p %p) stub\n", debugstr_us(name), min_size, max_size, actual_size ); return STATUS_SUCCESS; } + +#ifndef _WIN64 + +/*********************************************************************** + * NtWow64ReadVirtualMemory64 (NTDLL.@) + * ZwWow64ReadVirtualMemory64 (NTDLL.@) + */ +NTSTATUS WINAPI NtWow64ReadVirtualMemory64( HANDLE process, ULONG64 addr, void *buffer, + ULONG64 size, ULONG64 *bytes_read ) +{ + NTSTATUS status; + + if (size > MAXLONG) size = MAXLONG; + + if (virtual_check_buffer_for_write( buffer, size )) + { + SERVER_START_REQ( read_process_memory ) + { + req->handle = wine_server_obj_handle( process ); + req->addr = addr; + wine_server_set_reply( req, buffer, size ); + if ((status = wine_server_call( req ))) size = 0; + } + SERVER_END_REQ; + } + else + { + status = STATUS_ACCESS_VIOLATION; + size = 0; + } + if (bytes_read) *bytes_read = size; + return status; +} + + +/*********************************************************************** + * NtWow64WriteVirtualMemory64 (NTDLL.@) + * ZwWow64WriteVirtualMemory64 (NTDLL.@) + */ +NTSTATUS WINAPI NtWow64WriteVirtualMemory64( HANDLE process, ULONG64 addr, const void *buffer, + ULONG64 size, ULONG64 *bytes_written ) +{ + NTSTATUS status; + + if (size > MAXLONG) size = MAXLONG; + + if (virtual_check_buffer_for_read( buffer, size )) + { + SERVER_START_REQ( write_process_memory ) + { + req->handle = wine_server_obj_handle( process ); + req->addr = addr; + wine_server_add_data( req, buffer, size ); + if ((status = wine_server_call( req ))) size = 0; + } + SERVER_END_REQ; + } + else + { + status = STATUS_PARTIAL_COPY; + size = 0; + } + if (bytes_written) *bytes_written = size; + return status; +} + +#endif /* _WIN64 */ diff --git a/include/winternl.h b/include/winternl.h index 7221c0632b0..042936f4a7f 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -4396,19 +4396,19 @@ NTSYSAPI NTSTATUS WINAPI RtlpUnWaitCriticalSection(RTL_CRITICAL_SECTION *); NTSYSAPI NTSTATUS WINAPI vDbgPrintEx(ULONG,ULONG,LPCSTR,__ms_va_list); NTSYSAPI NTSTATUS WINAPI vDbgPrintExWithPrefix(LPCSTR,ULONG,ULONG,LPCSTR,__ms_va_list); -#ifdef _WIN64 -NTSYSAPI NTSTATUS WINAPI RtlWow64GetCpuAreaInfo(WOW64_CPURESERVED*,ULONG,WOW64_CPU_AREA_INFO*); -NTSYSAPI NTSTATUS WINAPI RtlWow64GetThreadContext(HANDLE,WOW64_CONTEXT*); -NTSYSAPI NTSTATUS WINAPI RtlWow64SetThreadContext(HANDLE,const WOW64_CONTEXT*); -#endif - #ifndef __WINE_USE_MSVCRT NTSYSAPI int __cdecl _strnicmp(LPCSTR,LPCSTR,size_t); #endif -/* 32-bit only functions */ +/* 32-bit or 64-bit only functions */ -#ifndef _WIN64 +#ifdef _WIN64 +NTSYSAPI NTSTATUS WINAPI RtlWow64GetCpuAreaInfo(WOW64_CPURESERVED*,ULONG,WOW64_CPU_AREA_INFO*); +NTSYSAPI NTSTATUS WINAPI RtlWow64GetThreadContext(HANDLE,WOW64_CONTEXT*); +NTSYSAPI NTSTATUS WINAPI RtlWow64SetThreadContext(HANDLE,const WOW64_CONTEXT*); +#else +NTSYSAPI NTSTATUS WINAPI NtWow64ReadVirtualMemory64(HANDLE,ULONG64,void*,ULONG64,ULONG64*); +NTSYSAPI NTSTATUS WINAPI NtWow64WriteVirtualMemory64(HANDLE,ULONG64,const void*,ULONG64,ULONG64*); NTSYSAPI LONGLONG WINAPI RtlConvertLongToLargeInteger(LONG); NTSYSAPI ULONGLONG WINAPI RtlConvertUlongToLargeInteger(ULONG); NTSYSAPI LONGLONG WINAPI RtlEnlargedIntegerMultiply(INT,INT);

1 0

Zebediah Figura : kernel32/tests: Add some tests for SetEndOfFile().
by Alexandre Julliard June 29, 2021

June 29, 2021

Module: wine Branch: master Commit: 08c5e0106b0e5eb92a160ace97c5403d156c74c0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=08c5e0106b0e5eb92a160ace… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jun 25 00:28:50 2021 -0500 kernel32/tests: Add some tests for SetEndOfFile(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/file.c | 186 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 186 insertions(+) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 138f1e6c2d3..c09438e09bd 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -5924,6 +5924,191 @@ static void test_move_file(void) SetCurrentDirectoryA( cwd ); } +static void test_eof(void) +{ + char temp_path[MAX_PATH], filename[MAX_PATH], buffer[20]; + LARGE_INTEGER file_size; + HANDLE file, mapping; + unsigned int i; + void *view; + DWORD size; + BOOL ret; + + static const struct + { + DWORD protection; + DWORD view_access; + } + map_tests[] = + { + {PAGE_READONLY, FILE_MAP_READ}, + {PAGE_READWRITE, FILE_MAP_WRITE}, + }; + + GetTempPathA(sizeof(temp_path), temp_path); + GetTempFileNameA(temp_path, "eof", 0, filename); + + file = CreateFileA(filename, GENERIC_READ | GENERIC_WRITE | DELETE, 0, NULL, CREATE_ALWAYS, 0, 0); + ok(file != INVALID_HANDLE_VALUE, "failed to create file, error %u\n", GetLastError()); + + ret = GetFileSizeEx(file, &file_size); + ok(ret, "failed to get size, error %u\n", GetLastError()); + ok(!file_size.QuadPart, "got size %I64d\n", file_size.QuadPart); + + SetFilePointer(file, 2, NULL, SEEK_SET); + + ret = GetFileSizeEx(file, &file_size); + ok(ret, "failed to get size, error %u\n", GetLastError()); + ok(!file_size.QuadPart, "got size %I64d\n", file_size.QuadPart); + + ret = ReadFile(file, buffer, sizeof(buffer), &size, NULL); + ok(ret, "failed to read, error %u\n", GetLastError()); + ok(!size, "got size %u\n", size); + + ret = SetEndOfFile(file); + ok(ret, "failed to set EOF, error %u\n", GetLastError()); + + ret = GetFileSizeEx(file, &file_size); + ok(ret, "failed to get size, error %u\n", GetLastError()); + ok(file_size.QuadPart == 2, "got size %I64d\n", file_size.QuadPart); + + ret = WriteFile(file, "data", 4, &size, NULL); + ok(ret, "failed to write, error %u\n", GetLastError()); + ok(size == 4, "got size %u\n", size); + + ret = GetFileSizeEx(file, &file_size); + ok(ret, "failed to get size, error %u\n", GetLastError()); + ok(file_size.QuadPart == 6, "got size %I64d\n", file_size.QuadPart); + + SetFilePointer(file, 4, NULL, SEEK_SET); + ret = SetEndOfFile(file); + ok(ret, "failed to set EOF, error %u\n", GetLastError()); + + ret = GetFileSizeEx(file, &file_size); + ok(ret, "failed to get size, error %u\n", GetLastError()); + ok(file_size.QuadPart == 4, "got size %I64d\n", file_size.QuadPart); + + SetFilePointer(file, 0, NULL, SEEK_SET); + ret = ReadFile(file, buffer, sizeof(buffer), &size, NULL); + ok(ret, "failed to read, error %u\n", GetLastError()); + ok(size == 4, "got size %u\n", size); + ok(!memcmp(buffer, "\0\0da", 4), "wrong data\n"); + + SetFilePointer(file, 6, NULL, SEEK_SET); + ret = SetEndOfFile(file); + ok(ret, "failed to set EOF, error %u\n", GetLastError()); + + ret = GetFileSizeEx(file, &file_size); + ok(ret, "failed to get size, error %u\n", GetLastError()); + ok(file_size.QuadPart == 6, "got size %I64d\n", file_size.QuadPart); + + SetFilePointer(file, 0, NULL, SEEK_SET); + ret = ReadFile(file, buffer, sizeof(buffer), &size, NULL); + ok(ret, "failed to read, error %u\n", GetLastError()); + ok(size == 6, "got size %u\n", size); + ok(!memcmp(buffer, "\0\0da\0\0", 6), "wrong data\n"); + + ret = SetEndOfFile(file); + ok(ret, "failed to set EOF, error %u\n", GetLastError()); + + SetFilePointer(file, 2, NULL, SEEK_SET); + ret = WriteFile(file, "data", 4, &size, NULL); + ok(ret, "failed to write, error %u\n", GetLastError()); + ok(size == 4, "got size %u\n", size); + + ret = GetFileSizeEx(file, &file_size); + ok(ret, "failed to get size, error %u\n", GetLastError()); + ok(file_size.QuadPart == 6, "got size %I64d\n", file_size.QuadPart); + + SetFilePointer(file, 0, NULL, SEEK_SET); + ret = ReadFile(file, buffer, sizeof(buffer), &size, NULL); + ok(ret, "failed to read, error %u\n", GetLastError()); + ok(size == 6, "got size %u\n", size); + ok(!memcmp(buffer, "\0\0data", 6), "wrong data\n"); + + for (i = 0; i < ARRAY_SIZE(map_tests); ++i) + { + mapping = CreateFileMappingA(file, NULL, map_tests[i].protection, 0, 4, NULL); + ok(!!mapping, "failed to create mapping, error %u\n", GetLastError()); + + ret = GetFileSizeEx(file, &file_size); + ok(ret, "failed to get size, error %u\n", GetLastError()); + ok(file_size.QuadPart == 6, "got size %I64d\n", file_size.QuadPart); + + SetFilePointer(file, 6, NULL, SEEK_SET); + ret = SetEndOfFile(file); + ok(ret, "failed to set EOF, error %u\n", GetLastError()); + ret = GetFileSizeEx(file, &file_size); + ok(ret, "failed to get size, error %u\n", GetLastError()); + ok(file_size.QuadPart == 6, "got size %I64d\n", file_size.QuadPart); + + SetFilePointer(file, 8, NULL, SEEK_SET); + ret = SetEndOfFile(file); + ok(ret, "failed to set EOF, error %u\n", GetLastError()); + ret = GetFileSizeEx(file, &file_size); + ok(ret, "failed to get size, error %u\n", GetLastError()); + ok(file_size.QuadPart == 8, "got size %I64d\n", file_size.QuadPart); + + SetLastError(0xdeadbeef); + SetFilePointer(file, 6, NULL, SEEK_SET); + ret = SetEndOfFile(file); + todo_wine ok(!ret, "expected failure\n"); + todo_wine ok(GetLastError() == ERROR_USER_MAPPED_FILE, "got error %u\n", GetLastError()); + ret = GetFileSizeEx(file, &file_size); + ok(ret, "failed to get size, error %u\n", GetLastError()); + todo_wine ok(file_size.QuadPart == 8, "got size %I64d\n", file_size.QuadPart); + + SetFilePointer(file, 8192, NULL, SEEK_SET); + ret = SetEndOfFile(file); + ok(ret, "failed to set EOF, error %u\n", GetLastError()); + ret = GetFileSizeEx(file, &file_size); + ok(ret, "failed to get size, error %u\n", GetLastError()); + ok(file_size.QuadPart == 8192, "got size %I64d\n", file_size.QuadPart); + + SetFilePointer(file, 8191, NULL, SEEK_SET); + ret = SetEndOfFile(file); + todo_wine ok(!ret, "expected failure\n"); + todo_wine ok(GetLastError() == ERROR_USER_MAPPED_FILE, "got error %u\n", GetLastError()); + ret = GetFileSizeEx(file, &file_size); + ok(ret, "failed to get size, error %u\n", GetLastError()); + todo_wine ok(file_size.QuadPart == 8192, "got size %I64d\n", file_size.QuadPart); + + view = MapViewOfFile(mapping, map_tests[i].view_access, 0, 0, 4); + ok(!!view, "failed to map view, error %u\n", GetLastError()); + + CloseHandle(mapping); + + SetFilePointer(file, 16384, NULL, SEEK_SET); + ret = SetEndOfFile(file); + ok(ret, "failed to set EOF, error %u\n", GetLastError()); + ret = GetFileSizeEx(file, &file_size); + ok(ret, "failed to get size, error %u\n", GetLastError()); + ok(file_size.QuadPart == 16384, "got size %I64d\n", file_size.QuadPart); + + SetFilePointer(file, 16383, NULL, SEEK_SET); + ret = SetEndOfFile(file); + todo_wine ok(!ret, "expected failure\n"); + todo_wine ok(GetLastError() == ERROR_USER_MAPPED_FILE, "got error %u\n", GetLastError()); + ret = GetFileSizeEx(file, &file_size); + ok(ret, "failed to get size, error %u\n", GetLastError()); + todo_wine ok(file_size.QuadPart == 16384, "got size %I64d\n", file_size.QuadPart); + + ret = UnmapViewOfFile(view); + ok(ret, "failed to unmap view, error %u\n", GetLastError()); + + SetFilePointer(file, 6, NULL, SEEK_SET); + ret = SetEndOfFile(file); + ok(ret, "failed to set EOF, error %u\n", GetLastError()); + ret = GetFileSizeEx(file, &file_size); + ok(ret, "failed to get size, error %u\n", GetLastError()); + ok(file_size.QuadPart == 6, "got size %I64d\n", file_size.QuadPart); + } + + CloseHandle(file); + ret = DeleteFileA(filename); + ok(ret, "failed to delete %s, error %u\n", debugstr_a(filename), GetLastError()); +} + START_TEST(file) { char temp_path[MAX_PATH]; @@ -6001,4 +6186,5 @@ START_TEST(file) test_ReOpenFile(); test_hard_link(); test_move_file(); + test_eof(); }

1 0

Alexander Fischer : winhttp: Added stubs to function request_set_option.
by Alexandre Julliard June 29, 2021

June 29, 2021

Module: wine Branch: master Commit: b9f012e14c180c992a60eb846a5e6a6fed354a48 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b9f012e14c180c992a60eb84… Author: Alexander Fischer <fischeralex1993(a)gmail.com> Date: Sat Jun 26 15:25:38 2021 +0200 winhttp: Added stubs to function request_set_option. WINHTTP_OPTION_MAX_RESPONSE_DRAIN_SIZE and WINHTTP_OPTION_MAX_RESPONSE_HEADER_SIZE, (defined in include/winhttp.h) weren't handled yet, which caused 'Amazon Games App' downloads to fail. Signed-off-by: Alexander Fischer <fischeralex1993(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/session.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index dcea874306a..e4e8f1cec56 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -1041,6 +1041,14 @@ static BOOL request_set_option( struct object_header *hdr, DWORD option, void *b SetLastError(ERROR_INVALID_PARAMETER); return FALSE; + case WINHTTP_OPTION_MAX_RESPONSE_HEADER_SIZE: + FIXME("WINHTTP_OPTION_MAX_RESPONSE_HEADER_SIZE\n"); + return TRUE; + + case WINHTTP_OPTION_MAX_RESPONSE_DRAIN_SIZE: + FIXME("WINHTTP_OPTION_MAX_RESPONSE_DRAIN_SIZE\n"); + return TRUE; + default: FIXME("unimplemented option %u\n", option); SetLastError( ERROR_WINHTTP_INVALID_OPTION );

1 0

Francois Gouget : d3d11/tests: Increase the tolerance in test_texture_compressed_3d().
by Alexandre Julliard June 29, 2021

June 29, 2021

Module: wine Branch: master Commit: 42fc1dcda539864468fb4b743b4233f15cf189fc URL: https://source.winehq.org/git/wine.git/?a=commit;h=42fc1dcda539864468fb4b74… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jun 29 09:11:18 2021 +0200 d3d11/tests: Increase the tolerance in test_texture_compressed_3d(). This fixes failures on Nvidia GeForce GTX 560 graphics cards. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51340 Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 2d66f9bde73..a2858ed0155 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -33420,7 +33420,7 @@ static void test_texture_compressed_3d(void) } expected |= 0xff000000; colour = get_readback_color(&rb, (x * 640 + 128) / 256, (y * 480 + 128) / 256, 0); - if (!(equal = compare_color(colour, expected, 2))) + if (!(equal = compare_color(colour, expected, 8))) break; } if (!equal)

1 0

Rémi Bernon : d2d1: Use D3D11 interfaces to create sampler states.
by Alexandre Julliard June 28, 2021

June 28, 2021

Module: wine Branch: master Commit: 580ef84cae0955bd533702d8b276ead8dc0a884f URL: https://source.winehq.org/git/wine.git/?a=commit;h=580ef84cae0955bd533702d8… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jun 28 09:17:35 2021 +0200 d2d1: Use D3D11 interfaces to create sampler states. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/brush.c | 32 +++++++++++++++++++------------- dlls/d2d1/d2d1_private.h | 2 +- dlls/d2d1/device.c | 2 +- 3 files changed, 21 insertions(+), 15 deletions(-) diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c index 5932a5fa113..6384cb0ae52 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -1121,19 +1121,19 @@ struct d2d_brush *unsafe_impl_from_ID2D1Brush(ID2D1Brush *iface) return CONTAINING_RECORD(iface, struct d2d_brush, ID2D1Brush_iface); } -static D3D10_TEXTURE_ADDRESS_MODE texture_address_mode_from_extend_mode(D2D1_EXTEND_MODE mode) +static D3D11_TEXTURE_ADDRESS_MODE texture_address_mode_from_extend_mode(D2D1_EXTEND_MODE mode) { switch (mode) { case D2D1_EXTEND_MODE_CLAMP: - return D3D10_TEXTURE_ADDRESS_CLAMP; + return D3D11_TEXTURE_ADDRESS_CLAMP; case D2D1_EXTEND_MODE_WRAP: - return D3D10_TEXTURE_ADDRESS_WRAP; + return D3D11_TEXTURE_ADDRESS_WRAP; case D2D1_EXTEND_MODE_MIRROR: - return D3D10_TEXTURE_ADDRESS_MIRROR; + return D3D11_TEXTURE_ADDRESS_MIRROR; default: FIXME("Unhandled extend mode %#x.\n", mode); - return D3D10_TEXTURE_ADDRESS_CLAMP; + return D3D11_TEXTURE_ADDRESS_CLAMP; } } @@ -1256,7 +1256,8 @@ BOOL d2d_brush_fill_cb(const struct d2d_brush *brush, struct d2d_brush_cb *cb) static void d2d_brush_bind_bitmap(struct d2d_brush *brush, struct d2d_device_context *context, unsigned int brush_idx) { - ID3D10SamplerState **sampler_state; + ID3D10SamplerState *d3d10_sampler_state; + ID3D11SamplerState **sampler_state; HRESULT hr; ID3D10Device_PSSetShaderResources(context->d3d_device, brush_idx, 1, &brush->u.bitmap.bitmap->srv); @@ -1268,18 +1269,18 @@ static void d2d_brush_bind_bitmap(struct d2d_brush *brush, struct d2d_device_con if (!*sampler_state) { - D3D10_SAMPLER_DESC sampler_desc; + D3D11_SAMPLER_DESC sampler_desc; if (brush->u.bitmap.interpolation_mode == D2D1_INTERPOLATION_MODE_NEAREST_NEIGHBOR) - sampler_desc.Filter = D3D10_FILTER_MIN_MAG_MIP_POINT; + sampler_desc.Filter = D3D11_FILTER_MIN_MAG_MIP_POINT; else - sampler_desc.Filter = D3D10_FILTER_MIN_MAG_MIP_LINEAR; + sampler_desc.Filter = D3D11_FILTER_MIN_MAG_MIP_LINEAR; sampler_desc.AddressU = texture_address_mode_from_extend_mode(brush->u.bitmap.extend_mode_x); sampler_desc.AddressV = texture_address_mode_from_extend_mode(brush->u.bitmap.extend_mode_y); - sampler_desc.AddressW = D3D10_TEXTURE_ADDRESS_CLAMP; + sampler_desc.AddressW = D3D11_TEXTURE_ADDRESS_CLAMP; sampler_desc.MipLODBias = 0.0f; sampler_desc.MaxAnisotropy = 0; - sampler_desc.ComparisonFunc = D3D10_COMPARISON_NEVER; + sampler_desc.ComparisonFunc = D3D11_COMPARISON_NEVER; sampler_desc.BorderColor[0] = 0.0f; sampler_desc.BorderColor[1] = 0.0f; sampler_desc.BorderColor[2] = 0.0f; @@ -1287,10 +1288,15 @@ static void d2d_brush_bind_bitmap(struct d2d_brush *brush, struct d2d_device_con sampler_desc.MinLOD = 0.0f; sampler_desc.MaxLOD = 0.0f; - if (FAILED(hr = ID3D10Device_CreateSamplerState(context->d3d_device, &sampler_desc, sampler_state))) + if (FAILED(hr = ID3D11Device1_CreateSamplerState(context->d3d11_device, &sampler_desc, sampler_state))) ERR("Failed to create sampler state, hr %#x.\n", hr); } - ID3D10Device_PSSetSamplers(context->d3d_device, brush_idx, 1, sampler_state); + + if (FAILED(hr = ID3D11SamplerState_QueryInterface(*sampler_state, &IID_ID3D10SamplerState, (void **)&d3d10_sampler_state))) + ERR("Failed to query D3D10 sampler state, hr %#x.\n", hr); + + ID3D10Device_PSSetSamplers(context->d3d_device, brush_idx, 1, &d3d10_sampler_state); + ID3D10SamplerState_Release(d3d10_sampler_state); } void d2d_brush_bind_resources(struct d2d_brush *brush, struct d2d_device_context *context, unsigned int brush_idx) diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index f823953dd2b..b4a489e1966 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -174,7 +174,7 @@ struct d2d_device_context ID3D11Buffer *vb; ID3D11RasterizerState *rs; ID3D11BlendState *bs; - ID3D10SamplerState *sampler_states + ID3D11SamplerState *sampler_states [D2D_SAMPLER_INTERPOLATION_MODE_COUNT] [D2D_SAMPLER_EXTEND_MODE_COUNT] [D2D_SAMPLER_EXTEND_MODE_COUNT]; diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index ba9e4e13481..a862215c130 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -352,7 +352,7 @@ static ULONG STDMETHODCALLTYPE d2d_device_context_inner_Release(IUnknown *iface) for (k = 0; k < D2D_SAMPLER_EXTEND_MODE_COUNT; ++k) { if (context->sampler_states[i][j][k]) - ID3D10SamplerState_Release(context->sampler_states[i][j][k]); + ID3D11SamplerState_Release(context->sampler_states[i][j][k]); } } }

1 0