Ros-diffs

ros-diffs@reactos.org

81390 discussions

02/02: [IDL] Fix redefinition of server types when lmserver.h is included too
by Eric Kohl 01 May '18

01 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1362983bb713f51e34057… commit 1362983bb713f51e34057d44872e6458d9249348 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Tue May 1 15:41:13 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Tue May 1 16:15:52 2018 +0200 [IDL] Fix redefinition of server types when lmserver.h is included too --- sdk/include/reactos/idl/srvsvc.idl | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/sdk/include/reactos/idl/srvsvc.idl b/sdk/include/reactos/idl/srvsvc.idl index 70f17e6ea1..1cd1bb5ec9 100644 --- a/sdk/include/reactos/idl/srvsvc.idl +++ b/sdk/include/reactos/idl/srvsvc.idl @@ -330,6 +330,8 @@ typedef [switch_type(unsigned long)] union _SHARE_INFO [case(503)] LPSHARE_INFO_503_I ShareInfo503; } SHARE_INFO, *PSHARE_INFO, *LPSHARE_INFO; + +cpp_quote("#ifndef _LMSERVER_H") typedef struct _SERVER_INFO_100 { DWORD sv100_platform_id; @@ -362,6 +364,7 @@ typedef struct _SERVER_INFO_102 DWORD sv102_licenses; [string] wchar_t *sv102_userpath; } SERVER_INFO_102, *PSERVER_INFO_102, *LPSERVER_INFO_102; +cpp_quote("#endif") typedef struct _SERVER_INFO_103 { @@ -381,6 +384,7 @@ typedef struct _SERVER_INFO_103 DWORD sv103_capabilities; } SERVER_INFO_103, *PSERVER_INFO_103, *LPSERVER_INFO_103; +cpp_quote("#ifndef _LMSERVER_H") typedef struct _SERVER_INFO_502 { DWORD sv502_sessopens; @@ -728,6 +732,7 @@ typedef struct _SERVER_INFO_1556 { DWORD sv1556_maxworkitemidletime; } SERVER_INFO_1556, *PSERVER_INFO_1556, *LPSERVER_INFO_1556; +cpp_quote("#endif") typedef [switch_type(unsigned long)] union _SERVER_INFO { @@ -795,6 +800,7 @@ typedef struct _DISK_ENUM_CONTAINER [size_is(EntriesRead), length_is(EntriesRead)] LPDISK_INFO Buffer; } DISK_ENUM_CONTAINER; +cpp_quote("#ifndef _LMSERVER_H") typedef struct _SERVER_TRANSPORT_INFO_0 { DWORD svti0_numberofvcs; @@ -803,6 +809,7 @@ typedef struct _SERVER_TRANSPORT_INFO_0 DWORD svti0_transportaddresslength; [string] wchar_t *svti0_networkaddress; } SERVER_TRANSPORT_INFO_0, *PSERVER_TRANSPORT_INFO_0, *LPSERVER_TRANSPORT_INFO_0; +cpp_quote("#endif") typedef struct _SERVER_XPORT_INFO_0_CONTAINER { @@ -810,6 +817,7 @@ typedef struct _SERVER_XPORT_INFO_0_CONTAINER [size_is(EntriesRead)] LPSERVER_TRANSPORT_INFO_0 Buffer; } SERVER_XPORT_INFO_0_CONTAINER, *PSERVER_XPORT_INFO_0_CONTAINER; +cpp_quote("#ifndef _LMSERVER_H") typedef struct _SERVER_TRANSPORT_INFO_1 { DWORD svti1_numberofvcs; @@ -819,6 +827,7 @@ typedef struct _SERVER_TRANSPORT_INFO_1 [string] wchar_t *svti1_networkaddress; [string] wchar_t *svti1_domain; } SERVER_TRANSPORT_INFO_1, *PSERVER_TRANSPORT_INFO_1, *LPSERVER_TRANSPORT_INFO_1; +cpp_quote("#endif") typedef struct _SERVER_XPORT_INFO_1_CONTAINER { @@ -826,6 +835,7 @@ typedef struct _SERVER_XPORT_INFO_1_CONTAINER [size_is(EntriesRead)] LPSERVER_TRANSPORT_INFO_1 Buffer; } SERVER_XPORT_INFO_1_CONTAINER, *PSERVER_XPORT_INFO_1_CONTAINER; +cpp_quote("#ifndef _LMSERVER_H") typedef struct _SERVER_TRANSPORT_INFO_2 { DWORD svti2_numberofvcs; @@ -836,6 +846,7 @@ typedef struct _SERVER_TRANSPORT_INFO_2 [string] wchar_t *svti2_domain; unsigned long svti2_flags; } SERVER_TRANSPORT_INFO_2, *PSERVER_TRANSPORT_INFO_2, *LPSERVER_TRANSPORT_INFO_2; +cpp_quote("#endif") typedef struct _SERVER_XPORT_INFO_2_CONTAINER { @@ -843,6 +854,7 @@ typedef struct _SERVER_XPORT_INFO_2_CONTAINER [size_is(EntriesRead)] LPSERVER_TRANSPORT_INFO_2 Buffer; } SERVER_XPORT_INFO_2_CONTAINER, *PSERVER_XPORT_INFO_2_CONTAINER; +cpp_quote("#ifndef _LMSERVER_H") typedef struct _SERVER_TRANSPORT_INFO_3 { DWORD svti3_numberofvcs; @@ -855,6 +867,7 @@ typedef struct _SERVER_TRANSPORT_INFO_3 DWORD svti3_passwordlength; unsigned char svti3_password[256]; } SERVER_TRANSPORT_INFO_3, *PSERVER_TRANSPORT_INFO_3, *LPSERVER_TRANSPORT_INFO_3; +cpp_quote("#endif") typedef struct _SERVER_XPORT_INFO_3_CONTAINER { @@ -884,6 +897,7 @@ typedef struct _SERVER_XPORT_ENUM_STRUCT [switch_is(Level)] SERVER_XPORT_ENUM_UNION XportInfo; } SERVER_XPORT_ENUM_STRUCT, *PSERVER_XPORT_ENUM_STRUCT, *LPSERVER_XPORT_ENUM_STRUCT; + typedef [context_handle] void *SHARE_DEL_HANDLE; typedef SHARE_DEL_HANDLE *PSHARE_DEL_HANDLE;

1 0

01/02: [SDK] Improve lmserver.h
by Eric Kohl 01 May '18

01 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ce0856099ad168d2cf245… commit ce0856099ad168d2cf2457b3248a58f7c3ae848c Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Tue May 1 15:39:29 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Tue May 1 16:15:51 2018 +0200 [SDK] Improve lmserver.h - Add _SERVER_TRANSPORT_INFO_1, _SERVER_TRANSPORT_INFO_2, and _SERVER_TRANSPORT_INFO_3 structs. - Fix the calling convention of SetServiceBits(). --- sdk/include/psdk/lmserver.h | 33 ++++++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/sdk/include/psdk/lmserver.h b/sdk/include/psdk/lmserver.h index 91cbd09412..b41142912e 100644 --- a/sdk/include/psdk/lmserver.h +++ b/sdk/include/psdk/lmserver.h @@ -368,6 +368,37 @@ typedef struct _SERVER_TRANSPORT_INFO_0 { LPWSTR svti0_networkaddress; } SERVER_TRANSPORT_INFO_0, *PSERVER_TRANSPORT_INFO_0, *LPSERVER_TRANSPORT_INFO_0; +typedef struct _SERVER_TRANSPORT_INFO_1 { + DWORD svti1_numberofvcs; + LPWSTR svti1_transportname; + PBYTE svti1_transportaddress; + DWORD svti1_transportaddresslength; + LPWSTR svti1_networkaddress; + LPWSTR svti1_domain; +} SERVER_TRANSPORT_INFO_1, *PSERVER_TRANSPORT_INFO_1, *LPSERVER_TRANSPORT_INFO_1; + +typedef struct _SERVER_TRANSPORT_INFO_2 { + DWORD svti2_numberofvcs; + LPWSTR svti2_transportname; + PBYTE svti2_transportaddress; + DWORD svti2_transportaddresslength; + LPWSTR svti2_networkaddress; + LPWSTR svti2_domain; + ULONG svti2_flags; +} SERVER_TRANSPORT_INFO_2, *PSERVER_TRANSPORT_INFO_2, *LPSERVER_TRANSPORT_INFO_2; + +typedef struct _SERVER_TRANSPORT_INFO_3 { + DWORD svti3_numberofvcs; + LPWSTR svti3_transportname; + PBYTE svti3_transportaddress; + DWORD svti3_transportaddresslength; + LPWSTR svti3_networkaddress; + LPWSTR svti3_domain; + ULONG svti3_flags; + DWORD svti3_passwordlength; + BYTE svti3_password[256]; +} SERVER_TRANSPORT_INFO_3, *PSERVER_TRANSPORT_INFO_3, *LPSERVER_TRANSPORT_INFO_3; + NET_API_STATUS WINAPI NetServerEnum(LPCWSTR, DWORD, PBYTE*, DWORD, PDWORD, PDWORD, DWORD, LPCWSTR, PDWORD); NET_API_STATUS WINAPI NetServerEnumEx(LPCWSTR, DWORD, PBYTE*, DWORD, PDWORD, PDWORD, DWORD, LPCWSTR, LPCWSTR); NET_API_STATUS WINAPI NetServerGetInfo(LPWSTR, DWORD, PBYTE*); @@ -380,7 +411,7 @@ NET_API_STATUS WINAPI NetServerTransportAdd(LPWSTR, DWORD, PBYTE); NET_API_STATUS WINAPI NetServerTransportAddEx(LPWSTR, DWORD, PBYTE); NET_API_STATUS WINAPI NetServerTransportDel(LPWSTR, DWORD, PBYTE); NET_API_STATUS WINAPI NetServerTransportEnum(LPWSTR, DWORD, PBYTE*, DWORD, PDWORD, PDWORD, PDWORD); -BOOL SetServiceBits(SERVICE_STATUS_HANDLE, DWORD, BOOL, BOOL); +BOOL WINAPI SetServiceBits(SERVICE_STATUS_HANDLE, DWORD, BOOL, BOOL); #define SVI1_NUM_ELEMENTS 5 #define SVI2_NUM_ELEMENTS 40

1 0

01/01: [DRWTSN32] Add French translation.
by Pierre Schweitzer 01 May '18

01 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3b6d00eab970b2b54ae4a… commit 3b6d00eab970b2b54ae4acb84ce060b271a747f9 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Tue May 1 12:19:17 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Tue May 1 12:19:17 2018 +0200 [DRWTSN32] Add French translation. --- base/applications/drwtsn32/drwtsn32.rc | 3 +++ base/applications/drwtsn32/lang/fr-FR.rc | 14 ++++++++++++++ 2 files changed, 17 insertions(+) diff --git a/base/applications/drwtsn32/drwtsn32.rc b/base/applications/drwtsn32/drwtsn32.rc index f39332b8a4..07c449cf18 100644 --- a/base/applications/drwtsn32/drwtsn32.rc +++ b/base/applications/drwtsn32/drwtsn32.rc @@ -22,6 +22,9 @@ #ifdef LANGUAGE_EN_US #include "lang/en-US.rc" #endif +#ifdef LANGUAGE_FR_FR + #include "lang/fr-FR.rc" +#endif #ifdef LANGUAGE_PL_PL #include "lang/pl-PL.rc" #endif diff --git a/base/applications/drwtsn32/lang/fr-FR.rc b/base/applications/drwtsn32/lang/fr-FR.rc new file mode 100644 index 0000000000..18f53abb64 --- /dev/null +++ b/base/applications/drwtsn32/lang/fr-FR.rc @@ -0,0 +1,14 @@ +/* + * PROJECT: Dr. Watson crash reporter + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: fr-FR resource file + * COPYRIGHT: Copyright 2018 Pierre Schweitzer (pierre(a)reactos.org) + */ + +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN + IDS_APP_TITLE "ReactOS Crash Reporter" + IDS_USER_ALERT_MESSAGE "L'application %ls a cessé de fonctionner. Des informations à propos de ce dysfonctionnement ont été enregistrées ici :\r\n\r\n%ls" +END

1 0

01/01: [NTOKSNRL] Always flush dirty VACB.
by Pierre Schweitzer 30 Apr '18

30 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=54c049bd6ef0a906aff0f… commit 54c049bd6ef0a906aff0f434f724765f009485d8 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Mon Apr 30 22:19:17 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Mon Apr 30 22:24:30 2018 +0200 [NTOKSNRL] Always flush dirty VACB. Recent changes seem to show that it's not required to be exclusive on VACB to be able to flush it. This commit goes with f2c44aa and fixes the last issues going with copying huge files. There are no longer BSODs (be it in Mm or Cc). I could, with 750MB RAM extract a 2GB file from a 53MB archive and copy a 2,5GB file from a VBox share to the disk. Note that writes are often deferred, so if copy works, it's not that fast for now. Note that it also brings some beloved behavior from Windows: copy times are totally unreliable now when writes are deferred. Little remaining times when actively copying, high remaining times when deferred writes in action. And goes between both... Sorry! ;-) https://xkcd.com/612/ CORE-9696 CORE-11175 --- ntoskrnl/cc/view.c | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/ntoskrnl/cc/view.c b/ntoskrnl/cc/view.c index d3c32f9046..9a7f716854 100644 --- a/ntoskrnl/cc/view.c +++ b/ntoskrnl/cc/view.c @@ -207,8 +207,6 @@ CcRosFlushDirtyPages ( while ((current_entry != &DirtyVacbListHead) && (Target > 0)) { - ULONG Refs; - current = CONTAINING_RECORD(current_entry, ROS_VACB, DirtyVacbListEntry); @@ -234,17 +232,6 @@ CcRosFlushDirtyPages ( ASSERT(current->Dirty); - /* One reference is added above */ - Refs = CcRosVacbGetRefCount(current); - if ((Refs > 3 && current->PinCount == 0) || - (Refs > 4 && current->PinCount > 1)) - { - current->SharedCacheMap->Callbacks->ReleaseFromLazyWrite( - current->SharedCacheMap->LazyWriteContext); - CcRosVacbDecRefCount(current); - continue; - } - KeReleaseGuardedMutex(&ViewLock); Status = CcRosFlushVacb(current);

1 0

01/01: [SDK] Add description to MANUALLY_INITIATED_CRASH (#509)
by David Knapp 30 Apr '18

30 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7673837a8577fb7aee4ad… commit 7673837a8577fb7aee4ad9219908eca4d8e5eef2 Author: David Knapp <mazecraze96(a)gmail.com> AuthorDate: Mon Apr 30 06:55:34 2018 -0400 Commit: Robert Naumann <gonzomdx(a)gmail.com> CommitDate: Mon Apr 30 12:55:34 2018 +0200 [SDK] Add description to MANUALLY_INITIATED_CRASH (#509) --- sdk/include/reactos/mc/bugcodes.mc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/include/reactos/mc/bugcodes.mc b/sdk/include/reactos/mc/bugcodes.mc index d1d701c962..52e18cbf06 100644 --- a/sdk/include/reactos/mc/bugcodes.mc +++ b/sdk/include/reactos/mc/bugcodes.mc @@ -1557,7 +1557,7 @@ Severity=Success Facility=System SymbolicName=MANUALLY_INITIATED_CRASH Language=English -MANUALLY_INITIATED_CRASH +The user manually generated the crash dump. . MessageId=0xE3

1 0

01/01: [NTOSKRNL] Free unused VACB when required.
by Pierre Schweitzer 30 Apr '18

30 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=74c5d8b6bd6e8668eaab5… commit 74c5d8b6bd6e8668eaab5f6467c80cfc2d899825 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Mon Apr 30 12:10:24 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Mon Apr 30 12:10:24 2018 +0200 [NTOSKRNL] Free unused VACB when required. Same mechanism exists in Windows (even their Cc is way different from ours...) where when Cc is out of memory (in their case, out of VACB), we will start scavenge old & unused VACB to free some of the memory. It's useful in case we're operating we big files operations, we may run out of memory where to map VACB for them, so start to scavenge VACB to free some of that memory. With this, I am able to install Qt 4.8.6 with 2,5GB of RAM, scavenging acting when needed! CORE-12081 CORE-14582 --- ntoskrnl/cc/view.c | 99 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 99 insertions(+) diff --git a/ntoskrnl/cc/view.c b/ntoskrnl/cc/view.c index 5bd1f41411..d3c32f9046 100644 --- a/ntoskrnl/cc/view.c +++ b/ntoskrnl/cc/view.c @@ -699,6 +699,88 @@ CcRosMapVacbInKernelSpace( return STATUS_SUCCESS; } +static +BOOLEAN +CcRosFreeUnusedVacb ( + PULONG Count) +{ + ULONG cFreed; + BOOLEAN Freed; + KIRQL oldIrql; + PROS_VACB current; + LIST_ENTRY FreeList; + PLIST_ENTRY current_entry; + + cFreed = 0; + Freed = FALSE; + InitializeListHead(&FreeList); + + KeAcquireGuardedMutex(&ViewLock); + + /* Browse all the available VACB */ + current_entry = VacbLruListHead.Flink; + while (current_entry != &VacbLruListHead) + { + ULONG Refs; + + current = CONTAINING_RECORD(current_entry, + ROS_VACB, + VacbLruListEntry); + current_entry = current_entry->Flink; + + KeAcquireSpinLock(&current->SharedCacheMap->CacheMapLock, &oldIrql); + + /* Only deal with unused VACB, we will free them */ + Refs = CcRosVacbGetRefCount(current); + if (Refs < 2) + { + ASSERT(!current->Dirty); + ASSERT(!current->MappedCount); + ASSERT(Refs == 1); + + /* Reset and move to free list */ + RemoveEntryList(&current->CacheMapVacbListEntry); + RemoveEntryList(&current->VacbLruListEntry); + InitializeListHead(&current->VacbLruListEntry); + InsertHeadList(&FreeList, &current->CacheMapVacbListEntry); + } + + KeReleaseSpinLock(&current->SharedCacheMap->CacheMapLock, oldIrql); + + } + + KeReleaseGuardedMutex(&ViewLock); + + /* And now, free any of the found VACB, that'll free memory! */ + while (!IsListEmpty(&FreeList)) + { + ULONG Refs; + + current_entry = RemoveHeadList(&FreeList); + current = CONTAINING_RECORD(current_entry, + ROS_VACB, + CacheMapVacbListEntry); + InitializeListHead(&current->CacheMapVacbListEntry); + Refs = CcRosVacbDecRefCount(current); + ASSERT(Refs == 0); + ++cFreed; + } + + /* If we freed at least one VACB, return success */ + if (cFreed != 0) + { + Freed = TRUE; + } + + /* If caller asked for free count, return it */ + if (Count != NULL) + { + *Count = cFreed; + } + + return Freed; +} + static NTSTATUS CcRosCreateVacb ( @@ -712,6 +794,7 @@ CcRosCreateVacb ( NTSTATUS Status; KIRQL oldIrql; ULONG Refs; + BOOLEAN Retried; ASSERT(SharedCacheMap); @@ -745,9 +828,25 @@ CcRosCreateVacb ( CcRosVacbIncRefCount(current); + Retried = FALSE; +Retry: + /* Map VACB in kernel space */ Status = CcRosMapVacbInKernelSpace(current); if (!NT_SUCCESS(Status)) { + ULONG Freed; + /* If no space left, try to prune unused VACB + * to recover space to map our VACB + * If it succeed, retry to map, otherwise + * just fail. + */ + if (!Retried && CcRosFreeUnusedVacb(&Freed)) + { + DPRINT("Prunned %d VACB, trying again\n", Freed); + Retried = TRUE; + goto Retry; + } + CcRosVacbDecRefCount(current); ExFreeToNPagedLookasideList(&VacbLookasideList, current); return Status;

1 0

01/01: [NTOSKRNL] Unmark dirty first, and then write.
by Pierre Schweitzer 30 Apr '18

30 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cc54e51495f99a90df3bb… commit cc54e51495f99a90df3bb46eacc6f6aead518ca5 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Mon Apr 30 10:36:19 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Mon Apr 30 10:36:19 2018 +0200 [NTOSKRNL] Unmark dirty first, and then write. This will avoid trying to flush twice a dirty VACB under high IOs pressure. CORE-14584 --- ntoskrnl/cc/view.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ntoskrnl/cc/view.c b/ntoskrnl/cc/view.c index e1d064312f..5bd1f41411 100644 --- a/ntoskrnl/cc/view.c +++ b/ntoskrnl/cc/view.c @@ -168,10 +168,12 @@ CcRosFlushVacb ( { NTSTATUS Status; + CcRosUnmarkDirtyVacb(Vacb, TRUE); + Status = CcWriteVirtualAddress(Vacb); - if (NT_SUCCESS(Status)) + if (!NT_SUCCESS(Status)) { - CcRosUnmarkDirtyVacb(Vacb, TRUE); + CcRosMarkDirtyVacb(Vacb); } return Status;

1 0

02/02: [FASTFAT] Implement write IOs defering.
by Pierre Schweitzer 29 Apr '18

29 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2a7d16727a840b631076a… commit 2a7d16727a840b631076aaaa1cd00d09b9a32a80 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sun Apr 29 20:42:24 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sun Apr 29 20:42:53 2018 +0200 [FASTFAT] Implement write IOs defering. Before any write operation that would involve caching, ask the cache controler whether writing would make it exceed its memory consumption. If so, queue the write operation for later execution. In case the write operation can wait, then, the FSD operation will be halted until the write is allowed. I could test it successfully by copying huge files from a FAT volume to another. The write is halted until some portions of the file is written to the disk. I could also properly install Qt (SDK) on ReactOS with this and less than 1GB RAM: - https://www.heisspiter.net/~Pierre/rostests/Qt_OS.png - https://www.heisspiter.net/~Pierre/rostests/Qt_OS2.png CORE-12081 CORE-14582 CORE-14313 --- drivers/filesystems/fastfat/misc.c | 9 +++++++++ drivers/filesystems/fastfat/rw.c | 17 +++++++++++++++++ drivers/filesystems/fastfat/vfat.h | 7 +++++++ 3 files changed, 33 insertions(+) diff --git a/drivers/filesystems/fastfat/misc.c b/drivers/filesystems/fastfat/misc.c index 7797f37ab2..0d291776b5 100644 --- a/drivers/filesystems/fastfat/misc.c +++ b/drivers/filesystems/fastfat/misc.c @@ -213,6 +213,15 @@ VfatDispatchRequest( return Status; } +VOID +NTAPI +VfatHandleDeferredWrite( + IN PVOID IrpContext, + IN PVOID Unused) +{ + VfatDispatchRequest((PVFAT_IRP_CONTEXT)IrpContext); +} + NTSTATUS NTAPI VfatBuildRequest( diff --git a/drivers/filesystems/fastfat/rw.c b/drivers/filesystems/fastfat/rw.c index 25114f25cf..4dd59933c4 100644 --- a/drivers/filesystems/fastfat/rw.c +++ b/drivers/filesystems/fastfat/rw.c @@ -895,6 +895,23 @@ VfatWrite( } } + if (!NoCache && !CcCanIWrite(IrpContext->FileObject, Length, CanWait, + BooleanFlagOn(IrpContext->Flags, IRPCONTEXT_DEFERRED_WRITE))) + { + BOOLEAN Retrying; + + Retrying = BooleanFlagOn(IrpContext->Flags, IRPCONTEXT_DEFERRED_WRITE); + SetFlag(IrpContext->Flags, IRPCONTEXT_DEFERRED_WRITE); + + Status = STATUS_PENDING; + CcDeferWrite(IrpContext->FileObject, VfatHandleDeferredWrite, + IrpContext, NULL, Length, Retrying); + + DPRINT1("Dererring write!\n"); + + goto ByeBye; + } + if (IsVolume) { Resource = &IrpContext->DeviceExt->DirResource; diff --git a/drivers/filesystems/fastfat/vfat.h b/drivers/filesystems/fastfat/vfat.h index 5bb5289feb..cb38b16699 100644 --- a/drivers/filesystems/fastfat/vfat.h +++ b/drivers/filesystems/fastfat/vfat.h @@ -544,6 +544,7 @@ DOSDATE, *PDOSDATE; #define IRPCONTEXT_COMPLETE 0x0002 #define IRPCONTEXT_QUEUE 0x0004 #define IRPCONTEXT_PENDINGRETURNED 0x0008 +#define IRPCONTEXT_DEFERRED_WRITE 0x0010 typedef struct { @@ -1085,6 +1086,12 @@ vfatReportChange( IN ULONG FilterMatch, IN ULONG Action); +VOID +NTAPI +VfatHandleDeferredWrite( + IN PVOID IrpContext, + IN PVOID Unused); + /* pnp.c */ NTSTATUS

1 0

01/02: [NTOSKRNL] Fix lazy writer for in-use VACB.
by Pierre Schweitzer 29 Apr '18

29 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f2c44aa4838de066069a5… commit f2c44aa4838de066069a532758965522f482de10 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sun Apr 29 20:34:28 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sun Apr 29 20:42:53 2018 +0200 [NTOSKRNL] Fix lazy writer for in-use VACB. Adjusting refcount and enabling lazy-write for pinned VACB makes it actually more efficient, often purging data to disk, reducing memory stress for the system. This is required for defering writes. This commit unfortunately (?) reverts a previous revert. CORE-12081 CORE-14582 CORE-14313 --- ntoskrnl/cc/pin.c | 4 ++++ ntoskrnl/cc/view.c | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ntoskrnl/cc/pin.c b/ntoskrnl/cc/pin.c index d81f09d470..2d48a27a0a 100644 --- a/ntoskrnl/cc/pin.c +++ b/ntoskrnl/cc/pin.c @@ -275,6 +275,10 @@ CcSetDirtyPinnedData ( Bcb, Lsn); iBcb->Dirty = TRUE; + if (!iBcb->Vacb->Dirty) + { + CcRosMarkDirtyVacb(iBcb->Vacb); + } } diff --git a/ntoskrnl/cc/view.c b/ntoskrnl/cc/view.c index c2b8913132..e1d064312f 100644 --- a/ntoskrnl/cc/view.c +++ b/ntoskrnl/cc/view.c @@ -205,6 +205,8 @@ CcRosFlushDirtyPages ( while ((current_entry != &DirtyVacbListHead) && (Target > 0)) { + ULONG Refs; + current = CONTAINING_RECORD(current_entry, ROS_VACB, DirtyVacbListEntry); @@ -231,7 +233,9 @@ CcRosFlushDirtyPages ( ASSERT(current->Dirty); /* One reference is added above */ - if (CcRosVacbGetRefCount(current) > 2) + Refs = CcRosVacbGetRefCount(current); + if ((Refs > 3 && current->PinCount == 0) || + (Refs > 4 && current->PinCount > 1)) { current->SharedCacheMap->Callbacks->ReleaseFromLazyWrite( current->SharedCacheMap->LazyWriteContext);

1 0

01/01: [MODE] Improve the way the DOS device statuses are enumerated via the "mode" command (without parameters).
by Hermès Bélusca-Maïto 29 Apr '18

29 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3055afce81f5f6683bd22… commit 3055afce81f5f6683bd22a361610d9c9d8deb34a Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Apr 29 19:33:49 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Apr 29 19:36:13 2018 +0200 [MODE] Improve the way the DOS device statuses are enumerated via the "mode" command (without parameters). --- base/applications/cmdutils/mode/lang/de-DE.rc | 13 +- base/applications/cmdutils/mode/lang/en-US.rc | 13 +- base/applications/cmdutils/mode/lang/ro-RO.rc | 13 +- base/applications/cmdutils/mode/lang/ru-RU.rc | 13 +- base/applications/cmdutils/mode/lang/tr-TR.rc | 13 +- base/applications/cmdutils/mode/lang/zh-CN.rc | 13 +- base/applications/cmdutils/mode/mode.c | 192 ++++++++++++++------------ base/applications/cmdutils/mode/resource.h | 17 +-- 8 files changed, 152 insertions(+), 135 deletions(-) diff --git a/base/applications/cmdutils/mode/lang/de-DE.rc b/base/applications/cmdutils/mode/lang/de-DE.rc index 883bc567ae..5355ac86e8 100644 --- a/base/applications/cmdutils/mode/lang/de-DE.rc +++ b/base/applications/cmdutils/mode/lang/de-DE.rc @@ -14,13 +14,13 @@ Codepagestatus: MODE CON[:] CP [/STATUS]\n\ Anzeigemodus: MODE CON[:] [COLS=c] [LINES=n]\n\ Tastaturwiederholrate: MODE CON[:] [RATE=r DELAY=d]\n" - IDS_QUERY_SERIAL_FOUND " Serieller Anschluss gefunden - %s\n" - IDS_QUERY_PRINTER_FOUND " Drucker gefunden - %s\n" - IDS_QUERY_PARALLEL_FOUND " Paralleler Anschluss gefunden - %s\n" - IDS_QUERY_DOSDEV_FOUND " Found DOS device - %s\n" - // IDS_QUERY_MISC_FOUND " Found other device - %s\n" + IDS_QUERY_SERIAL_FOUND "Serieller Anschluss gefunden - %s\n" + IDS_QUERY_PRINTER_FOUND "Drucker gefunden - %s\n" + IDS_QUERY_PARALLEL_FOUND "Paralleler Anschluss gefunden - %s\n" + IDS_QUERY_DOSDEV_FOUND "Found DOS device - %s\n" + // IDS_QUERY_MISC_FOUND "Found other device - %s\n" - // IDS_QUERY_DEVICE_FOUND " Found %s device - %s\n" + // IDS_QUERY_DEVICE_FOUND "Found %s device - %s\n" // IDS_SERIAL "serial" // IDS_PRINTER "parallel" // IDS_OTHER "other" @@ -59,6 +59,7 @@ BEGIN IDS_ERROR_SET_PARALLEL_STATE "ERROR: SetParallelState(%d) - DefineDosDevice(%s) (0x%lx)\n" IDS_ERROR_INVALID_PARAMETER "Unzulässiger Parameter - %s\n" IDS_ERROR_ILLEGAL_DEVICE_NAME "Unzulässiger Gerätename - %s (0x%lx)\n" + IDS_ERROR_DEVICE_NOT_AVAILABLE "The device %s is not currently available.\n" IDS_ERROR_STATUS_GET_DEVICE "Failed to get the status for device %s:\n" IDS_ERROR_STATUS_SET_DEVICE "Failed to set the status for device %s:\n" IDS_ERROR_TIMEOUT_GET_DEVICE "Failed to get the timeout for device %s:\n" diff --git a/base/applications/cmdutils/mode/lang/en-US.rc b/base/applications/cmdutils/mode/lang/en-US.rc index 9663215a3b..ce84d5d0e5 100644 --- a/base/applications/cmdutils/mode/lang/en-US.rc +++ b/base/applications/cmdutils/mode/lang/en-US.rc @@ -14,13 +14,13 @@ Code page status: MODE CON[:] CP [/STATUS]\n\ Display mode: MODE CON[:] [COLS=c] [LINES=n]\n\ Typematic rate: MODE CON[:] [RATE=r DELAY=d]\n" - IDS_QUERY_SERIAL_FOUND " Found serial device - %s\n" - IDS_QUERY_PRINTER_FOUND " Found printer device - %s\n" - IDS_QUERY_PARALLEL_FOUND " Found parallel device - %s\n" - IDS_QUERY_DOSDEV_FOUND " Found DOS device - %s\n" - // IDS_QUERY_MISC_FOUND " Found other device - %s\n" + IDS_QUERY_SERIAL_FOUND "Found serial device - %s\n" + IDS_QUERY_PRINTER_FOUND "Found printer device - %s\n" + IDS_QUERY_PARALLEL_FOUND "Found parallel device - %s\n" + IDS_QUERY_DOSDEV_FOUND "Found DOS device - %s\n" + // IDS_QUERY_MISC_FOUND "Found other device - %s\n" - // IDS_QUERY_DEVICE_FOUND " Found %s device - %s\n" + // IDS_QUERY_DEVICE_FOUND "Found %s device - %s\n" // IDS_SERIAL "serial" // IDS_PRINTER "parallel" // IDS_OTHER "other" @@ -59,6 +59,7 @@ BEGIN IDS_ERROR_SET_PARALLEL_STATE "ERROR: SetParallelState(%d) - DefineDosDevice(%s) (0x%lx)\n" IDS_ERROR_INVALID_PARAMETER "Invalid parameter - %s\n" IDS_ERROR_ILLEGAL_DEVICE_NAME "Illegal device name - %s (0x%lx)\n" + IDS_ERROR_DEVICE_NOT_AVAILABLE "The device %s is not currently available.\n" IDS_ERROR_STATUS_GET_DEVICE "Failed to get the status for device %s:\n" IDS_ERROR_STATUS_SET_DEVICE "Failed to set the status for device %s:\n" IDS_ERROR_TIMEOUT_GET_DEVICE "Failed to get the timeout for device %s:\n" diff --git a/base/applications/cmdutils/mode/lang/ro-RO.rc b/base/applications/cmdutils/mode/lang/ro-RO.rc index 6f92acd9db..767e215a6c 100644 --- a/base/applications/cmdutils/mode/lang/ro-RO.rc +++ b/base/applications/cmdutils/mode/lang/ro-RO.rc @@ -22,13 +22,13 @@ Modul de afișare:\n\ Rata de repetiție la menținerea unei taste apăsate:\n\ MODE CON[:] [RATE=r DELAY=d]\n" - IDS_QUERY_SERIAL_FOUND " Depistat dispozitiv la portul serial - %s\n" - IDS_QUERY_PRINTER_FOUND " Depistat dispozitiv de imprimare - %s\n" - IDS_QUERY_PARALLEL_FOUND " Depistat dispozitiv la portul paralel - %s\n" - IDS_QUERY_DOSDEV_FOUND " Depistat dispozitiv de tip DOS - %s\n" - // IDS_QUERY_MISC_FOUND " Found other device - %s\n" + IDS_QUERY_SERIAL_FOUND "Depistat dispozitiv la portul serial - %s\n" + IDS_QUERY_PRINTER_FOUND "Depistat dispozitiv de imprimare - %s\n" + IDS_QUERY_PARALLEL_FOUND "Depistat dispozitiv la portul paralel - %s\n" + IDS_QUERY_DOSDEV_FOUND "Depistat dispozitiv de tip DOS - %s\n" + // IDS_QUERY_MISC_FOUND "Found other device - %s\n" - // IDS_QUERY_DEVICE_FOUND " Found %s device - %s\n" + // IDS_QUERY_DEVICE_FOUND "Found %s device - %s\n" // IDS_SERIAL "serial" // IDS_PRINTER "parallel" // IDS_OTHER "other" @@ -67,6 +67,7 @@ BEGIN IDS_ERROR_SET_PARALLEL_STATE "EROARE: SetParallelState(%d) - DefineDosDevice(%s) (0x%lx)\n" IDS_ERROR_INVALID_PARAMETER "Parametru nevalid - %s\n" IDS_ERROR_ILLEGAL_DEVICE_NAME "Nume eronat de dispozitiv - %s (0x%lx)\n" + IDS_ERROR_DEVICE_NOT_AVAILABLE "The device %s is not currently available.\n" IDS_ERROR_STATUS_GET_DEVICE "Nu poate fi determinată starea dispozitivului %s:\n" IDS_ERROR_STATUS_SET_DEVICE "Nu poate fi schimbată starea pentru dispozitivul %s:\n" IDS_ERROR_TIMEOUT_GET_DEVICE "Failed to get the timeout for device %s:\n" diff --git a/base/applications/cmdutils/mode/lang/ru-RU.rc b/base/applications/cmdutils/mode/lang/ru-RU.rc index 7ef70b2368..81d2190c7d 100644 --- a/base/applications/cmdutils/mode/lang/ru-RU.rc +++ b/base/applications/cmdutils/mode/lang/ru-RU.rc @@ -14,13 +14,13 @@ BEGIN Режим работы экрана: MODE CON[:] [COLS=c] [LINES=n]\n\ Ввод с клавиатуры: MODE CON[:] [RATE=r DELAY=d]\n" - IDS_QUERY_SERIAL_FOUND " Найдено последовательное устройство - %s\n" - IDS_QUERY_PRINTER_FOUND " Найдено устройство печати - %s\n" - IDS_QUERY_PARALLEL_FOUND " Найдено параллельное устройство - %s\n" - IDS_QUERY_DOSDEV_FOUND " Найдено устройство DOS - %s\n" - // IDS_QUERY_MISC_FOUND " Найдено другое устройство - %s\n" + IDS_QUERY_SERIAL_FOUND "Найдено последовательное устройство - %s\n" + IDS_QUERY_PRINTER_FOUND "Найдено устройство печати - %s\n" + IDS_QUERY_PARALLEL_FOUND "Найдено параллельное устройство - %s\n" + IDS_QUERY_DOSDEV_FOUND "Найдено устройство DOS - %s\n" + // IDS_QUERY_MISC_FOUND "Найдено другое устройство - %s\n" - // IDS_QUERY_DEVICE_FOUND " Найдено %s устройство - %s\n" + // IDS_QUERY_DEVICE_FOUND "Найдено %s устройство - %s\n" // IDS_SERIAL "последовательное" // IDS_PRINTER "параллельное" // IDS_OTHER "другое" @@ -59,6 +59,7 @@ BEGIN IDS_ERROR_SET_PARALLEL_STATE "ОШИБКА: SetParallelState(%d) - DefineDosDevice(%s) (0x%lx)\n" IDS_ERROR_INVALID_PARAMETER "Неверный параметр - %s\n" IDS_ERROR_ILLEGAL_DEVICE_NAME "Недопустимое имя устройства - %s (0x%lx)\n" + IDS_ERROR_DEVICE_NOT_AVAILABLE "The device %s is not currently available.\n" IDS_ERROR_STATUS_GET_DEVICE "Не удалось получить состояние устройства %s:\n" IDS_ERROR_STATUS_SET_DEVICE "Не удалось установить состояние устройства %s:\n" IDS_ERROR_TIMEOUT_GET_DEVICE "Failed to get the timeout for device %s:\n" diff --git a/base/applications/cmdutils/mode/lang/tr-TR.rc b/base/applications/cmdutils/mode/lang/tr-TR.rc index aa919dac56..31cfe37bfd 100644 --- a/base/applications/cmdutils/mode/lang/tr-TR.rc +++ b/base/applications/cmdutils/mode/lang/tr-TR.rc @@ -16,13 +16,13 @@ Kod sayfası durumu: MODE CON[:] CP [/STATUS]\n\ Görüntü kipi: MODE CON[:] [COLS=c] [LINES=n]\n\ Yineleme hızı: MODE CON[:] [RATE=r DELAY=d]\n" - IDS_QUERY_SERIAL_FOUND " Dizilik aygıt bulundu - %s\n" - IDS_QUERY_PRINTER_FOUND " Yazıcı aygıtı bulundu - %s\n" - IDS_QUERY_PARALLEL_FOUND " Koşut aygıt bulundu - %s\n" - IDS_QUERY_DOSDEV_FOUND " DOS aygıtı bulundu - %s\n" - // IDS_QUERY_MISC_FOUND " Başka aygıt bulundu - %s\n" + IDS_QUERY_SERIAL_FOUND "Dizilik aygıt bulundu - %s\n" + IDS_QUERY_PRINTER_FOUND "Yazıcı aygıtı bulundu - %s\n" + IDS_QUERY_PARALLEL_FOUND "Koşut aygıt bulundu - %s\n" + IDS_QUERY_DOSDEV_FOUND "DOS aygıtı bulundu - %s\n" + // IDS_QUERY_MISC_FOUND "Başka aygıt bulundu - %s\n" - // IDS_QUERY_DEVICE_FOUND " %s aygıtı bulundu - %s\n" + // IDS_QUERY_DEVICE_FOUND "%s aygıtı bulundu - %s\n" // IDS_SERIAL "dizilik" // IDS_PRINTER "koşut" // IDS_OTHER "başka" @@ -61,6 +61,7 @@ BEGIN IDS_ERROR_SET_PARALLEL_STATE "YANLIŞLIK: SetParallelState(%d) - DefineDosDevice(%s) (0x%lx)\n" IDS_ERROR_INVALID_PARAMETER "Geçersiz değişken - %s\n" IDS_ERROR_ILLEGAL_DEVICE_NAME "Geçersiz aygıt adı - %s (0x%lx)\n" + IDS_ERROR_DEVICE_NOT_AVAILABLE "The device %s is not currently available.\n" IDS_ERROR_STATUS_GET_DEVICE "%s: aygıtının durumu alınamıyor\n" IDS_ERROR_STATUS_SET_DEVICE "%s: aygıtının durumu ayarlanamıyor\n" IDS_ERROR_TIMEOUT_GET_DEVICE "Failed to get the timeout for device %s:\n" diff --git a/base/applications/cmdutils/mode/lang/zh-CN.rc b/base/applications/cmdutils/mode/lang/zh-CN.rc index 99bf6f6802..7e8e841dcd 100644 --- a/base/applications/cmdutils/mode/lang/zh-CN.rc +++ b/base/applications/cmdutils/mode/lang/zh-CN.rc @@ -14,13 +14,13 @@ BEGIN 显示模式: MODE CON[:] [COLS=c] [LINES=n]\n\ 敲击速率: MODE CON[:] [RATE=r DELAY=d]\n" - IDS_QUERY_SERIAL_FOUND " 发现串口设备 - %s\n" - IDS_QUERY_PRINTER_FOUND " 发现打印设备 - %s\n" - IDS_QUERY_PARALLEL_FOUND " 发现并口设备 - %s\n" - IDS_QUERY_DOSDEV_FOUND " 发现 DOS 设备 - %s\n" - // IDS_QUERY_MISC_FOUND " 发现其他设备 - %s\n" + IDS_QUERY_SERIAL_FOUND "发现串口设备 - %s\n" + IDS_QUERY_PRINTER_FOUND "发现打印设备 - %s\n" + IDS_QUERY_PARALLEL_FOUND "发现并口设备 - %s\n" + IDS_QUERY_DOSDEV_FOUND "发现 DOS 设备 - %s\n" + // IDS_QUERY_MISC_FOUND "发现其他设备 - %s\n" - // IDS_QUERY_DEVICE_FOUND " 发现 %s 设备 - %s\n" + // IDS_QUERY_DEVICE_FOUND "发现 %s 设备 - %s\n" // IDS_SERIAL "串口" // IDS_PRINTER "并口" // IDS_OTHER "其他" @@ -59,6 +59,7 @@ BEGIN IDS_ERROR_SET_PARALLEL_STATE "错误: SetParallelState(%d) - DefineDosDevice(%s) (0x%lx)\n" IDS_ERROR_INVALID_PARAMETER "无效参数 - %s\n" IDS_ERROR_ILLEGAL_DEVICE_NAME "非法设备名 - %s (0x%lx)\n" + IDS_ERROR_DEVICE_NOT_AVAILABLE "The device %s is not currently available.\n" IDS_ERROR_STATUS_GET_DEVICE "无法获得设备 %s: 的状态\n" IDS_ERROR_STATUS_SET_DEVICE "无法设置设备 %s: 的状态\n" IDS_ERROR_TIMEOUT_GET_DEVICE "Failed to get the timeout for device %s:\n" diff --git a/base/applications/cmdutils/mode/mode.c b/base/applications/cmdutils/mode/mode.c index f571549dfb..054564e3dd 100644 --- a/base/applications/cmdutils/mode/mode.c +++ b/base/applications/cmdutils/mode/mode.c @@ -29,6 +29,7 @@ */ #include <stdio.h> +#include <stdlib.h> #include <windef.h> #include <winbase.h> @@ -40,7 +41,6 @@ #include "resource.h" #define MAX_PORTNAME_LEN 20 -#define MAX_COMPORT_NUM 10 #define ASSERT(a) @@ -72,76 +72,6 @@ UnderlinedResPrintf( ConStreamWrite(Stream, szMsgBuffer, Len); } -int QueryDevices(VOID) -{ - 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 */ - ConPuts(StdErr, L"ERROR: Not enough memory\n"); - return 0; - } - - for (;;) - { - *Buffer = UNICODE_NULL; - if (QueryDosDeviceW(NULL, Buffer, dwLen)) - break; - - if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) - { - /* We failed, bail out */ - ConPrintf(StdErr, 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 */ - ConPuts(StdErr, L"ERROR: Not enough memory\n"); - HeapFree(GetProcessHeap(), 0, Buffer); - return 0; - } - Buffer = ptr; - } - - for (ptr = Buffer; *ptr != UNICODE_NULL; ptr += wcslen(ptr) + 1) - { - 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; -} - int ShowParallelStatus(INT nPortNum) { WCHAR buffer[250]; @@ -174,6 +104,7 @@ int ShowParallelStatus(INT nPortNum) { ConPrintf(StdErr, L"ERROR: QueryDosDeviceW(%s) failed: 0x%lx\n", szPortName, GetLastError()); } + ConPuts(StdOut, L"\n"); return 1; } @@ -251,6 +182,8 @@ int ShowConsoleStatus(VOID) ConResPrintf(StdOut, IDS_CONSOLE_KBD_DELAY, dwKbdDelay); } ConResPrintf(StdOut, IDS_CONSOLE_CODEPAGE, GetConsoleOutputCP()); + ConPuts(StdOut, L"\n"); + return 0; } @@ -261,6 +194,8 @@ int ShowConsoleCPStatus(VOID) ConPuts(StdOut, L"\n"); ConResPrintf(StdOut, IDS_CONSOLE_CODEPAGE, GetConsoleOutputCP()); + ConPuts(StdOut, L"\n"); + return 0; } @@ -364,6 +299,7 @@ ResizeTextConsole( /* Update the console screen buffer information */ GetConsoleScreenBufferInfo(hConOut, pcsbi); + return TRUE; } @@ -570,7 +506,11 @@ SerialPortQuery(INT nPortNum, LPDCB pDCB, LPCOMMTIMEOUTS pCommTimeouts, BOOL bWr if (hPort == INVALID_HANDLE_VALUE) { - ConResPrintf(StdErr, IDS_ERROR_ILLEGAL_DEVICE_NAME, szPortName, GetLastError()); + DWORD dwLastError = GetLastError(); + if (dwLastError == ERROR_ACCESS_DENIED) + ConResPrintf(StdErr, IDS_ERROR_DEVICE_NOT_AVAILABLE, szPortName); + else + ConResPrintf(StdErr, IDS_ERROR_ILLEGAL_DEVICE_NAME, szPortName, dwLastError); return FALSE; } @@ -654,6 +594,8 @@ int ShowSerialStatus(INT nPortNum) control_strings[dcb.fDsrSensitivity ? 1 : 0]); ConResPrintf(StdOut, IDS_COM_STATUS_DTR_CIRCUIT, control_strings[dcb.fDtrControl]); ConResPrintf(StdOut, IDS_COM_STATUS_RTS_CIRCUIT, control_strings[dcb.fRtsControl]); + ConPuts(StdOut, L"\n"); + return 0; } @@ -1108,24 +1050,100 @@ int SetSerialState(INT nPortNum, IN PCWSTR ArgStr) static PCWSTR FindPortNum(PCWSTR argStr, PINT PortNum) { - *PortNum = -1; + PWSTR endptr = NULL; - if (*argStr >= L'0' && *argStr <= L'9') + *PortNum = wcstol(argStr, &endptr, 10); + if (endptr == argStr) { - *PortNum = *argStr - L'0'; - argStr++; - if (*argStr >= L'0' && *argStr <= L'9') + *PortNum = -1; + return NULL; + } + + return endptr; +} + +int EnumerateDevices(VOID) +{ + PWSTR Buffer, ptr; + PCWSTR argStr; + DWORD dwLen = MAX_PATH; + INT nPortNum; + + /* Pre-allocate a buffer for QueryDosDeviceW() */ + Buffer = HeapAlloc(GetProcessHeap(), 0, dwLen * sizeof(WCHAR)); + if (Buffer == NULL) + { + /* We failed, bail out */ + ConPuts(StdErr, L"ERROR: Not enough memory\n"); + return 0; + } + + for (;;) + { + *Buffer = UNICODE_NULL; + if (QueryDosDeviceW(NULL, Buffer, dwLen)) + break; + + if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) + { + /* We failed, bail out */ + ConPrintf(StdErr, 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) { - *PortNum *= 10; - *PortNum += *argStr - L'0'; + /* We failed, bail out */ + ConPuts(StdErr, 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) { - return NULL; + if (_wcsnicmp(ptr, L"COM", 3) == 0) + { + argStr = FindPortNum(ptr+3, &nPortNum); + if (!argStr || *argStr || nPortNum == -1) + continue; + + // ConResPrintf(StdOut, IDS_QUERY_SERIAL_FOUND, ptr); + ShowSerialStatus(nPortNum); + } + else if (_wcsicmp(ptr, L"PRN") == 0) + { + ConResPrintf(StdOut, IDS_QUERY_PRINTER_FOUND, ptr); + } + else if (_wcsnicmp(ptr, L"LPT", 3) == 0) + { + argStr = FindPortNum(ptr+3, &nPortNum); + if (!argStr || *argStr || nPortNum == -1) + continue; + + // ConResPrintf(StdOut, IDS_QUERY_PARALLEL_FOUND, ptr); + ShowParallelStatus(nPortNum); + } + else if (_wcsicmp(ptr, L"AUX") == 0 || _wcsicmp(ptr, L"NUL") == 0) + { + ConResPrintf(StdOut, IDS_QUERY_DOSDEV_FOUND, ptr); + } + else + { + // ConResPrintf(StdOut, IDS_QUERY_MISC_FOUND, ptr); + } } - return argStr; + ShowConsoleStatus(); + + /* Free the buffer and return success */ + HeapFree(GetProcessHeap(), 0, Buffer); + return 1; } int wmain(int argc, WCHAR* argv[]) @@ -1273,15 +1291,7 @@ int wmain(int argc, WCHAR* argv[]) } show_status: - QueryDevices(); -/* - ShowParallelStatus(1); - for (nPortNum = 0; nPortNum < MAX_COMPORT_NUM; nPortNum++) - { - ShowSerialStatus(nPortNum + 1); - } - ShowConsoleStatus(); -*/ + EnumerateDevices(); goto Quit; invalid_parameter: diff --git a/base/applications/cmdutils/mode/resource.h b/base/applications/cmdutils/mode/resource.h index c54e8ac31e..2916e47c2c 100644 --- a/base/applications/cmdutils/mode/resource.h +++ b/base/applications/cmdutils/mode/resource.h @@ -38,13 +38,14 @@ #define IDS_ERROR_SET_PARALLEL_STATE 26 #define IDS_ERROR_INVALID_PARAMETER 27 #define IDS_ERROR_ILLEGAL_DEVICE_NAME 28 -#define IDS_ERROR_STATUS_GET_DEVICE 29 -#define IDS_ERROR_STATUS_SET_DEVICE 30 -#define IDS_ERROR_TIMEOUT_GET_DEVICE 31 -#define IDS_ERROR_TIMEOUT_SET_DEVICE 32 -#define IDS_ERROR_INVALID_PARITY_BITS 33 -#define IDS_ERROR_INVALID_STOP_BITS 34 -#define IDS_ERROR_NO_MEMORY 35 -#define IDS_ERROR_SCREEN_LINES_COL 36 +#define IDS_ERROR_DEVICE_NOT_AVAILABLE 29 +#define IDS_ERROR_STATUS_GET_DEVICE 30 +#define IDS_ERROR_STATUS_SET_DEVICE 31 +#define IDS_ERROR_TIMEOUT_GET_DEVICE 32 +#define IDS_ERROR_TIMEOUT_SET_DEVICE 33 +#define IDS_ERROR_INVALID_PARITY_BITS 34 +#define IDS_ERROR_INVALID_STOP_BITS 35 +#define IDS_ERROR_NO_MEMORY 36 +#define IDS_ERROR_SCREEN_LINES_COL 37 #endif /* RESOURCE_H */

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