January 2019 - Wine-Commits

Fabian Maurer : ucrtbase: Forward a few functions for dxil.dll and pkgmgr.exe.
by Alexandre Julliard Jan. 29, 2019

Jan. 29, 2019

Module: wine Branch: master Commit: e9c90afc065d7a3c57b532aa214b9b4b4546ee83 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e9c90afc065d7a3c57b532aa… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sun Jan 27 16:06:01 2019 +0100 ucrtbase: Forward a few functions for dxil.dll and pkgmgr.exe. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44469 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-private-l1-1-0.spec | 38 +++++++++++----------- dlls/ucrtbase/ucrtbase.spec | 38 +++++++++++----------- 2 files changed, 38 insertions(+), 38 deletions(-) diff --git a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec index 9bddd3d..77be3a5 100644 --- a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec +++ b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec @@ -127,11 +127,11 @@ @ stub _o___libm_sse2_sinf @ stub _o___libm_sse2_tan @ stub _o___libm_sse2_tanf -@ stub _o___p___argc +@ cdecl _o___p___argc() ucrtbase._o___p___argc @ stub _o___p___argv -@ stub _o___p___wargv +@ cdecl _o___p___wargv() ucrtbase._o___p___wargv @ stub _o___p__acmdln -@ stub _o___p__commode +@ cdecl _o___p__commode() ucrtbase._o___p__commode @ stub _o___p__environ @ stub _o___p__fmode @ stub _o___p__mbcasemap @@ -144,7 +144,7 @@ @ stub _o___pwctype_func @ stub _o___std_exception_copy @ stub _o___std_exception_destroy -@ stub _o___std_type_info_destroy_list +@ cdecl _o___std_type_info_destroy_list(ptr) ucrtbase._o___std_type_info_destroy_list @ stub _o___std_type_info_name @ stub _o___stdio_common_vfprintf @ stub _o___stdio_common_vfprintf_p @@ -207,15 +207,15 @@ @ stub _o__chsize_s @ stub _o__close @ stub _o__commit -@ stub _o__configthreadlocale +@ cdecl _o__configthreadlocale(long) ucrtbase._o__configthreadlocale @ stub _o__configure_narrow_argv -@ stub _o__configure_wide_argv -@ stub _o__controlfp_s +@ cdecl _o__configure_wide_argv(long) ucrtbase._o__configure_wide_argv +@ cdecl _o__controlfp_s(ptr long long) ucrtbase._o__controlfp_s @ stub _o__cputs @ stub _o__cputws @ stub _o__creat @ stub _o__create_locale -@ stub _o__crt_atexit +@ cdecl _o__crt_atexit(ptr) ucrtbase._o__crt_atexit @ stub _o__ctime32_s @ stub _o__ctime64_s @ stub _o__cwait @@ -319,7 +319,7 @@ @ stub _o__get_fmode @ stub _o__get_heap_handle @ stub _o__get_initial_narrow_environment -@ stub _o__get_initial_wide_environment +@ cdecl _o__get_initial_wide_environment() ucrtbase._o__get_initial_wide_environment @ stub _o__get_invalid_parameter_handler @ stub _o__get_narrow_winmain_command_line @ stub _o__get_osfhandle @@ -366,7 +366,7 @@ @ stub _o__i64tow_s @ stub _o__initialize_narrow_environment @ cdecl _o__initialize_onexit_table(ptr) ucrtbase._o__initialize_onexit_table -@ stub _o__initialize_wide_environment +@ cdecl _o__initialize_wide_environment() ucrtbase._o__initialize_wide_environment @ stub _o__invalid_parameter_noinfo @ stub _o__invalid_parameter_noinfo_noreturn @ stub _o__isatty @@ -660,16 +660,16 @@ @ stub _o__scalbf @ stub _o__searchenv @ stub _o__searchenv_s -@ stub _o__seh_filter_dll -@ stub _o__seh_filter_exe +@ cdecl _o__seh_filter_dll(long ptr) ucrtbase._o__seh_filter_dll +@ cdecl _o__seh_filter_exe(long ptr) ucrtbase._o__seh_filter_exe @ stub _o__set_abort_behavior -@ stub _o__set_app_type +@ cdecl _o__set_app_type(long) ucrtbase._o__set_app_type @ stub _o__set_doserrno @ stub _o__set_errno -@ stub _o__set_fmode +@ cdecl _o__set_fmode(long) ucrtbase._o__set_fmode @ stub _o__set_invalid_parameter_handler @ stub _o__set_new_handler -@ stub _o__set_new_mode +@ cdecl _o__set_new_mode(long) ucrtbase._o__set_new_mode @ stub _o__set_thread_local_invalid_parameter_handler @ stub _o__seterrormode @ stub _o__setmbcp @@ -919,7 +919,7 @@ @ stub _o_bsearch @ stub _o_bsearch_s @ stub _o_btowc -@ stub _o_calloc +@ cdecl _o_calloc(long long) ucrtbase._o_calloc @ stub _o_cbrt @ stub _o_cbrtf @ stub _o_ceil @@ -936,7 +936,7 @@ @ stub _o_erfcl @ stub _o_erff @ stub _o_erfl -@ stub _o_exit +@ cdecl _o_exit(long) ucrtbase._o_exit @ stub _o_exp @ stub _o_exp2 @ stub _o_exp2f @@ -967,7 +967,7 @@ @ stub _o_fputws @ stub _o_fread @ stub _o_fread_s -@ stub _o_free +@ cdecl _o_free(ptr) ucrtbase._o_free @ stub _o_freopen @ stub _o_freopen_s @ stub _o_frexp @@ -1142,7 +1142,7 @@ @ stub _o_tmpfile_s @ stub _o_tmpnam_s @ stub _o_tolower -@ stub _o_toupper +@ cdecl _o_toupper(long) ucrtbase._o_toupper @ stub _o_towlower @ stub _o_towupper @ stub _o_ungetc diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index cb45aa5..2d1d8da 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -791,11 +791,11 @@ @ stub _o___libm_sse2_sinf @ stub _o___libm_sse2_tan @ stub _o___libm_sse2_tanf -@ stub _o___p___argc +@ cdecl _o___p___argc() MSVCRT___p___argc @ stub _o___p___argv -@ stub _o___p___wargv +@ cdecl _o___p___wargv() MSVCRT___p___wargv @ stub _o___p__acmdln -@ stub _o___p__commode +@ cdecl _o___p__commode() __p__commode @ stub _o___p__environ @ stub _o___p__fmode @ stub _o___p__mbcasemap @@ -808,7 +808,7 @@ @ stub _o___pwctype_func @ stub _o___std_exception_copy @ stub _o___std_exception_destroy -@ stub _o___std_type_info_destroy_list +@ cdecl _o___std_type_info_destroy_list(ptr) MSVCRT_type_info_destroy_list @ stub _o___std_type_info_name @ stub _o___stdio_common_vfprintf @ stub _o___stdio_common_vfprintf_p @@ -871,15 +871,15 @@ @ stub _o__chsize_s @ stub _o__close @ stub _o__commit -@ stub _o__configthreadlocale +@ cdecl _o__configthreadlocale(long) _configthreadlocale @ stub _o__configure_narrow_argv -@ stub _o__configure_wide_argv -@ stub _o__controlfp_s +@ cdecl _o__configure_wide_argv(long) _configure_wide_argv +@ cdecl _o__controlfp_s(ptr long long) _controlfp_s @ stub _o__cputs @ stub _o__cputws @ stub _o__creat @ stub _o__create_locale -@ stub _o__crt_atexit +@ cdecl _o__crt_atexit(ptr) MSVCRT__crt_atexit @ stub _o__ctime32_s @ stub _o__ctime64_s @ stub _o__cwait @@ -983,7 +983,7 @@ @ stub _o__get_fmode @ stub _o__get_heap_handle @ stub _o__get_initial_narrow_environment -@ stub _o__get_initial_wide_environment +@ cdecl _o__get_initial_wide_environment() _get_initial_wide_environment @ stub _o__get_invalid_parameter_handler @ stub _o__get_narrow_winmain_command_line @ stub _o__get_osfhandle @@ -1030,7 +1030,7 @@ @ stub _o__i64tow_s @ stub _o__initialize_narrow_environment @ cdecl _o__initialize_onexit_table(ptr) MSVCRT__initialize_onexit_table -@ stub _o__initialize_wide_environment +@ cdecl _o__initialize_wide_environment() _initialize_wide_environment @ stub _o__invalid_parameter_noinfo @ stub _o__invalid_parameter_noinfo_noreturn @ stub _o__isatty @@ -1324,16 +1324,16 @@ @ stub _o__scalbf @ stub _o__searchenv @ stub _o__searchenv_s -@ stub _o__seh_filter_dll -@ stub _o__seh_filter_exe +@ cdecl _o__seh_filter_dll(long ptr) __CppXcptFilter +@ cdecl _o__seh_filter_exe(long ptr) _XcptFilter @ stub _o__set_abort_behavior -@ stub _o__set_app_type +@ cdecl _o__set_app_type(long) MSVCRT___set_app_type @ stub _o__set_doserrno @ stub _o__set_errno -@ stub _o__set_fmode +@ cdecl _o__set_fmode(long) MSVCRT__set_fmode @ stub _o__set_invalid_parameter_handler @ stub _o__set_new_handler -@ stub _o__set_new_mode +@ cdecl _o__set_new_mode(long) MSVCRT__set_new_mode @ stub _o__set_thread_local_invalid_parameter_handler @ stub _o__seterrormode @ stub _o__setmbcp @@ -1583,7 +1583,7 @@ @ stub _o_bsearch @ stub _o_bsearch_s @ stub _o_btowc -@ stub _o_calloc +@ cdecl _o_calloc(long long) MSVCRT_calloc @ stub _o_cbrt @ stub _o_cbrtf @ stub _o_ceil @@ -1600,7 +1600,7 @@ @ stub _o_erfcl @ stub _o_erff @ stub _o_erfl -@ stub _o_exit +@ cdecl _o_exit(long) MSVCRT_exit @ stub _o_exp @ stub _o_exp2 @ stub _o_exp2f @@ -1631,7 +1631,7 @@ @ stub _o_fputws @ stub _o_fread @ stub _o_fread_s -@ stub _o_free +@ cdecl _o_free(ptr) MSVCRT_free @ stub _o_freopen @ stub _o_freopen_s @ stub _o_frexp @@ -1807,7 +1807,7 @@ @ stub _o_tmpfile_s @ stub _o_tmpnam_s @ stub _o_tolower -@ stub _o_toupper +@ cdecl _o_toupper(long) MSVCRT__toupper @ stub _o_towlower @ stub _o_towupper @ stub _o_ungetc

1 0

Jon Doron : kernel32: Fix MOVEFILE_REPLACE_EXISTING between devices.
by Alexandre Julliard Jan. 29, 2019

Jan. 29, 2019

Module: wine Branch: master Commit: aa5107b16542a2b236224cc4974731691d77a20c URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa5107b16542a2b236224cc4… Author: Jon Doron <arilou(a)gmail.com> Date: Fri Jan 11 10:24:45 2019 +0200 kernel32: Fix MOVEFILE_REPLACE_EXISTING between devices. Fix the case of rename fails because when done between 2 different devices and the MOVEFILE_REPLACE_EXISTING is set. Signed-off-by: Jon Doron <arilou(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/path.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index 554f96a..cf1c768 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -1418,8 +1418,9 @@ BOOL WINAPI MoveFileWithProgressW( LPCWSTR source, LPCWSTR dest, NtClose( source_handle ); RtlFreeAnsiString( &source_unix ); RtlFreeAnsiString( &dest_unix ); - if (!CopyFileExW( source, dest, fnProgress, - param, NULL, COPY_FILE_FAIL_IF_EXISTS )) + if (!CopyFileExW( source, dest, fnProgress, param, NULL, + flag & MOVEFILE_REPLACE_EXISTING ? + 0 : COPY_FILE_FAIL_IF_EXISTS )) return FALSE; return DeleteFileW( source ); }

1 0

Michael Stefaniuc : wineandroid.drv: Use the ARRAY_SIZE() macro.
by Alexandre Julliard Jan. 29, 2019

Jan. 29, 2019

Module: wine Branch: master Commit: a1c756510d9cdfc8a1f0cb4a53f997b8bae45937 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a1c756510d9cdfc8a1f0cb4a… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Jan 29 20:38:03 2019 +0100 wineandroid.drv: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/window.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wineandroid.drv/window.c b/dlls/wineandroid.drv/window.c index 861b216..eb05aaf 100644 --- a/dlls/wineandroid.drv/window.c +++ b/dlls/wineandroid.drv/window.c @@ -1176,9 +1176,9 @@ static int get_cursor_system_id( const ICONINFOEXW *info ) if (info->szResName[0]) return 0; /* only integer resources are supported here */ if (!(module = GetModuleHandleW( info->szModName ))) return 0; - for (i = 0; i < sizeof(module_cursors)/sizeof(module_cursors[0]); i++) + for (i = 0; i < ARRAY_SIZE( module_cursors ); i++) if (GetModuleHandleW( module_cursors[i].name ) == module) break; - if (i == sizeof(module_cursors)/sizeof(module_cursors[0])) return 0; + if (i == ARRAY_SIZE( module_cursors )) return 0; cursors = module_cursors[i].cursors; for (i = 0; cursors[i].id; i++)

1 0

Eric Bissonnette : dbghelp: Support full memory dumps.
by Alexandre Julliard Jan. 29, 2019

Jan. 29, 2019

Module: wine Branch: master Commit: b90bbcbe750f6af0ce13f2577984f4818e05a013 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b90bbcbe750f6af0ce13f257… Author: Eric Bissonnette <ebisso.dev(a)gmail.com> Date: Fri Jan 25 21:12:02 2019 -0500 dbghelp: Support full memory dumps. 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> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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..b096476 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 0

Jon Doron : kernel32: Fix MoveFileWithProgressW from closing same handle twice.
by Alexandre Julliard Jan. 29, 2019

Jan. 29, 2019

Module: wine Branch: master Commit: 69d3c7a00f37badf6a5661ab0c176963fe63dc42 URL: https://source.winehq.org/git/wine.git/?a=commit;h=69d3c7a00f37badf6a5661ab… Author: Jon Doron <arilou(a)gmail.com> Date: Fri Jan 11 10:24:44 2019 +0200 kernel32: Fix MoveFileWithProgressW from closing same handle twice. Signed-off-by: Jon Doron <arilou(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/path.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index 41f0d34..554f96a 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -1392,6 +1392,7 @@ BOOL WINAPI MoveFileWithProgressW( LPCWSTR source, LPCWSTR dest, } NtClose( dest_handle ); + dest_handle = NULL; } else if (status != STATUS_OBJECT_NAME_NOT_FOUND) {

1 0

Michael Stefaniuc : strmbase: Remove redundant NULL check before CoTaskMemFree().
by Alexandre Julliard Jan. 29, 2019

Jan. 29, 2019

Module: wine Branch: master Commit: 78a8445a2a4a6f225386a8a9781e961d2c5517a4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=78a8445a2a4a6f225386a8a9… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Jan 29 20:38:09 2019 +0100 strmbase: Remove redundant NULL check before CoTaskMemFree(). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/mediatype.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/strmbase/mediatype.c b/dlls/strmbase/mediatype.c index 1ad4d3b..cd8e909 100644 --- a/dlls/strmbase/mediatype.c +++ b/dlls/strmbase/mediatype.c @@ -45,11 +45,8 @@ HRESULT WINAPI CopyMediaType(AM_MEDIA_TYPE *dest, const AM_MEDIA_TYPE *src) void WINAPI FreeMediaType(AM_MEDIA_TYPE * pMediaType) { - if (pMediaType->pbFormat) - { - CoTaskMemFree(pMediaType->pbFormat); - pMediaType->pbFormat = NULL; - } + CoTaskMemFree(pMediaType->pbFormat); + pMediaType->pbFormat = NULL; if (pMediaType->pUnk) { IUnknown_Release(pMediaType->pUnk);

1 0

Zebediah Figura : msi: Factor out msi_view_refresh_row().
by Alexandre Julliard Jan. 29, 2019

Jan. 29, 2019

Module: wine Branch: master Commit: 31628cee6e2ba63a1a08672d89ccd8d10836bf7e URL: https://source.winehq.org/git/wine.git/?a=commit;h=31628cee6e2ba63a1a08672d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jan 28 22:11:10 2019 -0600 msi: Factor out msi_view_refresh_row(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/msiquery.c | 47 ++++++++++++++++++++++++++++++----------------- 1 file changed, 30 insertions(+), 17 deletions(-) diff --git a/dlls/msi/msiquery.c b/dlls/msi/msiquery.c index 30c4f65..bea08c2 100644 --- a/dlls/msi/msiquery.c +++ b/dlls/msi/msiquery.c @@ -287,7 +287,7 @@ UINT WINAPI MsiDatabaseOpenViewW(MSIHANDLE hdb, return ret; } -UINT msi_view_get_row(MSIDATABASE *db, MSIVIEW *view, UINT row, MSIRECORD **rec) +UINT msi_view_refresh_row(MSIDATABASE *db, MSIVIEW *view, UINT row, MSIRECORD *rec) { UINT row_count = 0, col_count = 0, i, ival, ret, type; @@ -300,13 +300,6 @@ UINT msi_view_get_row(MSIDATABASE *db, MSIVIEW *view, UINT row, MSIRECORD **rec) if (!col_count) return ERROR_INVALID_PARAMETER; - if (row >= row_count) - return ERROR_NO_MORE_ITEMS; - - *rec = MSI_CreateRecord(col_count); - if (!*rec) - return ERROR_FUNCTION_FAILED; - for (i = 1; i <= col_count; i++) { ret = view->ops->get_column_info(view, i, NULL, &type, NULL, NULL); @@ -323,7 +316,7 @@ UINT msi_view_get_row(MSIDATABASE *db, MSIVIEW *view, UINT row, MSIRECORD **rec) ret = view->ops->fetch_stream(view, row, i, &stm); if ((ret == ERROR_SUCCESS) && stm) { - MSI_RecordSetIStream(*rec, i, stm); + MSI_RecordSetIStream(rec, i, stm); IStream_Release(stm); } else @@ -342,28 +335,48 @@ UINT msi_view_get_row(MSIDATABASE *db, MSIVIEW *view, UINT row, MSIRECORD **rec) if (! (type & MSITYPE_VALID)) ERR("Invalid type!\n"); - /* check if it's nul (0) - if so, don't set anything */ - if (!ival) - continue; - if (type & MSITYPE_STRING) { int len; - const WCHAR *sval = msi_string_lookup( db->strings, ival, &len ); - msi_record_set_string( *rec, i, sval, len ); + const WCHAR *sval = msi_string_lookup(db->strings, ival, &len); + msi_record_set_string(rec, i, sval, len); } else { if ((type & MSI_DATASIZEMASK) == 2) - MSI_RecordSetInteger(*rec, i, ival - (1<<15)); + MSI_RecordSetInteger(rec, i, ival ? ival - (1<<15) : MSI_NULL_INTEGER); else - MSI_RecordSetInteger(*rec, i, ival - (1u<<31)); + MSI_RecordSetInteger(rec, i, ival - (1u<<31)); } } return ERROR_SUCCESS; } +UINT msi_view_get_row(MSIDATABASE *db, MSIVIEW *view, UINT row, MSIRECORD **rec) +{ + UINT row_count = 0, col_count = 0, r; + MSIRECORD *object; + + TRACE("view %p, row %u, rec %p.\n", view, row, rec); + + if ((r = view->ops->get_dimensions(view, &row_count, &col_count))) + return r; + + if (row >= row_count) + return ERROR_NO_MORE_ITEMS; + + if (!(object = MSI_CreateRecord( col_count ))) + return ERROR_OUTOFMEMORY; + + if ((r = msi_view_refresh_row(db, view, row, object))) + msiobj_release( &object->hdr ); + else + *rec = object; + + return r; +} + UINT MSI_ViewFetch(MSIQUERY *query, MSIRECORD **prec) { MSIVIEW *view;

1 0

Zebediah Figura : wined3d: Factor our init_default_render_states().
by Alexandre Julliard Jan. 29, 2019

Jan. 29, 2019

Module: wine Branch: master Commit: 05149fa2d5d081df131f0726c291e1b31a774ffc URL: https://source.winehq.org/git/wine.git/?a=commit;h=05149fa2d5d081df131f0726… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jan 28 23:09:14 2019 -0600 wined3d: Factor our init_default_render_states(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/stateblock.c | 256 +++++++++++++++++++++++----------------------- 1 file changed, 130 insertions(+), 126 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=05149fa2d5d081df131f…

1 0

Zebediah Figura : wined3d: Store render states in the wined3d_stateblock_state structure.
by Alexandre Julliard Jan. 29, 2019

Jan. 29, 2019

Module: wine Branch: master Commit: 9a1d0797937f39ef2296e1d34b095b29ae848c20 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9a1d0797937f39ef2296e1d3… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jan 28 23:09:15 2019 -0600 wined3d: Store render states in the wined3d_stateblock_state structure. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 13 +++++++------ dlls/wined3d/stateblock.c | 21 ++++++++++++++++++--- dlls/wined3d/wined3d_private.h | 4 ++++ 3 files changed, 29 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 2c22331..dee99dc 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2033,8 +2033,6 @@ struct wined3d_rasterizer_state * CDECL wined3d_device_get_rasterizer_state(stru void CDECL wined3d_device_set_render_state(struct wined3d_device *device, enum wined3d_render_state state, DWORD value) { - DWORD old_value; - TRACE("device %p, state %s (%#x), value %#x.\n", device, debug_d3drenderstate(state), state, value); if (state > WINEHIGHEST_RENDER_STATE) @@ -2043,8 +2041,7 @@ void CDECL wined3d_device_set_render_state(struct wined3d_device *device, return; } - old_value = device->state.render_states[state]; - device->update_state->render_states[state] = value; + device->update_stateblock_state->rs[state] = value; /* Handle recording of state blocks. */ if (device->recording) @@ -2054,11 +2051,13 @@ void CDECL wined3d_device_set_render_state(struct wined3d_device *device, return; } - /* Compared here and not before the assignment to allow proper stateblock recording. */ - if (value == old_value) + if (value == device->state.render_states[state]) TRACE("Application is setting the old value over, nothing to do.\n"); else + { + device->state.render_states[state] = value; wined3d_cs_emit_set_render_state(device->cs, state, value); + } if (state == WINED3D_RS_POINTSIZE && value == WINED3D_RESZ_CODE) { @@ -5038,6 +5037,7 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, state_init(&device->state, &device->fb, &device->adapter->d3d_info, WINED3D_STATE_INIT_DEFAULT); device->update_state = &device->state; memset(&device->stateblock_state, 0, sizeof(device->stateblock_state)); + wined3d_stateblock_state_init(&device->stateblock_state, device, WINED3D_STATE_INIT_DEFAULT); device->update_stateblock_state = &device->stateblock_state; device_init_swapchain_state(device, swapchain); @@ -5313,6 +5313,7 @@ HRESULT device_init(struct wined3d_device *device, struct wined3d *wined3d, state_init(&device->state, &device->fb, &adapter->d3d_info, WINED3D_STATE_INIT_DEFAULT); device->update_state = &device->state; + wined3d_stateblock_state_init(&device->stateblock_state, device, WINED3D_STATE_INIT_DEFAULT); device->update_stateblock_state = &device->stateblock_state; device->max_frame_latency = 3; diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 80d02a3..1c8e6ad 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -916,9 +916,9 @@ void CDECL wined3d_stateblock_capture(struct wined3d_stateblock *stateblock) { enum wined3d_render_state rs = stateblock->contained_render_states[i]; - TRACE("Updating render state %#x to %u.\n", rs, src_state->render_states[rs]); + TRACE("Updating render state %#x to %u.\n", rs, state->rs[rs]); - stateblock->state.render_states[rs] = src_state->render_states[rs]; + stateblock->stateblock_state.rs[rs] = state->rs[rs]; } /* Texture states */ @@ -1066,8 +1066,9 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock) /* Render states. */ for (i = 0; i < stateblock->num_contained_render_states; ++i) { + state->rs[i] = stateblock->stateblock_state.rs[i]; wined3d_device_set_render_state(device, stateblock->contained_render_states[i], - stateblock->state.render_states[stateblock->contained_render_states[i]]); + stateblock->stateblock_state.rs[stateblock->contained_render_states[i]]); } /* Texture states. */ @@ -1387,6 +1388,19 @@ void state_init(struct wined3d_state *state, struct wined3d_fb_state *fb, state_init_default(state, d3d_info); } +static void stateblock_state_init_default(struct wined3d_stateblock_state *state, + const struct wined3d_d3d_info *d3d_info) +{ + init_default_render_states(state->rs, d3d_info); +} + +void wined3d_stateblock_state_init(struct wined3d_stateblock_state *state, + const struct wined3d_device *device, DWORD flags) +{ + if (flags & WINED3D_STATE_INIT_DEFAULT) + stateblock_state_init_default(state, &device->adapter->d3d_info); +} + static HRESULT stateblock_init(struct wined3d_stateblock *stateblock, struct wined3d_device *device, enum wined3d_stateblock_type type) { @@ -1395,6 +1409,7 @@ static HRESULT stateblock_init(struct wined3d_stateblock *stateblock, stateblock->ref = 1; stateblock->device = device; state_init(&stateblock->state, NULL, d3d_info, 0); + wined3d_stateblock_state_init(&stateblock->stateblock_state, device, 0); if (type == WINED3D_SBT_RECORDED) return WINED3D_OK; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c347018..1e3ec28 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2979,6 +2979,8 @@ struct wined3d_stateblock_state struct wined3d_vec4 ps_consts_f[WINED3D_MAX_PS_CONSTS_F]; struct wined3d_ivec4 ps_consts_i[WINED3D_MAX_CONSTS_I]; BOOL ps_consts_b[WINED3D_MAX_CONSTS_B]; + + DWORD rs[WINEHIGHEST_RENDER_STATE + 1]; }; struct wined3d_device @@ -3598,6 +3600,8 @@ struct wined3d_stateblock void stateblock_init_contained_states(struct wined3d_stateblock *stateblock) DECLSPEC_HIDDEN; +void wined3d_stateblock_state_init(struct wined3d_stateblock_state *state, + const struct wined3d_device *device, DWORD flags) DECLSPEC_HIDDEN; void wined3d_stateblock_state_cleanup(struct wined3d_stateblock_state *state) DECLSPEC_HIDDEN; void state_cleanup(struct wined3d_state *state) DECLSPEC_HIDDEN;

1 0

Alistair Leslie-Hughes : mfreadwrite: Add initial tests.
by Alexandre Julliard Jan. 29, 2019

Jan. 29, 2019

Module: wine Branch: master Commit: 2e4afec590a9375f55090dfc71bfb8a98a29e16e URL: https://source.winehq.org/git/wine.git/?a=commit;h=2e4afec590a9375f55090dfc… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Jan 29 02:31:00 2019 +0000 mfreadwrite: Add initial tests. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/mfreadwrite/Makefile.in | 1 + dlls/mfreadwrite/tests/Makefile.in | 5 ++ dlls/mfreadwrite/tests/mfplat.c | 109 +++++++++++++++++++++++++++++++++++++ 5 files changed, 117 insertions(+) diff --git a/configure b/configure index b3a360e..663b6dc 100755 --- a/configure +++ b/configure @@ -19692,6 +19692,7 @@ wine_fn_config_makefile dlls/mf3216 enable_mf3216 wine_fn_config_makefile dlls/mfplat enable_mfplat wine_fn_config_makefile dlls/mfplat/tests enable_tests wine_fn_config_makefile dlls/mfreadwrite enable_mfreadwrite +wine_fn_config_makefile dlls/mfreadwrite/tests enable_tests wine_fn_config_makefile dlls/mfuuid enable_mfuuid wine_fn_config_makefile dlls/mgmtapi enable_mgmtapi wine_fn_config_makefile dlls/midimap enable_midimap diff --git a/configure.ac b/configure.ac index 119c4ce..1b425d2 100644 --- a/configure.ac +++ b/configure.ac @@ -3431,6 +3431,7 @@ WINE_CONFIG_MAKEFILE(dlls/mf3216) WINE_CONFIG_MAKEFILE(dlls/mfplat) WINE_CONFIG_MAKEFILE(dlls/mfplat/tests) WINE_CONFIG_MAKEFILE(dlls/mfreadwrite) +WINE_CONFIG_MAKEFILE(dlls/mfreadwrite/tests) WINE_CONFIG_MAKEFILE(dlls/mfuuid) WINE_CONFIG_MAKEFILE(dlls/mgmtapi) WINE_CONFIG_MAKEFILE(dlls/midimap) diff --git a/dlls/mfreadwrite/Makefile.in b/dlls/mfreadwrite/Makefile.in index 7cf3a59..4b8ee82 100644 --- a/dlls/mfreadwrite/Makefile.in +++ b/dlls/mfreadwrite/Makefile.in @@ -1,4 +1,5 @@ MODULE = mfreadwrite.dll +IMPORTLIB = mfreadwrite C_SRCS = \ main.c diff --git a/dlls/mfreadwrite/tests/Makefile.in b/dlls/mfreadwrite/tests/Makefile.in new file mode 100644 index 0000000..5c906a1 --- /dev/null +++ b/dlls/mfreadwrite/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = mfreadwrite.dll +IMPORTS = ole32 mfplat mfreadwrite mfuuid + +C_SRCS = \ + mfplat.c diff --git a/dlls/mfreadwrite/tests/mfplat.c b/dlls/mfreadwrite/tests/mfplat.c new file mode 100644 index 0000000..9f5cad6 --- /dev/null +++ b/dlls/mfreadwrite/tests/mfplat.c @@ -0,0 +1,109 @@ +/* + * Copyright 2018 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> +#include <string.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "winreg.h" + +#include "mfapi.h" +#include "mfidl.h" +#include "mferror.h" +#include "mfreadwrite.h" + +#include "wine/test.h" + +#include "initguid.h" +DEFINE_GUID(MF_READWRITE_MMCSS_PRIORITY_AUDIO,0x273db885, 0x2de2, 0x4db2, 0xa6, 0xa7, 0xfd, 0xb6, 0x6f, 0xb4, 0x0b, 0x61); +DEFINE_GUID(MF_READWRITE_MMCSS_CLASS_AUDIO, 0x430847da, 0x0890, 0x4b0e, 0x93, 0x8c, 0x05, 0x43, 0x32, 0xc5, 0x47, 0xe1); + +static HRESULT (WINAPI *pMFCreateMFByteStreamOnStream)(IStream *stream, IMFByteStream **bytestream); + +static void init_functions(void) +{ + HMODULE mod = GetModuleHandleA("mfplat.dll"); + +#define X(f) if (!(p##f = (void*)GetProcAddress(mod, #f))) return; + X(MFCreateMFByteStreamOnStream); +#undef X +} + +static void test_MFCreateSourceReaderFromByteStream(void) +{ + static const WCHAR audio[] = {'A','u','d','i','o',0}; + IMFSourceReader *source; + IMFAttributes *attributes; + IMFByteStream *bytestream = NULL; + IStream *stream = NULL; + HRESULT hr; + + if(!pMFCreateMFByteStreamOnStream) + { + win_skip("MFCreateMFByteStreamOnStream() not found\n"); + return; + } + + hr = MFCreateAttributes( &attributes, 3 ); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IMFAttributes_SetString(attributes, &MF_READWRITE_MMCSS_CLASS_AUDIO, audio); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IMFAttributes_SetUINT32(attributes, &MF_READWRITE_MMCSS_PRIORITY_AUDIO, 0); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = pMFCreateMFByteStreamOnStream(stream, &bytestream); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = MFCreateSourceReaderFromByteStream(bytestream, attributes, &source); + ok(hr == S_OK || hr == MF_E_UNSUPPORTED_BYTESTREAM_TYPE, "got 0x%08x\n", hr); + + if(stream) + IStream_Release(stream); + if(bytestream) + IMFByteStream_Release(bytestream); + IMFAttributes_Release(attributes); + if(source) + IMFSourceReader_Release(source); +} + +START_TEST(mfplat) +{ + HRESULT hr; + + CoInitialize(NULL); + + hr = MFStartup(MF_VERSION, MFSTARTUP_FULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + + init_functions(); + + test_MFCreateSourceReaderFromByteStream(); + + MFShutdown(); + + CoUninitialize(); +}

1 0