- Wine-Devel - list.winehq.org

[PATCH 01/12] advapi32/tests: Fix misleading indentation warnings
by Fabian Maurer Jan. 26, 2022

Jan. 26, 2022

Next patchset to fix compiler warnings. There's a lot more to come... I split it up since I figured that's required. I hope I got all of them. For some reason gcc doesn't always give the same warnings. I also only change the indentation where it actually is needed, to cause at least change as possible. wine_todo with curly braces can remain the same. I left quite a few wine_todo with the wrong indentation, as long as they don't cause issues for now. This is for example in a single if/else branch, or at the end of a method. I send it as a series, but they are functionally independent. If one patch is not good enough, you can apply the rest still fine. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/advapi32/tests/security.c | 16 ++++++++-------- dlls/advapi32/tests/service.c | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index c73e28a98e6..009a941c700 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -1028,7 +1028,7 @@ cleanup: rc = GetFileAttributesA(file); rc &= ~(FILE_ATTRIBUTE_NOT_CONTENT_INDEXED|FILE_ATTRIBUTE_COMPRESSED); -todo_wine + todo_wine ok(rc == (FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_READONLY), "expected FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_READONLY got %#x\n", rc); @@ -1488,10 +1488,10 @@ static void test_AccessCheck(void) ret = AccessCheck(SecurityDescriptor, Token, KEY_READ, &Mapping, 0, &PrivSetLen, &Access, &AccessStatus); err = GetLastError(); -todo_wine + todo_wine ok(!ret && err == ERROR_INSUFFICIENT_BUFFER, "AccessCheck should have " "failed with ERROR_INSUFFICIENT_BUFFER, instead of %d\n", err); -todo_wine + todo_wine ok(PrivSetLen == sizeof(PRIVILEGE_SET), "PrivSetLen returns %d\n", PrivSetLen); ok(Access == 0x1abe11ed && AccessStatus == 0x1abe11ed, "Access and/or AccessStatus were changed!\n"); @@ -1600,7 +1600,7 @@ todo_wine PrivSet, &PrivSetLen, &Access, &AccessStatus); err = GetLastError(); ok(ret, "AccessCheck failed with error %d\n", GetLastError()); -todo_wine + todo_wine ok(PrivSetLen == sizeof(PRIVILEGE_SET) + 1, "PrivSetLen returns %d\n", PrivSetLen); ok(AccessStatus && (Access == KEY_READ), "AccessCheck failed to grant access with error %d\n", GetLastError()); @@ -5365,9 +5365,9 @@ static void validate_default_security_descriptor(SECURITY_DESCRIPTOR *sd) SetLastError(0xdeadbeef); ret = GetSecurityDescriptorDacl(sd, &present, &acl, &defaulted); ok(ret, "GetSecurityDescriptorDacl error %d\n", GetLastError()); -todo_wine + todo_wine ok(present == 1, "acl is not present\n"); -todo_wine + todo_wine ok(acl != (void *)0xdeadbeef && acl != NULL, "acl pointer is not set\n"); ok(defaulted == 0, "defaulted is set to TRUE\n"); @@ -5376,7 +5376,7 @@ todo_wine SetLastError(0xdeadbeef); ret = GetSecurityDescriptorOwner(sd, &sid, &defaulted); ok(ret, "GetSecurityDescriptorOwner error %d\n", GetLastError()); -todo_wine + todo_wine ok(sid != (void *)0xdeadbeef && sid != NULL, "sid pointer is not set\n"); ok(defaulted == 0, "defaulted is set to TRUE\n"); @@ -5385,7 +5385,7 @@ todo_wine SetLastError(0xdeadbeef); ret = GetSecurityDescriptorGroup(sd, &sid, &defaulted); ok(ret, "GetSecurityDescriptorGroup error %d\n", GetLastError()); -todo_wine + todo_wine ok(sid != (void *)0xdeadbeef && sid != NULL, "sid pointer is not set\n"); ok(defaulted == 0, "defaulted is set to TRUE\n"); } diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index cbe7fffbc7a..21704048778 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -2728,7 +2728,7 @@ static void test_EventLog(void) !strcmpi(config->lpBinaryPathName, "C:\\windows\\system32\\svchost.exe -k LocalServiceNetworkRestricted") /* Vista+ */ || !strcmpi(config->lpBinaryPathName, "C:\\windows\\system32\\svchost.exe -k LocalServiceNetworkRestricted -p") /* Win10 */, "got %s\n", config->lpBinaryPathName); -todo_wine + todo_wine ok(!strcmpi(config->lpLoadOrderGroup, "Event Log"), "got %s\n", config->lpLoadOrderGroup); ok(config->dwTagId == 0, "Expected 0, got %d\n", config->dwTagId); ok(!config->lpDependencies[0], "lpDependencies is not empty\n"); @@ -2749,7 +2749,7 @@ todo_wine status.dwServiceType == (SERVICE_WIN32_SHARE_PROCESS | SERVICE_WIN32_OWN_PROCESS) /* Win10 */, "got %#x\n", status.dwServiceType); ok(status.dwCurrentState == SERVICE_RUNNING, "got %#x\n", status.dwCurrentState); -todo_wine + todo_wine ok(status.dwControlsAccepted == SERVICE_ACCEPT_SHUTDOWN /* XP */ || status.dwControlsAccepted == (SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_SHUTDOWN) /* 2008 */ || status.dwControlsAccepted == (SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_TIMECHANGE | SERVICE_ACCEPT_SHUTDOWN), -- 2.35.0

4 17

[PATCH 1/5] include: Define MEDIASUBTYPE_MSAUDIO1 in wmcodecdsp.idl.
by Rémi Bernon Jan. 26, 2022

Jan. 26, 2022

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- include/wmcodecdsp.idl | 1 + 1 file changed, 1 insertion(+) diff --git a/include/wmcodecdsp.idl b/include/wmcodecdsp.idl index 1e43766a358..809e528d7e2 100644 --- a/include/wmcodecdsp.idl +++ b/include/wmcodecdsp.idl @@ -20,6 +20,7 @@ import "mediaobj.idl"; import "strmif.idl"; cpp_quote("DEFINE_GUID(MEDIASUBTYPE_I420,0x30323449,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);") +cpp_quote("DEFINE_GUID(MEDIASUBTYPE_MSAUDIO1,0x00000160,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);") [ uuid(bbeea841-0a63-4f52-a7ab-a9b3a84ed38a) -- 2.34.1

4 27

[PATCH] include: Define InterlockedExchangeAdd64() and InterlockedExchangeAddSizeT().
by Zebediah Figura Jan. 26, 2022

Jan. 26, 2022

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- include/winnt.h | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/include/winnt.h b/include/winnt.h index 9296a3dc555..6e834da3ef2 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -6276,6 +6276,7 @@ typedef enum _PROCESS_MITIGATION_POLICY #define InterlockedDecrement16 _InterlockedDecrement16 #define InterlockedExchange _InterlockedExchange #define InterlockedExchangeAdd _InterlockedExchangeAdd +#define InterlockedExchangeAdd64 _InterlockedExchangeAdd64 #define InterlockedExchangePointer _InterlockedExchangePointer #define InterlockedIncrement _InterlockedIncrement #define InterlockedIncrement16 _InterlockedIncrement16 @@ -6291,6 +6292,7 @@ typedef enum _PROCESS_MITIGATION_POLICY #pragma intrinsic(_InterlockedCompareExchange64) #pragma intrinsic(_InterlockedExchange) #pragma intrinsic(_InterlockedExchangeAdd) +#pragma intrinsic(_InterlockedExchangeAdd64) #pragma intrinsic(_InterlockedIncrement) #pragma intrinsic(_InterlockedIncrement16) #pragma intrinsic(_InterlockedDecrement) @@ -6307,6 +6309,7 @@ long _InterlockedDecrement(long volatile*); short _InterlockedDecrement16(short volatile*); long _InterlockedExchange(long volatile*,long); long _InterlockedExchangeAdd(long volatile*,long); +long long _InterlockedExchangeAdd64(long long volatile*,long long); long _InterlockedIncrement(long volatile*); short _InterlockedIncrement16(short volatile*); long _InterlockedOr(long volatile *,long); @@ -6432,6 +6435,11 @@ static FORCEINLINE LONG WINAPI InterlockedExchangeAdd( LONG volatile *dest, LONG return __sync_fetch_and_add( dest, incr ); } +static FORCEINLINE LONGLONG WINAPI InterlockedExchangeAdd64( LONGLONG volatile *dest, LONGLONG incr ) +{ + return __sync_fetch_and_add( dest, incr ); +} + static FORCEINLINE LONG WINAPI InterlockedIncrement( LONG volatile *dest ) { return __sync_add_and_fetch( dest, 1 ); @@ -6515,7 +6523,14 @@ static FORCEINLINE unsigned char InterlockedCompareExchange128( volatile __int64 } #endif -#endif + +#define InterlockedExchangeAddSizeT(a, b) InterlockedExchangeAdd64((LONGLONG *)(a), (b)) + +#else /* _WIN64 */ + +#define InterlockedExchangeAddSizeT(a, b) InterlockedExchangeAdd((LONG *)(a), (b)) + +#endif /* _WIN64 */ static FORCEINLINE void YieldProcessor(void) { -- 2.34.1

1 0

[PATCH vkd3d] build: Disable crosstests as well if tests are disabled.
by Zebediah Figura Jan. 26, 2022

Jan. 26, 2022

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- configure.ac | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index d296dfd4b..f69f1ea4a 100644 --- a/configure.ac +++ b/configure.ac @@ -148,7 +148,7 @@ AC_CONFIG_FILES([Makefile]) AC_OUTPUT dnl Output configuration summary -AS_IF([test "x$CROSSTARGET32" != "xno" -o "x$CROSSTARGET64" != "xno"], +AS_IF([test "x$enable_tests" != "xno" -a $ "x$CROSSTARGET32" != "xno" -o "x$CROSSTARGET64" != "xno" $], [HAVE_CROSSTEST=yes], [HAVE_CROSSTEST=no]) AS_IF([test $DX_FLAG_doc = 1], [HAVE_DOCS=yes], [HAVE_DOCS=no]) @@ -166,6 +166,6 @@ AS_ECHO([" Building documentation: ${HAVE_DOCS} Building crosstests: ${HAVE_CROSSTEST}"]) -AS_IF([test "x$CROSSTARGET32" != "xno"], [AS_ECHO([" Using 32-bit cross compiler: $CROSSCC32"])]) -AS_IF([test "x$CROSSTARGET64" != "xno"], [AS_ECHO([" Using 64-bit cross compiler: $CROSSCC64"])]) +AS_IF([test "$HAVE_CROSSTEST" == "yes" -a "x$CROSSTARGET32" != "xno"], [AS_ECHO([" Using 32-bit cross compiler: $CROSSCC32"])]) +AS_IF([test "$HAVE_CROSSTEST" == "yes" -a "x$CROSSTARGET64" != "xno"], [AS_ECHO([" Using 64-bit cross compiler: $CROSSCC64"])]) AS_ECHO([]) -- 2.34.1

4 3

[PATCH vkd3d v6 1/9] vkd3d-shader/hlsl: Introduce a sm4_src_from_node() helper.
by Matteo Bruni Jan. 26, 2022

Jan. 26, 2022

From: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- libs/vkd3d-shader/hlsl_sm4.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index 8fc4e738..082c1c28 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -748,7 +748,7 @@ struct sm4_instruction } dsts[1]; unsigned int dst_count; - struct + struct sm4_src_register { struct sm4_register reg; enum vkd3d_sm4_swizzle_type swizzle_type; @@ -890,6 +890,16 @@ static void sm4_register_from_node(struct sm4_register *reg, unsigned int *write *writemask = instr->reg.writemask; } +static void sm4_src_from_node(struct sm4_src_register *src, + const struct hlsl_ir_node *instr, unsigned int map_writemask) +{ + unsigned int writemask; + + sm4_register_from_node(&src->reg, &writemask, &src->swizzle_type, instr); + if (src->swizzle_type == VKD3D_SM4_SWIZZLE_VEC4) + src->swizzle = hlsl_map_swizzle(hlsl_swizzle_from_writemask(writemask), map_writemask); +} + static uint32_t sm4_encode_register(const struct sm4_register *reg) { return (reg->type << VKD3D_SM4_REGISTER_TYPE_SHIFT) @@ -1132,7 +1142,6 @@ static void write_sm4_unary_op(struct vkd3d_bytecode_buffer *buffer, enum vkd3d_ const struct hlsl_ir_node *dst, const struct hlsl_ir_node *src, unsigned int src_mod) { struct sm4_instruction instr; - unsigned int writemask; memset(&instr, 0, sizeof(instr)); instr.opcode = opcode; @@ -1140,8 +1149,7 @@ static void write_sm4_unary_op(struct vkd3d_bytecode_buffer *buffer, enum vkd3d_ sm4_register_from_node(&instr.dsts[0].reg, &instr.dsts[0].writemask, NULL, dst); instr.dst_count = 1; - sm4_register_from_node(&instr.srcs[0].reg, &writemask, &instr.srcs[0].swizzle_type, src); - instr.srcs[0].swizzle = hlsl_map_swizzle(hlsl_swizzle_from_writemask(writemask), instr.dsts[0].writemask); + sm4_src_from_node(&instr.srcs[0], src, instr.dsts[0].writemask); instr.srcs[0].reg.mod = src_mod; instr.src_count = 1; @@ -1152,7 +1160,6 @@ static void write_sm4_binary_op(struct vkd3d_bytecode_buffer *buffer, enum vkd3d const struct hlsl_ir_node *dst, const struct hlsl_ir_node *src1, const struct hlsl_ir_node *src2) { struct sm4_instruction instr; - unsigned int writemask; memset(&instr, 0, sizeof(instr)); instr.opcode = opcode; @@ -1160,10 +1167,8 @@ static void write_sm4_binary_op(struct vkd3d_bytecode_buffer *buffer, enum vkd3d sm4_register_from_node(&instr.dsts[0].reg, &instr.dsts[0].writemask, NULL, dst); instr.dst_count = 1; - sm4_register_from_node(&instr.srcs[0].reg, &writemask, &instr.srcs[0].swizzle_type, src1); - instr.srcs[0].swizzle = hlsl_map_swizzle(hlsl_swizzle_from_writemask(writemask), instr.dsts[0].writemask); - sm4_register_from_node(&instr.srcs[1].reg, &writemask, &instr.srcs[1].swizzle_type, src2); - instr.srcs[1].swizzle = hlsl_map_swizzle(hlsl_swizzle_from_writemask(writemask), instr.dsts[0].writemask); + sm4_src_from_node(&instr.srcs[0], src1, instr.dsts[0].writemask); + sm4_src_from_node(&instr.srcs[1], src2, instr.dsts[0].writemask); instr.src_count = 2; write_sm4_instruction(buffer, &instr); @@ -1218,8 +1223,7 @@ static void write_sm4_ld(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *buf sm4_register_from_node(&instr.dsts[0].reg, &instr.dsts[0].writemask, NULL, dst); instr.dst_count = 1; - sm4_register_from_node(&instr.srcs[0].reg, &writemask, &instr.srcs[0].swizzle_type, coords); - instr.srcs[0].swizzle = hlsl_swizzle_from_writemask(writemask); + sm4_src_from_node(&instr.srcs[0], coords, VKD3DSP_WRITEMASK_ALL); /* Mipmap level is in the last component in the IR, but needs to be in the W * component in the instruction. */ @@ -1263,8 +1267,7 @@ static void write_sm4_sample(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer sm4_register_from_node(&instr.dsts[0].reg, &instr.dsts[0].writemask, NULL, dst); instr.dst_count = 1; - sm4_register_from_node(&instr.srcs[0].reg, &writemask, &instr.srcs[0].swizzle_type, coords); - instr.srcs[0].swizzle = hlsl_swizzle_from_writemask(writemask); + sm4_src_from_node(&instr.srcs[0], coords, VKD3DSP_WRITEMASK_ALL); sm4_register_from_deref(ctx, &instr.srcs[1].reg, &writemask, &instr.srcs[1].swizzle_type, resource, resource_type); @@ -1621,12 +1624,10 @@ static void write_sm4_if(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *buf .opcode = VKD3D_SM4_OP_IF | VKD3D_SM4_CONDITIONAL_NZ, .src_count = 1, }; - unsigned int writemask; assert(iff->condition.node->data_type->dimx == 1); - sm4_register_from_node(&instr.srcs[0].reg, &writemask, &instr.srcs[0].swizzle_type, iff->condition.node); - instr.srcs[0].swizzle = hlsl_swizzle_from_writemask(writemask); + sm4_src_from_node(&instr.srcs[0], iff->condition.node, VKD3DSP_WRITEMASK_ALL); write_sm4_instruction(buffer, &instr); write_sm4_block(ctx, buffer, &iff->then_instrs); @@ -1741,8 +1742,7 @@ static void write_sm4_store(struct hlsl_ctx *ctx, instr.dsts[0].writemask = hlsl_combine_writemasks(writemask, store->writemask); instr.dst_count = 1; - sm4_register_from_node(&instr.srcs[0].reg, &writemask, &instr.srcs[0].swizzle_type, rhs); - instr.srcs[0].swizzle = hlsl_map_swizzle(hlsl_swizzle_from_writemask(writemask), instr.dsts[0].writemask); + sm4_src_from_node(&instr.srcs[0], rhs, instr.dsts[0].writemask); instr.src_count = 1; write_sm4_instruction(buffer, &instr); -- 2.34.1

2 17

[PATCH v4 3/3] msvcp140_atomic_wait: Implement __std_parallel_algorithms_hw_threads.
by Piotr Caban Jan. 26, 2022

Jan. 26, 2022

From: Daniel Lehman <dlehman(a)esri.com> v2 - call function in msvcp140 instead of copy v3 - without internal header v4 - remove DllMain Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- configure.ac | 1 + dlls/msvcp140_atomic_wait/Makefile.in | 4 ++ dlls/msvcp140_atomic_wait/main.c | 32 ++++++++++ .../msvcp140_atomic_wait.spec | 2 +- dlls/msvcp140_atomic_wait/tests/Makefile.in | 4 ++ .../tests/msvcp140_atomic_wait.c | 60 +++++++++++++++++++ 6 files changed, 102 insertions(+), 1 deletion(-) create mode 100644 dlls/msvcp140_atomic_wait/main.c create mode 100644 dlls/msvcp140_atomic_wait/tests/Makefile.in create mode 100644 dlls/msvcp140_atomic_wait/tests/msvcp140_atomic_wait.c

1 0

[PATCH v3 2/3] msvcp140_atomic_wait: Add stub dll.
by Daniel Lehman Jan. 26, 2022

Jan. 26, 2022

2 1

[PATCH v3 1/3] msvcp140: Add importlib.
by Daniel Lehman Jan. 26, 2022

Jan. 26, 2022

2 1

[PATCH v2 2/2] ntdll/tests: Add more tests for NtOpenKey/NtCreateKey.
by Dmitry Timoshkov Jan. 26, 2022

Jan. 26, 2022

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/ntdll/tests/reg.c | 42 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 41 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index 445c05a02e1..16ce80a3dbf 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -456,6 +456,26 @@ todo_wine ok( status == STATUS_OBJECT_TYPE_MISMATCH, "NtOpenKey failed: 0x%08x\n", status ); pRtlFreeUnicodeString( &str ); + pRtlCreateUnicodeStringFromAsciiz( &str, "\\REGISTRY\\Machine\\Software\\Classes123" ); + str.Buffer[str.Length/sizeof(WCHAR) - 1] = 0; + str.Buffer[str.Length/sizeof(WCHAR) - 2] = 0; + str.Buffer[str.Length/sizeof(WCHAR) - 3] = 0; + str.Length += sizeof(WCHAR); /* include terminating \0 in the length */ + status = pNtOpenKey( &key, KEY_READ, &attr ); + ok( status == STATUS_SUCCESS || broken(status == STATUS_OBJECT_NAME_NOT_FOUND) /* win8 */, + "NtOpenKey failed: 0x%08x\n", status ); + if (!status) pNtClose( key ); + pRtlFreeUnicodeString( &str ); + + pRtlCreateUnicodeStringFromAsciiz( &str, "\\REGISTRY\\Machine\\Software\\Classes123" ); + str.Buffer[str.Length/sizeof(WCHAR) - 3] = 0; + status = pNtOpenKey( &key, KEY_READ, &attr ); + todo_wine + ok( status == STATUS_SUCCESS || broken(status == STATUS_OBJECT_NAME_NOT_FOUND) /* win10 */, + "NtOpenKey failed: 0x%08x\n", status ); + pNtClose( key ); + pRtlFreeUnicodeString( &str ); + if (!pNtOpenKeyEx) { win_skip("NtOpenKeyEx not available\n"); @@ -630,13 +650,33 @@ static void test_NtCreateKey(void) status = pNtCreateKey( &subkey, am, &attr, 0, 0, 0, 0 ); ok( status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08x\n", status ); - if (!status) pNtClose( subkey ); + pNtClose( subkey ); pRtlFreeUnicodeString( &str ); pRtlCreateUnicodeStringFromAsciiz( &str, "\\REGISTRY\\MACHINE\\SOFTWARE\\CLASSES" ); status = pNtCreateKey( &subkey, am, &attr, 0, 0, 0, 0 ); ok( status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08x\n", status ); + pNtClose( subkey ); + pRtlFreeUnicodeString( &str ); + + pRtlCreateUnicodeStringFromAsciiz( &str, "\\REGISTRY\\Machine\\Software\\Classes123" ); + str.Buffer[str.Length/sizeof(WCHAR) - 1] = 0; + str.Buffer[str.Length/sizeof(WCHAR) - 2] = 0; + str.Buffer[str.Length/sizeof(WCHAR) - 3] = 0; + str.Length += sizeof(WCHAR); /* include terminating \0 in the length */ + status = pNtCreateKey( &subkey, am, &attr, 0, 0, 0, 0 ); + ok( status == STATUS_SUCCESS || broken(status == STATUS_OBJECT_PATH_NOT_FOUND) /* win8 */, + "NtCreateKey failed: 0x%08x\n", status ); + if (!status) pNtClose( subkey ); + pRtlFreeUnicodeString( &str ); + + pRtlCreateUnicodeStringFromAsciiz( &str, "\\REGISTRY\\Machine\\Software\\Classes123" ); + str.Buffer[str.Length/sizeof(WCHAR) - 3] = 0; + str.Length += sizeof(WCHAR); /* include terminating \0 in the length */ + status = pNtCreateKey( &subkey, am, &attr, 0, 0, 0, 0 ); + ok( status == STATUS_SUCCESS || broken(status == STATUS_OBJECT_PATH_NOT_FOUND) /* win8 */, + "NtCreateKey failed: 0x%08x\n", status ); if (!status) pNtClose( subkey ); pRtlFreeUnicodeString( &str ); -- 2.34.1

1 0

[PATCH] shell32: Ignore KF_FLAG_NOT_PARENT_RELATIVE in SHGetKnownFolderPath().
by Nikolay Sivov Jan. 26, 2022

Jan. 26, 2022

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/shell32/shellpath.c | 15 ++++++++++++++- dlls/shell32/tests/shellpath.c | 13 +++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index 7bfa504a62f..2f1573f8221 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -3529,11 +3529,24 @@ HRESULT WINAPI SHGetKnownFolderPath(REFKNOWNFOLDERID rfid, DWORD flags, HANDLE t return HRESULT_FROM_WIN32( ERROR_FILE_NOT_FOUND ); if (flags & ~(KF_FLAG_CREATE|KF_FLAG_SIMPLE_IDLIST|KF_FLAG_DONT_UNEXPAND| - KF_FLAG_DONT_VERIFY|KF_FLAG_NO_ALIAS|KF_FLAG_INIT|KF_FLAG_DEFAULT_PATH)) + KF_FLAG_DONT_VERIFY|KF_FLAG_NO_ALIAS|KF_FLAG_INIT|KF_FLAG_DEFAULT_PATH|KF_FLAG_NOT_PARENT_RELATIVE)) { FIXME("flags 0x%08x not supported\n", flags); return E_INVALIDARG; } + + if ((flags & (KF_FLAG_DEFAULT_PATH | KF_FLAG_NOT_PARENT_RELATIVE)) == KF_FLAG_NOT_PARENT_RELATIVE) + { + WARN("Invalid flags mask %#x.\n", flags); + return E_INVALIDARG; + } + + if (flags & KF_FLAG_NOT_PARENT_RELATIVE) + { + FIXME("Ignoring KF_FLAG_NOT_PARENT_RELATIVE.\n"); + flags &= ~KF_FLAG_NOT_PARENT_RELATIVE; + } + folder |= flags & CSIDL_FLAG_MASK; shgfp_flags = flags & KF_FLAG_DEFAULT_PATH ? SHGFP_TYPE_DEFAULT : SHGFP_TYPE_CURRENT; diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c index 0ba3734c518..7d0f725158a 100644 --- a/dlls/shell32/tests/shellpath.c +++ b/dlls/shell32/tests/shellpath.c @@ -1910,6 +1910,19 @@ if (0) { /* crashes */ ok(!lstrcmpiW(path, path2), "expected equal paths: %s, %s\n", wine_dbgstr_w(path), wine_dbgstr_w(path2)); CoTaskMemFree(path2); + hr = pSHGetKnownFolderPath(folder_id, KF_FLAG_DEFAULT_PATH, NULL, &path2); + ok(hr == S_OK, "expected S_OK, got 0x%08x\n", hr); + ok(path2 != NULL, "expected path != NULL\n"); + CoTaskMemFree(path2); + + hr = pSHGetKnownFolderPath(folder_id, KF_FLAG_NOT_PARENT_RELATIVE, NULL, &path2); + ok(hr == E_INVALIDARG, "expected S_OK, got 0x%08x\n", hr); + + hr = pSHGetKnownFolderPath(folder_id, KF_FLAG_DEFAULT_PATH | KF_FLAG_NOT_PARENT_RELATIVE, NULL, &path2); + ok(hr == S_OK, "expected S_OK, got 0x%08x\n", hr); + ok(path2 != NULL, "expected path != NULL\n"); + CoTaskMemFree(path2); + CoTaskMemFree(path); } -- 2.34.1

1 0