Ros-diffs April 2018

ros-diffs@reactos.org

26 participants
247 discussions

01/01: [ADVAPI32] Ignore the return value of the HandlerFunctionEx as well

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=aba6ce5b84e34ce02b14b… commit aba6ce5b84e34ce02b14b689c66be3cc7830e9eb Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Thu Apr 19 06:09:57 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Thu Apr 19 06:09:57 2018 +0200 [ADVAPI32] Ignore the return value of the HandlerFunctionEx as well Ignore the return value of the HandlerFunctionEx because we already ignore the return value of the HandlerFunction. This fixes a winetest failure. --- dll/win32/advapi32/service/sctrl.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dll/win32/advapi32/service/sctrl.c b/dll/win32/advapi32/service/sctrl.c index 40970f0811..4b53a74c0c 100644 --- a/dll/win32/advapi32/service/sctrl.c +++ b/dll/win32/advapi32/service/sctrl.c @@ -536,9 +536,10 @@ ScControlService(PACTIVE_SERVICE lpService, else if (lpService->HandlerFunctionEx) { /* FIXME: Send correct 2nd and 3rd parameters */ - dwError = (lpService->HandlerFunctionEx)(ControlPacket->dwControl, - 0, NULL, - lpService->HandlerContext); + (lpService->HandlerFunctionEx)(ControlPacket->dwControl, + 0, NULL, + lpService->HandlerContext); + dwError = ERROR_SUCCESS; } TRACE("ScControlService() done (Error %lu)\n", dwError);

6 years, 8 months

01/01: [LOCALSPL] Fix 2 Clang-Cl warnings about ullResult and "UserName"

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6d912629f7d050213ad0b… commit 6d912629f7d050213ad0b933a8ed0395da3ed653 Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Wed Apr 18 17:25:34 2018 +0200 Commit: Colin Finck <colin(a)reactos.org> CommitDate: Wed Apr 18 18:10:47 2018 +0200 [LOCALSPL] Fix 2 Clang-Cl warnings about ullResult and "UserName" - "warning: comparison of unsigned expression < 0 is always false [-Wtautological-unsigned-zero-compare]" - "warning: logical not is only applied to the left hand side of this comparison [-Wlogical-not-parentheses]" CORE-14306 --- win32ss/printing/providers/localspl/jobs.c | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/win32ss/printing/providers/localspl/jobs.c b/win32ss/printing/providers/localspl/jobs.c index b52b25eb8f..ea6e219a22 100644 --- a/win32ss/printing/providers/localspl/jobs.c +++ b/win32ss/printing/providers/localspl/jobs.c @@ -108,7 +108,7 @@ _GlobalJobListCompareRoutine(PVOID FirstStruct, PVOID SecondStruct) /** * @name _PrinterJobListCompareRoutine * - * SKIPLIST_COMPARE_ROUTINE for the each Printer's Job List. + * SKIPLIST_COMPARE_ROUTINE for each Printer's Job List. * Jobs in this list are sorted in the desired order of processing. */ static int WINAPI @@ -119,9 +119,6 @@ _PrinterJobListCompareRoutine(PVOID FirstStruct, PVOID SecondStruct) int iComparison; FILETIME ftSubmittedA; FILETIME ftSubmittedB; - ULARGE_INTEGER uliSubmittedA; - ULARGE_INTEGER uliSubmittedB; - ULONGLONG ullResult; // First compare the priorities to determine the order. // The job with a higher priority shall come first. @@ -130,7 +127,6 @@ _PrinterJobListCompareRoutine(PVOID FirstStruct, PVOID SecondStruct) return iComparison; // Both have the same priority, so go by creation time. - // Comparison is done using the MSDN-recommended way for comparing SYSTEMTIMEs. if (!SystemTimeToFileTime(&A->stSubmitted, &ftSubmittedA)) { ERR("SystemTimeToFileTime failed for A with error %lu!\n", GetLastError()); @@ -143,18 +139,7 @@ _PrinterJobListCompareRoutine(PVOID FirstStruct, PVOID SecondStruct) return 0; } - uliSubmittedA.LowPart = ftSubmittedA.dwLowDateTime; - uliSubmittedA.HighPart = ftSubmittedA.dwHighDateTime; - uliSubmittedB.LowPart = ftSubmittedB.dwLowDateTime; - uliSubmittedB.HighPart = ftSubmittedB.dwHighDateTime; - ullResult = uliSubmittedA.QuadPart - uliSubmittedB.QuadPart; - - if (ullResult < 0) - return -1; - else if (ullResult > 0) - return 1; - - return 0; + return CompareFileTime(&ftSubmittedA, &ftSubmittedB); } DWORD @@ -781,7 +766,7 @@ _LocalSetJobLevel1(PLOCAL_PRINTER_HANDLE pPrinterHandle, PLOCAL_JOB pJob, PJOB_I } // Check if the user name has changed. An empty string is permitted here! - if (!_EqualStrings(pJob->pwszUserName, pJobInfo->pUserName) != 0) + if (!_EqualStrings(pJob->pwszUserName, pJobInfo->pUserName)) { // The new user name doesn't need to exist, so no additional verification is required.

6 years, 8 months

02/02: [NTOS:PNP] Use pool tagging for DEVICE_ACTION_DATA. CORE-10456

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d82ccaa2a292c5637e22e… commit d82ccaa2a292c5637e22eb86194f28fbe6c67c9d Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Mon Dec 18 00:13:51 2017 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Wed Apr 18 16:13:14 2018 +0200 [NTOS:PNP] Use pool tagging for DEVICE_ACTION_DATA. CORE-10456 --- ntoskrnl/io/pnpmgr/pnpmgr.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ntoskrnl/io/pnpmgr/pnpmgr.c b/ntoskrnl/io/pnpmgr/pnpmgr.c index c8a14e1f34..83ff6774b6 100644 --- a/ntoskrnl/io/pnpmgr/pnpmgr.c +++ b/ntoskrnl/io/pnpmgr/pnpmgr.c @@ -926,7 +926,7 @@ IopDeviceActionWorker( Data->Type); ObDereferenceObject(Data->DeviceObject); - ExFreePool(Data); + ExFreePoolWithTag(Data, TAG_IO); KeAcquireSpinLock(&IopDeviceActionLock, &OldIrql); } IopDeviceActionInProgress = FALSE; @@ -4892,7 +4892,9 @@ IoInvalidateDeviceRelations( PDEVICE_ACTION_DATA Data; KIRQL OldIrql; - Data = ExAllocatePool(NonPagedPool, sizeof(DEVICE_ACTION_DATA)); + Data = ExAllocatePoolWithTag(NonPagedPool, + sizeof(DEVICE_ACTION_DATA), + TAG_IO); if (!Data) return;

6 years, 8 months

01/02: [NTOS:PNP] Rename IopDeviceRelations* to IopDeviceAction*. CORE-10456

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=121146e65177568e01a9a… commit 121146e65177568e01a9acd7b41da1bc652e1c01 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sun Dec 17 22:53:01 2017 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Wed Apr 18 16:12:56 2018 +0200 [NTOS:PNP] Rename IopDeviceRelations* to IopDeviceAction*. CORE-10456 --- ntoskrnl/include/internal/io.h | 4 ++-- ntoskrnl/io/pnpmgr/pnpinit.c | 4 ++-- ntoskrnl/io/pnpmgr/pnpmgr.c | 54 +++++++++++++++++++++--------------------- 3 files changed, 31 insertions(+), 31 deletions(-) diff --git a/ntoskrnl/include/internal/io.h b/ntoskrnl/include/internal/io.h index 86ddbda17a..f536fef5b2 100644 --- a/ntoskrnl/include/internal/io.h +++ b/ntoskrnl/include/internal/io.h @@ -1339,8 +1339,8 @@ extern ULONG IopNumTriageDumpDataBlocks; extern PVOID IopTriageDumpDataBlocks[64]; extern PIO_BUS_TYPE_GUID_LIST PnpBusTypeGuidList; extern PDRIVER_OBJECT IopRootDriverObject; -extern KSPIN_LOCK IopDeviceRelationsSpinLock; -extern LIST_ENTRY IopDeviceRelationsRequestList; +extern KSPIN_LOCK IopDeviceActionLock; +extern LIST_ENTRY IopDeviceActionRequestList; extern RESERVE_IRP_ALLOCATOR IopReserveIrpAllocator; // diff --git a/ntoskrnl/io/pnpmgr/pnpinit.c b/ntoskrnl/io/pnpmgr/pnpinit.c index 7545f84851..57c844781e 100644 --- a/ntoskrnl/io/pnpmgr/pnpinit.c +++ b/ntoskrnl/io/pnpmgr/pnpinit.c @@ -399,8 +399,8 @@ IopInitializePlugPlayServices(VOID) /* Initialize locks and such */ KeInitializeSpinLock(&IopDeviceTreeLock); - KeInitializeSpinLock(&IopDeviceRelationsSpinLock); - InitializeListHead(&IopDeviceRelationsRequestList); + KeInitializeSpinLock(&IopDeviceActionLock); + InitializeListHead(&IopDeviceActionRequestList); /* Get the default interface */ PnpDefaultInterfaceType = IopDetermineDefaultInterfaceType(); diff --git a/ntoskrnl/io/pnpmgr/pnpmgr.c b/ntoskrnl/io/pnpmgr/pnpmgr.c index da3cf8c065..c8a14e1f34 100644 --- a/ntoskrnl/io/pnpmgr/pnpmgr.c +++ b/ntoskrnl/io/pnpmgr/pnpmgr.c @@ -34,17 +34,17 @@ extern BOOLEAN PnpSystemInit; PDRIVER_OBJECT IopRootDriverObject; PIO_BUS_TYPE_GUID_LIST PnpBusTypeGuidList = NULL; -LIST_ENTRY IopDeviceRelationsRequestList; -WORK_QUEUE_ITEM IopDeviceRelationsWorkItem; -BOOLEAN IopDeviceRelationsRequestInProgress; -KSPIN_LOCK IopDeviceRelationsSpinLock; +LIST_ENTRY IopDeviceActionRequestList; +WORK_QUEUE_ITEM IopDeviceActionWorkItem; +BOOLEAN IopDeviceActionInProgress; +KSPIN_LOCK IopDeviceActionLock; -typedef struct _INVALIDATE_DEVICE_RELATION_DATA +typedef struct _DEVICE_ACTION_DATA { LIST_ENTRY RequestListEntry; PDEVICE_OBJECT DeviceObject; DEVICE_RELATION_TYPE Type; -} INVALIDATE_DEVICE_RELATION_DATA, *PINVALIDATE_DEVICE_RELATION_DATA; +} DEVICE_ACTION_DATA, *PDEVICE_ACTION_DATA; /* FUNCTIONS *****************************************************************/ NTSTATUS @@ -906,20 +906,20 @@ IopQueryDeviceCapabilities(PDEVICE_NODE DeviceNode, static VOID NTAPI -IopDeviceRelationsWorker( +IopDeviceActionWorker( _In_ PVOID Context) { PLIST_ENTRY ListEntry; - PINVALIDATE_DEVICE_RELATION_DATA Data; + PDEVICE_ACTION_DATA Data; KIRQL OldIrql; - KeAcquireSpinLock(&IopDeviceRelationsSpinLock, &OldIrql); - while (!IsListEmpty(&IopDeviceRelationsRequestList)) + KeAcquireSpinLock(&IopDeviceActionLock, &OldIrql); + while (!IsListEmpty(&IopDeviceActionRequestList)) { - ListEntry = RemoveHeadList(&IopDeviceRelationsRequestList); - KeReleaseSpinLock(&IopDeviceRelationsSpinLock, OldIrql); + ListEntry = RemoveHeadList(&IopDeviceActionRequestList); + KeReleaseSpinLock(&IopDeviceActionLock, OldIrql); Data = CONTAINING_RECORD(ListEntry, - INVALIDATE_DEVICE_RELATION_DATA, + DEVICE_ACTION_DATA, RequestListEntry); IoSynchronousInvalidateDeviceRelations(Data->DeviceObject, @@ -927,10 +927,10 @@ IopDeviceRelationsWorker( ObDereferenceObject(Data->DeviceObject); ExFreePool(Data); - KeAcquireSpinLock(&IopDeviceRelationsSpinLock, &OldIrql); + KeAcquireSpinLock(&IopDeviceActionLock, &OldIrql); } - IopDeviceRelationsRequestInProgress = FALSE; - KeReleaseSpinLock(&IopDeviceRelationsSpinLock, OldIrql); + IopDeviceActionInProgress = FALSE; + KeReleaseSpinLock(&IopDeviceActionLock, OldIrql); } NTSTATUS @@ -4889,10 +4889,10 @@ IoInvalidateDeviceRelations( IN PDEVICE_OBJECT DeviceObject, IN DEVICE_RELATION_TYPE Type) { - PINVALIDATE_DEVICE_RELATION_DATA Data; + PDEVICE_ACTION_DATA Data; KIRQL OldIrql; - Data = ExAllocatePool(NonPagedPool, sizeof(INVALIDATE_DEVICE_RELATION_DATA)); + Data = ExAllocatePool(NonPagedPool, sizeof(DEVICE_ACTION_DATA)); if (!Data) return; @@ -4900,20 +4900,20 @@ IoInvalidateDeviceRelations( Data->DeviceObject = DeviceObject; Data->Type = Type; - KeAcquireSpinLock(&IopDeviceRelationsSpinLock, &OldIrql); - InsertTailList(&IopDeviceRelationsRequestList, &Data->RequestListEntry); - if (IopDeviceRelationsRequestInProgress) + KeAcquireSpinLock(&IopDeviceActionLock, &OldIrql); + InsertTailList(&IopDeviceActionRequestList, &Data->RequestListEntry); + if (IopDeviceActionInProgress) { - KeReleaseSpinLock(&IopDeviceRelationsSpinLock, OldIrql); + KeReleaseSpinLock(&IopDeviceActionLock, OldIrql); return; } - IopDeviceRelationsRequestInProgress = TRUE; - KeReleaseSpinLock(&IopDeviceRelationsSpinLock, OldIrql); + IopDeviceActionInProgress = TRUE; + KeReleaseSpinLock(&IopDeviceActionLock, OldIrql); - ExInitializeWorkItem(&IopDeviceRelationsWorkItem, - IopDeviceRelationsWorker, + ExInitializeWorkItem(&IopDeviceActionWorkItem, + IopDeviceActionWorker, NULL); - ExQueueWorkItem(&IopDeviceRelationsWorkItem, + ExQueueWorkItem(&IopDeviceActionWorkItem, DelayedWorkQueue); }

6 years, 8 months

02/02: [MODE] Use ConUtils functions for printing to screen.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bc826532e3247a79a823d… commit bc826532e3247a79a823df5f05aaca34dfcb94e7 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed Apr 18 00:44:39 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Apr 18 00:45:32 2018 +0200 [MODE] Use ConUtils functions for printing to screen. --- base/applications/cmdutils/mode/mode.c | 42 +++++++++++++++++----------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/base/applications/cmdutils/mode/mode.c b/base/applications/cmdutils/mode/mode.c index 2981edfe1c..1d17ff7f00 100644 --- a/base/applications/cmdutils/mode/mode.c +++ b/base/applications/cmdutils/mode/mode.c @@ -82,7 +82,7 @@ int QueryDevices(VOID) if (Buffer == NULL) { /* We failed, bail out */ - wprintf(L"ERROR: Not enough memory\n"); + ConPuts(StdErr, L"ERROR: Not enough memory\n"); return 0; } @@ -95,7 +95,7 @@ int QueryDevices(VOID) if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) { /* We failed, bail out */ - wprintf(L"ERROR: QueryDosDeviceW(...) failed: 0x%lx\n", GetLastError()); + ConPrintf(StdErr, L"ERROR: QueryDosDeviceW(...) failed: 0x%lx\n", GetLastError()); HeapFree(GetProcessHeap(), 0, Buffer); return 0; } @@ -106,7 +106,7 @@ int QueryDevices(VOID) if (ptr == NULL) { /* We failed, bail out */ - wprintf(L"ERROR: Not enough memory\n"); + ConPuts(StdErr, L"ERROR: Not enough memory\n"); HeapFree(GetProcessHeap(), 0, Buffer); return 0; } @@ -167,12 +167,12 @@ int ShowParallelStatus(INT nPortNum) } else { - wprintf(L" QueryDosDeviceW(%s) returned unrecognised form %s.\n", szPortName, buffer); + ConPrintf(StdErr, L" QueryDosDeviceW(%s) returned unrecognised form %s.\n", szPortName, buffer); } } else { - wprintf(L"ERROR: QueryDosDeviceW(%s) failed: 0x%lx\n", szPortName, GetLastError()); + ConPrintf(StdErr, L"ERROR: QueryDosDeviceW(%s) failed: 0x%lx\n", szPortName, GetLastError()); } return 1; @@ -187,7 +187,7 @@ int SetParallelState(INT nPortNum) swprintf(szTargetPath, L"COM%d", nPortNum); if (!DefineDosDeviceW(DDD_REMOVE_DEFINITION, szPortName, szTargetPath)) { - wprintf(L"SetParallelState(%d) - DefineDosDevice(%s) failed: 0x%lx\n", nPortNum, szPortName, GetLastError()); + ConPrintf(StdErr, L"SetParallelState(%d) - DefineDosDevice(%s) failed: 0x%lx\n", nPortNum, szPortName, GetLastError()); } ShowParallelStatus(nPortNum); @@ -408,12 +408,12 @@ int SetConsoleStateOld(IN PCWSTR ArgStr) Quit: ClearScreen(hConOut, &csbi); if (!ResizeTextConsole(hConOut, &csbi, Resolution)) - wprintf(L"The screen cannot be set to the number of lines and columns specified.\n"); + ConPuts(StdErr, L"The screen cannot be set to the number of lines and columns specified.\n"); return 0; invalid_parameter: - wprintf(L"Invalid parameter - %s\n", ArgStr); + ConPrintf(StdErr, L"Invalid parameter - %s\n", ArgStr); return 1; } @@ -486,7 +486,7 @@ int SetConsoleState(IN PCWSTR ArgStr) else { invalid_parameter: - wprintf(L"Invalid parameter - %s\n", ArgStr); + ConPrintf(StdErr, L"Invalid parameter - %s\n", ArgStr); return 1; } } @@ -495,7 +495,7 @@ invalid_parameter: { ClearScreen(hConOut, &csbi); if (!ResizeTextConsole(hConOut, &csbi, Resolution)) - wprintf(L"The screen cannot be set to the number of lines and columns specified.\n"); + ConPuts(StdErr, L"The screen cannot be set to the number of lines and columns specified.\n"); } else if (kbdMode) { @@ -537,7 +537,7 @@ int SetConsoleCPState(IN PCWSTR ArgStr) else { invalid_parameter: - wprintf(L"Invalid parameter - %s\n", ArgStr); + ConPrintf(StdErr, L"Invalid parameter - %s\n", ArgStr); return 1; } @@ -570,8 +570,8 @@ SerialPortQuery(INT nPortNum, LPDCB pDCB, LPCOMMTIMEOUTS pCommTimeouts, BOOL bWr if (hPort == INVALID_HANDLE_VALUE) { - wprintf(L"Illegal device name - %s\n", szPortName); - wprintf(L"Last error = 0x%lx\n", GetLastError()); + ConPrintf(StdErr, L"Illegal device name - %s\n", szPortName); + ConPrintf(StdErr, L"Last error = 0x%lx\n", GetLastError()); return FALSE; } @@ -579,7 +579,7 @@ SerialPortQuery(INT nPortNum, LPDCB pDCB, LPCOMMTIMEOUTS pCommTimeouts, BOOL bWr : GetCommState(hPort, pDCB); if (!Success) { - wprintf(L"Failed to %s the status for device COM%d:\n", bWrite ? L"set" : L"get", nPortNum); + ConPrintf(StdErr, L"Failed to %s the status for device COM%d:\n", bWrite ? L"set" : L"get", nPortNum); goto Quit; } @@ -587,7 +587,7 @@ SerialPortQuery(INT nPortNum, LPDCB pDCB, LPCOMMTIMEOUTS pCommTimeouts, BOOL bWr : GetCommTimeouts(hPort, pCommTimeouts); if (!Success) { - wprintf(L"Failed to %s timeout status for device COM%d:\n", bWrite ? L"set" : L"get", nPortNum); + ConPrintf(StdErr, L"Failed to %s timeout status for device COM%d:\n", bWrite ? L"set" : L"get", nPortNum); goto Quit; } @@ -619,12 +619,12 @@ int ShowSerialStatus(INT nPortNum) } if (dcb.Parity >= ARRAYSIZE(parity_strings)) { - wprintf(L"ERROR: Invalid value for Parity Bits %d:\n", dcb.Parity); + ConPrintf(StdErr, L"ERROR: Invalid value for Parity Bits %d:\n", dcb.Parity); dcb.Parity = 0; } if (dcb.StopBits >= ARRAYSIZE(stopbit_strings)) { - wprintf(L"ERROR: Invalid value for Stop Bits %d:\n", dcb.StopBits); + ConPrintf(StdErr, L"ERROR: Invalid value for Stop Bits %d:\n", dcb.StopBits); dcb.StopBits = 0; } @@ -1087,7 +1087,7 @@ int SetSerialState(INT nPortNum, IN PCWSTR ArgStr) if (!Success) { - wprintf(L"Invalid parameter - %s\n", ArgStr); + ConPrintf(StdErr, L"Invalid parameter - %s\n", ArgStr); return 1; } @@ -1165,7 +1165,7 @@ int wmain(int argc, WCHAR* argv[]) ArgStr = HeapAlloc(GetProcessHeap(), 0, (ArgStrSize + 1) * sizeof(WCHAR)); if (ArgStr == NULL) { - wprintf(L"ERROR: Not enough memory\n"); + ConPuts(StdErr, L"ERROR: Not enough memory\n"); return 1; } @@ -1215,7 +1215,7 @@ int wmain(int argc, WCHAR* argv[]) if (!*argStr || _wcsnicmp(argStr, L"/STA", 4) == 0) ret = ShowParallelStatus(nPortNum); else - wprintf(L"ERROR: LPT port redirection is not implemented!\n"); + ConPuts(StdErr, L"ERROR: LPT port redirection is not implemented!\n"); // TODO: Implement setting LPT port redirection using SetParallelState(). goto Quit; } @@ -1282,7 +1282,7 @@ show_status: goto Quit; invalid_parameter: - wprintf(L"Invalid parameter - %s\n", ArgStr); + ConPrintf(StdErr, L"Invalid parameter - %s\n", ArgStr); goto Quit; Quit:

6 years, 8 months

01/02: [MODE] Improve few points in the MODE command. Adapted from a patch by Katayama Hirofumi MZ. CORE-12894

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=22bf16928847b13026047… commit 22bf16928847b13026047b1a95c1e704cf6271d6 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed Apr 18 00:37:42 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Apr 18 00:45:28 2018 +0200 [MODE] Improve few points in the MODE command. Adapted from a patch by Katayama Hirofumi MZ. CORE-12894 --- base/applications/cmdutils/mode/mode.c | 115 ++++++++++++++++++++++----------- 1 file changed, 76 insertions(+), 39 deletions(-) diff --git a/base/applications/cmdutils/mode/mode.c b/base/applications/cmdutils/mode/mode.c index e4e4faf75c..2981edfe1c 100644 --- a/base/applications/cmdutils/mode/mode.c +++ b/base/applications/cmdutils/mode/mode.c @@ -46,7 +46,7 @@ /*** For fixes, see also network/net/main.c ***/ // VOID PrintPadding(...) -INT +VOID __cdecl UnderlinedResPrintf( IN PCON_STREAM Stream, @@ -69,50 +69,76 @@ UnderlinedResPrintf( szMsgBuffer[i] = L'-'; szMsgBuffer[Len] = UNICODE_NULL; - // FIXME: Use ConStreamWrite instead. - ConPuts(Stream, szMsgBuffer); - - return Len; + ConStreamWrite(Stream, szMsgBuffer, Len); } int QueryDevices(VOID) { - WCHAR buffer[20240]; - WCHAR* ptr = buffer; + PWSTR Buffer, ptr; + DWORD dwLen = MAX_PATH; + + /* Pre-allocate a buffer for QueryDosDeviceW() */ + Buffer = HeapAlloc(GetProcessHeap(), 0, dwLen * sizeof(WCHAR)); + if (Buffer == NULL) + { + /* We failed, bail out */ + wprintf(L"ERROR: Not enough memory\n"); + return 0; + } - *ptr = L'\0'; - // FIXME: Dynamically allocate 'buffer' in a loop. - if (QueryDosDeviceW(NULL, buffer, ARRAYSIZE(buffer))) + for (;;) { - while (*ptr != L'\0') + *Buffer = UNICODE_NULL; + if (QueryDosDeviceW(NULL, Buffer, dwLen)) + break; + + if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) { - if (wcsstr(ptr, L"COM")) - { - ConResPrintf(StdOut, IDS_QUERY_SERIAL_FOUND, ptr); - } - else if (wcsstr(ptr, L"PRN")) - { - ConResPrintf(StdOut, IDS_QUERY_PRINTER_FOUND, ptr); - } - else if (wcsstr(ptr, L"LPT")) - { - ConResPrintf(StdOut, IDS_QUERY_PARALLEL_FOUND, ptr); - } - else if (wcsstr(ptr, L"AUX") || wcsstr(ptr, L"NUL")) - { - ConResPrintf(StdOut, IDS_QUERY_DOSDEV_FOUND, ptr); - } - else - { - // ConResPrintf(StdOut, IDS_QUERY_MISC_FOUND, ptr); - } - ptr += (wcslen(ptr) + 1); + /* We failed, bail out */ + wprintf(L"ERROR: QueryDosDeviceW(...) failed: 0x%lx\n", GetLastError()); + HeapFree(GetProcessHeap(), 0, Buffer); + return 0; + } + + /* The buffer was too small, try to re-allocate it */ + dwLen *= 2; + ptr = HeapReAlloc(GetProcessHeap(), 0, Buffer, dwLen * sizeof(WCHAR)); + if (ptr == NULL) + { + /* We failed, bail out */ + wprintf(L"ERROR: Not enough memory\n"); + HeapFree(GetProcessHeap(), 0, Buffer); + return 0; } + Buffer = ptr; } - else + + for (ptr = Buffer; *ptr != UNICODE_NULL; ptr += wcslen(ptr) + 1) { - wprintf(L"ERROR: QueryDosDeviceW(...) failed: 0x%lx\n", GetLastError()); + if (wcsstr(ptr, L"COM")) + { + ConResPrintf(StdOut, IDS_QUERY_SERIAL_FOUND, ptr); + } + else if (wcsstr(ptr, L"PRN")) + { + ConResPrintf(StdOut, IDS_QUERY_PRINTER_FOUND, ptr); + } + else if (wcsstr(ptr, L"LPT")) + { + ConResPrintf(StdOut, IDS_QUERY_PARALLEL_FOUND, ptr); + } + else if (wcsstr(ptr, L"AUX") || wcsstr(ptr, L"NUL")) + { + ConResPrintf(StdOut, IDS_QUERY_DOSDEV_FOUND, ptr); + } + else + { + // ConResPrintf(StdOut, IDS_QUERY_MISC_FOUND, ptr); + } } + + /* Free the buffer and return success */ + HeapFree(GetProcessHeap(), 0, Buffer); return 1; } @@ -129,7 +155,7 @@ int ShowParallelStatus(INT nPortNum) if (QueryDosDeviceW(szPortName, buffer, ARRAYSIZE(buffer))) { - WCHAR* ptr = wcsrchr(buffer, L'\\'); + PWSTR ptr = wcsrchr(buffer, L'\\'); if (ptr != NULL) { if (_wcsicmp(szPortName, ++ptr) == 0) @@ -1131,7 +1157,7 @@ int wmain(int argc, WCHAR* argv[]) */ ArgStrSize = 0; - /* Compute space needed for the new string, and allocate it */ + /* Compute the space needed for the new string, and allocate it */ for (arg = 1; arg < argc; arg++) { ArgStrSize += wcslen(argv[arg]) + 1; // 1 for space @@ -1166,8 +1192,15 @@ int wmain(int argc, WCHAR* argv[]) } else if (_wcsnicmp(argStr, L"/STA", 4) == 0) { - // FIXME: Check if there are other "parameters" after the status, - // in which case this is invalid. + /* Skip this parameter */ + while (*argStr != L' ') argStr++; + /* Skip any delimiter */ + while (*argStr == L' ') argStr++; + + /* The presence of any other parameter is invalid */ + if (*argStr) + goto invalid_parameter; + goto show_status; } else if (_wcsnicmp(argStr, L"LPT", 3) == 0) @@ -1179,7 +1212,11 @@ int wmain(int argc, WCHAR* argv[]) if (*argStr == L':') argStr++; while (*argStr == L' ') argStr++; - ret = ShowParallelStatus(nPortNum); + if (!*argStr || _wcsnicmp(argStr, L"/STA", 4) == 0) + ret = ShowParallelStatus(nPortNum); + else + wprintf(L"ERROR: LPT port redirection is not implemented!\n"); + // TODO: Implement setting LPT port redirection using SetParallelState(). goto Quit; } else if (_wcsnicmp(argStr, L"COM", 3) == 0)

6 years, 8 months

02/02: [EVENTVWR] Additions for the Event Viewer. CORE-11637, CORE-12269

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bf3589a280df2b1450b6d… commit bf3589a280df2b1450b6de35d7fafe56f4c4d07c Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue Apr 17 23:01:45 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Apr 17 23:17:48 2018 +0200 [EVENTVWR] Additions for the Event Viewer. CORE-11637, CORE-12269 - Implement support for remote connections to NT computers to view their event logs (and the event logs settings). For the moment the remote computer name specification is is only available via the command-line. Note that the paths to the event log files need also to be translated to network-share format. - Implement loading and saving the settings of the event viewer. - Implement showing/hiding the events description pane, the ListView grid, and whether or not to save the EventViewer settings. - Handle hypertext link click handling for the RichEdit edit box of the events description dialog. --- base/applications/mscutils/eventvwr/eventvwr.c | 518 ++++++++++++++++++++-- base/applications/mscutils/eventvwr/evtdetctl.c | 58 ++- base/applications/mscutils/eventvwr/lang/bg-BG.rc | 5 +- base/applications/mscutils/eventvwr/lang/cs-CZ.rc | 5 +- base/applications/mscutils/eventvwr/lang/de-DE.rc | 5 +- base/applications/mscutils/eventvwr/lang/el-GR.rc | 5 +- base/applications/mscutils/eventvwr/lang/en-US.rc | 5 +- base/applications/mscutils/eventvwr/lang/es-ES.rc | 5 +- base/applications/mscutils/eventvwr/lang/fr-FR.rc | 5 +- base/applications/mscutils/eventvwr/lang/he-IL.rc | 5 +- base/applications/mscutils/eventvwr/lang/it-IT.rc | 5 +- base/applications/mscutils/eventvwr/lang/ja-JP.rc | 5 +- base/applications/mscutils/eventvwr/lang/ko-KR.rc | 5 +- base/applications/mscutils/eventvwr/lang/no-NO.rc | 5 +- base/applications/mscutils/eventvwr/lang/pl-PL.rc | 5 +- base/applications/mscutils/eventvwr/lang/pt-BR.rc | 5 +- base/applications/mscutils/eventvwr/lang/ro-RO.rc | 5 +- base/applications/mscutils/eventvwr/lang/ru-RU.rc | 5 +- base/applications/mscutils/eventvwr/lang/sk-SK.rc | 5 +- base/applications/mscutils/eventvwr/lang/sq-AL.rc | 5 +- base/applications/mscutils/eventvwr/lang/sv-SE.rc | 5 +- base/applications/mscutils/eventvwr/lang/tr-TR.rc | 5 +- base/applications/mscutils/eventvwr/lang/uk-UA.rc | 5 +- base/applications/mscutils/eventvwr/lang/zh-CN.rc | 5 +- base/applications/mscutils/eventvwr/lang/zh-TW.rc | 5 +- base/applications/mscutils/eventvwr/resource.h | 8 +- 26 files changed, 626 insertions(+), 73 deletions(-) diff --git a/base/applications/mscutils/eventvwr/eventvwr.c b/base/applications/mscutils/eventvwr/eventvwr.c index 318e5dea5a..01c416e1a6 100644 --- a/base/applications/mscutils/eventvwr/eventvwr.c +++ b/base/applications/mscutils/eventvwr/eventvwr.c @@ -39,6 +39,7 @@ static const LPCWSTR EVENTVWR_WNDCLASS = L"EVENTVWR"; /* The main window class name */ static const LPCWSTR EVENTLOG_BASE_KEY = L"SYSTEM\\CurrentControlSet\\Services\\EventLog\\"; +static const LPCWSTR EVNTVWR_PARAM_KEY = L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Event Viewer"; /* The 3 system logs that should always exist in the user's system */ static const LPCWSTR SystemLogs[] = @@ -91,6 +92,7 @@ LPWSTR lpComputerName = NULL; /* NULL: local user computer (default) */ LPWSTR lpszzUserLogsToLoad = NULL; /* The list of user logs to load at startup (multi-string) */ SIZE_T cbUserLogsSize = 0; +HKEY hkMachine = NULL; // Registry handle to the HKEY_LOCAL_MACHINE key of the remote computer registry. /* Global event records cache for the current active event log filter */ DWORD g_TotalRecords = 0; @@ -100,7 +102,6 @@ PEVENTLOGRECORD* g_RecordPtrs = NULL; LIST_ENTRY EventLogList; LIST_ENTRY EventLogFilterList; PEVENTLOGFILTER ActiveFilter = NULL; -BOOL NewestEventsFirst = TRUE; HANDLE hEnumEventsThread = NULL; HANDLE hStopEnumEvent = NULL; @@ -117,6 +118,21 @@ HANDLE hStartEnumEvent = NULL; // Command event OPENFILENAMEW sfn; +/* Event Viewer Application Settings */ +typedef struct _SETTINGS +{ + BOOL bShowDetailsPane; /* Show (TRUE) or Hide (FALSE) the events details pane */ + BOOL bShowGrid; /* Show (TRUE) or Hide (FALSE) the events view grid */ + BOOL bSaveSettings; /* Save (TRUE) or do not save (FALSE) current settings on exit */ + BOOL bNewestEventsFirst; /* Sort the displayed events the newest ones first (TRUE) or last (FALSE) */ + INT nVSplitPos; /* Vertical splitter position */ + INT nHSplitPos; /* Horizontal splitter position */ + WINDOWPLACEMENT wpPos; +} SETTINGS, *PSETTINGS; + +SETTINGS Settings; + + /* Forward declarations of functions included in this code module */ static DWORD WINAPI @@ -129,7 +145,7 @@ VOID FreeLogList(VOID); VOID FreeLogFilterList(VOID); ATOM MyRegisterClass(HINSTANCE); -BOOL InitInstance(HINSTANCE, int); +BOOL InitInstance(HINSTANCE); LRESULT CALLBACK WndProc(HWND, UINT, WPARAM, LPARAM); INT_PTR EventLogProperties(HINSTANCE, HWND, PEVENTLOGFILTER); INT_PTR CALLBACK EventDetails(HWND, UINT, WPARAM, LPARAM); @@ -296,13 +312,18 @@ ProcessCmdLine(IN LPWSTR lpCmdLine) if (i == 1) { /* Store the computer name */ + LPWSTR lpTemp = argv[i]; SIZE_T cbLength; - cbLength = (wcslen(argv[i]) + 1) * sizeof(WCHAR); + /* Strip any leading backslashes */ + while (*lpTemp == L'\\') + ++lpTemp; + + cbLength = (wcslen(lpTemp) + 1) * sizeof(WCHAR); lpComputerName = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, cbLength); if (lpComputerName) { - StringCbCopyW(lpComputerName, cbLength, argv[i]); + StringCbCopyW(lpComputerName, cbLength, lpTemp); } /* else, fall back to local computer */ } @@ -339,6 +360,214 @@ Quit: return Success; } +BOOL +LoadSettings(int nDefCmdShow) +{ + HKEY hKeyEventVwr; + LONG Result; + DWORD dwSize; + DWORD dwType; + DWORD Value; + UNICODE_STRING ValueU; + WCHAR buffer[100]; + + /* Load the default values */ + Settings.bShowDetailsPane = TRUE; + Settings.bShowGrid = FALSE; + Settings.bSaveSettings = TRUE; + Settings.bNewestEventsFirst = TRUE; + Settings.nVSplitPos = 250; /* Splitter default positions */ + Settings.nHSplitPos = 250; + ZeroMemory(&Settings.wpPos, sizeof(Settings.wpPos)); + Settings.wpPos.length = sizeof(Settings.wpPos); + Settings.wpPos.rcNormalPosition.left = CW_USEDEFAULT; + Settings.wpPos.rcNormalPosition.top = CW_USEDEFAULT; + Settings.wpPos.rcNormalPosition.right = CW_USEDEFAULT; + Settings.wpPos.rcNormalPosition.bottom = CW_USEDEFAULT; + + /* Try to create/open the Event Viewer user key */ + if (RegCreateKeyExW(HKEY_CURRENT_USER, + EVNTVWR_PARAM_KEY, + 0, + NULL, + REG_OPTION_NON_VOLATILE, + KEY_READ | KEY_WRITE, + NULL, + &hKeyEventVwr, + NULL) != ERROR_SUCCESS) + { + return FALSE; + } + + // Result = RegQueryValueExW(hKeyEventVwr, L"Filter", NULL, &dwType, (LPBYTE)&szFilter, &dwSize); // REG_SZ + // Result = RegQueryValueExW(hKeyEventVwr, L"Find", NULL, &dwType, (LPBYTE)&szFind, &dwSize); // REG_SZ + // Result = RegQueryValueExW(hKeyEventVwr, L"Module", NULL, &dwType, (LPBYTE)&szModule, &dwSize); // REG_SZ + + dwSize = sizeof(Value); + Result = RegQueryValueExW(hKeyEventVwr, L"DetailsPane", NULL, &dwType, (LPBYTE)&Value, &dwSize); + if ((Result == ERROR_SUCCESS) && (dwType == REG_SZ || dwType == REG_DWORD)) + { + if (dwType == REG_SZ) + { + ValueU.Buffer = (PWSTR)&Value; + ValueU.Length = ValueU.MaximumLength = dwSize; + RtlUnicodeStringToInteger(&ValueU, 10, &Value); + } + Settings.bShowDetailsPane = !!Value; + } + + dwSize = sizeof(Value); + Result = RegQueryValueExW(hKeyEventVwr, L"ShowGrid", NULL, &dwType, (LPBYTE)&Value, &dwSize); + if ((Result == ERROR_SUCCESS) && (dwType == REG_SZ || dwType == REG_DWORD)) + { + if (dwType == REG_SZ) + { + ValueU.Buffer = (PWSTR)&Value; + ValueU.Length = ValueU.MaximumLength = dwSize; + RtlUnicodeStringToInteger(&ValueU, 10, &Value); + } + Settings.bShowGrid = !!Value; + } + + dwSize = sizeof(Value); + Result = RegQueryValueExW(hKeyEventVwr, L"SortOrder", NULL, &dwType, (LPBYTE)&Value, &dwSize); + if ((Result == ERROR_SUCCESS) && (dwType == REG_SZ || dwType == REG_DWORD)) + { + if (dwType == REG_SZ) + { + ValueU.Buffer = (PWSTR)&Value; + ValueU.Length = ValueU.MaximumLength = dwSize; + RtlUnicodeStringToInteger(&ValueU, 10, &Value); + } + Settings.bNewestEventsFirst = !!Value; + } + + /* Retrieve the splitter positions */ + dwSize = sizeof(Value); + Result = RegQueryValueExW(hKeyEventVwr, L"VSplitPos", NULL, &dwType, (LPBYTE)&Value, &dwSize); + if ((Result == ERROR_SUCCESS) && (dwType == REG_SZ || dwType == REG_DWORD)) + { + if (dwType == REG_SZ) + { + ValueU.Buffer = (PWSTR)&Value; + ValueU.Length = ValueU.MaximumLength = dwSize; + RtlUnicodeStringToInteger(&ValueU, 10, &Value); + } + Settings.nVSplitPos = Value; + } + + dwSize = sizeof(Value); + Result = RegQueryValueExW(hKeyEventVwr, L"HSplitPos", NULL, &dwType, (LPBYTE)&Value, &dwSize); + if ((Result == ERROR_SUCCESS) && (dwType == REG_SZ || dwType == REG_DWORD)) + { + if (dwType == REG_SZ) + { + ValueU.Buffer = (PWSTR)&Value; + ValueU.Length = ValueU.MaximumLength = dwSize; + RtlUnicodeStringToInteger(&ValueU, 10, &Value); + } + Settings.nHSplitPos = Value; + } + + /* Retrieve the geometry of the main window */ + dwSize = sizeof(buffer); + Result = RegQueryValueExW(hKeyEventVwr, L"Window", NULL, &dwType, (LPBYTE)buffer, &dwSize); + if ((Result != ERROR_SUCCESS) || (dwType != REG_SZ)) + buffer[0] = UNICODE_NULL; + + if (swscanf(buffer, L"%d %d %d %d %d", + &Settings.wpPos.rcNormalPosition.left, + &Settings.wpPos.rcNormalPosition.top, + &Settings.wpPos.rcNormalPosition.right, + &Settings.wpPos.rcNormalPosition.bottom, + &Settings.wpPos.showCmd) != 5) + { + /* Parsing failed, use defaults */ + Settings.wpPos.rcNormalPosition.left = CW_USEDEFAULT; + Settings.wpPos.rcNormalPosition.top = CW_USEDEFAULT; + Settings.wpPos.rcNormalPosition.right = CW_USEDEFAULT; + Settings.wpPos.rcNormalPosition.bottom = CW_USEDEFAULT; + Settings.wpPos.showCmd = nDefCmdShow; // SW_SHOWNORMAL; + } + + dwSize = sizeof(Value); + Result = RegQueryValueExW(hKeyEventVwr, L"SaveSettings", NULL, &dwType, (LPBYTE)&Value, &dwSize); + if ((Result == ERROR_SUCCESS) && (dwType == REG_SZ || dwType == REG_DWORD)) + { + if (dwType == REG_SZ) + { + ValueU.Buffer = (PWSTR)&Value; + ValueU.Length = ValueU.MaximumLength = dwSize; + RtlUnicodeStringToInteger(&ValueU, 10, &Value); + } + Settings.bSaveSettings = !!Value; + } + + RegCloseKey(hKeyEventVwr); + return TRUE; +} + +BOOL +SaveSettings(VOID) +{ + HKEY hKeyEventVwr; + DWORD dwSize; + WCHAR buffer[100]; + + /* Try to create/open the Event Viewer user key */ + if (RegCreateKeyExW(HKEY_CURRENT_USER, + EVNTVWR_PARAM_KEY, + 0, + NULL, + REG_OPTION_NON_VOLATILE, + KEY_READ | KEY_WRITE, + NULL, + &hKeyEventVwr, + NULL) != ERROR_SUCCESS) + { + return FALSE; + } + + dwSize = sizeof(Settings.bSaveSettings); + RegSetValueExW(hKeyEventVwr, L"SaveSettings", 0, REG_DWORD, (LPBYTE)&Settings.bSaveSettings, dwSize); + + /* Do not save more settings if we are not asked to do so */ + if (!Settings.bSaveSettings) + goto Quit; + + dwSize = sizeof(Settings.bShowDetailsPane); + RegSetValueExW(hKeyEventVwr, L"DetailsPane", 0, REG_DWORD, (LPBYTE)&Settings.bShowDetailsPane, dwSize); + + dwSize = sizeof(Settings.bShowGrid); + RegSetValueExW(hKeyEventVwr, L"ShowGrid", 0, REG_DWORD, (LPBYTE)&Settings.bShowGrid, dwSize); + + dwSize = sizeof(Settings.bNewestEventsFirst); + RegSetValueExW(hKeyEventVwr, L"SortOrder", 0, REG_DWORD, (LPBYTE)&Settings.bNewestEventsFirst, dwSize); + + Settings.nVSplitPos = nVSplitPos; + dwSize = sizeof(Settings.nVSplitPos); + RegSetValueExW(hKeyEventVwr, L"VSplitPos", 0, REG_DWORD, (LPBYTE)&Settings.nVSplitPos, dwSize); + + Settings.nHSplitPos = nHSplitPos; + dwSize = sizeof(Settings.nHSplitPos); + RegSetValueExW(hKeyEventVwr, L"HSplitPos", 0, REG_DWORD, (LPBYTE)&Settings.nHSplitPos, dwSize); + + StringCbPrintfW(buffer, sizeof(buffer), + L"%d %d %d %d %d", + Settings.wpPos.rcNormalPosition.left, + Settings.wpPos.rcNormalPosition.top, + Settings.wpPos.rcNormalPosition.right, + Settings.wpPos.rcNormalPosition.bottom, + Settings.wpPos.showCmd); + + dwSize = wcslen(buffer) * sizeof(WCHAR); + RegSetValueExW(hKeyEventVwr, L"Window", 0, REG_SZ, (LPBYTE)buffer, dwSize); + +Quit: + RegCloseKey(hKeyEventVwr); + return TRUE; +} + int APIENTRY wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, @@ -389,8 +618,11 @@ wWinMain(HINSTANCE hInstance, if (!MyRegisterClass(hInstance)) goto Quit; + /* Load the settings */ + LoadSettings(nCmdShow); + /* Perform application initialization */ - if (!InitInstance(hInstance, nCmdShow)) + if (!InitInstance(hInstance)) goto Quit; hAccelTable = LoadAcceleratorsW(hInstance, MAKEINTRESOURCEW(IDA_EVENTVWR)); @@ -442,6 +674,17 @@ wWinMain(HINSTANCE hInstance, } } + /* Save the settings */ + SaveSettings(); + + /* Disconnect from computer */ + if (hkMachine && hkMachine != HKEY_LOCAL_MACHINE) + { + /* We are connected to some other computer, close the old connection */ + RegCloseKey(hkMachine); + hkMachine = NULL; + } + /* Stop the enumerator thread */ SetEvent(hStartStopEnumEvent); WaitForSingleObject(hThread, INFINITE); @@ -590,7 +833,14 @@ GetMessageStringFromDll( } else { + LPWSTR ptr; + ASSERT(lpMsgBuf); + + /* Trim any trailing whitespace */ + ptr = lpMsgBuf + dwLength - 1; + while (iswspace(*ptr)) + *ptr-- = UNICODE_NULL; } return lpMsgBuf; @@ -1210,6 +1460,79 @@ TrimNulls(LPWSTR s) } } +DWORD +GetExpandedFilePathName( + IN LPCWSTR ComputerName OPTIONAL, + IN LPCWSTR lpFileName, + OUT LPWSTR lpFullFileName OPTIONAL, + IN DWORD nSize) +{ + DWORD dwLength; + + /* Determine the needed size after expansion of any environment strings */ + dwLength = ExpandEnvironmentStringsW(lpFileName, NULL, 0); + if (dwLength == 0) + { + /* We failed, bail out */ + return 0; + } + + /* If the file path is on a remote computer, estimate its length */ + // FIXME: Use WNetGetUniversalName instead? + if (ComputerName && *ComputerName) + { + /* Skip any leading backslashes */ + while (*ComputerName == L'\\') + ++ComputerName; + + if (*ComputerName) + { + /* Count 2 backslashes plus the computer name and one backslash separator */ + dwLength += 2 + wcslen(ComputerName) + 1; + } + } + + /* Check whether we have enough space */ + if (dwLength > nSize) + { + /* No, return the needed size in characters (includes NULL-terminator) */ + return dwLength; + } + + + /* Now expand the file path */ + ASSERT(dwLength <= nSize); + + /* Expand any existing environment strings */ + if (ExpandEnvironmentStringsW(lpFileName, lpFullFileName, dwLength) == 0) + { + /* We failed, bail out */ + return 0; + } + + /* If the file path is on a remote computer, retrieve the network share form of the file name */ + // FIXME: Use WNetGetUniversalName instead? + if (ComputerName && *ComputerName) + { + /* Note that we previously skipped any potential leading backslashes */ + + /* Replace ':' by '$' in the drive letter */ + if (*lpFullFileName && lpFullFileName[1] == L':') + lpFullFileName[1] = L'$'; + + /* Prepend the computer name */ + RtlMoveMemory(lpFullFileName + 2 + wcslen(ComputerName) + 1, + lpFullFileName, dwLength * sizeof(WCHAR) - (2 + wcslen(ComputerName) + 1) * sizeof(WCHAR)); + lpFullFileName[0] = L'\\'; + lpFullFileName[1] = L'\\'; + wcsncpy(lpFullFileName + 2, ComputerName, wcslen(ComputerName)); + lpFullFileName[2 + wcslen(ComputerName)] = L'\\'; + } + + /* Return the number of stored characters (includes NULL-terminator) */ + return dwLength; +} + BOOL GetEventMessageFileDLL(IN LPCWSTR lpLogName, IN LPCWSTR SourceName, @@ -1227,7 +1550,7 @@ GetEventMessageFileDLL(IN LPCWSTR lpLogName, StringCbCopyW(szKeyName, sizeof(szKeyName), EVENTLOG_BASE_KEY); StringCbCatW(szKeyName, sizeof(szKeyName), lpLogName); - Result = RegOpenKeyExW(HKEY_LOCAL_MACHINE, + Result = RegOpenKeyExW(hkMachine, szKeyName, 0, KEY_READ, @@ -1261,7 +1584,7 @@ GetEventMessageFileDLL(IN LPCWSTR lpLogName, { /* NULL-terminate the string and expand it */ szModuleName[dwSize / sizeof(WCHAR) - 1] = UNICODE_NULL; - ExpandEnvironmentStringsW(szModuleName, lpModuleName, ARRAYSIZE(szModuleName)); + GetExpandedFilePathName(lpComputerName, szModuleName, lpModuleName, ARRAYSIZE(szModuleName)); Success = TRUE; } @@ -1518,7 +1841,7 @@ GetEventUserName(IN PEVENTLOGRECORD pelr, * string-form. It should not be bigger than the user-provided buffer * 'pszUser', otherwise we return an error. */ - if (LookupAccountSidW(NULL, // FIXME: Use computer name? From the particular event? + if (LookupAccountSidW(lpComputerName, pCurrentSid, szName, &cchName, @@ -1801,7 +2124,7 @@ EnumEventsThread(IN LPVOID lpParameter) ProgressBar_SetRange(hwndStatusProgress, MAKELPARAM(0, 100)); uStepAt = (dwTotalRecords / 100) + 1; - dwFlags = EVENTLOG_SEQUENTIAL_READ | (NewestEventsFirst ? EVENTLOG_FORWARDS_READ : EVENTLOG_BACKWARDS_READ); + dwFlags = EVENTLOG_SEQUENTIAL_READ | (Settings.bNewestEventsFirst ? EVENTLOG_FORWARDS_READ : EVENTLOG_BACKWARDS_READ); /* 0x7ffff is the maximum buffer size ReadEventLog will accept */ dwWanted = 0x7ffff; @@ -2416,7 +2739,7 @@ GetDisplayNameFileAndID(IN LPCWSTR lpLogName, StringCbCopyW(KeyPath, cbKeyPath, EVENTLOG_BASE_KEY); StringCbCatW(KeyPath, cbKeyPath, lpLogName); - Result = RegOpenKeyExW(HKEY_LOCAL_MACHINE, KeyPath, 0, KEY_QUERY_VALUE, &hLogKey); + Result = RegOpenKeyExW(hkMachine, KeyPath, 0, KEY_QUERY_VALUE, &hLogKey); HeapFree(GetProcessHeap(), 0, KeyPath); if (Result != ERROR_SUCCESS) return FALSE; @@ -2436,7 +2759,7 @@ GetDisplayNameFileAndID(IN LPCWSTR lpLogName, { /* NULL-terminate the string and expand it */ szModuleName[cbData / sizeof(WCHAR) - 1] = UNICODE_NULL; - ExpandEnvironmentStringsW(szModuleName, lpModuleName, ARRAYSIZE(szModuleName)); + GetExpandedFilePathName(lpComputerName, szModuleName, lpModuleName, ARRAYSIZE(szModuleName)); Success = TRUE; } @@ -2482,11 +2805,32 @@ BuildLogListAndFilterList(IN LPCWSTR lpComputerName) LPWSTR lpDisplayName; HTREEITEM hRootNode = NULL, hItem = NULL, hItemDefault = NULL; + if (hkMachine && hkMachine != HKEY_LOCAL_MACHINE) + { + /* We are connected to some other computer, close the old connection */ + RegCloseKey(hkMachine); + hkMachine = NULL; + } + if (!lpComputerName || !*lpComputerName) + { + /* Use the local computer registry */ + hkMachine = HKEY_LOCAL_MACHINE; + } + else + { + /* Connect to the remote computer registry */ + Result = RegConnectRegistry(lpComputerName, HKEY_LOCAL_MACHINE, &hkMachine); + if (Result != ERROR_SUCCESS) + { + /* Connection failed, display a message and bail out */ + hkMachine = NULL; + ShowWin32Error(GetLastError()); + return; + } + } + /* Open the EventLog key */ - // TODO: Implement connection to remote computer... - // At the moment we only support the user local computer. - // FIXME: Use local or remote computer - Result = RegOpenKeyExW(HKEY_LOCAL_MACHINE, EVENTLOG_BASE_KEY, 0, KEY_READ, &hEventLogKey); + Result = RegOpenKeyExW(hkMachine, EVENTLOG_BASE_KEY, 0, KEY_READ, &hEventLogKey); if (Result != ERROR_SUCCESS) { return; @@ -2689,8 +3033,7 @@ FreeLogFilterList(VOID) } BOOL -InitInstance(HINSTANCE hInstance, - int nCmdShow) +InitInstance(HINSTANCE hInstance) { RECT rcClient, rs; LONG StatusHeight; @@ -2699,10 +3042,13 @@ InitInstance(HINSTANCE hInstance, WCHAR szTemp[256]; /* Create the main window */ + rs = Settings.wpPos.rcNormalPosition; hwndMainWindow = CreateWindowW(EVENTVWR_WNDCLASS, szTitle, WS_OVERLAPPEDWINDOW | WS_CLIPCHILDREN, - CW_USEDEFAULT, 0, CW_USEDEFAULT, 0, + rs.left, rs.top, + (rs.right != CW_USEDEFAULT && rs.left != CW_USEDEFAULT) ? rs.right - rs.left : CW_USEDEFAULT, + (rs.bottom != CW_USEDEFAULT && rs.top != CW_USEDEFAULT) ? rs.bottom - rs.top : CW_USEDEFAULT, NULL, NULL, hInstance, @@ -2737,11 +3083,14 @@ InitInstance(HINSTANCE hInstance, NULL, // window ID hInstance, // instance NULL); // window data + /* Remove its static edge */ + SetWindowLongPtrW(hwndStatusProgress, GWL_EXSTYLE, + GetWindowLongPtrW(hwndStatusProgress, GWL_EXSTYLE) & ~WS_EX_STATICEDGE); ProgressBar_SetStep(hwndStatusProgress, 1); /* Initialize the splitter default positions */ - nVSplitPos = 250; - nHSplitPos = 250; + nVSplitPos = Settings.nVSplitPos; + nHSplitPos = Settings.nHSplitPos; /* Create the TreeView */ hwndTreeView = CreateWindowExW(WS_EX_CLIENTEDGE, @@ -2785,11 +3134,8 @@ InitInstance(HINSTANCE hInstance, /* Create the Event details pane (optional) */ hwndEventDetails = CreateEventDetailsCtrl(hInst, hwndMainWindow, (LPARAM)NULL); - // hwndEventDetails = NULL; if (hwndEventDetails) { - // SetWindowLongPtrW(hwndEventDetails, GWL_STYLE, - // GetWindowLongPtrW(hwndEventDetails, GWL_STYLE) | WS_BORDER); SetWindowLongPtrW(hwndEventDetails, GWL_EXSTYLE, GetWindowLongPtrW(hwndEventDetails, GWL_EXSTYLE) | WS_EX_CLIENTEDGE); SetWindowPos(hwndEventDetails, NULL, @@ -2797,7 +3143,7 @@ InitInstance(HINSTANCE hInstance, nHSplitPos + SPLIT_WIDTH/2, (rcClient.right - rcClient.left) - nVSplitPos - SPLIT_WIDTH/2, (rcClient.bottom - rcClient.top) - nHSplitPos - SPLIT_WIDTH/2 - StatusHeight, - SWP_NOZORDER | SWP_NOACTIVATE | SWP_SHOWWINDOW); + SWP_NOZORDER | SWP_NOACTIVATE | (Settings.bShowDetailsPane ? SWP_SHOWWINDOW : SWP_HIDEWINDOW)); } /* Create the ListView */ @@ -2808,15 +3154,16 @@ InitInstance(HINSTANCE hInstance, nVSplitPos + SPLIT_WIDTH/2, 0, (rcClient.right - rcClient.left) - nVSplitPos - SPLIT_WIDTH/2, - hwndEventDetails ? nHSplitPos - SPLIT_WIDTH/2 - : (rcClient.bottom - rcClient.top) - StatusHeight, + hwndEventDetails && Settings.bShowDetailsPane + ? nHSplitPos - SPLIT_WIDTH/2 + : (rcClient.bottom - rcClient.top) - StatusHeight, hwndMainWindow, NULL, hInstance, NULL); /* Add the extended ListView styles */ - ListView_SetExtendedListViewStyle(hwndListView, LVS_EX_HEADERDRAGDROP | LVS_EX_FULLROWSELECT |LVS_EX_LABELTIP); + ListView_SetExtendedListViewStyle(hwndListView, LVS_EX_HEADERDRAGDROP | LVS_EX_FULLROWSELECT | LVS_EX_LABELTIP | (Settings.bShowGrid ? LVS_EX_GRIDLINES : 0)); /* Create the ImageList */ hSmall = ImageList_Create(GetSystemMetrics(SM_CXSMICON), @@ -2914,7 +3261,7 @@ InitInstance(HINSTANCE hInstance, sfn.Flags = OFN_HIDEREADONLY | OFN_SHAREAWARE; sfn.lpstrDefExt = NULL; - ShowWindow(hwndMainWindow, nCmdShow); + ShowWindow(hwndMainWindow, Settings.wpPos.showCmd); UpdateWindow(hwndMainWindow); return TRUE; @@ -2922,20 +3269,27 @@ InitInstance(HINSTANCE hInstance, VOID ResizeWnd(INT cx, INT cy) { - HDWP hdwp; RECT rs; LONG StatusHeight; + LONG_PTR dwExStyle; + HDWP hdwp; /* Resize the status bar -- now done in WM_SIZE */ // SendMessageW(hwndStatus, WM_SIZE, 0, 0); GetWindowRect(hwndStatus, &rs); StatusHeight = rs.bottom - rs.top; - /* Move the progress bar */ + /* + * Move the progress bar -- Take into account for extra size due to the static edge + * (AdjustWindowRectEx() does not seem to work for the progress bar). + */ StatusBar_GetItemRect(hwndStatus, 0, &rs); + dwExStyle = GetWindowLongPtrW(hwndStatusProgress, GWL_EXSTYLE); + SetWindowLongPtrW(hwndStatusProgress, GWL_EXSTYLE, dwExStyle | WS_EX_STATICEDGE); MoveWindow(hwndStatusProgress, - rs.left, rs.top, rs.right-rs.left, rs.bottom-rs.top, + rs.left, rs.top, rs.right - rs.left, rs.bottom - rs.top, IsWindowVisible(hwndStatusProgress) ? TRUE : FALSE); + SetWindowLongPtrW(hwndStatusProgress, GWL_EXSTYLE, dwExStyle); /* * TODO: Adjust the splitter positions: @@ -2962,11 +3316,12 @@ VOID ResizeWnd(INT cx, INT cy) HWND_TOP, nVSplitPos + SPLIT_WIDTH/2, 0, cx - nVSplitPos - SPLIT_WIDTH/2, - hwndEventDetails ? nHSplitPos - SPLIT_WIDTH/2 - : cy - StatusHeight, + hwndEventDetails && Settings.bShowDetailsPane + ? nHSplitPos - SPLIT_WIDTH/2 + : cy - StatusHeight, SWP_NOZORDER | SWP_NOACTIVATE); - if (hwndEventDetails && hdwp) + if (hwndEventDetails && Settings.bShowDetailsPane && hdwp) hdwp = DeferWindowPos(hdwp, hwndEventDetails, HWND_TOP, @@ -2993,8 +3348,11 @@ WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) break; case WM_DESTROY: + { + GetWindowPlacement(hwndMainWindow, &Settings.wpPos); PostQuitMessage(0); break; + } case WM_NOTIFY: { @@ -3165,9 +3523,9 @@ WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) case IDM_LIST_NEWEST: { CheckMenuRadioItem(hMainMenu, IDM_LIST_NEWEST, IDM_LIST_OLDEST, IDM_LIST_NEWEST, MF_BYCOMMAND); - if (!NewestEventsFirst) + if (!Settings.bNewestEventsFirst) { - NewestEventsFirst = TRUE; + Settings.bNewestEventsFirst = TRUE; Refresh(GetSelectedFilter(NULL)); } break; @@ -3176,9 +3534,9 @@ WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) case IDM_LIST_OLDEST: { CheckMenuRadioItem(hMainMenu, IDM_LIST_NEWEST, IDM_LIST_OLDEST, IDM_LIST_OLDEST, MF_BYCOMMAND); - if (NewestEventsFirst) + if (Settings.bNewestEventsFirst) { - NewestEventsFirst = FALSE; + Settings.bNewestEventsFirst = FALSE; Refresh(GetSelectedFilter(NULL)); } break; @@ -3205,6 +3563,45 @@ WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) Refresh(GetSelectedFilter(NULL)); break; + case IDM_EVENT_DETAILS_VIEW: + { + Settings.bShowDetailsPane = !Settings.bShowDetailsPane; + CheckMenuItem(hMainMenu, IDM_EVENT_DETAILS_VIEW, + MF_BYCOMMAND | (Settings.bShowDetailsPane ? MF_CHECKED : MF_UNCHECKED)); + + GetClientRect(hWnd, &rect); + if (Settings.bShowDetailsPane) + { + ResizeWnd(rect.right - rect.left, rect.bottom - rect.top); + ShowWindow(hwndEventDetails, SW_SHOW); + } + else + { + ShowWindow(hwndEventDetails, SW_HIDE); + ResizeWnd(rect.right - rect.left, rect.bottom - rect.top); + } + + break; + } + + case IDM_LIST_GRID_LINES: + { + Settings.bShowGrid = !Settings.bShowGrid; + CheckMenuItem(hMainMenu, IDM_LIST_GRID_LINES, + MF_BYCOMMAND | (Settings.bShowGrid ? MF_CHECKED : MF_UNCHECKED)); + + ListView_SetExtendedListViewStyleEx(hwndListView, LVS_EX_GRIDLINES, (Settings.bShowGrid ? LVS_EX_GRIDLINES : 0)); + break; + } + + case IDM_SAVE_SETTINGS: + { + Settings.bSaveSettings = !Settings.bSaveSettings; + CheckMenuItem(hMainMenu, IDM_SAVE_SETTINGS, + MF_BYCOMMAND | (Settings.bSaveSettings ? MF_CHECKED : MF_UNCHECKED)); + break; + } + case IDM_ABOUT: { HICON hIcon; @@ -3234,6 +3631,42 @@ WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) break; } + case WM_INITMENU: + { + if ((HMENU)wParam != hMainMenu) + break; + + CheckMenuRadioItem(hMainMenu, IDM_LIST_NEWEST, IDM_LIST_OLDEST, + Settings.bNewestEventsFirst ? IDM_LIST_NEWEST : IDM_LIST_OLDEST, + MF_BYCOMMAND); + + if (!hwndEventDetails) + { + EnableMenuItem(hMainMenu, IDM_EVENT_DETAILS_VIEW, + MF_BYCOMMAND | MF_GRAYED); + } + CheckMenuItem(hMainMenu, IDM_EVENT_DETAILS_VIEW, + MF_BYCOMMAND | (Settings.bShowDetailsPane ? MF_CHECKED : MF_UNCHECKED)); + + CheckMenuItem(hMainMenu, IDM_LIST_GRID_LINES, + MF_BYCOMMAND | (Settings.bShowGrid ? MF_CHECKED : MF_UNCHECKED)); + + CheckMenuItem(hMainMenu, IDM_SAVE_SETTINGS, + MF_BYCOMMAND | (Settings.bSaveSettings ? MF_CHECKED : MF_UNCHECKED)); + + break; + } + +#if 0 + case WM_INITMENUPOPUP: + lParam = lParam; + break; + + case WM_CONTEXTMENU: + lParam = lParam; + break; +#endif + case WM_SETCURSOR: { POINT pt; @@ -3258,7 +3691,7 @@ WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) } else /* Set the cursor for the horizontal splitter, if the Event details pane is displayed */ - if (hwndEventDetails && + if (hwndEventDetails && Settings.bShowDetailsPane && (pt.y >= nHSplitPos - SPLIT_WIDTH/2 && pt.y < nHSplitPos + SPLIT_WIDTH/2 + 1)) { // RECT rs; @@ -3290,7 +3723,7 @@ WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) } else /* Capture the cursor for the horizontal splitter, if the Event details pane is displayed */ - if (hwndEventDetails && + if (hwndEventDetails && Settings.bShowDetailsPane && (y >= nHSplitPos - SPLIT_WIDTH/2 && y < nHSplitPos + SPLIT_WIDTH/2 + 1)) { bSplit = 2; @@ -3414,7 +3847,7 @@ InitPropertiesDlg(HWND hDlg, PEVENTLOG EventLog) StringCbCopyW(KeyPath, cbKeyPath, EVENTLOG_BASE_KEY); StringCbCatW(KeyPath, cbKeyPath, lpLogName); - if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, KeyPath, 0, KEY_QUERY_VALUE, &hLogKey) != ERROR_SUCCESS) + if (RegOpenKeyExW(hkMachine, KeyPath, 0, KEY_QUERY_VALUE, &hLogKey) != ERROR_SUCCESS) { HeapFree(GetProcessHeap(), 0, KeyPath); goto Quit; @@ -3467,7 +3900,8 @@ Quit: FileName = EventLog->FileName; if (FileName && *FileName) { - ExpandEnvironmentStringsW(FileName, wszBuf, ARRAYSIZE(wszBuf)); + /* Expand the file name. If the log file is on a remote computer, retrieve the network share form of the file name. */ + GetExpandedFilePathName(EventLog->ComputerName, FileName, wszBuf, ARRAYSIZE(wszBuf)); FileName = wszBuf; } else diff --git a/base/applications/mscutils/eventvwr/evtdetctl.c b/base/applications/mscutils/eventvwr/evtdetctl.c index 5a685855b0..d767fe721f 100644 --- a/base/applications/mscutils/eventvwr/evtdetctl.c +++ b/base/applications/mscutils/eventvwr/evtdetctl.c @@ -11,6 +11,8 @@ #include "eventvwr.h" #include "evtdetctl.h" +#include <shellapi.h> + // FIXME: #define EVENT_MESSAGE_EVENTTEXT_BUFFER 1024*10 extern HWND hwndListView; @@ -343,7 +345,46 @@ Quit: CloseClipboard(); } -static VOID +static +VOID +OnLink(HWND hDlg, ENLINK* penLink) +{ + LPWSTR pLink; + TEXTRANGE txtRange; + + ASSERT(penLink->nmhdr.idFrom == IDC_EVENTTEXTEDIT); + + /* Only act on left button up events */ + if (penLink->msg != WM_LBUTTONUP) + return; + + /* If the range is empty, do nothing */ + if (penLink->chrg.cpMin == penLink->chrg.cpMax) + return; + + /* Allocate memory for the text link */ + pLink = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + (max(penLink->chrg.cpMin, penLink->chrg.cpMax) - + min(penLink->chrg.cpMin, penLink->chrg.cpMax) + 1) * sizeof(WCHAR)); + if (!pLink) + { + /* Not enough memory, bail out */ + return; + } + + txtRange.chrg = penLink->chrg; + txtRange.lpstrText = pLink; + SendDlgItemMessageW(hDlg, IDC_EVENTTEXTEDIT, EM_GETTEXTRANGE, 0, (LPARAM)&txtRange); + + /* Open the link */ + ShellExecuteW(hDlg, L"open", pLink, NULL, NULL, SW_SHOWNOACTIVATE); + + /* Free the buffer */ + HeapFree(GetProcessHeap(), 0, pLink); +} + +static +VOID OnScroll(HWND hDlg, PDETAILDATA pData, INT nBar, WORD sbCode) { RECT rect; @@ -858,13 +899,20 @@ EventDetailsCtrl(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) break; case WM_NOTIFY: - switch (((LPNMHDR)lParam)->code) + { + LPNMHDR hdr = (LPNMHDR)lParam; + + if (hdr->idFrom == IDC_EVENTTEXTEDIT) { - case EN_LINK: - // TODO: Act on the activated RichEdit link! - break; + switch (hdr->code) + { + case EN_LINK: + OnLink(hDlg, (ENLINK*)lParam); + break; + } } break; + } case WM_HSCROLL: OnScroll(hDlg, pData, SB_HORZ, LOWORD(wParam)); diff --git a/base/applications/mscutils/eventvwr/lang/bg-BG.rc b/base/applications/mscutils/eventvwr/lang/bg-BG.rc index 9399ff168d..2a874b1ee1 100644 --- a/base/applications/mscutils/eventvwr/lang/bg-BG.rc +++ b/base/applications/mscutils/eventvwr/lang/bg-BG.rc @@ -25,7 +25,10 @@ BEGIN END POPUP "На&стройки" BEGIN - MENUITEM "&Show event details view", IDM_SHOW_EVENT_DETAILS_VIEW + MENUITEM "Event details &view", IDM_EVENT_DETAILS_VIEW + MENUITEM "&Grid lines", IDM_LIST_GRID_LINES + MENUITEM SEPARATOR + MENUITEM "&Save settings on exit", IDM_SAVE_SETTINGS END POPUP "Помо&щ" BEGIN diff --git a/base/applications/mscutils/eventvwr/lang/cs-CZ.rc b/base/applications/mscutils/eventvwr/lang/cs-CZ.rc index ea4f7dbeba..0a347f7040 100644 --- a/base/applications/mscutils/eventvwr/lang/cs-CZ.rc +++ b/base/applications/mscutils/eventvwr/lang/cs-CZ.rc @@ -25,7 +25,10 @@ BEGIN END POPUP "&Možnosti" BEGIN - MENUITEM "&Zobrazit podrobnosti", IDM_SHOW_EVENT_DETAILS_VIEW + MENUITEM "Event details &view", IDM_EVENT_DETAILS_VIEW + MENUITEM "&Grid lines", IDM_LIST_GRID_LINES + MENUITEM SEPARATOR + MENUITEM "&Save settings on exit", IDM_SAVE_SETTINGS END POPUP "&Nápověda" BEGIN diff --git a/base/applications/mscutils/eventvwr/lang/de-DE.rc b/base/applications/mscutils/eventvwr/lang/de-DE.rc index c80fde7921..b73f20cbc0 100644 --- a/base/applications/mscutils/eventvwr/lang/de-DE.rc +++ b/base/applications/mscutils/eventvwr/lang/de-DE.rc @@ -27,7 +27,10 @@ BEGIN END POPUP "&Optionen" BEGIN - MENUITEM "&Show event details view", IDM_SHOW_EVENT_DETAILS_VIEW + MENUITEM "Event details &view", IDM_EVENT_DETAILS_VIEW + MENUITEM "&Grid lines", IDM_LIST_GRID_LINES + MENUITEM SEPARATOR + MENUITEM "&Save settings on exit", IDM_SAVE_SETTINGS END POPUP "&Hilfe" BEGIN diff --git a/base/applications/mscutils/eventvwr/lang/el-GR.rc b/base/applications/mscutils/eventvwr/lang/el-GR.rc index ba92148689..eea6b9dd01 100644 --- a/base/applications/mscutils/eventvwr/lang/el-GR.rc +++ b/base/applications/mscutils/eventvwr/lang/el-GR.rc @@ -27,7 +27,10 @@ BEGIN END POPUP "&Επιλογές" BEGIN - MENUITEM "&Show event details view", IDM_SHOW_EVENT_DETAILS_VIEW + MENUITEM "Event details &view", IDM_EVENT_DETAILS_VIEW + MENUITEM "&Grid lines", IDM_LIST_GRID_LINES + MENUITEM SEPARATOR + MENUITEM "&Save settings on exit", IDM_SAVE_SETTINGS END POPUP "&Βοήθεια" BEGIN diff --git a/base/applications/mscutils/eventvwr/lang/en-US.rc b/base/applications/mscutils/eventvwr/lang/en-US.rc index 9990028d24..4dcd14314c 100644 --- a/base/applications/mscutils/eventvwr/lang/en-US.rc +++ b/base/applications/mscutils/eventvwr/lang/en-US.rc @@ -33,7 +33,10 @@ BEGIN END POPUP "&Options" BEGIN - MENUITEM "&Show event details view", IDM_SHOW_EVENT_DETAILS_VIEW + MENUITEM "Event details &view", IDM_EVENT_DETAILS_VIEW + MENUITEM "&Grid lines", IDM_LIST_GRID_LINES + MENUITEM SEPARATOR + MENUITEM "&Save settings on exit", IDM_SAVE_SETTINGS END POPUP "&Help" BEGIN diff --git a/base/applications/mscutils/eventvwr/lang/es-ES.rc b/base/applications/mscutils/eventvwr/lang/es-ES.rc index b279a01eb8..a89bef6f48 100644 --- a/base/applications/mscutils/eventvwr/lang/es-ES.rc +++ b/base/applications/mscutils/eventvwr/lang/es-ES.rc @@ -27,7 +27,10 @@ BEGIN END POPUP "&Opciones" BEGIN - MENUITEM "&Show event details view", IDM_SHOW_EVENT_DETAILS_VIEW + MENUITEM "Event details &view", IDM_EVENT_DETAILS_VIEW + MENUITEM "&Grid lines", IDM_LIST_GRID_LINES + MENUITEM SEPARATOR + MENUITEM "&Save settings on exit", IDM_SAVE_SETTINGS END POPUP "Ay&uda" BEGIN diff --git a/base/applications/mscutils/eventvwr/lang/fr-FR.rc b/base/applications/mscutils/eventvwr/lang/fr-FR.rc index 9600746e66..81dbc99800 100644 --- a/base/applications/mscutils/eventvwr/lang/fr-FR.rc +++ b/base/applications/mscutils/eventvwr/lang/fr-FR.rc @@ -27,7 +27,10 @@ BEGIN END POPUP "&Options" BEGIN - MENUITEM "&Montrer la vue des détails d'événements", IDM_SHOW_EVENT_DETAILS_VIEW + MENUITEM "&Vue des détails d'événements", IDM_EVENT_DETAILS_VIEW + MENUITEM "&Grille", IDM_LIST_GRID_LINES + MENUITEM SEPARATOR + MENUITEM "&Enregistrer la configuration en quittant", IDM_SAVE_SETTINGS END POPUP "Aide" BEGIN diff --git a/base/applications/mscutils/eventvwr/lang/he-IL.rc b/base/applications/mscutils/eventvwr/lang/he-IL.rc index 0ad6a428dc..c53929f128 100644 --- a/base/applications/mscutils/eventvwr/lang/he-IL.rc +++ b/base/applications/mscutils/eventvwr/lang/he-IL.rc @@ -27,7 +27,10 @@ BEGIN END POPUP "אפשרויות" BEGIN - MENUITEM "&Show event details view", IDM_SHOW_EVENT_DETAILS_VIEW + MENUITEM "Event details &view", IDM_EVENT_DETAILS_VIEW + MENUITEM "&Grid lines", IDM_LIST_GRID_LINES + MENUITEM SEPARATOR + MENUITEM "&Save settings on exit", IDM_SAVE_SETTINGS END POPUP "עזרה" BEGIN diff --git a/base/applications/mscutils/eventvwr/lang/it-IT.rc b/base/applications/mscutils/eventvwr/lang/it-IT.rc index ffa965c72b..a8b4fe845b 100644 --- a/base/applications/mscutils/eventvwr/lang/it-IT.rc +++ b/base/applications/mscutils/eventvwr/lang/it-IT.rc @@ -27,7 +27,10 @@ BEGIN END POPUP "&Opzioni" BEGIN - MENUITEM "&Show event details view", IDM_SHOW_EVENT_DETAILS_VIEW + MENUITEM "Event details &view", IDM_EVENT_DETAILS_VIEW + MENUITEM "&Grid lines", IDM_LIST_GRID_LINES + MENUITEM SEPARATOR + MENUITEM "&Save settings on exit", IDM_SAVE_SETTINGS END POPUP "&Aiuto" BEGIN diff --git a/base/applications/mscutils/eventvwr/lang/ja-JP.rc b/base/applications/mscutils/eventvwr/lang/ja-JP.rc index 749d3a2246..023a714bdc 100644 --- a/base/applications/mscutils/eventvwr/lang/ja-JP.rc +++ b/base/applications/mscutils/eventvwr/lang/ja-JP.rc @@ -27,7 +27,10 @@ BEGIN END POPUP "オプション(&O)" BEGIN - MENUITEM "&Show event details view", IDM_SHOW_EVENT_DETAILS_VIEW + MENUITEM "Event details &view", IDM_EVENT_DETAILS_VIEW + MENUITEM "&Grid lines", IDM_LIST_GRID_LINES + MENUITEM SEPARATOR + MENUITEM "&Save settings on exit", IDM_SAVE_SETTINGS END POPUP "ヘルプ(&H)" BEGIN diff --git a/base/applications/mscutils/eventvwr/lang/ko-KR.rc b/base/applications/mscutils/eventvwr/lang/ko-KR.rc index 257d78e562..1b0fdf594b 100644 --- a/base/applications/mscutils/eventvwr/lang/ko-KR.rc +++ b/base/applications/mscutils/eventvwr/lang/ko-KR.rc @@ -27,7 +27,10 @@ BEGIN END POPUP "옵션(&O)" BEGIN - MENUITEM "&Show event details view", IDM_SHOW_EVENT_DETAILS_VIEW + MENUITEM "Event details &view", IDM_EVENT_DETAILS_VIEW + MENUITEM "&Grid lines", IDM_LIST_GRID_LINES + MENUITEM SEPARATOR + MENUITEM "&Save settings on exit", IDM_SAVE_SETTINGS END POPUP "도움말(&H)" BEGIN diff --git a/base/applications/mscutils/eventvwr/lang/no-NO.rc b/base/applications/mscutils/eventvwr/lang/no-NO.rc index 76d95e1150..d2f1ee52ff 100644 --- a/base/applications/mscutils/eventvwr/lang/no-NO.rc +++ b/base/applications/mscutils/eventvwr/lang/no-NO.rc @@ -25,7 +25,10 @@ BEGIN END POPUP "&Handling" BEGIN - MENUITEM "&Show event details view", IDM_SHOW_EVENT_DETAILS_VIEW + MENUITEM "Event details &view", IDM_EVENT_DETAILS_VIEW + MENUITEM "&Grid lines", IDM_LIST_GRID_LINES + MENUITEM SEPARATOR + MENUITEM "&Save settings on exit", IDM_SAVE_SETTINGS END POPUP "&Hjelp" BEGIN diff --git a/base/applications/mscutils/eventvwr/lang/pl-PL.rc b/base/applications/mscutils/eventvwr/lang/pl-PL.rc index ca16e6404a..3c125fd323 100644 --- a/base/applications/mscutils/eventvwr/lang/pl-PL.rc +++ b/base/applications/mscutils/eventvwr/lang/pl-PL.rc @@ -29,7 +29,10 @@ BEGIN END POPUP "Op&cje" BEGIN - MENUITEM "&Pokaż szczegóły zdarzenia ", IDM_SHOW_EVENT_DETAILS_VIEW + MENUITEM "Event details &view", IDM_EVENT_DETAILS_VIEW + MENUITEM "&Grid lines", IDM_LIST_GRID_LINES + MENUITEM SEPARATOR + MENUITEM "&Save settings on exit", IDM_SAVE_SETTINGS END POPUP "Po&moc" BEGIN diff --git a/base/applications/mscutils/eventvwr/lang/pt-BR.rc b/base/applications/mscutils/eventvwr/lang/pt-BR.rc index c67973dacc..56c3568b0f 100644 --- a/base/applications/mscutils/eventvwr/lang/pt-BR.rc +++ b/base/applications/mscutils/eventvwr/lang/pt-BR.rc @@ -27,7 +27,10 @@ BEGIN END POPUP "&Opções" BEGIN - MENUITEM "&Show event details view", IDM_SHOW_EVENT_DETAILS_VIEW + MENUITEM "Event details &view", IDM_EVENT_DETAILS_VIEW + MENUITEM "&Grid lines", IDM_LIST_GRID_LINES + MENUITEM SEPARATOR + MENUITEM "&Save settings on exit", IDM_SAVE_SETTINGS END POPUP "&Ajuda" BEGIN diff --git a/base/applications/mscutils/eventvwr/lang/ro-RO.rc b/base/applications/mscutils/eventvwr/lang/ro-RO.rc index 319fb4a8d9..f545812495 100644 --- a/base/applications/mscutils/eventvwr/lang/ro-RO.rc +++ b/base/applications/mscutils/eventvwr/lang/ro-RO.rc @@ -30,7 +30,10 @@ BEGIN END POPUP "&Opțiuni" BEGIN - MENUITEM "&Afișează detalii de eveniment", IDM_SHOW_EVENT_DETAILS_VIEW + MENUITEM "Event details &view", IDM_EVENT_DETAILS_VIEW + MENUITEM "&Grid lines", IDM_LIST_GRID_LINES + MENUITEM SEPARATOR + MENUITEM "&Save settings on exit", IDM_SAVE_SETTINGS END POPUP "Aj&utor" BEGIN diff --git a/base/applications/mscutils/eventvwr/lang/ru-RU.rc b/base/applications/mscutils/eventvwr/lang/ru-RU.rc index c1eeffb061..fda9dd8f68 100644 --- a/base/applications/mscutils/eventvwr/lang/ru-RU.rc +++ b/base/applications/mscutils/eventvwr/lang/ru-RU.rc @@ -27,7 +27,10 @@ BEGIN END POPUP "&Настройки" BEGIN - MENUITEM "&Область сведений событий", IDM_SHOW_EVENT_DETAILS_VIEW + MENUITEM "Event details &view", IDM_EVENT_DETAILS_VIEW + MENUITEM "&Grid lines", IDM_LIST_GRID_LINES + MENUITEM SEPARATOR + MENUITEM "&Save settings on exit", IDM_SAVE_SETTINGS END POPUP "&Справка" BEGIN diff --git a/base/applications/mscutils/eventvwr/lang/sk-SK.rc b/base/applications/mscutils/eventvwr/lang/sk-SK.rc index 2e5b291e3b..36160cfd82 100644 --- a/base/applications/mscutils/eventvwr/lang/sk-SK.rc +++ b/base/applications/mscutils/eventvwr/lang/sk-SK.rc @@ -30,7 +30,10 @@ BEGIN END POPUP "&Možnosti" BEGIN - MENUITEM "&Show event details view", IDM_SHOW_EVENT_DETAILS_VIEW + MENUITEM "Event details &view", IDM_EVENT_DETAILS_VIEW + MENUITEM "&Grid lines", IDM_LIST_GRID_LINES + MENUITEM SEPARATOR + MENUITEM "&Save settings on exit", IDM_SAVE_SETTINGS END POPUP "&Pomocník" BEGIN diff --git a/base/applications/mscutils/eventvwr/lang/sq-AL.rc b/base/applications/mscutils/eventvwr/lang/sq-AL.rc index 70bedaf82c..a469dc4dbd 100644 --- a/base/applications/mscutils/eventvwr/lang/sq-AL.rc +++ b/base/applications/mscutils/eventvwr/lang/sq-AL.rc @@ -33,7 +33,10 @@ BEGIN END POPUP "&Opsione" BEGIN - MENUITEM "&Show event details view", IDM_SHOW_EVENT_DETAILS_VIEW + MENUITEM "Event details &view", IDM_EVENT_DETAILS_VIEW + MENUITEM "&Grid lines", IDM_LIST_GRID_LINES + MENUITEM SEPARATOR + MENUITEM "&Save settings on exit", IDM_SAVE_SETTINGS END POPUP "Ndihmë" BEGIN diff --git a/base/applications/mscutils/eventvwr/lang/sv-SE.rc b/base/applications/mscutils/eventvwr/lang/sv-SE.rc index d591cd42df..b5b922c7d9 100644 --- a/base/applications/mscutils/eventvwr/lang/sv-SE.rc +++ b/base/applications/mscutils/eventvwr/lang/sv-SE.rc @@ -27,7 +27,10 @@ BEGIN END POPUP "&Åtgärd" BEGIN - MENUITEM "&Show event details view", IDM_SHOW_EVENT_DETAILS_VIEW + MENUITEM "Event details &view", IDM_EVENT_DETAILS_VIEW + MENUITEM "&Grid lines", IDM_LIST_GRID_LINES + MENUITEM SEPARATOR + MENUITEM "&Save settings on exit", IDM_SAVE_SETTINGS END POPUP "&Hjälp" BEGIN diff --git a/base/applications/mscutils/eventvwr/lang/tr-TR.rc b/base/applications/mscutils/eventvwr/lang/tr-TR.rc index 9a37929a48..e9d174b0a4 100644 --- a/base/applications/mscutils/eventvwr/lang/tr-TR.rc +++ b/base/applications/mscutils/eventvwr/lang/tr-TR.rc @@ -33,7 +33,10 @@ BEGIN END POPUP "&Seçenekler" BEGIN - MENUITEM "&Olay Ayrıntıları Görünümüyle Göster", IDM_SHOW_EVENT_DETAILS_VIEW + MENUITEM "Event details &view", IDM_EVENT_DETAILS_VIEW + MENUITEM "&Grid lines", IDM_LIST_GRID_LINES + MENUITEM SEPARATOR + MENUITEM "&Save settings on exit", IDM_SAVE_SETTINGS END POPUP "&Yardım" BEGIN diff --git a/base/applications/mscutils/eventvwr/lang/uk-UA.rc b/base/applications/mscutils/eventvwr/lang/uk-UA.rc index a79d9cf6fa..d5a6dc129a 100644 --- a/base/applications/mscutils/eventvwr/lang/uk-UA.rc +++ b/base/applications/mscutils/eventvwr/lang/uk-UA.rc @@ -27,7 +27,10 @@ BEGIN END POPUP "&Властивості" BEGIN - MENUITEM "&Show event details view", IDM_SHOW_EVENT_DETAILS_VIEW + MENUITEM "Event details &view", IDM_EVENT_DETAILS_VIEW + MENUITEM "&Grid lines", IDM_LIST_GRID_LINES + MENUITEM SEPARATOR + MENUITEM "&Save settings on exit", IDM_SAVE_SETTINGS END POPUP "&Допомога" BEGIN diff --git a/base/applications/mscutils/eventvwr/lang/zh-CN.rc b/base/applications/mscutils/eventvwr/lang/zh-CN.rc index f250d05712..58945d971f 100644 --- a/base/applications/mscutils/eventvwr/lang/zh-CN.rc +++ b/base/applications/mscutils/eventvwr/lang/zh-CN.rc @@ -27,7 +27,10 @@ BEGIN END POPUP "选项(&O)" BEGIN - MENUITEM "显示日志详情视图(&S)", IDM_SHOW_EVENT_DETAILS_VIEW + MENUITEM "Event details &view", IDM_EVENT_DETAILS_VIEW + MENUITEM "&Grid lines", IDM_LIST_GRID_LINES + MENUITEM SEPARATOR + MENUITEM "&Save settings on exit", IDM_SAVE_SETTINGS END POPUP "帮助(&H)" BEGIN diff --git a/base/applications/mscutils/eventvwr/lang/zh-TW.rc b/base/applications/mscutils/eventvwr/lang/zh-TW.rc index 94afc5c069..db57f03c42 100644 --- a/base/applications/mscutils/eventvwr/lang/zh-TW.rc +++ b/base/applications/mscutils/eventvwr/lang/zh-TW.rc @@ -27,7 +27,10 @@ BEGIN END POPUP "選項(&O)" BEGIN - MENUITEM "&Show event details view", IDM_SHOW_EVENT_DETAILS_VIEW + MENUITEM "Event details &view", IDM_EVENT_DETAILS_VIEW + MENUITEM "&Grid lines", IDM_LIST_GRID_LINES + MENUITEM SEPARATOR + MENUITEM "&Save settings on exit", IDM_SAVE_SETTINGS END POPUP "説明(&H)" BEGIN diff --git a/base/applications/mscutils/eventvwr/resource.h b/base/applications/mscutils/eventvwr/resource.h index 6917955720..b4a077711c 100644 --- a/base/applications/mscutils/eventvwr/resource.h +++ b/base/applications/mscutils/eventvwr/resource.h @@ -74,9 +74,11 @@ #define IDM_LIST_OLDEST 32779 #define IDM_EVENT_DETAILS 32780 #define IDM_REFRESH 32781 -#define IDM_SHOW_EVENT_DETAILS_VIEW 32782 -#define IDM_HELP 32783 -#define IDM_ABOUT 32784 +#define IDM_EVENT_DETAILS_VIEW 32782 +#define IDM_LIST_GRID_LINES 32783 +#define IDM_SAVE_SETTINGS 32784 +#define IDM_HELP 32785 +#define IDM_ABOUT 32786 /* String IDs */

6 years, 8 months

01/02: [EVENTVWR] Code style only.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0c32666852296e312ccd8… commit 0c32666852296e312ccd85f5d4b3b3a01401dfb0 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue Apr 17 22:43:47 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Apr 17 23:17:44 2018 +0200 [EVENTVWR] Code style only. --- base/applications/mscutils/eventvwr/eventvwr.c | 194 ++++++++++++------------ base/applications/mscutils/eventvwr/evtdetctl.c | 2 +- 2 files changed, 102 insertions(+), 94 deletions(-) diff --git a/base/applications/mscutils/eventvwr/eventvwr.c b/base/applications/mscutils/eventvwr/eventvwr.c index f7e89d3207..318e5dea5a 100644 --- a/base/applications/mscutils/eventvwr/eventvwr.c +++ b/base/applications/mscutils/eventvwr/eventvwr.c @@ -37,8 +37,8 @@ #define LVM_PROGRESS (WM_APP + 1) // Used by the subclassed ListView -static const LPCWSTR szWindowClass = L"EVENTVWR"; /* The main window class name */ -static const WCHAR EVENTLOG_BASE_KEY[] = L"SYSTEM\\CurrentControlSet\\Services\\EventLog\\"; +static const LPCWSTR EVENTVWR_WNDCLASS = L"EVENTVWR"; /* The main window class name */ +static const LPCWSTR EVENTLOG_BASE_KEY = L"SYSTEM\\CurrentControlSet\\Services\\EventLog\\"; /* The 3 system logs that should always exist in the user's system */ static const LPCWSTR SystemLogs[] = @@ -442,6 +442,7 @@ wWinMain(HINSTANCE hInstance, } } + /* Stop the enumerator thread */ SetEvent(hStartStopEnumEvent); WaitForSingleObject(hThread, INFINITE); CloseHandle(hThread); @@ -1217,7 +1218,7 @@ GetEventMessageFileDLL(IN LPCWSTR lpLogName, { BOOL Success = FALSE; LONG Result; - DWORD Type, dwSize; + DWORD dwType, dwSize; WCHAR szModuleName[MAX_PATH]; WCHAR szKeyName[MAX_PATH]; HKEY hLogKey = NULL; @@ -1249,10 +1250,10 @@ GetEventMessageFileDLL(IN LPCWSTR lpLogName, Result = RegQueryValueExW(hSourceKey, EntryName, NULL, - &Type, + &dwType, (LPBYTE)szModuleName, &dwSize); - if ((Result != ERROR_SUCCESS) || (Type != REG_EXPAND_SZ && Type != REG_SZ)) + if ((Result != ERROR_SUCCESS) || (dwType != REG_EXPAND_SZ && dwType != REG_SZ)) { szModuleName[0] = UNICODE_NULL; } @@ -1829,7 +1830,7 @@ EnumEventsThread(IN LPVOID lpParameter) } else if (!bResult) { - /* exit on other errors (ERROR_HANDLE_EOF) */ + /* Exit on other errors (ERROR_HANDLE_EOF) */ break; } @@ -2378,7 +2379,7 @@ MyRegisterClass(HINSTANCE hInstance) wcex.hCursor = LoadCursorW(NULL, MAKEINTRESOURCEW(IDC_ARROW)); wcex.hbrBackground = (HBRUSH)(COLOR_3DFACE + 1); // COLOR_WINDOW + 1 wcex.lpszMenuName = MAKEINTRESOURCEW(IDM_EVENTVWR); - wcex.lpszClassName = szWindowClass; + wcex.lpszClassName = EVENTVWR_WNDCLASS; wcex.hIconSm = (HICON)LoadImageW(hInstance, MAKEINTRESOURCEW(IDI_EVENTVWR), IMAGE_ICON, @@ -2400,7 +2401,7 @@ GetDisplayNameFileAndID(IN LPCWSTR lpLogName, HKEY hLogKey; WCHAR *KeyPath; SIZE_T cbKeyPath; - DWORD Type, cbData; + DWORD dwType, cbData; DWORD dwMessageID = 0; WCHAR szModuleName[MAX_PATH]; @@ -2424,10 +2425,10 @@ GetDisplayNameFileAndID(IN LPCWSTR lpLogName, Result = RegQueryValueExW(hLogKey, L"DisplayNameFile", NULL, - &Type, + &dwType, (LPBYTE)szModuleName, &cbData); - if ((Result != ERROR_SUCCESS) || (Type != REG_EXPAND_SZ && Type != REG_SZ)) + if ((Result != ERROR_SUCCESS) || (dwType != REG_EXPAND_SZ && dwType != REG_SZ)) { szModuleName[0] = UNICODE_NULL; } @@ -2449,10 +2450,10 @@ GetDisplayNameFileAndID(IN LPCWSTR lpLogName, Result = RegQueryValueExW(hLogKey, L"DisplayNameID", NULL, - &Type, + &dwType, (LPBYTE)&dwMessageID, &cbData); - if ((Result != ERROR_SUCCESS) || (Type != REG_DWORD)) + if ((Result != ERROR_SUCCESS) || (dwType != REG_DWORD)) dwMessageID = 0; *pdwMessageID = dwMessageID; @@ -2471,7 +2472,7 @@ BuildLogListAndFilterList(IN LPCWSTR lpComputerName) HKEY hEventLogKey, hLogKey; DWORD dwNumLogs = 0; DWORD dwIndex, dwMaxKeyLength; - DWORD Type; + DWORD dwType; PEVENTLOG EventLog; PEVENTLOGFILTER EventLogFilter; LPWSTR LogName = NULL; @@ -2554,10 +2555,10 @@ BuildLogListAndFilterList(IN LPCWSTR lpComputerName) Result = RegQueryValueExW(hLogKey, L"File", NULL, - &Type, + &dwType, NULL, &lpcName); - if ((Result != ERROR_SUCCESS) || (Type != REG_EXPAND_SZ && Type != REG_SZ)) + if ((Result != ERROR_SUCCESS) || (dwType != REG_EXPAND_SZ && dwType != REG_SZ)) { // Windows' EventLog uses some kind of default value, we do not. EventLog->FileName = NULL; @@ -2571,7 +2572,7 @@ BuildLogListAndFilterList(IN LPCWSTR lpComputerName) Result = RegQueryValueExW(hLogKey, L"File", NULL, - &Type, + &dwType, (LPBYTE)EventLog->FileName, &lpcName); if (Result != ERROR_SUCCESS) @@ -2698,7 +2699,7 @@ InitInstance(HINSTANCE hInstance, WCHAR szTemp[256]; /* Create the main window */ - hwndMainWindow = CreateWindowW(szWindowClass, + hwndMainWindow = CreateWindowW(EVENTVWR_WNDCLASS, szTitle, WS_OVERLAPPEDWINDOW | WS_CLIPCHILDREN, CW_USEDEFAULT, 0, CW_USEDEFAULT, 0, @@ -2731,7 +2732,7 @@ InitInstance(HINSTANCE hInstance, NULL, // no text WS_CHILD | PBS_SMOOTH, // styles rs.left, rs.top, // x, y - rs.right-rs.left, rs.bottom-rs.top, // cx, cy + rs.right - rs.left, rs.bottom - rs.top, // cx, cy hwndStatus, // parent window NULL, // window ID hInstance, // instance @@ -3053,7 +3054,7 @@ WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { LPWSTR pszText = item.pszText; - /* Trim all whitespace */ + /* Trim leading whitespace */ while (*pszText && iswspace(*pszText)) ++pszText; @@ -3234,41 +3235,44 @@ WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) } case WM_SETCURSOR: - if (LOWORD(lParam) == HTCLIENT) - { - POINT pt; - GetCursorPos(&pt); - ScreenToClient(hWnd, &pt); + { + POINT pt; + + if (LOWORD(lParam) != HTCLIENT) + goto Default; - /* Set the cursor for the vertical splitter */ - if (pt.x >= nVSplitPos - SPLIT_WIDTH/2 && pt.x < nVSplitPos + SPLIT_WIDTH/2 + 1) + GetCursorPos(&pt); + ScreenToClient(hWnd, &pt); + + /* Set the cursor for the vertical splitter */ + if (pt.x >= nVSplitPos - SPLIT_WIDTH/2 && pt.x < nVSplitPos + SPLIT_WIDTH/2 + 1) + { + RECT rs; + GetClientRect(hWnd, &rect); + GetWindowRect(hwndStatus, &rs); + if (pt.y >= rect.top && pt.y < rect.bottom - (rs.bottom - rs.top)) { - RECT rs; - GetClientRect(hWnd, &rect); - GetWindowRect(hwndStatus, &rs); - if (pt.y >= rect.top && pt.y < rect.bottom - (rs.bottom - rs.top)) - { - SetCursor(LoadCursorW(NULL, IDC_SIZEWE)); - return TRUE; - } + SetCursor(LoadCursorW(NULL, IDC_SIZEWE)); + return TRUE; } - else - /* Set the cursor for the horizontal splitter, if the Event details pane is displayed */ - if (hwndEventDetails && - (pt.y >= nHSplitPos - SPLIT_WIDTH/2 && pt.y < nHSplitPos + SPLIT_WIDTH/2 + 1)) + } + else + /* Set the cursor for the horizontal splitter, if the Event details pane is displayed */ + if (hwndEventDetails && + (pt.y >= nHSplitPos - SPLIT_WIDTH/2 && pt.y < nHSplitPos + SPLIT_WIDTH/2 + 1)) + { + // RECT rs; + GetClientRect(hWnd, &rect); + // GetWindowRect(hwndStatus, &rs); + if (pt.x >= nVSplitPos + SPLIT_WIDTH/2 + 1 /* rect.left + (rs.bottom - rs.top) */ && + pt.x < rect.right) { - // RECT rs; - GetClientRect(hWnd, &rect); - // GetWindowRect(hwndStatus, &rs); - if (pt.x >= nVSplitPos + SPLIT_WIDTH/2 + 1 /* rect.left + (rs.bottom - rs.top) */ && - pt.x < rect.right) - { - SetCursor(LoadCursorW(NULL, IDC_SIZENS)); - return TRUE; - } + SetCursor(LoadCursorW(NULL, IDC_SIZENS)); + return TRUE; } } goto Default; + } case WM_LBUTTONDOWN: { @@ -3297,62 +3301,66 @@ WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) case WM_LBUTTONUP: case WM_RBUTTONDOWN: - if (GetCapture() == hWnd) - { - /* Adjust the correct splitter position */ - if (bSplit == 1) - nVSplitPos = GET_X_LPARAM(lParam); - else if (bSplit == 2) - nHSplitPos = GET_Y_LPARAM(lParam); - - /* If we are splitting, resize the windows */ - if (bSplit != 0) - { - GetClientRect(hWnd, &rect); - ResizeWnd(rect.right - rect.left, rect.bottom - rect.top); - } + { + if (GetCapture() != hWnd) + break; - /* Reset the splitter state */ - bSplit = 0; + /* Adjust the correct splitter position */ + if (bSplit == 1) + nVSplitPos = GET_X_LPARAM(lParam); + else if (bSplit == 2) + nHSplitPos = GET_Y_LPARAM(lParam); - ReleaseCapture(); + /* If we are splitting, resize the windows */ + if (bSplit != 0) + { + GetClientRect(hWnd, &rect); + ResizeWnd(rect.right - rect.left, rect.bottom - rect.top); } + + /* Reset the splitter state */ + bSplit = 0; + + ReleaseCapture(); break; + } case WM_MOUSEMOVE: - if (GetCapture() == hWnd) + { + if (GetCapture() != hWnd) + break; + + /* Move the correct splitter */ + if (bSplit == 1) { - /* Move the correct splitter */ - if (bSplit == 1) - { - INT x = GET_X_LPARAM(lParam); + INT x = GET_X_LPARAM(lParam); - GetClientRect(hWnd, &rect); + GetClientRect(hWnd, &rect); - x = min(max(x, SPLIT_WIDTH/2), rect.right - rect.left - SPLIT_WIDTH/2); - if (nVSplitPos != x) - { - nVSplitPos = x; - ResizeWnd(rect.right - rect.left, rect.bottom - rect.top); - } - } - else if (bSplit == 2) + x = min(max(x, SPLIT_WIDTH/2), rect.right - rect.left - SPLIT_WIDTH/2); + if (nVSplitPos != x) { - RECT rs; - INT y = GET_Y_LPARAM(lParam); + nVSplitPos = x; + ResizeWnd(rect.right - rect.left, rect.bottom - rect.top); + } + } + else if (bSplit == 2) + { + RECT rs; + INT y = GET_Y_LPARAM(lParam); - GetClientRect(hWnd, &rect); - GetWindowRect(hwndStatus, &rs); + GetClientRect(hWnd, &rect); + GetWindowRect(hwndStatus, &rs); - y = min(max(y, SPLIT_WIDTH/2), rect.bottom - rect.top - SPLIT_WIDTH/2 - (rs.bottom - rs.top)); - if (nHSplitPos != y) - { - nHSplitPos = y; - ResizeWnd(rect.right - rect.left, rect.bottom - rect.top); - } + y = min(max(y, SPLIT_WIDTH/2), rect.bottom - rect.top - SPLIT_WIDTH/2 - (rs.bottom - rs.top)); + if (nHSplitPos != y) + { + nHSplitPos = y; + ResizeWnd(rect.right - rect.left, rect.bottom - rect.top); } } break; + } case WM_SIZE: { @@ -3379,7 +3387,7 @@ InitPropertiesDlg(HWND hDlg, PEVENTLOG EventLog) { LPWSTR lpLogName = EventLog->LogName; - DWORD Result, Type; + DWORD Result, dwType; DWORD dwMaxSize = 0, dwRetention = 0; BOOL Success; WIN32_FIND_DATAW FileInfo; // WIN32_FILE_ATTRIBUTE_DATA @@ -3418,10 +3426,10 @@ InitPropertiesDlg(HWND hDlg, PEVENTLOG EventLog) Result = RegQueryValueExW(hLogKey, L"MaxSize", NULL, - &Type, + &dwType, (LPBYTE)&dwMaxSize, &cbData); - if ((Result != ERROR_SUCCESS) || (Type != REG_DWORD)) + if ((Result != ERROR_SUCCESS) || (dwType != REG_DWORD)) { // dwMaxSize = 512 * 1024; /* 512 kBytes */ dwMaxSize = 0; @@ -3433,10 +3441,10 @@ InitPropertiesDlg(HWND hDlg, PEVENTLOG EventLog) Result = RegQueryValueExW(hLogKey, L"Retention", NULL, - &Type, + &dwType, (LPBYTE)&dwRetention, &cbData); - if ((Result != ERROR_SUCCESS) || (Type != REG_DWORD)) + if ((Result != ERROR_SUCCESS) || (dwType != REG_DWORD)) { /* On Windows 2003 it is 604800 (secs) == 7 days */ dwRetention = 0; diff --git a/base/applications/mscutils/eventvwr/evtdetctl.c b/base/applications/mscutils/eventvwr/evtdetctl.c index e25ad077d9..5a685855b0 100644 --- a/base/applications/mscutils/eventvwr/evtdetctl.c +++ b/base/applications/mscutils/eventvwr/evtdetctl.c @@ -730,7 +730,7 @@ InitDetailsDlgCtrl(HWND hDlg, PDETAILDATA pData) */ SendDlgItemMessageW(hDlg, IDC_EVENTTEXTEDIT, EM_AUTOURLDETECT, AURL_ENABLEURL /* | AURL_ENABLEEAURLS */, 0); - /* Note that the RichEdit control never gets themed under WinXP+. One would have to write code to simulate Edit-control theming */ + /* Note that the RichEdit control never gets themed under WinXP+; one would have to write code to simulate Edit-control theming */ SendDlgItemMessageW(hDlg, pData->bDisplayWords ? IDC_WORDRADIO : IDC_BYTESRADIO, BM_SETCHECK, BST_CHECKED, 0); SendDlgItemMessageW(hDlg, IDC_EVENTDATAEDIT, WM_SETFONT, (WPARAM)pData->hMonospaceFont, (LPARAM)TRUE);

6 years, 8 months

05/05: [NTOSKRNL] Properly reset VACB on free

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fd3a6c1089f8eb315bf1a… commit fd3a6c1089f8eb315bf1ab1dea85b44894938a05 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Apr 14 11:13:12 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sun Apr 15 22:52:53 2018 +0200 [NTOSKRNL] Properly reset VACB on free CID 1434271 --- ntoskrnl/cc/view.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ntoskrnl/cc/view.c b/ntoskrnl/cc/view.c index 11062095f5..bd2f4887d4 100644 --- a/ntoskrnl/cc/view.c +++ b/ntoskrnl/cc/view.c @@ -978,7 +978,7 @@ CcRosInternalFreeVacb ( ASSERT(IsListEmpty(&Vacb->CacheMapVacbListEntry)); ASSERT(IsListEmpty(&Vacb->DirtyVacbListEntry)); ASSERT(IsListEmpty(&Vacb->VacbLruListEntry)); - RtlFillMemory(Vacb, sizeof(Vacb), 0xfd); + RtlFillMemory(Vacb, sizeof(*Vacb), 0xfd); ExFreeToNPagedLookasideList(&VacbLookasideList, Vacb); return STATUS_SUCCESS; }

6 years, 8 months

04/05: [NTOSKRNL] Drop the VACB lock. This has have several benefits for ReactOS Cc: - It helps reducing potential deadlocks situations in Cc - It speeds up ReactOS by reducing locks - It gets us a bit closer to Windows VACB

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=953dc72dad7117d681120… commit 953dc72dad7117d681120e6c2423431dab824ffe Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sun Apr 8 19:09:36 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sun Apr 15 22:52:53 2018 +0200 [NTOSKRNL] Drop the VACB lock. This has have several benefits for ReactOS Cc: - It helps reducing potential deadlocks situations in Cc - It speeds up ReactOS by reducing locks - It gets us a bit closer to Windows VACB CORE-14349 --- ntoskrnl/cc/fs.c | 6 +++-- ntoskrnl/cc/pin.c | 5 ----- ntoskrnl/cc/view.c | 50 +++++++++++++++--------------------------- ntoskrnl/include/internal/cc.h | 41 ++++++++++++++-------------------- 4 files changed, 38 insertions(+), 64 deletions(-) diff --git a/ntoskrnl/cc/fs.c b/ntoskrnl/cc/fs.c index 31b7ec6bac..cb98eed153 100644 --- a/ntoskrnl/cc/fs.c +++ b/ntoskrnl/cc/fs.c @@ -251,12 +251,14 @@ CcPurgeCacheSection ( while (!IsListEmpty(&FreeList)) { + ULONG Refs; + Vacb = CONTAINING_RECORD(RemoveHeadList(&FreeList), ROS_VACB, CacheMapVacbListEntry); InitializeListHead(&Vacb->CacheMapVacbListEntry); - CcRosVacbDecRefCount(Vacb); - CcRosInternalFreeVacb(Vacb); + Refs = CcRosVacbDecRefCount(Vacb); + ASSERT(Refs == 0); } return Success; diff --git a/ntoskrnl/cc/pin.c b/ntoskrnl/cc/pin.c index c9167834c0..d81f09d470 100644 --- a/ntoskrnl/cc/pin.c +++ b/ntoskrnl/cc/pin.c @@ -215,7 +215,6 @@ CcPinRead ( iBcb->Pinned = TRUE; iBcb->Vacb->PinCount++; - CcRosReleaseVacbLock(iBcb->Vacb); if (Flags & PIN_EXCLUSIVE) { @@ -308,7 +307,6 @@ CcUnpinDataForThread ( { ExReleaseResourceForThreadLite(&iBcb->Lock, ResourceThreadId); iBcb->Pinned = FALSE; - CcRosAcquireVacbLock(iBcb->Vacb, NULL); iBcb->Vacb->PinCount--; } @@ -360,7 +358,6 @@ CcUnpinRepinnedBcb ( IoStatus->Information = 0; if (WriteThrough) { - CcRosAcquireVacbLock(iBcb->Vacb, NULL); if (iBcb->Vacb->Dirty) { IoStatus->Status = CcRosFlushVacb(iBcb->Vacb); @@ -369,7 +366,6 @@ CcUnpinRepinnedBcb ( { IoStatus->Status = STATUS_SUCCESS; } - CcRosReleaseVacbLock(iBcb->Vacb); } else { @@ -380,7 +376,6 @@ CcUnpinRepinnedBcb ( { ExReleaseResourceLite(&iBcb->Lock); iBcb->Pinned = FALSE; - CcRosAcquireVacbLock(iBcb->Vacb, NULL); iBcb->Vacb->PinCount--; ASSERT(iBcb->Vacb->PinCount == 0); } diff --git a/ntoskrnl/cc/view.c b/ntoskrnl/cc/view.c index cde1c2d6fa..11062095f5 100644 --- a/ntoskrnl/cc/view.c +++ b/ntoskrnl/cc/view.c @@ -90,6 +90,11 @@ ULONG CcRosVacbDecRefCount_(PROS_VACB vacb, PCSTR file, INT line) file, line, vacb, Refs, vacb->Dirty, vacb->PageOut); } + if (Refs == 0) + { + CcRosInternalFreeVacb(vacb); + } + return Refs; } ULONG CcRosVacbGetRefCount_(PROS_VACB vacb, PCSTR file, INT line) @@ -107,9 +112,6 @@ ULONG CcRosVacbGetRefCount_(PROS_VACB vacb, PCSTR file, INT line) } #endif -NTSTATUS -CcRosInternalFreeVacb(PROS_VACB Vacb); - /* FUNCTIONS *****************************************************************/ @@ -187,12 +189,10 @@ CcRosFlushDirtyPages ( PROS_VACB current; BOOLEAN Locked; NTSTATUS Status; - LARGE_INTEGER ZeroTimeout; DPRINT("CcRosFlushDirtyPages(Target %lu)\n", Target); (*Count) = 0; - ZeroTimeout.QuadPart = 0; KeEnterCriticalRegion(); KeAcquireGuardedMutex(&ViewLock); @@ -228,22 +228,11 @@ CcRosFlushDirtyPages ( continue; } - Status = CcRosAcquireVacbLock(current, - Wait ? NULL : &ZeroTimeout); - if (Status != STATUS_SUCCESS) - { - current->SharedCacheMap->Callbacks->ReleaseFromLazyWrite( - current->SharedCacheMap->LazyWriteContext); - CcRosVacbDecRefCount(current); - continue; - } - ASSERT(current->Dirty); /* One reference is added above */ if (CcRosVacbGetRefCount(current) > 2) { - CcRosReleaseVacbLock(current); current->SharedCacheMap->Callbacks->ReleaseFromLazyWrite( current->SharedCacheMap->LazyWriteContext); CcRosVacbDecRefCount(current); @@ -254,7 +243,6 @@ CcRosFlushDirtyPages ( Status = CcRosFlushVacb(current); - CcRosReleaseVacbLock(current); current->SharedCacheMap->Callbacks->ReleaseFromLazyWrite( current->SharedCacheMap->LazyWriteContext); @@ -410,13 +398,15 @@ retry: while (!IsListEmpty(&FreeList)) { + ULONG Refs; + current_entry = RemoveHeadList(&FreeList); current = CONTAINING_RECORD(current_entry, ROS_VACB, CacheMapVacbListEntry); InitializeListHead(&current->CacheMapVacbListEntry); - CcRosVacbDecRefCount(current); - CcRosInternalFreeVacb(current); + Refs = CcRosVacbDecRefCount(current); + ASSERT(Refs == 0); } DPRINT("Evicted %lu cache pages\n", (*NrFreed)); @@ -457,8 +447,6 @@ CcRosReleaseVacb ( Refs = CcRosVacbDecRefCount(Vacb); ASSERT(Refs > 0); - CcRosReleaseVacbLock(Vacb); - return STATUS_SUCCESS; } @@ -494,7 +482,6 @@ CcRosLookupVacb ( CcRosVacbIncRefCount(current); KeReleaseSpinLock(&SharedCacheMap->CacheMapLock, oldIrql); KeReleaseGuardedMutex(&ViewLock); - CcRosAcquireVacbLock(current, NULL); return current; } if (current->FileOffset.QuadPart > FileOffset) @@ -718,6 +705,7 @@ CcRosCreateVacb ( PLIST_ENTRY current_entry; NTSTATUS Status; KIRQL oldIrql; + ULONG Refs; ASSERT(SharedCacheMap); @@ -745,7 +733,6 @@ CcRosCreateVacb ( current->MappedCount = 0; current->ReferenceCount = 0; current->PinCount = 0; - KeInitializeMutex(&current->Mutex, 0); InitializeListHead(&current->CacheMapVacbListEntry); InitializeListHead(&current->DirtyVacbListEntry); InitializeListHead(&current->VacbLruListEntry); @@ -760,7 +747,6 @@ CcRosCreateVacb ( return Status; } - CcRosAcquireVacbLock(current, NULL); KeAcquireGuardedMutex(&ViewLock); *Vacb = current; @@ -792,12 +778,12 @@ CcRosCreateVacb ( current); } #endif - CcRosVacbDecRefCount(*Vacb); - CcRosReleaseVacbLock(*Vacb); KeReleaseGuardedMutex(&ViewLock); - CcRosInternalFreeVacb(*Vacb); + + Refs = CcRosVacbDecRefCount(*Vacb); + ASSERT(Refs == 0); + *Vacb = current; - CcRosAcquireVacbLock(current, NULL); return STATUS_SUCCESS; } if (current->FileOffset.QuadPart < FileOffset) @@ -1111,7 +1097,6 @@ CcRosDeleteFileCache ( KeReleaseSpinLock(&SharedCacheMap->CacheMapLock, oldIrql); current = CONTAINING_RECORD(current_entry, ROS_VACB, CacheMapVacbListEntry); - CcRosAcquireVacbLock(current, NULL); RemoveEntryList(&current->VacbLruListEntry); InitializeListHead(&current->VacbLruListEntry); if (current->Dirty) @@ -1122,7 +1107,6 @@ CcRosDeleteFileCache ( DPRINT1("Freeing dirty VACB\n"); } InsertHeadList(&FreeList, &current->CacheMapVacbListEntry); - CcRosReleaseVacbLock(current); KeAcquireSpinLock(&SharedCacheMap->CacheMapLock, &oldIrql); } @@ -1136,11 +1120,13 @@ CcRosDeleteFileCache ( while (!IsListEmpty(&FreeList)) { + ULONG Refs; + current_entry = RemoveTailList(&FreeList); current = CONTAINING_RECORD(current_entry, ROS_VACB, CacheMapVacbListEntry); InitializeListHead(&current->CacheMapVacbListEntry); - CcRosVacbDecRefCount(current); - CcRosInternalFreeVacb(current); + Refs = CcRosVacbDecRefCount(current); + ASSERT(Refs == 0); } OldIrql = KeAcquireQueuedSpinLock(LockQueueMasterLock); diff --git a/ntoskrnl/include/internal/cc.h b/ntoskrnl/include/internal/cc.h index e3c279b6f8..0dcea16f43 100644 --- a/ntoskrnl/include/internal/cc.h +++ b/ntoskrnl/include/internal/cc.h @@ -217,12 +217,9 @@ typedef struct _ROS_VACB LIST_ENTRY VacbLruListEntry; /* Offset in the file which this view maps. */ LARGE_INTEGER FileOffset; - /* Mutex */ - KMUTEX Mutex; /* Number of references. */ volatile ULONG ReferenceCount; /* How many times was it pinned? */ - _Guarded_by_(Mutex) LONG PinCount; /* Pointer to the shared cache map for the file which this view maps data for. */ PROS_SHARED_CACHE_MAP SharedCacheMap; @@ -470,28 +467,9 @@ VOID CcPerformReadAhead( IN PFILE_OBJECT FileObject); -FORCEINLINE NTSTATUS -CcRosAcquireVacbLock( - _Inout_ PROS_VACB Vacb, - _In_ PLARGE_INTEGER Timeout) -{ - NTSTATUS Status; - Status = KeWaitForSingleObject(&Vacb->Mutex, - Executive, - KernelMode, - FALSE, - Timeout); - return Status; -} - -FORCEINLINE -VOID -CcRosReleaseVacbLock( - _Inout_ PROS_VACB Vacb) -{ - KeReleaseMutex(&Vacb->Mutex, FALSE); -} +CcRosInternalFreeVacb( + IN PROS_VACB Vacb); FORCEINLINE BOOLEAN @@ -545,6 +523,19 @@ CcRosVacbGetRefCount_( #else #define CcRosVacbIncRefCount(vacb) InterlockedIncrement((PLONG)&(vacb)->ReferenceCount) -#define CcRosVacbDecRefCount(vacb) InterlockedDecrement((PLONG)&(vacb)->ReferenceCount) +FORCEINLINE +ULONG +CcRosVacbDecRefCount( + PROS_VACB vacb) +{ + ULONG Refs; + + Refs = InterlockedDecrement((PLONG)&vacb->ReferenceCount); + if (Refs == 0) + { + CcRosInternalFreeVacb(vacb); + } + return Refs; +} #define CcRosVacbGetRefCount(vacb) InterlockedCompareExchange((PLONG)&(vacb)->ReferenceCount, 0, 0) #endif

6 years, 8 months

← Newer
1
...
5
6
7
8
9
10
11
...
25
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 April 2018