November 2014 - Wine-commits

Sebastian Lackner : ntdll: Implement Rtl[Add|Remove] VectoredContinueHandler semi-stubs.
by Alexandre Julliard 14 Nov '14

14 Nov '14

Module: wine Branch: master Commit: 275ee4b376177f260693541a0f89f4e0c8c71847 URL: http://source.winehq.org/git/wine.git/?a=commit;h=275ee4b376177f260693541a0… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Nov 14 00:12:07 2014 +0100 ntdll: Implement Rtl[Add|Remove]VectoredContinueHandler semi-stubs. --- dlls/ntdll/exception.c | 85 +++++++++++++++++++++++++------------------- dlls/ntdll/tests/exception.c | 5 --- 2 files changed, 49 insertions(+), 41 deletions(-) diff --git a/dlls/ntdll/exception.c b/dlls/ntdll/exception.c index 37edc77..5b4abb6 100644 --- a/dlls/ntdll/exception.c +++ b/dlls/ntdll/exception.c @@ -47,7 +47,8 @@ typedef struct ULONG count; } VECTORED_HANDLER; -static struct list vectored_handlers = LIST_INIT(vectored_handlers); +static struct list vectored_exception_handlers = LIST_INIT(vectored_exception_handlers); +static struct list vectored_continue_handlers = LIST_INIT(vectored_continue_handlers); static RTL_CRITICAL_SECTION vectored_handlers_section; static RTL_CRITICAL_SECTION_DEBUG critsect_debug = @@ -58,6 +59,47 @@ static RTL_CRITICAL_SECTION_DEBUG critsect_debug = }; static RTL_CRITICAL_SECTION vectored_handlers_section = { &critsect_debug, -1, 0, 0, 0, 0 }; + +static VECTORED_HANDLER *add_vectored_handler( struct list *handler_list, ULONG first, + PVECTORED_EXCEPTION_HANDLER func ) +{ + VECTORED_HANDLER *handler = RtlAllocateHeap( GetProcessHeap(), 0, sizeof(*handler) ); + if (handler) + { + handler->func = RtlEncodePointer( func ); + handler->count = 1; + RtlEnterCriticalSection( &vectored_handlers_section ); + if (first) list_add_head( handler_list, &handler->entry ); + else list_add_tail( handler_list, &handler->entry ); + RtlLeaveCriticalSection( &vectored_handlers_section ); + } + return handler; +} + + +static ULONG remove_vectored_handler( struct list *handler_list, VECTORED_HANDLER *handler ) +{ + struct list *ptr; + ULONG ret = FALSE; + + RtlEnterCriticalSection( &vectored_handlers_section ); + LIST_FOR_EACH( ptr, handler_list ) + { + VECTORED_HANDLER *curr_handler = LIST_ENTRY( ptr, VECTORED_HANDLER, entry ); + if (curr_handler == handler) + { + if (!--curr_handler->count) list_remove( ptr ); + else handler = NULL; /* don't free it yet */ + ret = TRUE; + break; + } + } + RtlLeaveCriticalSection( &vectored_handlers_section ); + if (ret) RtlFreeHeap( GetProcessHeap(), 0, handler ); + return ret; +} + + /********************************************************************** * wait_suspend * @@ -165,7 +207,7 @@ LONG call_vectored_handlers( EXCEPTION_RECORD *rec, CONTEXT *context ) except_ptrs.ContextRecord = context; RtlEnterCriticalSection( &vectored_handlers_section ); - ptr = list_head( &vectored_handlers ); + ptr = list_head( &vectored_exception_handlers ); while (ptr) { handler = LIST_ENTRY( ptr, VECTORED_HANDLER, entry ); @@ -181,7 +223,7 @@ LONG call_vectored_handlers( EXCEPTION_RECORD *rec, CONTEXT *context ) TRACE( "handler at %p returned %x\n", func, ret ); RtlEnterCriticalSection( &vectored_handlers_section ); - ptr = list_next( &vectored_handlers, ptr ); + ptr = list_next( &vectored_exception_handlers, ptr ); if (!--handler->count) /* removed during execution */ { list_remove( &handler->entry ); @@ -228,8 +270,7 @@ void WINAPI RtlRaiseStatus( NTSTATUS status ) */ PVOID WINAPI RtlAddVectoredContinueHandler( ULONG first, PVECTORED_EXCEPTION_HANDLER func ) { - FIXME("%u %p stub\n", first, func); - return NULL; + return add_vectored_handler( &vectored_continue_handlers, first, func ); } @@ -238,8 +279,7 @@ PVOID WINAPI RtlAddVectoredContinueHandler( ULONG first, PVECTORED_EXCEPTION_HAN */ ULONG WINAPI RtlRemoveVectoredContinueHandler( PVOID handler ) { - FIXME("%p stub\n", handler); - return FALSE; + return remove_vectored_handler( &vectored_continue_handlers, handler ); } @@ -248,17 +288,7 @@ ULONG WINAPI RtlRemoveVectoredContinueHandler( PVOID handler ) */ PVOID WINAPI RtlAddVectoredExceptionHandler( ULONG first, PVECTORED_EXCEPTION_HANDLER func ) { - VECTORED_HANDLER *handler = RtlAllocateHeap( GetProcessHeap(), 0, sizeof(*handler) ); - if (handler) - { - handler->func = RtlEncodePointer( func ); - handler->count = 1; - RtlEnterCriticalSection( &vectored_handlers_section ); - if (first) list_add_head( &vectored_handlers, &handler->entry ); - else list_add_tail( &vectored_handlers, &handler->entry ); - RtlLeaveCriticalSection( &vectored_handlers_section ); - } - return handler; + return add_vectored_handler( &vectored_exception_handlers, first, func ); } @@ -267,24 +297,7 @@ PVOID WINAPI RtlAddVectoredExceptionHandler( ULONG first, PVECTORED_EXCEPTION_HA */ ULONG WINAPI RtlRemoveVectoredExceptionHandler( PVOID handler ) { - struct list *ptr; - ULONG ret = FALSE; - - RtlEnterCriticalSection( &vectored_handlers_section ); - LIST_FOR_EACH( ptr, &vectored_handlers ) - { - VECTORED_HANDLER *curr_handler = LIST_ENTRY( ptr, VECTORED_HANDLER, entry ); - if (curr_handler == handler) - { - if (!--curr_handler->count) list_remove( ptr ); - else handler = NULL; /* don't free it yet */ - ret = TRUE; - break; - } - } - RtlLeaveCriticalSection( &vectored_handlers_section ); - if (ret) RtlFreeHeap( GetProcessHeap(), 0, handler ); - return ret; + return remove_vectored_handler( &vectored_exception_handlers, handler ); } diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 451e497..5cbab71 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -1803,13 +1803,10 @@ static void test_vectored_continue_handler(void) } handler1 = pRtlAddVectoredContinueHandler(TRUE, (void *)0xdeadbeef); - todo_wine ok(handler1 != 0, "RtlAddVectoredContinueHandler failed\n"); handler2 = pRtlAddVectoredContinueHandler(TRUE, (void *)0xdeadbeef); - todo_wine ok(handler2 != 0, "RtlAddVectoredContinueHandler failed\n"); - todo_wine ok(handler1 != handler2, "RtlAddVectoredContinueHandler returned same handler\n"); if (pRtlRemoveVectoredExceptionHandler) @@ -1819,11 +1816,9 @@ static void test_vectored_continue_handler(void) } ret = pRtlRemoveVectoredContinueHandler(handler1); - todo_wine ok(ret, "RtlRemoveVectoredContinueHandler failed\n"); ret = pRtlRemoveVectoredContinueHandler(handler2); - todo_wine ok(ret, "RtlRemoveVectoredContinueHandler failed\n"); ret = pRtlRemoveVectoredContinueHandler(handler1);

1 0

Sebastian Lackner : d3dx9_36: Allow NULL pointer for optional arguments of D3DXIntersectTri.
by Alexandre Julliard 14 Nov '14

14 Nov '14

Module: wine Branch: master Commit: b69038e3d96bd4eee19be6d6c6de7d4abb03460d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b69038e3d96bd4eee19be6d6c… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sat Nov 8 19:29:53 2014 +0100 d3dx9_36: Allow NULL pointer for optional arguments of D3DXIntersectTri. --- dlls/d3dx9_36/mesh.c | 6 +++--- dlls/d3dx9_36/tests/mesh.c | 9 +++++++++ 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index 9aece61..6f268f2 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -2407,9 +2407,9 @@ BOOL WINAPI D3DXIntersectTri(const D3DXVECTOR3 *p0, const D3DXVECTOR3 *p1, const D3DXVec4Transform(&vec, &vec, &m); if ( (vec.x >= 0.0f) && (vec.y >= 0.0f) && (vec.x + vec.y <= 1.0f) && (vec.z >= 0.0f) ) { - *pu = vec.x; - *pv = vec.y; - *pdist = fabsf( vec.z ); + if (pu) *pu = vec.x; + if (pv) *pv = vec.y; + if (pdist) *pdist = fabsf( vec.z ); return TRUE; } } diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index 870f62a..dac0f60 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -1104,6 +1104,9 @@ static void D3DXIntersectTriTest(void) ok( compare(exp_v,got_v), "Expected v = %f, got %f\n",exp_v,got_v); ok( compare(exp_dist,got_dist), "Expected distance = %f, got %f\n",exp_dist,got_dist); + got_res = D3DXIntersectTri(&vertex[0], &vertex[1], &vertex[2], &position, &ray, NULL, NULL, NULL); + ok(got_res == exp_res, "Expected result = %d, got %d\n", exp_res, got_res); + /*Only positive ray is taken in account*/ vertex[0].x = 1.0f; vertex[0].y = 0.0f; vertex[0].z = 0.0f; @@ -1119,6 +1122,9 @@ static void D3DXIntersectTriTest(void) got_res = D3DXIntersectTri(&vertex[0],&vertex[1],&vertex[2],&position,&ray,&got_u,&got_v,&got_dist); ok( got_res == exp_res, "Expected result = %d, got %d\n",exp_res,got_res); + got_res = D3DXIntersectTri(&vertex[0], &vertex[1], &vertex[2], &position, &ray, NULL, NULL, NULL); + ok(got_res == exp_res, "Expected result = %d, got %d\n", exp_res, got_res); + /*Intersection between ray and triangle in a same plane is considered as empty*/ vertex[0].x = 4.0f; vertex[0].y = 0.0f; vertex[0].z = 0.0f; @@ -1133,6 +1139,9 @@ static void D3DXIntersectTriTest(void) got_res = D3DXIntersectTri(&vertex[0],&vertex[1],&vertex[2],&position,&ray,&got_u,&got_v,&got_dist); ok( got_res == exp_res, "Expected result = %d, got %d\n",exp_res,got_res); + + got_res = D3DXIntersectTri(&vertex[0], &vertex[1], &vertex[2], &position, &ray, NULL, NULL, NULL); + ok(got_res == exp_res, "Expected result = %d, got %d\n", exp_res, got_res); } static void D3DXCreateMeshTest(void)

1 0

Alexandre Julliard : configure: Don't require libXext for Xrender.
by Alexandre Julliard 14 Nov '14

14 Nov '14

Module: wine Branch: master Commit: 60fcafcf048fe426e4bc3e830712be08d1828729 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60fcafcf048fe426e4bc3e830… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 14 15:36:38 2014 +0900 configure: Don't require libXext for Xrender. --- configure | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index b469858..909b622 100755 --- a/configure +++ b/configure @@ -9818,7 +9818,7 @@ This is an error since --with-xxf86vm was requested." "$LINENO" 5 ;; esac fi - if test "$ac_cv_header_X11_extensions_Xrender_h" = "yes" -a "x$ac_cv_lib_soname_X11" != "x" -a "x$ac_cv_lib_soname_Xext" != "x" + if test "$ac_cv_header_X11_extensions_Xrender_h" = "yes" -a "x$ac_cv_lib_soname_X11" != "x" then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -lXrender" >&5 $as_echo_n "checking for -lXrender... " >&6; } diff --git a/configure.ac b/configure.ac index 398d60b..4ee8133 100644 --- a/configure.ac +++ b/configure.ac @@ -1161,7 +1161,7 @@ then [libXxf86vm ${notice_platform}development files not found, XFree86 Vidmode won't be supported.]) dnl *** Check for Transform functions in Xrender - if test "$ac_cv_header_X11_extensions_Xrender_h" = "yes" -a "x$ac_cv_lib_soname_X11" != "x" -a "x$ac_cv_lib_soname_Xext" != "x" + if test "$ac_cv_header_X11_extensions_Xrender_h" = "yes" -a "x$ac_cv_lib_soname_X11" != "x" then WINE_CHECK_SONAME(Xrender,XRenderQueryExtension, [AC_CHECK_LIB(Xrender,XRenderSetPictureTransform,

1 0

Sebastian Lackner : psapi/tests: Add tests for GetPerformanceInfo function.
by Alexandre Julliard 14 Nov '14

14 Nov '14

Module: wine Branch: master Commit: 4297046d013c9e941221d850728fefd285108181 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4297046d013c9e941221d8507… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Nov 14 06:47:13 2014 +0100 psapi/tests: Add tests for GetPerformanceInfo function. --- dlls/psapi/tests/psapi_main.c | 137 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 136 insertions(+), 1 deletion(-) diff --git a/dlls/psapi/tests/psapi_main.c b/dlls/psapi/tests/psapi_main.c index 62d4f5c..7220da9 100644 --- a/dlls/psapi/tests/psapi_main.c +++ b/dlls/psapi/tests/psapi_main.c @@ -53,14 +53,16 @@ static DWORD (WINAPI *pGetModuleFileNameExW)(HANDLE, HMODULE, LPWSTR, DWORD); static BOOL (WINAPI *pGetModuleInformation)(HANDLE, HMODULE, LPMODULEINFO, DWORD); static DWORD (WINAPI *pGetMappedFileNameA)(HANDLE, LPVOID, LPSTR, DWORD); static DWORD (WINAPI *pGetMappedFileNameW)(HANDLE, LPVOID, LPWSTR, DWORD); +static BOOL (WINAPI *pGetPerformanceInfo)(PPERFORMANCE_INFORMATION, DWORD); static DWORD (WINAPI *pGetProcessImageFileNameA)(HANDLE, LPSTR, DWORD); static DWORD (WINAPI *pGetProcessImageFileNameW)(HANDLE, LPWSTR, DWORD); static BOOL (WINAPI *pGetProcessMemoryInfo)(HANDLE, PPROCESS_MEMORY_COUNTERS, DWORD); static BOOL (WINAPI *pGetWsChanges)(HANDLE, PPSAPI_WS_WATCH_INFORMATION, DWORD); static BOOL (WINAPI *pInitializeProcessForWsWatch)(HANDLE); static BOOL (WINAPI *pQueryWorkingSet)(HANDLE, PVOID, DWORD); +static NTSTATUS (WINAPI *pNtQuerySystemInformation)(SYSTEM_INFORMATION_CLASS, PVOID, ULONG, PULONG); static NTSTATUS (WINAPI *pNtQueryVirtualMemory)(HANDLE, LPCVOID, ULONG, PVOID, SIZE_T, SIZE_T *); - + static BOOL InitFunctionPtrs(HMODULE hpsapi) { PSAPI_GET_PROC(EmptyWorkingSet); @@ -77,10 +79,13 @@ static BOOL InitFunctionPtrs(HMODULE hpsapi) PSAPI_GET_PROC(InitializeProcessForWsWatch); PSAPI_GET_PROC(QueryWorkingSet); /* GetProcessImageFileName is not exported on NT4 */ + pGetPerformanceInfo = + (void *)GetProcAddress(hpsapi, "GetPerformanceInfo"); pGetProcessImageFileNameA = (void *)GetProcAddress(hpsapi, "GetProcessImageFileNameA"); pGetProcessImageFileNameW = (void *)GetProcAddress(hpsapi, "GetProcessImageFileNameW"); + pNtQuerySystemInformation = (void *)GetProcAddress(GetModuleHandleA("ntdll.dll"), "NtQuerySystemInformation"); pNtQueryVirtualMemory = (void *)GetProcAddress(GetModuleHandleA("ntdll.dll"), "NtQueryVirtualMemory"); return TRUE; } @@ -184,6 +189,135 @@ static void test_GetModuleInformation(void) ok(info.lpBaseOfDll == hMod, "lpBaseOfDll=%p hMod=%p\n", info.lpBaseOfDll, hMod); } +static void test_GetPerformanceInfo(void) +{ + PERFORMANCE_INFORMATION info; + NTSTATUS status; + DWORD size; + BOOL ret; + + SetLastError(0xdeadbeef); + ret = pGetPerformanceInfo(&info, sizeof(info)-1); + ok(!ret, "GetPerformanceInfo unexpectedly succeeded\n"); + ok(GetLastError() == ERROR_BAD_LENGTH, "expected error=ERROR_BAD_LENGTH but got %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = pGetPerformanceInfo(&info, sizeof(info)); + todo_wine + ok(ret, "GetPerformanceInfo failed with %d\n", GetLastError()); + todo_wine + ok(info.cb == sizeof(PERFORMANCE_INFORMATION), "got %d\n", info.cb); + + if (!pNtQuerySystemInformation) + win_skip("NtQuerySystemInformation not found, skipping tests\n"); + else + { + char performance_buffer[sizeof(SYSTEM_PERFORMANCE_INFORMATION) + 16]; /* larger on w2k8/win7 */ + SYSTEM_PERFORMANCE_INFORMATION *sys_performance_info = (SYSTEM_PERFORMANCE_INFORMATION *)performance_buffer; + SYSTEM_PROCESS_INFORMATION *sys_process_info = NULL, *spi; + SYSTEM_BASIC_INFORMATION sys_basic_info; + DWORD process_count, handle_count, thread_count; + + /* compare with values from SYSTEM_PERFORMANCE_INFORMATION */ + size = 0; + status = pNtQuerySystemInformation(SystemPerformanceInformation, sys_performance_info, sizeof(performance_buffer), &size); + ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %08x\n", status); + ok(size >= sizeof(SYSTEM_PERFORMANCE_INFORMATION), "incorrect length %d\n", size); + + todo_wine + ok(info.CommitTotal == sys_performance_info->TotalCommittedPages, + "expected info.CommitTotal=%u but got %u\n", + sys_performance_info->TotalCommittedPages, (ULONG)info.CommitTotal); + + todo_wine + ok(info.CommitLimit == sys_performance_info->TotalCommitLimit, + "expected info.CommitLimit=%u but got %u\n", + sys_performance_info->TotalCommitLimit, (ULONG)info.CommitLimit); + + todo_wine + ok(info.CommitPeak == sys_performance_info->PeakCommitment, + "expected info.CommitPeak=%u but got %u\n", + sys_performance_info->PeakCommitment, (ULONG)info.CommitPeak); + + todo_wine + ok(info.PhysicalAvailable >= max(sys_performance_info->AvailablePages, 25) - 25 && + info.PhysicalAvailable <= sys_performance_info->AvailablePages + 25, + "expected approximately info.PhysicalAvailable=%u but got %u\n", + sys_performance_info->AvailablePages, (ULONG)info.PhysicalAvailable); + + /* TODO: info.SystemCache not checked yet - to which field(s) does this value correspond to? */ + + todo_wine + ok(info.KernelTotal == sys_performance_info->PagedPoolUsage + sys_performance_info->NonPagedPoolUsage, + "expected info.KernelTotal=%u but got %u\n", + sys_performance_info->PagedPoolUsage + sys_performance_info->NonPagedPoolUsage, (ULONG)info.KernelTotal); + + todo_wine + ok(info.KernelPaged == sys_performance_info->PagedPoolUsage, + "expected info.KernelPaged=%u but got %u\n", + sys_performance_info->PagedPoolUsage, (ULONG)info.KernelPaged); + + todo_wine + ok(info.KernelNonpaged == sys_performance_info->NonPagedPoolUsage, + "expected info.KernelNonpaged=%u but got %u\n", + sys_performance_info->NonPagedPoolUsage, (ULONG)info.KernelNonpaged); + + /* compare with values from SYSTEM_BASIC_INFORMATION */ + size = 0; + status = pNtQuerySystemInformation(SystemBasicInformation, &sys_basic_info, sizeof(sys_basic_info), &size); + ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %08x\n", status); + ok(size >= sizeof(SYSTEM_BASIC_INFORMATION), "incorrect length %d\n", size); + + todo_wine + ok(info.PhysicalTotal == sys_basic_info.MmNumberOfPhysicalPages, + "expected info.PhysicalTotal=%u but got %u\n", + sys_basic_info.MmNumberOfPhysicalPages, (ULONG)info.PhysicalTotal); + + todo_wine + ok(info.PageSize == sys_basic_info.PageSize, + "expected info.PageSize=%u but got %u\n", + sys_basic_info.PageSize, (ULONG)info.PageSize); + + /* compare with values from SYSTEM_PROCESS_INFORMATION */ + size = 0; + status = pNtQuerySystemInformation(SystemProcessInformation, NULL, 0, &size); + ok(status == STATUS_INFO_LENGTH_MISMATCH, "expected STATUS_LENGTH_MISMATCH, got %08x\n", status); + ok(size > 0, "incorrect length %d\n", size); + while (status == STATUS_INFO_LENGTH_MISMATCH) + { + sys_process_info = HeapAlloc(GetProcessHeap(), 0, size); + ok(sys_process_info != NULL, "failed to allocate memory\n"); + status = pNtQuerySystemInformation(SystemProcessInformation, sys_process_info, size, &size); + if (status == STATUS_SUCCESS) break; + HeapFree(GetProcessHeap(), 0, sys_process_info); + } + ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %08x\n", status); + + process_count = handle_count = thread_count = 0; + for (spi = sys_process_info;; spi = (SYSTEM_PROCESS_INFORMATION *)(((char *)spi) + spi->NextEntryOffset)) + { + process_count++; + handle_count += spi->HandleCount; + thread_count += spi->dwThreadCount; + if (spi->NextEntryOffset == 0) break; + } + HeapFree(GetProcessHeap(), 0, sys_process_info); + + todo_wine + ok(info.HandleCount == handle_count, + "expected info.HandleCount=%u but got %u\n", handle_count, info.HandleCount); + + todo_wine + ok(info.ProcessCount == process_count, + "expected info.ProcessCount=%u but got %u\n", process_count, info.ProcessCount); + + todo_wine + ok(info.ThreadCount == thread_count, + "expected info.ThreadCount=%u but got %u\n", thread_count, info.ThreadCount); + } +} + + static void test_GetProcessMemoryInfo(void) { PROCESS_MEMORY_COUNTERS pmc; @@ -677,6 +811,7 @@ START_TEST(psapi_main) test_EnumProcesses(); test_EnumProcessModules(); test_GetModuleInformation(); + test_GetPerformanceInfo(); test_GetProcessMemoryInfo(); test_GetMappedFileName(); test_GetProcessImageFileName();

1 0

Sebastian Lackner : kernel32: Fix implementation of K32GetPerformanceInfo.
by Alexandre Julliard 14 Nov '14

14 Nov '14

Module: wine Branch: master Commit: 4032eef90fc9cb6dcd09310a9ed5372e234e7653 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4032eef90fc9cb6dcd09310a9… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Nov 14 08:07:34 2014 +0100 kernel32: Fix implementation of K32GetPerformanceInfo. --- dlls/kernel32/cpu.c | 64 ++++++++++++++++++++++++++++++++++++++++++- dlls/psapi/tests/psapi_main.c | 14 ---------- 2 files changed, 63 insertions(+), 15 deletions(-) diff --git a/dlls/kernel32/cpu.c b/dlls/kernel32/cpu.c index 0ebf8f3..f48fcf0 100644 --- a/dlls/kernel32/cpu.c +++ b/dlls/kernel32/cpu.c @@ -216,12 +216,74 @@ BOOL WINAPI IsProcessorFeaturePresent ( */ BOOL WINAPI K32GetPerformanceInfo(PPERFORMANCE_INFORMATION info, DWORD size) { + union + { + SYSTEM_PERFORMANCE_INFORMATION performance; + SYSTEM_PROCESS_INFORMATION process; + SYSTEM_BASIC_INFORMATION basic; + } *sysinfo; + SYSTEM_PROCESS_INFORMATION *spi; + DWORD process_info_size; NTSTATUS status; TRACE( "(%p, %d)\n", info, size ); - status = NtQuerySystemInformation( SystemPerformanceInformation, info, size, NULL ); + if (size < sizeof(*info)) + { + SetLastError( ERROR_BAD_LENGTH ); + return FALSE; + } + + memset( info, 0, sizeof(*info) ); + info->cb = sizeof(*info); + + /* fields from SYSTEM_PROCESS_INFORMATION */ + NtQuerySystemInformation( SystemProcessInformation, NULL, 0, &process_info_size ); + for (;;) + { + sysinfo = HeapAlloc( GetProcessHeap(), 0, max(process_info_size, sizeof(*sysinfo)) ); + if (!sysinfo) + { + SetLastError( ERROR_OUTOFMEMORY ); + return FALSE; + } + status = NtQuerySystemInformation( SystemProcessInformation, &sysinfo->process, + process_info_size, &process_info_size ); + if (!status) break; + if (status != STATUS_INFO_LENGTH_MISMATCH) + goto err; + HeapFree( GetProcessHeap(), 0, sysinfo ); + } + for (spi = &sysinfo->process;; spi = (SYSTEM_PROCESS_INFORMATION *)(((PCHAR)spi) + spi->NextEntryOffset)) + { + info->ProcessCount++; + info->HandleCount += spi->HandleCount; + info->ThreadCount += spi->dwThreadCount; + if (spi->NextEntryOffset == 0) break; + } + + /* fields from SYSTEM_PERFORMANCE_INFORMATION */ + status = NtQuerySystemInformation( SystemPerformanceInformation, &sysinfo->performance, + sizeof(sysinfo->performance), NULL ); + if (status) goto err; + info->CommitTotal = sysinfo->performance.TotalCommittedPages; + info->CommitLimit = sysinfo->performance.TotalCommitLimit; + info->CommitPeak = sysinfo->performance.PeakCommitment; + info->PhysicalAvailable = sysinfo->performance.AvailablePages; + info->KernelTotal = sysinfo->performance.PagedPoolUsage + + sysinfo->performance.NonPagedPoolUsage; + info->KernelPaged = sysinfo->performance.PagedPoolUsage; + info->KernelNonpaged = sysinfo->performance.NonPagedPoolUsage; + + /* fields from SYSTEM_BASIC_INFORMATION */ + status = NtQuerySystemInformation( SystemBasicInformation, &sysinfo->basic, + sizeof(sysinfo->basic), NULL ); + if (status) goto err; + info->PhysicalTotal = sysinfo->basic.MmNumberOfPhysicalPages; + info->PageSize = sysinfo->basic.PageSize; +err: + HeapFree( GetProcessHeap(), 0, sysinfo ); if (status) { SetLastError( RtlNtStatusToDosError( status ) ); diff --git a/dlls/psapi/tests/psapi_main.c b/dlls/psapi/tests/psapi_main.c index 7220da9..890b4ac 100644 --- a/dlls/psapi/tests/psapi_main.c +++ b/dlls/psapi/tests/psapi_main.c @@ -203,9 +203,7 @@ static void test_GetPerformanceInfo(void) SetLastError(0xdeadbeef); ret = pGetPerformanceInfo(&info, sizeof(info)); - todo_wine ok(ret, "GetPerformanceInfo failed with %d\n", GetLastError()); - todo_wine ok(info.cb == sizeof(PERFORMANCE_INFORMATION), "got %d\n", info.cb); if (!pNtQuerySystemInformation) @@ -224,22 +222,18 @@ static void test_GetPerformanceInfo(void) ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %08x\n", status); ok(size >= sizeof(SYSTEM_PERFORMANCE_INFORMATION), "incorrect length %d\n", size); - todo_wine ok(info.CommitTotal == sys_performance_info->TotalCommittedPages, "expected info.CommitTotal=%u but got %u\n", sys_performance_info->TotalCommittedPages, (ULONG)info.CommitTotal); - todo_wine ok(info.CommitLimit == sys_performance_info->TotalCommitLimit, "expected info.CommitLimit=%u but got %u\n", sys_performance_info->TotalCommitLimit, (ULONG)info.CommitLimit); - todo_wine ok(info.CommitPeak == sys_performance_info->PeakCommitment, "expected info.CommitPeak=%u but got %u\n", sys_performance_info->PeakCommitment, (ULONG)info.CommitPeak); - todo_wine ok(info.PhysicalAvailable >= max(sys_performance_info->AvailablePages, 25) - 25 && info.PhysicalAvailable <= sys_performance_info->AvailablePages + 25, "expected approximately info.PhysicalAvailable=%u but got %u\n", @@ -247,17 +241,14 @@ static void test_GetPerformanceInfo(void) /* TODO: info.SystemCache not checked yet - to which field(s) does this value correspond to? */ - todo_wine ok(info.KernelTotal == sys_performance_info->PagedPoolUsage + sys_performance_info->NonPagedPoolUsage, "expected info.KernelTotal=%u but got %u\n", sys_performance_info->PagedPoolUsage + sys_performance_info->NonPagedPoolUsage, (ULONG)info.KernelTotal); - todo_wine ok(info.KernelPaged == sys_performance_info->PagedPoolUsage, "expected info.KernelPaged=%u but got %u\n", sys_performance_info->PagedPoolUsage, (ULONG)info.KernelPaged); - todo_wine ok(info.KernelNonpaged == sys_performance_info->NonPagedPoolUsage, "expected info.KernelNonpaged=%u but got %u\n", sys_performance_info->NonPagedPoolUsage, (ULONG)info.KernelNonpaged); @@ -268,12 +259,10 @@ static void test_GetPerformanceInfo(void) ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %08x\n", status); ok(size >= sizeof(SYSTEM_BASIC_INFORMATION), "incorrect length %d\n", size); - todo_wine ok(info.PhysicalTotal == sys_basic_info.MmNumberOfPhysicalPages, "expected info.PhysicalTotal=%u but got %u\n", sys_basic_info.MmNumberOfPhysicalPages, (ULONG)info.PhysicalTotal); - todo_wine ok(info.PageSize == sys_basic_info.PageSize, "expected info.PageSize=%u but got %u\n", sys_basic_info.PageSize, (ULONG)info.PageSize); @@ -303,15 +292,12 @@ static void test_GetPerformanceInfo(void) } HeapFree(GetProcessHeap(), 0, sys_process_info); - todo_wine ok(info.HandleCount == handle_count, "expected info.HandleCount=%u but got %u\n", handle_count, info.HandleCount); - todo_wine ok(info.ProcessCount == process_count, "expected info.ProcessCount=%u but got %u\n", process_count, info.ProcessCount); - todo_wine ok(info.ThreadCount == thread_count, "expected info.ThreadCount=%u but got %u\n", thread_count, info.ThreadCount); }

1 0

Jacek Caban : mshtml: Added IHTMLTxtRange:: moveToElementText implementation.
by Alexandre Julliard 13 Nov '14

13 Nov '14

Module: wine Branch: master Commit: 41e3de93c3459c6c61820c2f81ad90605faea456 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41e3de93c3459c6c61820c2f8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 12 16:25:13 2014 +0100 mshtml: Added IHTMLTxtRange::moveToElementText implementation. --- dlls/mshtml/tests/dom.c | 11 +++++++++++ dlls/mshtml/txtrange.c | 18 ++++++++++++++++-- 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 5dc0c4c..a4bc01f 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -4823,6 +4823,7 @@ static void test_txtrange(IHTMLDocument2 *doc) IHTMLTxtRange *body_range, *range, *range2; IHTMLSelectionObject *selection; IDispatch *disp_range; + IHTMLElement *body; HRESULT hres; body_range = test_create_body_range(doc); @@ -5008,6 +5009,16 @@ static void test_txtrange(IHTMLDocument2 *doc) test_range_moveend(range, characterW, 2, 2); test_range_text(range, "ab"); + body = doc_get_body(doc); + + hres = IHTMLTxtRange_moveToElementText(range, body); + ok(hres == S_OK, "moveToElementText failed: %08x\n", hres); + + test_range_text(range, "abc xyz abc 123\r\nit's text"); + test_range_parent(range, ET_BODY); + + IHTMLElement_Release(body); + IHTMLTxtRange_Release(range); } diff --git a/dlls/mshtml/txtrange.c b/dlls/mshtml/txtrange.c index 6b57eb2..886f596 100644 --- a/dlls/mshtml/txtrange.c +++ b/dlls/mshtml/txtrange.c @@ -1579,8 +1579,22 @@ static HRESULT WINAPI HTMLTxtRange_pasteHTML(IHTMLTxtRange *iface, BSTR html) static HRESULT WINAPI HTMLTxtRange_moveToElementText(IHTMLTxtRange *iface, IHTMLElement *element) { HTMLTxtRange *This = impl_from_IHTMLTxtRange(iface); - FIXME("(%p)->(%p)\n", This, element); - return E_NOTIMPL; + HTMLElement *elem; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, element); + + elem = unsafe_impl_from_IHTMLElement(element); + if(!elem) + return E_INVALIDARG; + + nsres = nsIDOMRange_SelectNodeContents(This->nsrange, elem->node.nsnode); + if(NS_FAILED(nsres)) { + ERR("SelectNodeContents failed: %08x\n", nsres); + return E_FAIL; + } + + return S_OK; } static HRESULT WINAPI HTMLTxtRange_setEndPoint(IHTMLTxtRange *iface, BSTR how,

1 0

Jacek Caban : mshtml: Moved IHTMLElement2 implementation to htmlelem.c.
by Alexandre Julliard 13 Nov '14

13 Nov '14

Module: wine Branch: master Commit: 1e4cd8f53367e9302f3de09d5547be6fab5fcd07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e4cd8f53367e9302f3de09d5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 12 16:25:20 2014 +0100 mshtml: Moved IHTMLElement2 implementation to htmlelem.c. --- dlls/mshtml/Makefile.in | 1 - dlls/mshtml/htmlelem.c | 1351 +++++++++++++++++++++++++++++++++++++++- dlls/mshtml/htmlelem2.c | 1387 ------------------------------------------ dlls/mshtml/mshtml_private.h | 1 - 4 files changed, 1349 insertions(+), 1391 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1e4cd8f53367e9302f3de…

1 0

Jacek Caban : mshtml: Added IHTMLElement2::put_dir implementation.
by Alexandre Julliard 13 Nov '14

13 Nov '14

Module: wine Branch: master Commit: d619fd2d0e41ffe61ea011c56ad316c241a668bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=d619fd2d0e41ffe61ea011c56… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 12 16:25:26 2014 +0100 mshtml: Added IHTMLElement2::put_dir implementation. --- dlls/mshtml/htmlelem.c | 21 +++++++++++++++++++-- dlls/mshtml/tests/dom.c | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 7ada9aa..2c82c4a 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -2601,8 +2601,25 @@ static HRESULT WINAPI HTMLElement2_get_oncellchange(IHTMLElement2 *iface, VARIAN static HRESULT WINAPI HTMLElement2_put_dir(IHTMLElement2 *iface, BSTR v) { HTMLElement *This = impl_from_IHTMLElement2(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + nsAString nsstr; + nsresult nsres; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + if(!This->nselem) { + FIXME("Unsupported for comment nodes.\n"); + return S_OK; + } + + nsAString_InitDepend(&nsstr, v); + nsres = nsIDOMHTMLElement_SetDir(This->nselem, &nsstr); + nsAString_Finish(&nsstr); + if(NS_FAILED(nsres)) { + ERR("SetDir failed: %08x\n", nsres); + return E_FAIL; + } + + return S_OK; } static HRESULT WINAPI HTMLElement2_get_dir(IHTMLElement2 *iface, BSTR *p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index a4bc01f..8c7adc9 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2695,6 +2695,39 @@ static void _test_select_set_disabled(unsigned line, IHTMLSelectElement *select, _test_select_get_disabled(line, select, b); } +#define test_elem_dir(u,n) _test_elem_dir(__LINE__,u,n) +static void _test_elem_dir(unsigned line, IUnknown *unk, const char *exdir) +{ + IHTMLElement2 *elem = _get_elem2_iface(line, unk); + BSTR dir; + HRESULT hres; + + hres = IHTMLElement2_get_dir(elem, &dir); + IHTMLElement2_Release(elem); + ok_(__FILE__, line) (hres == S_OK, "get_dir failed: %08x\n", hres); + if(exdir) + ok_(__FILE__, line) (!strcmp_wa(dir, exdir), "got dir: %s, expected %s\n", wine_dbgstr_w(dir), exdir); + else + ok_(__FILE__, line) (!dir, "got dir: %s, expected NULL\n", wine_dbgstr_w(dir)); + + SysFreeString(dir); +} + +#define set_elem_dir(u,n) _set_elem_dir(__LINE__,u,n) +static void _set_elem_dir(unsigned line, IUnknown *unk, const char *dira) +{ + IHTMLElement2 *elem = _get_elem2_iface(line, unk); + BSTR dir = a2bstr(dira); + HRESULT hres; + + hres = IHTMLElement2_put_dir(elem, dir); + IHTMLElement2_Release(elem); + ok_(__FILE__, line) (hres == S_OK, "put_dir failed: %08x\n", hres); + SysFreeString(dir); + + _test_elem_dir(line, unk, dira); +} + #define elem_get_scroll_height(u) _elem_get_scroll_height(__LINE__,u) static LONG _elem_get_scroll_height(unsigned line, IUnknown *unk) { @@ -5640,6 +5673,9 @@ static void test_default_body(IHTMLBodyElement *body) ok(!l, "scrollTop = %d\n", l); elem_get_scroll_left((IUnknown*)body); + test_elem_dir((IUnknown*)body, NULL); + set_elem_dir((IUnknown*)body, "ltr"); + /* get_text tests */ hres = IHTMLBodyElement_get_text(body, &v); ok(hres == S_OK, "expect S_OK got 0x%08d\n", hres);

1 0

Jacek Caban : mshtml: Added IHTMLTxtRange::pasteHTML implementation.
by Alexandre Julliard 13 Nov '14

13 Nov '14

Module: wine Branch: master Commit: e567f309bf94b0218010b99f2598caf1cf26bafb URL: http://source.winehq.org/git/wine.git/?a=commit;h=e567f309bf94b0218010b99f2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 12 16:25:31 2014 +0100 mshtml: Added IHTMLTxtRange::pasteHTML implementation. --- dlls/mshtml/tests/dom.c | 27 +++++++++++++++++++++++++++ dlls/mshtml/txtrange.c | 30 ++++++++++++++++++++++++++++-- 2 files changed, 55 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 8c7adc9..39c3a7d 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2148,6 +2148,17 @@ static void _test_range_isequal(unsigned line, IHTMLTxtRange *range1, IHTMLTxtRa } } +#define test_range_paste_html(a,b) _test_range_paste_html(__LINE__,a,b) +static void _test_range_paste_html(unsigned line, IHTMLTxtRange *range, const char *html) +{ + BSTR str = a2bstr(html); + HRESULT hres; + + hres = IHTMLTxtRange_pasteHTML(range, str); + ok_(__FILE__,line)(hres == S_OK, "pasteHTML failed: %08x\n", hres); + SysFreeString(str); +} + #define test_range_parent(r,t) _test_range_parent(__LINE__,r,t) static void _test_range_parent(unsigned line, IHTMLTxtRange *range, elem_type_t type) { @@ -5050,6 +5061,22 @@ static void test_txtrange(IHTMLDocument2 *doc) test_range_text(range, "abc xyz abc 123\r\nit's text"); test_range_parent(range, ET_BODY); + test_range_move(range, wordW, 1, 1); + test_range_moveend(range, characterW, 12, 12); + test_range_text(range, "xyz abc 123"); + + test_range_collapse(range, VARIANT_TRUE); + test_range_paste_html(range, "<br>paste<br>"); + test_range_text(range, NULL); + + test_range_moveend(range, characterW, 3, 3); + test_range_text(range, "xyz"); + + hres = IHTMLTxtRange_moveToElementText(range, body); + ok(hres == S_OK, "moveToElementText failed: %08x\n", hres); + + test_range_text(range, "abc \r\npaste\r\nxyz abc 123\r\nit's text"); + IHTMLElement_Release(body); IHTMLTxtRange_Release(range); diff --git a/dlls/mshtml/txtrange.c b/dlls/mshtml/txtrange.c index 886f596..43c9f1a 100644 --- a/dlls/mshtml/txtrange.c +++ b/dlls/mshtml/txtrange.c @@ -17,6 +17,7 @@ */ #include <stdarg.h> +#include <assert.h> #define COBJMACROS @@ -1572,8 +1573,33 @@ static HRESULT WINAPI HTMLTxtRange_select(IHTMLTxtRange *iface) static HRESULT WINAPI HTMLTxtRange_pasteHTML(IHTMLTxtRange *iface, BSTR html) { HTMLTxtRange *This = impl_from_IHTMLTxtRange(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(html)); - return E_NOTIMPL; + nsIDOMDocumentFragment *doc_frag; + nsAString nsstr; + nsresult nsres; + + TRACE("(%p)->(%s)\n", This, debugstr_w(html)); + + nsres = nsIDOMRange_Collapse(This->nsrange, TRUE); + assert(nsres == NS_OK); + + nsAString_InitDepend(&nsstr, html); + nsres = nsIDOMRange_CreateContextualFragment(This->nsrange, &nsstr, &doc_frag); + nsAString_Finish(&nsstr); + if(NS_FAILED(nsres)) { + ERR("CreateContextualFragment failed: %08x\n", nsres); + return E_FAIL; + } + + nsres = nsIDOMRange_InsertNode(This->nsrange, (nsIDOMNode*)doc_frag); + nsIDOMDocumentFragment_Release(doc_frag); + if(NS_FAILED(nsres)) { + ERR("InsertNode failed: %08x\n", nsres); + return E_FAIL; + } + + nsres = nsIDOMRange_Collapse(This->nsrange, FALSE); + assert(nsres == NS_OK); + return S_OK; } static HRESULT WINAPI HTMLTxtRange_moveToElementText(IHTMLTxtRange *iface, IHTMLElement *element)

1 0

Austin English : ntdll: Add stubs for vectored continue handler.
by Alexandre Julliard 13 Nov '14

13 Nov '14

Module: wine Branch: master Commit: 4c0ceacee0413031f129d2e62be6a064f2cfae5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c0ceacee0413031f129d2e62… Author: Austin English <austinenglish(a)gmail.com> Date: Sat Nov 8 07:14:26 2014 +0100 ntdll: Add stubs for vectored continue handler. --- .../api-ms-win-core-errorhandling-l1-1-1.spec | 4 ++-- dlls/kernel32/kernel32.spec | 2 ++ dlls/ntdll/exception.c | 20 ++++++++++++++++++++ dlls/ntdll/ntdll.spec | 2 ++ 4 files changed, 26 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-core-errorhandling-l1-1-1/api-ms-win-core-errorhandling-l1-1-1.spec b/dlls/api-ms-win-core-errorhandling-l1-1-1/api-ms-win-core-errorhandling-l1-1-1.spec index 8f00d0d..142b4a4 100644 --- a/dlls/api-ms-win-core-errorhandling-l1-1-1/api-ms-win-core-errorhandling-l1-1-1.spec +++ b/dlls/api-ms-win-core-errorhandling-l1-1-1/api-ms-win-core-errorhandling-l1-1-1.spec @@ -1,9 +1,9 @@ -@ stub AddVectoredContinueHandler +@ stdcall AddVectoredContinueHandler(long ptr) kernel32.AddVectoredContinueHandler @ stdcall AddVectoredExceptionHandler(long ptr) kernel32.AddVectoredExceptionHandler @ stdcall GetErrorMode() kernel32.GetErrorMode @ stdcall GetLastError() kernel32.GetLastError @ stdcall RaiseException(long long long ptr) kernel32.RaiseException -@ stub RemoveVectoredContinueHandler +@ stdcall RemoveVectoredContinueHandler(ptr) kernel32.RemoveVectoredContinueHandler @ stdcall RemoveVectoredExceptionHandler(ptr) kernel32.RemoveVectoredExceptionHandler @ stdcall RestoreLastError(long) kernel32.RestoreLastError @ stdcall SetErrorMode(long) kernel32.SetErrorMode diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 2b01df1..c072780 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -143,6 +143,7 @@ # @ stub AddLocalAlternateComputerNameA # @ stub AddLocalAlternateComputerNameW @ stdcall AddRefActCtx(ptr) +@ stdcall AddVectoredContinueHandler(long ptr) ntdll.RtlAddVectoredContinueHandler @ stdcall AddVectoredExceptionHandler(long ptr) ntdll.RtlAddVectoredExceptionHandler @ stdcall AllocConsole() @ stub -i386 AllocLSCallback @@ -1026,6 +1027,7 @@ @ stdcall RemoveDirectoryW(wstr) # @ stub RemoveLocalAlternateComputerNameA # @ stub RemoveLocalAlternateComputerNameW +@ stdcall RemoveVectoredContinueHandler(ptr) ntdll.RtlRemoveVectoredContinueHandler @ stdcall RemoveVectoredExceptionHandler(ptr) ntdll.RtlRemoveVectoredExceptionHandler @ stdcall ReplaceFile(wstr wstr wstr long ptr ptr) ReplaceFileW @ stdcall ReplaceFileA(str str str long ptr ptr) diff --git a/dlls/ntdll/exception.c b/dlls/ntdll/exception.c index 31d5edd..37edc77 100644 --- a/dlls/ntdll/exception.c +++ b/dlls/ntdll/exception.c @@ -224,6 +224,26 @@ void WINAPI RtlRaiseStatus( NTSTATUS status ) /******************************************************************* + * RtlAddVectoredContinueHandler (NTDLL.@) + */ +PVOID WINAPI RtlAddVectoredContinueHandler( ULONG first, PVECTORED_EXCEPTION_HANDLER func ) +{ + FIXME("%u %p stub\n", first, func); + return NULL; +} + + +/******************************************************************* + * RtlRemoveVectoredContinueHandler (NTDLL.@) + */ +ULONG WINAPI RtlRemoveVectoredContinueHandler( PVOID handler ) +{ + FIXME("%p stub\n", handler); + return FALSE; +} + + +/******************************************************************* * RtlAddVectoredExceptionHandler (NTDLL.@) */ PVOID WINAPI RtlAddVectoredExceptionHandler( ULONG first, PVECTORED_EXCEPTION_HANDLER func ) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 5bac269..7e95969 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -415,6 +415,7 @@ @ cdecl -arch=arm,x86_64 RtlAddFunctionTable(ptr long long) @ stdcall RtlAddRefActivationContext(ptr) # @ stub RtlAddRefMemoryStream +@ stdcall RtlAddVectoredContinueHandler(long ptr) @ stdcall RtlAddVectoredExceptionHandler(long ptr) # @ stub RtlAddressInSectionTable @ stdcall RtlAdjustPrivilege(long long long ptr) @@ -819,6 +820,7 @@ @ stdcall RtlReleaseSRWLockExclusive(ptr) @ stdcall RtlReleaseSRWLockShared(ptr) @ stub RtlRemoteCall +@ stdcall RtlRemoveVectoredContinueHandler(ptr) @ stdcall RtlRemoveVectoredExceptionHandler(ptr) @ stub RtlResetRtlTranslations @ stdcall RtlRestoreLastWin32Error(long) RtlSetLastWin32Error

1 0