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

Zebediah Figura : vkd3d-shader: Allow declarations to specify type modifiers redundant with the type.
by Alexandre Julliard 28 Jun '21

28 Jun '21

Module: vkd3d Branch: master Commit: 1dbb14645423437a6dfc370a0b4d550446efe383 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=1dbb14645423437a6dfc370… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jun 23 23:57:31 2021 -0500 vkd3d-shader: Allow declarations to specify type modifiers redundant with the type. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 2 ++ libs/vkd3d-shader/hlsl.y | 6 +++++- tests/hlsl-duplicate-modifiers.shader_test | 11 +++++++++++ tests/hlsl-invalid.shader_test | 17 +++++++++++++++++ 4 files changed, 35 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index e853786..5b3c4ff 100644 --- a/Makefile.am +++ b/Makefile.am @@ -57,6 +57,7 @@ vkd3d_shader_tests = \ tests/conditional.shader_test \ tests/hlsl-array-dimension.shader_test \ tests/hlsl-comma.shader_test \ + tests/hlsl-duplicate-modifiers.shader_test \ tests/hlsl-invalid.shader_test \ tests/hlsl-majority-pragma.shader_test \ tests/hlsl-majority-typedef.shader_test \ @@ -256,6 +257,7 @@ XFAIL_TESTS = \ tests/conditional.shader_test \ tests/hlsl-array-dimension.shader_test \ tests/hlsl-comma.shader_test \ + tests/hlsl-duplicate-modifiers.shader_test \ tests/hlsl-majority-pragma.shader_test \ tests/hlsl-majority-typedef.shader_test \ tests/hlsl-nested-arrays.shader_test \ diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 828b19a..513c451 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -659,9 +659,13 @@ static struct hlsl_type *apply_type_modifiers(struct hlsl_ctx *ctx, struct hlsl_ if (!(new_type = hlsl_type_clone(ctx, type, default_majority))) return NULL; - new_type->modifiers = add_modifiers(ctx, new_type->modifiers, *modifiers, loc); + new_type->modifiers |= *modifiers; *modifiers &= ~HLSL_TYPE_MODIFIERS_MASK; + if ((new_type->modifiers & HLSL_MODIFIER_ROW_MAJOR) && (new_type->modifiers & HLSL_MODIFIER_COLUMN_MAJOR)) + hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_INVALID_MODIFIER, + "'row_major' and 'column_major' modifiers are mutually exclusive."); + if (new_type->type == HLSL_CLASS_MATRIX) new_type->reg_size = (hlsl_type_is_row_major(new_type) ? new_type->dimy : new_type->dimx) * 4; return new_type; diff --git a/tests/hlsl-duplicate-modifiers.shader_test b/tests/hlsl-duplicate-modifiers.shader_test new file mode 100644 index 0000000..6491701 --- /dev/null +++ b/tests/hlsl-duplicate-modifiers.shader_test @@ -0,0 +1,11 @@ +[pixel shader] +typedef const precise row_major float2x2 mat_t; +float4 main() : sv_target +{ + const precise row_major mat_t mat = float2x2(0.1, 0.2, 0.3, 0.4); + return mat; +} + +[test] +draw quad +probe all rgba (0.1, 0.2, 0.3, 0.4) diff --git a/tests/hlsl-invalid.shader_test b/tests/hlsl-invalid.shader_test index 7205598..f6a7ffd 100644 --- a/tests/hlsl-invalid.shader_test +++ b/tests/hlsl-invalid.shader_test @@ -219,3 +219,20 @@ float4 main(void) : sv_target in float f; return 0; } + +[pixel shader fail] +const const float4 c; + +float4 main() : sv_target +{ + return float4(0, 0, 0, 0); +} + +[pixel shader fail] +typedef row_major float4x4 mat_t; +column_major mat_t m; + +float4 main() : sv_target +{ + return float4(0, 0, 0, 0); +}

1 0

Huw Davies : uuid: Add a few NPI module ids.
by Alexandre Julliard 25 Jun '21

25 Jun '21

Module: wine Branch: master Commit: 2cd939d71a8d680d4c3264fac14765dc92b99a6b URL: https://source.winehq.org/git/wine.git/?a=commit;h=2cd939d71a8d680d4c3264fa… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Jun 25 10:22:42 2021 +0100 uuid: Add a few NPI module ids. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uuid/uuid.c | 3 +++ include/netiodef.h | 29 +++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+) diff --git a/dlls/uuid/uuid.c b/dlls/uuid/uuid.c index eacb83301d1..aa7ad3dd678 100644 --- a/dlls/uuid/uuid.c +++ b/dlls/uuid/uuid.c @@ -92,6 +92,9 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); #include "comsvcs.h" #include "directmanipulation.h" +#define __WINE_INIT_NPI_MODULEID +#include "netiodef.h" + /* FIXME: cguids declares GUIDs but does not define their values */ /* GUIDs not declared in an exported header file */ diff --git a/include/netiodef.h b/include/netiodef.h index 611359c49f8..658dd235db0 100644 --- a/include/netiodef.h +++ b/include/netiodef.h @@ -57,4 +57,33 @@ static inline BOOLEAN NmrIsEqualNpiModuleId( const NPI_MODULEID *mod1, const NPI return FALSE; } +#ifdef __WINE_INIT_NPI_MODULEID +#ifdef __cplusplus +#define DEFINE_NPI_GUID_MODULEID(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \ + EXTERN_C const NPI_MODULEID name DECLSPEC_HIDDEN; \ + EXTERN_C const NPI_MODULEID name = \ + { sizeof(NPI_MODULEID), MIT_GUID, { { l, w1, w2, { b1, b2, b3, b4, b5, b6, b7, b8 } } } } +#else +#define DEFINE_NPI_GUID_MODULEID(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \ + const NPI_MODULEID name DECLSPEC_HIDDEN; \ + const NPI_MODULEID name = \ + { sizeof(NPI_MODULEID), MIT_GUID, { { l, w1, w2, { b1, b2, b3, b4, b5, b6, b7, b8 } } } } +#endif +#else /* __WINE_INIT_MODULEID */ +#define DEFINE_NPI_GUID_MODULEID(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \ + EXTERN_C const NPI_MODULEID name DECLSPEC_HIDDEN +#endif /* __WINE_INIT_MODULEID */ + +#define DEFINE_NPI_MS_MODULEID(name, n) DEFINE_NPI_GUID_MODULEID(name, 0xeb004a00 + (n), 0x9b1a, 0x11d4, \ + 0x91, 0x23, 0x00, 0x50, 0x04, 0x77, 0x59, 0xbc) + +DEFINE_NPI_MS_MODULEID( NPI_MS_IPV4_MODULEID, 0x00 ); +DEFINE_NPI_MS_MODULEID( NPI_MS_IPV6_MODULEID, 0x01 ); +DEFINE_NPI_MS_MODULEID( NPI_MS_UDP_MODULEID, 0x02 ); +DEFINE_NPI_MS_MODULEID( NPI_MS_TCP_MODULEID, 0x03 ); +DEFINE_NPI_MS_MODULEID( NPI_MS_NDIS_MODULEID, 0x11 ); + +#undef DEFINE_NPI_MS_MODULEID +#undef DEFINE_NPI_GUID_MODULEID + #endif /* __WINE_NETIODEF_H */

1 0

Huw Davies : nsi: Add a stub dll.
by Alexandre Julliard 25 Jun '21

25 Jun '21

Module: wine Branch: master Commit: 2b783a35328507479a73f53ff2eca277dcfcef4d URL: https://source.winehq.org/git/wine.git/?a=commit;h=2b783a35328507479a73f53f… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Jun 25 10:22:43 2021 +0100 nsi: Add a stub dll. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/nsi/Makefile.in | 4 ++++ dlls/nsi/nsi.spec | 26 ++++++++++++++++++++++++++ 4 files changed, 33 insertions(+) diff --git a/configure b/configure index c73646351b8..22562bb3897 100755 --- a/configure +++ b/configure @@ -1525,6 +1525,7 @@ enable_ninput enable_normaliz enable_npmshtml enable_npptools +enable_nsi enable_ntdll enable_ntdsapi enable_ntoskrnl_exe @@ -20819,6 +20820,7 @@ wine_fn_config_makefile dlls/ninput/tests enable_tests wine_fn_config_makefile dlls/normaliz enable_normaliz 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/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 796cd015d17..b79bd9070f1 100644 --- a/configure.ac +++ b/configure.ac @@ -3496,6 +3496,7 @@ WINE_CONFIG_MAKEFILE(dlls/ninput/tests) WINE_CONFIG_MAKEFILE(dlls/normaliz) WINE_CONFIG_MAKEFILE(dlls/npmshtml) WINE_CONFIG_MAKEFILE(dlls/npptools) +WINE_CONFIG_MAKEFILE(dlls/nsi) WINE_CONFIG_MAKEFILE(dlls/ntdll) WINE_CONFIG_MAKEFILE(dlls/ntdll/tests) WINE_CONFIG_MAKEFILE(dlls/ntdsapi) diff --git a/dlls/nsi/Makefile.in b/dlls/nsi/Makefile.in new file mode 100644 index 00000000000..634c4011ed9 --- /dev/null +++ b/dlls/nsi/Makefile.in @@ -0,0 +1,4 @@ +MODULE = nsi.dll +IMPORTLIB = nsi + +EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/nsi/nsi.spec b/dlls/nsi/nsi.spec new file mode 100644 index 00000000000..2d500d30e94 --- /dev/null +++ b/dlls/nsi/nsi.spec @@ -0,0 +1,26 @@ +@ stub NsiAllocateAndGetPersistentDataWithMaskTable +@ stub NsiAllocateAndGetTable +@ stub NsiCancelChangeNotification +@ stub NsiDeregisterChangeNotification +@ stub NsiDeregisterChangeNotificationEx +@ stub NsiEnumerateObjectsAllParameters +@ stub NsiEnumerateObjectsAllParametersEx +@ stub NsiEnumerateObjectsAllPersistentParametersWithMask +@ stub NsiFreePersistentDataWithMaskTable +@ stub NsiFreeTable +@ stub NsiGetAllParameters +@ stub NsiGetAllParametersEx +@ stub NsiGetAllPersistentParametersWithMask +@ stub NsiObjectSecurity +@ stub NsiGetParameter +@ stub NsiGetParameterEx +@ stub NsiRegisterChangeNotification +@ stub NsiRegisterChangeNotificationEx +@ stub NsiRequestChangeNotification +@ stub NsiRequestChangeNotificationEx +@ stub NsiSetAllParameters +@ stub NsiSetAllParametersEx +@ stub NsiSetAllPersistentParametersWithMask +@ stub NsiSetObjectSecurity +@ stub NsiSetParameter +@ stub NsiSetParameterEx

1 0

Huw Davies : nsi: Add stub implementations of NsiAllocateAndGetTable() and NsiFreeTable().
by Alexandre Julliard 25 Jun '21

25 Jun '21

Module: wine Branch: master Commit: b85df9aab0094209d15c9e3d44a8d8da4b588d7a URL: https://source.winehq.org/git/wine.git/?a=commit;h=b85df9aab0094209d15c9e3d… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Jun 25 10:22:44 2021 +0100 nsi: Add stub implementations of NsiAllocateAndGetTable() and NsiFreeTable(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/nsi/Makefile.in | 3 +++ dlls/nsi/nsi.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ dlls/nsi/nsi.spec | 4 ++-- include/wine/nsi.h | 28 ++++++++++++++++++++++++++++ 4 files changed, 77 insertions(+), 2 deletions(-) diff --git a/dlls/nsi/Makefile.in b/dlls/nsi/Makefile.in index 634c4011ed9..68126cab6c6 100644 --- a/dlls/nsi/Makefile.in +++ b/dlls/nsi/Makefile.in @@ -2,3 +2,6 @@ MODULE = nsi.dll IMPORTLIB = nsi EXTRADLLFLAGS = -mno-cygwin + +C_SRCS = \ + nsi.c diff --git a/dlls/nsi/nsi.c b/dlls/nsi/nsi.c new file mode 100644 index 00000000000..d55445a3dd7 --- /dev/null +++ b/dlls/nsi/nsi.c @@ -0,0 +1,44 @@ +/* + * Network Store Interface + * + * 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 "winsock2.h" +#include "winternl.h" +#include "ws2ipdef.h" +#include "iphlpapi.h" +#include "netioapi.h" +#include "iptypes.h" +#include "netiodef.h" +#include "wine/nsi.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(nsi); + +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 ) +{ + FIXME( "%d %p %d %p %d %p %d %p %d %p %d %p %d: stub\n", unk, module, table, key_data, key_size, + rw_data, rw_size, dynamic_data, dynamic_size, static_data, static_size, count, unk2 ); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +void WINAPI NsiFreeTable( void *key_data, void *rw_data, void *dynamic_data, void *static_data ) +{ + FIXME( "%p %p %p %p: stub\n", key_data, rw_data, dynamic_data, static_data ); +} diff --git a/dlls/nsi/nsi.spec b/dlls/nsi/nsi.spec index 2d500d30e94..fc2db9e35c1 100644 --- a/dlls/nsi/nsi.spec +++ b/dlls/nsi/nsi.spec @@ -1,5 +1,5 @@ @ stub NsiAllocateAndGetPersistentDataWithMaskTable -@ stub NsiAllocateAndGetTable +@ stdcall NsiAllocateAndGetTable(long ptr long ptr long ptr long ptr long ptr long ptr long) @ stub NsiCancelChangeNotification @ stub NsiDeregisterChangeNotification @ stub NsiDeregisterChangeNotificationEx @@ -7,7 +7,7 @@ @ stub NsiEnumerateObjectsAllParametersEx @ stub NsiEnumerateObjectsAllPersistentParametersWithMask @ stub NsiFreePersistentDataWithMaskTable -@ stub NsiFreeTable +@ stdcall NsiFreeTable(ptr ptr ptr ptr) @ stub NsiGetAllParameters @ stub NsiGetAllParametersEx @ stub NsiGetAllPersistentParametersWithMask diff --git a/include/wine/nsi.h b/include/wine/nsi.h new file mode 100644 index 00000000000..594d6f9ea5d --- /dev/null +++ b/include/wine/nsi.h @@ -0,0 +1,28 @@ +/* + * 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 + */ + +#ifndef __WINE_NSI_H +#define __WINE_NSI_H + +/* Undocumented Nsi api */ +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 ); +void WINAPI NsiFreeTable( void *key_data, void *rw_data, void *dynamic_data, void *static_data ); + +#endif /* __WINE_NSI_H */

1 0

Huw Davies : nsi/tests: Add tests for the NDIS ifinfo table.
by Alexandre Julliard 25 Jun '21

25 Jun '21

Module: wine Branch: master Commit: 83e041eacf1d4b8f5157a218517366099f486282 URL: https://source.winehq.org/git/wine.git/?a=commit;h=83e041eacf1d4b8f5157a218… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Jun 25 10:22:45 2021 +0100 nsi/tests: Add tests for the NDIS ifinfo table. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/nsi/tests/Makefile.in | 5 ++ dlls/nsi/tests/nsi.c | 149 +++++++++++++++++++++++++++++++++++++++++++++ include/wine/nsi.h | 73 ++++++++++++++++++++++ 5 files changed, 229 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=83e041eacf1d4b8f5157…

1 0

Bernhard Übelacker : winedbg: Try to load debug symbols for executable in gdb mode.
by Alexandre Julliard 25 Jun '21

25 Jun '21

Module: wine Branch: master Commit: 61310dd3b8bfc393b4b722652651fd726e25da7b URL: https://source.winehq.org/git/wine.git/?a=commit;h=61310dd3b8bfc393b4b72265… Author: Bernhard Übelacker <bernhardu(a)mailbox.org> Date: Fri Jun 25 17:19:33 2021 +0200 winedbg: Try to load debug symbols for executable in gdb mode. Signed-off-by: Bernhard Übelacker <bernhardu(a)mailbox.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/gdbproxy.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index 478e0d16fe0..19fa86d44da 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -437,6 +437,9 @@ static BOOL handle_debug_event(struct gdb_context* gdbctx) fprintf(stderr, "%04x:%04x: create thread I @%p\n", de->dwProcessId, de->dwThreadId, de->u.CreateProcessInfo.lpStartAddress); + dbg_load_module(gdbctx->process->handle, de->u.CreateProcessInfo.hFile, u.buffer, + (DWORD_PTR)de->u.CreateProcessInfo.lpBaseOfImage, 0); + dbg_add_thread(gdbctx->process, de->dwThreadId, de->u.CreateProcessInfo.hThread, de->u.CreateProcessInfo.lpThreadLocalBase);

1 0

Haoyang Chen : ole32: Request the needed memory blocks at once.
by Alexandre Julliard 25 Jun '21

25 Jun '21

Module: wine Branch: master Commit: 542175ab10420953920779f3c64eb310dd3aa258 URL: https://source.winehq.org/git/wine.git/?a=commit;h=542175ab10420953920779f3… Author: Haoyang Chen <chenhaoyang(a)uniontech.com> Date: Wed Jun 23 16:53:39 2021 +0800 ole32: Request the needed memory blocks at once. When requesting a large block of memory, newNumBlocks can be very large and time-consuming. Signed-off-by: Haoyang Chen <chenhaoyang(a)uniontech.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/storage32.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 980b6c8d9f6..1bc8455cc6b 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -4144,7 +4144,7 @@ static void StorageImpl_SetNextBlockInChain( * */ static ULONG StorageImpl_GetNextFreeBigBlock( - StorageImpl* This) + StorageImpl* This, ULONG neededAddNumBlocks) { ULONG depotBlockIndexPos; BYTE depotBuffer[MAX_BIG_BLOCK_SIZE]; @@ -4269,7 +4269,7 @@ static ULONG StorageImpl_GetNextFreeBigBlock( /* * make sure that the block physically exists before using it */ - neededSize.QuadPart = StorageImpl_GetBigBlockOffset(This, freeBlock)+This->bigBlockSize; + neededSize.QuadPart = StorageImpl_GetBigBlockOffset(This, freeBlock)+This->bigBlockSize * neededAddNumBlocks; ILockBytes_Stat(This->lockBytes, &statstg, STATFLAG_NONAME); @@ -7403,7 +7403,7 @@ static BOOL BlockChainStream_Enlarge(BlockChainStream* This, */ if (blockIndex == BLOCK_END_OF_CHAIN) { - blockIndex = StorageImpl_GetNextFreeBigBlock(This->parentStorage); + blockIndex = StorageImpl_GetNextFreeBigBlock(This->parentStorage, 1); StorageImpl_SetNextBlockInChain(This->parentStorage, blockIndex, BLOCK_END_OF_CHAIN); @@ -7472,7 +7472,7 @@ static BOOL BlockChainStream_Enlarge(BlockChainStream* This, { while (oldNumBlocks < newNumBlocks) { - blockIndex = StorageImpl_GetNextFreeBigBlock(This->parentStorage); + blockIndex = StorageImpl_GetNextFreeBigBlock(This->parentStorage, newNumBlocks - oldNumBlocks); StorageImpl_SetNextBlockInChain( This->parentStorage,

1 0

Alexandre Julliard : ntdll/tests: Move Wow64 tests to a separate file.
by Alexandre Julliard 25 Jun '21

25 Jun '21

Module: wine Branch: master Commit: d66bd3e8b1fdf9eacef3864a5c019323cff2c782 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d66bd3e8b1fdf9eacef3864a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 25 17:41:16 2021 +0200 ntdll/tests: Move Wow64 tests to a separate file. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/Makefile.in | 3 +- dlls/ntdll/tests/info.c | 414 -------------------------------------- dlls/ntdll/tests/wow64.c | 467 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 469 insertions(+), 415 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d66bd3e8b1fdf9eacef3…

1 0

Rémi Bernon : d2d1: Use D3D11 interfaces to create buffers.
by Alexandre Julliard 25 Jun '21

25 Jun '21

Module: wine Branch: master Commit: 63b7afb15473a4c12e6d9b208812efa902524445 URL: https://source.winehq.org/git/wine.git/?a=commit;h=63b7afb15473a4c12e6d9b20… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jun 25 09:34:01 2021 +0200 d2d1: Use D3D11 interfaces to create buffers. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49395 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/d2d1_private.h | 8 +- dlls/d2d1/device.c | 211 ++++++++++++++++++++++++++++++----------------- 2 files changed, 138 insertions(+), 81 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=63b7afb15473a4c12e6d…

1 0

Rémi Bernon : d2d1: Use D3D11 interfaces to create input layout.
by Alexandre Julliard 25 Jun '21

25 Jun '21

Module: wine Branch: master Commit: 072d90b19f6ea1674c7a900aa1e1eb8afaf329c7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=072d90b19f6ea1674c7a900a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jun 25 09:34:02 2021 +0200 d2d1: Use D3D11 interfaces to create input layout. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49395 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/d2d1_private.h | 2 +- dlls/d2d1/device.c | 50 ++++++++++++++++++++++++++++-------------------- 2 files changed, 30 insertions(+), 22 deletions(-) diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index e85c93ec277..0f4b52f4c3e 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -73,7 +73,7 @@ struct d2d_error_state struct d2d_shape_resources { - ID3D10InputLayout *il; + ID3D11InputLayout *il; ID3D10VertexShader *vs; }; diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index 5242342c454..10b555c080f 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -125,6 +125,7 @@ static void d2d_device_context_draw(struct d2d_device_context *render_target, en ID3D10Device *device = render_target->d3d_device; ID3D10Buffer *d3d10_ib = NULL, *d3d10_vb = NULL, *d3d10_vs_cb = NULL, *d3d10_ps_cb = NULL; ID3D11Buffer *vs_cb = render_target->vs_cb, *ps_cb = render_target->ps_cb; + ID3D10InputLayout *d3d10_il = NULL; D3D10_RECT scissor_rect; unsigned int offset; D3D10_VIEWPORT vp; @@ -161,6 +162,12 @@ static void d2d_device_context_draw(struct d2d_device_context *render_target, en goto error; } + if (shape_resources->il && FAILED(hr = ID3D11InputLayout_QueryInterface(shape_resources->il, &IID_ID3D10InputLayout, (void **)&d3d10_il))) + { + ERR("Failed to query D3D10 input layout, hr %#x.\n", hr); + goto error; + } + if (FAILED(hr = render_target->stateblock->lpVtbl->Capture(render_target->stateblock))) { WARN("Failed to capture stateblock, hr %#x.\n", hr); @@ -169,7 +176,7 @@ static void d2d_device_context_draw(struct d2d_device_context *render_target, en ID3D10Device_ClearState(device); - ID3D10Device_IASetInputLayout(device, shape_resources->il); + ID3D10Device_IASetInputLayout(device, d3d10_il); ID3D10Device_IASetPrimitiveTopology(device, D3D10_PRIMITIVE_TOPOLOGY_TRIANGLELIST); ID3D10Device_IASetIndexBuffer(device, d3d10_ib, DXGI_FORMAT_R16_UINT, 0); offset = 0; @@ -216,6 +223,7 @@ static void d2d_device_context_draw(struct d2d_device_context *render_target, en WARN("Failed to apply stateblock, hr %#x.\n", hr); error: + if (d3d10_il) ID3D10InputLayout_Release(d3d10_il); if (d3d10_ib) ID3D10Buffer_Release(d3d10_ib); if (d3d10_vb) ID3D10Buffer_Release(d3d10_vb); if (d3d10_vs_cb) ID3D10Buffer_Release(d3d10_vs_cb); @@ -303,7 +311,7 @@ static ULONG STDMETHODCALLTYPE d2d_device_context_inner_Release(IUnknown *iface) for (i = 0; i < D2D_SHAPE_TYPE_COUNT; ++i) { ID3D10VertexShader_Release(context->shape_resources[i].vs); - ID3D10InputLayout_Release(context->shape_resources[i].il); + ID3D11InputLayout_Release(context->shape_resources[i].il); } for (i = 0; i < D2D_SAMPLER_INTERPOLATION_MODE_COUNT; ++i) { @@ -2840,29 +2848,29 @@ static HRESULT d2d_device_context_init(struct d2d_device_context *render_target, unsigned int i; HRESULT hr; - static const D3D10_INPUT_ELEMENT_DESC il_desc_outline[] = + static const D3D11_INPUT_ELEMENT_DESC il_desc_outline[] = { - {"POSITION", 0, DXGI_FORMAT_R32G32_FLOAT, 0, 0, D3D10_INPUT_PER_VERTEX_DATA, 0}, - {"PREV", 0, DXGI_FORMAT_R32G32_FLOAT, 0, 8, D3D10_INPUT_PER_VERTEX_DATA, 0}, - {"NEXT", 0, DXGI_FORMAT_R32G32_FLOAT, 0, 16, D3D10_INPUT_PER_VERTEX_DATA, 0}, + {"POSITION", 0, DXGI_FORMAT_R32G32_FLOAT, 0, 0, D3D11_INPUT_PER_VERTEX_DATA, 0}, + {"PREV", 0, DXGI_FORMAT_R32G32_FLOAT, 0, 8, D3D11_INPUT_PER_VERTEX_DATA, 0}, + {"NEXT", 0, DXGI_FORMAT_R32G32_FLOAT, 0, 16, D3D11_INPUT_PER_VERTEX_DATA, 0}, }; - static const D3D10_INPUT_ELEMENT_DESC il_desc_curve_outline[] = + static const D3D11_INPUT_ELEMENT_DESC il_desc_curve_outline[] = { - {"POSITION", 0, DXGI_FORMAT_R32G32_FLOAT, 0, 0, D3D10_INPUT_PER_VERTEX_DATA, 0}, - {"P", 0, DXGI_FORMAT_R32G32_FLOAT, 0, 8, D3D10_INPUT_PER_VERTEX_DATA, 0}, - {"P", 1, DXGI_FORMAT_R32G32_FLOAT, 0, 16, D3D10_INPUT_PER_VERTEX_DATA, 0}, - {"P", 2, DXGI_FORMAT_R32G32_FLOAT, 0, 24, D3D10_INPUT_PER_VERTEX_DATA, 0}, - {"PREV", 0, DXGI_FORMAT_R32G32_FLOAT, 0, 32, D3D10_INPUT_PER_VERTEX_DATA, 0}, - {"NEXT", 0, DXGI_FORMAT_R32G32_FLOAT, 0, 40, D3D10_INPUT_PER_VERTEX_DATA, 0}, + {"POSITION", 0, DXGI_FORMAT_R32G32_FLOAT, 0, 0, D3D11_INPUT_PER_VERTEX_DATA, 0}, + {"P", 0, DXGI_FORMAT_R32G32_FLOAT, 0, 8, D3D11_INPUT_PER_VERTEX_DATA, 0}, + {"P", 1, DXGI_FORMAT_R32G32_FLOAT, 0, 16, D3D11_INPUT_PER_VERTEX_DATA, 0}, + {"P", 2, DXGI_FORMAT_R32G32_FLOAT, 0, 24, D3D11_INPUT_PER_VERTEX_DATA, 0}, + {"PREV", 0, DXGI_FORMAT_R32G32_FLOAT, 0, 32, D3D11_INPUT_PER_VERTEX_DATA, 0}, + {"NEXT", 0, DXGI_FORMAT_R32G32_FLOAT, 0, 40, D3D11_INPUT_PER_VERTEX_DATA, 0}, }; - static const D3D10_INPUT_ELEMENT_DESC il_desc_triangle[] = + static const D3D11_INPUT_ELEMENT_DESC il_desc_triangle[] = { - {"POSITION", 0, DXGI_FORMAT_R32G32_FLOAT, 0, 0, D3D10_INPUT_PER_VERTEX_DATA, 0}, + {"POSITION", 0, DXGI_FORMAT_R32G32_FLOAT, 0, 0, D3D11_INPUT_PER_VERTEX_DATA, 0}, }; - static const D3D10_INPUT_ELEMENT_DESC il_desc_curve[] = + static const D3D11_INPUT_ELEMENT_DESC il_desc_curve[] = { - {"POSITION", 0, DXGI_FORMAT_R32G32_FLOAT, 0, 0, D3D10_INPUT_PER_VERTEX_DATA, 0}, - {"TEXCOORD", 0, DXGI_FORMAT_R32G32B32_FLOAT, 0, 8, D3D10_INPUT_PER_VERTEX_DATA, 0}, + {"POSITION", 0, DXGI_FORMAT_R32G32_FLOAT, 0, 0, D3D11_INPUT_PER_VERTEX_DATA, 0}, + {"TEXCOORD", 0, DXGI_FORMAT_R32G32B32_FLOAT, 0, 8, D3D11_INPUT_PER_VERTEX_DATA, 0}, }; static const DWORD vs_code_outline[] = { @@ -3856,7 +3864,7 @@ static HRESULT d2d_device_context_init(struct d2d_device_context *render_target, static const struct shape_info { enum d2d_shape_type shape_type; - const D3D10_INPUT_ELEMENT_DESC *il_desc; + const D3D11_INPUT_ELEMENT_DESC *il_desc; unsigned int il_element_count; const void *vs_code; size_t vs_code_size; @@ -3931,7 +3939,7 @@ static HRESULT d2d_device_context_init(struct d2d_device_context *render_target, { const struct shape_info *si = &shape_info[i]; - if (FAILED(hr = ID3D10Device_CreateInputLayout(render_target->d3d_device, si->il_desc, si->il_element_count, + if (FAILED(hr = ID3D11Device1_CreateInputLayout(render_target->d3d11_device, si->il_desc, si->il_element_count, si->vs_code, si->vs_code_size, &render_target->shape_resources[si->shape_type].il))) { WARN("Failed to create input layout for shape type %#x, hr %#x.\n", si->shape_type, hr); @@ -4074,7 +4082,7 @@ err: if (render_target->shape_resources[i].vs) ID3D10VertexShader_Release(render_target->shape_resources[i].vs); if (render_target->shape_resources[i].il) - ID3D10InputLayout_Release(render_target->shape_resources[i].il); + ID3D11InputLayout_Release(render_target->shape_resources[i].il); } if (render_target->stateblock) render_target->stateblock->lpVtbl->Release(render_target->stateblock);

1 0