April 2022 - Wine-devel - list.winehq.org

[PATCH v2 1/4] kernelbase: Use the same HLOCAL entry pointer alignment as native.
by Rémi Bernon 04 Apr '22

04 Apr '22

This changes the GlobalUnlock todo_wine as we previously considered the invalid mem handle as a valid pointer, and we now instead check handle validity. Returning TRUE in for an invalid handle doesn't seem very important, and a corner case, and it breaks compatibility and imm32 tests. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/kernel32/heap.c | 10 ++++------ dlls/kernel32/tests/heap.c | 17 +---------------- dlls/kernelbase/memory.c | 10 ++++------ 3 files changed, 9 insertions(+), 28 deletions(-) diff --git a/dlls/kernel32/heap.c b/dlls/kernel32/heap.c index dbb240d89fc..20505b673ec 100644 --- a/dlls/kernel32/heap.c +++ b/dlls/kernel32/heap.c @@ -147,8 +147,6 @@ BOOL WINAPI HeapDestroy( HANDLE heap /* [in] Handle of heap */ ) * Global/local heap functions, keep in sync with kernelbase/memory.c ***********************************************************************/ -#include "pshpack1.h" - struct mem_entry { union @@ -156,15 +154,15 @@ struct mem_entry struct { WORD magic; - void *ptr; BYTE flags; BYTE lock; }; void *next_free; }; + void *ptr; }; -#include "poppack.h" +C_ASSERT(sizeof(struct mem_entry) == 2 * sizeof(void *)); struct kernelbase_global_data *kernelbase_global_data; @@ -181,7 +179,7 @@ static inline struct mem_entry *unsafe_mem_from_HLOCAL( HLOCAL handle ) { struct mem_entry *mem = CONTAINING_RECORD( handle, struct mem_entry, ptr ); struct kernelbase_global_data *data = kernelbase_global_data; - if (!((ULONG_PTR)handle & 2)) return NULL; + if (((UINT_PTR)handle & ((sizeof(void *) << 1) - 1)) != sizeof(void *)) return NULL; if (mem < data->mem_entries || mem >= data->mem_entries_end) return NULL; if (mem->magic != MAGIC_LOCAL_USED) return NULL; return mem; @@ -189,7 +187,7 @@ static inline struct mem_entry *unsafe_mem_from_HLOCAL( HLOCAL handle ) static inline void *unsafe_ptr_from_HLOCAL( HLOCAL handle ) { - if ((ULONG_PTR)handle & 2) return NULL; + if (((UINT_PTR)handle & ((sizeof(void *) << 1) - 1))) return NULL; return handle; } diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index 476be96cea8..5d6383a49e5 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -368,9 +368,7 @@ static void test_GlobalAlloc(void) mem = GlobalAlloc( GMEM_MOVEABLE, alloc_size ); ok( !!mem, "GlobalAlloc failed, error %lu\n", GetLastError() ); - todo_wine ok( ((UINT_PTR)mem & sizeof(void *)), "got unexpected entry align\n" ); - todo_wine ok( !((UINT_PTR)mem & (sizeof(void *) - 1)), "got unexpected entry align\n" ); entry = mem_entry_from_HANDLE( mem ); @@ -414,9 +412,7 @@ static void test_GlobalAlloc(void) ok( !tmp_mem, "GlobalFree failed, error %lu\n", GetLastError() ); ok( !!entry->flags, "got unexpected flags %#Ix\n", entry->flags ); ok( !((UINT_PTR)entry->flags & sizeof(void *)), "got unexpected ptr align\n" ); - todo_wine_if(sizeof(void *) == 4) ok( !((UINT_PTR)entry->flags & (sizeof(void *) - 1)), "got unexpected ptr align\n" ); - todo_wine ok( !entry->ptr, "got unexpected ptr %p\n", entry->ptr ); mem = GlobalAlloc( GMEM_MOVEABLE | GMEM_DISCARDABLE, 0 ); @@ -543,29 +539,24 @@ static void test_GlobalAlloc(void) ok( GetLastError() == ERROR_INVALID_HANDLE, "got error %lu\n", GetLastError() ); SetLastError( 0xdeadbeef ); flags = GlobalFlags( invalid_mem ); - todo_wine ok( flags == GMEM_INVALID_HANDLE, "GlobalFlags succeeded\n" ); - todo_wine ok( GetLastError() == ERROR_INVALID_HANDLE, "got error %lu\n", GetLastError() ); SetLastError( 0xdeadbeef ); size = GlobalSize( invalid_mem ); ok( size == 0, "GlobalSize succeeded\n" ); - todo_wine ok( GetLastError() == ERROR_INVALID_HANDLE, "got error %lu\n", GetLastError() ); SetLastError( 0xdeadbeef ); ptr = GlobalLock( invalid_mem ); ok( !ptr, "GlobalLock succeeded\n" ); - todo_wine ok( GetLastError() == ERROR_INVALID_HANDLE, "got error %lu\n", GetLastError() ); SetLastError( 0xdeadbeef ); ret = GlobalUnlock( invalid_mem ); - ok( ret, "GlobalUnlock failed, error %lu\n", GetLastError() ); todo_wine + ok( ret, "GlobalUnlock failed, error %lu\n", GetLastError() ); ok( GetLastError() == ERROR_INVALID_HANDLE, "got error %lu\n", GetLastError() ); SetLastError( 0xdeadbeef ); tmp_mem = GlobalReAlloc( invalid_mem, 0, GMEM_MOVEABLE ); ok( !tmp_mem, "GlobalReAlloc succeeded\n" ); - todo_wine ok( GetLastError() == ERROR_INVALID_HANDLE, "got error %lu\n", GetLastError() ); /* invalid pointers are caught */ @@ -889,29 +880,23 @@ static void test_LocalAlloc(void) ok( GetLastError() == ERROR_INVALID_HANDLE, "got error %lu\n", GetLastError() ); SetLastError( 0xdeadbeef ); flags = LocalFlags( invalid_mem ); - todo_wine ok( flags == LMEM_INVALID_HANDLE, "LocalFlags succeeded\n" ); - todo_wine ok( GetLastError() == ERROR_INVALID_HANDLE, "got error %lu\n", GetLastError() ); SetLastError( 0xdeadbeef ); size = LocalSize( invalid_mem ); ok( size == 0, "LocalSize succeeded\n" ); - todo_wine ok( GetLastError() == ERROR_INVALID_HANDLE, "got error %lu\n", GetLastError() ); SetLastError( 0xdeadbeef ); ptr = LocalLock( invalid_mem ); ok( !ptr, "LocalLock succeeded\n" ); - todo_wine ok( GetLastError() == ERROR_INVALID_HANDLE, "got error %lu\n", GetLastError() ); SetLastError( 0xdeadbeef ); ret = LocalUnlock( invalid_mem ); ok( !ret, "LocalUnlock succeeded\n" ); - todo_wine ok( GetLastError() == ERROR_INVALID_HANDLE, "got error %lu\n", GetLastError() ); SetLastError( 0xdeadbeef ); tmp_mem = LocalReAlloc( invalid_mem, 0, LMEM_MOVEABLE ); ok( !tmp_mem, "LocalReAlloc succeeded\n" ); - todo_wine ok( GetLastError() == ERROR_INVALID_HANDLE, "got error %lu\n", GetLastError() ); /* invalid pointers are caught */ diff --git a/dlls/kernelbase/memory.c b/dlls/kernelbase/memory.c index 5bdab31589d..086674ab41c 100644 --- a/dlls/kernelbase/memory.c +++ b/dlls/kernelbase/memory.c @@ -585,8 +585,6 @@ struct kernelbase_global_data struct mem_entry *mem_entries_end; }; -#include "pshpack1.h" - struct mem_entry { union @@ -594,15 +592,15 @@ struct mem_entry struct { WORD magic; - void *ptr; BYTE flags; BYTE lock; }; void *next_free; }; + void *ptr; }; -#include "poppack.h" +C_ASSERT(sizeof(struct mem_entry) == 2 * sizeof(void *)); #define MAX_MEM_HANDLES 0x10000 static struct mem_entry mem_entries[MAX_MEM_HANDLES]; @@ -626,7 +624,7 @@ static inline struct mem_entry *unsafe_mem_from_HLOCAL( HLOCAL handle ) { struct mem_entry *mem = CONTAINING_RECORD( handle, struct mem_entry, ptr ); struct kernelbase_global_data *data = &kernelbase_global_data; - if (!((ULONG_PTR)handle & 2)) return NULL; + if (((UINT_PTR)handle & ((sizeof(void *) << 1) - 1)) != sizeof(void *)) return NULL; if (mem < data->mem_entries || mem >= data->mem_entries_end) return NULL; if (mem->magic != MAGIC_LOCAL_USED) return NULL; return mem; @@ -639,7 +637,7 @@ static inline HLOCAL HLOCAL_from_mem( struct mem_entry *mem ) static inline void *unsafe_ptr_from_HLOCAL( HLOCAL handle ) { - if ((ULONG_PTR)handle & 2) return NULL; + if (((UINT_PTR)handle & ((sizeof(void *) << 1) - 1))) return NULL; return handle; } -- 2.35.1

2 4

[PATCH][widl] Fix uninitialized read in write_union_tfs
by Raphael Isemann 04 Apr '22

04 Apr '22

The summary of how the bug happens is: 1. union_memsize gets called with a pointer to uninitialized `dummy`. ``` static unsigned int write_union_tfs(FILE *file, const attr_list_t *attrs, type_t *type, unsigned int *tfsoff) { [...] unsigned int dummy; [...] size = union_memsize(fields, &dummy); ``` 2. `union_memsize` reads `pmaxa` (which points to dummy) to set the initial value of align. ``` static unsigned int union_memsize(const var_list_t *fields, unsigned int *pmaxa) { unsigned int size, maxs = 0; unsigned int align = *pmaxa; const var_t *v; if (fields) LIST_FOR_EACH_ENTRY( v, fields, const var_t, entry ) { /* we could have an empty default field with NULL type */ if (v->declspec.type) { size = type_memsize_and_alignment(v->declspec.type, &align); if (maxs < size) maxs = size; if (*pmaxa < align) *pmaxa = align; } } ``` `type_memsize_and_alignment` then descends down and passes along the uninitialized `align`. `type_memsize_and_alignment` will use this to find the required alignment for the type (and will round up the computed type size to the uninitialized alignment if necessary). This patch just initializes `dummy` to 0 (which means the 'real' alignment value) should set the value to a real alignment. --- tools/widl/typegen.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index b2d9ab5..eb0fa5e 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -3327,7 +3327,7 @@ static unsigned int write_union_tfs(FILE *file, const attr_list_t *attrs, unsigned int nbranch = 0; type_t *deftype = NULL; short nodeftype = 0xffff; - unsigned int dummy; + unsigned int dummy = 0; var_t *f; if (processed(type) && -- 2.35.1

2 1

[PATCH 1/3] msvcr100: Add _StructuredTaskCollection::_Schedule stub.
by Torge Matthies 04 Apr '22

04 Apr '22

Signed-off-by: Torge Matthies <tmatthies(a)codeweavers.com> --- dlls/concrt140/concrt140.spec | 2 +- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcrt/concurrency.c | 12 ++++++++++++ 6 files changed, 17 insertions(+), 5 deletions(-) diff --git a/dlls/concrt140/concrt140.spec b/dlls/concrt140/concrt140.spec index 50db9348327..ab57c736672 100644 --- a/dlls/concrt140/concrt140.spec +++ b/dlls/concrt140/concrt140.spec @@ -596,7 +596,7 @@ @ stub -arch=win64 ?_RunAndWait(a)_TaskCollection@details(a)Concurrency@@QEAA?AW4_TaskCollectionStatus(a)23@PEAV_UnrealizedChore(a)23@@Z @ stub -arch=arm ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAAXPAV_UnrealizedChore(a)23@@Z @ stub -arch=i386 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAEXPAV_UnrealizedChore(a)23@@Z -@ stub -arch=win64 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QEAAXPEAV_UnrealizedChore(a)23@@Z +@ thiscall -arch=win64 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QEAAXPEAV_UnrealizedChore(a)23@@Z(ptr ptr) StructuredTaskCollection__Schedule @ stub -arch=arm ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAAXPAV_UnrealizedChore(a)23@PAVlocation(a)3@@Z @ stub -arch=i386 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAEXPAV_UnrealizedChore(a)23@PAVlocation(a)3@@Z @ stub -arch=win64 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QEAAXPEAV_UnrealizedChore(a)23@PEAVlocation(a)3@@Z diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 19b4cbe96d7..68a78a6aa16 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -364,7 +364,7 @@ @ stub -arch=win32 ?_RunAndWait(a)_TaskCollection@details(a)Concurrency@@QAG?AW4_TaskCollectionStatus(a)23@PAV_UnrealizedChore(a)23@@Z @ stub -arch=win64 ?_RunAndWait(a)_TaskCollection@details(a)Concurrency@@QEAA?AW4_TaskCollectionStatus(a)23@PEAV_UnrealizedChore(a)23@@Z @ stub -arch=win32 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAEXPAV_UnrealizedChore(a)23@@Z -@ stub -arch=win64 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QEAAXPEAV_UnrealizedChore(a)23@@Z +@ thiscall -arch=win64 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QEAAXPEAV_UnrealizedChore(a)23@@Z(ptr ptr) StructuredTaskCollection__Schedule @ stub -arch=win32 ?_Schedule(a)_TaskCollection@details(a)Concurrency@@QAEXPAV_UnrealizedChore(a)23@@Z @ stub -arch=win64 ?_Schedule(a)_TaskCollection@details(a)Concurrency@@QEAAXPEAV_UnrealizedChore(a)23@@Z @ thiscall -arch=win32 ?_SetSpinCount@?$_SpinWait@$00(a)details@Concurrency@@QAEXI(a)Z(ptr long) SpinWait__SetSpinCount diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 23840f85eda..0f5eaf9ac51 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -616,7 +616,7 @@ @ stub -arch=win64 ?_RunAndWait(a)_TaskCollection@details(a)Concurrency@@QEAA?AW4_TaskCollectionStatus(a)23@PEAV_UnrealizedChore(a)23@@Z @ stub -arch=arm ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAAXPAV_UnrealizedChore(a)23@@Z @ stub -arch=i386 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAEXPAV_UnrealizedChore(a)23@@Z -@ stub -arch=win64 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QEAAXPEAV_UnrealizedChore(a)23@@Z +@ thiscall -arch=win64 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QEAAXPEAV_UnrealizedChore(a)23@@Z(ptr ptr) StructuredTaskCollection__Schedule @ stub -arch=arm ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAAXPAV_UnrealizedChore(a)23@PAVlocation(a)3@@Z @ stub -arch=i386 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAEXPAV_UnrealizedChore(a)23@PAVlocation(a)3@@Z @ stub -arch=win64 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QEAAXPEAV_UnrealizedChore(a)23@PEAVlocation(a)3@@Z diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 64ddeed42f4..332a617932e 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -598,7 +598,7 @@ @ stub -arch=win64 ?_RunAndWait(a)_TaskCollection@details(a)Concurrency@@QEAA?AW4_TaskCollectionStatus(a)23@PEAV_UnrealizedChore(a)23@@Z @ stub -arch=arm ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAAXPAV_UnrealizedChore(a)23@@Z @ stub -arch=i386 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAEXPAV_UnrealizedChore(a)23@@Z -@ stub -arch=win64 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QEAAXPEAV_UnrealizedChore(a)23@@Z +@ thiscall -arch=win64 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QEAAXPEAV_UnrealizedChore(a)23@@Z(ptr ptr) StructuredTaskCollection__Schedule @ stub -arch=arm ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAAXPAV_UnrealizedChore(a)23@PAVlocation(a)3@@Z @ stub -arch=i386 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAEXPAV_UnrealizedChore(a)23@PAVlocation(a)3@@Z @ stub -arch=win64 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QEAAXPEAV_UnrealizedChore(a)23@PEAVlocation(a)3@@Z diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 05f408d6884..d70f1423f68 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -594,7 +594,7 @@ @ stub -arch=win64 ?_RunAndWait(a)_TaskCollection@details(a)Concurrency@@QEAA?AW4_TaskCollectionStatus(a)23@PEAV_UnrealizedChore(a)23@@Z @ stub -arch=arm ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAAXPAV_UnrealizedChore(a)23@@Z @ stub -arch=i386 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAEXPAV_UnrealizedChore(a)23@@Z -@ stub -arch=win64 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QEAAXPEAV_UnrealizedChore(a)23@@Z +@ thiscall -arch=win64 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QEAAXPEAV_UnrealizedChore(a)23@@Z(ptr ptr) StructuredTaskCollection__Schedule @ stub -arch=arm ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAAXPAV_UnrealizedChore(a)23@PAVlocation(a)3@@Z @ stub -arch=i386 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAEXPAV_UnrealizedChore(a)23@PAVlocation(a)3@@Z @ stub -arch=win64 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QEAAXPEAV_UnrealizedChore(a)23@PEAVlocation(a)3@@Z diff --git a/dlls/msvcrt/concurrency.c b/dlls/msvcrt/concurrency.c index 54b2c49db99..fc754c69a2e 100644 --- a/dlls/msvcrt/concurrency.c +++ b/dlls/msvcrt/concurrency.c @@ -174,6 +174,11 @@ typedef struct cs_queue #endif } cs_queue; +typedef struct +{ + int dummy; +} structured_task_collection; + typedef struct { ULONG_PTR unk_thread_id; @@ -1706,6 +1711,13 @@ bool __thiscall SpinWait__SpinOnce(SpinWait *this) } } +/* ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QEAAXPEAV_UnrealizedChore(a)23@@Z */ +DEFINE_THISCALL_WRAPPER(StructuredTaskCollection__Schedule, 8) +void __thiscall StructuredTaskCollection__Schedule(structured_task_collection *this, void *chore) +{ + FIXME("(%p %p): stub!\n", this, chore); +} + /* ??0critical_section(a)Concurrency@@QAE(a)XZ */ /* ??0critical_section(a)Concurrency@@QEAA(a)XZ */ DEFINE_THISCALL_WRAPPER(critical_section_ctor, 4) -- 2.35.1

2 5

[PATCH rebase 1/2] winemenubuilder: Skip desktop integration for certain associations
by Alex Henrie 04 Apr '22

04 Apr '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=41275 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- loader/wine.inf.in | 6 +++ programs/winemenubuilder/winemenubuilder.c | 43 +++++++++++++++++++--- 2 files changed, 44 insertions(+), 5 deletions(-) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 46b2caf3647..ad9e1ac8c43 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -320,6 +320,12 @@ HKCR,http\shell\open\command,,2,"""%11%\winebrowser.exe"" ""%1""" HKCR,https\shell\open\command,,2,"""%11%\winebrowser.exe"" ""%1""" HKCR,mailto\shell\open\command,,2,"""%11%\winebrowser.exe"" ""%1""" +HKCU,Software\Wine\FileOpenNoIntegration,"ieframe",,"ieframe.dll" +HKCU,Software\Wine\FileOpenNoIntegration,"iexplore",,"iexplore.exe" +HKCU,Software\Wine\FileOpenNoIntegration,"notepad",,"notepad.exe" +HKCU,Software\Wine\FileOpenNoIntegration,"winebrowser",,"winebrowser.exe" +HKCU,Software\Wine\FileOpenNoIntegration,"wordpad",,"wordpad.exe" + [ContentIndex] HKLM,System\CurrentControlSet\Control\ContentIndex\Language\Neutral,"WBreakerClass",,"{369647e0-17b0-11ce-9950-00aa004bbb1f}" HKLM,System\CurrentControlSet\Control\ContentIndex\Language\Neutral,"StemmerClass",,"" diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 1579ca8dafa..ef280954b67 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -1974,6 +1974,35 @@ static BOOL is_extension_banned(LPCWSTR extension) return FALSE; } +static BOOL on_exclude_list(const WCHAR *command) +{ + static const WCHAR FileOpenNoIntegrationW[] = L"Software\\Wine\\FileOpenNoIntegration"; + HKEY key; + WCHAR program_name[MAX_PATH], *pattern_to_exclude; + DWORD len = ARRAY_SIZE(program_name); + DWORD i = 0; + + if (RegOpenKeyExW(HKEY_CURRENT_USER, FileOpenNoIntegrationW, 0, KEY_QUERY_VALUE, &key) != ERROR_SUCCESS) + return FALSE; + + while (RegEnumValueW(key, i, program_name, &len, NULL, NULL, NULL, NULL) == ERROR_SUCCESS) + { + pattern_to_exclude = reg_get_valW(HKEY_CURRENT_USER, FileOpenNoIntegrationW, program_name); + if (wcsstr(command, pattern_to_exclude)) + { + heap_free(pattern_to_exclude); + RegCloseKey(key); + return TRUE; + } + heap_free(pattern_to_exclude); + len = ARRAY_SIZE(program_name); + i++; + } + + RegCloseKey(key); + return FALSE; +} + static WCHAR *get_special_mime_type(LPCWSTR extension) { if (!wcsicmp(extension, L".lnk")) @@ -2054,6 +2083,15 @@ static BOOL generate_associations(const WCHAR *packages_dir, const WCHAR *applic WCHAR *mimeProgId = NULL; struct rb_string_entry *entry; + commandW = assoc_query(ASSOCSTR_COMMAND, extensionW, L"open"); + if (commandW == NULL) + /* no command => no application is associated */ + goto end; + + if (on_exclude_list(commandW)) + /* command is on the exclude list => desktop integration is not desirable */ + goto end; + wcslwr(extensionW); friendlyDocNameW = assoc_query(ASSOCSTR_FRIENDLYDOCNAME, extensionW, NULL); @@ -2093,11 +2131,6 @@ static BOOL generate_associations(const WCHAR *packages_dir, const WCHAR *applic hasChanged = TRUE; } - commandW = assoc_query(ASSOCSTR_COMMAND, extensionW, L"open"); - if (commandW == NULL) - /* no command => no application is associated */ - goto end; - executableW = assoc_query(ASSOCSTR_EXECUTABLE, extensionW, L"open"); if (executableW) openWithIcon = compute_native_identifier(0, executableW, NULL); -- 2.35.1

1 1

[PATCH resend] mciwave: Fix bad free in MCI_SendCommandAsync (Coverity)
by Alex Henrie 04 Apr '22

04 Apr '22

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/mciwave/mciwave.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mciwave/mciwave.c b/dlls/mciwave/mciwave.c index 3ca884ed6e0..b2582a56123 100644 --- a/dlls/mciwave/mciwave.c +++ b/dlls/mciwave/mciwave.c @@ -124,7 +124,7 @@ static DWORD MCI_SendCommandAsync(UINT wDevID, async_cmd cmd, DWORD_PTR dwParam1 WARN("Couldn't allocate thread for async command handling, sending synchronously\n"); if (handles[1]) CloseHandle(handles[1]); sca->evt = NULL; - return MCI_SCAStarter(&sca); + return MCI_SCAStarter(sca); } SetThreadPriority(handles[0], THREAD_PRIORITY_TIME_CRITICAL); -- 2.35.1

1 0

[PATCH resend] shell32: Fix sizeof argument in DoPaste (Coverity)
by Alex Henrie 04 Apr '22

04 Apr '22

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/shell32/shlview_cmenu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/shlview_cmenu.c b/dlls/shell32/shlview_cmenu.c index 176ce6061e6..14cd9aeeebe 100644 --- a/dlls/shell32/shlview_cmenu.c +++ b/dlls/shell32/shlview_cmenu.c @@ -1217,7 +1217,7 @@ static HRESULT DoPaste(ContextMenu *This) TRACE("CF_HDROP=%p\n", medium.u.hGlobal); count = DragQueryFileW(medium.u.hGlobal, -1, NULL, 0); - pidls = SHAlloc(count*sizeof(ITEMIDLIST**)); + pidls = SHAlloc(count*sizeof(ITEMIDLIST*)); if (pidls) { for (i = 0; i < count; i++) -- 2.35.1

1 0

[PATCH resend] cmd: Ensure new volume label is null-terminated (Coverity)
by Alex Henrie 04 Apr '22

04 Apr '22

The command `echo | wine cmd /k 'label c:'` causes WCMD_ReadFile to return the single character '\n' without a null terminator, which would then cause garbage to be written to ~/.wine/drive_c/.windows-label. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- programs/cmd/builtins.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 963a9eaf361..dc7f0461433 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -4718,8 +4718,8 @@ int WCMD_volume(BOOL set_label, const WCHAR *path) if (set_label) { WCMD_output (WCMD_LoadMessage(WCMD_VOLUMEPROMPT)); WCMD_ReadFile(GetStdHandle(STD_INPUT_HANDLE), string, ARRAY_SIZE(string), &count); + string[count-1] = '\0'; /* ReadFile output is not null-terminated! */ if (count > 1) { - string[count-1] = '\0'; /* ReadFile output is not null-terminated! */ if (string[count-2] == '\r') string[count-2] = '\0'; /* Under Windoze we get CRLF! */ } if (*path) { -- 2.35.1

1 0

[PATCH 1/2] hid: Implement HidD_GetMsGenreDescriptor.
by Mohamad Al-Jaf 04 Apr '22

04 Apr '22

Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> --- dlls/hid/hid.spec | 2 +- dlls/hid/hidd.c | 6 ++++++ include/ddk/hidsdi.h | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/hid/hid.spec b/dlls/hid/hid.spec index 67c4473129d..59d6317c666 100644 --- a/dlls/hid/hid.spec +++ b/dlls/hid/hid.spec @@ -7,7 +7,7 @@ @ stdcall HidD_GetIndexedString(ptr long ptr long) @ stdcall HidD_GetInputReport(long ptr long) @ stdcall HidD_GetManufacturerString(long ptr long) -@ stub HidD_GetMsGenreDescriptor +@ stdcall HidD_GetMsGenreDescriptor(long ptr long) @ stdcall HidD_GetNumInputBuffers(long ptr) @ stdcall HidD_GetPhysicalDescriptor(long ptr long) @ stdcall HidD_GetPreparsedData(ptr ptr) diff --git a/dlls/hid/hidd.c b/dlls/hid/hidd.c index e01ab2a35e7..cf694644008 100644 --- a/dlls/hid/hidd.c +++ b/dlls/hid/hidd.c @@ -103,6 +103,12 @@ BOOLEAN WINAPI HidD_GetManufacturerString( HANDLE file, void *buffer, ULONG buff return sync_ioctl( file, IOCTL_HID_GET_MANUFACTURER_STRING, NULL, 0, buffer, buffer_len ); } +BOOLEAN WINAPI HidD_GetMsGenreDescriptor( HANDLE file, void *buffer, ULONG buffer_len ) +{ + TRACE( "file %p, buffer %p, buffer_len %lu.\n", file, buffer, buffer_len ); + return sync_ioctl( file, IOCTL_HID_GET_MS_GENRE_DESCRIPTOR, NULL, 0, buffer, buffer_len ); +} + BOOLEAN WINAPI HidD_GetNumInputBuffers( HANDLE file, ULONG *num_buffer ) { TRACE( "file %p, num_buffer %p.\n", file, num_buffer ); diff --git a/include/ddk/hidsdi.h b/include/ddk/hidsdi.h index 72470079a79..6f19ced3331 100644 --- a/include/ddk/hidsdi.h +++ b/include/ddk/hidsdi.h @@ -40,6 +40,7 @@ void WINAPI HidD_GetHidGuid(LPGUID guid); BOOLEAN WINAPI HidD_GetIndexedString(HANDLE file, ULONG index, void *buffer, ULONG length); BOOLEAN WINAPI HidD_GetInputReport(HANDLE HidDeviceObject, PVOID ReportBuffer, ULONG ReportBufferLength); BOOLEAN WINAPI HidD_GetManufacturerString(HANDLE HidDeviceObject, PVOID Buffer, ULONG BufferLength); +BOOLEAN WINAPI HidD_GetMsGenreDescriptor(HANDLE HidDeviceObject, PVOID Buffer, ULONG BufferLength); BOOLEAN WINAPI HidD_GetNumInputBuffers(HANDLE HidDeviceObject, ULONG *NumberBuffers); BOOLEAN WINAPI HidD_GetPhysicalDescriptor(HANDLE HidDeviceObject, PVOID Buffer, ULONG BufferLength); BOOLEAN WINAPI HidD_GetProductString(HANDLE HidDeviceObject, PVOID Buffer, ULONG BufferLength); -- 2.35.1

2 5

wine-6.0.4-rc1 Available
by Michael Stefaniuc 03 Apr '22

03 Apr '22

Hello guys, I have pushed wine-6.0.4-rc1 (6803e14775a16fec9d09e8cccaafaeee27c7a45c) to https://github.com/mstefani/wine-stable/tree/oldstable https://people.redhat.com/mstefani/wine/stable/ Commits from 6.21 up to 7.4. Last one for the 6.0.x series. What's new in this release (see below for details): - Various bug fixes ---------------------------------------------------------------- Bugs fixed in 6.0.4 (total 42): 12732 Nota Bene crashes on install 26350 Dungeons demo (OGRE) fails to load its plugins (LoadLibraryEx with LOAD_WITH_ALTERED_SEARCH_PATH and relative path) 32183 Cannot open console device read only, then read from it to get input 39699 EDT for Windows installer crashes inside wine`s hhctrl.ocx 41098 Descent 3 (GOG version) has problem when running with OpenGL renderer (Nvidia proprietary drivers) 42030 winedbg: Internal crash at 0x9f58fd40 44202 undname.c fails to parse symbols with rvalue-reference semantics '&&' 47287 Accessible Event Watcher Tool 'accevent.exe' from Windows 10 SDK (10.0.17763.x) crashes on unimplemented function oleacc.dll.AccessibleObjectFromEvent 48631 Multiple games display text as squares (Death to Spies: Moment of Truth, Shadow Warrior, Resident Evil 4 HD) 48950 NVDA needs oleacc.AccessibleObjectFromPoint implementation for mouse tracking 50370 Gothic 1 doesn't start correctly when screen resolution of the game matches display resolution 50526 ConEmu wineconsole Ctrl+m has different behavior 50714 YooSee CMS client 10.0.0.53 crashes after login since Wine 5.12 (ntdll built as PE) 51163 WinOffice Pro 5.3 stops after splashscreen, needs WMI class SoftwareLicensingProduct 51195 Lara Croft and the Temple of Osiris doesn't launch 51220 version:info - In Wine the GetFileVersionInfoEx() checks fail in non-English locales 51396 cl.exe 64bit fails with internal compiler error, needs support for separated code segments in vcruntime140_1 51598 cmd.exe crashes on "if exist" without arguments 51821 EVE Online Client Crashes Due to differences in how Wine and Windows handle LdrGetDllPath with dwFlags 0x8 and relative path 51860 Missing include for uid_t on musl-based systems 51864 VeraCrypt Installer for 1.24-Update7 (Win8+) fails with HRESULT 0x800288BD 51911 vbscript does not handle strings in if clauses 51938 Safe Exam Browser needs "DNSDomain" from Win32_NetworkAdapterConfiguration 51959 Missing procedure GetDayLightFlag 51968 Winaero WEI Tool: Crash due to C:\windows\performance\winsat\datastore missing 51978 Autodesk Fusion 360 crashes on unimplemented function msvcp140.dll.?table@?$ctype(a)D@std@@QEBAPEBFXZ 51983 foobar2000 v1.5.1+ crashes on startup with Wine v6.6+ with Windows version set to "Windows 10" 52076 Wrong icons placement when using a theme 52082 Ace Ventura (CD-ROM) crashes on start 52102 outSPOKEN 3.0 demo crashes on unimplemented function krnl386.exe16.GetLPErrMode 52141 NetAPI detection in configure is broken 52173 Kodi crashes on unimplemented function wsdapi.dll.WSDCreateDiscoveryProvider 52200 Yamizome Liberator (demo): In-game video isn't played. 52220 TMIDI Player, Cherry: Playback with multiple MIDI ports is broken 52224 inetmib1:main test times out in linux 52298 Opening PPT with Freeoffice Presentations crashes on unimplemented function ole32.dll.OleConvertIStorageToOLESTREAMEx 52327 Wrong WM_CONTEXTMENU message default processing 52349 Vortex Mod Manager Starts but Infinitely Loads 52378 Python WMI module: AttributeError: wbemErrInvalidQuery 52494 shell32 progman_dde tests crash if run immediately after prefix creation 52583 ApiSetView does not display export ordinals correctly 52626 MahjongSoul needs unimplemented function combase.dll.RoSetErrorReportingFlags ---------------------------------------------------------------- Changes since 6.0.3: Akihiro Sagawa (1): quartz: Fix a race in IMediaFilter::Pause(). Alex Henrie (2): krnl386: Add GetLPErrMode stub. explorer: Only try to destroy the IShellWindows object if it exists. Alexandre Julliard (3): configure: Fix the netapi check. krnl386.exe: Page-align the GlobalAlloc() size when the selector limit is in pages. user.exe: Make sure that the thunk selector doesn't get freed. Bernhard Kölbl (1): oleaut32: Allow the registration of 64bit typelibs from a 32bit context. Bernhard Übelacker (2): hhctrl.ocx: Handle only the number of bytes given in html_fragment_len. inetmib1: Fix endianess issue with dwLocalAddr and dwLocalPort. Christian Costa (1): d3dx9: Also check for a valid alpha channel for TGA images. Connor McAdams (2): oleacc: Implement AccessibleObjectFromEvent. winex11.drv: Add mutable pixel format awareness. Derek Lesho (1): kernelbase: Fix parameter order of FindResourceExW call for non-localized path. Doug Lyons (1): msvcrt: Do not acquire fd lock in msvcrt_create_io_inherit_block. Eric Pouech (2): winedbg: Fix command line arguments parsing. cmd: Don't crash on 'if exist' without parameter. Gabriel Ivăncescu (3): comctl32: Redraw children when the combo box is dropped down. user32: Redraw children when the combo box is dropped down. ddraw: Use WINED3D_SWAPCHAIN_NO_WINDOW_CHANGES only if window is not in foreground. Gerald Pfeifer (1): configure: Diagnose if NetAPI is not present. Hugh McMaster (1): conhost: Process Ctrl-M key input. Huw D. M. Davies (1): user32: Set WM_CONTEXTMENU's wparam to the child window's handle. Ismael Luceno (1): server: Fix missing include for uid_t. Jacek Caban (1): ntdll: Fix handling \\.\CON path in RtlDosPathNameToNtPathName. Jacek Konieczny (1): winealsa.drv: Use separate port for each output device. Louis Lenders (5): wbemprox: Add empty DNSDomain to Win32_NetworkAdapterConfiguration. combase: Add stub for RoOriginateError. wsdapi: Add stub for WSDCreateDiscoveryProvider. wbemprox: Add some properties of SoftwareLicensingProduct class. ole32: Add stub for OleConvertIStorageToOLESTREAMEx. Loïc Rebmeister (1): loader: Create performance\winsat\datastore on prefix creation. Matteo Bruni (1): combase: Add RoSetErrorReportingFlags() stub. Nick Fox (2): kernel32: Add tests for LdrGetDllPath with LOAD_WITH_ALTERED_SEARCH_PATH. ntdll: Fix LdrGetDllPath with LOAD_WITH_ALTERED_SEARCH_PATH without a path. Nikolay Sivov (3): d3d11: Always initialize out view pointer in CreateRenderTargetView(). include: Add WbemErrorEnum error codes. comctl32/listview: Initialize subitem text buffer before drawing each subitem. Olivier F. R. Dierick (1): taskschd: Set count to zero in regtasks_get_Count stub. Piotr Caban (5): msvcp100: Export ctype<char>::table function. oleacc: Add AccessibleObjectFromPoint implementation. msvcrt: Don't use GetDaylightFlag function in _ftime64. vcruntime140_1: Add support for exception separated code segments. ucrtbase: Add support for r-value demangling in unDName. Robert Wilhelm (1): vbscript: Support VT_BSTR in stack_pop_bool. Rémi Bernon (1): ntdll: Use the unrolled memset from msvcrt. Thomas Faber (1): msvcrt/tests: Show that spawn does not require locking of fds. Zebediah Figura (1): ntdll/tests: Add more tests for RtlDosPathNameToNtPathName_U(). Zhiyi Zhang (1): comctl32/button: Support image list margin for buttons with BS_CENTER or BS_VCENTER. -- Michael Stefaniuc mstefani(a)winehq.org

1 0

[PATCH] msvcr100: Improve ThreadScheduler_ScheduleTask_loc stub.
by Piotr Caban 03 Apr '22

03 Apr '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45916 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/concurrency.c | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+)

1 0