Ros-diffs November 2018

ros-diffs@reactos.org

29 participants
250 discussions

01/05: [BTRFS] Import BTRFS upstream commit e43183a0 "open_file: set granted_access when creating file".

by Mark Harmstone

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5729380349a3bc1ed7bd7… commit 5729380349a3bc1ed7bd7ab995fbb14dc6f5081b Author: Mark Harmstone <mark(a)harmstone.com> AuthorDate: Sun Nov 11 18:47:35 2018 +0000 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Nov 11 21:47:29 2018 +0100 [BTRFS] Import BTRFS upstream commit e43183a0 "open_file: set granted_access when creating file". Better solution for the original problem described at: https://github.com/maharmstone/btrfs/pull/123 --- drivers/filesystems/btrfs/create.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/filesystems/btrfs/create.c b/drivers/filesystems/btrfs/create.c index 39fbf09240..4c4c5dd984 100644 --- a/drivers/filesystems/btrfs/create.c +++ b/drivers/filesystems/btrfs/create.c @@ -3557,6 +3557,7 @@ static NTSTATUS open_file(PDEVICE_OBJECT DeviceObject, _Requires_lock_held_(_Cur release_fcb_lock(Vcb); Irp->IoStatus.Information = NT_SUCCESS(Status) ? FILE_CREATED : 0; + granted_access = IrpSp->Parameters.Create.SecurityContext->DesiredAccess; } if (NT_SUCCESS(Status) && !(options & FILE_NO_INTERMEDIATE_BUFFERING))

5 years, 10 months

02/02: [MC] Add messages 2300-2484 to netmsg.dll.

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bebbb69b2129a34a760da… commit bebbb69b2129a34a760da98b61c39916f8c3f414 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Nov 11 19:53:34 2018 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Nov 11 19:54:32 2018 +0100 [MC] Add messages 2300-2484 to netmsg.dll. --- sdk/include/reactos/mc/netmsgmsg.mc | 880 ++++++++++++++++++++++++++++++++++++ 1 file changed, 880 insertions(+) diff --git a/sdk/include/reactos/mc/netmsgmsg.mc b/sdk/include/reactos/mc/netmsgmsg.mc index 6236389195..43959c72ba 100644 --- a/sdk/include/reactos/mc/netmsgmsg.mc +++ b/sdk/include/reactos/mc/netmsgmsg.mc @@ -1546,6 +1546,886 @@ Language=Russian The message alias was not successfully deleted from all networks. . +MessageId=2300 +Severity=Success +Facility=System +SymbolicName=NERR_MultipleNets +Language=English +This operation is not supported on computers with multiple networks. +. +Language=Russian +This operation is not supported on computers with multiple networks. +. + +MessageId=2310 +Severity=Success +Facility=System +SymbolicName=NERR_NetNameNotFound +Language=English +This shared resource does not exist. +. +Language=Russian +This shared resource does not exist. +. + +MessageId=2311 +Severity=Success +Facility=System +SymbolicName=NERR_DeviceNotShared +Language=English +This device is not shared. +. +Language=Russian +This device is not shared. +. + +MessageId=2312 +Severity=Success +Facility=System +SymbolicName=NERR_ClientNameNotFound +Language=English +A session does not exist with that computer name. +. +Language=Russian +A session does not exist with that computer name. +. + +MessageId=2314 +Severity=Success +Facility=System +SymbolicName=NERR_FileIdNotFound +Language=English +There is not an open file with that identification number. +. +Language=Russian +There is not an open file with that identification number. +. + +MessageId=2315 +Severity=Success +Facility=System +SymbolicName=NERR_ExecFailure +Language=English +A failure occurred when executing a remote administration command. +. +Language=Russian +A failure occurred when executing a remote administration command. +. + +MessageId=2316 +Severity=Success +Facility=System +SymbolicName=NERR_TmpFile +Language=English +A failure occurred when opening a remote temporary file. +. +Language=Russian +A failure occurred when opening a remote temporary file. +. + +MessageId=2317 +Severity=Success +Facility=System +SymbolicName=NERR_TooMuchData +Language=English +The data returned from a remote administration command has been truncated to 64K. +. +Language=Russian +The data returned from a remote administration command has been truncated to 64K. +. + +MessageId=2318 +Severity=Success +Facility=System +SymbolicName=NERR_DeviceShareConflict +Language=English +This device cannot be shared as both a spooled and a non-spooled resource. +. +Language=Russian +This device cannot be shared as both a spooled and a non-spooled resource. +. + +MessageId=2319 +Severity=Success +Facility=System +SymbolicName=NERR_BrowserTableIncomplete +Language=English +The information in the list of servers may be incorrect. +. +Language=Russian +The information in the list of servers may be incorrect. +. + +MessageId=2320 +Severity=Success +Facility=System +SymbolicName=NERR_NotLocalDomain +Language=English +The computer is not active in this domain. +. +Language=Russian +The computer is not active in this domain. +. + +MessageId=2321 +Severity=Success +Facility=System +SymbolicName=NERR_IsDfsShare +Language=English +The share must be removed from the Distributed File System before it can be deleted. +. +Language=Russian +The share must be removed from the Distributed File System before it can be deleted. +. + +MessageId=2331 +Severity=Success +Facility=System +SymbolicName=NERR_DevInvalidOpCode +Language=English +The operation is invalid for this device. +. +Language=Russian +The operation is invalid for this device. +. + +MessageId=2332 +Severity=Success +Facility=System +SymbolicName=NERR_DevNotFound +Language=English +This device cannot be shared. +. +Language=Russian +This device cannot be shared. +. + +MessageId=2333 +Severity=Success +Facility=System +SymbolicName=NERR_DevNotOpen +Language=English +This device was not open. +. +Language=Russian +This device was not open. +. + +MessageId=2334 +Severity=Success +Facility=System +SymbolicName=NERR_BadQueueDevString +Language=English +This device name list is invalid. +. +Language=Russian +This device name list is invalid. +. + +MessageId=2335 +Severity=Success +Facility=System +SymbolicName=NERR_BadQueuePriority +Language=English +The queue priority is invalid. +. +Language=Russian +The queue priority is invalid. +. + +MessageId=2337 +Severity=Success +Facility=System +SymbolicName=NERR_NoCommDevs +Language=English +There are no shared communication devices. +. +Language=Russian +There are no shared communication devices. +. + +MessageId=2338 +Severity=Success +Facility=System +SymbolicName=NERR_QueueNotFound +Language=English +The queue you specified does not exist. +. +Language=Russian +The queue you specified does not exist. +. + +MessageId=2340 +Severity=Success +Facility=System +SymbolicName=NERR_BadDevString +Language=English +This list of devices is invalid. +. +Language=Russian +This list of devices is invalid. +. + +MessageId=2341 +Severity=Success +Facility=System +SymbolicName=NERR_BadDev +Language=English +The requested device is invalid. +. +Language=Russian +The requested device is invalid. +. + +MessageId=2342 +Severity=Success +Facility=System +SymbolicName=NERR_InUseBySpooler +Language=English +This device is already in use by the spooler. +. +Language=Russian +This device is already in use by the spooler. +. + +MessageId=2343 +Severity=Success +Facility=System +SymbolicName=NERR_CommDevInUse +Language=English +This device is already in use as a communication device. +. +Language=Russian +This device is already in use as a communication device. +. + +MessageId=2351 +Severity=Success +Facility=System +SymbolicName=NERR_InvalidComputer +Language=English +This computer name is invalid. +. +Language=Russian +This computer name is invalid. +. + +MessageId=2354 +Severity=Success +Facility=System +SymbolicName=NERR_MaxLenExceeded +Language=English +The string and prefix specified are too long. +. +Language=Russian +The string and prefix specified are too long. +. + +MessageId=2356 +Severity=Success +Facility=System +SymbolicName=NERR_BadComponent +Language=English +This path component is invalid. +. +Language=Russian +This path component is invalid. +. + +MessageId=2357 +Severity=Success +Facility=System +SymbolicName=NERR_CantType +Language=English +Could not determine the type of input. +. +Language=Russian +Could not determine the type of input. +. + +MessageId=2362 +Severity=Success +Facility=System +SymbolicName=NERR_TooManyEntries +Language=English +The buffer for types is not big enough. +. +Language=Russian +The buffer for types is not big enough. +. + +MessageId=2370 +Severity=Success +Facility=System +SymbolicName=NERR_ProfileFileTooBig +Language=English +Profile files cannot exceed 64K. +. +Language=Russian +Profile files cannot exceed 64K. +. + +MessageId=2371 +Severity=Success +Facility=System +SymbolicName=NERR_ProfileOffset +Language=English +The start offset is out of range. +. +Language=Russian +The start offset is out of range. +. + +MessageId=2372 +Severity=Success +Facility=System +SymbolicName=NERR_ProfileCleanup +Language=English +The system cannot delete current connections to network resources. +. +Language=Russian +The system cannot delete current connections to network resources. +. + +MessageId=2373 +Severity=Success +Facility=System +SymbolicName=NERR_ProfileUnknownCmd +Language=English +The system was unable to parse the command line in this file. +. +Language=Russian +The system was unable to parse the command line in this file. +. + +MessageId=2374 +Severity=Success +Facility=System +SymbolicName=NERR_ProfileLoadErr +Language=English +An error occurred while loading the profile file. +. +Language=Russian +An error occurred while loading the profile file. +. + +MessageId=2375 +Severity=Success +Facility=System +SymbolicName=NERR_ProfileSaveErr +Language=English +Errors occurred while saving the profile file. The profile was partially saved. +. +Language=Russian +Errors occurred while saving the profile file. The profile was partially saved. +. + +MessageId=2377 +Severity=Success +Facility=System +SymbolicName=NERR_LogOverflow +Language=English +Log file %1 is full. +. +Language=Russian +Log file %1 is full. +. + +MessageId=2378 +Severity=Success +Facility=System +SymbolicName=NERR_LogFileChanged +Language=English +This log file has changed between reads. +. +Language=Russian +This log file has changed between reads. +. + +MessageId=2379 +Severity=Success +Facility=System +SymbolicName=NERR_LogFileCorrupt +Language=English +Log file %1 is corrupt. +. +Language=Russian +Log file %1 is corrupt. +. + +MessageId=2380 +Severity=Success +Facility=System +SymbolicName=NERR_SourceIsDir +Language=English +The source path cannot be a directory. +. +Language=Russian +The source path cannot be a directory. +. + +MessageId=2381 +Severity=Success +Facility=System +SymbolicName=NERR_BadSource +Language=English +The source path is illegal. +. +Language=Russian +The source path is illegal. +. + +MessageId=2382 +Severity=Success +Facility=System +SymbolicName=NERR_BadDest +Language=English +The destination path is illegal. +. +Language=Russian +The destination path is illegal. +. + +MessageId=2383 +Severity=Success +Facility=System +SymbolicName=NERR_DifferentServers +Language=English +The source and destination paths are on different servers. +. +Language=Russian +The source and destination paths are on different servers. +. + +MessageId=2385 +Severity=Success +Facility=System +SymbolicName=NERR_RunSrvPaused +Language=English +The Run server you requested is paused. +. +Language=Russian +The Run server you requested is paused. +. + +MessageId=2389 +Severity=Success +Facility=System +SymbolicName=NERR_ErrCommRunSrv +Language=English +An error occurred when communicating with a Run server. +. +Language=Russian +An error occurred when communicating with a Run server. +. + +MessageId=2391 +Severity=Success +Facility=System +SymbolicName=NERR_ErrorExecingGhost +Language=English +An error occurred when starting a background process. +. +Language=Russian +An error occurred when starting a background process. +. + +MessageId=2392 +Severity=Success +Facility=System +SymbolicName=NERR_ShareNotFound +Language=English +The shared resource you are connected to could not be found. +. +Language=Russian +The shared resource you are connected to could not be found. +. + +MessageId=2400 +Severity=Success +Facility=System +SymbolicName=NERR_InvalidLana +Language=English +The LAN adapter number is invalid. +. +Language=Russian +The LAN adapter number is invalid. +. + +MessageId=2401 +Severity=Success +Facility=System +SymbolicName=NERR_OpenFiles +Language=English +There are open files on the connection. +. +Language=Russian +There are open files on the connection. +. + +MessageId=2402 +Severity=Success +Facility=System +SymbolicName=NERR_ActiveConns +Language=English +Active connections still exist. +. +Language=Russian +Active connections still exist. +. + +MessageId=2403 +Severity=Success +Facility=System +SymbolicName=NERR_BadPasswordCore +Language=English +This share name or password is invalid. +. +Language=Russian +This share name or password is invalid. +. + +MessageId=2404 +Severity=Success +Facility=System +SymbolicName=NERR_DevInUse +Language=English +The device is being accessed by an active process. +. +Language=Russian +The device is being accessed by an active process. +. + +MessageId=2405 +Severity=Success +Facility=System +SymbolicName=NERR_LocalDrive +Language=English +The drive letter is in use locally. +. +Language=Russian +The drive letter is in use locally. +. + +MessageId=2430 +Severity=Success +Facility=System +SymbolicName=NERR_AlertExists +Language=English +The specified client is already registered for the specified event. +. +Language=Russian +The specified client is already registered for the specified event. +. + +MessageId=2431 +Severity=Success +Facility=System +SymbolicName=NERR_TooManyAlerts +Language=English +The alert table is full. +. +Language=Russian +The alert table is full. +. + +MessageId=2432 +Severity=Success +Facility=System +SymbolicName=NERR_NoSuchAlert +Language=English +An invalid or nonexistent alert name was raised. +. +Language=Russian +An invalid or nonexistent alert name was raised. +. + +MessageId=2433 +Severity=Success +Facility=System +SymbolicName=NERR_BadRecipient +Language=English +The alert recipient is invalid. +. +Language=Russian +The alert recipient is invalid. +. + +MessageId=2434 +Severity=Success +Facility=System +SymbolicName=NERR_AcctLimitExceeded +Language=English +A user's session with this server has been deleted\nbecause the user's logon hours are no longer valid. +. +Language=Russian +A user's session with this server has been deleted\nbecause the user's logon hours are no longer valid. +. + +MessageId=2440 +Severity=Success +Facility=System +SymbolicName=NERR_InvalidLogSeek +Language=English +The log file does not contain the requested record number. +. +Language=Russian +The log file does not contain the requested record number. +. + +MessageId=2450 +Severity=Success +Facility=System +SymbolicName=NERR_BadUasConfig +Language=English +The user accounts database is not configured correctly. +. +Language=Russian +The user accounts database is not configured correctly. +. + +MessageId=2451 +Severity=Success +Facility=System +SymbolicName=NERR_InvalidUASOp +Language=English +This operation is not permitted when the Netlogon service is running. +. +Language=Russian +This operation is not permitted when the Netlogon service is running. +. + +MessageId=2452 +Severity=Success +Facility=System +SymbolicName=NERR_LastAdmin +Language=English +This operation is not allowed on the last administrative account. +. +Language=Russian +This operation is not allowed on the last administrative account. +. + +MessageId=2453 +Severity=Success +Facility=System +SymbolicName=NERR_DCNotFound +Language=English +Could not find domain controller for this domain. +. +Language=Russian +Could not find domain controller for this domain. +. + +MessageId=2454 +Severity=Success +Facility=System +SymbolicName=NERR_LogonTrackingError +Language=English +Could not set logon information for this user. +. +Language=Russian +Could not set logon information for this user. +. + +MessageId=2455 +Severity=Success +Facility=System +SymbolicName=NERR_NetlogonNotStarted +Language=English +The Netlogon service has not been started. +. +Language=Russian +The Netlogon service has not been started. +. + +MessageId=2456 +Severity=Success +Facility=System +SymbolicName=NERR_CanNotGrowUASFile +Language=English +Unable to add to the user accounts database. +. +Language=Russian +Unable to add to the user accounts database. +. + +MessageId=2457 +Severity=Success +Facility=System +SymbolicName=NERR_TimeDiffAtDC +Language=English +This server's clock is not synchronized with the primary domain controller's clock. +. +Language=Russian +This server's clock is not synchronized with the primary domain controller's clock. +. + +MessageId=2458 +Severity=Success +Facility=System +SymbolicName=NERR_PasswordMismatch +Language=English +A password mismatch has been detected. +. +Language=Russian +A password mismatch has been detected. +. + +MessageId=2460 +Severity=Success +Facility=System +SymbolicName=NERR_NoSuchServer +Language=English +The server identification does not specify a valid server. +. +Language=Russian +The server identification does not specify a valid server. +. + +MessageId=2461 +Severity=Success +Facility=System +SymbolicName=NERR_NoSuchSession +Language=English +The session identification does not specify a valid session. +. +Language=Russian +The session identification does not specify a valid session. +. + +MessageId=2462 +Severity=Success +Facility=System +SymbolicName=NERR_NoSuchConnection +Language=English +The connection identification does not specify a valid connection. +. +Language=Russian +The connection identification does not specify a valid connection. +. + +MessageId=2463 +Severity=Success +Facility=System +SymbolicName=NERR_TooManyServers +Language=English +There is no space for another entry in the table of available servers. +. +Language=Russian +There is no space for another entry in the table of available servers. +. + +MessageId=2464 +Severity=Success +Facility=System +SymbolicName=NERR_TooManySessions +Language=English +The server has reached the maximum number of sessions it supports. +. +Language=Russian +The server has reached the maximum number of sessions it supports. +. + +MessageId=2465 +Severity=Success +Facility=System +SymbolicName=NERR_TooManyConnections +Language=English +The server has reached the maximum number of connections it supports. +. +Language=Russian +The server has reached the maximum number of connections it supports. +. + +MessageId=2466 +Severity=Success +Facility=System +SymbolicName=NERR_TooManyFiles +Language=English +The server cannot open more files because it has reached its maximum number. +. +Language=Russian +The server cannot open more files because it has reached its maximum number. +. + +MessageId=2467 +Severity=Success +Facility=System +SymbolicName=NERR_NoAlternateServers +Language=English +There are no alternate servers registered on this server. +. +Language=Russian +There are no alternate servers registered on this server. +. + +MessageId=2470 +Severity=Success +Facility=System +SymbolicName=NERR_TryDownLevel +Language=English +Try down-level (remote admin protocol) version of API instead. +. +Language=Russian +Try down-level (remote admin protocol) version of API instead. +. + +MessageId=2480 +Severity=Success +Facility=System +SymbolicName=NERR_UPSDriverNotStarted +Language=English +The UPS driver could not be accessed by the UPS service. +. +Language=Russian +The UPS driver could not be accessed by the UPS service. +. + +MessageId=2481 +Severity=Success +Facility=System +SymbolicName=NERR_UPSInvalidConfig +Language=English +The UPS service is not configured correctly. +. +Language=Russian +The UPS service is not configured correctly. +. + +MessageId=2482 +Severity=Success +Facility=System +SymbolicName=NERR_UPSInvalidCommPort +Language=English +The UPS service could not access the specified Comm Port. +. +Language=Russian +The UPS service could not access the specified Comm Port. +. + +MessageId=2483 +Severity=Success +Facility=System +SymbolicName=NERR_UPSSignalAsserted +Language=English +The UPS indicated a line fail or low battery situation. Service not started. +. +Language=Russian +The UPS indicated a line fail or low battery situation. Service not started. +. + +MessageId=2484 +Severity=Success +Facility=System +SymbolicName=NERR_UPSShutdownFailed +Language=English +The UPS service failed to perform a system shut down. +. +Language=Russian +The UPS service failed to perform a system shut down. +. + ; ; other message definitions

5 years, 10 months

01/02: [PSDK] Add missing NERR_IsDfsShare to lmerr.h.

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7021115c213b576d5dac6… commit 7021115c213b576d5dac6eeebbf99c6298126474 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Nov 11 19:33:49 2018 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Nov 11 19:54:30 2018 +0100 [PSDK] Add missing NERR_IsDfsShare to lmerr.h. --- sdk/include/psdk/lmerr.h | 1 + 1 file changed, 1 insertion(+) diff --git a/sdk/include/psdk/lmerr.h b/sdk/include/psdk/lmerr.h index dfc6254d9e..66aab138d7 100644 --- a/sdk/include/psdk/lmerr.h +++ b/sdk/include/psdk/lmerr.h @@ -153,6 +153,7 @@ #define NERR_DeviceShareConflict (NERR_BASE+218) #define NERR_BrowserTableIncomplete (NERR_BASE+219) #define NERR_NotLocalDomain (NERR_BASE+220) +#define NERR_IsDfsShare (NERR_BASE+221) #define NERR_DevInvalidOpCode (NERR_BASE+231) #define NERR_DevNotFound (NERR_BASE+232) #define NERR_DevNotOpen (NERR_BASE+233)

5 years, 10 months

06/06: [NETSHELL] CNetConUiObject: Fix implementation of IContextMenu. The id that InvokeCommand gets is the one used by QueryContextMenu after subtracting idCmdFirst.

by Giannis Adamopoulos

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=73b679e4a6c3b3ee8d7e5… commit 73b679e4a6c3b3ee8d7e5bd33886f1d9617f3a73 Author: Giannis Adamopoulos <gadamopoulos(a)reactos.org> AuthorDate: Sun Nov 11 20:09:53 2018 +0200 Commit: Giannis Adamopoulos <gadamopoulos(a)reactos.org> CommitDate: Sun Nov 11 20:28:36 2018 +0200 [NETSHELL] CNetConUiObject: Fix implementation of IContextMenu. The id that InvokeCommand gets is the one used by QueryContextMenu after subtracting idCmdFirst. --- dll/shellext/netshell/shfldr_netconnect.cpp | 44 ++++++++++++++++------------- 1 file changed, 24 insertions(+), 20 deletions(-) diff --git a/dll/shellext/netshell/shfldr_netconnect.cpp b/dll/shellext/netshell/shfldr_netconnect.cpp index 78d5d017b4..3866121424 100644 --- a/dll/shellext/netshell/shfldr_netconnect.cpp +++ b/dll/shellext/netshell/shfldr_netconnect.cpp @@ -851,40 +851,40 @@ HRESULT WINAPI CNetConUiObject::QueryContextMenu( return E_FAIL; if (pProperties->Status == NCS_HARDWARE_DISABLED) - _InsertMenuItemW(hMenu, indexMenu++, TRUE, IDS_NET_ACTIVATE, MFT_STRING, MAKEINTRESOURCEW(IDS_NET_ACTIVATE), MFS_DEFAULT); + _InsertMenuItemW(hMenu, indexMenu++, TRUE, idCmdFirst, MFT_STRING, MAKEINTRESOURCEW(IDS_NET_ACTIVATE), MFS_DEFAULT); else - _InsertMenuItemW(hMenu, indexMenu++, TRUE, IDS_NET_DEACTIVATE, MFT_STRING, MAKEINTRESOURCEW(IDS_NET_DEACTIVATE), MFS_ENABLED); + _InsertMenuItemW(hMenu, indexMenu++, TRUE, idCmdFirst + 1, MFT_STRING, MAKEINTRESOURCEW(IDS_NET_DEACTIVATE), MFS_ENABLED); if (pProperties->Status == NCS_HARDWARE_DISABLED || pProperties->Status == NCS_MEDIA_DISCONNECTED || pProperties->Status == NCS_DISCONNECTED) - _InsertMenuItemW(hMenu, indexMenu++, TRUE, IDS_NET_STATUS, MFT_STRING, MAKEINTRESOURCEW(IDS_NET_STATUS), MFS_GRAYED); + _InsertMenuItemW(hMenu, indexMenu++, TRUE, idCmdFirst + 2, MFT_STRING, MAKEINTRESOURCEW(IDS_NET_STATUS), MFS_GRAYED); else if (pProperties->Status == NCS_CONNECTED) - _InsertMenuItemW(hMenu, indexMenu++, TRUE, IDS_NET_STATUS, MFT_STRING, MAKEINTRESOURCEW(IDS_NET_STATUS), MFS_DEFAULT); + _InsertMenuItemW(hMenu, indexMenu++, TRUE, idCmdFirst + 2, MFT_STRING, MAKEINTRESOURCEW(IDS_NET_STATUS), MFS_DEFAULT); else - _InsertMenuItemW(hMenu, indexMenu++, TRUE, IDS_NET_STATUS, MFT_STRING, MAKEINTRESOURCEW(IDS_NET_STATUS), MFS_ENABLED); + _InsertMenuItemW(hMenu, indexMenu++, TRUE, idCmdFirst + 2, MFT_STRING, MAKEINTRESOURCEW(IDS_NET_STATUS), MFS_ENABLED); if (pProperties->Status == NCS_HARDWARE_DISABLED || pProperties->Status == NCS_MEDIA_DISCONNECTED) - _InsertMenuItemW(hMenu, indexMenu++, TRUE, IDS_NET_REPAIR, MFT_STRING, MAKEINTRESOURCEW(IDS_NET_REPAIR), MFS_GRAYED); + _InsertMenuItemW(hMenu, indexMenu++, TRUE, idCmdFirst + 3, MFT_STRING, MAKEINTRESOURCEW(IDS_NET_REPAIR), MFS_GRAYED); else - _InsertMenuItemW(hMenu, indexMenu++, TRUE, IDS_NET_REPAIR, MFT_STRING, MAKEINTRESOURCEW(IDS_NET_REPAIR), MFS_ENABLED); + _InsertMenuItemW(hMenu, indexMenu++, TRUE, idCmdFirst + 3, MFT_STRING, MAKEINTRESOURCEW(IDS_NET_REPAIR), MFS_ENABLED); _InsertMenuItemW(hMenu, indexMenu++, TRUE, -1, MFT_SEPARATOR, NULL, MFS_ENABLED); - _InsertMenuItemW(hMenu, indexMenu++, TRUE, IDS_NET_CREATELINK, MFT_STRING, MAKEINTRESOURCEW(IDS_NET_CREATELINK), MFS_ENABLED); + _InsertMenuItemW(hMenu, indexMenu++, TRUE, idCmdFirst + 4, MFT_STRING, MAKEINTRESOURCEW(IDS_NET_CREATELINK), MFS_ENABLED); if (pProperties->dwCharacter & NCCF_ALLOW_REMOVAL) - _InsertMenuItemW(hMenu, indexMenu++, TRUE, IDS_NET_DELETE, MFT_STRING, MAKEINTRESOURCEW(IDS_NET_DELETE), MFS_ENABLED); + _InsertMenuItemW(hMenu, indexMenu++, TRUE, idCmdFirst + 5, MFT_STRING, MAKEINTRESOURCEW(IDS_NET_DELETE), MFS_ENABLED); else - _InsertMenuItemW(hMenu, indexMenu++, TRUE, IDS_NET_DELETE, MFT_STRING, MAKEINTRESOURCEW(IDS_NET_DELETE), MFS_GRAYED); + _InsertMenuItemW(hMenu, indexMenu++, TRUE, idCmdFirst + 5, MFT_STRING, MAKEINTRESOURCEW(IDS_NET_DELETE), MFS_GRAYED); if (pProperties->dwCharacter & NCCF_ALLOW_RENAME) - _InsertMenuItemW(hMenu, indexMenu++, TRUE, IDS_NET_RENAME, MFT_STRING, MAKEINTRESOURCEW(IDS_NET_RENAME), MFS_ENABLED); + _InsertMenuItemW(hMenu, indexMenu++, TRUE, idCmdFirst + 6, MFT_STRING, MAKEINTRESOURCEW(IDS_NET_RENAME), MFS_ENABLED); else - _InsertMenuItemW(hMenu, indexMenu++, TRUE, IDS_NET_RENAME, MFT_STRING, MAKEINTRESOURCEW(IDS_NET_RENAME), MFS_GRAYED); + _InsertMenuItemW(hMenu, indexMenu++, TRUE, idCmdFirst + 6, MFT_STRING, MAKEINTRESOURCEW(IDS_NET_RENAME), MFS_GRAYED); _InsertMenuItemW(hMenu, indexMenu++, TRUE, -1, MFT_SEPARATOR, NULL, MFS_ENABLED); if (pProperties->Status == NCS_CONNECTED) - _InsertMenuItemW(hMenu, indexMenu++, TRUE, IDS_NET_PROPERTIES, MFT_STRING, MAKEINTRESOURCEW(IDS_NET_PROPERTIES), MFS_ENABLED); + _InsertMenuItemW(hMenu, indexMenu++, TRUE, idCmdFirst + 7, MFT_STRING, MAKEINTRESOURCEW(IDS_NET_PROPERTIES), MFS_ENABLED); else - _InsertMenuItemW(hMenu, indexMenu++, TRUE, IDS_NET_PROPERTIES, MFT_STRING, MAKEINTRESOURCEW(IDS_NET_PROPERTIES), MFS_DEFAULT); + _InsertMenuItemW(hMenu, indexMenu++, TRUE, idCmdFirst + 7, MFT_STRING, MAKEINTRESOURCEW(IDS_NET_PROPERTIES), MFS_DEFAULT); NcFreeNetconProperties(pProperties); return MAKE_HRESULT(SEVERITY_SUCCESS, 0, 9); } @@ -993,17 +993,23 @@ HRESULT WINAPI CNetConUiObject::InvokeCommand(LPCMINVOKECOMMANDINFO lpcmi) if (HIWORD(lpcmi->lpVerb) && !strcmp(lpcmi->lpVerb, "rename")) lpcmi->lpVerb = MAKEINTRESOURCEA(IDS_NET_RENAME); - if (HIWORD(lpcmi->lpVerb)) + if (HIWORD(lpcmi->lpVerb) || LOWORD(lpcmi->lpVerb) > 7) { - //FIXME + FIXME("Got invalid command\n"); return E_NOTIMPL; } - CmdId = LOWORD(lpcmi->lpVerb); - + CmdId = LOWORD(lpcmi->lpVerb) + IDS_NET_ACTIVATE; switch(CmdId) { + case IDS_NET_ACTIVATE: + case IDS_NET_DEACTIVATE: + case IDS_NET_REPAIR: + case IDS_NET_CREATELINK: + case IDS_NET_DELETE: + FIXME("Command %u is not implemented\n", CmdId); + return E_NOTIMPL; case IDS_NET_RENAME: { HRESULT hr; @@ -1019,10 +1025,8 @@ HRESULT WINAPI CNetConUiObject::InvokeCommand(LPCMINVOKECOMMANDINFO lpcmi) return S_OK; } case IDS_NET_STATUS: - case IDS_NET_STATUS-1: //HACK for Windows XP return ShowNetConnectionStatus(m_lpOleCmd, val->pItem, lpcmi->hwnd); case IDS_NET_PROPERTIES: - case 10099: //HACK for Windows XP return ShowNetConnectionProperties(val->pItem, lpcmi->hwnd); }

5 years, 10 months

05/06: [NETSHELL] CNetConUiObject: Implement handling the rename context menu item

by Giannis Adamopoulos

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cd7a3317494bd93a93076… commit cd7a3317494bd93a93076f56a5f3236b838affb3 Author: Giannis Adamopoulos <gadamopoulos(a)reactos.org> AuthorDate: Sun Nov 11 15:46:58 2018 +0200 Commit: Giannis Adamopoulos <gadamopoulos(a)reactos.org> CommitDate: Sun Nov 11 20:28:34 2018 +0200 [NETSHELL] CNetConUiObject: Implement handling the rename context menu item --- dll/shellext/netshell/shfldr_netconnect.cpp | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/dll/shellext/netshell/shfldr_netconnect.cpp b/dll/shellext/netshell/shfldr_netconnect.cpp index ef00ff2e55..78d5d017b4 100644 --- a/dll/shellext/netshell/shfldr_netconnect.cpp +++ b/dll/shellext/netshell/shfldr_netconnect.cpp @@ -989,6 +989,10 @@ HRESULT WINAPI CNetConUiObject::InvokeCommand(LPCMINVOKECOMMANDINFO lpcmi) if (!val) return E_FAIL; + /* We should get this when F2 is pressed in explorer */ + if (HIWORD(lpcmi->lpVerb) && !strcmp(lpcmi->lpVerb, "rename")) + lpcmi->lpVerb = MAKEINTRESOURCEA(IDS_NET_RENAME); + if (HIWORD(lpcmi->lpVerb)) { //FIXME @@ -1000,6 +1004,20 @@ HRESULT WINAPI CNetConUiObject::InvokeCommand(LPCMINVOKECOMMANDINFO lpcmi) switch(CmdId) { + case IDS_NET_RENAME: + { + HRESULT hr; + IShellView *psv; + hr = IUnknown_QueryService(m_pUnknown, SID_IFolderView, IID_IShellView, (PVOID*)&psv); + if (SUCCEEDED(hr)) + { + SVSIF selFlags = SVSI_DESELECTOTHERS | SVSI_EDIT | SVSI_ENSUREVISIBLE | SVSI_FOCUSED | SVSI_SELECT; + psv->SelectItem(m_pidl, selFlags); + } + psv->Release(); + + return S_OK; + } case IDS_NET_STATUS: case IDS_NET_STATUS-1: //HACK for Windows XP return ShowNetConnectionStatus(m_lpOleCmd, val->pItem, lpcmi->hwnd); @@ -1008,7 +1026,7 @@ HRESULT WINAPI CNetConUiObject::InvokeCommand(LPCMINVOKECOMMANDINFO lpcmi) return ShowNetConnectionProperties(val->pItem, lpcmi->hwnd); } - return S_OK; + return E_NOTIMPL; } /**************************************************************************

5 years, 10 months

04/06: [NETSHELL] CNetConUiObject: Use a switch in InvokeCommand

by Giannis Adamopoulos

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=af3a1b19363be1f411b3e… commit af3a1b19363be1f411b3e6c5456065680d2dccdd Author: Giannis Adamopoulos <gadamopoulos(a)reactos.org> AuthorDate: Sun Nov 11 15:37:44 2018 +0200 Commit: Giannis Adamopoulos <gadamopoulos(a)reactos.org> CommitDate: Sun Nov 11 20:28:32 2018 +0200 [NETSHELL] CNetConUiObject: Use a switch in InvokeCommand --- dll/shellext/netshell/shfldr_netconnect.cpp | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/dll/shellext/netshell/shfldr_netconnect.cpp b/dll/shellext/netshell/shfldr_netconnect.cpp index 64b7806e70..ef00ff2e55 100644 --- a/dll/shellext/netshell/shfldr_netconnect.cpp +++ b/dll/shellext/netshell/shfldr_netconnect.cpp @@ -983,21 +983,29 @@ ShowNetConnectionProperties( HRESULT WINAPI CNetConUiObject::InvokeCommand(LPCMINVOKECOMMANDINFO lpcmi) { const VALUEStruct * val; + UINT CmdId; val = _ILGetValueStruct(m_pidl); if (!val) return E_FAIL; - if (lpcmi->lpVerb == MAKEINTRESOURCEA(IDS_NET_STATUS) || - lpcmi->lpVerb == MAKEINTRESOURCEA(IDS_NET_STATUS-1)) //HACK for Windows XP + if (HIWORD(lpcmi->lpVerb)) { - return ShowNetConnectionStatus(m_lpOleCmd, val->pItem, lpcmi->hwnd); + //FIXME + return E_NOTIMPL; } - else if (lpcmi->lpVerb == MAKEINTRESOURCEA(IDS_NET_PROPERTIES) || - lpcmi->lpVerb == MAKEINTRESOURCEA(10099)) //HACK for Windows XP + + CmdId = LOWORD(lpcmi->lpVerb); + + + switch(CmdId) { - /* FIXME perform version checks */ - return ShowNetConnectionProperties(val->pItem, lpcmi->hwnd); + case IDS_NET_STATUS: + case IDS_NET_STATUS-1: //HACK for Windows XP + return ShowNetConnectionStatus(m_lpOleCmd, val->pItem, lpcmi->hwnd); + case IDS_NET_PROPERTIES: + case 10099: //HACK for Windows XP + return ShowNetConnectionProperties(val->pItem, lpcmi->hwnd); } return S_OK;

5 years, 10 months

03/06: [NETSHELL] CNetworkConnections: Remove SFGAO_CANRENAME bit when renaming shouldn't be enabled. This fixes the problem where renaming could take place by clicking on a name even when it is disabled in the context menu. CORE-14116

by Giannis Adamopoulos

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=41639e94c208b4dda7cd4… commit 41639e94c208b4dda7cd4f52af242a417d3c6a69 Author: Giannis Adamopoulos <gadamopoulos(a)reactos.org> AuthorDate: Sun Nov 11 12:40:45 2018 +0200 Commit: Giannis Adamopoulos <gadamopoulos(a)reactos.org> CommitDate: Sun Nov 11 20:28:31 2018 +0200 [NETSHELL] CNetworkConnections: Remove SFGAO_CANRENAME bit when renaming shouldn't be enabled. This fixes the problem where renaming could take place by clicking on a name even when it is disabled in the context menu. CORE-14116 --- dll/shellext/netshell/shfldr_netconnect.cpp | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/dll/shellext/netshell/shfldr_netconnect.cpp b/dll/shellext/netshell/shfldr_netconnect.cpp index cb4d167f81..64b7806e70 100644 --- a/dll/shellext/netshell/shfldr_netconnect.cpp +++ b/dll/shellext/netshell/shfldr_netconnect.cpp @@ -401,10 +401,33 @@ HRESULT WINAPI CNetworkConnections::GetAttributesOf( *rgfInOut = ~0; if (cidl == 0) + { *rgfInOut = dwNetConnectAttributes; + } else + { *rgfInOut = dwNetConnectItemAttributes; + while (cidl > 0 && *apidl) + { + const VALUEStruct * val; + NETCON_PROPERTIES * pProperties; + + val = _ILGetValueStruct(*apidl); + if (!val) + continue; + + if (val->pItem->GetProperties(&pProperties) != S_OK) + continue; + + if (!(pProperties->dwCharacter & NCCF_ALLOW_RENAME)) + *rgfInOut &= ~SFGAO_CANRENAME; + + apidl++; + cidl--; + } + } + /* make sure SFGAO_VALIDATE is cleared, some apps depend on that */ *rgfInOut &= ~SFGAO_VALIDATE;

5 years, 10 months

02/06: [NETSHELL] CNetworkConnections: SetNameOf should always return a new pidl on success. CORE-14116

by Giannis Adamopoulos

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=91119080bc8011a204d01… commit 91119080bc8011a204d01d061d38d11a1ccca731 Author: Giannis Adamopoulos <gadamopoulos(a)reactos.org> AuthorDate: Sun Nov 11 12:29:20 2018 +0200 Commit: Giannis Adamopoulos <gadamopoulos(a)reactos.org> CommitDate: Sun Nov 11 20:28:29 2018 +0200 [NETSHELL] CNetworkConnections: SetNameOf should always return a new pidl on success. CORE-14116 --- dll/shellext/netshell/shfldr_netconnect.cpp | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/dll/shellext/netshell/shfldr_netconnect.cpp b/dll/shellext/netshell/shfldr_netconnect.cpp index d293edb73e..cb4d167f81 100644 --- a/dll/shellext/netshell/shfldr_netconnect.cpp +++ b/dll/shellext/netshell/shfldr_netconnect.cpp @@ -534,6 +534,7 @@ HRESULT WINAPI CNetworkConnections::SetNameOf ( LPCOLESTR lpName, DWORD dwFlags, PITEMID_CHILD * pPidlOut) { const VALUEStruct * val; + HRESULT hr; val = _ILGetValueStruct(pidl); if (!val) @@ -542,7 +543,14 @@ HRESULT WINAPI CNetworkConnections::SetNameOf ( if (!val->pItem) return E_FAIL; - return val->pItem->Rename(lpName); + hr = val->pItem->Rename(lpName); + if (FAILED(hr)) + return hr; + + /* The pidl hasn't changed */ + *pPidlOut = ILClone(pidl); + + return S_OK; } HRESULT WINAPI CNetworkConnections::GetDefaultSearchGUID(GUID * pguid)

5 years, 10 months

01/06: [SHELL32] CDefView: Don't assume that SetNameOf always works properly so initialize pidlNew to NULL before CORE-14116

by Giannis Adamopoulos

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bcd309cb7ad3a6f1008a8… commit bcd309cb7ad3a6f1008a8b54f5e4e248e7593bba Author: Giannis Adamopoulos <gadamopoulos(a)reactos.org> AuthorDate: Sun Nov 11 12:27:55 2018 +0200 Commit: Giannis Adamopoulos <gadamopoulos(a)reactos.org> CommitDate: Sun Nov 11 20:28:27 2018 +0200 [SHELL32] CDefView: Don't assume that SetNameOf always works properly so initialize pidlNew to NULL before CORE-14116 --- dll/win32/shell32/CDefView.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/shell32/CDefView.cpp b/dll/win32/shell32/CDefView.cpp index 0032366568..640bb143ff 100644 --- a/dll/win32/shell32/CDefView.cpp +++ b/dll/win32/shell32/CDefView.cpp @@ -1860,7 +1860,7 @@ LRESULT CDefView::OnNotify(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandl LVITEMW lvItem; pidl = _PidlByItem(lpdi->item); - PITEMID_CHILD pidlNew; + PITEMID_CHILD pidlNew = NULL; hr = m_pSFParent->SetNameOf(0, pidl, lpdi->item.pszText, SHGDN_INFOLDER, &pidlNew); if (SUCCEEDED(hr) && pidlNew)

5 years, 10 months

01/01: [FLTMC] Add volumes usage info

by Ged Murphy

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f66f58991cdfe967b06dc… commit f66f58991cdfe967b06dcadebf266344671f5cd6 Author: Ged Murphy <gedmurphy(a)reactos.org> AuthorDate: Sun Nov 11 18:05:47 2018 +0000 Commit: Ged Murphy <gedmurphy(a)reactos.org> CommitDate: Sun Nov 11 18:05:47 2018 +0000 [FLTMC] Add volumes usage info --- base/applications/fltmc/fltmc.cpp | 2 +- base/applications/fltmc/lang/en-US.rc | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/base/applications/fltmc/fltmc.cpp b/base/applications/fltmc/fltmc.cpp index 3220a6e863..689efa3cdc 100644 --- a/base/applications/fltmc/fltmc.cpp +++ b/base/applications/fltmc/fltmc.cpp @@ -420,7 +420,7 @@ int wmain(int argc, WCHAR *argv[]) else { LoadAndPrintString(IDS_USAGE_VOLUMES); - wprintf(L"fltmc.exe volumes [name]\n\n"); + wprintf(L"fltmc.exe volumes\n\n"); } } diff --git a/base/applications/fltmc/lang/en-US.rc b/base/applications/fltmc/lang/en-US.rc index 721855ef2c..728063f3bb 100644 --- a/base/applications/fltmc/lang/en-US.rc +++ b/base/applications/fltmc/lang/en-US.rc @@ -5,11 +5,14 @@ BEGIN IDS_USAGE "\nValid commands :\n\ load Loads a Filter driver\n\ unload Unloads a Filter driver\n\ - filters Lists the Filters currently registered in the system\n\n" + filters Lists the Filters currently registered in the system\n\ + volumes Lists all volumes\n\n" + IDS_USAGE_LOAD "Loads a filter driver\n" IDS_USAGE_UNLOAD "Unloads a filter driver\n" IDS_USAGE_FILTERS "Lists all registered filters\n" + IDS_USAGE_VOLUMES "Lists all volumes\n" END STRINGTABLE

5 years, 10 months

← Newer
1
...
15
16
17
18
19
20
21
...
25
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2018