January 2019 - Wine-Devel - list.winehq.org

[PATCH] msi: Return an error code instead of a button id in msi_change_media().

by Alexandre Julliard

Found while trying to install Borland C++ Builder. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/media.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msi/media.c b/dlls/msi/media.c index 3d4a8c09eb6e..5f8c26a34436 100644 --- a/dlls/msi/media.c +++ b/dlls/msi/media.c @@ -97,7 +97,7 @@ static UINT msi_change_media(MSIPACKAGE *package, MSIMEDIAINFO *mi) msiobj_release(&record->hdr); msi_free(source_dir); - return r; + return r == IDRETRY ? ERROR_SUCCESS : ERROR_INSTALL_SOURCE_ABSENT; } static MSICABINETSTREAM *msi_get_cabinet_stream( MSIPACKAGE *package, UINT disk_id ) -- 2.19.2

Jan. 2, 2019

[PATCH] ntoskrnl.exe: fix handling relocations on page boundary

by Rafał H

Code is only used for non-page-aligned device drivers. Previously if relocation was happening on page boundary it crashed because only one page had changed protection in load_driver_module. Now code is changing protection for two pages (current and next). Also added "goto error" for VirtualProtect call for the current page. This change is safe because if it failed before this change updating the page content would crash anyway. Commit fixes running MTA: San Andreas game. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46401 Signed-off-by: Rafał Harabień <rafalh92(a)outlook.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 27 ++++++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 48b309f3d6..0c32e12801 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3318,8 +3318,9 @@ static HMODULE load_driver_module( const WCHAR *name ) if (nt->OptionalHeader.SectionAlignment < info.PageSize || !(nt->FileHeader.Characteristics & IMAGE_FILE_DLL)) { - DWORD old; + DWORD old, old_next_page; IMAGE_BASE_RELOCATION *rel, *end; + void *page, *next_page = NULL; if ((rel = RtlImageDirectoryEntryToData( module, TRUE, IMAGE_DIRECTORY_ENTRY_BASERELOC, &size ))) { @@ -3327,13 +3328,33 @@ static HMODULE load_driver_module( const WCHAR *name ) end = (IMAGE_BASE_RELOCATION *)((char *)rel + size); while (rel < end && rel->SizeOfBlock) { - void *page = (char *)module + rel->VirtualAddress; - VirtualProtect( page, info.PageSize, PAGE_EXECUTE_READWRITE, &old ); + page = (char *)module + rel->VirtualAddress; + /* if the page protection was already changed in previous interation don't do it again here */ + if (page == next_page) + old = old_next_page; + else + { + /* bring back old protection for 'next_page' from previous iteration */ + if (old_next_page != PAGE_EXECUTE_READWRITE) + VirtualProtect( next_page, info.PageSize, old_next_page, &old_next_page ); + /* change current page protection */ + if (!VirtualProtect( page, info.PageSize, PAGE_EXECUTE_READWRITE, &old )) + goto error; + } + + /* protect the next page as well because relocation can occur on the page boundary */ + next_page = (char*)page + info.PageSize; + if (!VirtualProtect( next_page, info.PageSize, PAGE_EXECUTE_READWRITE, &old_next_page )) + next_page = NULL; + rel = LdrProcessRelocationBlock( page, (rel->SizeOfBlock - sizeof(*rel)) / sizeof(USHORT), (USHORT *)(rel + 1), delta ); + /* bring back old protection of current page; next page is handled in the next iteration */ if (old != PAGE_EXECUTE_READWRITE) VirtualProtect( page, info.PageSize, old, &old ); if (!rel) goto error; } + if (next_page && old_next_page != PAGE_EXECUTE_READWRITE) + VirtualProtect( next_page, info.PageSize, old_next_page, &old_next_page ); /* make sure we don't try again */ size = FIELD_OFFSET( IMAGE_NT_HEADERS, OptionalHeader ) + nt->FileHeader.SizeOfOptionalHeader; VirtualProtect( nt, size, PAGE_READWRITE, &old ); -- 2.17.1

Jan. 2, 2019

[RFC PATCH] port: Provide ucrt compat functions required for mingw build.

by Jacek Caban

Hi all, Recent mingw-w64 changed quite a lot its crt to be able to support different runtime DLLs (most notably both msvcrt.dll and ucrtbase.dll at the same time). This requires some compat code to be used depending on which DLL is used. Compat code lives in the same libraries as are used as importlibs (like libmsvcrt.a). Wine doesn't use this library and generates its own import library instead. This library misses compat code required by mingw startup code. Commit 32bac734632cf082da40a82de7f3135262688351 worked around the build problem by exporting more functions from our msvcrt. The problem is that those functions are not exported on Windows, so Wine DLLs compiled this way will fail to load on Windows. The attached patch adds required compat code from mingw-w64 (it's mostly just a copy of its code). It's just a proof of concept - if we want that, we'd need to make sure it builds with old mingw-w64 first. The solution has its problems: for example we may need to extend that in the future if more such changes will happen to be needed on mingw-w64 side. Also __acrt_iob_func situation is even more tricky than onexit table functions. It's pulled by code that is so late in linker order, that linker will not pull it from our lib. It happens to work because it's in the same object file as other onexit table functions which are pulled earlier in the process (so using GC sections could break it). It's not really nice, but it looks like a maintainable solution. Comments or better ideas are welcomed. Jacek --- libs/port/Makefile.in | 1 + libs/port/ucrt.c | 90 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 91 insertions(+) create mode 100644 libs/port/ucrt.c

Jan. 2, 2019

[PATCH] po: Update French translation

by Isira Seneviratne

Jan. 2, 2019

[PATCH] po: Update French translation

by Isira Seneviratne

Jan. 2, 2019

Re: [PATCH] riched20: Fix a use after free.

by Huw Davies

Signed-off-by: Huw Davies <huw(a)codeweavers.com>

Jan. 2, 2019

[PATCH] dbghelp: Support full memory dumps.

by Eric Bissonnette

Add support of flag MinidumpWithFullMemory in function MinidumpWriteDump. A Memory64ListStream is added to the minidump streams and all memory regions of the process with MEM_COMMIT state are written to the last part of the minidump file. Signed-off-by: Eric Bissonnette <ebisso.dev(a)gmail.com> --- dlls/dbghelp/dbghelp_private.h | 9 +++ dlls/dbghelp/minidump.c | 129 ++++++++++++++++++++++++++++++++++++++--- include/dbghelp.h | 13 +++++ 3 files changed, 144 insertions(+), 7 deletions(-) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index ae8bc50..8083408 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -471,6 +471,12 @@ struct dump_memory ULONG rva; }; +struct dump_memory64 +{ + ULONG64 base; + ULONG64 size; +}; + struct dump_module { unsigned is_elf; @@ -509,6 +515,9 @@ struct dump_context struct dump_memory* mem; unsigned num_mem; unsigned alloc_mem; + struct dump_memory64* mem64; + unsigned num_mem64; + unsigned alloc_mem64; /* callback information */ MINIDUMP_CALLBACK_INFORMATION* cb; }; diff --git a/dlls/dbghelp/minidump.c b/dlls/dbghelp/minidump.c index 04dc775..ad69ba5 100644 --- a/dlls/dbghelp/minidump.c +++ b/dlls/dbghelp/minidump.c @@ -294,6 +294,49 @@ static BOOL fetch_macho_module_info_cb(const WCHAR* name, unsigned long base, return TRUE; } +void minidump_add_memory64_block(struct dump_context* dc, ULONG64 base, ULONG64 size) +{ + if (!dc->mem64) + { + dc->alloc_mem64 = 32; + dc->mem64 = HeapAlloc(GetProcessHeap(), 0, dc->alloc_mem64 * sizeof(*dc->mem64)); + } + else if (dc->num_mem64 >= dc->alloc_mem64) + { + dc->alloc_mem64 *= 2; + dc->mem64 = HeapReAlloc(GetProcessHeap(), 0, dc->mem64, + dc->alloc_mem64 * sizeof(*dc->mem64)); + } + if (dc->mem64) + { + dc->mem64[dc->num_mem64].base = base; + dc->mem64[dc->num_mem64].size = size; + dc->num_mem64++; + } + else dc->num_mem64 = dc->alloc_mem64 = 0; +} + +static void fetch_memory64_info(struct dump_context* dc) +{ + ULONG_PTR addr; + MEMORY_BASIC_INFORMATION mbi; + + addr = 0; + while (VirtualQueryEx(dc->hProcess, (LPCVOID)addr, &mbi, sizeof(mbi)) != 0) + { + /* Memory regions with state MEM_COMMIT will be added to the dump */ + if (mbi.State == MEM_COMMIT) + { + minidump_add_memory64_block(dc, (ULONG_PTR)mbi.BaseAddress, mbi.RegionSize); + } + + if ((addr + mbi.RegionSize) < addr) + break; + + addr = (ULONG_PTR)mbi.BaseAddress + mbi.RegionSize; + } +} + static void fetch_modules_info(struct dump_context* dc) { EnumerateLoadedModulesW64(dc->hProcess, fetch_pe_module_info_cb, dc); @@ -831,6 +874,60 @@ static unsigned dump_memory_info(struct dump_context* dc) return sz; } +/****************************************************************** + * dump_memory64_info + * + * dumps information about the memory of the process (virtual memory) + */ +static unsigned dump_memory64_info(struct dump_context* dc) +{ + MINIDUMP_MEMORY64_LIST mdMem64List; + MINIDUMP_MEMORY_DESCRIPTOR64 mdMem64; + DWORD written; + unsigned i, len, sz; + RVA rva_base; + char tmp[1024]; + ULONG64 pos; + LARGE_INTEGER filepos; + + sz = sizeof(mdMem64List.NumberOfMemoryRanges) + + sizeof(mdMem64List.BaseRva) + + dc->num_mem64 * sizeof(mdMem64); + + mdMem64List.NumberOfMemoryRanges = dc->num_mem64; + mdMem64List.BaseRva = dc->rva + sz; + + append(dc, &mdMem64List.NumberOfMemoryRanges, + sizeof(mdMem64List.NumberOfMemoryRanges)); + append(dc, &mdMem64List.BaseRva, + sizeof(mdMem64List.BaseRva)); + + rva_base = dc->rva; + dc->rva += dc->num_mem64 * sizeof(mdMem64); + + /* dc->rva is not updated past this point. The end of the dump + * is just the full memory data. */ + filepos.QuadPart = dc->rva; + for (i = 0; i < dc->num_mem64; i++) + { + mdMem64.StartOfMemoryRange = dc->mem64[i].base; + mdMem64.DataSize = dc->mem64[i].size; + SetFilePointerEx(dc->hFile, filepos, NULL, FILE_BEGIN); + for (pos = 0; pos < dc->mem64[i].size; pos += sizeof(tmp)) + { + len = min(dc->mem64[i].size - pos, sizeof(tmp)); + if (ReadProcessMemory(dc->hProcess, + (void*)(ULONG_PTR)(dc->mem64[i].base + pos), + tmp, len, NULL)) + WriteFile(dc->hFile, tmp, len, &written, NULL); + } + filepos.QuadPart += mdMem64.DataSize; + writeat(dc, rva_base + i * sizeof(mdMem64), &mdMem64, sizeof(mdMem64)); + } + + return sz; +} + static unsigned dump_misc_info(struct dump_context* dc) { MINIDUMP_MISC_INFO mmi; @@ -876,6 +973,9 @@ BOOL WINAPI MiniDumpWriteDump(HANDLE hProcess, DWORD pid, HANDLE hFile, dc.mem = NULL; dc.num_mem = 0; dc.alloc_mem = 0; + dc.mem64 = NULL; + dc.num_mem64 = 0; + dc.alloc_mem64 = 0; dc.rva = 0; if (!fetch_process_info(&dc)) return FALSE; @@ -890,8 +990,6 @@ BOOL WINAPI MiniDumpWriteDump(HANDLE hProcess, DWORD pid, HANDLE hFile, if (DumpType & MiniDumpWithDataSegs) FIXME("NIY MiniDumpWithDataSegs\n"); - if (DumpType & MiniDumpWithFullMemory) - FIXME("NIY MiniDumpWithFullMemory\n"); if (DumpType & MiniDumpWithHandleData) FIXME("NIY MiniDumpWithHandleData\n"); if (DumpType & MiniDumpFilterMemory) @@ -940,11 +1038,15 @@ BOOL WINAPI MiniDumpWriteDump(HANDLE hProcess, DWORD pid, HANDLE hFile, writeat(&dc, mdHead.StreamDirectoryRva + idx_stream++ * sizeof(mdDir), &mdDir, sizeof(mdDir)); - mdDir.StreamType = MemoryListStream; - mdDir.Location.Rva = dc.rva; - mdDir.Location.DataSize = dump_memory_info(&dc); - writeat(&dc, mdHead.StreamDirectoryRva + idx_stream++ * sizeof(mdDir), - &mdDir, sizeof(mdDir)); + + if (!(DumpType & MiniDumpWithFullMemory)) + { + mdDir.StreamType = MemoryListStream; + mdDir.Location.Rva = dc.rva; + mdDir.Location.DataSize = dump_memory_info(&dc); + writeat(&dc, mdHead.StreamDirectoryRva + idx_stream++ * sizeof(mdDir), + &mdDir, sizeof(mdDir)); + } mdDir.StreamType = MiscInfoStream; mdDir.Location.Rva = dc.rva; @@ -977,12 +1079,25 @@ BOOL WINAPI MiniDumpWriteDump(HANDLE hProcess, DWORD pid, HANDLE hFile, } } + /* 3.4) write full memory (if requested) */ + if (DumpType & MiniDumpWithFullMemory) + { + fetch_memory64_info(&dc); + + mdDir.StreamType = Memory64ListStream; + mdDir.Location.Rva = dc.rva; + mdDir.Location.DataSize = dump_memory64_info(&dc); + writeat(&dc, mdHead.StreamDirectoryRva + idx_stream++ * sizeof(mdDir), + &mdDir, sizeof(mdDir)); + } + /* fill the remaining directory entries with 0's (unused stream types) */ /* NOTE: this should always come last in the dump! */ for (i = idx_stream; i < nStreams; i++) writeat(&dc, mdHead.StreamDirectoryRva + i * sizeof(emptyDir), &emptyDir, sizeof(emptyDir)); HeapFree(GetProcessHeap(), 0, dc.mem); + HeapFree(GetProcessHeap(), 0, dc.mem64); HeapFree(GetProcessHeap(), 0, dc.modules); HeapFree(GetProcessHeap(), 0, dc.threads); diff --git a/include/dbghelp.h b/include/dbghelp.h index 6e8d375..4210616 100644 --- a/include/dbghelp.h +++ b/include/dbghelp.h @@ -747,6 +747,19 @@ typedef struct _MINIDUMP_MEMORY_LIST MINIDUMP_MEMORY_DESCRIPTOR MemoryRanges[1]; /* FIXME: 0-sized array not supported */ } MINIDUMP_MEMORY_LIST, *PMINIDUMP_MEMORY_LIST; +typedef struct _MINIDUMP_MEMORY_DESCRIPTOR64 +{ + ULONG64 StartOfMemoryRange; + ULONG64 DataSize; +} MINIDUMP_MEMORY_DESCRIPTOR64, *PMINIDUMP_MEMORY_DESCRIPTOR64; + +typedef struct _MINIDUMP_MEMORY64_LIST +{ + ULONG64 NumberOfMemoryRanges; + RVA64 BaseRva; + MINIDUMP_MEMORY_DESCRIPTOR64 MemoryRanges[1]; /* FIXME: 0-sized array not supported */ +} MINIDUMP_MEMORY64_LIST, *PMINIDUMP_MEMORY64_LIST; + #define MINIDUMP_MISC1_PROCESS_ID 0x00000001 #define MINIDUMP_MISC1_PROCESS_TIMES 0x00000002 -- 1.8.3.1

Jan. 1, 2019

[PATCH] riched20: Fix a use after free.

by Zhiyi Zhang

In ME_DestroyEditor(), the item list is being freed when calling get_total_width() in destroy_para(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46328 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/riched20/editor.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 9bacc6315d..2bb285866b 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -3183,13 +3183,13 @@ ME_TextEditor *ME_MakeEditor(ITextHost *texthost, BOOL bEmulateVersion10) void ME_DestroyEditor(ME_TextEditor *editor) { - ME_DisplayItem *pFirst = editor->pBuffer->pFirst; - ME_DisplayItem *p = pFirst, *pNext = NULL; + ME_DisplayItem *p = editor->pBuffer->pFirst, *pNext = NULL; ME_Style *s, *cursor2; int i; ME_ClearTempStyle(editor); ME_EmptyUndoStack(editor); + editor->pBuffer->pFirst = NULL; while(p) { pNext = p->next; if (p->type == diParagraph) -- 2.19.2

Jan. 1, 2019

Re: [PATCH] d3d9/tests: Fix a typo in an undef

by Marvin

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=46021 Your paranoid android. === w8adm (32 bit report) === d3d9: visual.c:8620: Test failed: Got unexpected color 0x00007580 for quad 2 (different colors).

Jan. 1, 2019

[PATCH] d3d9/tests: Fix a typo in an undef

by Daniel Ansorregui

Signed-off-by: Daniel Ansorregui <mailszeros(a)gmail.com> --- dlls/d3d9/tests/visual.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 392369a3f7..195b7301e0 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -3236,8 +3236,8 @@ static void texbem_test(void) 0x000000ff, 0x000000ff, 0x000000ff, 0x000000ff, 0x000000ff, 0x000000ff, 0x000000ff, 0x000000ff, 0x000000ff, 0x000000ff, 0x000000ff, 0x000000ff, 0x000000ff, 0x000000ff, 0x000000ff, 0x000000ff, }; +#undef tex #undef tex1 -#undef tex2 #undef origin hr = IDirect3DTexture9_LockRect(texture2, 0, &locked_rect, NULL, 0); -- 2.17.1

Jan. 1, 2019