Ros-diffs September 2014

ros-diffs@reactos.org

16 participants
413 discussions

[tkreuzer] 64370: [GDI32_APITEST] - Add tests for OffsetClipRgn - Imporve ExcludeClipRect tests

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Sep 28 18:24:58 2014 New Revision: 64370 URL: http://svn.reactos.org/svn/reactos?rev=64370&view=rev Log: [GDI32_APITEST] - Add tests for OffsetClipRgn - Imporve ExcludeClipRect tests Added: trunk/rostests/apitests/gdi32/OffsetClipRgn.c (with props) Modified: trunk/rostests/apitests/gdi32/CMakeLists.txt trunk/rostests/apitests/gdi32/ExcludeClipRect.c trunk/rostests/apitests/gdi32/testlist.c Modified: trunk/rostests/apitests/gdi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/CMakeLists… ============================================================================== --- trunk/rostests/apitests/gdi32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/CMakeLists.txt [iso-8859-1] Sun Sep 28 18:24:58 2014 @@ -48,6 +48,7 @@ GetTextExtentExPoint.c GetTextFace.c MaskBlt.c + OffsetClipRgn.c PatBlt.c Rectangle.c SelectObject.c Modified: trunk/rostests/apitests/gdi32/ExcludeClipRect.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/ExcludeCli… ============================================================================== --- trunk/rostests/apitests/gdi32/ExcludeClipRect.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/ExcludeClipRect.c [iso-8859-1] Sun Sep 28 18:24:58 2014 @@ -44,12 +44,12 @@ hrgn = CreateRectRgn(10, 10, 20, 30); ok_int(SelectClipRgn(hdc, hrgn), NULLREGION); // yeah... it's NULLREGION ok_int(GetRandomRgn(hdc, hrgn2, CLIPRGN), 1); - ok_int(CombineRgn(hrgn2, hrgn2, hrgn, RGN_XOR), NULLREGION); // but in fact it's a rect region! + ok_int(EqualRgn(hrgn, hrgn2), TRUE); // but in fact it's the region we set /* Exclude something outside of the clip region */ ok_int(ExcludeClipRect(hdc, 0, 0, 1, 1), COMPLEXREGION); // in reality it's a rect region ok_int(GetRandomRgn(hdc, hrgn2, CLIPRGN), 1); - ok_int(CombineRgn(hrgn2, hrgn2, hrgn, RGN_XOR), NULLREGION); + ok_int(EqualRgn(hrgn, hrgn2), TRUE); /* Exclude something on one side of the clip rect */ ok_int(ExcludeClipRect(hdc, 0, 0, 13, 50), COMPLEXREGION); @@ -85,7 +85,8 @@ ok_int(ExcludeClipRect(hdc, 100000, 100000, 100010, 100010), COMPLEXREGION); // this time it's a complex region? ok_int(GetRandomRgn(hdc, hrgn2, CLIPRGN), 1); hrgn = CreateRectRgn(0, 0, 1, 1); - ok_int(CombineRgn(hrgn2, hrgn2, hrgn, RGN_XOR), NULLREGION); + ok_int(EqualRgn(hrgn, hrgn2), TRUE); + DeleteObject(hrgn); /* Test reversed rect negative, but still above 0 */ ok_int(SelectClipRgn(hdc, NULL), SIMPLEREGION); Added: trunk/rostests/apitests/gdi32/OffsetClipRgn.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/OffsetClip… ============================================================================== --- trunk/rostests/apitests/gdi32/OffsetClipRgn.c (added) +++ trunk/rostests/apitests/gdi32/OffsetClipRgn.c [iso-8859-1] Sun Sep 28 18:24:58 2014 @@ -0,0 +1,79 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPL - See COPYING in the top level directory + * PURPOSE: Test for OffsetClipRgn + * PROGRAMMERS: Timo Kreuzer + */ + +#include <apitest.h> +#include <wingdi.h> + +#define CLIPRGN 1 + +void Test_OffsetClipRgn() +{ + HDC hdc; + HRGN hrgn, hrgn2; + //RECT rect; + + hdc = CreateCompatibleDC(NULL); + ok(hdc != 0, "CreateCompatibleDC failed, skipping tests.\n"); + if (!hdc) return; + + hrgn2 = CreateRectRgn(0, 0, 0, 0); + + /* Test NULL DC */ + SetLastError(0x12345); + ok_int(OffsetClipRgn(NULL, 0, 0), ERROR); + ok_int(GetLastError(), ERROR_INVALID_HANDLE); + + /* Test invalid DC */ + SetLastError(0x12345); + ok_int(OffsetClipRgn((HDC)(ULONG_PTR)0x12345, 0, 0), ERROR); + ok_int(GetLastError(), 0x12345); + SetLastError(0x12345); + + /* Test without a clip region set */ + SetLastError(0x12345); + ok_int(SelectClipRgn(hdc, NULL), SIMPLEREGION); + ok_int(OffsetClipRgn(hdc, 0, 0), SIMPLEREGION); + ok_int(GetLastError(), 0x12345); + SetLastError(0x12345); + + /* Set a clip region */ + hrgn = CreateRectRgn(10, 10, 20, 30); + ok_int(SelectClipRgn(hdc, hrgn), NULLREGION); + DeleteObject(hrgn); + ok_int(OffsetClipRgn(hdc, 10, 10), SIMPLEREGION); + ok_int(GetRandomRgn(hdc, hrgn2, CLIPRGN), 1); + hrgn = CreateRectRgn(20, 20, 30, 40); + ok_int(EqualRgn(hrgn, hrgn2), TRUE); + + /* Set different scaling */ + SetMapMode(hdc, MM_ANISOTROPIC); + ok_int(SetViewportExtEx(hdc, 100, 100, NULL), 1); + ok_int(SetWindowExtEx(hdc, 200, 50, NULL), 1); + ok_int(OffsetClipRgn(hdc, 10, 10), SIMPLEREGION); + ok_int(GetRandomRgn(hdc, hrgn2, CLIPRGN), 1); + hrgn = CreateRectRgn(25, 40, 35, 60); + ok_int(EqualRgn(hrgn, hrgn2), TRUE); + +#if 0 + /* Set different scaling */ + SetMapMode(hdc, MM_ANISOTROPIC); + ok_int(SetViewportExtEx(hdc, 100, 100, NULL), 1); + ok_int(SetWindowExtEx(hdc, 80, 350, NULL), 1); + ok_int(OffsetClipRgn(hdc, 10, 10), SIMPLEREGION); + ok_int(GetRandomRgn(hdc, hrgn2, CLIPRGN), 1); + hrgn = CreateRectRgn(33, 23, 43, 43); + ok_int(EqualRgn(hrgn, hrgn2), TRUE); +#endif + + ok_int(GetLastError(), 0x12345); + +} + +START_TEST(OffsetClipRgn) +{ + Test_OffsetClipRgn(); +} Propchange: trunk/rostests/apitests/gdi32/OffsetClipRgn.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/gdi32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/testlist.c… ============================================================================== --- trunk/rostests/apitests/gdi32/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/testlist.c [iso-8859-1] Sun Sep 28 18:24:58 2014 @@ -49,6 +49,7 @@ extern void func_GetTextExtentExPoint(void); extern void func_GetTextFace(void); extern void func_MaskBlt(void); +extern void func_OffsetClipRgn(void); extern void func_PatBlt(void); extern void func_Rectangle(void); extern void func_SelectObject(void); @@ -110,6 +111,7 @@ { "GetTextExtentExPoint", func_GetTextExtentExPoint }, { "GetTextFace", func_GetTextFace }, { "MaskBlt", func_MaskBlt }, + { "OffsetClipRgn", func_OffsetClipRgn }, { "PatBlt", func_PatBlt }, { "Rectangle", func_Rectangle }, { "SelectObject", func_SelectObject },

9 years, 11 months

[tkreuzer] 64369: [NTOSKNRL] Improve performance of FsRtlIsNameInExpression by using a stack buffer for backtracking of wildcard expressions. See also CR-60

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Sep 28 18:17:14 2014 New Revision: 64369 URL: http://svn.reactos.org/svn/reactos?rev=64369&view=rev Log: [NTOSKNRL] Improve performance of FsRtlIsNameInExpression by using a stack buffer for backtracking of wildcard expressions. See also CR-60 Modified: trunk/reactos/ntoskrnl/fsrtl/name.c Modified: trunk/reactos/ntoskrnl/fsrtl/name.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fsrtl/name.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/fsrtl/name.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fsrtl/name.c [iso-8859-1] Sun Sep 28 18:17:14 2014 @@ -24,7 +24,10 @@ IN PWCHAR UpcaseTable OPTIONAL) { SHORT StarFound = -1, DosStarFound = -1; - PUSHORT BackTracking = NULL, DosBackTracking = NULL; + USHORT BackTrackingBuffer[5], DosBackTrackingBuffer[5]; + PUSHORT BackTracking = BackTrackingBuffer, DosBackTracking = DosBackTrackingBuffer; + SHORT BackTrackingSize = RTL_NUMBER_OF(BackTrackingBuffer); + SHORT DosBackTrackingSize = RTL_NUMBER_OF(DosBackTrackingBuffer); UNICODE_STRING IntExpression; USHORT ExpressionPosition = 0, NamePosition = 0, MatchingChars, LastDot; WCHAR CompareChar; @@ -127,23 +130,28 @@ ExpressionPosition++; } - /* Save star position */ - if (!BackTracking) - { - BackTracking = ExAllocatePoolWithTag(PagedPool | POOL_RAISE_IF_ALLOCATION_FAILURE, - (Expression->Length / sizeof(WCHAR)) * sizeof(USHORT), - 'nrSF'); - } - BackTracking[++StarFound] = ExpressionPosition++; - /* If star is at the end, then eat all rest and leave */ if (ExpressionPosition == Expression->Length / sizeof(WCHAR)) { NamePosition = Name->Length / sizeof(WCHAR); break; } + + /* Save star position */ + StarFound++; + if (StarFound >= BackTrackingSize) + { + BackTrackingSize = Expression->Length / sizeof(WCHAR); + BackTracking = ExAllocatePoolWithTag(PagedPool | POOL_RAISE_IF_ALLOCATION_FAILURE, + BackTrackingSize * sizeof(USHORT), + 'nrSF'); + RtlCopyMemory(BackTracking, BackTrackingBuffer, sizeof(BackTrackingBuffer)); + + } + BackTracking[StarFound] = ExpressionPosition++; + /* Allow null matching */ - else if (Expression->Buffer[ExpressionPosition] != L'?' && + if (Expression->Buffer[ExpressionPosition] != L'?' && Expression->Buffer[ExpressionPosition] != Name->Buffer[NamePosition]) { NamePosition++; @@ -179,10 +187,16 @@ */ if (MatchingChars != Name->Length || LastDot == (USHORT)-1) { - if (!DosBackTracking) DosBackTracking = ExAllocatePoolWithTag(PagedPool | POOL_RAISE_IF_ALLOCATION_FAILURE, - (Expression->Length / sizeof(WCHAR)) * sizeof(USHORT), - 'nrSF'); - DosBackTracking[++DosStarFound] = ExpressionPosition++; + DosStarFound++; + if (DosStarFound >= DosBackTrackingSize) + { + DosBackTrackingSize = Expression->Length / sizeof(WCHAR); + DosBackTracking = ExAllocatePoolWithTag(PagedPool | POOL_RAISE_IF_ALLOCATION_FAILURE, + DosBackTrackingSize * sizeof(USHORT), + 'nrSF'); + RtlCopyMemory(DosBackTracking, DosBackTrackingBuffer, sizeof(DosBackTrackingBuffer)); + } + DosBackTracking[DosStarFound] = ExpressionPosition++; /* Not the same char, start exploring */ if (Expression->Buffer[ExpressionPosition] != Name->Buffer[NamePosition]) @@ -206,7 +220,7 @@ NamePosition++; } /* Try to explore later on for null matching */ - else if ((ExpressionPosition + 1 < (USHORT)(Expression->Length / sizeof(WCHAR))) && + else if ((ExpressionPosition + 1 < (USHORT)(Expression->Length / sizeof(WCHAR))) && (Name->Buffer[NamePosition] == Expression->Buffer[ExpressionPosition + 1])) { NamePosition++; @@ -262,11 +276,11 @@ } } - if (BackTracking) + if (BackTracking != BackTrackingBuffer) { ExFreePoolWithTag(BackTracking, 'nrSF'); } - if (DosBackTracking) + if (DosBackTracking != DosBackTrackingBuffer) { ExFreePoolWithTag(DosBackTracking, 'nrSF'); }

9 years, 11 months

[aandrejevic] 64368: [NTVDM] Fix the calculation of TotalSize in DosCopyEnvironmentBlock. Return the correct error code in DosLoadExecutable.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Sun Sep 28 17:27:54 2014 New Revision: 64368 URL: http://svn.reactos.org/svn/reactos?rev=64368&view=rev Log: [NTVDM] Fix the calculation of TotalSize in DosCopyEnvironmentBlock. Return the correct error code in DosLoadExecutable. Modified: trunk/reactos/subsystems/ntvdm/dos/dos32krnl/dos.c Modified: trunk/reactos/subsystems/ntvdm/dos/dos32krnl/dos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/dos/dos32… ============================================================================== --- trunk/reactos/subsystems/ntvdm/dos/dos32krnl/dos.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/dos/dos32krnl/dos.c [iso-8859-1] Sun Sep 28 17:27:54 2014 @@ -418,6 +418,9 @@ /* Add the string buffer size */ TotalSize += strlen(ProgramName) + 1; + + /* Add the two extra bytes */ + TotalSize += 2; /* Allocate the memory for the environment block */ DestSegment = DosAllocateMemory((WORD)((TotalSize + 0x0F) >> 4), NULL); @@ -1012,7 +1015,7 @@ /* Check if at least the lowest allocation was successful */ if (Segment == 0) { - Result = ERROR_NOT_ENOUGH_MEMORY; + Result = DosLastError; goto Cleanup; } @@ -1081,7 +1084,7 @@ Segment = DosAllocateMemory(MaxAllocSize, NULL); if (Segment == 0) { - Result = ERROR_ARENA_TRASHED; + Result = DosLastError; goto Cleanup; }

9 years, 11 months

[hbelusca] 64367: [NTVDM] - Add the possibility to dump the VM memory either in text or binary mode. - Initialize the VM memory to 0xFF to track potential memory misuses (diagnostics purposes). Thi...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Sep 28 16:27:30 2014 New Revision: 64367 URL: http://svn.reactos.org/svn/reactos?rev=64367&view=rev Log: [NTVDM] - Add the possibility to dump the VM memory either in text or binary mode. - Initialize the VM memory to 0xFF to track potential memory misuses (diagnostics purposes). Things may crash, or not! Modified: trunk/reactos/subsystems/ntvdm/emulator.c trunk/reactos/subsystems/ntvdm/emulator.h trunk/reactos/subsystems/ntvdm/lang/cs-CZ.rc trunk/reactos/subsystems/ntvdm/lang/de-DE.rc trunk/reactos/subsystems/ntvdm/lang/en-US.rc trunk/reactos/subsystems/ntvdm/lang/es-ES.rc trunk/reactos/subsystems/ntvdm/lang/fr-FR.rc trunk/reactos/subsystems/ntvdm/lang/it-IT.rc trunk/reactos/subsystems/ntvdm/lang/pl-PL.rc trunk/reactos/subsystems/ntvdm/lang/ro-RO.rc trunk/reactos/subsystems/ntvdm/lang/ru-RU.rc trunk/reactos/subsystems/ntvdm/ntvdm.c trunk/reactos/subsystems/ntvdm/resource.h Modified: trunk/reactos/subsystems/ntvdm/emulator.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/emulator.… ============================================================================== --- trunk/reactos/subsystems/ntvdm/emulator.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/emulator.c [iso-8859-1] Sun Sep 28 16:27:30 2014 @@ -430,13 +430,22 @@ /* PUBLIC FUNCTIONS ***********************************************************/ -VOID DumpMemory(VOID) -{ - static ULONG DumpNumber = 0; - - HANDLE hFile; - WCHAR FileName[MAX_PATH]; - +static VOID +DumpMemoryRaw(HANDLE hFile) +{ + PVOID Buffer; + SIZE_T Size; + + /* Dump the VM memory */ + SetFilePointer(hFile, 0, NULL, FILE_BEGIN); + Buffer = REAL_TO_PHYS(NULL); + Size = MAX_ADDRESS - (ULONG_PTR)(NULL); + WriteFile(hFile, Buffer, Size, &Size, NULL); +} + +static VOID +DumpMemoryTxt(HANDLE hFile) +{ #define LINE_SIZE 75 + 2 ULONG i; PBYTE Ptr1, Ptr2; @@ -444,8 +453,61 @@ PCHAR Line; SIZE_T LineSize; + /* Dump the VM memory */ + SetFilePointer(hFile, 0, NULL, FILE_BEGIN); + Ptr1 = Ptr2 = REAL_TO_PHYS(NULL); + while (MAX_ADDRESS - (ULONG_PTR)PHYS_TO_REAL(Ptr1) > 0) + { + Ptr1 = Ptr2; + Line = LineBuffer; + + /* Print the address */ + Line += snprintf(Line, LINE_SIZE + LineBuffer - Line, "%08x ", PHYS_TO_REAL(Ptr1)); + + /* Print up to 16 bytes... */ + + /* ... in hexadecimal form first... */ + i = 0; + while (i++ <= 0x0F && (MAX_ADDRESS - (ULONG_PTR)PHYS_TO_REAL(Ptr1) > 0)) + { + Line += snprintf(Line, LINE_SIZE + LineBuffer - Line, " %02x", *Ptr1); + ++Ptr1; + } + + /* ... align with spaces if needed... */ + RtlFillMemory(Line, 0x0F + 4 - i, ' '); + Line += 0x0F + 4 - i; + + /* ... then in character form. */ + i = 0; + while (i++ <= 0x0F && (MAX_ADDRESS - (ULONG_PTR)PHYS_TO_REAL(Ptr2) > 0)) + { + *Line++ = ((*Ptr2 >= 0x20 && *Ptr2 <= 0x7E) || (*Ptr2 >= 0x80 && *Ptr2 < 0xFF) ? *Ptr2 : '.'); + ++Ptr2; + } + + /* Newline */ + *Line++ = '\r'; + *Line++ = '\n'; + + /* Finally write the line to the file */ + LineSize = Line - LineBuffer; + WriteFile(hFile, LineBuffer, LineSize, &LineSize, NULL); + } +} + +VOID DumpMemory(BOOLEAN TextFormat) +{ + static ULONG DumpNumber = 0; + + HANDLE hFile; + WCHAR FileName[MAX_PATH]; + /* Build a suitable file name */ - _snwprintf(FileName, MAX_PATH, L"memdump%lu.txt", DumpNumber); + _snwprintf(FileName, MAX_PATH, + L"memdump%lu.%s", + DumpNumber, + TextFormat ? L"txt" : L"dat"); ++DumpNumber; DPRINT1("Creating memory dump file '%S'...\n", FileName); @@ -466,47 +528,11 @@ return; } - /* Dump the VM memory */ - SetFilePointer(hFile, 0, NULL, FILE_BEGIN); - Ptr1 = Ptr2 = REAL_TO_PHYS(NULL); - while (MAX_ADDRESS - (ULONG_PTR)PHYS_TO_REAL(Ptr1) > 0) - { - Ptr1 = Ptr2; - Line = LineBuffer; - - /* Print the address */ - Line += snprintf(Line, LINE_SIZE + LineBuffer - Line, "%08x ", PHYS_TO_REAL(Ptr1)); - - /* Print up to 16 bytes... */ - - /* ... in hexadecimal form first... */ - i = 0; - while (i++ <= 0x0F && (MAX_ADDRESS - (ULONG_PTR)PHYS_TO_REAL(Ptr1) > 0)) - { - Line += snprintf(Line, LINE_SIZE + LineBuffer - Line, " %02x", *Ptr1); - ++Ptr1; - } - - /* ... align with spaces if needed... */ - RtlFillMemory(Line, 0x0F + 4 - i, ' '); - Line += 0x0F + 4 - i; - - /* ... then in character form. */ - i = 0; - while (i++ <= 0x0F && (MAX_ADDRESS - (ULONG_PTR)PHYS_TO_REAL(Ptr2) > 0)) - { - *Line++ = ((*Ptr2 >= 0x20 && *Ptr2 <= 0x7E) || (*Ptr2 >= 0x80 && *Ptr2 < 0xFF) ? *Ptr2 : '.'); - ++Ptr2; - } - - /* Newline */ - *Line++ = '\r'; - *Line++ = '\n'; - - /* Finally write the line to the file */ - LineSize = Line - LineBuffer; - WriteFile(hFile, LineBuffer, LineSize, &LineSize, NULL); - } + /* Dump the VM memory in the chosen format */ + if (TextFormat) + DumpMemoryTxt(hFile); + else + DumpMemoryRaw(hFile); /* Close the file */ CloseHandle(hFile); @@ -517,12 +543,14 @@ BOOLEAN EmulatorInitialize(HANDLE ConsoleInput, HANDLE ConsoleOutput) { /* Allocate memory for the 16-bit address space */ - BaseAddress = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, MAX_ADDRESS); + BaseAddress = HeapAlloc(GetProcessHeap(), /*HEAP_ZERO_MEMORY*/ 0, MAX_ADDRESS); if (BaseAddress == NULL) { wprintf(L"FATAL: Failed to allocate VDM memory.\n"); return FALSE; } + // For diagnostics purposes!! + FillMemory(BaseAddress, MAX_ADDRESS, 0xFF); /* Initialize I/O ports */ /* Initialize RAM */ Modified: trunk/reactos/subsystems/ntvdm/emulator.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/emulator.… ============================================================================== --- trunk/reactos/subsystems/ntvdm/emulator.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/emulator.h [iso-8859-1] Sun Sep 28 16:27:30 2014 @@ -98,7 +98,7 @@ /* FUNCTIONS ******************************************************************/ -VOID DumpMemory(VOID); +VOID DumpMemory(BOOLEAN TextFormat); VOID WINAPI EmulatorReadMemory ( Modified: trunk/reactos/subsystems/ntvdm/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/lang/cs-C… ============================================================================== --- trunk/reactos/subsystems/ntvdm/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/lang/cs-CZ.rc [iso-8859-1] Sun Sep 28 16:27:30 2014 @@ -15,6 +15,7 @@ STRINGTABLE BEGIN - IDS_VDM_DUMPMEM, "Dump &Memory" - IDS_VDM_QUIT , "&UkonÄit ReactOS VDM" + IDS_VDM_DUMPMEM_TXT, "Dump Memory (&Text)" + IDS_VDM_DUMPMEM_BIN, "Dump Memory (&Binary)" + IDS_VDM_QUIT , "&UkonÄit ReactOS VDM" END Modified: trunk/reactos/subsystems/ntvdm/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/lang/de-D… ============================================================================== --- trunk/reactos/subsystems/ntvdm/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/lang/de-DE.rc [iso-8859-1] Sun Sep 28 16:27:30 2014 @@ -9,6 +9,7 @@ STRINGTABLE BEGIN - IDS_VDM_DUMPMEM, "Dump &Memory" - IDS_VDM_QUIT , "ReactOS VDM b&eenden" + IDS_VDM_DUMPMEM_TXT, "Dump Memory (&Text)" + IDS_VDM_DUMPMEM_BIN, "Dump Memory (&Binary)" + IDS_VDM_QUIT , "ReactOS VDM b&eenden" END Modified: trunk/reactos/subsystems/ntvdm/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/lang/en-U… ============================================================================== --- trunk/reactos/subsystems/ntvdm/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/lang/en-US.rc [iso-8859-1] Sun Sep 28 16:27:30 2014 @@ -9,6 +9,7 @@ STRINGTABLE BEGIN - IDS_VDM_DUMPMEM, "Dump &Memory" - IDS_VDM_QUIT , "&Quit the ReactOS VDM" + IDS_VDM_DUMPMEM_TXT, "Dump Memory (&Text)" + IDS_VDM_DUMPMEM_BIN, "Dump Memory (&Binary)" + IDS_VDM_QUIT , "&Quit the ReactOS VDM" END Modified: trunk/reactos/subsystems/ntvdm/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/lang/es-E… ============================================================================== --- trunk/reactos/subsystems/ntvdm/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/lang/es-ES.rc [iso-8859-1] Sun Sep 28 16:27:30 2014 @@ -9,6 +9,7 @@ STRINGTABLE BEGIN - IDS_VDM_DUMPMEM, "Dump &Memory" - IDS_VDM_QUIT , "&Salir de ReactOS VDM" + IDS_VDM_DUMPMEM_TXT, "Dump Memory (&Text)" + IDS_VDM_DUMPMEM_BIN, "Dump Memory (&Binary)" + IDS_VDM_QUIT , "&Salir de ReactOS VDM" END Modified: trunk/reactos/subsystems/ntvdm/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/lang/fr-F… ============================================================================== --- trunk/reactos/subsystems/ntvdm/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/lang/fr-FR.rc [iso-8859-1] Sun Sep 28 16:27:30 2014 @@ -9,6 +9,7 @@ STRINGTABLE BEGIN - IDS_VDM_DUMPMEM, "Vidage &MÃ©moire" - IDS_VDM_QUIT , "&Quitter la ReactOS VDM" + IDS_VDM_DUMPMEM_TXT, "Vidage MÃ©moire (&Texte)" + IDS_VDM_DUMPMEM_BIN, "Vidage MÃ©moire (&Binaire)" + IDS_VDM_QUIT , "&Quitter la ReactOS VDM" END Modified: trunk/reactos/subsystems/ntvdm/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/lang/it-I… ============================================================================== --- trunk/reactos/subsystems/ntvdm/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/lang/it-IT.rc [iso-8859-1] Sun Sep 28 16:27:30 2014 @@ -9,6 +9,7 @@ STRINGTABLE BEGIN - IDS_VDM_DUMPMEM, "Dump &Memory" - IDS_VDM_QUIT , "&Esci da ReactOS VDM" + IDS_VDM_DUMPMEM_TXT, "Dump Memory (&Text)" + IDS_VDM_DUMPMEM_BIN, "Dump Memory (&Binary)" + IDS_VDM_QUIT , "&Esci da ReactOS VDM" END Modified: trunk/reactos/subsystems/ntvdm/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/lang/pl-P… ============================================================================== --- trunk/reactos/subsystems/ntvdm/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/lang/pl-PL.rc [iso-8859-1] Sun Sep 28 16:27:30 2014 @@ -11,6 +11,7 @@ STRINGTABLE BEGIN - IDS_VDM_DUMPMEM, "Zrzut &PamiÄci" - IDS_VDM_QUIT , "&WyjdÅº z ReactOS VDM" + IDS_VDM_DUMPMEM_TXT, "Dump Memory (&Text)" + IDS_VDM_DUMPMEM_BIN, "Dump Memory (&Binary)" + IDS_VDM_QUIT , "&WyjdÅº z ReactOS VDM" END Modified: trunk/reactos/subsystems/ntvdm/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/lang/ro-R… ============================================================================== --- trunk/reactos/subsystems/ntvdm/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/lang/ro-RO.rc [iso-8859-1] Sun Sep 28 16:27:30 2014 @@ -9,5 +9,7 @@ STRINGTABLE BEGIN - IDS_VDM_QUIT, "I&eÈire din ReactOS VDM" + IDS_VDM_DUMPMEM_TXT, "Dump Memory (&Text)" + IDS_VDM_DUMPMEM_BIN, "Dump Memory (&Binary)" + IDS_VDM_QUIT , "I&eÈire din ReactOS VDM" END Modified: trunk/reactos/subsystems/ntvdm/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/lang/ru-R… ============================================================================== --- trunk/reactos/subsystems/ntvdm/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/lang/ru-RU.rc [iso-8859-1] Sun Sep 28 16:27:30 2014 @@ -9,6 +9,7 @@ STRINGTABLE BEGIN - IDS_VDM_DUMPMEM, "ÐÐ°Ð¼Ð¿ &Ð¿Ð°Ð¼ÑÑÐ¸" - IDS_VDM_QUIT , "&ÐÑÐ¹ÑÐ¸ Ð¸Ð· ReactOS VDM" + IDS_VDM_DUMPMEM_TXT, "Dump Memory (&Text)" + IDS_VDM_DUMPMEM_BIN, "Dump Memory (&Binary)" + IDS_VDM_QUIT , "&ÐÑÐ¹ÑÐ¸ Ð¸Ð· ReactOS VDM" END Modified: trunk/reactos/subsystems/ntvdm/ntvdm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/ntvdm.c?r… ============================================================================== --- trunk/reactos/subsystems/ntvdm/ntvdm.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/ntvdm.c [iso-8859-1] Sun Sep 28 16:27:30 2014 @@ -51,8 +51,9 @@ static const VDM_MENUITEM VdmMenuItems[] = { - { IDS_VDM_DUMPMEM, NULL, ID_VDM_DUMPMEM }, - { IDS_VDM_QUIT , NULL, ID_VDM_QUIT }, + { IDS_VDM_DUMPMEM_TXT, NULL, ID_VDM_DUMPMEM_TXT }, + { IDS_VDM_DUMPMEM_BIN, NULL, ID_VDM_DUMPMEM_BIN }, + { IDS_VDM_QUIT , NULL, ID_VDM_QUIT }, { 0, NULL, 0 } /* End of list */ }; @@ -337,8 +338,12 @@ ShowPointer = !ShowPointer; break; - case ID_VDM_DUMPMEM: - DumpMemory(); + case ID_VDM_DUMPMEM_TXT: + DumpMemory(TRUE); + break; + + case ID_VDM_DUMPMEM_BIN: + DumpMemory(FALSE); break; case ID_VDM_QUIT: Modified: trunk/reactos/subsystems/ntvdm/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/resource.… ============================================================================== --- trunk/reactos/subsystems/ntvdm/resource.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/resource.h [iso-8859-1] Sun Sep 28 16:27:30 2014 @@ -2,16 +2,18 @@ /* Menu IDs */ #define ID_SHOWHIDE_MOUSE 1000 -#define ID_VDM_DUMPMEM 1001 -#define ID_VDM_QUIT 1002 +#define ID_VDM_DUMPMEM_TXT 1001 +#define ID_VDM_DUMPMEM_BIN 1002 +#define ID_VDM_QUIT 1003 /* String IDs */ #define IDS_HIDE_MOUSE 100 #define IDS_SHOW_MOUSE 101 #define IDS_VDM_MENU 102 -#define IDS_VDM_DUMPMEM 200 -#define IDS_VDM_QUIT 201 +#define IDS_VDM_DUMPMEM_TXT 200 +#define IDS_VDM_DUMPMEM_BIN 201 +#define IDS_VDM_QUIT 202 /* Icon */ #define IDI_APPICON 1

9 years, 11 months

[ekohl] 64366: [INCLUDE] Add LsaGetLogonSessionData prototype.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Sep 28 15:30:50 2014 New Revision: 64366 URL: http://svn.reactos.org/svn/reactos?rev=64366&view=rev Log: [INCLUDE] Add LsaGetLogonSessionData prototype. Modified: trunk/reactos/include/psdk/ntsecapi.h Modified: trunk/reactos/include/psdk/ntsecapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntsecapi.h?re… ============================================================================== --- trunk/reactos/include/psdk/ntsecapi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ntsecapi.h [iso-8859-1] Sun Sep 28 15:30:50 2014 @@ -709,6 +709,7 @@ PVOID*,ULONG,PULONG); NTSTATUS NTAPI LsaFreeMemory(PVOID); NTSTATUS NTAPI LsaFreeReturnBuffer(PVOID); +NTSTATUS NTAPI LsaGetLogonSessionData(PLUID,PSECURITY_LOGON_SESSION_DATA*); NTSTATUS NTAPI LsaGetQuotasForAccount(LSA_HANDLE,PQUOTA_LIMITS); NTSTATUS NTAPI LsaGetRemoteUserName(PLSA_UNICODE_STRING, PLSA_UNICODE_STRING*, PLSA_UNICODE_STRING*);

9 years, 11 months

[hbelusca] 64365: [FAST486]: Improve the trace.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Sep 28 15:11:33 2014 New Revision: 64365 URL: http://svn.reactos.org/svn/reactos?rev=64365&view=rev Log: [FAST486]: Improve the trace. Modified: trunk/reactos/lib/fast486/fast486.c Modified: trunk/reactos/lib/fast486/fast486.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/fast486.c?rev=… ============================================================================== --- trunk/reactos/lib/fast486/fast486.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/fast486.c [iso-8859-1] Sun Sep 28 15:11:33 2014 @@ -299,81 +299,83 @@ NTAPI Fast486DumpState(PFAST486_STATE State) { - DPRINT1("\nCPU currently executing in %s mode at %04X:%08X\n", + DbgPrint("\nFast486DumpState -->\n"); + DbgPrint("\nCPU currently executing in %s mode at %04X:%08X\n", (State->ControlRegisters[0] & FAST486_CR0_PE) ? "protected" : "real", - State->SegmentRegs[FAST486_REG_CS].Selector, - State->InstPtr.Long); - DPRINT1("\nGeneral purpose registers:\n" - "EAX = %08X\tECX = %08X\tEDX = %08X\tEBX = %08X\n" - "ESP = %08X\tEBP = %08X\tESI = %08X\tEDI = %08X\n", - State->GeneralRegs[FAST486_REG_EAX].Long, - State->GeneralRegs[FAST486_REG_ECX].Long, - State->GeneralRegs[FAST486_REG_EDX].Long, - State->GeneralRegs[FAST486_REG_EBX].Long, - State->GeneralRegs[FAST486_REG_ESP].Long, - State->GeneralRegs[FAST486_REG_EBP].Long, - State->GeneralRegs[FAST486_REG_ESI].Long, - State->GeneralRegs[FAST486_REG_EDI].Long); - DPRINT1("\nSegment registers:\n" - "ES = %04X (Base: %08X, Limit: %08X, Dpl: %u)\n" - "CS = %04X (Base: %08X, Limit: %08X, Dpl: %u)\n" - "SS = %04X (Base: %08X, Limit: %08X, Dpl: %u)\n" - "DS = %04X (Base: %08X, Limit: %08X, Dpl: %u)\n" - "FS = %04X (Base: %08X, Limit: %08X, Dpl: %u)\n" - "GS = %04X (Base: %08X, Limit: %08X, Dpl: %u)\n", - State->SegmentRegs[FAST486_REG_ES].Selector, - State->SegmentRegs[FAST486_REG_ES].Base, - State->SegmentRegs[FAST486_REG_ES].Limit, - State->SegmentRegs[FAST486_REG_ES].Dpl, - State->SegmentRegs[FAST486_REG_CS].Selector, - State->SegmentRegs[FAST486_REG_CS].Base, - State->SegmentRegs[FAST486_REG_CS].Limit, - State->SegmentRegs[FAST486_REG_CS].Dpl, - State->SegmentRegs[FAST486_REG_SS].Selector, - State->SegmentRegs[FAST486_REG_SS].Base, - State->SegmentRegs[FAST486_REG_SS].Limit, - State->SegmentRegs[FAST486_REG_SS].Dpl, - State->SegmentRegs[FAST486_REG_DS].Selector, - State->SegmentRegs[FAST486_REG_DS].Base, - State->SegmentRegs[FAST486_REG_DS].Limit, - State->SegmentRegs[FAST486_REG_DS].Dpl, - State->SegmentRegs[FAST486_REG_FS].Selector, - State->SegmentRegs[FAST486_REG_FS].Base, - State->SegmentRegs[FAST486_REG_FS].Limit, - State->SegmentRegs[FAST486_REG_FS].Dpl, - State->SegmentRegs[FAST486_REG_GS].Selector, - State->SegmentRegs[FAST486_REG_GS].Base, - State->SegmentRegs[FAST486_REG_GS].Limit, - State->SegmentRegs[FAST486_REG_GS].Dpl); - DPRINT1("\nFlags: %08X (%s %s %s %s %s %s %s %s %s %s %s %s) Iopl: %u\n", - State->Flags.Long, - State->Flags.Cf ? "CF" : "cf", - State->Flags.Pf ? "PF" : "pf", - State->Flags.Af ? "AF" : "af", - State->Flags.Zf ? "ZF" : "zf", - State->Flags.Sf ? "SF" : "sf", - State->Flags.Tf ? "TF" : "tf", - State->Flags.If ? "IF" : "if", - State->Flags.Df ? "DF" : "df", - State->Flags.Of ? "OF" : "of", - State->Flags.Nt ? "NT" : "nt", - State->Flags.Rf ? "RF" : "rf", - State->Flags.Vm ? "VM" : "vm", - State->Flags.Iopl); - DPRINT1("\nControl Registers:\n" - "CR0 = %08X\tCR2 = %08X\tCR3 = %08X\n", - State->ControlRegisters[FAST486_REG_CR0], - State->ControlRegisters[FAST486_REG_CR2], - State->ControlRegisters[FAST486_REG_CR3]); - DPRINT1("\nDebug Registers:\n" - "DR0 = %08X\tDR1 = %08X\tDR2 = %08X\n" - "DR3 = %08X\tDR4 = %08X\tDR5 = %08X\n", - State->DebugRegisters[FAST486_REG_DR0], - State->DebugRegisters[FAST486_REG_DR1], - State->DebugRegisters[FAST486_REG_DR2], - State->DebugRegisters[FAST486_REG_DR3], - State->DebugRegisters[FAST486_REG_DR4], - State->DebugRegisters[FAST486_REG_DR5]); + State->SegmentRegs[FAST486_REG_CS].Selector, + State->InstPtr.Long); + DbgPrint("\nGeneral purpose registers:\n" + "EAX = %08X\tECX = %08X\tEDX = %08X\tEBX = %08X\n" + "ESP = %08X\tEBP = %08X\tESI = %08X\tEDI = %08X\n", + State->GeneralRegs[FAST486_REG_EAX].Long, + State->GeneralRegs[FAST486_REG_ECX].Long, + State->GeneralRegs[FAST486_REG_EDX].Long, + State->GeneralRegs[FAST486_REG_EBX].Long, + State->GeneralRegs[FAST486_REG_ESP].Long, + State->GeneralRegs[FAST486_REG_EBP].Long, + State->GeneralRegs[FAST486_REG_ESI].Long, + State->GeneralRegs[FAST486_REG_EDI].Long); + DbgPrint("\nSegment registers:\n" + "ES = %04X (Base: %08X, Limit: %08X, Dpl: %u)\n" + "CS = %04X (Base: %08X, Limit: %08X, Dpl: %u)\n" + "SS = %04X (Base: %08X, Limit: %08X, Dpl: %u)\n" + "DS = %04X (Base: %08X, Limit: %08X, Dpl: %u)\n" + "FS = %04X (Base: %08X, Limit: %08X, Dpl: %u)\n" + "GS = %04X (Base: %08X, Limit: %08X, Dpl: %u)\n", + State->SegmentRegs[FAST486_REG_ES].Selector, + State->SegmentRegs[FAST486_REG_ES].Base, + State->SegmentRegs[FAST486_REG_ES].Limit, + State->SegmentRegs[FAST486_REG_ES].Dpl, + State->SegmentRegs[FAST486_REG_CS].Selector, + State->SegmentRegs[FAST486_REG_CS].Base, + State->SegmentRegs[FAST486_REG_CS].Limit, + State->SegmentRegs[FAST486_REG_CS].Dpl, + State->SegmentRegs[FAST486_REG_SS].Selector, + State->SegmentRegs[FAST486_REG_SS].Base, + State->SegmentRegs[FAST486_REG_SS].Limit, + State->SegmentRegs[FAST486_REG_SS].Dpl, + State->SegmentRegs[FAST486_REG_DS].Selector, + State->SegmentRegs[FAST486_REG_DS].Base, + State->SegmentRegs[FAST486_REG_DS].Limit, + State->SegmentRegs[FAST486_REG_DS].Dpl, + State->SegmentRegs[FAST486_REG_FS].Selector, + State->SegmentRegs[FAST486_REG_FS].Base, + State->SegmentRegs[FAST486_REG_FS].Limit, + State->SegmentRegs[FAST486_REG_FS].Dpl, + State->SegmentRegs[FAST486_REG_GS].Selector, + State->SegmentRegs[FAST486_REG_GS].Base, + State->SegmentRegs[FAST486_REG_GS].Limit, + State->SegmentRegs[FAST486_REG_GS].Dpl); + DbgPrint("\nFlags: %08X (%s %s %s %s %s %s %s %s %s %s %s %s) Iopl: %u\n", + State->Flags.Long, + State->Flags.Cf ? "CF" : "cf", + State->Flags.Pf ? "PF" : "pf", + State->Flags.Af ? "AF" : "af", + State->Flags.Zf ? "ZF" : "zf", + State->Flags.Sf ? "SF" : "sf", + State->Flags.Tf ? "TF" : "tf", + State->Flags.If ? "IF" : "if", + State->Flags.Df ? "DF" : "df", + State->Flags.Of ? "OF" : "of", + State->Flags.Nt ? "NT" : "nt", + State->Flags.Rf ? "RF" : "rf", + State->Flags.Vm ? "VM" : "vm", + State->Flags.Iopl); + DbgPrint("\nControl Registers:\n" + "CR0 = %08X\tCR2 = %08X\tCR3 = %08X\n", + State->ControlRegisters[FAST486_REG_CR0], + State->ControlRegisters[FAST486_REG_CR2], + State->ControlRegisters[FAST486_REG_CR3]); + DbgPrint("\nDebug Registers:\n" + "DR0 = %08X\tDR1 = %08X\tDR2 = %08X\n" + "DR3 = %08X\tDR4 = %08X\tDR5 = %08X\n", + State->DebugRegisters[FAST486_REG_DR0], + State->DebugRegisters[FAST486_REG_DR1], + State->DebugRegisters[FAST486_REG_DR2], + State->DebugRegisters[FAST486_REG_DR3], + State->DebugRegisters[FAST486_REG_DR4], + State->DebugRegisters[FAST486_REG_DR5]); + DbgPrint("\n<-- Fast486DumpState\n\n"); } VOID

9 years, 11 months

[ekohl] 64364: [SERVICES] Log service start, control and status change events.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Sep 28 14:10:16 2014 New Revision: 64364 URL: http://svn.reactos.org/svn/reactos?rev=64364&view=rev Log: [SERVICES] Log service start, control and status change events. Modified: trunk/reactos/base/system/services/database.c trunk/reactos/base/system/services/rpcserver.c trunk/reactos/base/system/services/services.c trunk/reactos/base/system/services/services.h Modified: trunk/reactos/base/system/services/database.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/datab… ============================================================================== --- trunk/reactos/base/system/services/database.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/database.c [iso-8859-1] Sun Sep 28 14:10:16 2014 @@ -1456,6 +1456,19 @@ return dwError; } } + else + { + if (dwProcessId != Service->lpImage->dwProcessId) + { +/* + LPWSTR Strings[3] + + ScmLogError(EVENT_SERVICE_DIFFERENT_PID_CONNECTED, + 3, + lpStrings); +*/ + } + } DPRINT("ScmWaitForServiceConnect() done\n"); @@ -1578,7 +1591,7 @@ { PSERVICE_GROUP Group = Service->lpGroup; DWORD dwError = ERROR_SUCCESS; - LPCWSTR ErrorLogStrings[2]; + LPCWSTR lpErrorStrings[2]; WCHAR szErrorBuffer[32]; DPRINT("ScmLoadService() called\n"); @@ -1633,6 +1646,14 @@ { Group->ServicesRunning = TRUE; } + + /* Log a successful service start */ + lpErrorStrings[0] = Service->lpDisplayName; + lpErrorStrings[1] = L"start"; + ScmLogEvent(EVENT_SERVICE_CONTROL_SUCCESS, + EVENTLOG_INFORMATION_TYPE, + 2, + lpErrorStrings); } else { @@ -1640,11 +1661,12 @@ { /* Log a failed service start */ swprintf(szErrorBuffer, L"%lu", dwError); - ErrorLogStrings[0] = Service->lpServiceName; - ErrorLogStrings[1] = szErrorBuffer; - ScmLogError(EVENT_SERVICE_START_FAILED, + lpErrorStrings[0] = Service->lpServiceName; + lpErrorStrings[1] = szErrorBuffer; + ScmLogEvent(EVENT_SERVICE_START_FAILED, + EVENTLOG_ERROR_TYPE, 2, - ErrorLogStrings); + lpErrorStrings); } #if 0 Modified: trunk/reactos/base/system/services/rpcserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/rpcse… ============================================================================== --- trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] Sun Sep 28 14:10:16 2014 @@ -1085,6 +1085,7 @@ DWORD dwControlsAccepted; DWORD dwCurrentState; HKEY hServicesKey = NULL; + LPCWSTR lpErrorStrings[2]; DPRINT("RControlService() called\n"); @@ -1240,6 +1241,39 @@ RtlCopyMemory(lpServiceStatus, &lpService->Status, sizeof(SERVICE_STATUS)); + } + + if (dwError == ERROR_SUCCESS) + { + if (dwControl != SERVICE_CONTROL_INTERROGATE) + { + /* Log a sucessful send control */ + lpErrorStrings[0] = lpService->lpDisplayName; + + switch(dwControl) + { + case SERVICE_CONTROL_STOP: + lpErrorStrings[1] = L"stop"; + break; + + case SERVICE_CONTROL_PAUSE: + lpErrorStrings[1] = L"pause"; + break; + + case SERVICE_CONTROL_CONTINUE: + lpErrorStrings[1] = L"continue"; + break; + + default: + lpErrorStrings[1] = L"other"; + break; + } + + ScmLogEvent(EVENT_SERVICE_CONTROL_SUCCESS, + EVENTLOG_INFORMATION_TYPE, + 2, + lpErrorStrings); + } } return dwError; @@ -1691,20 +1725,47 @@ /* Unlock the service database */ ScmUnlockDatabase(); - /* Log a failed service stop */ if ((lpServiceStatus->dwCurrentState == SERVICE_STOPPED) && - (dwPreviousState != SERVICE_STOPPED)) - { - if (lpServiceStatus->dwWin32ExitCode != ERROR_SUCCESS) - { - swprintf(szErrorBuffer, L"%lu", lpServiceStatus->dwWin32ExitCode); - lpErrorStrings[0] = lpService->lpDisplayName; - lpErrorStrings[1] = szErrorBuffer; - - ScmLogError(EVENT_SERVICE_EXIT_FAILED, - 2, - lpErrorStrings); - } + (dwPreviousState != SERVICE_STOPPED) && + (lpServiceStatus->dwWin32ExitCode != ERROR_SUCCESS)) + { + /* Log a failed service stop */ + swprintf(szErrorBuffer, L"%lu", lpServiceStatus->dwWin32ExitCode); + lpErrorStrings[0] = lpService->lpDisplayName; + lpErrorStrings[1] = szErrorBuffer; + + ScmLogEvent(EVENT_SERVICE_EXIT_FAILED, + EVENTLOG_ERROR_TYPE, + 2, + lpErrorStrings); + } + else if (lpServiceStatus->dwCurrentState != dwPreviousState && + (lpServiceStatus->dwCurrentState == SERVICE_STOPPED || + lpServiceStatus->dwCurrentState == SERVICE_RUNNING || + lpServiceStatus->dwCurrentState == SERVICE_PAUSED)) + { + /* Log a successful service status change */ + lpErrorStrings[0] = lpService->lpDisplayName; + + switch(lpServiceStatus->dwCurrentState) + { + case SERVICE_STOPPED: + lpErrorStrings[1] = L"stopped"; + break; + + case SERVICE_RUNNING: + lpErrorStrings[1] = L"running"; + break; + + case SERVICE_PAUSED: + lpErrorStrings[1] = L"paused"; + break; + } + + ScmLogEvent(EVENT_SERVICE_STATUS_SUCCESS, + EVENTLOG_INFORMATION_TYPE, + 2, + lpErrorStrings); } DPRINT("Set %S to %lu\n", lpService->lpDisplayName, lpService->Status.dwCurrentState); Modified: trunk/reactos/base/system/services/services.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/servi… ============================================================================== --- trunk/reactos/base/system/services/services.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/services.c [iso-8859-1] Sun Sep 28 14:10:16 2014 @@ -53,7 +53,8 @@ VOID -ScmLogError(DWORD dwEventId, +ScmLogEvent(DWORD dwEventId, + WORD wType, WORD wStrings, LPCWSTR *lpStrings) { @@ -68,10 +69,10 @@ } if (!ReportEventW(hLog, - EVENTLOG_ERROR_TYPE, + wType, 0, dwEventId, - NULL, // Sid, + NULL, wStrings, 0, lpStrings, Modified: trunk/reactos/base/system/services/services.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/servi… ============================================================================== --- trunk/reactos/base/system/services/services.h [iso-8859-1] (original) +++ trunk/reactos/base/system/services/services.h [iso-8859-1] Sun Sep 28 14:10:16 2014 @@ -175,6 +175,7 @@ /* lock.c */ + DWORD ScmAcquireServiceStartLock(IN BOOL IsServiceController, OUT LPSC_RPC_LOCK lpLock); DWORD ScmReleaseServiceStartLock(IN OUT LPSC_RPC_LOCK lpLock); @@ -190,7 +191,8 @@ /* services.c */ VOID PrintString(LPCSTR fmt, ...); -VOID ScmLogError(DWORD dwEventId, +VOID ScmLogEvent(DWORD dwEventId, + WORD wType, WORD wStrings, LPCWSTR *lpStrings); VOID ScmWaitForLsa(VOID);

9 years, 11 months

[jimtabor] 64363: [Win32k] - Process hardware keyboard and mouse buttons before mouse move messages. Should fix CORE-7797.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Sun Sep 28 11:42:24 2014 New Revision: 64363 URL: http://svn.reactos.org/svn/reactos?rev=64363&view=rev Log: [Win32k] - Process hardware keyboard and mouse buttons before mouse move messages. Should fix CORE-7797. Modified: trunk/reactos/win32ss/user/ntuser/message.c Modified: trunk/reactos/win32ss/user/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/messag… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/message.c [iso-8859-1] Sun Sep 28 11:42:24 2014 @@ -852,17 +852,6 @@ } /* Check for hardware events. */ - if ((ProcessMask & QS_MOUSE) && - co_MsqPeekMouseMove( pti, - RemoveMessages, - Window, - MsgFilterMin, - MsgFilterMax, - Msg )) - { - return TRUE; - } - if ((ProcessMask & QS_INPUT) && co_MsqPeekHardwareMessage( pti, RemoveMessages, @@ -871,6 +860,17 @@ MsgFilterMax, ProcessMask, Msg)) + { + return TRUE; + } + + if ((ProcessMask & QS_MOUSE) && + co_MsqPeekMouseMove( pti, + RemoveMessages, + Window, + MsgFilterMin, + MsgFilterMax, + Msg )) { return TRUE; } @@ -1198,7 +1198,7 @@ Window = UserGetWindowObject(Wnd); if ( !Window ) { - ERR("UserPostMessage: Invalid handle 0x%p!\n",Wnd); + ERR("UserPostMessage: Invalid handle 0x%p Msg %d!\n",Wnd,Msg); return FALSE; }

9 years, 11 months

[akhaldi] 64362: [MSTSC] * Partial sync with rdesktop-ce to fix Windows 2008 R2 server login. CORE-8561 #resolve #comment Should be fixed in r64362. Please retest.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Sep 28 11:18:16 2014 New Revision: 64362 URL: http://svn.reactos.org/svn/reactos?rev=64362&view=rev Log: [MSTSC] * Partial sync with rdesktop-ce to fix Windows 2008 R2 server login. CORE-8561 #resolve #comment Should be fixed in r64362. Please retest. Modified: trunk/reactos/base/applications/mstsc/constants.h trunk/reactos/base/applications/mstsc/secure.c Modified: trunk/reactos/base/applications/mstsc/constants.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/co… ============================================================================== --- trunk/reactos/base/applications/mstsc/constants.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/constants.h [iso-8859-1] Sun Sep 28 11:18:16 2014 @@ -2,7 +2,7 @@ rdesktop: A Remote Desktop Protocol client. Miscellaneous protocol constants Copyright (C) Matthew Chapman 1999-2005 - + This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or @@ -13,9 +13,9 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ /* TCP port for Remote Desktop Protocol */ @@ -60,10 +60,11 @@ #define MCS_USERCHANNEL_BASE 1001 /* RDP secure transport constants */ -#define SEC_RANDOM_SIZE 32 -#define SEC_MODULUS_SIZE 64 -#define SEC_PADDING_SIZE 8 -#define SEC_EXPONENT_SIZE 4 +#define SEC_RANDOM_SIZE 32 +#define SEC_MODULUS_SIZE 64 +#define SEC_MAX_MODULUS_SIZE 256 +#define SEC_PADDING_SIZE 8 +#define SEC_EXPONENT_SIZE 4 #define SEC_CLIENT_RANDOM 0x0001 #define SEC_ENCRYPT 0x0008 Modified: trunk/reactos/base/applications/mstsc/secure.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/se… ============================================================================== --- trunk/reactos/base/applications/mstsc/secure.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/secure.c [iso-8859-1] Sun Sep 28 11:18:16 2014 @@ -13,9 +13,9 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #include "precomp.h" @@ -56,7 +56,7 @@ ssl_mod_exp(char* out, int out_len, char* in, int in_len, char* mod, int mod_len, char* exp, int exp_len); -extern char g_hostname[]; +extern char g_hostname[16]; extern int g_width; extern int g_height; extern unsigned int g_keylayout; @@ -77,13 +77,14 @@ static void * rc4_encrypt_key = 0; //static RSA *server_public_key; static void * server_public_key; +static uint32 server_public_key_len; static uint8 sec_sign_key[16]; static uint8 sec_decrypt_key[16]; static uint8 sec_encrypt_key[16]; static uint8 sec_decrypt_update_key[16]; static uint8 sec_encrypt_update_key[16]; -static uint8 sec_crypted_random[SEC_MODULUS_SIZE]; +static uint8 sec_crypted_random[SEC_MAX_MODULUS_SIZE]; uint16 g_server_rdp_version = 0; @@ -263,7 +264,7 @@ ssl_md5_transform(md5, (char *)pad_92, 48); ssl_md5_transform(md5, (char *)shasig, 20); ssl_md5_complete(md5, (char *)md5sig); - ssl_md5_info_delete(md5); + ssl_md5_info_delete(md5); memcpy(signature, md5sig, siglen); } @@ -347,16 +348,32 @@ /* Perform an RSA public key encryption operation */ static void -sec_rsa_encrypt(uint8 * out, uint8 * in, int len, uint8 * modulus, uint8 * exponent) +//sec_rsa_encrypt(uint8 * out, uint8 * in, int len, uint8 * modulus, uint8 * exponent) +sec_rsa_encrypt(uint8 * out, uint8 * in, int len, uint32 modulus_size, uint8 * modulus, uint8 * exponent) { ssl_mod_exp((char *)out, 64, (char *)in, 32, (char *)modulus, 64, (char *)exponent, 4); +/* +ssl_mod_exp(out, 64, in, 32, modulus, 64, exponent, 4); + +ssl_mod_exp(char* out, int out_len, char* in, int in_len, + char* mod, int mod_len, char* exp, int exp_len) + +e = (DIGIT_T*)l_exp; +x = (DIGIT_T*)l_in; +y = (DIGIT_T*)l_out; +m = (DIGIT_T*)l_mod; + +*/ + + //BN_CTX *ctx; + /* BN_CTX *ctx; BIGNUM mod, exp, x, y; - uint8 inr[SEC_MODULUS_SIZE]; + uint8 inr[SEC_MAX_MODULUS_SIZE]; int outlen; - reverse(modulus, SEC_MODULUS_SIZE); + reverse(modulus, modulus_size); reverse(exponent, SEC_EXPONENT_SIZE); memcpy(inr, in, len); reverse(inr, len); @@ -367,14 +384,14 @@ BN_init(&x); BN_init(&y); - BN_bin2bn(modulus, SEC_MODULUS_SIZE, &mod); + BN_bin2bn(modulus, modulus_size, &mod); BN_bin2bn(exponent, SEC_EXPONENT_SIZE, &exp); BN_bin2bn(inr, len, &x); BN_mod_exp(&y, &x, &exp, &mod, ctx); outlen = BN_bn2bin(&y, out); reverse(out, outlen); - if (outlen < SEC_MODULUS_SIZE) - memset(out + outlen, 0, SEC_MODULUS_SIZE - outlen); + if (outlen < modulus_size) + memset(out + outlen, 0, modulus_size - outlen); BN_free(&y); BN_clear_free(&x); @@ -440,14 +457,14 @@ static void sec_establish_key(void) { - uint32 length = SEC_MODULUS_SIZE + SEC_PADDING_SIZE; + uint32 length = server_public_key_len + SEC_PADDING_SIZE; uint32 flags = SEC_CLIENT_RANDOM; STREAM s; - s = sec_init(flags, 76); + s = sec_init(flags, length+4); out_uint32_le(s, length); - out_uint8p(s, sec_crypted_random, SEC_MODULUS_SIZE); + out_uint8p(s, sec_crypted_random, server_public_key_len); out_uint8s(s, SEC_PADDING_SIZE); s_mark_end(s); @@ -559,16 +576,18 @@ } in_uint32_le(s, modulus_len); - if (modulus_len != SEC_MODULUS_SIZE + SEC_PADDING_SIZE) - { - error("modulus len 0x%x\n", modulus_len); + modulus_len -= SEC_PADDING_SIZE; + if ((modulus_len < 64) || (modulus_len > SEC_MAX_MODULUS_SIZE)) + { + error("Bad server public key size (%u bits)\n", modulus_len*8); return False; } in_uint8s(s, 8); /* modulus_bits, unknown */ in_uint8p(s, *exponent, SEC_EXPONENT_SIZE); - in_uint8p(s, *modulus, SEC_MODULUS_SIZE); + in_uint8p(s, *modulus, modulus_len); in_uint8s(s, SEC_PADDING_SIZE); + server_public_key_len = modulus_len; return s_check(s); } @@ -740,10 +759,10 @@ static void sec_process_crypt_info(STREAM s) { - uint8 *server_random, *modulus = NULL, *exponent = NULL; + uint8 *server_random, *modulus, *exponent; uint8 client_random[SEC_RANDOM_SIZE]; uint32 rc4_key_size; - uint8 inr[SEC_MODULUS_SIZE]; + //uint8 inr[SEC_MODULUS_SIZE]; if (!sec_parse_crypt_info(s, &rc4_key_size, &server_random, &modulus, &exponent)) { @@ -754,15 +773,14 @@ DEBUG(("Generating client random\n")); /* Generate a client random, and hence determine encryption keys */ /* This is what the MS client do: */ - memset(inr, 0, SEC_RANDOM_SIZE); + //memset(inr, 0, SEC_RANDOM_SIZE); /* *ARIGL!* Plaintext attack, anyone? - I tried doing: - generate_random(inr); - ..but that generates connection errors now and then (yes, - "now and then". Something like 0 to 3 attempts needed before a - successful connection. Nice. Not! - */ - + I tried doing: + generate_random(inr); + ..but that generates connection errors now and then (yes, + "now and then". Something like 0 to 3 attempts needed before a + successful connection. Nice. Not! + */ generate_random(client_random); if (NULL != server_public_key) { /* Which means we should use @@ -783,7 +801,7 @@ else { /* RDP4-style encryption */ sec_rsa_encrypt(sec_crypted_random, - client_random, SEC_RANDOM_SIZE, modulus, exponent); + client_random, SEC_RANDOM_SIZE, server_public_key_len, modulus, exponent); } sec_generate_keys(client_random, server_random, rc4_key_size); }

9 years, 11 months

[ekohl] 64361: [MC] - Fix service manager message ids. Message 7004 does not exist. - Add missing service manager messages.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Sep 28 09:19:20 2014 New Revision: 64361 URL: http://svn.reactos.org/svn/reactos?rev=64361&view=rev Log: [MC] - Fix service manager message ids. Message 7004 does not exist. - Add missing service manager messages. Modified: trunk/reactos/include/reactos/mc/neteventmsg.mc Modified: trunk/reactos/include/reactos/mc/neteventmsg.mc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/mc/neteven… ============================================================================== --- trunk/reactos/include/reactos/mc/neteventmsg.mc [iso-8859-1] (original) +++ trunk/reactos/include/reactos/mc/neteventmsg.mc [iso-8859-1] Sun Sep 28 09:19:20 2014 @@ -180,7 +180,7 @@ The %1 service depends on the following nonexistent service: %2 . -MessageId=7004 +MessageId=7005 Severity=Error Facility=System SymbolicName=EVENT_CALL_TO_FUNCTION_FAILED @@ -188,7 +188,7 @@ The %1 call failed with the following error: %n%2 . -MessageId=7005 +MessageId=7006 Severity=Error Facility=System SymbolicName=EVENT_CALL_TO_FUNCTION_FAILED_II @@ -196,7 +196,7 @@ The %1 call failed for %2 with the following error: %n%3 . -MessageId=7006 +MessageId=7007 Severity=Error Facility=System SymbolicName=EVENT_REVERTED_TO_LASTKNOWNGOOD @@ -204,7 +204,7 @@ The system reverted to its last known good configuration. The system is restarting.... . -MessageId=7007 +MessageId=7008 Severity=Error Facility=System SymbolicName=EVENT_BAD_ACCOUNT_NAME @@ -212,7 +212,7 @@ No backslash is in the account name. . -MessageId=7008 +MessageId=7009 Severity=Error Facility=System SymbolicName=EVENT_CONNECTION_TIMEOUT @@ -220,7 +220,7 @@ Timeout (%1 milliseconds) waiting for the %2 service to connect. . -MessageId=7009 +MessageId=7010 Severity=Error Facility=System SymbolicName=EVENT_READFILE_TIMEOUT @@ -228,7 +228,7 @@ Timeout (%1 milliseconds) waiting for ReadFile. . -MessageId=7010 +MessageId=7011 Severity=Error Facility=System SymbolicName=EVENT_TRANSACT_TIMEOUT @@ -236,7 +236,7 @@ Timeout (%1 milliseconds) waiting for a transaction response from the %2 service. . -MessageId=7011 +MessageId=7012 Severity=Error Facility=System SymbolicName=EVENT_TRANSACT_INVALID @@ -244,7 +244,7 @@ Message returned in transaction has incorrect size. . -MessageId=7012 +MessageId=7013 Severity=Error Facility=System SymbolicName=EVENT_FIRST_LOGON_FAILED @@ -252,7 +252,7 @@ Logon attempt with current password failed with the following error: %n%1 . -MessageId=7013 +MessageId=7014 Severity=Error Facility=System SymbolicName=EVENT_SECOND_LOGON_FAILED @@ -260,7 +260,7 @@ Second logon attempt with old password also failed with the following error: %n%1 . -MessageId=7014 +MessageId=7015 Severity=Error Facility=System SymbolicName=EVENT_INVALID_DRIVER_DEPENDENCY @@ -268,7 +268,7 @@ Boot-start or system-start driver (%1) must not depend on a service. . -MessageId=7015 +MessageId=7016 Severity=Error Facility=System SymbolicName=EVENT_BAD_SERVICE_STATE @@ -276,7 +276,7 @@ The %1 service has reported an invalid current state %2. . -MessageId=7016 +MessageId=7017 Severity=Error Facility=System SymbolicName=EVENT_CIRCULAR_DEPENDENCY_DEMAND @@ -284,7 +284,7 @@ Detected circular dependencies demand starting %1. . -MessageId=7017 +MessageId=7018 Severity=Error Facility=System SymbolicName=EVENT_CIRCULAR_DEPENDENCY_AUTO @@ -292,7 +292,7 @@ Detected circular dependencies auto-starting services. . -MessageId=7018 +MessageId=7019 Severity=Error Facility=System SymbolicName=EVENT_DEPEND_ON_LATER_SERVICE @@ -300,7 +300,7 @@ Circular dependency: The %1 service depends on a service in a group which starts later. . -MessageId=7019 +MessageId=7020 Severity=Error Facility=System SymbolicName=EVENT_DEPEND_ON_LATER_GROUP @@ -308,7 +308,7 @@ Circular dependency: The %1 service depends on a group which starts later. . -MessageId=7020 +MessageId=7021 Severity=Error Facility=System SymbolicName=EVENT_SEVERE_SERVICE_FAILED @@ -316,7 +316,7 @@ About to revert to the last known good configuration because the %1 service failed to start. . -MessageId=7021 +MessageId=7022 Severity=Error Facility=System SymbolicName=EVENT_SERVICE_START_HUNG @@ -324,7 +324,7 @@ The %1 service hung on starting. . -MessageId=7022 +MessageId=7023 Severity=Error Facility=System SymbolicName=EVENT_SERVICE_EXIT_FAILED @@ -332,7 +332,7 @@ The %1 service terminated with the following error: %n%2 . -MessageId=7023 +MessageId=7024 Severity=Error Facility=System SymbolicName=EVENT_SERVICE_EXIT_FAILED_SPECIFIC @@ -340,7 +340,7 @@ The %1 service terminated with service-specific error %2. . -MessageId=7024 +MessageId=7025 Severity=Error Facility=System SymbolicName=EVENT_SERVICE_START_AT_BOOT_FAILED @@ -348,7 +348,7 @@ At least one service or driver failed during system startup. Use Event Viewer to examine the event log for details. . -MessageId=7025 +MessageId=7026 Severity=Error Facility=System SymbolicName=EVENT_BOOT_SYSTEM_DRIVERS_FAILED @@ -356,7 +356,7 @@ The following boot-start or system-start driver(s) failed to load: %1 . -MessageId=7026 +MessageId=7027 Severity=Error Facility=System SymbolicName=EVENT_RUNNING_LASTKNOWNGOOD @@ -364,7 +364,7 @@ ReactOS could not be started as configured. A previous working configuration was used instead. . -MessageId=7027 +MessageId=7028 Severity=Error Facility=System SymbolicName=EVENT_TAKE_OWNERSHIP @@ -372,7 +372,7 @@ The %1 Registry key denied access to SYSTEM account programs so the Service Control Manager took ownership of the Registry key. . -MessageId=7028 +MessageId=7029 Severity=Error Facility=System SymbolicName=TITLE_SC_MESSAGE_BOX @@ -380,7 +380,7 @@ Service Control Manager %0 . -MessageId=7029 +MessageId=7030 Severity=Error Facility=System SymbolicName=EVENT_SERVICE_NOT_INTERACTIVE @@ -388,7 +388,7 @@ The %1 service is marked as an interactive service. However, the system is configured to not allow interactive services. This service may not function properly. . -MessageId=7030 +MessageId=7031 Severity=Error Facility=System SymbolicName=EVENT_SERVICE_CRASH @@ -396,7 +396,7 @@ The %1 service terminated unexpectedly. It has done this %2 time(s). The following corrective action will be taken in %3 milliseconds: %5. . -MessageId=7031 +MessageId=7032 Severity=Error Facility=System SymbolicName=EVENT_SERVICE_RECOVERY_FAILED @@ -404,7 +404,7 @@ The Service Control Manager tried to take a corrective action (%2) after the unexpected termination of the %3 service, but this action failed with the following error: %n%4 . -MessageId=7032 +MessageId=7033 Severity=Error Facility=System SymbolicName=EVENT_SERVICE_SCESRV_FAILED @@ -414,31 +414,31 @@ system is restarting... . -MessageId=7033 +MessageId=7034 Severity=Error Facility=System SymbolicName=EVENT_SERVICE_CRASH_NO_ACTION Language=English The %1 service terminated unexpectedly. It has done this %2 time(s). -. - -MessageId=7034 -Severity=Informational -Facility=System -SymbolicName=EVENT_SERVICE_CONTROL_SUCCESS -Language=English -The %1 service was successfully sent a %2 control. . MessageId=7035 Severity=Informational Facility=System +SymbolicName=EVENT_SERVICE_CONTROL_SUCCESS +Language=English +The %1 service was successfully sent a %2 control. +. + +MessageId=7036 +Severity=Informational +Facility=System SymbolicName=EVENT_SERVICE_STATUS_SUCCESS Language=English -Service Control Manager %0 -. - -MessageId=7036 +The %1 service entered the %2 state. +. + +MessageId=7037 Severity=Error Facility=System SymbolicName=EVENT_SERVICE_CONFIG_BACKOUT_FAILED @@ -451,7 +451,7 @@ properly, use the Services snap-in in Microsoft Management Console (MMC). . -MessageId=7037 +MessageId=7038 Severity=Error Facility=System SymbolicName=EVENT_FIRST_LOGON_FAILED_II @@ -462,6 +462,65 @@ Console (MMC). . +MessageId=7039 +Severity=Warning +Facility=System +SymbolicName=EVENT_SERVICE_DIFFERENT_PID_CONNECTED +Language=English +A service process other than the one launched by the Service Control Manager +connected when starting the %1 service. The Service Control Manager launched +process %2 and process %3 connected instead.%n%n + +Note that if this service is configured to start under a debugger, this behavior is expected. +. + +MessageId=7040 +Severity=Informational +Facility=System +SymbolicName=EVENT_SERVICE_START_TYPE_CHANGED +Language=English +The start type of the %1 service was changed from %2 to %3. +. + +MessageId=7041 +Severity=Error +Facility=System +SymbolicName=EVENT_SERVICE_LOGON_TYPE_NOT_GRANTED +Language=English +The %1 service was unable to log on as %2 with the currently configured password due to the following error:%n +Logon failure: the user has not been granted the requested logon type at this computer.%n%n +Service: %1%n +Domain and account: %2%n%n +This service account does not have the necessary user right "Log on as a service."%n%n +User Action%n%n +Assign "Log on as a service" to the service account on this computer. You can +use Local Security Settings (Secpol.msc) to do this. If this computer is a +node in a cluster, check that this user right is assigned to the Cluster +service account on all nodes in the cluster.%n%n +If you have already assigned this user right to the service account, and the +user right appears to be removed, a Group Policy object associated with this +node might be removing the right. Check with your domain administrator to find +out if this is happening. +. + +MessageId=7042 +Severity=Informational +Facility=System +SymbolicName=EVENT_SERVICE_STOP_SUCCESS_WITH_REASON +Language=English +The %1 service was successfully sent a %2 control.%n%n +The reason specified was: %3 [%4]%n%n +Comment: %5 +. + +MessageId=7043 +Severity=Error +Facility=System +SymbolicName=EVENT_SERVICE_SHUTDOWN_FAILED +Language=English +The %1 service did not shut down properly after receiving a preshutdown control. +. + ; ; transport events 9000-9499

9 years, 11 months

← Newer
1
...
4
5
6
7
8
9
10
...
42
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2014