Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 03/04: [KMTESTS] Use KeClearEvent instead of KeResetEvent where the previous state is not needed.
by Thomas Faber 30 Dec '17

30 Dec '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2cb0c129a6c68eb4a6bdb… commit 2cb0c129a6c68eb4a6bdbbbaf7a2fbcf89b314f8 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sat Dec 30 11:46:14 2017 +0100 [KMTESTS] Use KeClearEvent instead of KeResetEvent where the previous state is not needed. --- modules/rostests/kmtests/kmtest_drv/kmtest_drv.c | 2 +- modules/rostests/kmtests/npfs/NpfsHelpers.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/rostests/kmtests/kmtest_drv/kmtest_drv.c b/modules/rostests/kmtests/kmtest_drv/kmtest_drv.c index 644e3918d0..1962f6c46d 100644 --- a/modules/rostests/kmtests/kmtest_drv/kmtest_drv.c +++ b/modules/rostests/kmtests/kmtest_drv/kmtest_drv.c @@ -458,7 +458,7 @@ DriverIoControl( RtlCopyMemory(Irp->AssociatedIrp.SystemBuffer, &WorkItem->Request, Length); Status = STATUS_SUCCESS; - KeResetEvent(&WorkList.NewWorkEvent); + KeClearEvent(&WorkList.NewWorkEvent); break; } diff --git a/modules/rostests/kmtests/npfs/NpfsHelpers.c b/modules/rostests/kmtests/npfs/NpfsHelpers.c index ec0d3669e9..00864990b5 100644 --- a/modules/rostests/kmtests/npfs/NpfsHelpers.c +++ b/modules/rostests/kmtests/npfs/NpfsHelpers.c @@ -709,7 +709,7 @@ TriggerWork( FALSE, NULL); ok_eq_hex(Status, STATUS_SUCCESS); - KeResetEvent(&Context->WorkCompleteEvent); + KeClearEvent(&Context->WorkCompleteEvent); KeSetEvent(&Context->StartWorkEvent, IO_NO_INCREMENT, TRUE); return WaitForWork(Context, MilliSeconds); }

1 0

[reactos] 02/04: [NTOS] Use KeClearEvent instead of KeResetEvent where the previous state is not needed.
by Thomas Faber 30 Dec '17

30 Dec '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=75850abcbbad5d3741604… commit 75850abcbbad5d37416044d4a1be432770f1cad1 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sat Dec 30 11:45:03 2017 +0100 [NTOS] Use KeClearEvent instead of KeResetEvent where the previous state is not needed. --- ntoskrnl/fstub/disksup.c | 6 +++--- ntoskrnl/io/iomgr/rawfs.c | 2 +- ntoskrnl/lpc/reply.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ntoskrnl/fstub/disksup.c b/ntoskrnl/fstub/disksup.c index 62986aed4b..ef5630d0ee 100644 --- a/ntoskrnl/fstub/disksup.c +++ b/ntoskrnl/fstub/disksup.c @@ -1014,7 +1014,7 @@ HalpGetFullGeometry(IN PDEVICE_OBJECT DeviceObject, } /* Reset event */ - KeResetEvent(Event); + KeClearEvent(Event); /* Call the driver and check if it's pending */ Status = IoCallDriver(DeviceObject, Irp); @@ -1847,7 +1847,7 @@ xHalIoSetPartitionInformation(IN PDEVICE_OBJECT DeviceObject, do { /* Reset the event since we reuse it */ - KeResetEvent(&Event); + KeClearEvent(&Event); /* Build the read IRP */ Irp = IoBuildSynchronousFsdRequest(IRP_MJ_READ, @@ -1912,7 +1912,7 @@ xHalIoSetPartitionInformation(IN PDEVICE_OBJECT DeviceObject, PartitionDescriptor->PartitionType = (UCHAR)PartitionType; /* Reset the reusable event */ - KeResetEvent(&Event); + KeClearEvent(&Event); /* Build the write IRP */ Irp = IoBuildSynchronousFsdRequest(IRP_MJ_WRITE, diff --git a/ntoskrnl/io/iomgr/rawfs.c b/ntoskrnl/io/iomgr/rawfs.c index 8ade9a7db5..062c1fb42e 100644 --- a/ntoskrnl/io/iomgr/rawfs.c +++ b/ntoskrnl/io/iomgr/rawfs.c @@ -833,7 +833,7 @@ RawQueryFsSizeInfo(IN PVCB Vcb, else { /* Setup query IRP */ - KeResetEvent(&Event); + KeClearEvent(&Event); Irp = IoBuildDeviceIoControlRequest(IOCTL_DISK_GET_PARTITION_INFO, RealDevice, NULL, diff --git a/ntoskrnl/lpc/reply.c b/ntoskrnl/lpc/reply.c index d9fa834be0..8454754c3a 100644 --- a/ntoskrnl/lpc/reply.c +++ b/ntoskrnl/lpc/reply.c @@ -608,7 +608,7 @@ NtReplyWaitReceivePortEx(IN HANDLE PortHandle, if (ReceivePort->Flags & LPCP_WAITABLE_PORT) { /* Reset its event */ - KeResetEvent(&ReceivePort->WaitEvent); + KeClearEvent(&ReceivePort->WaitEvent); } /* Release the lock and fail */ @@ -630,7 +630,7 @@ NtReplyWaitReceivePortEx(IN HANDLE PortHandle, if (ReceivePort->Flags & LPCP_WAITABLE_PORT) { /* Reset its event */ - KeResetEvent(&ReceivePort->WaitEvent); + KeClearEvent(&ReceivePort->WaitEvent); } }

1 0

[reactos] 01/04: [DRIVERS] Use KeClearEvent instead of KeResetEvent where the previous state is not needed.
by Thomas Faber 30 Dec '17

30 Dec '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4f8379a02b525eb5ca60d… commit 4f8379a02b525eb5ca60d83e80b108458c664d63 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sat Dec 30 11:44:25 2017 +0100 [DRIVERS] Use KeClearEvent instead of KeResetEvent where the previous state is not needed. --- drivers/filters/mountmgr/mountmgr.c | 2 +- drivers/hid/kbdhid/kbdhid.c | 2 +- drivers/hid/mouhid/mouhid.c | 2 +- drivers/input/sermouse/readmouse.c | 2 +- drivers/network/ndis/ndis/control.c | 2 +- drivers/network/ndis/ndis/io.c | 2 +- drivers/usb/usbhub_new/usbhub.c | 8 ++++---- drivers/usb/usbport/usbport.c | 2 +- drivers/wdm/audio/legacy/stream/pnp.c | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/drivers/filters/mountmgr/mountmgr.c b/drivers/filters/mountmgr/mountmgr.c index 54487a4cb3..1852dfc17f 100644 --- a/drivers/filters/mountmgr/mountmgr.c +++ b/drivers/filters/mountmgr/mountmgr.c @@ -872,7 +872,7 @@ MountMgrUnload(IN struct _DRIVER_OBJECT *DriverObject) NextEntry = RemoveHeadList(&(DeviceExtension->UniqueIdWorkerItemListHead)); WorkItem = CONTAINING_RECORD(NextEntry, UNIQUE_ID_WORK_ITEM, UniqueIdWorkerItemListEntry); - KeResetEvent(&UnloadEvent); + KeClearEvent(&UnloadEvent); WorkItem->Event = &UnloadEvent; KeReleaseSemaphore(&(DeviceExtension->DeviceLock), IO_NO_INCREMENT, diff --git a/drivers/hid/kbdhid/kbdhid.c b/drivers/hid/kbdhid/kbdhid.c index 4b240a46af..bacf72a010 100644 --- a/drivers/hid/kbdhid/kbdhid.c +++ b/drivers/hid/kbdhid/kbdhid.c @@ -289,7 +289,7 @@ KbdHid_Create( DeviceExtension->FileObject = IoStack->FileObject; /* reset event */ - KeResetEvent(&DeviceExtension->ReadCompletionEvent); + KeClearEvent(&DeviceExtension->ReadCompletionEvent); /* initiating read */ Status = KbdHid_InitiateRead(DeviceExtension); diff --git a/drivers/hid/mouhid/mouhid.c b/drivers/hid/mouhid/mouhid.c index 193cf792c0..045090929d 100644 --- a/drivers/hid/mouhid/mouhid.c +++ b/drivers/hid/mouhid/mouhid.c @@ -497,7 +497,7 @@ MouHid_Create( DeviceExtension->FileObject = IoStack->FileObject; /* reset event */ - KeResetEvent(&DeviceExtension->ReadCompletionEvent); + KeClearEvent(&DeviceExtension->ReadCompletionEvent); /* initiating read */ Status = MouHid_InitiateRead(DeviceExtension); diff --git a/drivers/input/sermouse/readmouse.c b/drivers/input/sermouse/readmouse.c index 6142e9bdeb..7526af1496 100644 --- a/drivers/input/sermouse/readmouse.c +++ b/drivers/input/sermouse/readmouse.c @@ -137,7 +137,7 @@ SermouseDeviceWorker( if (Status != STATUS_TIMEOUT) { /* we need to stop the worker thread */ - KeResetEvent(&DeviceExtension->StopWorkerThreadEvent); + KeClearEvent(&DeviceExtension->StopWorkerThreadEvent); break; } diff --git a/drivers/network/ndis/ndis/control.c b/drivers/network/ndis/ndis/control.c index 614bf39858..7aa51efd91 100644 --- a/drivers/network/ndis/ndis/control.c +++ b/drivers/network/ndis/ndis/control.c @@ -261,7 +261,7 @@ NdisResetEvent( * Event = Pointer to the initialized event object to be reset */ { - KeResetEvent(&Event->Event); + KeClearEvent(&Event->Event); } diff --git a/drivers/network/ndis/ndis/io.c b/drivers/network/ndis/ndis/io.c index faee64ae30..1775716fe5 100644 --- a/drivers/network/ndis/ndis/io.c +++ b/drivers/network/ndis/ndis/io.c @@ -416,7 +416,7 @@ NdisMAllocateMapRegisters( NDIS_DbgPrint(MAX_TRACE, ("resetting event\n")); - KeResetEvent(&AllocationEvent); + KeClearEvent(&AllocationEvent); } NDIS_DbgPrint(MAX_TRACE, ("returning success\n")); diff --git a/drivers/usb/usbhub_new/usbhub.c b/drivers/usb/usbhub_new/usbhub.c index ab60b45173..354e286505 100644 --- a/drivers/usb/usbhub_new/usbhub.c +++ b/drivers/usb/usbhub_new/usbhub.c @@ -2315,7 +2315,7 @@ USBH_ChangeIndication(IN PDEVICE_OBJECT DeviceObject, if (InterlockedIncrement(&HubExtension->ResetRequestCount) == 1) { - KeResetEvent(&HubExtension->ResetEvent); + KeClearEvent(&HubExtension->ResetEvent); } HubWorkItemBuffer->HubExtension = HubExtension; @@ -2415,7 +2415,7 @@ USBH_SubmitStatusChangeTransfer(IN PUSBHUB_FDO_EXTENSION HubExtension) TRUE, TRUE); - KeResetEvent(&HubExtension->StatusChangeEvent); + KeClearEvent(&HubExtension->StatusChangeEvent); Status = IoCallDriver(HubExtension->LowerDevice, Irp); @@ -2915,7 +2915,7 @@ USBD_RegisterRootHubCallBack(IN PUSBHUB_FDO_EXTENSION HubExtension) return STATUS_NOT_IMPLEMENTED; } - KeResetEvent(&HubExtension->RootHubNotificationEvent); + KeClearEvent(&HubExtension->RootHubNotificationEvent); return RootHubInitNotification(HubExtension->BusInterface.BusContext, HubExtension, @@ -3828,7 +3828,7 @@ return; //HACK: delete it line after fixing Power Manager!!! if (IsHubCheck && !(HubExtension->HubFlags & USBHUB_FDO_FLAG_WAIT_IDLE_REQUEST)) { - KeResetEvent(&HubExtension->IdleEvent); + KeClearEvent(&HubExtension->IdleEvent); HubExtension->HubFlags |= USBHUB_FDO_FLAG_WAIT_IDLE_REQUEST; IsHubIdle = TRUE; } diff --git a/drivers/usb/usbport/usbport.c b/drivers/usb/usbport/usbport.c index ad421d442b..09286465bb 100644 --- a/drivers/usb/usbport/usbport.c +++ b/drivers/usb/usbport/usbport.c @@ -1393,7 +1393,7 @@ USBPORT_WorkerThread(IN PVOID StartContext) KeQuerySystemTime(&NewTime); KeAcquireSpinLock(&FdoExtension->WorkerThreadEventSpinLock, &OldIrql); - KeResetEvent(&FdoExtension->WorkerThreadEvent); + KeClearEvent(&FdoExtension->WorkerThreadEvent); KeReleaseSpinLock(&FdoExtension->WorkerThreadEventSpinLock, OldIrql); DPRINT_CORE("USBPORT_WorkerThread: run \n"); diff --git a/drivers/wdm/audio/legacy/stream/pnp.c b/drivers/wdm/audio/legacy/stream/pnp.c index 67f1878360..b8814cdb1f 100644 --- a/drivers/wdm/audio/legacy/stream/pnp.c +++ b/drivers/wdm/audio/legacy/stream/pnp.c @@ -413,7 +413,7 @@ StreamClassStartDevice( /* Setup get stream info struct */ RequestBlock->Block.Command = SRB_GET_STREAM_INFO; RequestBlock->Block.CommandData.StreamBuffer = StreamDescriptor; - KeResetEvent(&RequestBlock->Event); + KeClearEvent(&RequestBlock->Event); /* send the request */ DriverObjectExtension->Data.HwReceivePacket((PHW_STREAM_REQUEST_BLOCK)RequestBlock);

1 0

[reactos] 01/01: [KSPROXY] Fix MSVC build The module stays disabled though.
by Timo Kreuzer 30 Dec '17

30 Dec '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bad1c035295455f95ff33… commit bad1c035295455f95ff33045337e8f06996eb7dd Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Dec 30 11:06:50 2017 +0100 [KSPROXY] Fix MSVC build The module stays disabled though. --- dll/directx/ksproxy/datatype.cpp | 2 -- dll/directx/ksproxy/ksproxy.cpp | 4 ---- dll/directx/ksproxy/proxy.cpp | 2 -- 3 files changed, 8 deletions(-) diff --git a/dll/directx/ksproxy/datatype.cpp b/dll/directx/ksproxy/datatype.cpp index 91fe76a21d..7f55efc06e 100644 --- a/dll/directx/ksproxy/datatype.cpp +++ b/dll/directx/ksproxy/datatype.cpp @@ -9,9 +9,7 @@ #include "precomp.h" /* FIXME guid mess */ -#ifndef _MSC_VER const GUID IID_IUnknown = {0x00000000, 0x0000, 0x0000, {0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46}}; -#endif const GUID IID_IClassFactory = {0x00000001, 0x0000, 0x0000, {0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46}}; class CKsDataTypeHandler : public IKsDataTypeHandler diff --git a/dll/directx/ksproxy/ksproxy.cpp b/dll/directx/ksproxy/ksproxy.cpp index 9a034e1f75..9509f701ff 100644 --- a/dll/directx/ksproxy/ksproxy.cpp +++ b/dll/directx/ksproxy/ksproxy.cpp @@ -13,11 +13,7 @@ const GUID CLSID_KsClockForwarder = {0x877e4351, 0x6fea, 0x11d0, {0xb8, 0x63, 0x00, 0xaa, 0x00, 0xa2, 0x16, 0xa1}}; const GUID CLSID_KsQualityForwarder = {0xe05592e4, 0xc0b5, 0x11d0, {0xa4, 0x39, 0x00, 0xa0, 0xc9, 0x22, 0x31, 0x96}}; - - -#ifndef _MSC_VER const GUID CLSID_KsIBasicAudioInterfaceHandler = {0xb9f8ac3e, 0x0f71, 0x11d2, {0xb7, 0x2c, 0x00, 0xc0, 0x4f, 0xb6, 0xbd, 0x3d}}; -#endif static INTERFACE_TABLE InterfaceTable[] = { diff --git a/dll/directx/ksproxy/proxy.cpp b/dll/directx/ksproxy/proxy.cpp index 25b00fe666..940d6e61bd 100644 --- a/dll/directx/ksproxy/proxy.cpp +++ b/dll/directx/ksproxy/proxy.cpp @@ -8,12 +8,10 @@ */ #include "precomp.h" -#ifndef _MSC_VER const GUID IID_IPersistPropertyBag = {0x37D84F60, 0x42CB, 0x11CE, {0x81, 0x35, 0x00, 0xAA, 0x00, 0x4B, 0xB8, 0x51}}; const GUID IID_ISpecifyPropertyPages = {0xB196B28B, 0xBAB4, 0x101A, {0xB6, 0x9C, 0x00, 0xAA, 0x00, 0x34, 0x1D, 0x07}}; const GUID IID_IPersistStream = {0x00000109, 0x0000, 0x0000, {0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46}}; const GUID IID_IPersist = {0x0000010c, 0x0000, 0x0000, {0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46}}; -#endif const GUID IID_IBDA_DeviceControl = {0xFD0A5AF3, 0xB41D, 0x11d2, {0x9C, 0x95, 0x00, 0xC0, 0x4F, 0x79, 0x71, 0xE0}}; const GUID IID_IKsAggregateControl = {0x7F40EAC0, 0x3947, 0x11D2, {0x87, 0x4E, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96}}; const GUID IID_IKsClockPropertySet = {0x5C5CBD84, 0xE755, 0x11D0, {0xAC, 0x18, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96}};

1 0

[reactos] 01/01: [RAPPS] Romanian translation update
by Bișoc George 29 Dec '17

29 Dec '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=409d166c2c979464ba041… commit 409d166c2c979464ba041184f8fc7e37127ab8bc Author: Bișoc George <fraizeraust99(a)gmail.com> AuthorDate: Fri Dec 29 16:07:24 2017 +0100 [RAPPS] Romanian translation update - Translated some English strings and fixed a small grammar typo. Addendum: - Header file ported from ReactOS coding style added (even though it kind of bloats the translation file, it does actually help for future translators looking at changes committed by previous translators). - Replaced "..." with "…" (single character) <sanchaez> --- base/applications/rapps/lang/ro-RO.rc | 61 +++++++++++++++++++---------------- 1 file changed, 34 insertions(+), 27 deletions(-) diff --git a/base/applications/rapps/lang/ro-RO.rc b/base/applications/rapps/lang/ro-RO.rc index f040a66e57..b3886d5f4a 100644 --- a/base/applications/rapps/lang/ro-RO.rc +++ b/base/applications/rapps/lang/ro-RO.rc @@ -1,4 +1,11 @@ -/* Ștefan Fulea (stefan dot fulea at mail dot md) */ +/* + * PROJECT: ReactOS Applications Manager (RAPPS) + * FILE: base/applications/rapps/lang/ro-RO.rc + * PURPOSE: Romanian Translation for RAPPS + * TRANSLATORS: + * Ștefan Fulea (stefan dot fulea at mail dot md) + * Bișoc George (fraizeraust99(a)gmail.com) + */ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL @@ -85,7 +92,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Instalare aplicație" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "...", IDC_INSTALL_TEXT, 4, 5, 209, 35 + LTEXT "…", IDC_INSTALL_TEXT, 4, 5, 209, 35 AUTORADIOBUTTON "Instalea&ză de pe un disc (CD sau DVD)", IDC_CD_INSTALL, 10, 46, 197, 11, WS_GROUP AUTORADIOBUTTON "&Descarcă și instalează", IDC_DOWNLOAD_INSTALL, 10, 59, 197, 11, NOT WS_TABSTOP PUSHBUTTON "Con&firmă", IDOK, 86, 78, 60, 14 @@ -94,7 +101,7 @@ END IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 72 STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE -CAPTION "În curs de descărcare %ls..." +CAPTION "În curs de descărcare %ls…" FONT 8, "MS Shell Dlg" BEGIN CONTROL "Progress1", IDC_DOWNLOAD_PROGRESS, "msctls_progress32", WS_BORDER | PBS_SMOOTH, 10, 10, 200, 12 @@ -154,13 +161,13 @@ END STRINGTABLE BEGIN IDS_AINFO_VERSION "\nVersiune: " - IDS_AINFO_AVAILABLEVERSION "\nAvailable Version: " + IDS_AINFO_AVAILABLEVERSION "\nVersiune disponibilă: " IDS_AINFO_DESCRIPTION "\nDescriere: " IDS_AINFO_SIZE "\nDimensiune: " IDS_AINFO_URLSITE "\nAdresă web: " IDS_AINFO_LICENSE "\nLicență: " IDS_AINFO_URLDOWNLOAD "\nURL fișier: " - IDS_AINFO_LANGUAGES "\nLanguages: " + IDS_AINFO_LANGUAGES "\nLimbi: " END STRINGTABLE @@ -189,7 +196,7 @@ BEGIN IDS_INSTALL "Instalează" IDS_UNINSTALL "Dezinstalează" IDS_MODIFY "Modifică" - IDS_APPS_COUNT "Numărul de programe: %d; Selected: %d" + IDS_APPS_COUNT "Numărul de programe: %d; Selectate: %d" IDS_WELCOME_TITLE "Bun venit la gestionarul de programe ReactOS!\n\n" IDS_WELCOME_TEXT "Alegeți o categorie din stânga, apoi alegeți o aplicație pentru a o instala sau dezinstala.\nArdesa web ReactOS: " IDS_WELCOME_URL "http://www.reactos.org" @@ -204,47 +211,47 @@ BEGIN IDS_UNABLE_TO_DOWNLOAD "Pachetul nu poate fi descărcat! Adresa nu este găsită!" IDS_UNABLE_TO_DOWNLOAD2 "Pachetul nu poate fi descărcat! Verificați conexiunea de Internet!" IDS_UNABLE_TO_REMOVE "Datele de registru pentru acest program nu au putut fi eliminate!" - IDS_UNABLE_TO_INSTALL "Unable to open installer!" + IDS_UNABLE_TO_INSTALL "Programul de instalare nu poate fi executat!" IDS_CERT_DOES_NOT_MATCH "Verificarea certificatului SSL a eșuat." IDS_INTEG_CHECK_TITLE "Integritatea pachetului în verificare…" IDS_INTEG_CHECK_FAIL "Pachetul nu a trecut de verificarea de integritate. Utilizarea programului nu este recomandată." IDS_INTERRUPTED_DOWNLOAD "Descărcarea a fost întreruptă. Verificați conexiunea la Internet." - IDS_UNABLE_TO_WRITE "Eșec la scriea pe disc. Una din cauze poate fi atingerea limitei de capacitate." - IDS_SELECT_ALL "Select/Deselect All" - IDS_INSTALL_SELECTED "Install Selected" + IDS_UNABLE_TO_WRITE "Eșec la scrierea pe disc. Una din cauze poate fi atingerea limitei de capacitate." + IDS_SELECT_ALL "Selectează/Deselectează Toate" + IDS_INSTALL_SELECTED "Instalează selecționate" END STRINGTABLE BEGIN - IDS_STATUS_INSTALLED "Installed" - IDS_STATUS_NOTINSTALLED "Not installed" - IDS_STATUS_DOWNLOADED "Downloaded" - IDS_STATUS_UPDATE_AVAILABLE "Update available" - IDS_STATUS_DOWNLOADING "Downloading…" - IDS_STATUS_INSTALLING "Installing…" - IDS_STATUS_WAITING "Waiting to install…" - IDS_STATUS_FINISHED "Finished" + IDS_STATUS_INSTALLED "Instalat" + IDS_STATUS_NOTINSTALLED "Nu instalat" + IDS_STATUS_DOWNLOADED "Descărcat" + IDS_STATUS_UPDATE_AVAILABLE "Actualizare disponibilă" + IDS_STATUS_DOWNLOADING "Descărcare…" + IDS_STATUS_INSTALLING "Instalare…" + IDS_STATUS_WAITING "În fază de instalare…" + IDS_STATUS_FINISHED "Terminat" END STRINGTABLE BEGIN - IDS_LICENSE_OPENSOURCE "Open Source" + IDS_LICENSE_OPENSOURCE "Sursă Deschisă" IDS_LICENSE_FREEWARE "Freeware" IDS_LICENSE_TRIAL "Trial/Demo" END STRINGTABLE BEGIN - IDS_LANGUAGE_AVAILABLE_TRANSLATION "Supports your language" - IDS_LANGUAGE_NO_TRANSLATION "Supports other languages" - IDS_LANGUAGE_ENGLISH_TRANSLATION "Supports English" - IDS_LANGUAGE_SINGLE "Single language" - IDS_LANGUAGE_MORE_PLACEHOLDER " (+%d more)" - IDS_LANGUAGE_AVAILABLE_PLACEHOLDER " (+%d available)" + IDS_LANGUAGE_AVAILABLE_TRANSLATION "Suportă limba respectivă" + IDS_LANGUAGE_NO_TRANSLATION "Suportă alte limbi" + IDS_LANGUAGE_ENGLISH_TRANSLATION "Suportă limba Engleză" + IDS_LANGUAGE_SINGLE "Singura Limbă" + IDS_LANGUAGE_MORE_PLACEHOLDER " (+%d mult)" + IDS_LANGUAGE_AVAILABLE_PLACEHOLDER " (+%d disponibil)" END STRINGTABLE BEGIN - IDS_DL_DIALOG_DB_DISP "Applications Database" - IDS_DL_DIALOG_DB_DOWNLOAD_DISP "Updating Database..." + IDS_DL_DIALOG_DB_DISP "Aplicații baza de date" + IDS_DL_DIALOG_DB_DOWNLOAD_DISP "Actualizare baza de date…" END

1 0

[reactos] 03/03: [NTOSKRNL] Print tags which contains numerics in the memory dumper. This fixes i8042prt.sys allocations not properly being rendered.
by Pierre Schweitzer 29 Dec '17

29 Dec '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7fecde4a20b6a73e1702d… commit 7fecde4a20b6a73e1702dfbc8c2a012060185d6b Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Fri Dec 29 20:36:35 2017 +0100 [NTOSKRNL] Print tags which contains numerics in the memory dumper. This fixes i8042prt.sys allocations not properly being rendered. --- ntoskrnl/mm/ARM3/expool.c | 1 + 1 file changed, 1 insertion(+) diff --git a/ntoskrnl/mm/ARM3/expool.c b/ntoskrnl/mm/ARM3/expool.c index 89103807a6..d13142a4a7 100644 --- a/ntoskrnl/mm/ARM3/expool.c +++ b/ntoskrnl/mm/ARM3/expool.c @@ -467,6 +467,7 @@ ExpTagAllowPrint(CHAR Tag) { if ((Tag >= 'a' && Tag <= 'z') || (Tag >= 'A' && Tag <= 'Z') || + (Tag >= '0' && Tag <= '9') || Tag == ' ') { return TRUE;

1 0

[reactos] 02/03: [NTOSKRNL] In the memory dumper, print in the direct order to make !poolused TAG usage easier
by Pierre Schweitzer 29 Dec '17

29 Dec '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4663d02cd7d55e41a320c… commit 4663d02cd7d55e41a320cffb6655afae36ab07ef Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Fri Dec 29 20:33:42 2017 +0100 [NTOSKRNL] In the memory dumper, print in the direct order to make !poolused TAG usage easier --- ntoskrnl/mm/ARM3/expool.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ntoskrnl/mm/ARM3/expool.c b/ntoskrnl/mm/ARM3/expool.c index e42d7e8c4e..89103807a6 100644 --- a/ntoskrnl/mm/ARM3/expool.c +++ b/ntoskrnl/mm/ARM3/expool.c @@ -562,11 +562,11 @@ MiDumpPoolConsumers(BOOLEAN CalledFromDbg, ULONG Tag, ULONG Mask, ULONG Flags) if (ExpTagAllowPrint(Tag[0]) && ExpTagAllowPrint(Tag[1]) && ExpTagAllowPrint(Tag[2]) && ExpTagAllowPrint(Tag[3])) { // - // Print in reversed order to match what is in source code + // Print in direct order to make !poolused TAG usage easier // if (Verbose) { - MiDumperPrint(CalledFromDbg, "'%c%c%c%c'\t\t%ld\t\t%ld\t\t%ld\t\t%ld\t\t%ld\t\t%ld\t\t%ld\t\t%ld\n", Tag[3], Tag[2], Tag[1], Tag[0], + MiDumperPrint(CalledFromDbg, "'%c%c%c%c'\t\t%ld\t\t%ld\t\t%ld\t\t%ld\t\t%ld\t\t%ld\t\t%ld\t\t%ld\n", Tag[0], Tag[1], Tag[2], Tag[3], TableEntry->NonPagedAllocs, TableEntry->NonPagedFrees, (TableEntry->NonPagedAllocs - TableEntry->NonPagedFrees), TableEntry->NonPagedBytes, TableEntry->PagedAllocs, TableEntry->PagedFrees, @@ -574,7 +574,7 @@ MiDumpPoolConsumers(BOOLEAN CalledFromDbg, ULONG Tag, ULONG Mask, ULONG Flags) } else { - MiDumperPrint(CalledFromDbg, "'%c%c%c%c'\t\t%ld\t\t%ld\t\t%ld\t\t%ld\n", Tag[3], Tag[2], Tag[1], Tag[0], + MiDumperPrint(CalledFromDbg, "'%c%c%c%c'\t\t%ld\t\t%ld\t\t%ld\t\t%ld\n", Tag[0], Tag[1], Tag[2], Tag[3], TableEntry->NonPagedAllocs, TableEntry->NonPagedBytes, TableEntry->PagedAllocs, TableEntry->PagedBytes); }

1 0

[reactos] 01/03: [NTOSKRNL] Add support for verbose output in the !poolused command
by Pierre Schweitzer 29 Dec '17

29 Dec '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ca3143b9ab5d2748ee145… commit ca3143b9ab5d2748ee145af5c023b2c3f5b19582 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Fri Dec 29 20:28:54 2017 +0100 [NTOSKRNL] Add support for verbose output in the !poolused command --- ntoskrnl/kdbg/kdb_cli.c | 2 +- ntoskrnl/mm/ARM3/expool.c | 145 ++++++++++++++++++++++++++++++++++++---------- 2 files changed, 115 insertions(+), 32 deletions(-) diff --git a/ntoskrnl/kdbg/kdb_cli.c b/ntoskrnl/kdbg/kdb_cli.c index b951178721..fe83d5d421 100644 --- a/ntoskrnl/kdbg/kdb_cli.c +++ b/ntoskrnl/kdbg/kdb_cli.c @@ -185,7 +185,7 @@ static const struct { "kmsg", "kmsg", "Kernel dmesg. Alias for dmesg.", KdbpCmdDmesg }, { "help", "help", "Display help screen.", KdbpCmdHelp }, { "!pool", "!pool [Address [Flags]]", "Display information about pool allocations.", ExpKdbgExtPool }, - { "!poolused", "!poolused [Tag]", "Display pool usage.", ExpKdbgExtPoolUsed }, + { "!poolused", "!poolused [Flags [Tag]]", "Display pool usage.", ExpKdbgExtPoolUsed }, }; /* FUNCTIONS *****************************************************************/ diff --git a/ntoskrnl/mm/ARM3/expool.c b/ntoskrnl/mm/ARM3/expool.c index 4b5a8afbe8..e42d7e8c4e 100644 --- a/ntoskrnl/mm/ARM3/expool.c +++ b/ntoskrnl/mm/ARM3/expool.c @@ -485,9 +485,10 @@ ExpTagAllowPrint(CHAR Tag) #endif VOID -MiDumpPoolConsumers(BOOLEAN CalledFromDbg, ULONG Tag, ULONG Mask) +MiDumpPoolConsumers(BOOLEAN CalledFromDbg, ULONG Tag, ULONG Mask, ULONG Flags) { SIZE_T i; + BOOLEAN Verbose; // // Only print header if called from OOM situation @@ -504,11 +505,25 @@ MiDumpPoolConsumers(BOOLEAN CalledFromDbg, ULONG Tag, ULONG Mask) } #endif + // + // Remember whether we'll have to be verbose + // This is the only supported flag! + // + Verbose = BooleanFlagOn(Flags, 1); + // // Print table header // - MiDumperPrint(CalledFromDbg, "\t\tNonPaged\t\t\tPaged\n"); - MiDumperPrint(CalledFromDbg, "Tag\t\tAllocs\t\tUsed\t\tAllocs\t\tUsed\n"); + if (Verbose) + { + MiDumperPrint(CalledFromDbg, "\t\t\t\tNonPaged\t\t\t\t\t\t\tPaged\n"); + MiDumperPrint(CalledFromDbg, "Tag\t\tAllocs\t\tFrees\t\tDiff\t\tUsed\t\tAllocs\t\tFrees\t\tDiff\t\tUsed\n"); + } + else + { + MiDumperPrint(CalledFromDbg, "\t\tNonPaged\t\t\tPaged\n"); + MiDumperPrint(CalledFromDbg, "Tag\t\tAllocs\t\tUsed\t\tAllocs\t\tUsed\n"); + } // // We'll extract allocations for all the tracked pools @@ -549,22 +564,55 @@ MiDumpPoolConsumers(BOOLEAN CalledFromDbg, ULONG Tag, ULONG Mask) // // Print in reversed order to match what is in source code // - MiDumperPrint(CalledFromDbg, "'%c%c%c%c'\t\t%ld\t\t%ld\t\t%ld\t\t%ld\n", Tag[3], Tag[2], Tag[1], Tag[0], - TableEntry->NonPagedAllocs, TableEntry->NonPagedBytes, - TableEntry->PagedAllocs, TableEntry->PagedBytes); + if (Verbose) + { + MiDumperPrint(CalledFromDbg, "'%c%c%c%c'\t\t%ld\t\t%ld\t\t%ld\t\t%ld\t\t%ld\t\t%ld\t\t%ld\t\t%ld\n", Tag[3], Tag[2], Tag[1], Tag[0], + TableEntry->NonPagedAllocs, TableEntry->NonPagedFrees, + (TableEntry->NonPagedAllocs - TableEntry->NonPagedFrees), TableEntry->NonPagedBytes, + TableEntry->PagedAllocs, TableEntry->PagedFrees, + (TableEntry->PagedAllocs - TableEntry->PagedFrees), TableEntry->PagedBytes); + } + else + { + MiDumperPrint(CalledFromDbg, "'%c%c%c%c'\t\t%ld\t\t%ld\t\t%ld\t\t%ld\n", Tag[3], Tag[2], Tag[1], Tag[0], + TableEntry->NonPagedAllocs, TableEntry->NonPagedBytes, + TableEntry->PagedAllocs, TableEntry->PagedBytes); + } } else { - MiDumperPrint(CalledFromDbg, "%x\t%ld\t\t%ld\t\t%ld\t\t%ld\n", TableEntry->Key, - TableEntry->NonPagedAllocs, TableEntry->NonPagedBytes, - TableEntry->PagedAllocs, TableEntry->PagedBytes); + if (Verbose) + { + MiDumperPrint(CalledFromDbg, "%x\t%ld\t\t%ld\t\t%ld\t\t%ld\t\t%ld\t\t%ld\t\t%ld\t\t%ld\n", TableEntry->Key, + TableEntry->NonPagedAllocs, TableEntry->NonPagedFrees, + (TableEntry->NonPagedAllocs - TableEntry->NonPagedFrees), TableEntry->NonPagedBytes, + TableEntry->PagedAllocs, TableEntry->PagedFrees, + (TableEntry->PagedAllocs - TableEntry->PagedFrees), TableEntry->PagedBytes); + } + else + { + MiDumperPrint(CalledFromDbg, "%x\t%ld\t\t%ld\t\t%ld\t\t%ld\n", TableEntry->Key, + TableEntry->NonPagedAllocs, TableEntry->NonPagedBytes, + TableEntry->PagedAllocs, TableEntry->PagedBytes); + } } } else if (Tag == 0 || (Tag & Mask) == (TAG_NONE & Mask)) { - MiDumperPrint(CalledFromDbg, "Anon\t\t%ld\t\t%ld\t\t%ld\t\t%ld\n", - TableEntry->NonPagedAllocs, TableEntry->NonPagedBytes, - TableEntry->PagedAllocs, TableEntry->PagedBytes); + if (Verbose) + { + MiDumperPrint(CalledFromDbg, "Anon\t\t%ld\t\t%ld\t\t%ld\t\t%ld\t\t%ld\t\t%ld\t\t%ld\t\t%ld\n", + TableEntry->NonPagedAllocs, TableEntry->NonPagedFrees, + (TableEntry->NonPagedAllocs - TableEntry->NonPagedFrees), TableEntry->NonPagedBytes, + TableEntry->PagedAllocs, TableEntry->PagedFrees, + (TableEntry->PagedAllocs - TableEntry->PagedFrees), TableEntry->PagedBytes); + } + else + { + MiDumperPrint(CalledFromDbg, "Anon\t\t%ld\t\t%ld\t\t%ld\t\t%ld\n", + TableEntry->NonPagedAllocs, TableEntry->NonPagedBytes, + TableEntry->PagedAllocs, TableEntry->PagedBytes); + } } } } @@ -1761,7 +1809,7 @@ ExAllocatePoolWithTag(IN POOL_TYPE PoolType, // // Out of memory, display current consumption // - MiDumpPoolConsumers(FALSE, 0, 0); + MiDumpPoolConsumers(FALSE, 0, 0, 0); #endif // @@ -2094,7 +2142,7 @@ ExAllocatePoolWithTag(IN POOL_TYPE PoolType, // // Out of memory, display current consumption // - MiDumpPoolConsumers(FALSE, 0, 0); + MiDumpPoolConsumers(FALSE, 0, 0, 0); #endif // @@ -2949,6 +2997,35 @@ ExpKdbgExtPool( return TRUE; } +static +VOID +ExpKdbgExtPoolUsedGetTag(PCHAR Arg, PULONG Tag, PULONG Mask) +{ + CHAR Tmp[4]; + ULONG Len; + USHORT i; + + /* Get the tag */ + Len = strlen(Arg); + if (Len > 4) + { + Len = 4; + } + + /* Generate the mask to have wildcards support */ + for (i = 0; i < Len; ++i) + { + Tmp[i] = Arg[i]; + if (Tmp[i] != '?') + { + *Mask |= (0xFF << i * 8); + } + } + + /* Get the tag in the ulong form */ + *Tag = *((PULONG)Tmp); +} + BOOLEAN ExpKdbgExtPoolUsed( ULONG Argc, @@ -2956,35 +3033,41 @@ ExpKdbgExtPoolUsed( { ULONG Tag = 0; ULONG Mask = 0; + ULONG Flags = 0; if (Argc > 1) { - CHAR Tmp[4]; - ULONG Len; - USHORT i; - - /* Get the tag */ - Len = strlen(Argv[1]); - if (Len > 4) + /* If we have 2+ args, easy: flags then tag */ + if (Argc > 2) { - Len = 4; + ExpKdbgExtPoolUsedGetTag(Argv[2], &Tag, &Mask); + if (!KdbpGetHexNumber(Argv[1], &Flags)) + { + KdbpPrint("Invalid parameter: %s\n", Argv[0]); + } } - /* Generate the mask to have wildcards support */ - for (i = 0; i < Len; ++i) + else { - Tmp[i] = Argv[1][i]; - if (Tmp[i] != '?') + /* Otherwise, try to find out whether that's flags */ + if (strlen(Argv[1]) == 1 || + (strlen(Argv[1]) == 3 && Argv[1][0] == '0' && Argv[1][1] == 'x')) + { + /* Fallback: if reading flags failed, assume it's a tag */ + if (!KdbpGetHexNumber(Argv[1], &Flags)) + { + ExpKdbgExtPoolUsedGetTag(Argv[1], &Tag, &Mask); + } + } + /* Or tag */ + else { - Mask |= (0xFF << i * 8); + ExpKdbgExtPoolUsedGetTag(Argv[1], &Tag, &Mask); } } - - /* Get the tag in the ulong form */ - Tag = *((PULONG)Tmp); } /* Call the dumper */ - MiDumpPoolConsumers(TRUE, Tag, Mask); + MiDumpPoolConsumers(TRUE, Tag, Mask, Flags); return TRUE; }

1 0

[reactos] 01/01: [NTOS:EX] Fix handle table code for x64. Based on patch by Ivan Labutin. See PR #115
by Timo Kreuzer 29 Dec '17

29 Dec '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cbc4cfeed6a6c6f93d1f5… commit cbc4cfeed6a6c6f93d1f5e60abb9dd254c38c98f Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Mon Nov 13 19:00:31 2017 +0100 [NTOS:EX] Fix handle table code for x64. Based on patch by Ivan Labutin. See PR #115 --- ntoskrnl/ex/handle.c | 64 ++++++++++++++++++++++-------------------- ntoskrnl/include/internal/ex.h | 20 +++++++------ 2 files changed, 46 insertions(+), 38 deletions(-) diff --git a/ntoskrnl/ex/handle.c b/ntoskrnl/ex/handle.c index b9732f3639..5c26ccdca8 100644 --- a/ntoskrnl/ex/handle.c +++ b/ntoskrnl/ex/handle.c @@ -18,6 +18,7 @@ LIST_ENTRY HandleTableListHead; EX_PUSH_LOCK HandleTableListLock; #define SizeOfHandle(x) (sizeof(HANDLE) * (x)) +#define INDEX_TO_HANDLE_VALUE(x) ((x) << HANDLE_TAG_BITS) /* PRIVATE FUNCTIONS *********************************************************/ @@ -67,12 +68,14 @@ ExpLookupHandleTableEntry(IN PHANDLE_TABLE HandleTable, /* Get the mid level pointer array */ PointerArray = PointerArray[Handle.HighIndex]; + ASSERT(PointerArray != NULL); /* Fall through */ case 1: /* Get the handle array */ HandleArray = PointerArray[Handle.MidIndex]; + ASSERT(HandleArray != NULL); /* Fall through */ case 0: @@ -255,8 +258,8 @@ ExpFreeHandleTableEntry(IN PHANDLE_TABLE HandleTable, IN EXHANDLE Handle, IN PHANDLE_TABLE_ENTRY HandleTableEntry) { - ULONG OldValue, NewValue, *Free; - ULONG i; + ULONG OldValue, *Free; + ULONG LockIndex; PAGED_CODE(); /* Sanity checks */ @@ -267,16 +270,16 @@ ExpFreeHandleTableEntry(IN PHANDLE_TABLE HandleTable, InterlockedDecrement(&HandleTable->HandleCount); /* Mark the handle as free */ - NewValue = (ULONG)Handle.Value & ~(SizeOfHandle(1) - 1); + Handle.TagBits = 0; /* Check if we're FIFO */ if (!HandleTable->StrictFIFO) { /* Select a lock index */ - i = (NewValue >> 2) % 4; + LockIndex = Handle.Index % 4; /* Select which entry to use */ - Free = (HandleTable->HandleTableLock[i].Locked) ? + Free = (HandleTable->HandleTableLock[LockIndex].Locked) ? &HandleTable->FirstFree : &HandleTable->LastFree; } else @@ -290,8 +293,8 @@ ExpFreeHandleTableEntry(IN PHANDLE_TABLE HandleTable, { /* Get the current value and write */ OldValue = *Free; - HandleTableEntry->NextFreeTableEntry = (ULONG)OldValue; - if (InterlockedCompareExchange((PLONG) Free, NewValue, OldValue) == OldValue) + HandleTableEntry->NextFreeTableEntry = OldValue; + if (InterlockedCompareExchange((PLONG)Free, Handle.AsULONG, OldValue) == OldValue) { /* Break out, we're done. Make sure the handle value makes sense */ ASSERT((OldValue & FREE_HANDLE_MASK) < @@ -354,7 +357,7 @@ ExpAllocateHandleTable(IN PEPROCESS Process OPTIONAL, { /* Set up the free data */ HandleEntry->Value = 0; - HandleEntry->NextFreeTableEntry = (i + 1) * SizeOfHandle(1); + HandleEntry->NextFreeTableEntry = INDEX_TO_HANDLE_VALUE(i + 1); /* Move to the next entry */ HandleEntry++; @@ -363,11 +366,11 @@ ExpAllocateHandleTable(IN PEPROCESS Process OPTIONAL, /* Terminate the last entry */ HandleEntry->Value = 0; HandleEntry->NextFreeTableEntry = 0; - HandleTable->FirstFree = SizeOfHandle(1); + HandleTable->FirstFree = INDEX_TO_HANDLE_VALUE(1); } /* Set the next handle needing pool after our allocated page from above */ - HandleTable->NextHandleNeedingPool = LOW_LEVEL_ENTRIES * SizeOfHandle(1); + HandleTable->NextHandleNeedingPool = INDEX_TO_HANDLE_VALUE(LOW_LEVEL_ENTRIES); /* Setup the rest of the handle table data */ HandleTable->QuotaProcess = Process; @@ -409,12 +412,12 @@ ExpAllocateLowLevelTable(IN PHANDLE_TABLE HandleTable, { /* Go to the next entry and the base entry */ HandleEntry++; - Base = HandleTable->NextHandleNeedingPool + SizeOfHandle(2); + Base = HandleTable->NextHandleNeedingPool + INDEX_TO_HANDLE_VALUE(2); /* Loop each entry */ for (i = Base; - i < Base + SizeOfHandle(LOW_LEVEL_ENTRIES - 2); - i += SizeOfHandle(1)) + i < Base + INDEX_TO_HANDLE_VALUE(LOW_LEVEL_ENTRIES - 2); + i += INDEX_TO_HANDLE_VALUE(1)) { /* Free this entry and move on to the next one */ HandleEntry->NextFreeTableEntry = i; @@ -494,7 +497,7 @@ ExpAllocateHandleTableEntrySlow(IN PHANDLE_TABLE HandleTable, /* Get if the next index can fit in the table */ i = HandleTable->NextHandleNeedingPool / - SizeOfHandle(LOW_LEVEL_ENTRIES); + INDEX_TO_HANDLE_VALUE(LOW_LEVEL_ENTRIES); if (i < MID_LEVEL_ENTRIES) { /* We need to allocate a new table */ @@ -539,7 +542,7 @@ ExpAllocateHandleTableEntrySlow(IN PHANDLE_TABLE HandleTable, ThirdLevel = (PVOID)TableBase; /* Get the index and check if it can fit */ - i = HandleTable->NextHandleNeedingPool / SizeOfHandle(MAX_MID_INDEX); + i = HandleTable->NextHandleNeedingPool / INDEX_TO_HANDLE_VALUE(MAX_MID_INDEX); if (i >= HIGH_LEVEL_ENTRIES) return FALSE; /* Check if there's no mid-level table */ @@ -556,8 +559,8 @@ ExpAllocateHandleTableEntrySlow(IN PHANDLE_TABLE HandleTable, else { /* We have one, check at which index we should insert our entry */ - Index = (HandleTable->NextHandleNeedingPool / SizeOfHandle(1)) - - i * MAX_MID_INDEX; + Index = (HandleTable->NextHandleNeedingPool / INDEX_TO_HANDLE_VALUE(1)) - + i * MAX_MID_INDEX; j = Index / LOW_LEVEL_ENTRIES; /* Allocate a new low level */ @@ -577,13 +580,13 @@ ExpAllocateHandleTableEntrySlow(IN PHANDLE_TABLE HandleTable, /* Update the index of the next handle */ Index = InterlockedExchangeAdd((PLONG) &HandleTable->NextHandleNeedingPool, - SizeOfHandle(LOW_LEVEL_ENTRIES)); + INDEX_TO_HANDLE_VALUE(LOW_LEVEL_ENTRIES)); /* Check if need to initialize the table */ if (DoInit) { /* Create a new index number */ - Index += SizeOfHandle(1); + Index += INDEX_TO_HANDLE_VALUE(1); /* Start free index change loop */ for (;;) @@ -646,7 +649,7 @@ ExpAllocateHandleTableEntry(IN PHANDLE_TABLE HandleTable, { ULONG OldValue, NewValue, NewValue1; PHANDLE_TABLE_ENTRY Entry; - EXHANDLE Handle; + EXHANDLE Handle, OldHandle; BOOLEAN Result; ULONG i; @@ -709,7 +712,8 @@ ExpAllocateHandleTableEntry(IN PHANDLE_TABLE HandleTable, Entry = ExpLookupHandleTableEntry(HandleTable, Handle); /* Get an available lock and acquire it */ - i = ((OldValue & FREE_HANDLE_MASK) >> 2) % 4; + OldHandle.Value = OldValue; + i = OldHandle.Index % 4; KeEnterCriticalRegion(); ExAcquirePushLockShared(&HandleTable->HandleTableLock[i]); @@ -1063,7 +1067,7 @@ ExDupHandleTable(IN PEPROCESS Process, NewTable->FirstFree = 0; /* Setup the first handle value */ - Handle.Value = SizeOfHandle(1); + Handle.Value = INDEX_TO_HANDLE_VALUE(1); /* Enter a critical region and lookup the new entry */ KeEnterCriticalRegion(); @@ -1125,13 +1129,13 @@ ExDupHandleTable(IN PEPROCESS Process, } /* Increase the handle value and move to the next entry */ - Handle.Value += SizeOfHandle(1); + Handle.Value += INDEX_TO_HANDLE_VALUE(1); NewEntry++; HandleTableEntry++; - } while (Handle.Value % SizeOfHandle(LOW_LEVEL_ENTRIES)); + } while (Handle.Value % INDEX_TO_HANDLE_VALUE(LOW_LEVEL_ENTRIES)); /* We're done, skip the last entry */ - Handle.Value += SizeOfHandle(1); + Handle.Value += INDEX_TO_HANDLE_VALUE(1); } /* Acquire the table lock and insert this new table into the list */ @@ -1198,7 +1202,7 @@ ExSweepHandleTable(IN PHANDLE_TABLE HandleTable, PAGED_CODE(); /* Set the initial value and loop the entries */ - Handle.Value = SizeOfHandle(1); + Handle.Value = INDEX_TO_HANDLE_VALUE(1); while ((HandleTableEntry = ExpLookupHandleTableEntry(HandleTable, Handle))) { /* Loop each handle */ @@ -1214,12 +1218,12 @@ ExSweepHandleTable(IN PHANDLE_TABLE HandleTable, } /* Go to the next handle and entry */ - Handle.Value += SizeOfHandle(1); + Handle.Value += INDEX_TO_HANDLE_VALUE(1); HandleTableEntry++; - } while (Handle.Value % SizeOfHandle(LOW_LEVEL_ENTRIES)); + } while (Handle.Value % INDEX_TO_HANDLE_VALUE(LOW_LEVEL_ENTRIES)); /* Skip past the last entry */ - Handle.Value += SizeOfHandle(1); + Handle.Value += INDEX_TO_HANDLE_VALUE(1); } } @@ -1271,7 +1275,7 @@ ExEnumHandleTable(IN PHANDLE_TABLE HandleTable, } /* Go to the next entry */ - Handle.Value += SizeOfHandle(1); + Handle.Value += INDEX_TO_HANDLE_VALUE(1); } /* Leave the critical region and return callback result */ diff --git a/ntoskrnl/include/internal/ex.h b/ntoskrnl/include/internal/ex.h index 3834249c44..09ba4648df 100644 --- a/ntoskrnl/include/internal/ex.h +++ b/ntoskrnl/include/internal/ex.h @@ -68,25 +68,29 @@ VOID NTAPI ExpDebuggerWorker(IN PVOID Context); #define HANDLE_LOW_BITS (PAGE_SHIFT - 3) #define HANDLE_HIGH_BITS (PAGE_SHIFT - 2) #endif -#define KERNEL_FLAG_BITS (sizeof(PVOID)*8 - 31) +#define HANDLE_TAG_BITS (2) +#define HANDLE_INDEX_BITS (HANDLE_LOW_BITS + 2*HANDLE_HIGH_BITS) +#define KERNEL_FLAG_BITS (sizeof(PVOID)*8 - HANDLE_INDEX_BITS - HANDLE_TAG_BITS) typedef union _EXHANDLE { struct { - ULONG_PTR TagBits:2; - ULONG_PTR Index:29; + ULONG_PTR TagBits: HANDLE_TAG_BITS; + ULONG_PTR Index: HANDLE_INDEX_BITS; + ULONG_PTR KernelFlag : KERNEL_FLAG_BITS; }; struct { - ULONG_PTR TagBits2:2; - ULONG_PTR LowIndex:HANDLE_LOW_BITS; - ULONG_PTR MidIndex:HANDLE_HIGH_BITS; - ULONG_PTR HighIndex:HANDLE_HIGH_BITS; - ULONG_PTR KernelFlag:KERNEL_FLAG_BITS; + ULONG_PTR TagBits2: HANDLE_TAG_BITS; + ULONG_PTR LowIndex: HANDLE_LOW_BITS; + ULONG_PTR MidIndex: HANDLE_HIGH_BITS; + ULONG_PTR HighIndex: HANDLE_HIGH_BITS; + ULONG_PTR KernelFlag2: KERNEL_FLAG_BITS; }; HANDLE GenericHandleOverlay; ULONG_PTR Value; + ULONG AsULONG; } EXHANDLE, *PEXHANDLE; typedef struct _ETIMER

1 0

[reactos] 01/01: [NTOSKNRL] Addendum to 9a633f7
by Pierre Schweitzer 29 Dec '17

29 Dec '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2daf2391a6cac848d4ae6… commit 2daf2391a6cac848d4ae6e6951591a321b5b8535 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Fri Dec 29 18:22:37 2017 +0100 [NTOSKNRL] Addendum to 9a633f7 --- ntoskrnl/mm/ARM3/expool.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ntoskrnl/mm/ARM3/expool.c b/ntoskrnl/mm/ARM3/expool.c index e892999ed3..4b5a8afbe8 100644 --- a/ntoskrnl/mm/ARM3/expool.c +++ b/ntoskrnl/mm/ARM3/expool.c @@ -497,10 +497,12 @@ MiDumpPoolConsumers(BOOLEAN CalledFromDbg, ULONG Tag, ULONG Mask) DPRINT1("---------------------\n"); DPRINT1("Out of memory dumper!\n"); } +#ifdef KDBG else { KdbpPrint("Pool Used:\n"); } +#endif // // Print table header

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs