wine-commits January 2019

wine-commits@winehq.org

2 participants
499 discussions

Sven Baars : dmime/tests: Fix a memory leak (Valgrind).
by Alexandre Julliard 29 Jan '19

29 Jan '19

Module: wine Branch: master Commit: 8f3a474655387845d2381f39f7addf526c92c2c8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8f3a474655387845d2381f39… Author: Sven Baars <sven.wine(a)gmail.com> Date: Tue Jan 29 00:10:58 2019 +0100 dmime/tests: Fix a memory leak (Valgrind). Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/tests/performance.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/dmime/tests/performance.c b/dlls/dmime/tests/performance.c index c4cbb32..567de1e 100644 --- a/dlls/dmime/tests/performance.c +++ b/dlls/dmime/tests/performance.c @@ -315,6 +315,9 @@ static void test_createport(void) ok(port == NULL, "Get IDirectMusicPort pointer? %p\n", port); ok(portparams.dwValidParams == 0, "portparams struct was filled in?\n"); + hr = IDirectMusicPerformance8_CloseDown(perf); + ok(hr == S_OK, "CloseDown failed: %08x\n", hr); + IDirectMusic_Release(music); IDirectMusicPerformance_Release(perf); }

1 0

Jon Doron : kernel32: Fix MOVEFILE_REPLACE_EXISTING between devices.
by Alexandre Julliard 29 Jan '19

29 Jan '19

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

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

29 Jan '19

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

Eric Bissonnette : dbghelp: Support full memory dumps.
by Alexandre Julliard 29 Jan '19

29 Jan '19

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

Sven Baars : wsdapi: Fix some memory leaks (Valgrind).
by Alexandre Julliard 29 Jan '19

29 Jan '19

Module: wine Branch: master Commit: 18ac7e15aab3343b6c6d4dc56a33ea7d24e84f0f URL: https://source.winehq.org/git/wine.git/?a=commit;h=18ac7e15aab3343b6c6d4dc5… Author: Sven Baars <sven.wine(a)gmail.com> Date: Thu Jan 24 11:59:45 2019 +0100 wsdapi: Fix some memory leaks (Valgrind). Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsdapi/soap.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/wsdapi/soap.c b/dlls/wsdapi/soap.c index 2ecc013..aa8d15f 100644 --- a/dlls/wsdapi/soap.c +++ b/dlls/wsdapi/soap.c @@ -1426,6 +1426,9 @@ static HRESULT ws_element_to_wsdxml_element(WS_XML_READER *reader, IWSDXMLContex if (FAILED(ret)) goto cleanup; WSDXMLAddChild(cur_element, element); + WSDFreeLinkedMemory(name); + name = NULL; + cur_wsd_attrib = NULL; /* Add attributes */ @@ -1462,6 +1465,9 @@ static HRESULT ws_element_to_wsdxml_element(WS_XML_READER *reader, IWSDXMLContex new_wsd_attrib->Element = cur_element; new_wsd_attrib->Next = NULL; + WSDAttachLinkedMemory(new_wsd_attrib, name); + name = NULL; + if (cur_wsd_attrib == NULL) element->FirstAttribute = new_wsd_attrib; else @@ -1524,6 +1530,7 @@ outofmemory: cleanup: /* Free uri and element_name if applicable */ WSDFreeLinkedMemory(uri); + WSDFreeLinkedMemory(name); return ret; } @@ -1712,10 +1719,10 @@ HRESULT read_message(IWSDiscoveryPublisherImpl *impl, const char *xml, int xml_l IWSDXMLContext *context = NULL; WS_XML_STRING *soap_uri = NULL; const WS_XML_NODE *node; - WS_XML_READER *reader; + WS_XML_READER *reader = NULL; LPCWSTR value = NULL; LPWSTR uri, prefix; - WS_HEAP *heap; + WS_HEAP *heap = NULL; HRESULT ret; int i; @@ -1945,6 +1952,8 @@ cleanup: free_xml_string(soap_uri); WSDFreeLinkedMemory(soap_msg); if (context != NULL) IWSDXMLContext_Release(context); + if (reader != NULL) WsFreeReader(reader); + if (heap != NULL) WsFreeHeap(heap); return ret; }

1 0

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

29 Jan '19

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

Fabian Maurer : api-ms-win-crt-private-l1-1-0: Update to 10.0.17134.12 ( WinBuild.160101.0800).
by Alexandre Julliard 29 Jan '19

29 Jan '19

Module: wine Branch: master Commit: d77464d8da222d895a0be05c238c1b5e718e4756 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d77464d8da222d895a0be05c… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sun Jan 27 16:06:00 2019 +0100 api-ms-win-crt-private-l1-1-0: Update to 10.0.17134.12 (WinBuild.160101.0800). 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 | 31 +++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) 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 60a9258..9bddd3d 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 @@ -15,6 +15,7 @@ @ stub __BuildCatchObject @ stub __BuildCatchObjectHelper @ stdcall -arch=x86_64 __C_specific_handler(ptr long ptr ptr) ucrtbase.__C_specific_handler +@ stub __C_specific_handler_noexcept @ cdecl -arch=i386,x86_64,arm,arm64 __CxxDetectRethrow(ptr) ucrtbase.__CxxDetectRethrow @ cdecl -arch=i386,x86_64,arm,arm64 __CxxExceptionFilter(ptr ptr long ptr) ucrtbase.__CxxExceptionFilter @ cdecl -arch=i386,x86_64,arm,arm64 -norelay __CxxFrameHandler(ptr ptr ptr ptr) ucrtbase.__CxxFrameHandler @@ -44,6 +45,7 @@ @ stub __report_gsfailure @ cdecl __std_exception_copy(ptr ptr) ucrtbase.__std_exception_copy @ cdecl __std_exception_destroy(ptr) ucrtbase.__std_exception_destroy +@ stub __std_terminate @ cdecl __std_type_info_compare(ptr ptr) ucrtbase.__std_type_info_compare @ cdecl __std_type_info_destroy_list(ptr) ucrtbase.__std_type_info_destroy_list @ cdecl __std_type_info_hash(ptr) ucrtbase.__std_type_info_hash @@ -51,6 +53,7 @@ @ cdecl __unDName(ptr str long ptr ptr long) ucrtbase.__unDName @ cdecl __unDNameEx(ptr str long ptr ptr ptr long) ucrtbase.__unDNameEx @ cdecl __uncaught_exception() ucrtbase.__uncaught_exception +@ stub __uncaught_exceptions @ cdecl -arch=i386 -norelay _chkesp() ucrtbase._chkesp @ cdecl -arch=i386 _except_handler2(ptr ptr ptr ptr) ucrtbase._except_handler2 @ cdecl -arch=i386 _except_handler3(ptr ptr ptr ptr) ucrtbase._except_handler3 @@ -87,6 +90,10 @@ @ stub _o__W_Getmonths @ stub _o__W_Gettnames @ stub _o__Wcsftime +@ stub _o____lc_codepage_func +@ stub _o____lc_collate_cp_func +@ stub _o____lc_locale_name_func +@ stub _o____mb_cur_max_func @ stub _o___acrt_iob_func @ stub _o___conio_common_vcprintf @ stub _o___conio_common_vcprintf_p @@ -135,6 +142,10 @@ @ stub _o___p__wpgmptr @ stub _o___pctype_func @ stub _o___pwctype_func +@ stub _o___std_exception_copy +@ stub _o___std_exception_destroy +@ stub _o___std_type_info_destroy_list +@ stub _o___std_type_info_name @ stub _o___stdio_common_vfprintf @ stub _o___stdio_common_vfprintf_p @ stub _o___stdio_common_vfprintf_s @@ -184,6 +195,7 @@ @ stub _o__cabs @ stub _o__callnewh @ stub _o__calloc_base +@ stub _o__cexit @ stub _o__cgets @ stub _o__cgets_s @ stub _o__cgetws @@ -195,11 +207,15 @@ @ stub _o__chsize_s @ stub _o__close @ stub _o__commit +@ stub _o__configthreadlocale +@ stub _o__configure_narrow_argv @ stub _o__configure_wide_argv +@ stub _o__controlfp_s @ stub _o__cputs @ stub _o__cputws @ stub _o__creat @ stub _o__create_locale +@ stub _o__crt_atexit @ stub _o__ctime32_s @ stub _o__ctime64_s @ stub _o__cwait @@ -231,6 +247,7 @@ @ stub _o__execve @ stub _o__execvp @ stub _o__execvpe +@ stub _o__exit @ stub _o__expand @ stub _o__fclose_nolock @ stub _o__fcloseall @@ -301,6 +318,8 @@ @ stub _o__get_errno @ stub _o__get_fmode @ stub _o__get_heap_handle +@ stub _o__get_initial_narrow_environment +@ stub _o__get_initial_wide_environment @ stub _o__get_invalid_parameter_handler @ stub _o__get_narrow_winmain_command_line @ stub _o__get_osfhandle @@ -345,7 +364,9 @@ @ stub _o__i64toa_s @ stub _o__i64tow @ 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 @ stub _o__invalid_parameter_noinfo @ stub _o__invalid_parameter_noinfo_noreturn @ stub _o__isatty @@ -617,6 +638,7 @@ @ stub _o__pclose @ stub _o__pipe @ stub _o__popen +@ stub _o__purecall @ stub _o__putc_nolock @ stub _o__putch @ stub _o__putch_nolock @@ -638,9 +660,13 @@ @ stub _o__scalbf @ stub _o__searchenv @ stub _o__searchenv_s +@ stub _o__seh_filter_dll +@ stub _o__seh_filter_exe @ stub _o__set_abort_behavior +@ stub _o__set_app_type @ stub _o__set_doserrno @ stub _o__set_errno +@ stub _o__set_fmode @ stub _o__set_invalid_parameter_handler @ stub _o__set_new_handler @ stub _o__set_new_mode @@ -910,6 +936,7 @@ @ stub _o_erfcl @ stub _o_erff @ stub _o_erfl +@ stub _o_exit @ stub _o_exp @ stub _o_exp2 @ stub _o_exp2f @@ -1026,7 +1053,7 @@ @ stub _o_mbstowcs @ stub _o_mbstowcs_s @ stub _o_mbtowc -@ stub _o_memset +@ stub _o_memcpy_s @ stub _o_modf @ stub _o_modff @ stub _o_nan @@ -1061,6 +1088,7 @@ @ stub _o_remquo @ stub _o_remquof @ stub _o_remquol +@ stub _o_rename @ stub _o_rewind @ stub _o_rint @ stub _o_rintf @@ -1076,6 +1104,7 @@ @ stub _o_scalbnl @ stub _o_set_terminate @ stub _o_setbuf +@ stub _o_setlocale @ stub _o_setvbuf @ stub _o_sin @ stub _o_sinf

1 0

Andrey Gusev : mshtml: Remove redundant condition.
by Alexandre Julliard 29 Jan '19

29 Jan '19

Module: wine Branch: master Commit: 870598b8b0a6db8f796acec83b67e738b213dea0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=870598b8b0a6db8f796acec8… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Tue Jan 29 18:30:40 2019 +0200 mshtml: Remove redundant condition. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index c0171c8..cab39d6 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -2256,7 +2256,7 @@ static DOMEvent *alloc_event(nsIDOMEvent *nsevent, eventid_t event_id) custom_event->event.destroy = DOMCustomEvent_destroy; event = &custom_event->event; dispex_data = &DOMCustomEvent_dispex; - }else if(!event) { + }else { event = heap_alloc_zero(sizeof(*event)); if(!event) return NULL;

1 0

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

29 Jan '19

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

Zebediah Figura : wined3d: Factor our init_default_render_states().
by Alexandre Julliard 29 Jan '19

29 Jan '19

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

← Newer
1
...
5
6
7
8
9
10
11
...
50
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2019