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

Zebediah Figura : vkd3d-shader: Allow declarations to specify type modifiers redundant with the type.
by Alexandre Julliard June 28, 2021

June 28, 2021

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

Haoyang Chen : ole32: Request the needed memory blocks at once.
by Alexandre Julliard June 25, 2021

June 25, 2021

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

Huw Davies : nsi: Add stub implementations of NsiAllocateAndGetTable() and NsiFreeTable().
by Alexandre Julliard June 25, 2021

June 25, 2021

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

Bernhard Übelacker : winedbg: Try to load debug symbols for executable in gdb mode.
by Alexandre Julliard June 25, 2021

June 25, 2021

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

Huw Davies : nsi: Add a stub dll.
by Alexandre Julliard June 25, 2021

June 25, 2021

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 : uuid: Add a few NPI module ids.
by Alexandre Julliard June 25, 2021

June 25, 2021

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/tests: Add tests for the NDIS ifinfo table.
by Alexandre Julliard June 25, 2021

June 25, 2021

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

Huw Davies : include: Add netiodef.h.
by Alexandre Julliard June 25, 2021

June 25, 2021

Module: wine Branch: master Commit: bfdf115cd6d17059fc1102ca5dce6ca9e8942910 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bfdf115cd6d17059fc1102ca… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Jun 25 10:22:41 2021 +0100 include: Add netiodef.h. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/netiodef.h | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 5b84d7858ff..4a8c261bb8f 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -524,6 +524,7 @@ SOURCES = \ netcon.idl \ netfw.idl \ netioapi.h \ + netiodef.h \ netlistmgr.idl \ newdev.h \ nldef.h \ diff --git a/include/netiodef.h b/include/netiodef.h new file mode 100644 index 00000000000..611359c49f8 --- /dev/null +++ b/include/netiodef.h @@ -0,0 +1,60 @@ +/* + * 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_NETIODEF_H +#define __WINE_NETIODEF_H + +typedef enum _NPI_MODULEID_TYPE +{ + MIT_GUID = 1, + MIT_IF_LUID +} NPI_MODULEID_TYPE; + +typedef struct _NPI_MODULEID +{ + USHORT Length; + NPI_MODULEID_TYPE Type; + union + { + GUID Guid; + LUID IfLuid; + }; +} NPI_MODULEID; + +typedef const NPI_MODULEID *PNPI_MODULEID; + +static inline BOOLEAN NmrIsEqualNpiModuleId( const NPI_MODULEID *mod1, const NPI_MODULEID *mod2 ) +{ + if (mod1->Type == mod2->Type) + { + if (mod1->Type == MIT_GUID) + { +#ifdef __cplusplus + return IsEqualGUID( mod1->Guid, mod2->Guid ); +#else + return IsEqualGUID( &mod1->Guid, &mod2->Guid ); +#endif + } + else if (mod1->Type == MIT_IF_LUID) + return mod1->IfLuid.HighPart == mod2->IfLuid.HighPart && + mod1->IfLuid.LowPart == mod2->IfLuid.LowPart; + } + return FALSE; +} + +#endif /* __WINE_NETIODEF_H */

1 0

Henri Verbeet : wined3d: Use wined3d_mask_from_size() in wined3d_context_gl_enable_clip_distances().
by Alexandre Julliard June 25, 2021

June 25, 2021

Module: wine Branch: master Commit: 0fd45ba2be3e971db16d7201a9ae1bb62ab7cee8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0fd45ba2be3e971db16d7201… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 25 15:01:31 2021 +0200 wined3d: Use wined3d_mask_from_size() in wined3d_context_gl_enable_clip_distances(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context_gl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 43c086ac758..742dc5f3042 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -2396,8 +2396,8 @@ void wined3d_context_gl_enable_clip_distances(struct wined3d_context_gl *context clip_distance_count = gl_info->limits.user_clip_distances; disable_mask = ~enable_mask; - enable_mask &= (1u << clip_distance_count) - 1; - disable_mask &= (1u << clip_distance_count) - 1; + enable_mask &= wined3d_mask_from_size(clip_distance_count); + disable_mask &= wined3d_mask_from_size(clip_distance_count); current_mask = context_gl->c.clip_distance_mask; context_gl->c.clip_distance_mask = enable_mask;

1 0

Brendan McGrath : kernelbase: Don't pass StdHandles with CREATE_NEW_CONSOLE.
by Alexandre Julliard June 25, 2021

June 25, 2021

Module: wine Branch: master Commit: 7539dd607b5a9840d13849a0668d9e8982e20c8c URL: https://source.winehq.org/git/wine.git/?a=commit;h=7539dd607b5a9840d13849a0… Author: Brendan McGrath <brendan(a)redmandi.com> Date: Fri Jun 25 07:01:56 2021 +1000 kernelbase: Don't pass StdHandles with CREATE_NEW_CONSOLE. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51264 Signed-off-by: Brendan McGrath <brendan(a)redmandi.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/process.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernelbase/process.c b/dlls/kernelbase/process.c index 924fa733e5b..7296e085382 100644 --- a/dlls/kernelbase/process.c +++ b/dlls/kernelbase/process.c @@ -198,7 +198,7 @@ static RTL_USER_PROCESS_PARAMETERS *create_process_params( const WCHAR *filename params->hStdOutput = startup->hStdOutput; params->hStdError = startup->hStdError; } - else if (flags & DETACHED_PROCESS) + else if (flags & (DETACHED_PROCESS | CREATE_NEW_CONSOLE)) { params->hStdInput = INVALID_HANDLE_VALUE; params->hStdOutput = INVALID_HANDLE_VALUE;

1 0