July 2023 - Wine-commits - list.winehq.org

Alex Henrie : kernel32/tests: Check that lpSectionBase != NULL before dereferencing.
by Alexandre Julliard 19 Jul '23

19 Jul '23

Module: wine Branch: stable Commit: 4e404052e73046e507d572cd97ffbf8cba2c27f4 URL: https://gitlab.winehq.org/wine/wine/-/commit/4e404052e73046e507d572cd97ffbf… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Apr 12 22:58:06 2023 -0600 kernel32/tests: Check that lpSectionBase != NULL before dereferencing. If lpSectionBase is null then the tests will still crash, but at least we'll know why. (cherry picked from commit bd7459579d1fa448912151fd2d51564eb6b8716d) --- dlls/kernel32/tests/actctx.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c index bec04b7f066..af29a372f99 100644 --- a/dlls/kernel32/tests/actctx.c +++ b/dlls/kernel32/tests/actctx.c @@ -1410,8 +1410,8 @@ static void test_find_activatable_class(HANDLE handle, const WCHAR *classid, enu ok_(__FILE__, line)(data.lpData != NULL, "got lpData %p\n", data.lpData); header = (struct strsection_header *)data.lpSectionBase; - ok_(__FILE__, line)(header->magic == 0x64487353, "got wrong magic 0x%08lx\n", header->magic); ok_(__FILE__, line)(data.lpSectionBase != NULL, "got lpSectionBase %p\n", data.lpSectionBase); + ok_(__FILE__, line)(header->magic == 0x64487353, "got wrong magic 0x%08lx\n", header->magic); ok_(__FILE__, line)(data.ulSectionTotalLength > 0, "got ulSectionTotalLength %lu\n", data.ulSectionTotalLength); ok_(__FILE__, line)(data.lpSectionGlobalData == (BYTE *)header + header->global_offset, "got lpSectionGlobalData %p\n", data.lpSectionGlobalData); @@ -1662,10 +1662,10 @@ static void test_find_com_redirection(HANDLE handle, const GUID *clsid, const GU } header = (struct guidsection_header*)data.lpSectionBase; + ok_(__FILE__, line)(data.lpSectionBase != NULL, "data.lpSectionBase == NULL\n"); ok_(__FILE__, line)(data.lpSectionGlobalData == ((BYTE*)header + header->names_offset), "data.lpSectionGlobalData == NULL\n"); ok_(__FILE__, line)(data.ulSectionGlobalDataLength == header->names_len, "data.ulSectionGlobalDataLength=%lu\n", data.ulSectionGlobalDataLength); - ok_(__FILE__, line)(data.lpSectionBase != NULL, "data.lpSectionBase == NULL\n"); ok_(__FILE__, line)(data.ulSectionTotalLength > 0, "data.ulSectionTotalLength=%lu\n", data.ulSectionTotalLength); ok_(__FILE__, line)(data.hActCtx == NULL, "data.hActCtx=%p\n", data.hActCtx); @@ -1870,9 +1870,9 @@ static void test_find_progid_redirection(HANDLE handle, const GUID *clsid, const } header = (struct strsection_header*)data.lpSectionBase; + ok_(__FILE__, line)(data.lpSectionBase != NULL, "data.lpSectionBase == NULL\n"); ok_(__FILE__, line)(data.lpSectionGlobalData == (BYTE*)header + header->global_offset, "data.lpSectionGlobalData == NULL\n"); ok_(__FILE__, line)(data.ulSectionGlobalDataLength == header->global_len, "data.ulSectionGlobalDataLength=%lu\n", data.ulSectionGlobalDataLength); - ok_(__FILE__, line)(data.lpSectionBase != NULL, "data.lpSectionBase == NULL\n"); ok_(__FILE__, line)(data.ulSectionTotalLength > 0, "data.ulSectionTotalLength=%lu\n", data.ulSectionTotalLength); ok_(__FILE__, line)(data.hActCtx == NULL, "data.hActCtx=%p\n", data.hActCtx); ok_(__FILE__, line)(data.ulAssemblyRosterIndex == exid, "data.ulAssemblyRosterIndex=%lu, expected %lu\n",

1 0

Alex Henrie : ntdll: Increment offset by len in build_clr_surrogate_section.
by Alexandre Julliard 19 Jul '23

19 Jul '23

Module: wine Branch: stable Commit: 2ce8587ab39182d8651c267e44136691b91c8459 URL: https://gitlab.winehq.org/wine/wine/-/commit/2ce8587ab39182d8651c267e441366… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Apr 20 09:03:47 2023 -0600 ntdll: Increment offset by len in build_clr_surrogate_section. Instead of multiplying it by 2. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54808 Co-authored-by: Nikolay Sivov <nsivov(a)codeweavers.com> (cherry picked from commit 7af7ff872b3b1f3ab82a2b666cae2bd3d9401006) --- dlls/kernel32/tests/actctx.c | 38 +++++++++++++++++++++++++++++++++++++- dlls/ntdll/actctx.c | 2 +- 2 files changed, 38 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c index af29a372f99..5b31518ad06 100644 --- a/dlls/kernel32/tests/actctx.c +++ b/dlls/kernel32/tests/actctx.c @@ -147,6 +147,11 @@ static const char manifest3[] = " name=\"testsurrogate\"" " runtimeVersion=\"v2.0.50727\"" " />" +" <clrSurrogate " +" clsid=\"{96666666-8888-7777-6666-555555555556}\"" +" name=\"testsurrogate\"" +" runtimeVersion=\"v2.0.50728\"" +" />" " <clrClass " " clsid=\"{22345678-1234-5678-1234-111122223333}\"" " name=\"clrclass\"" @@ -1548,6 +1553,29 @@ struct clrclass_data { DWORD res2[2]; }; +static void validate_guid_index(const ACTCTX_SECTION_KEYED_DATA *data, int line) +{ +#define GUIDSECTION_MAGIC 0x64487347 /* dHsG */ + struct guidsection_header *header; + struct guid_index *index; + unsigned int i; + + header = (struct guidsection_header *)data->lpSectionBase; + + ok_(__FILE__, line)(header->magic == GUIDSECTION_MAGIC, "Unexpected magic %#lx.\n", header->magic); + ok_(__FILE__, line)(header->size == sizeof(*header), "Unexpected size %ld.\n", header->size); + ok_(__FILE__, line)(header->index_offset >= sizeof(*header), "Unexpected index offset %lu.\n", header->index_offset); + + index = (struct guid_index *)((BYTE *)data->lpSectionBase + header->index_offset); + for (i = 0; i < header->count; ++i) + { + ok_(__FILE__, line)(index[i].data_len <= data->ulSectionTotalLength, "Unexpected data length.\n"); + ok_(__FILE__, line)(index[i].data_offset <= data->ulSectionTotalLength - index[i].data_len, + "Unexpected data offset %ld, section total length %lu, data length %lu.\n", + index[i].data_offset, data->ulSectionTotalLength, index[i].data_len); + } +} + static void test_find_com_redirection(HANDLE handle, const GUID *clsid, const GUID *tlid, const WCHAR *progid, ULONG exid, int line) { struct comclassredirect_data *comclass, *comclass2; @@ -1671,6 +1699,7 @@ static void test_find_com_redirection(HANDLE handle, const GUID *clsid, const GU ok_(__FILE__, line)(data.hActCtx == NULL, "data.hActCtx=%p\n", data.hActCtx); ok_(__FILE__, line)(data.ulAssemblyRosterIndex == exid, "data.ulAssemblyRosterIndex=%lu, expected %lu\n", data.ulAssemblyRosterIndex, exid); + validate_guid_index(&data, line); /* generated guid for this class works as key guid in search */ memset(&data2, 0xfe, sizeof(data2)); @@ -1757,6 +1786,8 @@ static void test_find_ifaceps_redirection(HANDLE handle, const GUID *iid, const ok_(__FILE__, line)(data.hActCtx == NULL, "data.hActCtx=%p\n", data.hActCtx); ok_(__FILE__, line)(data.ulAssemblyRosterIndex == exid, "data.ulAssemblyRosterIndex=%lu, expected %lu\n", data.ulAssemblyRosterIndex, exid); + + validate_guid_index(&data, line); } struct clrsurrogate_data @@ -1771,7 +1802,7 @@ struct clrsurrogate_data }; static void test_find_surrogate(HANDLE handle, const GUID *clsid, const WCHAR *name, const WCHAR *version, - ULONG exid, int line) + ULONG exid, int line) { struct clrsurrogate_data *surrogate; ACTCTX_SECTION_KEYED_DATA data; @@ -1827,6 +1858,8 @@ static void test_find_surrogate(HANDLE handle, const GUID *clsid, const WCHAR *n ok_(__FILE__, line)(data.hActCtx == NULL, "data.hActCtx=%p\n", data.hActCtx); ok_(__FILE__, line)(data.ulAssemblyRosterIndex == exid, "data.ulAssemblyRosterIndex=%lu, expected %lu\n", data.ulAssemblyRosterIndex, exid); + + validate_guid_index(&data, line); } static void test_find_progid_redirection(HANDLE handle, const GUID *clsid, const char *progid, ULONG exid, int line) @@ -1867,6 +1900,8 @@ static void test_find_progid_redirection(HANDLE handle, const GUID *clsid, const comclass = (struct comclassredirect_data*)data2.lpData; ok_(__FILE__, line)(IsEqualGUID(guid, &comclass->alias), "got wrong alias referenced from progid %s, %s\n", progid, wine_dbgstr_guid(guid)); ok_(__FILE__, line)(IsEqualGUID(clsid, &comclass->clsid), "got wrong class referenced from progid %s, %s\n", progid, wine_dbgstr_guid(clsid)); + + validate_guid_index(&data2, line); } header = (struct strsection_header*)data.lpSectionBase; @@ -2032,6 +2067,7 @@ static void test_typelib_section(void) section = (struct guidsection_header*)data.lpSectionBase; ok(section->count == 4, "got %ld\n", section->count); ok(section->size == sizeof(*section), "got %ld\n", section->size); + validate_guid_index(&data, __LINE__); /* For both GUIDs same section is returned */ ok(data.lpSectionBase == data2.lpSectionBase, "got %p, %p\n", data.lpSectionBase, data2.lpSectionBase); diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 721a2f339a5..d8597e5c7fb 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -4818,7 +4818,7 @@ static NTSTATUS build_clr_surrogate_section(ACTIVATION_CONTEXT* actctx, struct g ptrW[data->version_len/sizeof(WCHAR)] = 0; } - data_offset += index->data_offset; + data_offset += index->data_len; index++; } }

1 0

Alexandre Julliard : kernelbase: Move to a higher address on 64-bit.
by Alexandre Julliard 19 Jul '23

19 Jul '23

Module: wine Branch: stable Commit: 67fcadd439ae48f92954417a245267eb2603a0ee URL: https://gitlab.winehq.org/wine/wine/-/commit/67fcadd439ae48f92954417a245267… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Apr 22 16:09:19 2023 +0200 kernelbase: Move to a higher address on 64-bit. (cherry picked from commit cab914c3aa66e26e6756c6704848265ddfcbf3a4) --- dlls/kernelbase/Makefile.in | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/kernelbase/Makefile.in b/dlls/kernelbase/Makefile.in index 38db49d7034..1f10fe8cc0b 100644 --- a/dlls/kernelbase/Makefile.in +++ b/dlls/kernelbase/Makefile.in @@ -3,7 +3,9 @@ MODULE = kernelbase.dll IMPORTLIB = kernelbase IMPORTS = uuid ntdll winecrt0 -EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -Wl,--image-base,0x7b000000 +EXTRADLLFLAGS = -nodefaultlibs -nostartfiles +i386_EXTRADLLFLAGS = -Wl,--image-base,0x7b000000 +x86_64_EXTRADLLFLAGS = -Wl,--image-base,0x174000000 C_SRCS = \ console.c \

1 0

Brendan Shanks : include/msvcrt: Add __WINE_(DEALLOC|MALLOC) attributes to _strdup and _wcsdup.
by Alexandre Julliard 19 Jul '23

19 Jul '23

Module: wine Branch: stable Commit: a4ca007083e6108654a02057af5253aed6bdef0b URL: https://gitlab.winehq.org/wine/wine/-/commit/a4ca007083e6108654a02057af5253… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Mon Dec 5 11:36:31 2022 -0800 include/msvcrt: Add __WINE_(DEALLOC|MALLOC) attributes to _strdup and _wcsdup. (cherry picked from commit 3a688e81a6de77bbed1a21d9649339950847cd0a) --- include/msvcrt/corecrt.h | 12 ++++++++++++ include/msvcrt/corecrt_wstring.h | 3 ++- include/msvcrt/string.h | 3 ++- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/include/msvcrt/corecrt.h b/include/msvcrt/corecrt.h index aba9bc9422e..9f403c7d10e 100644 --- a/include/msvcrt/corecrt.h +++ b/include/msvcrt/corecrt.h @@ -342,4 +342,16 @@ typedef struct threadlocaleinfostruct { #define __WINE_CRT_SCANF_ATTR(fmt,args) #endif +#if defined(__GNUC__) && (__GNUC__ > 10) +#define __WINE_DEALLOC(...) __attribute__((malloc (__VA_ARGS__))) +#else +#define __WINE_DEALLOC(...) +#endif + +#if defined(__GNUC__) && (__GNUC__ > 2) +#define __WINE_MALLOC __attribute__((malloc)) +#else +#define __WINE_MALLOC +#endif + #endif /* __WINE_CORECRT_H */ diff --git a/include/msvcrt/corecrt_wstring.h b/include/msvcrt/corecrt_wstring.h index bcf9f947625..4d012800f65 100644 --- a/include/msvcrt/corecrt_wstring.h +++ b/include/msvcrt/corecrt_wstring.h @@ -7,6 +7,7 @@ #define _WSTRING_DEFINED #include <corecrt.h> +#include <corecrt_malloc.h> #ifdef __cplusplus extern "C" { @@ -29,7 +30,7 @@ static inline void* memccpy(void *s1, const void *s2, int c, size_t n) { return _ACRTIMP void* __cdecl memmove(void*,const void*,size_t); -_ACRTIMP wchar_t* __cdecl _wcsdup(const wchar_t*); +_ACRTIMP wchar_t* __cdecl _wcsdup(const wchar_t*) __WINE_DEALLOC(free) __WINE_MALLOC; _ACRTIMP int __cdecl _wcsicmp(const wchar_t*,const wchar_t*); _ACRTIMP int __cdecl _wcsicoll(const wchar_t*,const wchar_t*); _ACRTIMP int __cdecl _wcsicoll_l(const wchar_t*, const wchar_t*, _locale_t); diff --git a/include/msvcrt/string.h b/include/msvcrt/string.h index 5e3d51076c6..18d424b1e6a 100644 --- a/include/msvcrt/string.h +++ b/include/msvcrt/string.h @@ -8,6 +8,7 @@ #ifndef __WINE_STRING_H #define __WINE_STRING_H +#include <corecrt_malloc.h> #include <corecrt_wstring.h> #ifndef _NLSCMP_DEFINED @@ -22,7 +23,7 @@ extern "C" { _ACRTIMP size_t __cdecl __strncnt(const char*,size_t); _ACRTIMP int __cdecl _strcmpi(const char*,const char*); _ACRTIMP int __cdecl _strcoll_l(const char*, const char*, _locale_t); -_ACRTIMP char* __cdecl _strdup(const char*); +_ACRTIMP char* __cdecl _strdup(const char*) __WINE_DEALLOC(free) __WINE_MALLOC; _ACRTIMP char* __cdecl _strerror(const char*); _ACRTIMP errno_t __cdecl strerror_s(char*,size_t,int); _ACRTIMP int __cdecl _stricmp(const char*,const char*);

1 0

Michael Stefaniuc : dmsynth: Don't crash when Open() gets a DMUS_PORTPARAMS7.
by Alexandre Julliard 19 Jul '23

19 Jul '23

Module: wine Branch: stable Commit: 27edcc17d812fa9c22deb1cf2e1dc4eb6b5be4b0 URL: https://gitlab.winehq.org/wine/wine/-/commit/27edcc17d812fa9c22deb1cf2e1dc4… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Mar 29 22:35:32 2023 +0200 dmsynth: Don't crash when Open() gets a DMUS_PORTPARAMS7. Wrong sizeof check: pointer instead of referenced structure. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53704 (cherry picked from commit 48fdc8e08c4150c74e6c740df82518405125541d) --- dlls/dmsynth/synth.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dmsynth/synth.c b/dlls/dmsynth/synth.c index 121d9aadf35..3631bcfe784 100644 --- a/dlls/dmsynth/synth.c +++ b/dlls/dmsynth/synth.c @@ -163,7 +163,7 @@ static HRESULT WINAPI IDirectMusicSynth8Impl_Open(IDirectMusicSynth8 *iface, DMU modified = TRUE; params->fShare = FALSE; - if (params->dwSize >= sizeof(params)) { + if (params->dwSize >= sizeof(*params)) { if (params->dwValidParams & DMUS_PORTPARAMS_FEATURES && params->dwFeatures) { if (params->dwFeatures & ~(DMUS_PORT_FEATURE_AUDIOPATH|DMUS_PORT_FEATURE_STREAMING)) { modified = TRUE;

1 0

Vijay Kiran Kamuju : msvcr100: Add _UnrealizedChore::_CheckTaskCollection stub.
by Alexandre Julliard 19 Jul '23

19 Jul '23

Module: wine Branch: stable Commit: 67da15b5dc921b3a41a68e6ca719f8ceb8e0ecec URL: https://gitlab.winehq.org/wine/wine/-/commit/67da15b5dc921b3a41a68e6ca719f8… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Fri Mar 17 13:19:19 2023 +0000 msvcr100: Add _UnrealizedChore::_CheckTaskCollection stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53794 (cherry picked from commit 8426109a439c35334f72fbf12aa15948366b2fb4) --- dlls/concrt140/concrt140.spec | 6 +++--- dlls/msvcr100/msvcr100.spec | 4 ++-- dlls/msvcr110/msvcr110.spec | 6 +++--- dlls/msvcr120/msvcr120.spec | 6 +++--- dlls/msvcr120_app/msvcr120_app.spec | 6 +++--- dlls/msvcrt/concurrency.c | 8 ++++++++ 6 files changed, 22 insertions(+), 14 deletions(-) diff --git a/dlls/concrt140/concrt140.spec b/dlls/concrt140/concrt140.spec index 8ddf2255f31..f2b2789a5e2 100644 --- a/dlls/concrt140/concrt140.spec +++ b/dlls/concrt140/concrt140.spec @@ -440,9 +440,9 @@ @ stub -arch=arm ?_Cancel(a)_TaskCollection@details(a)Concurrency@@QAAXXZ @ stub -arch=i386 ?_Cancel(a)_TaskCollection@details(a)Concurrency@@QAEXXZ @ stub -arch=win64 ?_Cancel(a)_TaskCollection@details(a)Concurrency@@QEAAXXZ -@ stub -arch=arm ?_CheckTaskCollection(a)_UnrealizedChore@details(a)Concurrency@@IAAXXZ -@ stub -arch=i386 ?_CheckTaskCollection(a)_UnrealizedChore@details(a)Concurrency@@IAEXXZ -@ stub -arch=win64 ?_CheckTaskCollection(a)_UnrealizedChore@details(a)Concurrency@@IEAAXXZ +@ cdecl -arch=arm ?_CheckTaskCollection(a)_UnrealizedChore@details(a)Concurrency@@IAAXXZ(ptr) _UnrealizedChore__CheckTaskCollection +@ thiscall -arch=i386 ?_CheckTaskCollection(a)_UnrealizedChore@details(a)Concurrency@@IAEXXZ(ptr) _UnrealizedChore__CheckTaskCollection +@ cdecl -arch=win64 ?_CheckTaskCollection(a)_UnrealizedChore@details(a)Concurrency@@IEAAXXZ(ptr) _UnrealizedChore__CheckTaskCollection @ stub -arch=arm ?_CleanupToken(a)_StructuredTaskCollection@details(a)Concurrency@@AAAXXZ @ stub -arch=i386 ?_CleanupToken(a)_StructuredTaskCollection@details(a)Concurrency@@AAEXXZ @ stub -arch=win64 ?_CleanupToken(a)_StructuredTaskCollection@details(a)Concurrency@@AEAAXXZ diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index e2107055c24..3e2839b3908 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -313,8 +313,8 @@ @ cdecl -arch=win64 ?_Cancel(a)_StructuredTaskCollection@details(a)Concurrency@@QEAAXXZ(ptr) _StructuredTaskCollection__Cancel @ stub -arch=win32 ?_Cancel(a)_TaskCollection@details(a)Concurrency@@QAEXXZ @ stub -arch=win64 ?_Cancel(a)_TaskCollection@details(a)Concurrency@@QEAAXXZ -@ stub -arch=win32 ?_CheckTaskCollection(a)_UnrealizedChore@details(a)Concurrency@@IAEXXZ -@ stub -arch=win64 ?_CheckTaskCollection(a)_UnrealizedChore@details(a)Concurrency@@IEAAXXZ +@ thiscall -arch=win32 ?_CheckTaskCollection(a)_UnrealizedChore@details(a)Concurrency@@IAEXXZ(ptr) _UnrealizedChore__CheckTaskCollection +@ cdecl -arch=win64 ?_CheckTaskCollection(a)_UnrealizedChore@details(a)Concurrency@@IEAAXXZ(ptr) _UnrealizedChore__CheckTaskCollection @ stub -arch=win32 ?_ConcRT_Assert(a)details@Concurrency@@YAXPBD0H(a)Z @ stub -arch=win64 ?_ConcRT_Assert(a)details@Concurrency@@YAXPEBD0H(a)Z @ stub -arch=win32 ?_ConcRT_CoreAssert(a)details@Concurrency@@YAXPBD0H(a)Z diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 4fc5a069fbb..c23293ea658 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -493,9 +493,9 @@ @ stub -arch=arm ?_Cancel(a)_TaskCollection@details(a)Concurrency@@QAAXXZ @ stub -arch=i386 ?_Cancel(a)_TaskCollection@details(a)Concurrency@@QAEXXZ @ stub -arch=win64 ?_Cancel(a)_TaskCollection@details(a)Concurrency@@QEAAXXZ -@ stub -arch=arm ?_CheckTaskCollection(a)_UnrealizedChore@details(a)Concurrency@@IAAXXZ -@ stub -arch=i386 ?_CheckTaskCollection(a)_UnrealizedChore@details(a)Concurrency@@IAEXXZ -@ stub -arch=win64 ?_CheckTaskCollection(a)_UnrealizedChore@details(a)Concurrency@@IEAAXXZ +@ cdecl -arch=arm ?_CheckTaskCollection(a)_UnrealizedChore@details(a)Concurrency@@IAAXXZ(ptr) _UnrealizedChore__CheckTaskCollection +@ thiscall -arch=i386 ?_CheckTaskCollection(a)_UnrealizedChore@details(a)Concurrency@@IAEXXZ(ptr) _UnrealizedChore__CheckTaskCollection +@ cdecl -arch=win64 ?_CheckTaskCollection(a)_UnrealizedChore@details(a)Concurrency@@IEAAXXZ(ptr) _UnrealizedChore__CheckTaskCollection @ stub -arch=arm ?_CleanupToken(a)_StructuredTaskCollection@details(a)Concurrency@@AAAXXZ @ stub -arch=i386 ?_CleanupToken(a)_StructuredTaskCollection@details(a)Concurrency@@AAEXXZ @ stub -arch=win64 ?_CleanupToken(a)_StructuredTaskCollection@details(a)Concurrency@@AEAAXXZ diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 7b379830d4b..6eac1937227 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -490,9 +490,9 @@ @ stub -arch=arm ?_Cancel(a)_TaskCollection@details(a)Concurrency@@QAAXXZ @ stub -arch=i386 ?_Cancel(a)_TaskCollection@details(a)Concurrency@@QAEXXZ @ stub -arch=win64 ?_Cancel(a)_TaskCollection@details(a)Concurrency@@QEAAXXZ -@ stub -arch=arm ?_CheckTaskCollection(a)_UnrealizedChore@details(a)Concurrency@@IAAXXZ -@ stub -arch=i386 ?_CheckTaskCollection(a)_UnrealizedChore@details(a)Concurrency@@IAEXXZ -@ stub -arch=win64 ?_CheckTaskCollection(a)_UnrealizedChore@details(a)Concurrency@@IEAAXXZ +@ cdecl -arch=arm ?_CheckTaskCollection(a)_UnrealizedChore@details(a)Concurrency@@IAAXXZ(ptr) _UnrealizedChore__CheckTaskCollection +@ thiscall -arch=i386 ?_CheckTaskCollection(a)_UnrealizedChore@details(a)Concurrency@@IAEXXZ(ptr) _UnrealizedChore__CheckTaskCollection +@ cdecl -arch=win64 ?_CheckTaskCollection(a)_UnrealizedChore@details(a)Concurrency@@IEAAXXZ(ptr) _UnrealizedChore__CheckTaskCollection @ stub -arch=arm ?_CleanupToken(a)_StructuredTaskCollection@details(a)Concurrency@@AAAXXZ @ stub -arch=i386 ?_CleanupToken(a)_StructuredTaskCollection@details(a)Concurrency@@AAEXXZ @ stub -arch=win64 ?_CleanupToken(a)_StructuredTaskCollection@details(a)Concurrency@@AEAAXXZ diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 37282fc54f8..aad6ece8acc 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -487,9 +487,9 @@ @ stub -arch=arm ?_Cancel(a)_TaskCollection@details(a)Concurrency@@QAAXXZ @ stub -arch=i386 ?_Cancel(a)_TaskCollection@details(a)Concurrency@@QAEXXZ @ stub -arch=win64 ?_Cancel(a)_TaskCollection@details(a)Concurrency@@QEAAXXZ -@ stub -arch=arm ?_CheckTaskCollection(a)_UnrealizedChore@details(a)Concurrency@@IAAXXZ -@ stub -arch=i386 ?_CheckTaskCollection(a)_UnrealizedChore@details(a)Concurrency@@IAEXXZ -@ stub -arch=win64 ?_CheckTaskCollection(a)_UnrealizedChore@details(a)Concurrency@@IEAAXXZ +@ cdecl -arch=arm ?_CheckTaskCollection(a)_UnrealizedChore@details(a)Concurrency@@IAAXXZ(ptr) msvcr120.?_CheckTaskCollection(a)_UnrealizedChore@details(a)Concurrency@@IAAXXZ +@ thiscall -arch=i386 ?_CheckTaskCollection(a)_UnrealizedChore@details(a)Concurrency@@IAEXXZ(ptr) msvcr120.?_CheckTaskCollection(a)_UnrealizedChore@details(a)Concurrency@@IAEXXZ +@ cdecl -arch=win64 ?_CheckTaskCollection(a)_UnrealizedChore@details(a)Concurrency@@IEAAXXZ(ptr) msvcr120.?_CheckTaskCollection(a)_UnrealizedChore@details(a)Concurrency@@IEAAXXZ @ stub -arch=arm ?_CleanupToken(a)_StructuredTaskCollection@details(a)Concurrency@@AAAXXZ @ stub -arch=i386 ?_CleanupToken(a)_StructuredTaskCollection@details(a)Concurrency@@AAEXXZ @ stub -arch=win64 ?_CleanupToken(a)_StructuredTaskCollection@details(a)Concurrency@@AEAAXXZ diff --git a/dlls/msvcrt/concurrency.c b/dlls/msvcrt/concurrency.c index fe156938e3a..01ba54308f0 100644 --- a/dlls/msvcrt/concurrency.c +++ b/dlls/msvcrt/concurrency.c @@ -2224,6 +2224,14 @@ bool __thiscall _StructuredTaskCollection__IsCanceling( return FALSE; } +/* ?_CheckTaskCollection(a)_UnrealizedChore@details(a)Concurrency@@IAEXXZ */ +/* ?_CheckTaskCollection(a)_UnrealizedChore@details(a)Concurrency@@IEAAXXZ */ +DEFINE_THISCALL_WRAPPER(_UnrealizedChore__CheckTaskCollection, 4) +void __thiscall _UnrealizedChore__CheckTaskCollection(_UnrealizedChore *this) +{ + FIXME("() stub\n"); +} + /* ??0critical_section(a)Concurrency@@QAE(a)XZ */ /* ??0critical_section(a)Concurrency@@QEAA(a)XZ */ DEFINE_THISCALL_WRAPPER(critical_section_ctor, 4)

1 0

Mohamad Al-Jaf : pdh: Implement PdhVbGetDoubleCounterValue().
by Alexandre Julliard 19 Jul '23

19 Jul '23

Module: wine Branch: stable Commit: c747c1f2586bc2bbc67046a80a9100080336090c URL: https://gitlab.winehq.org/wine/wine/-/commit/c747c1f2586bc2bbc67046a80a9100… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Tue Nov 1 20:49:41 2022 -0500 pdh: Implement PdhVbGetDoubleCounterValue(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54618 (cherry picked from commit e1c59cc5621a8d3420fc30314fd8daa5c6e55a26) --- dlls/pdh/pdh.spec | 2 +- dlls/pdh/pdh_main.c | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/dlls/pdh/pdh.spec b/dlls/pdh/pdh.spec index 5f61a8a42ca..711c970029b 100644 --- a/dlls/pdh/pdh.spec +++ b/dlls/pdh/pdh.spec @@ -145,7 +145,7 @@ @ stub PdhVbCreateCounterPathList @ stub PdhVbGetCounterPathElements @ stub PdhVbGetCounterPathFromList -@ stub PdhVbGetDoubleCounterValue +@ stdcall PdhVbGetDoubleCounterValue(ptr ptr) @ stub PdhVbGetLogFileSize @ stub PdhVbGetOneCounterPath @ stub PdhVbIsGoodStatus diff --git a/dlls/pdh/pdh_main.c b/dlls/pdh/pdh_main.c index 7eae7872b48..121b7e712ce 100644 --- a/dlls/pdh/pdh_main.c +++ b/dlls/pdh/pdh_main.c @@ -1062,6 +1062,23 @@ PDH_STATUS WINAPI PdhVbAddCounter( PDH_HQUERY query, LPCSTR path, PDH_HCOUNTER * return PDH_NOT_IMPLEMENTED; } +/*********************************************************************** + * PdhVbGetDoubleCounterValue (PDH.@) + */ +double WINAPI PdhVbGetDoubleCounterValue( PDH_HCOUNTER handle, PDH_STATUS *counter_status ) +{ + PDH_FMT_COUNTERVALUE value; + PDH_STATUS status; + + TRACE( "%p %p\n", handle, counter_status ); + + memset( &value, 0, sizeof(value) ); + status = PdhGetFormattedCounterValue( handle, PDH_FMT_DOUBLE, NULL, &value ); + + if (counter_status) *counter_status = status; + return value.u.doubleValue; +} + /*********************************************************************** * PdhValidatePathExA (PDH.@) */

1 0

Mohamad Al-Jaf : pdh/tests: Add PdhVbGetDoubleCounterValue() tests.
by Alexandre Julliard 19 Jul '23

19 Jul '23

Module: wine Branch: stable Commit: dd4f5f9d79cc61dc62ef302111db1cab557fadad URL: https://gitlab.winehq.org/wine/wine/-/commit/dd4f5f9d79cc61dc62ef302111db1c… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Sun Mar 5 17:35:21 2023 -0500 pdh/tests: Add PdhVbGetDoubleCounterValue() tests. (cherry picked from commit 2af11b6ee7736c3b26223b62233886e6a2616682) --- dlls/pdh/tests/pdh.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/dlls/pdh/tests/pdh.c b/dlls/pdh/tests/pdh.c index 195fd89eba5..e5d6fa8205e 100644 --- a/dlls/pdh/tests/pdh.c +++ b/dlls/pdh/tests/pdh.c @@ -34,6 +34,7 @@ static PDH_STATUS (WINAPI *pPdhAddEnglishCounterW)(PDH_HQUERY, LPCWSTR, DWORD_ static PDH_STATUS (WINAPI *pPdhCollectQueryDataWithTime)(PDH_HQUERY, LONGLONG *); static PDH_STATUS (WINAPI *pPdhValidatePathExA)(PDH_HLOG, LPCSTR); static PDH_STATUS (WINAPI *pPdhValidatePathExW)(PDH_HLOG, LPCWSTR); +static double (WINAPI *pPdhVbGetDoubleCounterValue)(PDH_HCOUNTER, PDH_STATUS *); #define GETFUNCPTR(func) p##func = (void *)GetProcAddress( pdh, #func ); @@ -69,6 +70,7 @@ static void init_function_ptrs( void ) GETFUNCPTR( PdhCollectQueryDataWithTime ) GETFUNCPTR( PdhValidatePathExA ) GETFUNCPTR( PdhValidatePathExW ) + GETFUNCPTR( PdhVbGetDoubleCounterValue ) } static const WCHAR processor_time[] = L"% Processor Time"; @@ -424,6 +426,46 @@ static void test_PdhGetRawCounterValue( void ) ok(ret == ERROR_SUCCESS, "PdhCloseQuery failed 0x%08lx\n", ret); } +static void test_PdhVbGetDoubleCounterValue(void) +{ + PDH_FMT_COUNTERVALUE value; + PDH_HCOUNTER counter; + PDH_STATUS status; + PDH_HQUERY query; + double ret; + + status = PdhOpenQueryA( NULL, 0, &query ); + ok(status == ERROR_SUCCESS, "PdhOpenQueryA failed 0x%08lx\n", status); + + status = PdhAddCounterA( query, "\\System\\System Up Time", 0, &counter ); + ok(status == ERROR_SUCCESS, "PdhAddCounterA failed 0x%08lx\n", status); + + status = PdhCollectQueryData(query); + ok(status == ERROR_SUCCESS, "PdhCollectQueryData failed 0x%08lx\n", status); + + status = PdhGetFormattedCounterValue( counter, PDH_FMT_DOUBLE, NULL, &value ); + ok(status == ERROR_SUCCESS, "PdhGetFormattedCounterValue failed 0x%08lx\n", status); + + ret = pPdhVbGetDoubleCounterValue( NULL, NULL ); + ok(ret == 0.0, "Unexpected value %f\n", ret); + + status = PDH_FUNCTION_NOT_FOUND; + ret = pPdhVbGetDoubleCounterValue( NULL, &status ); + ok(status == PDH_INVALID_HANDLE, "PdhVbGetDoubleCounterValue failed 0x%08lx\n", status); + ok(ret == 0.0, "Unexpected value %f\n", ret); + + ret = pPdhVbGetDoubleCounterValue( counter, NULL ); + ok(ret == value.doubleValue, "Unexpected value %f\n", ret); + + status = PDH_FUNCTION_NOT_FOUND; + ret = pPdhVbGetDoubleCounterValue( counter, &status ); + ok(status == ERROR_SUCCESS, "PdhVbGetDoubleCounterValue failed 0x%08lx\n", status); + ok(ret == value.doubleValue, "Unexpected value %f\n", ret); + + status = PdhCloseQuery(query); + ok(status == ERROR_SUCCESS, "PdhCloseQuery failed 0x%08lx\n", status); +} + static void test_PdhSetCounterScaleFactor( void ) { PDH_STATUS ret; @@ -998,6 +1040,8 @@ START_TEST(pdh) test_PdhSetCounterScaleFactor(); test_PdhGetCounterTimeBase(); + test_PdhVbGetDoubleCounterValue(); + test_PdhGetCounterInfoA(); test_PdhGetCounterInfoW();

1 0

Alex Henrie : comctl32/treeview: Ignore the lParam to WM_PRINTCLIENT and add tests.
by Alexandre Julliard 19 Jul '23

19 Jul '23

Module: wine Branch: stable Commit: 40ee74b5dc2c37608007004b79ed09e40594b0e7 URL: https://gitlab.winehq.org/wine/wine/-/commit/40ee74b5dc2c37608007004b79ed09… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Mar 14 21:59:04 2023 -0600 comctl32/treeview: Ignore the lParam to WM_PRINTCLIENT and add tests. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54640 (cherry picked from commit 231199bc462e2aa8fa98247b66022c62281fb508) --- dlls/comctl32/tests/treeview.c | 61 ++++++++++++++++++++++++++++++++++++++++++ dlls/comctl32/treeview.c | 17 ++++-------- 2 files changed, 66 insertions(+), 12 deletions(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index eda57ed2c81..4b5703b6b76 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -2181,6 +2181,66 @@ static void test_WM_PAINT(void) DestroyWindow(hTree); } +static void test_WM_PRINTCLIENT(void) +{ + static const LPARAM params[] = {0, PRF_CHECKVISIBLE, PRF_NONCLIENT, PRF_CLIENT, PRF_ERASEBKGND, + PRF_CHILDREN, PRF_OWNED}; + BOOL glyph_is_transparent; + HTHEME hTheme; + HWND hTree; + COLORREF clr; + LONG ret; + RECT rc; + HDC hdc; + int i; + + hTree = create_treeview_control(0); + + clr = SendMessageA(hTree, TVM_SETBKCOLOR, 0, RGB(255, 0, 0)); + ok(clr == CLR_NONE, "got 0x%lx, expected 0x%lx\n", clr, CLR_NONE); + + hdc = GetDC(hMainWnd); + GetClientRect(hMainWnd, &rc); + + hTheme = pGetWindowTheme(hTree); + glyph_is_transparent = hTheme && pIsThemeBackgroundPartiallyTransparent(hTheme, TVP_GLYPH, 0); + + /* test parameters when the treeview is visible */ + for (i = 0; i < ARRAY_SIZE(params); i++) + { + winetest_push_context("lParam=0x%Ix", params[i]); + FillRect(hdc, &rc, GetStockObject(BLACK_BRUSH)); + clr = GetPixel(hdc, 1, 1); + ok(clr == RGB(0, 0, 0), "got 0x%lx\n", clr); + ret = SendMessageA(hTree, WM_PRINTCLIENT, (WPARAM)hdc, params[i]); + ok(ret == 0, "got %ld\n", ret); + clr = GetPixel(hdc, 1, 1); + ok(clr == RGB(255, 0, 0) || (glyph_is_transparent && clr == GetSysColor(COLOR_WINDOW)), + "got 0x%lx\n", clr); + winetest_pop_context(); + } + + /* test parameters when the treeview is hidden */ + ShowWindow(hTree, SW_HIDE); + for (i = 0; i < ARRAY_SIZE(params); i++) + { + winetest_push_context("lParam=0x%Ix", params[i]); + FillRect(hdc, &rc, GetStockObject(BLACK_BRUSH)); + clr = GetPixel(hdc, 1, 1); + ok(clr == RGB(0, 0, 0), "got 0x%lx\n", clr); + ret = SendMessageA(hTree, WM_PRINTCLIENT, (WPARAM)hdc, params[i]); + ok(ret == 0, "got %ld\n", ret); + clr = GetPixel(hdc, 1, 1); + ok(clr == RGB(255, 0, 0) || (glyph_is_transparent && clr == GetSysColor(COLOR_WINDOW)), + "got 0x%lx\n", clr); + winetest_pop_context(); + } + ShowWindow(hTree, SW_SHOW); + + ReleaseDC(hMainWnd, hdc); + DestroyWindow(hTree); +} + static void test_delete_items(void) { const struct message *msg; @@ -3042,6 +3102,7 @@ START_TEST(treeview) test_expandnotify(); test_TVS_SINGLEEXPAND(); test_WM_PAINT(); + test_WM_PRINTCLIENT(); test_delete_items(); test_cchildren(); test_htreeitem_layout(FALSE); diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 1c87dc29b05..e866f82db11 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -3114,20 +3114,13 @@ TREEVIEW_Paint(TREEVIEW_INFO *infoPtr, HDC hdc_ref) static LRESULT TREEVIEW_PrintClient(TREEVIEW_INFO *infoPtr, HDC hdc, DWORD options) { - FIXME("Partial Stub: (hdc=%p options=%#lx)\n", hdc, options); - - if ((options & PRF_CHECKVISIBLE) && !IsWindowVisible(infoPtr->hwnd)) - return 0; + RECT rc; - if (options & PRF_ERASEBKGND) - TREEVIEW_EraseBackground(infoPtr, hdc); + FIXME("Partial Stub: (hdc=%p options=%#lx)\n", hdc, options); - if (options & PRF_CLIENT) - { - RECT rc; - GetClientRect(infoPtr->hwnd, &rc); - TREEVIEW_Refresh(infoPtr, hdc, &rc); - } + TREEVIEW_EraseBackground(infoPtr, hdc); + GetClientRect(infoPtr->hwnd, &rc); + TREEVIEW_Refresh(infoPtr, hdc, &rc); return 0; }

1 0

Louis Lenders : wine.inf: Add EditionID to HKEY_LOCAL_MACHINE\Software\Microsoft\Windows NT\CurrentVersion.
by Alexandre Julliard 19 Jul '23

19 Jul '23

Module: wine Branch: stable Commit: aed64c043359904ddd6107a0ad588fa0faed3849 URL: https://gitlab.winehq.org/wine/wine/-/commit/aed64c043359904ddd6107a0ad588f… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Sat Mar 25 18:32:07 2023 +0100 wine.inf: Add EditionID to HKEY_LOCAL_MACHINE\Software\Microsoft\Windows NT\CurrentVersion. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54675 Conflicts: loader/wine.inf.in (cherry picked from commit e8b0c9239562ed78c94d7dba87d5004b4d82b113) --- loader/wine.inf.in | 1 + 1 file changed, 1 insertion(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index f1525c4f6dd..20dc77e56a8 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2467,6 +2467,7 @@ HKLM,%CurrentVersionNT%,"DigitalProductId",1,00,00,00,00,00,00,00,00,00,00,00,\ 00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\ 00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\ 00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%,"EditionId",2,"Professional" HKLM,%CurrentVersionNT%,"ProductName",2,"Microsoft Windows 7" HKLM,%Control%\ProductOptions,"ProductType",2,"WinNT" HKLM,%Control%\Windows,"CSDVersion",0x10003,0x100

1 0