Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ekohl] 71772: [SC] Failure command: - Parse the actions parameter. - Adjust the shutdown privilege in order to set the failure actions.
by ekohl＠svn.reactos.org 03 Jul '16

03 Jul '16

Author: ekohl Date: Sun Jul 3 08:56:43 2016 New Revision: 71772 URL: http://svn.reactos.org/svn/reactos?rev=71772&view=rev Log: [SC] Failure command: - Parse the actions parameter. - Adjust the shutdown privilege in order to set the failure actions. Modified: trunk/reactos/base/applications/sc/CMakeLists.txt trunk/reactos/base/applications/sc/failure.c trunk/reactos/base/applications/sc/misc.c trunk/reactos/base/applications/sc/sc.h Modified: trunk/reactos/base/applications/sc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sc/CMake… ============================================================================== --- trunk/reactos/base/applications/sc/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/sc/CMakeLists.txt [iso-8859-1] Sun Jul 3 08:56:43 2016 @@ -22,6 +22,6 @@ add_executable(sc ${SOURCE} sc.rc) set_module_type(sc win32cui UNICODE) -add_importlibs(sc advapi32 msvcrt kernel32) +add_importlibs(sc advapi32 msvcrt kernel32 ntdll) add_pch(sc sc.h SOURCE) add_cd_file(TARGET sc DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/base/applications/sc/failure.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sc/failu… ============================================================================== --- trunk/reactos/base/applications/sc/failure.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/sc/failure.c [iso-8859-1] Sun Jul 3 08:56:43 2016 @@ -126,6 +126,9 @@ BOOL bResult = TRUE; SERVICE_FAILURE_ACTIONS FailureActions; LPCTSTR lpServiceName = NULL; + BOOLEAN Old = FALSE; + + ZeroMemory(&FailureActions, sizeof(SERVICE_FAILURE_ACTIONS)); if (!ParseFailureArguments(ServiceArgs, ArgCount, &lpServiceName, &FailureActions)) { @@ -145,13 +148,15 @@ hService = OpenService(hManager, lpServiceName, - SERVICE_CHANGE_CONFIG); + SERVICE_CHANGE_CONFIG | SERVICE_START); if (hService == NULL) { _tprintf(_T("[SC] OpenService FAILED %lu:\n\n"), GetLastError()); bResult = FALSE; goto done; } + + RtlAdjustPrivilege(SE_SHUTDOWN_PRIVILEGE, TRUE, FALSE, &Old); if (!ChangeServiceConfig2(hService, SERVICE_CONFIG_FAILURE_ACTIONS, @@ -165,8 +170,13 @@ _tprintf(_T("[SC] ChangeServiceConfig2 SUCCESS\n\n")); done: + RtlAdjustPrivilege(SE_SHUTDOWN_PRIVILEGE, Old, FALSE, &Old); + if (bResult == FALSE) ReportLastError(); + + if (FailureActions.lpsaActions != NULL) + HeapFree(GetProcessHeap(), 0, FailureActions.lpsaActions); if (hService) CloseServiceHandle(hService); Modified: trunk/reactos/base/applications/sc/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sc/misc.… ============================================================================== --- trunk/reactos/base/applications/sc/misc.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/sc/misc.c [iso-8859-1] Sun Jul 3 08:56:43 2016 @@ -161,6 +161,101 @@ BOOL +ParseFailureActions( + IN LPCTSTR lpActions, + OUT DWORD *pcActions, + OUT SC_ACTION **ppActions) +{ + SC_ACTION *pActions = NULL; + LPTSTR pStringBuffer = NULL; + LPTSTR p; + INT nLength; + INT nCount = 0; + + *pcActions = 0; + *ppActions = NULL; + + nLength = _tcslen(lpActions); + + /* Allocate the string buffer */ + pStringBuffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (nLength + 2) * sizeof(TCHAR)); + if (pStringBuffer == NULL) + { + return FALSE; + } + + /* Copy the actions string into the string buffer */ + CopyMemory(pStringBuffer, lpActions, nLength * sizeof(TCHAR)); + + /* Replace all slashes by null characters */ + p = pStringBuffer; + while (*p != 0 /*_T('\0')*/) + { + if (*p == _T('/')) + *p = 0; //_T('\0'); + p++; + } + + /* Count the arguments in the buffer */ + p = pStringBuffer; + while (*p != 0 /*_T('\0')*/) + { + nCount++; + + nLength = _tcslen(p); + p = (LPTSTR)((LONG_PTR)p + ((nLength + 1) * sizeof(TCHAR))); + } + + /* Allocate the actions buffer */ + pActions = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, nCount / 2 * sizeof(SC_ACTION)); + if (pActions == NULL) + { + HeapFree(GetProcessHeap(), 0, pStringBuffer); + return FALSE; + } + + /* Parse the string buffer */ + nCount = 0; + p = pStringBuffer; + while (*p != _T('\0')) + { + nLength = _tcslen(p); + + if (nCount % 2 == 0) + { + /* Action */ + if (_tcsicmp(p, _T("reboot"))) + pActions[nCount / 2].Type = SC_ACTION_REBOOT; + else if (_tcsicmp(p, _T("restart"))) + pActions[nCount / 2].Type = SC_ACTION_RESTART; + else if (_tcsicmp(p, _T("run"))) + pActions[nCount / 2].Type = SC_ACTION_RUN_COMMAND; + else + break; + } + else + { + /* Delay */ + pActions[nCount / 2].Delay = _tcstoul(p, NULL, 10); + if (pActions[nCount / 2].Delay == 0 && errno == ERANGE) + break; + } + + p = (LPTSTR)((LONG_PTR)p + ((nLength + 1) * sizeof(TCHAR))); + nCount++; + } + + /* Free the string buffer */ + HeapFree(GetProcessHeap(), 0, pStringBuffer); + + *pcActions = nCount / 2; + *ppActions = pActions; + + return TRUE; +} + + +BOOL ParseFailureArguments( IN LPCTSTR *ServiceArgs, IN INT ArgCount, @@ -220,7 +315,12 @@ if (lpActions != NULL) { - /* FIXME */ + if (!ParseFailureActions(lpActions, + &pFailureActions->cActions, + &pFailureActions->lpsaActions)) + { + return FALSE; + } } return (ArgCount == 0); Modified: trunk/reactos/base/applications/sc/sc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sc/sc.h?… ============================================================================== --- trunk/reactos/base/applications/sc/sc.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/sc/sc.h [iso-8859-1] Sun Jul 3 08:56:43 2016 @@ -3,11 +3,16 @@ #include <stdarg.h> +#define WIN32_NO_STATUS #include <windef.h> #include <winbase.h> #include <winsvc.h> #include <sddl.h> #include <tchar.h> + +#include <ndk/rtlfuncs.h> +#include <ndk/setypes.h> + #define SCDBG

1 0

[tfaber] 71771: [NTOS:OB] - Use the correct buffer size for the link target in NtCreateSymbolicLinkObject CORE-11509
by tfaber＠svn.reactos.org 03 Jul '16

03 Jul '16

Author: tfaber Date: Sun Jul 3 08:54:20 2016 New Revision: 71771 URL: http://svn.reactos.org/svn/reactos?rev=71771&view=rev Log: [NTOS:OB] - Use the correct buffer size for the link target in NtCreateSymbolicLinkObject CORE-11509 Modified: trunk/reactos/ntoskrnl/ob/oblink.c Modified: trunk/reactos/ntoskrnl/ob/oblink.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/oblink.c?rev=7… ============================================================================== --- trunk/reactos/ntoskrnl/ob/oblink.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ob/oblink.c [iso-8859-1] Sun Jul 3 08:54:20 2016 @@ -589,8 +589,7 @@ /* Setup the target name */ SymbolicLink->LinkTarget.Length = CapturedLinkTarget.Length; - SymbolicLink->LinkTarget.MaximumLength = CapturedLinkTarget.Length + - sizeof(WCHAR); + SymbolicLink->LinkTarget.MaximumLength = CapturedLinkTarget.MaximumLength; SymbolicLink->LinkTarget.Buffer = ExAllocatePoolWithTag(PagedPool, CapturedLinkTarget.MaximumLength,

1 0

[tfaber] 71770: [KMTESTS:OB] - Add a test for ZwCreateSymbolicLinkObject/ZwQuerySymbolicLinkObject CORE-11509
by tfaber＠svn.reactos.org 03 Jul '16

03 Jul '16

Author: tfaber Date: Sun Jul 3 08:31:28 2016 New Revision: 71770 URL: http://svn.reactos.org/svn/reactos?rev=71770&view=rev Log: [KMTESTS:OB] - Add a test for ZwCreateSymbolicLinkObject/ZwQuerySymbolicLinkObject CORE-11509 Added: trunk/rostests/kmtests/ntos_ob/ObSymbolicLink.c (with props) Modified: trunk/rostests/kmtests/CMakeLists.txt Modified: trunk/rostests/kmtests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/CMakeLists.txt?re… ============================================================================== --- trunk/rostests/kmtests/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/kmtests/CMakeLists.txt [iso-8859-1] Sun Jul 3 08:31:28 2016 @@ -79,6 +79,7 @@ ntos_mm/ZwMapViewOfSection.c ntos_ob/ObHandle.c ntos_ob/ObReference.c + ntos_ob/ObSymbolicLink.c ntos_ob/ObType.c ntos_ob/ObTypes.c ntos_ob/ObWait.c Added: trunk/rostests/kmtests/ntos_ob/ObSymbolicLink.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_ob/ObSymboli… ============================================================================== --- trunk/rostests/kmtests/ntos_ob/ObSymbolicLink.c (added) +++ trunk/rostests/kmtests/ntos_ob/ObSymbolicLink.c [iso-8859-1] Sun Jul 3 08:31:28 2016 @@ -0,0 +1,282 @@ +/* + * PROJECT: ReactOS kernel-mode tests + * LICENSE: LGPLv2.1+ - See COPYING.LIB in the top level directory + * PURPOSE: Kernel-Mode Test for Zw*SymbolicLinkObject + * PROGRAMMER: Thomas Faber <thomas.faber(a)reactos.org> + */ + +#include <kmt_test.h> + +#define NDEBUG +#include <debug.h> + +static +VOID +TestQueryLink( + _In_ HANDLE LinkHandle, + _In_ PCUNICODE_STRING ExpectedTarget) +{ + NTSTATUS Status; + WCHAR QueriedTargetBuffer[32]; + UNICODE_STRING QueriedTarget; + ULONG ResultLength; + PULONG pResultLength; + ULONG i; + + for (i = 0; i < 2; i++) + { + if (i == 0) + { + pResultLength = &ResultLength; + } + else + { + pResultLength = NULL; + } + + /* Query with NULL Buffer just gives us the length */ + RtlInitEmptyUnicodeString(&QueriedTarget, NULL, 0); + if (pResultLength) ResultLength = 0x55555555; + Status = ZwQuerySymbolicLinkObject(LinkHandle, + &QueriedTarget, + pResultLength); + ok_eq_hex(Status, STATUS_BUFFER_TOO_SMALL); + ok_eq_uint(QueriedTarget.Length, 0); + ok_eq_uint(QueriedTarget.MaximumLength, 0); + ok_eq_pointer(QueriedTarget.Buffer, NULL); + if (pResultLength) ok_eq_ulong(ResultLength, ExpectedTarget->MaximumLength); + + /* Query with Length-1 buffer */ + RtlInitEmptyUnicodeString(&QueriedTarget, + QueriedTargetBuffer, + ExpectedTarget->Length - 1); + RtlFillMemory(&QueriedTargetBuffer, sizeof(QueriedTargetBuffer), 0x55); + if (pResultLength) ResultLength = 0x55555555; + Status = ZwQuerySymbolicLinkObject(LinkHandle, + &QueriedTarget, + pResultLength); + ok_eq_hex(Status, STATUS_BUFFER_TOO_SMALL); + ok_eq_uint(QueriedTarget.Length, 0); + ok_eq_uint(QueriedTarget.MaximumLength, ExpectedTarget->Length - 1); + ok_eq_pointer(QueriedTarget.Buffer, QueriedTargetBuffer); + ok_eq_uint(QueriedTarget.Buffer[0], 0x5555); + if (pResultLength) ok_eq_ulong(ResultLength, ExpectedTarget->MaximumLength); + + /* Query with Length buffer */ + RtlInitEmptyUnicodeString(&QueriedTarget, + QueriedTargetBuffer, + ExpectedTarget->Length); + RtlFillMemory(&QueriedTargetBuffer, sizeof(QueriedTargetBuffer), 0x55); + if (pResultLength) ResultLength = 0x55555555; + Status = ZwQuerySymbolicLinkObject(LinkHandle, + &QueriedTarget, + pResultLength); + ok_eq_uint(QueriedTarget.MaximumLength, ExpectedTarget->Length); + ok_eq_pointer(QueriedTarget.Buffer, QueriedTargetBuffer); + if (pResultLength && + QueriedTarget.MaximumLength < ExpectedTarget->MaximumLength) + { + ok_eq_hex(Status, STATUS_BUFFER_TOO_SMALL); + ok_eq_uint(QueriedTarget.Length, 0); + ok_eq_uint(QueriedTarget.Buffer[0], 0x5555); + if (pResultLength) ok_eq_ulong(ResultLength, ExpectedTarget->MaximumLength); + } + else + { + ok_eq_hex(Status, STATUS_SUCCESS); + ok_eq_uint(QueriedTarget.Length, ExpectedTarget->Length); + ok(RtlEqualUnicodeString(&QueriedTarget, ExpectedTarget, FALSE), "%wZ != %wZ\n", &QueriedTarget, ExpectedTarget); + ok_eq_uint(QueriedTarget.Buffer[QueriedTarget.Length / sizeof(WCHAR)], 0x5555); + } + + /* Query with Length+1 buffer */ + RtlInitEmptyUnicodeString(&QueriedTarget, + QueriedTargetBuffer, + ExpectedTarget->Length + 1); + RtlFillMemory(&QueriedTargetBuffer, sizeof(QueriedTargetBuffer), 0x55); + if (pResultLength) ResultLength = 0x55555555; + Status = ZwQuerySymbolicLinkObject(LinkHandle, + &QueriedTarget, + pResultLength); + ok_eq_uint(QueriedTarget.MaximumLength, ExpectedTarget->Length + 1); + ok_eq_pointer(QueriedTarget.Buffer, QueriedTargetBuffer); + if (pResultLength && + QueriedTarget.MaximumLength < ExpectedTarget->MaximumLength) + { + ok_eq_hex(Status, STATUS_BUFFER_TOO_SMALL); + ok_eq_uint(QueriedTarget.Length, 0); + ok_eq_uint(QueriedTarget.Buffer[0], 0x5555); + if (pResultLength) ok_eq_ulong(ResultLength, ExpectedTarget->MaximumLength); + } + else + { + ok_eq_hex(Status, STATUS_SUCCESS); + ok_eq_uint(QueriedTarget.Length, ExpectedTarget->Length); + ok(RtlEqualUnicodeString(&QueriedTarget, ExpectedTarget, FALSE), "%wZ != %wZ\n", &QueriedTarget, ExpectedTarget); + ok_eq_uint(QueriedTarget.Buffer[QueriedTarget.Length / sizeof(WCHAR)], 0x5555); + } + + /* Query with Length+2 buffer */ + RtlInitEmptyUnicodeString(&QueriedTarget, + QueriedTargetBuffer, + ExpectedTarget->Length + sizeof(WCHAR)); + RtlFillMemory(&QueriedTargetBuffer, sizeof(QueriedTargetBuffer), 0x55); + if (pResultLength) ResultLength = 0x55555555; + Status = ZwQuerySymbolicLinkObject(LinkHandle, + &QueriedTarget, + pResultLength); + ok_eq_hex(Status, STATUS_SUCCESS); + ok_eq_uint(QueriedTarget.Length, ExpectedTarget->Length); + ok_eq_uint(QueriedTarget.MaximumLength, ExpectedTarget->Length + sizeof(WCHAR)); + ok_eq_pointer(QueriedTarget.Buffer, QueriedTargetBuffer); + ok(RtlEqualUnicodeString(&QueriedTarget, ExpectedTarget, FALSE), "%wZ != %wZ\n", &QueriedTarget, ExpectedTarget); + if (pResultLength) + { + if (ExpectedTarget->MaximumLength >= ExpectedTarget->Length + sizeof(UNICODE_NULL)) + ok_eq_uint(QueriedTarget.Buffer[QueriedTarget.Length / sizeof(WCHAR)], 0); + ok_eq_ulong(ResultLength, ExpectedTarget->MaximumLength); + } + else + { + ok_eq_uint(QueriedTarget.Buffer[QueriedTarget.Length / sizeof(WCHAR)], 0x5555); + } + + /* Query with full-sized buffer */ + RtlInitEmptyUnicodeString(&QueriedTarget, + QueriedTargetBuffer, + sizeof(QueriedTargetBuffer)); + RtlFillMemory(&QueriedTargetBuffer, sizeof(QueriedTargetBuffer), 0x55); + if (pResultLength) ResultLength = 0x55555555; + Status = ZwQuerySymbolicLinkObject(LinkHandle, + &QueriedTarget, + pResultLength); + ok_eq_hex(Status, STATUS_SUCCESS); + ok_eq_uint(QueriedTarget.Length, ExpectedTarget->Length); + ok_eq_uint(QueriedTarget.MaximumLength, sizeof(QueriedTargetBuffer)); + ok_eq_pointer(QueriedTarget.Buffer, QueriedTargetBuffer); + ok(RtlEqualUnicodeString(&QueriedTarget, ExpectedTarget, FALSE), "%wZ != %wZ\n", &QueriedTarget, ExpectedTarget); + if (pResultLength) + { + if (ExpectedTarget->MaximumLength >= ExpectedTarget->Length + sizeof(UNICODE_NULL)) + ok_eq_uint(QueriedTarget.Buffer[QueriedTarget.Length / sizeof(WCHAR)], 0); + ok_eq_ulong(ResultLength, ExpectedTarget->MaximumLength); + } + else + { + ok_eq_uint(QueriedTarget.Buffer[QueriedTarget.Length / sizeof(WCHAR)], 0x5555); + } + } +} + +START_TEST(ObSymbolicLink) +{ + NTSTATUS Status; + HANDLE LinkHandle; + HANDLE LinkHandle2; + UNICODE_STRING LinkName = RTL_CONSTANT_STRING(L"\\Device\\ObSymbolicLinkKmtestNamedPipe"); + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING DefaultLinkTarget = RTL_CONSTANT_STRING(L"\\Device\\NamedPipe"); + UNICODE_STRING LinkTarget = DefaultLinkTarget; + + InitializeObjectAttributes(&ObjectAttributes, + &LinkName, + OBJ_KERNEL_HANDLE | OBJ_CASE_INSENSITIVE, + NULL, + NULL); + LinkHandle = KmtInvalidPointer; + Status = ZwOpenSymbolicLinkObject(&LinkHandle, + SYMBOLIC_LINK_QUERY, + &ObjectAttributes); + ok_eq_hex(Status, STATUS_OBJECT_NAME_NOT_FOUND); + ok_eq_pointer(LinkHandle, NULL); + if (NT_SUCCESS(Status)) ObCloseHandle(LinkHandle, KernelMode); + + /* Create it */ + LinkHandle = KmtInvalidPointer; + Status = ZwCreateSymbolicLinkObject(&LinkHandle, + SYMBOLIC_LINK_QUERY, + &ObjectAttributes, + &LinkTarget); + ok_eq_hex(Status, STATUS_SUCCESS); + ok(LinkHandle != NULL && LinkHandle != KmtInvalidPointer, "LinkHandle = %p\n", LinkHandle); + if (skip(NT_SUCCESS(Status), "Failed to create link\n")) + { + return; + } + + /* Now we should be able to open it */ + LinkHandle2 = KmtInvalidPointer; + Status = ZwOpenSymbolicLinkObject(&LinkHandle2, + SYMBOLIC_LINK_QUERY, + &ObjectAttributes); + ok_eq_hex(Status, STATUS_SUCCESS); + ok(LinkHandle2 != NULL && LinkHandle2 != KmtInvalidPointer, "LinkHandle = %p\n", LinkHandle2); + if (!skip(NT_SUCCESS(Status), "Failed to open symlink\n")) + { + TestQueryLink(LinkHandle2, &LinkTarget); + ObCloseHandle(LinkHandle2, KernelMode); + } + + /* Close it */ + ObCloseHandle(LinkHandle, KernelMode); + + /* Open fails again */ + LinkHandle = KmtInvalidPointer; + Status = ZwOpenSymbolicLinkObject(&LinkHandle, + SYMBOLIC_LINK_QUERY, + &ObjectAttributes); + ok_eq_hex(Status, STATUS_OBJECT_NAME_NOT_FOUND); + ok_eq_pointer(LinkHandle, NULL); + if (NT_SUCCESS(Status)) ObCloseHandle(LinkHandle, KernelMode); + + /* Create with broken LinkTarget */ + LinkHandle = KmtInvalidPointer; + LinkTarget.Buffer = NULL; + Status = ZwCreateSymbolicLinkObject(&LinkHandle, + SYMBOLIC_LINK_QUERY, + &ObjectAttributes, + &LinkTarget); + ok_eq_hex(Status, STATUS_ACCESS_VIOLATION); + ok(LinkHandle == KmtInvalidPointer, "LinkHandle = %p\n", LinkHandle); + if (NT_SUCCESS(Status)) ObCloseHandle(LinkHandle, KernelMode); + + /* Since it failed, open should also fail */ + LinkHandle = KmtInvalidPointer; + Status = ZwOpenSymbolicLinkObject(&LinkHandle, + SYMBOLIC_LINK_QUERY, + &ObjectAttributes); + ok_eq_hex(Status, STATUS_OBJECT_NAME_NOT_FOUND); + ok_eq_pointer(LinkHandle, NULL); + if (NT_SUCCESS(Status)) ObCloseHandle(LinkHandle, KernelMode); + + /* Create with valid, but not null-terminated LinkTarget */ + LinkTarget = DefaultLinkTarget; + LinkTarget.MaximumLength = LinkTarget.Length; + LinkHandle = KmtInvalidPointer; + Status = ZwCreateSymbolicLinkObject(&LinkHandle, + SYMBOLIC_LINK_QUERY, + &ObjectAttributes, + &LinkTarget); + ok_eq_hex(Status, STATUS_SUCCESS); + ok(LinkHandle != NULL && LinkHandle != KmtInvalidPointer, "LinkHandle = %p\n", LinkHandle); + if (skip(NT_SUCCESS(Status), "Failed to create link\n")) + { + return; + } + + /* Now we should be able to open it */ + LinkHandle2 = KmtInvalidPointer; + Status = ZwOpenSymbolicLinkObject(&LinkHandle2, + SYMBOLIC_LINK_QUERY, + &ObjectAttributes); + ok_eq_hex(Status, STATUS_SUCCESS); + ok(LinkHandle2 != NULL && LinkHandle2 != KmtInvalidPointer, "LinkHandle = %p\n", LinkHandle2); + if (!skip(NT_SUCCESS(Status), "Failed to open symlink\n")) + { + TestQueryLink(LinkHandle2, &LinkTarget); + ObCloseHandle(LinkHandle2, KernelMode); + } + + /* Close it */ + ObCloseHandle(LinkHandle, KernelMode); +} Propchange: trunk/rostests/kmtests/ntos_ob/ObSymbolicLink.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[tfaber] 71769: [NTOS:OB] - Use SEH to access the link target buffer in NtQuerySymbolicLinkObject CORE-11509
by tfaber＠svn.reactos.org 03 Jul '16

03 Jul '16

Author: tfaber Date: Sun Jul 3 08:22:43 2016 New Revision: 71769 URL: http://svn.reactos.org/svn/reactos?rev=71769&view=rev Log: [NTOS:OB] - Use SEH to access the link target buffer in NtQuerySymbolicLinkObject CORE-11509 Modified: trunk/reactos/ntoskrnl/ob/oblink.c Modified: trunk/reactos/ntoskrnl/ob/oblink.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/oblink.c?rev=7… ============================================================================== --- trunk/reactos/ntoskrnl/ob/oblink.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ob/oblink.c [iso-8859-1] Sun Jul 3 08:22:43 2016 @@ -603,9 +603,18 @@ } /* Copy it */ - RtlCopyMemory(SymbolicLink->LinkTarget.Buffer, - CapturedLinkTarget.Buffer, - CapturedLinkTarget.MaximumLength); + _SEH2_TRY + { + RtlCopyMemory(SymbolicLink->LinkTarget.Buffer, + CapturedLinkTarget.Buffer, + CapturedLinkTarget.MaximumLength); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + ObDereferenceObject(SymbolicLink); + _SEH2_YIELD(return _SEH2_GetExceptionCode()); + } + _SEH2_END; /* Initialize the remaining name, dos drive index and target object */ SymbolicLink->LinkTargetObject = NULL;

1 0

[hbelusca] 71768: [KERNEL32]: Formatting fixes (whitespace...) only.
by hbelusca＠svn.reactos.org 02 Jul '16

02 Jul '16

Author: hbelusca Date: Sat Jul 2 20:52:25 2016 New Revision: 71768 URL: http://svn.reactos.org/svn/reactos?rev=71768&view=rev Log: [KERNEL32]: Formatting fixes (whitespace...) only. Modified: trunk/reactos/dll/win32/kernel32/client/debugger.c trunk/reactos/dll/win32/kernel32/client/except.c Modified: trunk/reactos/dll/win32/kernel32/client/debugger.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/debugger.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/debugger.c [iso-8859-1] Sat Jul 2 20:52:25 2016 @@ -71,19 +71,19 @@ TRUE, L"DBWinMutex"); - if(hMutex != NULL) + if (hMutex != NULL) { /* success */ return hMutex; } /* error other than the mutex not being found */ - else if(GetLastError() != ERROR_FILE_NOT_FOUND) + else if (GetLastError() != ERROR_FILE_NOT_FOUND) { /* failure */ return NULL; } - /* if the mutex doesn't exist, create it */ + /* if the mutex doesn't exist, create it */ /* first, set up the mutex security */ /* allocate the NT AUTHORITY\SYSTEM SID */ @@ -100,7 +100,7 @@ &psidSystem); /* failure */ - if(!NT_SUCCESS(nErrCode)) goto l_Cleanup; + if (!NT_SUCCESS(nErrCode)) goto l_Cleanup; /* allocate the BUILTIN\Administrators SID */ nErrCode = RtlAllocateAndInitializeSid(&siaNTAuth, @@ -116,7 +116,7 @@ &psidAdministrators); /* failure */ - if(!NT_SUCCESS(nErrCode)) goto l_Cleanup; + if (!NT_SUCCESS(nErrCode)) goto l_Cleanup; /* allocate the Everyone SID */ nErrCode = RtlAllocateAndInitializeSid(&siaWorldAuth, @@ -132,7 +132,7 @@ &psidEveryone); /* failure */ - if(!NT_SUCCESS(nErrCode)) goto l_Cleanup; + if (!NT_SUCCESS(nErrCode)) goto l_Cleanup; /* allocate space for the SIDs too */ nDaclBufSize += RtlLengthSid(psidSystem); @@ -143,13 +143,13 @@ pDaclBuf = GlobalAlloc(GMEM_FIXED, nDaclBufSize); /* failure */ - if(pDaclBuf == NULL) goto l_Cleanup; + if (pDaclBuf == NULL) goto l_Cleanup; /* create the DACL */ nErrCode = RtlCreateAcl(pDaclBuf, nDaclBufSize, ACL_REVISION); /* failure */ - if(!NT_SUCCESS(nErrCode)) goto l_Cleanup; + if (!NT_SUCCESS(nErrCode)) goto l_Cleanup; /* grant the minimum required access to Everyone */ nErrCode = RtlAddAccessAllowedAce(pDaclBuf, @@ -160,7 +160,7 @@ psidEveryone); /* failure */ - if(!NT_SUCCESS(nErrCode)) goto l_Cleanup; + if (!NT_SUCCESS(nErrCode)) goto l_Cleanup; /* grant full access to BUILTIN\Administrators */ nErrCode = RtlAddAccessAllowedAce(pDaclBuf, @@ -169,7 +169,7 @@ psidAdministrators); /* failure */ - if(!NT_SUCCESS(nErrCode)) goto l_Cleanup; + if (!NT_SUCCESS(nErrCode)) goto l_Cleanup; /* grant full access to NT AUTHORITY\SYSTEM */ nErrCode = RtlAddAccessAllowedAce(pDaclBuf, @@ -178,14 +178,14 @@ psidSystem); /* failure */ - if(!NT_SUCCESS(nErrCode)) goto l_Cleanup; + if (!NT_SUCCESS(nErrCode)) goto l_Cleanup; /* create the security descriptor */ nErrCode = RtlCreateSecurityDescriptor(&sdMutexSecurity, SECURITY_DESCRIPTOR_REVISION); /* failure */ - if(!NT_SUCCESS(nErrCode)) goto l_Cleanup; + if (!NT_SUCCESS(nErrCode)) goto l_Cleanup; /* set the descriptor's DACL to the ACL we created */ nErrCode = RtlSetDaclSecurityDescriptor(&sdMutexSecurity, @@ -194,19 +194,19 @@ FALSE); /* failure */ - if(!NT_SUCCESS(nErrCode)) goto l_Cleanup; + if (!NT_SUCCESS(nErrCode)) goto l_Cleanup; /* create the mutex */ hMutex = CreateMutexW(&saMutexAttribs, FALSE, L"DBWinMutex"); l_Cleanup: /* free the buffers */ - if(pDaclBuf) GlobalFree(pDaclBuf); - if(psidEveryone) RtlFreeSid(psidEveryone); - if(psidAdministrators) RtlFreeSid(psidAdministrators); - if(psidSystem) RtlFreeSid(psidSystem); - - return hMutex; + if (pDaclBuf) GlobalFree(pDaclBuf); + if (psidEveryone) RtlFreeSid(psidEveryone); + if (psidAdministrators) RtlFreeSid(psidAdministrators); + if (psidSystem) RtlFreeSid(psidSystem); + + return hMutex; } VOID @@ -425,8 +425,8 @@ /* Check if the process has a debug object/port */ Status = NtQueryInformationProcess(hProcess, ProcessDebugPort, - (PVOID)&DebugPort, - sizeof(HANDLE), + &DebugPort, + sizeof(DebugPort), NULL); if (NT_SUCCESS(Status)) { @@ -558,7 +558,7 @@ /* Send the breakin request */ Status = DbgUiIssueRemoteBreakin(Process); - if(!NT_SUCCESS(Status)) + if (!NT_SUCCESS(Status)) { /* Failure */ BaseSetLastNTError(Status); @@ -727,212 +727,212 @@ WINAPI OutputDebugStringA(IN LPCSTR _OutputString) { - _SEH2_TRY - { - ULONG_PTR a_nArgs[2]; - - a_nArgs[0] = (ULONG_PTR)(strlen(_OutputString) + 1); - a_nArgs[1] = (ULONG_PTR)_OutputString; - - /* send the string to the user-mode debugger */ - RaiseException(DBG_PRINTEXCEPTION_C, 0, 2, a_nArgs); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - /* no user-mode debugger: try the systemwide debug message monitor, or the - kernel debugger as a last resort */ - - /* mutex used to synchronize invocations of OutputDebugString */ - static HANDLE s_hDBMonMutex = NULL; - /* true if we already attempted to open/create the mutex */ - static BOOL s_bDBMonMutexTriedOpen = FALSE; - - /* local copy of the mutex handle */ - volatile HANDLE hDBMonMutex = s_hDBMonMutex; - /* handle to the Section of the shared buffer */ - volatile HANDLE hDBMonBuffer = NULL; - - /* pointer to the mapped view of the shared buffer. It consist of the current - process id followed by the message string */ - struct { DWORD ProcessId; CHAR Buffer[1]; } * pDBMonBuffer = NULL; - - /* event: signaled by the debug message monitor when OutputDebugString can write - to the shared buffer */ - volatile HANDLE hDBMonBufferReady = NULL; - - /* event: to be signaled by OutputDebugString when it's done writing to the - shared buffer */ - volatile HANDLE hDBMonDataReady = NULL; - - /* mutex not opened, and no previous attempts to open/create it */ - if(hDBMonMutex == NULL && !s_bDBMonMutexTriedOpen) - { - /* open/create the mutex */ - hDBMonMutex = K32CreateDBMonMutex(); - /* store the handle */ - s_hDBMonMutex = hDBMonMutex; - } - - _SEH2_TRY - { - volatile PCHAR a_cBuffer = NULL; - - /* opening the mutex failed */ - if(hDBMonMutex == NULL) - { - /* remember next time */ - s_bDBMonMutexTriedOpen = TRUE; - } - /* opening the mutex succeeded */ - else - { - do - { - /* synchronize with other invocations of OutputDebugString */ - WaitForSingleObject(hDBMonMutex, INFINITE); - - /* buffer of the system-wide debug message monitor */ - hDBMonBuffer = OpenFileMappingW(SECTION_MAP_WRITE, FALSE, L"DBWIN_BUFFER"); - - /* couldn't open the buffer: send the string to the kernel debugger */ - if(hDBMonBuffer == NULL) break; - - /* map the buffer */ - pDBMonBuffer = MapViewOfFile(hDBMonBuffer, - SECTION_MAP_READ | SECTION_MAP_WRITE, - 0, - 0, - 0); - - /* couldn't map the buffer: send the string to the kernel debugger */ - if(pDBMonBuffer == NULL) break; - - /* open the event signaling that the buffer can be accessed */ - hDBMonBufferReady = OpenEventW(SYNCHRONIZE, FALSE, L"DBWIN_BUFFER_READY"); - - /* couldn't open the event: send the string to the kernel debugger */ - if(hDBMonBufferReady == NULL) break; - - /* open the event to be signaled when the buffer has been filled */ - hDBMonDataReady = OpenEventW(EVENT_MODIFY_STATE, FALSE, L"DBWIN_DATA_READY"); - } - while(0); - - /* we couldn't connect to the system-wide debug message monitor: send the - string to the kernel debugger */ - if(hDBMonDataReady == NULL) ReleaseMutex(hDBMonMutex); - } - - _SEH2_TRY - { - /* size of the current output block */ - volatile SIZE_T nRoundLen; - - /* size of the remainder of the string */ - volatile SIZE_T nOutputStringLen; - - /* output the whole string */ - nOutputStringLen = strlen(_OutputString); - - do - { - /* we're connected to the debug monitor: - write the current block to the shared buffer */ - if(hDBMonDataReady) - { - /* wait a maximum of 10 seconds for the debug monitor - to finish processing the shared buffer */ - if(WaitForSingleObject(hDBMonBufferReady, 10000) != WAIT_OBJECT_0) - { - /* timeout or failure: give up */ - break; - } - - /* write the process id into the buffer */ - pDBMonBuffer->ProcessId = GetCurrentProcessId(); - - /* write only as many bytes as they fit in the buffer */ - if(nOutputStringLen > (PAGE_SIZE - sizeof(DWORD) - 1)) - nRoundLen = PAGE_SIZE - sizeof(DWORD) - 1; - else - nRoundLen = nOutputStringLen; - - /* copy the current block into the buffer */ - memcpy(pDBMonBuffer->Buffer, _OutputString, nRoundLen); - - /* null-terminate the current block */ - pDBMonBuffer->Buffer[nRoundLen] = 0; - - /* signal that the data contains meaningful data and can be read */ - SetEvent(hDBMonDataReady); - } - /* else, send the current block to the kernel debugger */ - else - { - /* output in blocks of 512 characters */ - a_cBuffer = (CHAR*)HeapAlloc(GetProcessHeap(), 0, 512); - - if (!a_cBuffer) - { - DbgPrint("OutputDebugStringA: Failed\n"); - break; - } - - /* write a maximum of 511 bytes */ - if(nOutputStringLen > 510) - nRoundLen = 510; - else - nRoundLen = nOutputStringLen; - - /* copy the current block */ - memcpy(a_cBuffer, _OutputString, nRoundLen); - - /* null-terminate the current block */ - a_cBuffer[nRoundLen] = 0; - - /* send the current block to the kernel debugger */ - DbgPrint("%s", a_cBuffer); - - if (a_cBuffer) - { - HeapFree(GetProcessHeap(), 0, a_cBuffer); - a_cBuffer = NULL; - } - } - - /* move to the next block */ - _OutputString += nRoundLen; - nOutputStringLen -= nRoundLen; - } - /* repeat until the string has been fully output */ - while (nOutputStringLen > 0); - } - /* ignore access violations and let other exceptions fall through */ - _SEH2_EXCEPT((_SEH2_GetExceptionCode() == STATUS_ACCESS_VIOLATION) ? EXCEPTION_EXECUTE_HANDLER : EXCEPTION_CONTINUE_SEARCH) - { - if (a_cBuffer) - HeapFree(GetProcessHeap(), 0, a_cBuffer); - - /* string copied verbatim from Microsoft's kernel32.dll */ - DbgPrint("\nOutputDebugString faulted during output\n"); - } - _SEH2_END; - } - _SEH2_FINALLY - { - /* close all the still open resources */ - if(hDBMonBufferReady) CloseHandle(hDBMonBufferReady); - if(pDBMonBuffer) UnmapViewOfFile(pDBMonBuffer); - if(hDBMonBuffer) CloseHandle(hDBMonBuffer); - if(hDBMonDataReady) CloseHandle(hDBMonDataReady); - - /* leave the critical section */ - if(hDBMonDataReady != NULL) - ReleaseMutex(hDBMonMutex); - } - _SEH2_END; - } - _SEH2_END; + _SEH2_TRY + { + ULONG_PTR a_nArgs[2]; + + a_nArgs[0] = (ULONG_PTR)(strlen(_OutputString) + 1); + a_nArgs[1] = (ULONG_PTR)_OutputString; + + /* send the string to the user-mode debugger */ + RaiseException(DBG_PRINTEXCEPTION_C, 0, 2, a_nArgs); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* no user-mode debugger: try the systemwide debug message monitor, or the + kernel debugger as a last resort */ + + /* mutex used to synchronize invocations of OutputDebugString */ + static HANDLE s_hDBMonMutex = NULL; + /* true if we already attempted to open/create the mutex */ + static BOOL s_bDBMonMutexTriedOpen = FALSE; + + /* local copy of the mutex handle */ + volatile HANDLE hDBMonMutex = s_hDBMonMutex; + /* handle to the Section of the shared buffer */ + volatile HANDLE hDBMonBuffer = NULL; + + /* pointer to the mapped view of the shared buffer. It consist of the current + process id followed by the message string */ + struct { DWORD ProcessId; CHAR Buffer[1]; } * pDBMonBuffer = NULL; + + /* event: signaled by the debug message monitor when OutputDebugString can write + to the shared buffer */ + volatile HANDLE hDBMonBufferReady = NULL; + + /* event: to be signaled by OutputDebugString when it's done writing to the + shared buffer */ + volatile HANDLE hDBMonDataReady = NULL; + + /* mutex not opened, and no previous attempts to open/create it */ + if (hDBMonMutex == NULL && !s_bDBMonMutexTriedOpen) + { + /* open/create the mutex */ + hDBMonMutex = K32CreateDBMonMutex(); + /* store the handle */ + s_hDBMonMutex = hDBMonMutex; + } + + _SEH2_TRY + { + volatile PCHAR a_cBuffer = NULL; + + /* opening the mutex failed */ + if (hDBMonMutex == NULL) + { + /* remember next time */ + s_bDBMonMutexTriedOpen = TRUE; + } + /* opening the mutex succeeded */ + else + { + do + { + /* synchronize with other invocations of OutputDebugString */ + WaitForSingleObject(hDBMonMutex, INFINITE); + + /* buffer of the system-wide debug message monitor */ + hDBMonBuffer = OpenFileMappingW(SECTION_MAP_WRITE, FALSE, L"DBWIN_BUFFER"); + + /* couldn't open the buffer: send the string to the kernel debugger */ + if (hDBMonBuffer == NULL) break; + + /* map the buffer */ + pDBMonBuffer = MapViewOfFile(hDBMonBuffer, + SECTION_MAP_READ | SECTION_MAP_WRITE, + 0, + 0, + 0); + + /* couldn't map the buffer: send the string to the kernel debugger */ + if (pDBMonBuffer == NULL) break; + + /* open the event signaling that the buffer can be accessed */ + hDBMonBufferReady = OpenEventW(SYNCHRONIZE, FALSE, L"DBWIN_BUFFER_READY"); + + /* couldn't open the event: send the string to the kernel debugger */ + if (hDBMonBufferReady == NULL) break; + + /* open the event to be signaled when the buffer has been filled */ + hDBMonDataReady = OpenEventW(EVENT_MODIFY_STATE, FALSE, L"DBWIN_DATA_READY"); + } + while(0); + + /* we couldn't connect to the system-wide debug message monitor: send the + string to the kernel debugger */ + if (hDBMonDataReady == NULL) ReleaseMutex(hDBMonMutex); + } + + _SEH2_TRY + { + /* size of the current output block */ + volatile SIZE_T nRoundLen; + + /* size of the remainder of the string */ + volatile SIZE_T nOutputStringLen; + + /* output the whole string */ + nOutputStringLen = strlen(_OutputString); + + do + { + /* we're connected to the debug monitor: + write the current block to the shared buffer */ + if (hDBMonDataReady) + { + /* wait a maximum of 10 seconds for the debug monitor + to finish processing the shared buffer */ + if (WaitForSingleObject(hDBMonBufferReady, 10000) != WAIT_OBJECT_0) + { + /* timeout or failure: give up */ + break; + } + + /* write the process id into the buffer */ + pDBMonBuffer->ProcessId = GetCurrentProcessId(); + + /* write only as many bytes as they fit in the buffer */ + if (nOutputStringLen > (PAGE_SIZE - sizeof(DWORD) - 1)) + nRoundLen = PAGE_SIZE - sizeof(DWORD) - 1; + else + nRoundLen = nOutputStringLen; + + /* copy the current block into the buffer */ + memcpy(pDBMonBuffer->Buffer, _OutputString, nRoundLen); + + /* null-terminate the current block */ + pDBMonBuffer->Buffer[nRoundLen] = 0; + + /* signal that the data contains meaningful data and can be read */ + SetEvent(hDBMonDataReady); + } + /* else, send the current block to the kernel debugger */ + else + { + /* output in blocks of 512 characters */ + a_cBuffer = (CHAR*)HeapAlloc(GetProcessHeap(), 0, 512); + + if (!a_cBuffer) + { + DbgPrint("OutputDebugStringA: Failed\n"); + break; + } + + /* write a maximum of 511 bytes */ + if (nOutputStringLen > 510) + nRoundLen = 510; + else + nRoundLen = nOutputStringLen; + + /* copy the current block */ + memcpy(a_cBuffer, _OutputString, nRoundLen); + + /* null-terminate the current block */ + a_cBuffer[nRoundLen] = 0; + + /* send the current block to the kernel debugger */ + DbgPrint("%s", a_cBuffer); + + if (a_cBuffer) + { + HeapFree(GetProcessHeap(), 0, a_cBuffer); + a_cBuffer = NULL; + } + } + + /* move to the next block */ + _OutputString += nRoundLen; + nOutputStringLen -= nRoundLen; + } + /* repeat until the string has been fully output */ + while (nOutputStringLen > 0); + } + /* ignore access violations and let other exceptions fall through */ + _SEH2_EXCEPT((_SEH2_GetExceptionCode() == STATUS_ACCESS_VIOLATION) ? EXCEPTION_EXECUTE_HANDLER : EXCEPTION_CONTINUE_SEARCH) + { + if (a_cBuffer) + HeapFree(GetProcessHeap(), 0, a_cBuffer); + + /* string copied verbatim from Microsoft's kernel32.dll */ + DbgPrint("\nOutputDebugString faulted during output\n"); + } + _SEH2_END; + } + _SEH2_FINALLY + { + /* close all the still open resources */ + if (hDBMonBufferReady) CloseHandle(hDBMonBufferReady); + if (pDBMonBuffer) UnmapViewOfFile(pDBMonBuffer); + if (hDBMonBuffer) CloseHandle(hDBMonBuffer); + if (hDBMonDataReady) CloseHandle(hDBMonDataReady); + + /* leave the critical section */ + if (hDBMonDataReady != NULL) + ReleaseMutex(hDBMonMutex); + } + _SEH2_END; + } + _SEH2_END; } /* Modified: trunk/reactos/dll/win32/kernel32/client/except.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/except.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/except.c [iso-8859-1] Sat Jul 2 20:52:25 2016 @@ -3,8 +3,8 @@ * PROJECT: ReactOS system libraries * FILE: dll/win32/kernel32/client/except.c * PURPOSE: Exception functions - * PROGRAMMER: Ariadne ( ariadne(a)xs4all.nl) - * modified from WINE [ Onno Hovers, (onno(a)stack.urc.tue.nl) ] + * PROGRAMMER: Ariadne (ariadne(a)xs4all.nl) + * Modified from WINE [ Onno Hovers, (onno(a)stack.urc.tue.nl) ] * UPDATE HISTORY: * Created 01/11/98 */ @@ -24,18 +24,18 @@ _module_name_from_addr(const void* addr, void **module_start_addr, char* psz, size_t nChars) { - MEMORY_BASIC_INFORMATION mbi; - if (VirtualQuery(addr, &mbi, sizeof(mbi)) != sizeof(mbi) || - !GetModuleFileNameA((HMODULE)mbi.AllocationBase, psz, nChars)) - { - psz[0] = '\0'; - *module_start_addr = 0; - } - else - { - *module_start_addr = (void *)mbi.AllocationBase; - } - return psz; + MEMORY_BASIC_INFORMATION mbi; + if (VirtualQuery(addr, &mbi, sizeof(mbi)) != sizeof(mbi) || + !GetModuleFileNameA((HMODULE)mbi.AllocationBase, psz, nChars)) + { + psz[0] = '\0'; + *module_start_addr = 0; + } + else + { + *module_start_addr = (void *)mbi.AllocationBase; + } + return psz; } @@ -43,45 +43,45 @@ _dump_context(PCONTEXT pc) { #ifdef _M_IX86 - /* - * Print out the CPU registers - */ - DbgPrint("CS:EIP %x:%x\n", pc->SegCs&0xffff, pc->Eip ); - DbgPrint("DS %x ES %x FS %x GS %x\n", pc->SegDs&0xffff, pc->SegEs&0xffff, - pc->SegFs&0xffff, pc->SegGs&0xfff); - DbgPrint("EAX: %.8x EBX: %.8x ECX: %.8x\n", pc->Eax, pc->Ebx, pc->Ecx); - DbgPrint("EDX: %.8x EBP: %.8x ESI: %.8x ESP: %.8x\n", pc->Edx, - pc->Ebp, pc->Esi, pc->Esp); - DbgPrint("EDI: %.8x EFLAGS: %.8x\n", pc->Edi, pc->EFlags); + /* + * Print out the CPU registers + */ + DbgPrint("CS:EIP %x:%x\n", pc->SegCs&0xffff, pc->Eip ); + DbgPrint("DS %x ES %x FS %x GS %x\n", pc->SegDs&0xffff, pc->SegEs&0xffff, + pc->SegFs&0xffff, pc->SegGs&0xfff); + DbgPrint("EAX: %.8x EBX: %.8x ECX: %.8x\n", pc->Eax, pc->Ebx, pc->Ecx); + DbgPrint("EDX: %.8x EBP: %.8x ESI: %.8x ESP: %.8x\n", pc->Edx, + pc->Ebp, pc->Esi, pc->Esp); + DbgPrint("EDI: %.8x EFLAGS: %.8x\n", pc->Edi, pc->EFlags); #elif defined(_M_AMD64) - DbgPrint("CS:RIP %x:%I64x\n", pc->SegCs&0xffff, pc->Rip ); - DbgPrint("DS %x ES %x FS %x GS %x\n", pc->SegDs&0xffff, pc->SegEs&0xffff, - pc->SegFs&0xffff, pc->SegGs&0xfff); - DbgPrint("RAX: %I64x RBX: %I64x RCX: %I64x RDI: %I64x\n", pc->Rax, pc->Rbx, pc->Rcx, pc->Rdi); - DbgPrint("RDX: %I64x RBP: %I64x RSI: %I64x RSP: %I64x\n", pc->Rdx, pc->Rbp, pc->Rsi, pc->Rsp); - DbgPrint("R8: %I64x R9: %I64x R10: %I64x R11: %I64x\n", pc->R8, pc->R9, pc->R10, pc->R11); - DbgPrint("R12: %I64x R13: %I64x R14: %I64x R15: %I64x\n", pc->R12, pc->R13, pc->R14, pc->R15); - DbgPrint("EFLAGS: %.8x\n", pc->EFlags); + DbgPrint("CS:RIP %x:%I64x\n", pc->SegCs&0xffff, pc->Rip ); + DbgPrint("DS %x ES %x FS %x GS %x\n", pc->SegDs&0xffff, pc->SegEs&0xffff, + pc->SegFs&0xffff, pc->SegGs&0xfff); + DbgPrint("RAX: %I64x RBX: %I64x RCX: %I64x RDI: %I64x\n", pc->Rax, pc->Rbx, pc->Rcx, pc->Rdi); + DbgPrint("RDX: %I64x RBP: %I64x RSI: %I64x RSP: %I64x\n", pc->Rdx, pc->Rbp, pc->Rsi, pc->Rsp); + DbgPrint("R8: %I64x R9: %I64x R10: %I64x R11: %I64x\n", pc->R8, pc->R9, pc->R10, pc->R11); + DbgPrint("R12: %I64x R13: %I64x R14: %I64x R15: %I64x\n", pc->R12, pc->R13, pc->R14, pc->R15); + DbgPrint("EFLAGS: %.8x\n", pc->EFlags); #elif defined(_M_ARM) - DbgPrint("PC: %08lx LR: %08lx SP: %08lx\n", pc->Pc); - DbgPrint("R0: %08lx R1: %08lx R2: %08lx R3: %08lx\n", pc->R0, pc->R1, pc->R2, pc->R3); - DbgPrint("R4: %08lx R5: %08lx R6: %08lx R7: %08lx\n", pc->R4, pc->R5, pc->R6, pc->R7); - DbgPrint("R8: %08lx R9: %08lx R10: %08lx R11: %08lx\n", pc->R8, pc->R9, pc->R10, pc->R11); - DbgPrint("R12: %08lx CPSR: %08lx FPSCR: %08lx\n", pc->R12, pc->Cpsr, pc->R1, pc->Fpscr, pc->R3); + DbgPrint("PC: %08lx LR: %08lx SP: %08lx\n", pc->Pc); + DbgPrint("R0: %08lx R1: %08lx R2: %08lx R3: %08lx\n", pc->R0, pc->R1, pc->R2, pc->R3); + DbgPrint("R4: %08lx R5: %08lx R6: %08lx R7: %08lx\n", pc->R4, pc->R5, pc->R6, pc->R7); + DbgPrint("R8: %08lx R9: %08lx R10: %08lx R11: %08lx\n", pc->R8, pc->R9, pc->R10, pc->R11); + DbgPrint("R12: %08lx CPSR: %08lx FPSCR: %08lx\n", pc->R12, pc->Cpsr, pc->R1, pc->Fpscr, pc->R3); #else -#error "Unknown architecture" + #error "Unknown architecture" #endif } static VOID -PrintStackTrace(struct _EXCEPTION_POINTERS *ExceptionInfo) +PrintStackTrace(IN PEXCEPTION_POINTERS ExceptionInfo) { PVOID StartAddr; CHAR szMod[128] = ""; PEXCEPTION_RECORD ExceptionRecord = ExceptionInfo->ExceptionRecord; PCONTEXT ContextRecord = ExceptionInfo->ContextRecord; - /* Print a stack trace. */ + /* Print a stack trace */ DbgPrint("Unhandled exception\n"); DbgPrint("ExceptionCode: %8x\n", ExceptionRecord->ExceptionCode); @@ -91,7 +91,7 @@ DbgPrint("Faulting Address: %8x\n", ExceptionRecord->ExceptionInformation[1]); } - _dump_context (ContextRecord); + _dump_context(ContextRecord); _module_name_from_addr(ExceptionRecord->ExceptionAddress, &StartAddr, szMod, sizeof(szMod)); DbgPrint("Address:\n %8x+%-8x %s\n", (PVOID)StartAddr, @@ -368,9 +368,7 @@ { /* We do, normalize the count */ if (nNumberOfArguments > EXCEPTION_MAXIMUM_PARAMETERS) - { nNumberOfArguments = EXCEPTION_MAXIMUM_PARAMETERS; - } /* Set the count of parameters and copy them */ ExceptionRecord.NumberParameters = nNumberOfArguments; @@ -388,14 +386,14 @@ } /* Trace the wine special error and show the modulename and functionname */ - if (dwExceptionCode == 0x80000100 /*EXCEPTION_WINE_STUB*/) - { - /* Numbers of parameter must be equal to two */ - if (ExceptionRecord.NumberParameters == 2) - { - DPRINT1("Missing function in : %s\n", ExceptionRecord.ExceptionInformation[0]); - DPRINT1("with the functionname : %s\n", ExceptionRecord.ExceptionInformation[1]); - } + if (dwExceptionCode == 0x80000100 /* EXCEPTION_WINE_STUB */) + { + /* Numbers of parameter must be equal to two */ + if (ExceptionRecord.NumberParameters == 2) + { + DPRINT1("Missing function in : %s\n", ExceptionRecord.ExceptionInformation[0]); + DPRINT1("with the functionname : %s\n", ExceptionRecord.ExceptionInformation[1]); + } } /* Raise the exception */

1 0

[hbelusca] 71767: [NTDLL] Export RtlMapSecurityErrorToNtStatus since we have it available in our RTL library (however it is still only stubbed). [RTL][NDK] - NT-ify a bit error.c - Add the prototyp...
by hbelusca＠svn.reactos.org 02 Jul '16

02 Jul '16

Author: hbelusca Date: Sat Jul 2 20:37:35 2016 New Revision: 71767 URL: http://svn.reactos.org/svn/reactos?rev=71767&view=rev Log: [NTDLL] Export RtlMapSecurityErrorToNtStatus since we have it available in our RTL library (however it is still only stubbed). [RTL][NDK] - NT-ify a bit error.c - Add the prototypes of the functions that manipulate the "last Win32 error" and "last NT status". - Add the prototypes of the functions that get & set the thread-error-mode (for hard-errors). - Define some prototypes for NTOS_MODE_USER only. [CONSRV] RtlGetLastNtStatus is now in the NDK, no need to keep its prototype there anymore. Modified: trunk/reactos/dll/ntdll/def/ntdll.spec trunk/reactos/sdk/include/ndk/rtlfuncs.h trunk/reactos/sdk/lib/rtl/error.c trunk/reactos/win32ss/user/winsrv/consrv/console.c Modified: trunk/reactos/dll/ntdll/def/ntdll.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/def/ntdll.spec?r… ============================================================================== --- trunk/reactos/dll/ntdll/def/ntdll.spec [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/def/ntdll.spec [iso-8859-1] Sat Jul 2 20:37:35 2016 @@ -771,7 +771,7 @@ @ stdcall -arch=x86_64 RtlLookupFunctionEntry(long ptr ptr) 767 stdcall RtlMakeSelfRelativeSD(ptr ptr ptr) 768 stdcall RtlMapGenericMask(long ptr) -# stdcall RtlMapSecurityErrorToNtStatus +769 stdcall RtlMapSecurityErrorToNtStatus(long) 770 stdcall RtlMoveMemory(ptr ptr long) 771 stdcall RtlMultiAppendUnicodeStringBuffer(ptr long ptr) 772 stdcall RtlMultiByteToUnicodeN(ptr long ptr ptr long) Modified: trunk/reactos/sdk/include/ndk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/ndk/rtlfuncs.h… ============================================================================== --- trunk/reactos/sdk/include/ndk/rtlfuncs.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/ndk/rtlfuncs.h [iso-8859-1] Sat Jul 2 20:37:35 2016 @@ -609,7 +609,7 @@ #endif /* RTL_USE_AVL_TABLES */ // -// Error and Exception Functions +// Exception and Error Functions // NTSYSAPI PVOID @@ -637,6 +637,84 @@ _In_ PRTLP_UNHANDLED_EXCEPTION_FILTER TopLevelExceptionFilter ); +NTSYSAPI +LONG +NTAPI +RtlUnhandledExceptionFilter( + _In_ struct _EXCEPTION_POINTERS* ExceptionInfo +); + +NTSYSAPI +PVOID +NTAPI +RtlEncodePointer( + _In_ PVOID Pointer +); + +NTSYSAPI +PVOID +NTAPI +RtlDecodePointer( + _In_ PVOID Pointer +); + +NTSYSAPI +PVOID +NTAPI +RtlEncodeSystemPointer( + _In_ PVOID Pointer +); + +NTSYSAPI +PVOID +NTAPI +RtlDecodeSystemPointer( + _In_ PVOID Pointer +); + +NTSYSAPI +NTSTATUS +NTAPI +RtlGetLastNtStatus( + VOID +); + +NTSYSAPI +ULONG +NTAPI +RtlGetLastWin32Error( + VOID +); + +NTSYSAPI +VOID +NTAPI +RtlSetLastWin32Error( + _In_ ULONG LastError +); + +NTSYSAPI +VOID +NTAPI +RtlSetLastWin32ErrorAndNtStatusFromNtStatus( + _In_ NTSTATUS Status +); + +NTSYSAPI +NTSTATUS +NTAPI +RtlSetThreadErrorMode( + _In_ ULONG NewMode, + _Out_opt_ PULONG OldMode +); + +NTSYSAPI +ULONG +NTAPI +RtlGetThreadErrorMode( + VOID +); + #endif /* NTOS_MODE_USER */ NTSYSAPI @@ -644,34 +722,6 @@ NTAPI RtlCaptureContext( _Out_ PCONTEXT ContextRecord -); - -NTSYSAPI -PVOID -NTAPI -RtlEncodePointer( - _In_ PVOID Pointer -); - -NTSYSAPI -PVOID -NTAPI -RtlDecodePointer( - _In_ PVOID Pointer -); - -NTSYSAPI -PVOID -NTAPI -RtlEncodeSystemPointer( - _In_ PVOID Pointer -); - -NTSYSAPI -PVOID -NTAPI -RtlDecodeSystemPointer( - _In_ PVOID Pointer ); NTSYSAPI @@ -702,10 +752,10 @@ ); NTSYSAPI -VOID -NTAPI -RtlSetLastWin32ErrorAndNtStatusFromNtStatus( - _In_ NTSTATUS Status +NTSTATUS +NTAPI +RtlMapSecurityErrorToNtStatus( + _In_ ULONG SecurityError ); NTSYSAPI @@ -721,13 +771,6 @@ NTAPI RtlRaiseStatus( _In_ NTSTATUS Status -); - -NTSYSAPI -LONG -NTAPI -RtlUnhandledExceptionFilter( - _In_ struct _EXCEPTION_POINTERS* ExceptionInfo ); NTSYSAPI Modified: trunk/reactos/sdk/lib/rtl/error.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/rtl/error.c?rev=71… ============================================================================== --- trunk/reactos/sdk/lib/rtl/error.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/rtl/error.c [iso-8859-1] Sat Jul 2 20:37:35 2016 @@ -46,21 +46,23 @@ * The mapped Win32 error code, or ERROR_MR_MID_NOT_FOUND if there is no * mapping defined. */ -ULONG WINAPI RtlNtStatusToDosErrorNoTeb( NTSTATUS status ) +ULONG +NTAPI +RtlNtStatusToDosErrorNoTeb(IN NTSTATUS Status) { const struct error_table *table = error_table; - if (!status || (status & 0x20000000)) return status; + if (!Status || (Status & 0x20000000)) return Status; /* 0xd... is equivalent to 0xc... */ - if ((status & 0xf0000000) == 0xd0000000) status &= ~0x10000000; + if ((Status & 0xf0000000) == 0xd0000000) Status &= ~0x10000000; while (table->start) { - if ((ULONG)status < table->start) break; - if ((ULONG)status < table->end) + if ((ULONG)Status < table->start) break; + if ((ULONG)Status < table->end) { - DWORD ret = table->table[status - table->start]; + DWORD ret = table->table[Status - table->start]; /* unknown entries are 0 */ if (!ret) goto no_mapping; return ret; @@ -69,11 +71,11 @@ } /* now some special cases */ - if (HIWORD(status) == 0xc001) return LOWORD(status); - if (HIWORD(status) == 0x8007) return LOWORD(status); + if (HIWORD(Status) == 0xc001) return LOWORD(Status); + if (HIWORD(Status) == 0x8007) return LOWORD(Status); no_mapping: - DPRINT1( "no mapping for %08x\n", status ); + DPRINT1( "no mapping for %08x\n", Status ); return ERROR_MR_MID_NOT_FOUND; } @@ -89,15 +91,17 @@ * The mapped Win32 error code, or ERROR_MR_MID_NOT_FOUND if there is no * mapping defined. */ -ULONG WINAPI RtlNtStatusToDosError( NTSTATUS status ) -{ - PTEB Teb = NtCurrentTeb (); +ULONG +NTAPI +RtlNtStatusToDosError(IN NTSTATUS Status) +{ + PTEB Teb = NtCurrentTeb(); if (NULL != Teb) { - Teb->LastStatusValue = status; + Teb->LastStatusValue = Status; } - return RtlNtStatusToDosErrorNoTeb( status ); + return RtlNtStatusToDosErrorNoTeb(Status); } /********************************************************************** @@ -105,7 +109,9 @@ * * Get the current per-thread status. */ -NTSTATUS WINAPI RtlGetLastNtStatus(void) +NTSTATUS +NTAPI +RtlGetLastNtStatus(VOID) { return NtCurrentTeb()->LastStatusValue; } @@ -121,7 +127,9 @@ * RETURNS * The current error value for the thread, as set by SetLastWin32Error() or SetLastError(). */ -DWORD WINAPI RtlGetLastWin32Error(void) +ULONG +NTAPI +RtlGetLastWin32Error(VOID) { return NtCurrentTeb()->LastErrorValue; } @@ -138,9 +146,11 @@ * RETURNS * Nothing. */ -void WINAPI RtlSetLastWin32Error( DWORD err ) -{ - NtCurrentTeb()->LastErrorValue = err; +VOID +NTAPI +RtlSetLastWin32Error(IN ULONG LastError) +{ + NtCurrentTeb()->LastErrorValue = LastError; } /*********************************************************************** @@ -154,9 +164,11 @@ * RETURNS * Nothing. */ -void WINAPI RtlSetLastWin32ErrorAndNtStatusFromNtStatus( NTSTATUS status ) -{ - NtCurrentTeb()->LastErrorValue = RtlNtStatusToDosError( status ); +VOID +NTAPI +RtlSetLastWin32ErrorAndNtStatusFromNtStatus(IN NTSTATUS Status) +{ + NtCurrentTeb()->LastErrorValue = RtlNtStatusToDosError(Status); } /* @@ -164,9 +176,7 @@ */ NTSTATUS NTAPI -RtlMapSecurityErrorToNtStatus( - IN ULONG SecurityError - ) +RtlMapSecurityErrorToNtStatus(IN ULONG SecurityError) { UNIMPLEMENTED; return STATUS_NOT_IMPLEMENTED; Modified: trunk/reactos/win32ss/user/winsrv/consrv/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/console.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/console.c [iso-8859-1] Sat Jul 2 20:37:35 2016 @@ -24,8 +24,6 @@ #define NDEBUG #include <debug.h> -// FIXME: Add this prototype to winternl.h / rtlfuncs.h / ... -NTSTATUS NTAPI RtlGetLastNtStatus(VOID); /* GLOBALS ********************************************************************/

1 0

[akhaldi] 71766: [INCLUDE/WINE] Update winternl.h. CORE-11368
by akhaldi＠svn.reactos.org 02 Jul '16

02 Jul '16

Author: akhaldi Date: Sat Jul 2 16:07:18 2016 New Revision: 71766 URL: http://svn.reactos.org/svn/reactos?rev=71766&view=rev Log: [INCLUDE/WINE] Update winternl.h. CORE-11368 Modified: trunk/reactos/sdk/include/reactos/wine/winternl.h Modified: trunk/reactos/sdk/include/reactos/wine/winternl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/wine/w… ============================================================================== --- trunk/reactos/sdk/include/reactos/wine/winternl.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/reactos/wine/winternl.h [iso-8859-1] Sat Jul 2 16:07:18 2016 @@ -543,6 +543,23 @@ WCHAR FileName[ANYSIZE_ARRAY]; } FILE_ID_BOTH_DIRECTORY_INFORMATION, *PFILE_ID_BOTH_DIRECTORY_INFORMATION; +typedef struct _FILE_ID_GLOBAL_TX_DIR_INFORMATION { + ULONG NextEntryOffset; + ULONG FileIndex; + LARGE_INTEGER CreationTime; + LARGE_INTEGER LastAccessTime; + LARGE_INTEGER LastWriteTime; + LARGE_INTEGER ChangeTime; + LARGE_INTEGER EndOfFile; + LARGE_INTEGER AllocationSize; + ULONG FileAttributes; + ULONG FileNameLength; + LARGE_INTEGER FileId; + GUID LockingTransactionId; + ULONG TxInfoFlags; + WCHAR FileName[ANYSIZE_ARRAY]; +} FILE_ID_GLOBAL_TX_DIR_INFORMATION, *PFILE_ID_GLOBAL_TX_DIR_INFORMATION; + typedef struct _FILE_BASIC_INFORMATION { LARGE_INTEGER CreationTime; LARGE_INTEGER LastAccessTime; @@ -683,6 +700,34 @@ ULONG NamedPipeState; ULONG NamedPipeEnd; } FILE_PIPE_LOCAL_INFORMATION, *PFILE_PIPE_LOCAL_INFORMATION; + +typedef struct _FILE_OBJECTID_INFORMATION { + LONGLONG FileReference; + UCHAR ObjectId[16]; + union { + struct { + UCHAR BirthVolumeId[16]; + UCHAR BirthObjectId[16]; + UCHAR DomainId[16]; + } DUMMYSTRUCTNAME; + UCHAR ExtendedInfo[48]; + } DUMMYUNIONNAME; +} FILE_OBJECTID_INFORMATION, *PFILE_OBJECTID_INFORMATION; + +typedef struct _FILE_QUOTA_INFORMATION { + ULONG NextEntryOffset; + ULONG SidLength; + LARGE_INTEGER ChangeTime; + LARGE_INTEGER QuotaUsed; + LARGE_INTEGER QuotaThreshold; + LARGE_INTEGER QuotaLimit; + SID Sid; +} FILE_QUOTA_INFORMATION, *PFILE_QUOTA_INFORMATION; + +typedef struct _FILE_REPARSE_POINT_INFORMATION { + LONGLONG FileReference; + ULONG Tag; +} FILE_REPARSE_POINT_INFORMATION, *PFILE_REPARSE_POINT_INFORMATION; #define FILE_PIPE_DISCONNECTED_STATE 0x01 #define FILE_PIPE_LISTENING_STATE 0x02 @@ -2383,11 +2428,14 @@ NTSYSAPI NTSTATUS WINAPI RtlAddAce(PACL,DWORD,DWORD,PACE_HEADER,DWORD); NTSYSAPI NTSTATUS WINAPI RtlAddAccessAllowedAce(PACL,DWORD,DWORD,PSID); NTSYSAPI NTSTATUS WINAPI RtlAddAccessAllowedAceEx(PACL,DWORD,DWORD,DWORD,PSID); +NTSYSAPI NTSTATUS WINAPI RtlAddAccessAllowedObjectAce(PACL,DWORD,DWORD,DWORD,GUID*,GUID*,PSID); NTSYSAPI NTSTATUS WINAPI RtlAddAccessDeniedAce(PACL,DWORD,DWORD,PSID); NTSYSAPI NTSTATUS WINAPI RtlAddAccessDeniedAceEx(PACL,DWORD,DWORD,DWORD,PSID); +NTSYSAPI NTSTATUS WINAPI RtlAddAccessDeniedObjectAce(PACL,DWORD,DWORD,DWORD,GUID*,GUID*,PSID); NTSYSAPI NTSTATUS WINAPI RtlAddAtomToAtomTable(RTL_ATOM_TABLE,const WCHAR*,RTL_ATOM*); NTSYSAPI NTSTATUS WINAPI RtlAddAuditAccessAce(PACL,DWORD,DWORD,PSID,BOOL,BOOL); NTSYSAPI NTSTATUS WINAPI RtlAddAuditAccessAceEx(PACL,DWORD,DWORD,DWORD,PSID,BOOL,BOOL); +NTSYSAPI NTSTATUS WINAPI RtlAddAuditAccessObjectAce(PACL,DWORD,DWORD,DWORD,GUID*,GUID*,PSID,BOOL,BOOL); NTSYSAPI void WINAPI RtlAddRefActivationContext(HANDLE); NTSYSAPI PVOID WINAPI RtlAddVectoredExceptionHandler(ULONG,PVECTORED_EXCEPTION_HANDLER); NTSYSAPI NTSTATUS WINAPI RtlAdjustPrivilege(ULONG,BOOLEAN,BOOLEAN,PBOOLEAN); @@ -2414,6 +2462,7 @@ NTSYSAPI ULONG WINAPI RtlCompactHeap(HANDLE,ULONG); NTSYSAPI LONG WINAPI RtlCompareString(const STRING*,const STRING*,BOOLEAN); NTSYSAPI LONG WINAPI RtlCompareUnicodeString(const UNICODE_STRING*,const UNICODE_STRING*,BOOLEAN); +NTSYSAPI LONG WINAPI RtlCompareUnicodeStrings(const WCHAR*,SIZE_T,const WCHAR*,SIZE_T,BOOLEAN); NTSYSAPI NTSTATUS WINAPI RtlCompressBuffer(USHORT,PUCHAR,ULONG,PUCHAR,ULONG,ULONG,PULONG,PVOID); NTSYSAPI DWORD WINAPI RtlComputeCrc32(DWORD,const BYTE*,INT); NTSYSAPI NTSTATUS WINAPI RtlConvertSidToUnicodeString(PUNICODE_STRING,PSID,BOOLEAN);

1 0

[akhaldi] 71765: [QUARTZ_WINETEST] Sync with Wine Staging 1.9.11. CORE-11368
by akhaldi＠svn.reactos.org 02 Jul '16

02 Jul '16

Author: akhaldi Date: Sat Jul 2 15:56:56 2016 New Revision: 71765 URL: http://svn.reactos.org/svn/reactos?rev=71765&view=rev Log: [QUARTZ_WINETEST] Sync with Wine Staging 1.9.11. CORE-11368 Modified: trunk/rostests/winetests/quartz/avisplitter.c trunk/rostests/winetests/quartz/filtermapper.c Modified: trunk/rostests/winetests/quartz/avisplitter.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/quartz/avisplit… ============================================================================== --- trunk/rostests/winetests/quartz/avisplitter.c [iso-8859-1] (original) +++ trunk/rostests/winetests/quartz/avisplitter.c [iso-8859-1] Sat Jul 2 15:56:56 2016 @@ -169,6 +169,137 @@ IBaseFilter_Release(base); } +static void test_filesourcefilter(void) +{ + static const WCHAR prefix[] = {'w','i','n',0}; + static const struct + { + const char *label; + const char *data; + DWORD size; + const GUID *subtype; + } + tests[] = + { + { + "AVI", + "\x52\x49\x46\x46xxxx\x41\x56\x49\x20", + 12, + &MEDIASUBTYPE_Avi, + }, + { + "MPEG1 System", + "\x00\x00\x01\xBA\x21\x00\x01\x00\x01\x80\x00\x01\x00\x00\x01\xBB", + 16, + &MEDIASUBTYPE_MPEG1System, + }, + { + "MPEG1 Video", + "\x00\x00\x01\xB3", + 4, + &MEDIASUBTYPE_MPEG1Video, + }, + { + "MPEG1 Audio", + "\xFF\xE0", + 2, + &MEDIASUBTYPE_MPEG1Audio, + }, + { + "MPEG2 Program", + "\x00\x00\x01\xBA\x40", + 5, + &MEDIASUBTYPE_MPEG2_PROGRAM, + }, + { + "WAVE", + "\x52\x49\x46\x46xxxx\x57\x41\x56\x45", + 12, + &MEDIASUBTYPE_WAVE, + }, + { + "unknown format", + "Hello World", + 11, + NULL, /* FIXME: should be &MEDIASUBTYPE_NULL */ + }, + }; + WCHAR path[MAX_PATH], temp[MAX_PATH]; + IFileSourceFilter *filesource; + DWORD ret, written; + IBaseFilter *base; + AM_MEDIA_TYPE mt; + OLECHAR *olepath; + BOOL success; + HANDLE file; + HRESULT hr; + int i; + + ret = GetTempPathW(MAX_PATH, temp); + ok(ret, "GetTempPathW failed with error %u\n", GetLastError()); + ret = GetTempFileNameW(temp, prefix, 0, path); + ok(ret, "GetTempFileNameW failed with error %u\n", GetLastError()); + + for (i = 0; i < sizeof(tests)/sizeof(tests[0]); i++) + { + trace("Running test for %s\n", tests[i].label); + + file = CreateFileW(path, GENERIC_READ | GENERIC_WRITE, 0, NULL, + CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + ok(file != INVALID_HANDLE_VALUE, "CreateFileW failed with error %u\n", GetLastError()); + success = WriteFile(file, tests[i].data, tests[i].size, &written, NULL); + ok(success, "WriteFile failed with error %u\n", GetLastError()); + ok(written == tests[i].size, "could not write test data\n"); + CloseHandle(file); + + hr = CoCreateInstance(&CLSID_AsyncReader, NULL, CLSCTX_INPROC_SERVER, + &IID_IBaseFilter, (void **)&base); + ok(hr == S_OK, "CoCreateInstance failed with %08x\n", hr); + hr = IBaseFilter_QueryInterface(base, &IID_IFileSourceFilter, (void **)&filesource); + ok(hr == S_OK, "IBaseFilter_QueryInterface failed with %08x\n", hr); + + olepath = (void *)0xdeadbeef; + hr = IFileSourceFilter_GetCurFile(filesource, &olepath, NULL); + ok(hr == S_OK, "expected S_OK, got %08x\n", hr); + ok(olepath == NULL, "expected NULL, got %p\n", olepath); + + hr = IFileSourceFilter_Load(filesource, NULL, NULL); + ok(hr == E_POINTER, "expected E_POINTER, got %08x\n", hr); + + hr = IFileSourceFilter_Load(filesource, path, NULL); + ok(hr == S_OK, "IFileSourceFilter_Load failed with %08x\n", hr); + + hr = IFileSourceFilter_GetCurFile(filesource, NULL, &mt); + ok(hr == E_POINTER, "expected E_POINTER, got %08x\n", hr); + + olepath = NULL; + hr = IFileSourceFilter_GetCurFile(filesource, &olepath, NULL); + ok(hr == S_OK, "expected S_OK, got %08x\n", hr); + CoTaskMemFree(olepath); + + olepath = NULL; + memset(&mt, 0x11, sizeof(mt)); + hr = IFileSourceFilter_GetCurFile(filesource, &olepath, &mt); + ok(hr == S_OK, "expected S_OK, got %08x\n", hr); + ok(!lstrcmpW(olepath, path), + "expected %s, got %s\n", wine_dbgstr_w(path), wine_dbgstr_w(olepath)); + if (tests[i].subtype) + { + ok(IsEqualGUID(&mt.majortype, &MEDIATYPE_Stream), + "expected MEDIATYPE_Stream, got %s\n", wine_dbgstr_guid(&mt.majortype)); + ok(IsEqualGUID(&mt.subtype, tests[i].subtype), + "expected %s, got %s\n", wine_dbgstr_guid(tests[i].subtype), wine_dbgstr_guid(&mt.subtype)); + } + CoTaskMemFree(olepath); + + IFileSourceFilter_Release(filesource); + IBaseFilter_Release(base); + + success = DeleteFileW(path); + ok(success, "DeleteFileW failed with error %u\n", GetLastError()); + } +} + static const WCHAR wfile[] = {'t','e','s','t','.','a','v','i',0}; static const char afile[] = "test.avi"; @@ -462,6 +593,7 @@ test_query_interface(); test_basefilter(); + test_filesourcefilter(); test_threads(); release_avisplitter(); Modified: trunk/rostests/winetests/quartz/filtermapper.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/quartz/filterma… ============================================================================== --- trunk/rostests/winetests/quartz/filtermapper.c [iso-8859-1] (original) +++ trunk/rostests/winetests/quartz/filtermapper.c [iso-8859-1] Sat Jul 2 15:56:56 2016 @@ -593,7 +593,7 @@ ok(pmapper != &unk_outer.IUnknown_iface, "pmapper = %p, expected not %p\n", pmapper, &unk_outer.IUnknown_iface); hr = IUnknown_QueryInterface(pmapper, &IID_IUnknown, (void **)&punk); - ok(hr == S_OK, "CoCreateInstance returned %x\n", hr); + ok(hr == S_OK, "IUnknown_QueryInterface returned %x\n", hr); ok(punk != &unk_outer.IUnknown_iface, "punk = %p, expected not %p\n", punk, &unk_outer.IUnknown_iface); IUnknown_Release(punk); @@ -603,7 +603,7 @@ unk_outer.Release_called = 0; hr = IUnknown_QueryInterface(pmapper, &IID_IFilterMapper, (void **)&punk); - ok(hr == S_OK, "CoCreateInstance returned %x\n", hr); + ok(hr == S_OK, "IUnknown_QueryInterface returned %x\n", hr); ok(punk != &unk_outer.IUnknown_iface, "punk = %p, expected not %p\n", punk, &unk_outer.IUnknown_iface); IUnknown_Release(punk); @@ -613,7 +613,7 @@ unk_outer.Release_called = 0; hr = IUnknown_QueryInterface(pmapper, &IID_IFilterMapper2, (void **)&punk); - ok(hr == S_OK, "CoCreateInstance returned %x\n", hr); + ok(hr == S_OK, "IUnknown_QueryInterface returned %x\n", hr); ok(punk != &unk_outer.IUnknown_iface, "punk = %p, expected not %p\n", punk, &unk_outer.IUnknown_iface); IUnknown_Release(punk); @@ -623,7 +623,7 @@ unk_outer.Release_called = 0; hr = IUnknown_QueryInterface(pmapper, &IID_IFilterMapper3, (void **)&punk); - ok(hr == S_OK, "CoCreateInstance returned %x\n", hr); + ok(hr == S_OK, "IUnknown_QueryInterface returned %x\n", hr); ok(punk != &unk_outer.IUnknown_iface, "punk = %p, expected not %p\n", punk, &unk_outer.IUnknown_iface); IUnknown_Release(punk);

1 0

[akhaldi] 71764: [QUARTZ] Sync with Wine Staging 1.9.11. CORE-11368
by akhaldi＠svn.reactos.org 02 Jul '16

02 Jul '16

Author: akhaldi Date: Sat Jul 2 15:56:39 2016 New Revision: 71764 URL: http://svn.reactos.org/svn/reactos?rev=71764&view=rev Log: [QUARTZ] Sync with Wine Staging 1.9.11. CORE-11368 Modified: trunk/reactos/dll/directx/wine/quartz/acmwrapper.c trunk/reactos/dll/directx/wine/quartz/avidec.c trunk/reactos/dll/directx/wine/quartz/dsoundrender.c trunk/reactos/dll/directx/wine/quartz/filesource.c trunk/reactos/dll/directx/wine/quartz/filtermapper.c trunk/reactos/dll/directx/wine/quartz/pin.c trunk/reactos/dll/directx/wine/quartz/videorenderer.c trunk/reactos/dll/directx/wine/quartz/vmr9.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/directx/wine/quartz/acmwrapper.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/ac… ============================================================================== --- trunk/reactos/dll/directx/wine/quartz/acmwrapper.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/quartz/acmwrapper.c [iso-8859-1] Sat Jul 2 15:56:39 2016 @@ -36,7 +36,7 @@ static inline ACMWrapperImpl *impl_from_TransformFilter( TransformFilter *iface ) { - return CONTAINING_RECORD(iface, ACMWrapperImpl, tf.filter); + return CONTAINING_RECORD(iface, ACMWrapperImpl, tf); } static HRESULT WINAPI ACMWrapper_Receive(TransformFilter *tf, IMediaSample *pSample) Modified: trunk/reactos/dll/directx/wine/quartz/avidec.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/av… ============================================================================== --- trunk/reactos/dll/directx/wine/quartz/avidec.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/quartz/avidec.c [iso-8859-1] Sat Jul 2 15:56:39 2016 @@ -34,7 +34,7 @@ static inline AVIDecImpl *impl_from_TransformFilter( TransformFilter *iface ) { - return CONTAINING_RECORD(iface, AVIDecImpl, tf.filter); + return CONTAINING_RECORD(iface, AVIDecImpl, tf); } static HRESULT WINAPI AVIDec_StartStreaming(TransformFilter* pTransformFilter) Modified: trunk/reactos/dll/directx/wine/quartz/dsoundrender.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/ds… ============================================================================== --- trunk/reactos/dll/directx/wine/quartz/dsoundrender.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/quartz/dsoundrender.c [iso-8859-1] Sat Jul 2 15:56:39 2016 @@ -387,7 +387,7 @@ else if (jitter < 0) jitter = 0; q.Type = (jitter > 0 ? Famine : Flood); - q.Proportion = 1.; + q.Proportion = 1000; q.Late = jitter; q.TimeStamp = tStart; IQualityControl_Notify((IQualityControl *)This->renderer.qcimpl, (IBaseFilter*)This, q); Modified: trunk/reactos/dll/directx/wine/quartz/filesource.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/fi… ============================================================================== --- trunk/reactos/dll/directx/wine/quartz/filesource.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/quartz/filesource.c [iso-8859-1] Sat Jul 2 15:56:39 2016 @@ -598,6 +598,9 @@ TRACE("(%s, %p)\n", debugstr_w(pszFileName), pmt); + if (!pszFileName) + return E_POINTER; + /* open file */ /* FIXME: check the sharing values that native uses */ hFile = CreateFileW(pszFileName, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_FLAG_OVERLAPPED, NULL); @@ -637,8 +640,8 @@ hr = GetClassMediaFile(pReader, pszFileName, &This->pmt->majortype, &This->pmt->subtype, NULL); if (FAILED(hr)) { - memcpy(&This->pmt->majortype, &MEDIATYPE_Stream, sizeof(GUID)); - memcpy(&This->pmt->subtype, &MEDIASUBTYPE_NULL, sizeof(GUID)); + This->pmt->majortype = MEDIATYPE_Stream; + This->pmt->subtype = MEDIASUBTYPE_NULL; hr = S_OK; } } @@ -751,7 +754,7 @@ return CONTAINING_RECORD(iface, FileAsyncReader, pin); } -static inline BaseOutputPin *impl_BaseOututPin_from_BasePin(BasePin *iface) +static inline BaseOutputPin *impl_BaseOutputPin_from_BasePin(BasePin *iface) { return CONTAINING_RECORD(iface, BaseOutputPin, pin); } @@ -867,7 +870,7 @@ * doesn't need the IMemInputPin interface on the receiving pin */ static HRESULT WINAPI FileAsyncReaderPin_AttemptConnection(BasePin * iface, IPin * pReceivePin, const AM_MEDIA_TYPE * pmt) { - BaseOutputPin *This = impl_BaseOututPin_from_BasePin(iface); + BaseOutputPin *This = impl_BaseOutputPin_from_BasePin(iface); HRESULT hr; TRACE("(%p, %p)\n", pReceivePin, pmt); Modified: trunk/reactos/dll/directx/wine/quartz/filtermapper.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/fi… ============================================================================== --- trunk/reactos/dll/directx/wine/quartz/filtermapper.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/quartz/filtermapper.c [iso-8859-1] Sat Jul 2 15:56:39 2016 @@ -1141,7 +1141,8 @@ HRESULT hr; TRACE("(%p/%p)->(%p, %x, %s, %s, %s, %s, %s, %s, %s) stub!\n", - iface,This, + This, + iface, ppEnum, dwMerit, bInputNeeded ? "true" : "false", Modified: trunk/reactos/dll/directx/wine/quartz/pin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/pi… ============================================================================== --- trunk/reactos/dll/directx/wine/quartz/pin.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/quartz/pin.c [iso-8859-1] Sat Jul 2 15:56:39 2016 @@ -20,8 +20,6 @@ #include "quartz_private.h" -static const IPinVtbl PullPin_Vtbl; - #define ALIGNDOWN(value,boundary) ((value)/(boundary)*(boundary)) #define ALIGNUP(value,boundary) (ALIGNDOWN((value)+(boundary)-1, (boundary))) Modified: trunk/reactos/dll/directx/wine/quartz/videorenderer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/vi… ============================================================================== --- trunk/reactos/dll/directx/wine/quartz/videorenderer.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/quartz/videorenderer.c [iso-8859-1] Sat Jul 2 15:56:39 2016 @@ -164,7 +164,7 @@ AdjustWindowRectEx(&This->WindowPos, style, FALSE, style_ex); - TRACE("WindowPos: %d %d %d %d\n", This->WindowPos.left, This->WindowPos.top, This->WindowPos.right, This->WindowPos.bottom); + TRACE("WindowPos: %s\n", wine_dbgstr_rect(&This->WindowPos)); SetWindowPos(This->baseControlWindow.baseWindow.hWnd, NULL, This->WindowPos.left, This->WindowPos.top, @@ -222,8 +222,8 @@ return E_FAIL; } - TRACE("Src Rect: %d %d %d %d\n", This->SourceRect.left, This->SourceRect.top, This->SourceRect.right, This->SourceRect.bottom); - TRACE("Dst Rect: %d %d %d %d\n", This->DestRect.left, This->DestRect.top, This->DestRect.right, This->DestRect.bottom); + TRACE("Src Rect: %s\n", wine_dbgstr_rect(&This->SourceRect)); + TRACE("Dst Rect: %s\n", wine_dbgstr_rect(&This->DestRect)); StretchDIBits(This->baseControlWindow.baseWindow.hDC, This->DestRect.left, This->DestRect.top, This->DestRect.right -This->DestRect.left, This->DestRect.bottom - This->DestRect.top, This->SourceRect.left, This->SourceRect.top, @@ -410,9 +410,7 @@ VideoRendererImpl *This = impl_from_BaseWindow(iface); static RECT defRect; - defRect.left = defRect.top = 0; - defRect.right = This->VideoWidth; - defRect.bottom = This->VideoHeight; + SetRect(&defRect, 0, 0, This->VideoWidth, This->VideoHeight); return defRect; } @@ -576,10 +574,7 @@ { VideoRendererImpl *This = impl_from_BaseControlVideo(iface); - This->SourceRect.left = 0; - This->SourceRect.top = 0; - This->SourceRect.right = This->VideoWidth; - This->SourceRect.bottom = This->VideoHeight; + SetRect(&This->SourceRect, 0, 0, This->VideoWidth, This->VideoHeight); return S_OK; } @@ -592,10 +587,7 @@ if (!GetClientRect(This->baseControlWindow.baseWindow.hWnd, &rect)) return E_FAIL; - This->DestRect.left = 0; - This->DestRect.top = 0; - This->DestRect.right = rect.right; - This->DestRect.bottom = rect.bottom; + SetRect(&This->DestRect, 0, 0, rect.right, rect.bottom); return S_OK; } Modified: trunk/reactos/dll/directx/wine/quartz/vmr9.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/vm… ============================================================================== --- trunk/reactos/dll/directx/wine/quartz/vmr9.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/quartz/vmr9.c [iso-8859-1] Sat Jul 2 15:56:39 2016 @@ -227,8 +227,8 @@ width = bmiHeader->biWidth; height = bmiHeader->biHeight; - TRACE("Src Rect: %d %d %d %d\n", This->source_rect.left, This->source_rect.top, This->source_rect.right, This->source_rect.bottom); - TRACE("Dst Rect: %d %d %d %d\n", This->target_rect.left, This->target_rect.top, This->target_rect.right, This->target_rect.bottom); + TRACE("Src Rect: %s\n", wine_dbgstr_rect(&This->source_rect)); + TRACE("Dst Rect: %s\n", wine_dbgstr_rect(&This->target_rect)); hr = IDirect3DSurface9_LockRect(info->lpSurf, &lock, NULL, D3DLOCK_DISCARD); if (FAILED(hr)) @@ -335,9 +335,9 @@ This->bmiheader = format->bmiHeader; TRACE("Resolution: %dx%d\n", format->bmiHeader.biWidth, format->bmiHeader.biHeight); - This->source_rect.right = This->VideoWidth = format->bmiHeader.biWidth; - This->source_rect.bottom = This->VideoHeight = format->bmiHeader.biHeight; - This->source_rect.top = This->source_rect.left = 0; + This->VideoWidth = format->bmiHeader.biWidth; + This->VideoHeight = format->bmiHeader.biHeight; + SetRect(&This->source_rect, 0, 0, This->VideoWidth, This->VideoHeight); } else if (IsEqualIID(&pmt->formattype, &FORMAT_VideoInfo2)) { @@ -346,9 +346,9 @@ This->bmiheader = format->bmiHeader; TRACE("Resolution: %dx%d\n", format->bmiHeader.biWidth, format->bmiHeader.biHeight); - This->source_rect.right = This->VideoWidth = format->bmiHeader.biWidth; - This->source_rect.bottom = This->VideoHeight = format->bmiHeader.biHeight; - This->source_rect.top = This->source_rect.left = 0; + This->VideoWidth = format->bmiHeader.biWidth; + This->VideoHeight = format->bmiHeader.biHeight; + SetRect(&This->source_rect, 0, 0, This->VideoWidth, This->VideoHeight); } else { @@ -408,9 +408,7 @@ hr = IVMRSurfaceAllocatorEx9_InitializeDevice(This->allocator, This->cookie, &info, &buffers); if (SUCCEEDED(hr)) { - This->source_rect.left = This->source_rect.top = 0; - This->source_rect.right = This->bmiheader.biWidth; - This->source_rect.bottom = This->bmiheader.biHeight; + SetRect(&This->source_rect, 0, 0, This->bmiheader.biWidth, This->bmiheader.biHeight); This->num_surfaces = buffers; } @@ -526,9 +524,7 @@ struct quartz_vmr* pVMR9 = impl_from_BaseWindow(This); static RECT defRect; - defRect.left = defRect.top = 0; - defRect.right = pVMR9->VideoWidth; - defRect.bottom = pVMR9->VideoHeight; + SetRect(&defRect, 0, 0, pVMR9->VideoWidth, pVMR9->VideoHeight); return defRect; } @@ -670,10 +666,7 @@ { struct quartz_vmr* pVMR9 = impl_from_BaseControlVideo(This); - pVMR9->source_rect.left = 0; - pVMR9->source_rect.top = 0; - pVMR9->source_rect.right = pVMR9->VideoWidth; - pVMR9->source_rect.bottom = pVMR9->VideoHeight; + SetRect(&pVMR9->source_rect, 0, 0, pVMR9->VideoWidth, pVMR9->VideoHeight); return S_OK; } @@ -686,10 +679,7 @@ if (!GetClientRect(pVMR9->baseControlWindow.baseWindow.hWnd, &rect)) return E_FAIL; - pVMR9->target_rect.left = 0; - pVMR9->target_rect.top = 0; - pVMR9->target_rect.right = rect.right; - pVMR9->target_rect.bottom = rect.bottom; + SetRect(&pVMR9->target_rect, 0, 0, rect.right, rect.bottom); return S_OK; } @@ -1761,8 +1751,7 @@ This->target_rect = *dest; if (This->baseControlWindow.baseWindow.hWnd) { - FIXME("Output rectangle: starting at %dx%d, up to point %dx%d\n", - dest->left, dest->top, dest->right, dest->bottom); + FIXME("Output rectangle: %s\n", wine_dbgstr_rect(dest)); SetWindowPos(This->baseControlWindow.baseWindow.hWnd, NULL, dest->left, dest->top, dest->right - dest->left, dest->bottom-dest->top, SWP_NOACTIVATE|SWP_NOCOPYBITS|SWP_NOOWNERZORDER|SWP_NOREDRAW); @@ -1966,7 +1955,7 @@ This->target_rect = *dest; if (This->baseControlWindow.baseWindow.hWnd) { - FIXME("Output rectangle: starting at %dx%d, up to point %dx%d\n", dest->left, dest->top, dest->right, dest->bottom); + FIXME("Output rectangle: %s\n", wine_dbgstr_rect(dest)); SetWindowPos(This->baseControlWindow.baseWindow.hWnd, NULL, dest->left, dest->top, dest->right - dest->left, dest->bottom-dest->top, SWP_NOACTIVATE|SWP_NOCOPYBITS|SWP_NOOWNERZORDER|SWP_NOREDRAW); } @@ -2584,14 +2573,9 @@ return hr; } - target_rect = This->pVMR9->target_rect; - target_rect.right -= target_rect.left; - target_rect.bottom -= target_rect.top; - target_rect.left = target_rect.top = 0; - - /* Flip */ - target_rect.top = target_rect.bottom; - target_rect.bottom = 0; + /* Move rect to origin and flip it */ + SetRect(&target_rect, 0, This->pVMR9->target_rect.bottom - This->pVMR9->target_rect.top, + This->pVMR9->target_rect.right - This->pVMR9->target_rect.left, 0); hr = IDirect3DDevice9_StretchRect(This->d3d9_dev, surface, &This->pVMR9->source_rect, target, &target_rect, D3DTEXF_LINEAR); if (FAILED(hr)) @@ -2610,7 +2594,7 @@ TRACE("(%p/%p/%p)->(...) stub\n", iface, This, This->pVMR9); GetWindowRect(This->pVMR9->baseControlWindow.baseWindow.hWnd, &output); - TRACE("Output rectangle: starting at %dx%d, up to point %dx%d\n", output.left, output.top, output.right, output.bottom); + TRACE("Output rectangle: %s\n", wine_dbgstr_rect(&output)); /* This might happen if we don't have active focus (eg on a different virtual desktop) */ if (!This->d3d9_dev) Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat Jul 2 15:56:39 2016 @@ -39,7 +39,7 @@ reactos/dll/directx/wine/dxdiagn # Synced to WineStaging-1.9.4 reactos/dll/directx/wine/msdmo # Synced to WineStaging-1.9.4 reactos/dll/directx/wine/qedit # Synced to WineStaging-1.9.11 -reactos/dll/directx/wine/quartz # Synced to WineStaging-1.9.4 +reactos/dll/directx/wine/quartz # Synced to WineStaging-1.9.11 reactos/dll/directx/wine/wined3d # Synced to WineStaging-1.9.4 reactos/dll/win32/activeds # Synced to WineStaging-1.9.4

1 0

[akhaldi] 71763: [QEDIT_WINETEST] Sync with Wine Staging 1.9.11. CORE-11368
by akhaldi＠svn.reactos.org 02 Jul '16

02 Jul '16

Author: akhaldi Date: Sat Jul 2 15:52:42 2016 New Revision: 71763 URL: http://svn.reactos.org/svn/reactos?rev=71763&view=rev Log: [QEDIT_WINETEST] Sync with Wine Staging 1.9.11. CORE-11368 Modified: trunk/rostests/winetests/qedit/mediadet.c Modified: trunk/rostests/winetests/qedit/mediadet.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/qedit/mediadet.… ============================================================================== --- trunk/rostests/winetests/qedit/mediadet.c [iso-8859-1] (original) +++ trunk/rostests/winetests/qedit/mediadet.c [iso-8859-1] Sat Jul 2 15:52:42 2016 @@ -353,6 +353,174 @@ DeleteFileW(test_sound_avi_filename); } +static HRESULT WINAPI ms_QueryInterface(IMediaSample *iface, REFIID riid, + void **ppvObject) +{ + return E_NOTIMPL; +} + +static ULONG WINAPI ms_AddRef(IMediaSample *iface) +{ + return 2; +} + +static ULONG WINAPI ms_Release(IMediaSample *iface) +{ + return 1; +} + +static HRESULT WINAPI ms_GetPointer(IMediaSample *iface, BYTE **ppBuffer) +{ + return E_NOTIMPL; +} + +static LONG WINAPI ms_GetSize(IMediaSample *iface) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI ms_GetTime(IMediaSample *iface, REFERENCE_TIME *pTimeStart, + REFERENCE_TIME *pTimeEnd) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI ms_SetTime(IMediaSample *iface, REFERENCE_TIME *pTimeStart, + REFERENCE_TIME *pTimeEnd) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI ms_IsSyncPoint(IMediaSample *iface) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI ms_SetSyncPoint(IMediaSample *iface, BOOL bIsSyncPoint) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI ms_IsPreroll(IMediaSample *iface) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI ms_SetPreroll(IMediaSample *iface, BOOL bIsPreroll) +{ + return E_NOTIMPL; +} + +static LONG WINAPI ms_GetActualDataLength(IMediaSample *iface) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI ms_SetActualDataLength(IMediaSample *iface, LONG length) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI ms_GetMediaType(IMediaSample *iface, AM_MEDIA_TYPE + **ppMediaType) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI ms_SetMediaType(IMediaSample *iface, AM_MEDIA_TYPE *pMediaType) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI ms_IsDiscontinuity(IMediaSample *iface) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI ms_SetDiscontinuity(IMediaSample *iface, BOOL bDiscontinuity) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI ms_GetMediaTime(IMediaSample *iface, LONGLONG *pTimeStart, + LONGLONG *pTimeEnd) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI ms_SetMediaTime(IMediaSample *iface, LONGLONG *pTimeStart, + LONGLONG *pTimeEnd) +{ + return E_NOTIMPL; +} + +static const IMediaSampleVtbl my_sample_vt = { + ms_QueryInterface, + ms_AddRef, + ms_Release, + ms_GetPointer, + ms_GetSize, + ms_GetTime, + ms_SetTime, + ms_IsSyncPoint, + ms_SetSyncPoint, + ms_IsPreroll, + ms_SetPreroll, + ms_GetActualDataLength, + ms_SetActualDataLength, + ms_GetMediaType, + ms_SetMediaType, + ms_IsDiscontinuity, + ms_SetDiscontinuity, + ms_GetMediaTime, + ms_SetMediaTime +}; + +static IMediaSample my_sample = { &my_sample_vt }; + +static BOOL samplecb_called = FALSE; + +static HRESULT WINAPI sgcb_QueryInterface(ISampleGrabberCB *iface, REFIID riid, + void **ppvObject) +{ + return E_NOTIMPL; +} + +static ULONG WINAPI sgcb_AddRef(ISampleGrabberCB *iface) +{ + return E_NOTIMPL; +} + +static ULONG WINAPI sgcb_Release(ISampleGrabberCB *iface) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI sgcb_SampleCB(ISampleGrabberCB *iface, double SampleTime, + IMediaSample *pSample) +{ + ok(pSample == &my_sample, "Got wrong IMediaSample: %p, expected %p\n", pSample, &my_sample); + samplecb_called = TRUE; + return E_NOTIMPL; +} + +static HRESULT WINAPI sgcb_BufferCB(ISampleGrabberCB *iface, double SampleTime, + BYTE *pBuffer, LONG BufferLen) +{ + ok(0, "BufferCB should not have been called\n"); + return E_NOTIMPL; +} + +static const ISampleGrabberCBVtbl sgcb_vt = { + sgcb_QueryInterface, + sgcb_AddRef, + sgcb_Release, + sgcb_SampleCB, + sgcb_BufferCB +}; + +static ISampleGrabberCB my_sg_cb = { &sgcb_vt }; + static void test_samplegrabber(void) { struct unk_impl unk_obj = {{&unk_vtbl}, 19, NULL}; @@ -361,8 +529,12 @@ IMediaFilter *mf; IPersist *persist; IUnknown *unk; + IPin *pin; + IMemInputPin *inpin; + IEnumPins *pins; ULONG refcount; HRESULT hr; + FILTER_STATE fstate; /* COM aggregation */ hr = CoCreateInstance(&CLSID_SampleGrabber, &unk_obj.IUnknown_iface, CLSCTX_INPROC_SERVER, @@ -414,6 +586,31 @@ refcount = IUnknown_AddRef(unk); ok(refcount == 7, "refcount == %u, expected 7\n", refcount); refcount = IUnknown_Release(unk); + + hr = ISampleGrabber_SetCallback(sg, &my_sg_cb, 0); + ok(hr == S_OK, "SetCallback failed: %08x\n", hr); + + hr = IBaseFilter_GetState(bf, 100, &fstate); + ok(hr == S_OK, "Failed to get filter state: %08x\n", hr); + ok(fstate == State_Stopped, "Got wrong filter state: %u\n", fstate); + + hr = IBaseFilter_EnumPins(bf, &pins); + ok(hr == S_OK, "EnumPins create failed: %08x, expected S_OK\n", hr); + + hr = IEnumPins_Next(pins, 1, &pin, NULL); + ok(hr == S_OK, "Next failed: %08x\n", hr); + + IEnumPins_Release(pins); + + hr = IPin_QueryInterface(pin, &IID_IMemInputPin, (void**)&inpin); + ok(hr == S_OK, "QueryInterface(IMemInputPin) failed: %08x\n", hr); + + hr = IMemInputPin_Receive(inpin, &my_sample); + ok(hr == S_OK, "Receive failed: %08x\n", hr); + ok(samplecb_called == TRUE, "SampleCB should have been called\n"); + + IMemInputPin_Release(inpin); + IPin_Release(pin); /* Interfaces that native does not support */ hr = ISampleGrabber_QueryInterface(sg, &IID_IMediaPosition, (void**)&unk);

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs