Ros-diffs October 2018

ros-diffs@reactos.org

21 participants
354 discussions

01/01: [NTOSKRNL] A bit of cleanup in Io*FilterContext()
by Pierre Schweitzer 04 Oct '18

04 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2a182931b6dcbb213d342… commit 2a182931b6dcbb213d342ad552f0d8b8e2ecd40b Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Thu Oct 4 22:24:52 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Thu Oct 4 22:24:52 2018 +0200 [NTOSKRNL] A bit of cleanup in Io*FilterContext() --- ntoskrnl/io/iomgr/file.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ntoskrnl/io/iomgr/file.c b/ntoskrnl/io/iomgr/file.c index 860348a370..a8da317317 100644 --- a/ntoskrnl/io/iomgr/file.c +++ b/ntoskrnl/io/iomgr/file.c @@ -2441,7 +2441,7 @@ PVOID NTAPI IoGetFileObjectFilterContext(IN PFILE_OBJECT FileObject) { - if (FileObject->Flags & FO_FILE_OBJECT_HAS_EXTENSION) + if (BooleanFlagOn(FileObject->Flags, FO_FILE_OBJECT_HAS_EXTENSION)) { PFILE_OBJECT_EXTENSION FileObjectExtension; @@ -2461,7 +2461,7 @@ IoChangeFileObjectFilterContext(IN PFILE_OBJECT FileObject, ULONG_PTR Success; PFILE_OBJECT_EXTENSION FileObjectExtension; - if (!(FileObject->Flags & FO_FILE_OBJECT_HAS_EXTENSION)) + if (!BooleanFlagOn(FileObject->Flags, FO_FILE_OBJECT_HAS_EXTENSION)) { return STATUS_INVALID_PARAMETER; } @@ -2472,7 +2472,7 @@ IoChangeFileObjectFilterContext(IN PFILE_OBJECT FileObject, /* If define, just set the new value if not value is set * Success will only contain old value. It is valid if it is NULL */ - Success = InterlockedCompareExchange((volatile LONG *)&FileObjectExtension->FilterContext, (ULONG_PTR)FilterContext, 0); + Success = (ULONG_PTR)InterlockedCompareExchangePointer(&FileObjectExtension->FilterContext, FilterContext, NULL); } else { @@ -2483,7 +2483,7 @@ IoChangeFileObjectFilterContext(IN PFILE_OBJECT FileObject, * If it matches (and thus, we reset), Success will contain 0 * Otherwise, it will contain a non-zero value. */ - Success = InterlockedCompareExchange((volatile LONG *)&FileObjectExtension->FilterContext, 0, (ULONG_PTR)FilterContext) - (ULONG_PTR)FilterContext; + Success = (ULONG_PTR)InterlockedCompareExchangePointer(&FileObjectExtension->FilterContext, NULL, FilterContext) - (ULONG_PTR)FilterContext; } /* If success isn't 0, it means we failed somewhere (set or unset) */

1 0

02/02: [NTOSKRNL] Implement IoChangeFileObjectFilterContext()
by Pierre Schweitzer 04 Oct '18

04 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5f0d02eb52c6ebe3caf6a… commit 5f0d02eb52c6ebe3caf6aa9c6315f5ca06bb89d3 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Thu Oct 4 19:30:11 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Thu Oct 4 19:30:39 2018 +0200 [NTOSKRNL] Implement IoChangeFileObjectFilterContext() --- ntoskrnl/io/iomgr/file.c | 31 +++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/ntoskrnl/io/iomgr/file.c b/ntoskrnl/io/iomgr/file.c index 0a5e0b1d1a..860348a370 100644 --- a/ntoskrnl/io/iomgr/file.c +++ b/ntoskrnl/io/iomgr/file.c @@ -2458,14 +2458,41 @@ IoChangeFileObjectFilterContext(IN PFILE_OBJECT FileObject, IN PVOID FilterContext, IN BOOLEAN Define) { + ULONG_PTR Success; + PFILE_OBJECT_EXTENSION FileObjectExtension; + if (!(FileObject->Flags & FO_FILE_OBJECT_HAS_EXTENSION)) { return STATUS_INVALID_PARAMETER; } - UNIMPLEMENTED; + FileObjectExtension = FileObject->FileObjectExtension; + if (Define) + { + /* If define, just set the new value if not value is set + * Success will only contain old value. It is valid if it is NULL + */ + Success = InterlockedCompareExchange((volatile LONG *)&FileObjectExtension->FilterContext, (ULONG_PTR)FilterContext, 0); + } + else + { + /* If not define, we want to reset filter context. + * We will remove value (provided by the caller) and set NULL instead. + * This will only success if caller provides correct previous value. + * To catch whether it worked, we substract previous value to expect value: + * If it matches (and thus, we reset), Success will contain 0 + * Otherwise, it will contain a non-zero value. + */ + Success = InterlockedCompareExchange((volatile LONG *)&FileObjectExtension->FilterContext, 0, (ULONG_PTR)FilterContext) - (ULONG_PTR)FilterContext; + } - return STATUS_NOT_IMPLEMENTED; + /* If success isn't 0, it means we failed somewhere (set or unset) */ + if (Success != 0) + { + return STATUS_ALREADY_COMMITTED; + } + + return STATUS_SUCCESS; } NTSTATUS

1 0

01/02: [NTOSKRNL] Implement IoGetFileObjectFilterContext()
by Pierre Schweitzer 04 Oct '18

04 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a43fb5e054b51a59a6cb5… commit a43fb5e054b51a59a6cb5f0cd81d6535460d08b4 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Thu Oct 4 19:19:24 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Thu Oct 4 19:30:38 2018 +0200 [NTOSKRNL] Implement IoGetFileObjectFilterContext() --- ntoskrnl/include/internal/io.h | 1 + ntoskrnl/io/iomgr/file.c | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ntoskrnl/include/internal/io.h b/ntoskrnl/include/internal/io.h index 9928cbaab4..8f0398b4ad 100644 --- a/ntoskrnl/include/internal/io.h +++ b/ntoskrnl/include/internal/io.h @@ -96,6 +96,7 @@ typedef struct _FILE_OBJECT_EXTENSION { PDEVICE_OBJECT TopDeviceObjectHint; + PVOID FilterContext; } FILE_OBJECT_EXTENSION, *PFILE_OBJECT_EXTENSION; diff --git a/ntoskrnl/io/iomgr/file.c b/ntoskrnl/io/iomgr/file.c index 68a801fd4f..0a5e0b1d1a 100644 --- a/ntoskrnl/io/iomgr/file.c +++ b/ntoskrnl/io/iomgr/file.c @@ -2443,9 +2443,10 @@ IoGetFileObjectFilterContext(IN PFILE_OBJECT FileObject) { if (FileObject->Flags & FO_FILE_OBJECT_HAS_EXTENSION) { - UNIMPLEMENTED; - /* FIXME: return NULL for the moment ~ */ - return NULL; + PFILE_OBJECT_EXTENSION FileObjectExtension; + + FileObjectExtension = FileObject->FileObjectExtension; + return FileObjectExtension->FilterContext; } return NULL;

1 0

01/01: [KMTESTS:TCPIP] Add an "Associate address IRP completed" trace
by Serge Gautherie 04 Oct '18

04 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=043faab08948aa9c49ddf… commit 043faab08948aa9c49ddf8ae1ab07a9005e3cbce Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Sun Sep 16 17:13:51 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Thu Oct 4 18:28:08 2018 +0200 [KMTESTS:TCPIP] Add an "Associate address IRP completed" trace --- modules/rostests/kmtests/tcpip/connect.c | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/rostests/kmtests/tcpip/connect.c b/modules/rostests/kmtests/tcpip/connect.c index ef85db2a9f..33c87a8834 100644 --- a/modules/rostests/kmtests/tcpip/connect.c +++ b/modules/rostests/kmtests/tcpip/connect.c @@ -166,6 +166,7 @@ TestTcpConnect(void) FALSE, NULL); Status = Irp->IoStatus.Status; + trace("Associate address IRP completed.\n"); } ok_eq_hex(Status, STATUS_SUCCESS); IoFreeIrp(Irp);

1 0

01/01: [KMTESTS:TCPIP] ReturnAddress: Expect NT5 result, not NT6+ one
by Serge Gautherie 04 Oct '18

04 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=302144c5acdde1bd47b6c… commit 302144c5acdde1bd47b6cff117e2a972491cc75e Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Sun Sep 16 17:38:38 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Thu Oct 4 18:17:15 2018 +0200 [KMTESTS:TCPIP] ReturnAddress: Expect NT5 result, not NT6+ one ROSTESTS-268 --- modules/rostests/kmtests/tcpip/connect.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/rostests/kmtests/tcpip/connect.c b/modules/rostests/kmtests/tcpip/connect.c index 89fc75849a..ef85db2a9f 100644 --- a/modules/rostests/kmtests/tcpip/connect.c +++ b/modules/rostests/kmtests/tcpip/connect.c @@ -229,11 +229,11 @@ TestTcpConnect(void) ok_eq_long(ReturnInfo.UserDataLength, 0); ok_eq_pointer(ReturnInfo.UserData, NULL); - ok_eq_long(ReturnAddress.TAAddressCount, 0); - ok_eq_hex(ReturnAddress.Address[0].AddressType, 0); - ok_eq_hex(ReturnAddress.Address[0].AddressLength, 0); - ok_eq_hex(ReturnAddress.Address[0].Address[0].sin_port, 0); - ok_eq_hex(ReturnAddress.Address[0].Address[0].in_addr, 0); + ok_eq_long(ReturnAddress.TAAddressCount, 1); + ok_eq_hex(ReturnAddress.Address[0].AddressType, TDI_ADDRESS_TYPE_IP); + ok_eq_hex(ReturnAddress.Address[0].AddressLength, TDI_ADDRESS_LENGTH_IP); + ok_eq_hex(ReturnAddress.Address[0].Address[0].sin_port, htons(TEST_CONNECT_SERVER_PORT)); + ok_eq_hex(ReturnAddress.Address[0].Address[0].in_addr, InAddr.S_un.S_addr); ObDereferenceObject(ConnectionFileObject);

1 0

01/01: [DEVMGR] Update French translation
by Pierre Schweitzer 04 Oct '18

04 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f2f24c1fa7c40334994d2… commit f2f24c1fa7c40334994d21063c3ba95e04ce27fc Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Thu Oct 4 11:13:15 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Thu Oct 4 11:13:15 2018 +0200 [DEVMGR] Update French translation --- dll/win32/devmgr/lang/fr-FR.rc | 124 ++++++++++++++++++++--------------------- 1 file changed, 62 insertions(+), 62 deletions(-) diff --git a/dll/win32/devmgr/lang/fr-FR.rc b/dll/win32/devmgr/lang/fr-FR.rc index 342b24af01..226d1290c7 100644 --- a/dll/win32/devmgr/lang/fr-FR.rc +++ b/dll/win32/devmgr/lang/fr-FR.rc @@ -27,12 +27,12 @@ BEGIN IDS_NOTAVAILABLE "Non disponible" IDS_NOTDIGITALLYSIGNED "Non signé numériquement" IDS_NODRIVERS "Aucun fichier n'est requis ou n'a été chargé pour ce matériel." - IDS_RESOURCE_COLUMN "Resource type" - IDS_SETTING_COLUMN "Setting" - IDS_RESOURCE_MEMORY_RANGE "Memory range" + IDS_RESOURCE_COLUMN "Type de ressource" + IDS_SETTING_COLUMN "Paramètres" + IDS_RESOURCE_MEMORY_RANGE "Rang mémoire" IDS_RESOURCE_INTERRUPT "IRQ" IDS_RESOURCE_DMA "DMA" - IDS_RESOURCE_PORT "I/O range" + IDS_RESOURCE_PORT "Rang I/O" END STRINGTABLE @@ -155,7 +155,7 @@ BEGIN GROUPBOX "État du matériel", IDC_DEVSTATUSGROUP, 7, 83, 238, 100 EDITTEXT IDC_DEVSTATUS, 14, 96, 224, 61, NOT WS_TABSTOP | ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_VSCROLL PUSHBUTTON "&Dépannage...", IDC_DEVPROBLEM, 148, 163, 90, 15 - LTEXT "&Utilisation du matériel:", IDC_DEVUSAGELABEL, 7, 188, 222, 8, WS_DISABLED + LTEXT "&Utilisation du matériel :", IDC_DEVUSAGELABEL, 7, 188, 222, 8, WS_DISABLED COMBOBOX IDC_DEVUSAGE, 7, 198, 239, 40, CBS_DROPDOWNLIST | WS_VSCROLL | WS_DISABLED END @@ -176,12 +176,12 @@ BEGIN EDITTEXT IDC_DIGITALSIGNER, 120, 81, 126, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY PUSHBUTTON "&Détails...", IDC_DRIVERDETAILS, 7, 106, 75, 15 LTEXT "Voir les détails à propos des fichiers du Pilote.", -1, 91, 110, 154, 17, SS_NOPREFIX - PUSHBUTTON "&Update Driver...", IDC_UPDATEDRIVER, 7, 134, 75, 15 - LTEXT "Update the device driver.", -1, 91, 138, 154, 17, SS_NOPREFIX - PUSHBUTTON "&Roll Back Driver", IDC_ROLLBACKDRIVER, 7, 162, 75, 15 - LTEXT "If the device fails after updating the driver, roll back to the previously installed driver.", -1, 91, 162, 154, 25, SS_NOPREFIX - PUSHBUTTON "&Uninstall", IDC_UNINSTALLDRIVER, 7, 190, 75, 15 - LTEXT "To uninstall the driver (Advanced).", -1, 91, 194, 154, 17, SS_NOPREFIX + PUSHBUTTON "&Mettre le pilote à jour...", IDC_UPDATEDRIVER, 7, 134, 75, 15 + LTEXT "Mettre à jour le pilote du périphérique.", -1, 91, 138, 154, 17, SS_NOPREFIX + PUSHBUTTON "&Restaurer le pilote", IDC_ROLLBACKDRIVER, 7, 162, 75, 15 + LTEXT "Si le périphérique ne fonctionne plus après la mise à jour du pilote, permet de retourner au pilote précédemment installé.", -1, 91, 162, 154, 25, SS_NOPREFIX + PUSHBUTTON "Dé&sinstaller", IDC_UNINSTALLDRIVER, 7, 190, 75, 15 + LTEXT "Désinstaller le pilote (Avancé).", -1, 91, 194, 154, 17, SS_NOPREFIX END IDD_DRIVERDETAILS DIALOGEX 0, 0, 224, 230 @@ -208,7 +208,7 @@ END IDD_DEVICEDETAILS DIALOGEX 0, 0, 252, 218 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Details" +CAPTION "Détails" FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_DEVICON, 7, 7, 20, 20 @@ -221,12 +221,12 @@ END IDD_DEVICERESOURCES DIALOGEX 0, 0, 252, 218 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Resources" +CAPTION "Ressources" FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_DEVICON, 7, 7, 20, 20 LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX - LTEXT "Resource settings:", -1, 7, 36, 204, 8 + LTEXT "Paramètres de la ressource :", -1, 7, 36, 204, 8 CONTROL "", IDC_DRIVERRESOURCES, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_SORTASCENDING | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 7, 46, 238, 80 @@ -234,7 +234,7 @@ END IDD_DEVICEPOWER DIALOGEX 0, 0, 252, 218 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Power" +CAPTION "Énergie" FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_DEVICON, 7, 7, 20, 20 @@ -249,79 +249,79 @@ END IDR_MAINMENU MENU BEGIN - POPUP "&File" + POPUP "&Fichier" BEGIN - MENUITEM "E&xit", IDC_EXIT + MENUITEM "&Quitter", IDC_EXIT END - MENUITEM "Action", IDC_ACTIONMENU - POPUP "View" + MENUITEM "Action", IDC_ACTIONMENU + POPUP "Vue" BEGIN - MENUITEM "Devices by type", IDC_DEVBYTYPE - MENUITEM "Devices by connection", IDC_DEVBYCONN - MENUITEM "Resources by type", IDC_RESBYTYPE, GRAYED - MENUITEM "Resources by connection", IDC_RESBYCONN, GRAYED + MENUITEM "Périphériques par type", IDC_DEVBYTYPE + MENUITEM "Périphériques par connexion", IDC_DEVBYCONN + MENUITEM "Ressources par type", IDC_RESBYTYPE, GRAYED + MENUITEM "Ressources par connexion", IDC_RESBYCONN, GRAYED MENUITEM SEPARATOR - MENUITEM "Show hidden devices", IDC_SHOWHIDDEN + MENUITEM "Afficher les périphériques cachés", IDC_SHOWHIDDEN END - POPUP "Help" + POPUP "Aide" BEGIN - MENUITEM "About", IDC_ABOUT + MENUITEM "À propos", IDC_ABOUT END END STRINGTABLE DISCARDABLE BEGIN - IDS_APPNAME "ReactOS Device Manager" - IDS_CONFIRM_DISABLE "Disabling this device will cause it to stop functioning.\r\nDo you really want to disable it?" - IDS_CONFIRM_UNINSTALL "Warning: You are about to uninstall this device from your system.\r\nDo you want to continue?" + IDS_APPNAME "Gestionnaire de périphériques ReactOS" + IDS_CONFIRM_DISABLE "Désactiver ce périphérique va le rendre inopérant.\r\nVoulez-vous réellement le désactiver ?" + IDS_CONFIRM_UNINSTALL "Attention : vous êtes sur le point de désinstaller ce périphérique de votre système.\r\nVoulez-vous continuer ?" END STRINGTABLE DISCARDABLE BEGIN - IDS_MENU_UPDATE "Update driver software..." - IDS_MENU_ENABLE "Enable" - IDS_MENU_DISABLE "Disable" - IDS_MENU_UNINSTALL "Uninstall" - IDS_MENU_SCAN "Scan for hardware changes" - IDS_MENU_ADD "Add hardware" - IDS_MENU_PROPERTIES "Properties" + IDS_MENU_UPDATE "Mettre le pilote logiciel à jour..." + IDS_MENU_ENABLE "Activer" + IDS_MENU_DISABLE "Désactiver" + IDS_MENU_UNINSTALL "Désinstaller" + IDS_MENU_SCAN "Vérifier les changements de matériel" + IDS_MENU_ADD "Ajouter un matériel" + IDS_MENU_PROPERTIES "Propriétés" END STRINGTABLE DISCARDABLE BEGIN - IDS_TOOLTIP_PROPERTIES "Properties" - IDS_TOOLTIP_SCAN "Scan for hardware changes" - IDS_TOOLTIP_ENABLE "Enable" - IDS_TOOLTIP_DISABLE "Disable" - IDS_TOOLTIP_UPDATE "Update Driver Software" - IDS_TOOLTIP_UNINSTALL "Uninstall" + IDS_TOOLTIP_PROPERTIES "Propriétés" + IDS_TOOLTIP_SCAN "Vérifier les changements de matériel" + IDS_TOOLTIP_ENABLE "Activer" + IDS_TOOLTIP_DISABLE "Désactiver" + IDS_TOOLTIP_UPDATE "Mettre le pilote logiciel à jour" + IDS_TOOLTIP_UNINSTALL "Désinstaller" END /* Hints */ STRINGTABLE DISCARDABLE BEGIN IDS_HINT_BLANK " " - IDS_HINT_PROPERTIES " Open property dialog for the current selection." - IDS_HINT_SCAN " Scan for changed or new plug and play devices." - IDS_HINT_ENABLE " Enables the selected device." - IDS_HINT_DISABLE " Disables the selected device." - IDS_HINT_UPDATE " Launches the Update Driver Software wizard for the selected device." - IDS_HINT_UNINSTALL " Uninstalls the driver for the selected device." - IDS_HINT_ADD " Adds a legacy (non-Plug and Play) device to the computer." - IDS_HINT_ABOUT " About ReactOS Device Manager." - IDS_HINT_EXIT " Exits the program." + IDS_HINT_PROPERTIES " Ouvre les priopriétés pour la sélection actuelle." + IDS_HINT_SCAN " Analyser le PC pour le matériel qui a changé ou pour les nouveaux périphériques 'plug and play'." + IDS_HINT_ENABLE " Active le périphérique sélectionné." + IDS_HINT_DISABLE " Désactive le périphérique sélectionné." + IDS_HINT_UPDATE " Lance l'assistant de mise à jour de pilote logiciel pour le périphérique sélectionné." + IDS_HINT_UNINSTALL " Désinstalle le pilote pour le périphérique sélectionné." + IDS_HINT_ADD " Ajoute un périphérique ancien (non 'plug and play') à l'ordinateur." + IDS_HINT_ABOUT " À propos du gestionnaire de périphérique ReactOS." + IDS_HINT_EXIT " Quitte le programme." - IDS_HINT_DEV_BY_TYPE " Displays devices by hardware type." - IDS_HINT_DEV_BY_CONN " Displays devices by connection." - IDS_HINT_RES_BY_TYPE " Displays resources by type." - IDS_HINT_RES_BY_CONN " Displays resources by connection type." - IDS_HINT_SHOW_HIDDEN " Displays legacy devices and devices that are no longer installed." + IDS_HINT_DEV_BY_TYPE " Affiche les périphériques par type de matériel." + IDS_HINT_DEV_BY_CONN " Affiche les périphériques par connexion." + IDS_HINT_RES_BY_TYPE " Affiche les ressources par type." + IDS_HINT_RES_BY_CONN " Affiche les ressources par type de connexion." + IDS_HINT_SHOW_HIDDEN " Affiche les anciens périphériques et les périphériques qui ne sont plus installés." - IDS_HINT_SYS_RESTORE " Restores this window to normal size." - IDS_HINT_SYS_MOVE " Moves this window." - IDS_HINT_SYS_SIZE " Resizes this window." - IDS_HINT_SYS_MINIMIZE " Collapses this window to an icon." - IDS_HINT_SYS_MAXIMIZE " Expands this window to fill this screen." - IDS_HINT_SYS_CLOSE " Closes this window." + IDS_HINT_SYS_RESTORE " Restaure cette fenêtre à sa taille normale." + IDS_HINT_SYS_MOVE " Déplace cette fenêtre." + IDS_HINT_SYS_SIZE " Redimensionne cette fenêtre." + IDS_HINT_SYS_MINIMIZE " Réduit cette fenêtre à une icône." + IDS_HINT_SYS_MAXIMIZE " Agrandit cette fenêtre pour occuper tout cet écran." + IDS_HINT_SYS_CLOSE " Ferme cette fenêtre." END

1 0

02/02: [NTOSKRNL] Quickly check for alignment in NtRead/WriteFile
by Pierre Schweitzer 04 Oct '18

04 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e19e907a2c40fa90a238e… commit e19e907a2c40fa90a238e78b146b5dfc3fe715a3 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Thu Oct 4 10:42:13 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Thu Oct 4 10:45:10 2018 +0200 [NTOSKRNL] Quickly check for alignment in NtRead/WriteFile This quick check based on bits and operation is for 2^ based sector sizes (most of the cases) and will perform faster than the modulo operation which is still used in fallback in case the sector size wouldn't be a power of 2. --- ntoskrnl/io/iomgr/iofunc.c | 32 ++++++++++++++++++++++---------- 1 file changed, 22 insertions(+), 10 deletions(-) diff --git a/ntoskrnl/io/iomgr/iofunc.c b/ntoskrnl/io/iomgr/iofunc.c index 01a956505f..61fd88f8fd 100644 --- a/ntoskrnl/io/iomgr/iofunc.c +++ b/ntoskrnl/io/iomgr/iofunc.c @@ -2612,13 +2612,19 @@ NtReadFile(IN HANDLE FileHandle, /* Perform additional checks for non-cached file access */ if (FileObject->Flags & FO_NO_INTERMEDIATE_BUFFERING) { - /* Fail if Length is not sector size aligned */ + /* Fail if Length is not sector size aligned + * Perform a quick check for 2^ sector sizes + * If it fails, try a more standard way + */ if ((DeviceObject->SectorSize != 0) && - (Length % DeviceObject->SectorSize != 0)) + ((DeviceObject->SectorSize - 1) & Length) != 0) { - /* Release the file object and and fail */ - ObDereferenceObject(FileObject); - return STATUS_INVALID_PARAMETER; + if (Length % DeviceObject->SectorSize != 0) + { + /* Release the file object and and fail */ + ObDereferenceObject(FileObject); + return STATUS_INVALID_PARAMETER; + } } /* Fail if buffer doesn't match alignment requirements */ @@ -3649,13 +3655,19 @@ NtWriteFile(IN HANDLE FileHandle, /* Perform additional checks for non-cached file access */ if (FileObject->Flags & FO_NO_INTERMEDIATE_BUFFERING) { - /* Fail if Length is not sector size aligned */ + /* Fail if Length is not sector size aligned + * Perform a quick check for 2^ sector sizes + * If it fails, try a more standard way + */ if ((DeviceObject->SectorSize != 0) && - (Length % DeviceObject->SectorSize != 0)) + ((DeviceObject->SectorSize - 1) & Length) != 0) { - /* Release the file object and and fail */ - ObDereferenceObject(FileObject); - return STATUS_INVALID_PARAMETER; + if (Length % DeviceObject->SectorSize != 0) + { + /* Release the file object and and fail */ + ObDereferenceObject(FileObject); + return STATUS_INVALID_PARAMETER; + } } /* Fail if buffer doesn't match alignment requirements */

1 0

01/02: [NTOSKRNL] Use captured variable to check parameters in NtRead/WriteFile
by Pierre Schweitzer 04 Oct '18

04 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=44155053cdade19887932… commit 44155053cdade19887932598ce6048a74f0ca71f Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Thu Oct 4 10:27:35 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Thu Oct 4 10:45:10 2018 +0200 [NTOSKRNL] Use captured variable to check parameters in NtRead/WriteFile --- ntoskrnl/io/iomgr/iofunc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ntoskrnl/io/iomgr/iofunc.c b/ntoskrnl/io/iomgr/iofunc.c index b90e73f5dc..01a956505f 100644 --- a/ntoskrnl/io/iomgr/iofunc.c +++ b/ntoskrnl/io/iomgr/iofunc.c @@ -2633,7 +2633,7 @@ NtReadFile(IN HANDLE FileHandle, { /* Fail if ByteOffset is not sector size aligned */ if ((DeviceObject->SectorSize != 0) && - (ByteOffset->QuadPart % DeviceObject->SectorSize != 0)) + (CapturedByteOffset.QuadPart % DeviceObject->SectorSize != 0)) { /* Release the file object and and fail */ ObDereferenceObject(FileObject); @@ -3670,11 +3670,11 @@ NtWriteFile(IN HANDLE FileHandle, { /* Fail if ByteOffset is not sector size aligned */ if ((DeviceObject->SectorSize != 0) && - (ByteOffset->QuadPart % DeviceObject->SectorSize != 0)) + (CapturedByteOffset.QuadPart % DeviceObject->SectorSize != 0)) { /* Only if that's not specific values for synchronous IO */ - if ((ByteOffset->QuadPart != FILE_WRITE_TO_END_OF_FILE) && - (ByteOffset->QuadPart != FILE_USE_FILE_POINTER_POSITION || + if ((CapturedByteOffset.QuadPart != FILE_WRITE_TO_END_OF_FILE) && + (CapturedByteOffset.QuadPart != FILE_USE_FILE_POINTER_POSITION || !BooleanFlagOn(FileObject->Flags, FO_SYNCHRONOUS_IO))) { /* Release the file object and and fail */

1 0

01/01: [MSPORTS] Check and show which parallel port is in use.
by Eric Kohl 04 Oct '18

04 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c444231b874c6c351ef59… commit c444231b874c6c351ef59a5afbe4563b63b707af Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Thu Oct 4 10:20:12 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Thu Oct 4 10:21:06 2018 +0200 [MSPORTS] Check and show which parallel port is in use. --- dll/win32/msports/lang/bg-BG.rc | 1 + dll/win32/msports/lang/de-DE.rc | 1 + dll/win32/msports/lang/en-US.rc | 1 + dll/win32/msports/lang/es-ES.rc | 1 + dll/win32/msports/lang/he-IL.rc | 1 + dll/win32/msports/lang/it-IT.rc | 1 + dll/win32/msports/lang/ja-JP.rc | 1 + dll/win32/msports/lang/pl-PL.rc | 1 + dll/win32/msports/lang/ro-RO.rc | 1 + dll/win32/msports/lang/ru-RU.rc | 1 + dll/win32/msports/lang/sq-AL.rc | 1 + dll/win32/msports/lang/tr-TR.rc | 1 + dll/win32/msports/lang/uk-UA.rc | 1 + dll/win32/msports/lang/zh-CN.rc | 1 + dll/win32/msports/lang/zh-TW.rc | 1 + dll/win32/msports/parallel.c | 107 ++++++++++++++++++++++++++++++++++++++-- dll/win32/msports/resource.h | 1 + 17 files changed, 118 insertions(+), 5 deletions(-) diff --git a/dll/win32/msports/lang/bg-BG.rc b/dll/win32/msports/lang/bg-BG.rc index de8fa745bd..cdc3c25a16 100644 --- a/dll/win32/msports/lang/bg-BG.rc +++ b/dll/win32/msports/lang/bg-BG.rc @@ -38,4 +38,5 @@ BEGIN IDS_PARITY "Even,Odd,None,Mark,Space" IDS_STOPBITS "1,1.5,2" IDS_FLOWCONTROL "Xon / Xoff,Hardware,None" + IDS_PORT_IN_USE " (in use)" END diff --git a/dll/win32/msports/lang/de-DE.rc b/dll/win32/msports/lang/de-DE.rc index b968518dbe..f1ccb23a44 100644 --- a/dll/win32/msports/lang/de-DE.rc +++ b/dll/win32/msports/lang/de-DE.rc @@ -38,4 +38,5 @@ BEGIN IDS_PARITY "Gerade,Ungerade,Keine,Mark,Space" IDS_STOPBITS "1,1.5,2" IDS_FLOWCONTROL "Xon / Xoff,Hardware,Keine" + IDS_PORT_IN_USE " (wird benutzt)" END diff --git a/dll/win32/msports/lang/en-US.rc b/dll/win32/msports/lang/en-US.rc index baf2725041..eb37b840b6 100644 --- a/dll/win32/msports/lang/en-US.rc +++ b/dll/win32/msports/lang/en-US.rc @@ -38,4 +38,5 @@ BEGIN IDS_PARITY "Even,Odd,None,Mark,Space" IDS_STOPBITS "1,1.5,2" IDS_FLOWCONTROL "Xon / Xoff,Hardware,None" + IDS_PORT_IN_USE " (in use)" END diff --git a/dll/win32/msports/lang/es-ES.rc b/dll/win32/msports/lang/es-ES.rc index dd6587b6bf..d6c7c700c2 100644 --- a/dll/win32/msports/lang/es-ES.rc +++ b/dll/win32/msports/lang/es-ES.rc @@ -38,4 +38,5 @@ BEGIN IDS_PARITY "Even,Odd,None,Mark,Space" IDS_STOPBITS "1,1.5,2" IDS_FLOWCONTROL "Xon / Xoff,Hardware,None" + IDS_PORT_IN_USE " (in use)" END diff --git a/dll/win32/msports/lang/he-IL.rc b/dll/win32/msports/lang/he-IL.rc index e6fef329c3..61933ac385 100644 --- a/dll/win32/msports/lang/he-IL.rc +++ b/dll/win32/msports/lang/he-IL.rc @@ -38,4 +38,5 @@ BEGIN IDS_PARITY "Even,Odd,None,Mark,Space" IDS_STOPBITS "1,1.5,2" IDS_FLOWCONTROL "Xon / Xoff,Hardware,None" + IDS_PORT_IN_USE " (in use)" END diff --git a/dll/win32/msports/lang/it-IT.rc b/dll/win32/msports/lang/it-IT.rc index eeaad20568..666a6b8886 100644 --- a/dll/win32/msports/lang/it-IT.rc +++ b/dll/win32/msports/lang/it-IT.rc @@ -38,4 +38,5 @@ BEGIN IDS_PARITY "Even,Odd,None,Mark,Space" IDS_STOPBITS "1,1.5,2" IDS_FLOWCONTROL "Xon / Xoff,Hardware,None" + IDS_PORT_IN_USE " (in use)" END diff --git a/dll/win32/msports/lang/ja-JP.rc b/dll/win32/msports/lang/ja-JP.rc index 25e5dfca79..cedc65f557 100644 --- a/dll/win32/msports/lang/ja-JP.rc +++ b/dll/win32/msports/lang/ja-JP.rc @@ -38,4 +38,5 @@ BEGIN IDS_PARITY "Even,Odd,None,Mark,Space" IDS_STOPBITS "1,1.5,2" IDS_FLOWCONTROL "Xon / Xoff,Hardware,None" + IDS_PORT_IN_USE " (in use)" END diff --git a/dll/win32/msports/lang/pl-PL.rc b/dll/win32/msports/lang/pl-PL.rc index d7af8e7626..6cd025fedf 100644 --- a/dll/win32/msports/lang/pl-PL.rc +++ b/dll/win32/msports/lang/pl-PL.rc @@ -46,4 +46,5 @@ BEGIN IDS_PARITY "Even,Odd,None,Mark,Space" IDS_STOPBITS "1,1.5,2" IDS_FLOWCONTROL "Xon / Xoff,Hardware,None" + IDS_PORT_IN_USE " (in use)" END diff --git a/dll/win32/msports/lang/ro-RO.rc b/dll/win32/msports/lang/ro-RO.rc index caa284ef72..825eeb50ff 100644 --- a/dll/win32/msports/lang/ro-RO.rc +++ b/dll/win32/msports/lang/ro-RO.rc @@ -44,4 +44,5 @@ BEGIN IDS_PARITY "Even,Odd,None,Mark,Space" IDS_STOPBITS "1,1.5,2" IDS_FLOWCONTROL "Xon / Xoff,Hardware,None" + IDS_PORT_IN_USE " (in use)" END diff --git a/dll/win32/msports/lang/ru-RU.rc b/dll/win32/msports/lang/ru-RU.rc index d6ac1e7f60..f90eb9c157 100644 --- a/dll/win32/msports/lang/ru-RU.rc +++ b/dll/win32/msports/lang/ru-RU.rc @@ -44,4 +44,5 @@ BEGIN IDS_PARITY "Чёт,Нечёт,Нет,Маркер,Пробел" IDS_STOPBITS "1,1.5,2" IDS_FLOWCONTROL "Xon / Xoff,Аппаратное,Нет" + IDS_PORT_IN_USE " (in use)" END diff --git a/dll/win32/msports/lang/sq-AL.rc b/dll/win32/msports/lang/sq-AL.rc index 73cc86ada1..6ee7f1f58f 100644 --- a/dll/win32/msports/lang/sq-AL.rc +++ b/dll/win32/msports/lang/sq-AL.rc @@ -42,4 +42,5 @@ BEGIN IDS_PARITY "Even,Odd,None,Mark,Space" IDS_STOPBITS "1,1.5,2" IDS_FLOWCONTROL "Xon / Xoff,Hardware,None" + IDS_PORT_IN_USE " (in use)" END diff --git a/dll/win32/msports/lang/tr-TR.rc b/dll/win32/msports/lang/tr-TR.rc index 39bad63929..c7132feff2 100644 --- a/dll/win32/msports/lang/tr-TR.rc +++ b/dll/win32/msports/lang/tr-TR.rc @@ -40,4 +40,5 @@ BEGIN IDS_PARITY "Even,Odd,None,Mark,Space" IDS_STOPBITS "1,1.5,2" IDS_FLOWCONTROL "Xon / Xoff,Hardware,None" + IDS_PORT_IN_USE " (in use)" END diff --git a/dll/win32/msports/lang/uk-UA.rc b/dll/win32/msports/lang/uk-UA.rc index 0f161170f5..503cb492e8 100644 --- a/dll/win32/msports/lang/uk-UA.rc +++ b/dll/win32/msports/lang/uk-UA.rc @@ -46,4 +46,5 @@ BEGIN IDS_PARITY "Even,Odd,None,Mark,Space" IDS_STOPBITS "1,1.5,2" IDS_FLOWCONTROL "Xon / Xoff,Hardware,None" + IDS_PORT_IN_USE " (in use)" END diff --git a/dll/win32/msports/lang/zh-CN.rc b/dll/win32/msports/lang/zh-CN.rc index 9f17ba41c1..f6daeb36e7 100644 --- a/dll/win32/msports/lang/zh-CN.rc +++ b/dll/win32/msports/lang/zh-CN.rc @@ -40,4 +40,5 @@ BEGIN IDS_PARITY "Even,Odd,None,Mark,Space" IDS_STOPBITS "1,1.5,2" IDS_FLOWCONTROL "Xon / Xoff,Hardware,None" + IDS_PORT_IN_USE " (in use)" END diff --git a/dll/win32/msports/lang/zh-TW.rc b/dll/win32/msports/lang/zh-TW.rc index cfaf247a3e..ac9c6e202a 100644 --- a/dll/win32/msports/lang/zh-TW.rc +++ b/dll/win32/msports/lang/zh-TW.rc @@ -40,5 +40,6 @@ BEGIN IDS_PARITY "Even,Odd,None,Mark,Space" IDS_STOPBITS "1,1.5,2" IDS_FLOWCONTROL "Xon / Xoff,Hardware,None" + IDS_PORT_IN_USE " (in use)" END diff --git a/dll/win32/msports/parallel.c b/dll/win32/msports/parallel.c index ddb72c5a6b..076bb20d44 100644 --- a/dll/win32/msports/parallel.c +++ b/dll/win32/msports/parallel.c @@ -8,18 +8,83 @@ #include "precomp.h" + typedef struct _PORT_DATA { HDEVINFO DeviceInfoSet; PSP_DEVINFO_DATA DeviceInfoData; WCHAR szPortName[16]; + DWORD dwPortNumber; DWORD dwFilterResourceMethod; DWORD dwLegacy; } PORT_DATA, *PPORT_DATA; +static +VOID +GetUsedPorts( + PDWORD pPortMap) +{ + WCHAR szDeviceName[64]; + WCHAR szDosDeviceName[64]; + DWORD dwIndex, dwType, dwPortNumber; + DWORD dwDeviceNameSize, dwDosDeviceNameSize; + PWSTR ptr; + HKEY hKey; + DWORD dwError; + + *pPortMap = 0; + + dwError = RegOpenKeyExW(HKEY_LOCAL_MACHINE, + L"Hardware\\DeviceMap\\PARALLEL PORTS", + 0, + KEY_READ, + &hKey); + if (dwError == ERROR_SUCCESS) + { + for (dwIndex = 0; ; dwIndex++) + { + dwDeviceNameSize = ARRAYSIZE(szDeviceName); + dwDosDeviceNameSize = sizeof(szDosDeviceName); + dwError = RegEnumValueW(hKey, + dwIndex, + szDeviceName, + &dwDeviceNameSize, + NULL, + &dwType, + (LPBYTE)szDosDeviceName, + &dwDosDeviceNameSize); + if (dwError != ERROR_SUCCESS) + break; + + if (dwType == REG_SZ) + { + TRACE("%S --> %S\n", szDeviceName, szDosDeviceName); + if (_wcsnicmp(szDosDeviceName, L"\\DosDevices\\LPT", wcslen(L"\\DosDevices\\LPT")) == 0) + { + ptr = szDosDeviceName + wcslen(L"\\DosDevices\\LPT"); + if (wcschr(ptr, L'.') == NULL) + { + TRACE("Device number %S\n", ptr); + dwPortNumber = wcstoul(ptr, NULL, 10); + if (dwPortNumber != 0) + { + *pPortMap |=(1 << dwPortNumber); + } + } + } + } + } + + RegCloseKey(hKey); + } + + TRACE("Done\n"); +} + + static VOID ReadPortSettings( @@ -33,6 +98,7 @@ ReadPortSettings( pPortData->dwFilterResourceMethod = 1; /* Never use an interrupt */ pPortData->dwLegacy = 0; /* Disabled */ + pPortData->dwPortNumber = 0; /* Unknown */ hKey = SetupDiOpenDevRegKey(pPortData->DeviceInfoSet, pPortData->DeviceInfoData, @@ -102,6 +168,7 @@ WritePortSettings( DWORD dwDisposition; DWORD dwFilterResourceMethod; DWORD dwLegacy; + DWORD dwPortNumber; HKEY hKey; DWORD dwError; @@ -169,9 +236,24 @@ WritePortSettings( if (dwError == ERROR_SUCCESS) { FIXME("Notify the driver!\n"); + + pPortData->dwLegacy = dwLegacy; } } } + + dwPortNumber = ComboBox_GetCurSel(GetDlgItem(hwnd, IDC_PARALLEL_NAME)); + if (dwPortNumber != LB_ERR) + { + dwPortNumber++; + if (dwPortNumber != pPortData->dwPortNumber) + { + FIXME("Port name changed! LPT%lu --> LPT%lu", pPortData->dwPortNumber, dwPortNumber); + + +// pPortData->dwPortNumber = dwPortNumber; + } + } } @@ -181,9 +263,11 @@ OnInitDialog(HWND hwnd, WPARAM wParam, LPARAM lParam) { + WCHAR szBuffer[256]; + WCHAR szPortInUse[64]; PPORT_DATA pPortData; HWND hwndControl; - WCHAR szBuffer[256]; + DWORD dwPortMap; UINT i; TRACE("OnInitDialog()\n"); @@ -214,18 +298,31 @@ OnInitDialog(HWND hwnd, pPortData->dwLegacy ? BST_CHECKED : BST_UNCHECKED); } + LoadStringW(hInstance, IDS_PORT_IN_USE, szPortInUse, ARRAYSIZE(szPortInUse)); + /* Fill the 'LPT Port Number' combobox */ hwndControl = GetDlgItem(hwnd, IDC_PARALLEL_NAME); if (hwndControl) { - for (i = 0; i < 3; i++) + GetUsedPorts(&dwPortMap); + + for (i = 1; i < 4; i++) { - swprintf(szBuffer, L"LPT%lu", i + 1); + swprintf(szBuffer, L"LPT%lu", i); + + if ((dwPortMap & (1 << i)) && (pPortData->dwPortNumber != i)) + wcscat(szBuffer, szPortInUse); + ComboBox_AddString(hwndControl, szBuffer); + + if (_wcsicmp(pPortData->szPortName, szBuffer) == 0) + pPortData->dwPortNumber = i; } - /* Disable it */ - EnableWindow(hwndControl, FALSE); + if (pPortData->dwPortNumber != 0) + { + ComboBox_SetCurSel(hwndControl, pPortData->dwPortNumber - 1); + } } return TRUE; diff --git a/dll/win32/msports/resource.h b/dll/win32/msports/resource.h index c9d716859d..335f74a495 100644 --- a/dll/win32/msports/resource.h +++ b/dll/win32/msports/resource.h @@ -20,3 +20,4 @@ #define IDS_PARITY 11 #define IDS_STOPBITS 12 #define IDS_FLOWCONTROL 13 +#define IDS_PORT_IN_USE 61

1 0

02/02: [NTOSKRNL] On read/write, also check buffer respects device alignment requirements
by Pierre Schweitzer 04 Oct '18

04 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bf596690657198c8e1272… commit bf596690657198c8e1272a46c4a10c73a4ff9f67 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Thu Oct 4 07:56:23 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Thu Oct 4 07:56:23 2018 +0200 [NTOSKRNL] On read/write, also check buffer respects device alignment requirements --- ntoskrnl/io/iomgr/iofunc.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/ntoskrnl/io/iomgr/iofunc.c b/ntoskrnl/io/iomgr/iofunc.c index f3ad7164c2..b90e73f5dc 100644 --- a/ntoskrnl/io/iomgr/iofunc.c +++ b/ntoskrnl/io/iomgr/iofunc.c @@ -2621,6 +2621,14 @@ NtReadFile(IN HANDLE FileHandle, return STATUS_INVALID_PARAMETER; } + /* Fail if buffer doesn't match alignment requirements */ + if (((ULONG_PTR)Buffer & DeviceObject->AlignmentRequirement) != 0) + { + /* Release the file object and and fail */ + ObDereferenceObject(FileObject); + return STATUS_INVALID_PARAMETER; + } + if (ByteOffset) { /* Fail if ByteOffset is not sector size aligned */ @@ -3650,6 +3658,14 @@ NtWriteFile(IN HANDLE FileHandle, return STATUS_INVALID_PARAMETER; } + /* Fail if buffer doesn't match alignment requirements */ + if (((ULONG_PTR)Buffer & DeviceObject->AlignmentRequirement) != 0) + { + /* Release the file object and and fail */ + ObDereferenceObject(FileObject); + return STATUS_INVALID_PARAMETER; + } + if (ByteOffset) { /* Fail if ByteOffset is not sector size aligned */

1 0

← Newer
1
...
28
29
30
31
32
33
34
35
36
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2018