Ros-diffs June 2016

ros-diffs@reactos.org

17 participants
228 discussions

[ekohl] 71648: [SC] Add GetDisplayName command.

by ekohl＠svn.reactos.org

Author: ekohl Date: Thu Jun 16 19:47:50 2016 New Revision: 71648 URL: http://svn.reactos.org/svn/reactos?rev=71648&view=rev Log: [SC] Add GetDisplayName command. Added: trunk/reactos/base/applications/sc/name.c (with props) Modified: trunk/reactos/base/applications/sc/CMakeLists.txt trunk/reactos/base/applications/sc/sc.c trunk/reactos/base/applications/sc/sc.h trunk/reactos/base/applications/sc/usage.c Modified: trunk/reactos/base/applications/sc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sc/CMake… ============================================================================== --- trunk/reactos/base/applications/sc/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/sc/CMakeLists.txt [iso-8859-1] Thu Jun 16 19:47:50 2016 @@ -9,6 +9,7 @@ description.c failure.c misc.c + name.c print.c query.c sc.c Added: trunk/reactos/base/applications/sc/name.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sc/name.… ============================================================================== --- trunk/reactos/base/applications/sc/name.c (added) +++ trunk/reactos/base/applications/sc/name.c [iso-8859-1] Thu Jun 16 19:47:50 2016 @@ -0,0 +1,75 @@ +/* + * PROJECT: ReactOS Services + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/applications/sc/name.c + * PURPOSE: + * COPYRIGHT: Copyright 2016 Eric Kohl + * + */ + +#include "sc.h" + +BOOL GetDisplayName(LPCTSTR ServiceName) +{ + SC_HANDLE hManager = NULL; + BOOL bResult = TRUE; + DWORD BufferSize = 0; + LPTSTR pBuffer = NULL; + + hManager = OpenSCManager(NULL, + NULL, + SC_MANAGER_CONNECT); + if (hManager == NULL) + { + _tprintf(_T("[SC] OpenSCManager FAILED %lu:\n\n"), GetLastError()); + bResult = FALSE; + goto done; + } + + if (!GetServiceDisplayName(hManager, + ServiceName, + NULL, + &BufferSize)) + { + if (BufferSize == 0) + { + _tprintf(_T("[SC] GetServiceDisplayName FAILED %lu:\n\n"), GetLastError()); + bResult = FALSE; + goto done; + } + } + + pBuffer = HeapAlloc(GetProcessHeap(), 0, (BufferSize + 1) * sizeof(TCHAR)); + if (pBuffer == NULL) + { + SetLastError(ERROR_OUTOFMEMORY); + _tprintf(_T("[SC] HeapAlloc FAILED %lu:\n\n"), GetLastError()); + bResult = FALSE; + goto done; + } + + BufferSize++; + if (!GetServiceDisplayName(hManager, + ServiceName, + pBuffer, + &BufferSize)) + { + _tprintf(_T("[SC] GetServiceDisplayName FAILED %lu:\n\n"), GetLastError()); + bResult = FALSE; + goto done; + } + + _tprintf(_T("[SC] GetServiceDisplayName SUCCESS Name = %s\n"), pBuffer); + +done: + if (bResult == FALSE) + ReportLastError(); + + if (pBuffer != NULL) + HeapFree(GetProcessHeap(), 0, pBuffer); + + if (hManager) + CloseServiceHandle(hManager); + + return bResult; +} Propchange: trunk/reactos/base/applications/sc/name.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/sc/sc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sc/sc.c?… ============================================================================== --- trunk/reactos/base/applications/sc/sc.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/sc/sc.c [iso-8859-1] Thu Jun 16 19:47:50 2016 @@ -272,6 +272,18 @@ { SetFailure(ServiceArgs, ArgCount); } + else if (!lstrcmpi(Command, _T("GetDisplayName"))) + { + if (ArgCount > 0) + { + ServiceName = *ServiceArgs++; + ArgCount--; + + GetDisplayName(ServiceName); + } + else + GetDisplayNameUsage(); + } else { MainUsage(); Modified: trunk/reactos/base/applications/sc/sc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sc/sc.h?… ============================================================================== --- trunk/reactos/base/applications/sc/sc.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/sc/sc.h [iso-8859-1] Thu Jun 16 19:47:50 2016 @@ -45,6 +45,7 @@ BOOL SetDescription(LPCTSTR ServiceName, LPCTSTR Description); BOOL QueryFailure(LPCTSTR ServiceName); BOOL SetFailure(LPCTSTR *ServiceArgs, INT ArgCount); +BOOL GetDisplayName(LPCTSTR ServiceName); /* print and error functions */ VOID PrintService(LPCTSTR ServiceName, LPSERVICE_STATUS_PROCESS pStatus, BOOL bExtended); @@ -83,5 +84,6 @@ VOID SetDescriptionUsage(VOID); VOID SetConfigUsage(VOID); VOID SetFailureUsage(VOID); +VOID GetDisplayNameUsage(VOID); #endif /* _SC_PCH_ */ Modified: trunk/reactos/base/applications/sc/usage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sc/usage… ============================================================================== --- trunk/reactos/base/applications/sc/usage.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/sc/usage.c [iso-8859-1] Thu Jun 16 19:47:50 2016 @@ -43,8 +43,8 @@ _T("\t create : Creates a service (adds it to the registry).\n") _T("\t control : Sends a control to a service.\n") _T("\t sdshow : Displays a service's security descriptor.\n") - _T("\t sdset : Sets a service's security descriptor.\n")); -// "\t GetDisplayName : Gets the DisplayName for a service.\n") + _T("\t sdset : Sets a service's security descriptor.\n") + _T("\t GetDisplayName : Gets the DisplayName for a service.\n")); // "\t GetKeyName : Gets the ServiceKeyName for a service.\n") // "\t EnumDepend : Enumerates Service Dependencies.\n") // "\n") @@ -262,3 +262,11 @@ _T(" Valid actions are <run|restart|reboot> >\n") _T(" (Must be used in conjunction with the reset= option)\n")); } + +VOID GetDisplayNameUsage(VOID) +{ + _tprintf(_T("DESCRIPTION:\n") + _T(" Gets the display name associated with a particular service\n") + _T("USAGE:\n") + _T(" sc <server> GetDisplayName <service key name> <bufsize>\n")); +}

8 years, 7 months

[apriyadarshi] 71647: - Fixed CMakeLists issues reported by hbelusca - Fixed ROS name issue reported by hbelusca - Handled non fatal device error interrupts - AhciProcessIO Implemented - code clean

by apriyadarshi＠svn.reactos.org

Author: apriyadarshi Date: Thu Jun 16 17:02:55 2016 New Revision: 71647 URL: http://svn.reactos.org/svn/reactos?rev=71647&view=rev Log: - Fixed CMakeLists issues reported by hbelusca - Fixed ROS name issue reported by hbelusca - Handled non fatal device error interrupts - AhciProcessIO Implemented - code clean Modified: branches/GSoC_2016/AHCI/drivers/storage/CMakeLists.txt branches/GSoC_2016/AHCI/drivers/storage/storahci/CMakeLists.txt branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.c branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.h branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.inf Modified: branches/GSoC_2016/AHCI/drivers/storage/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/AHCI/drivers/storage/… ============================================================================== --- branches/GSoC_2016/AHCI/drivers/storage/CMakeLists.txt [iso-8859-1] (original) +++ branches/GSoC_2016/AHCI/drivers/storage/CMakeLists.txt [iso-8859-1] Thu Jun 16 17:02:55 2016 @@ -6,3 +6,4 @@ add_subdirectory(ide) add_subdirectory(port) add_subdirectory(scsiport) +add_subdirectory(storahci) Modified: branches/GSoC_2016/AHCI/drivers/storage/storahci/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/AHCI/drivers/storage/… ============================================================================== --- branches/GSoC_2016/AHCI/drivers/storage/storahci/CMakeLists.txt [iso-8859-1] (original) +++ branches/GSoC_2016/AHCI/drivers/storage/storahci/CMakeLists.txt [iso-8859-1] Thu Jun 16 17:02:55 2016 @@ -1,27 +1,10 @@ - -set_cpp() - -include_directories( - BEFORE ${CMAKE_CURRENT_SOURCE_DIR} - inc) - -#add_definitions(-DDEBUG) +add_definitions(-DDEBUG) list(APPEND SOURCE - storahci.cpp - ros_glue/ros_glue.cpp - stdafx.h) + storahci.c) add_library(storahci SHARED ${SOURCE} storahci.rc) -if(NOT MSVC) - add_target_compile_flags(storahci "-Wno-narrowing") - if(NOT CMAKE_C_COMPILER_ID STREQUAL "Clang") - add_target_compile_flags(storahci "-Wno-unused-but-set-variable") - endif() -endif() - -add_pch(storahci stdafx.h SOURCE) set_module_type(storahci kernelmodedriver) add_importlibs(storahci storport ntoskrnl hal) add_cd_file(TARGET storahci DESTINATION reactos/system32/drivers NO_CAB FOR all) Modified: branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/AHCI/drivers/storage/… ============================================================================== --- branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.c [iso-8859-1] (original) +++ branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.c [iso-8859-1] Thu Jun 16 17:02:55 2016 @@ -216,19 +216,80 @@ * * @param PortExtension * - * @return - * return TRUE Indicates the interrupt was handled correctly - * return FALSE Indicates something went wrong - */ -BOOLEAN + */ +VOID AhciInterruptHandler ( __in PAHCI_PORT_EXTENSION PortExtension ) { + ULONG IS; + AHCI_INTERRUPT_STATUS PxIS; + AHCI_INTERRUPT_STATUS PxISMasked; + PAHCI_ADAPTER_EXTENSION AdapterExtension; + DebugPrint("AhciInterruptHandler()\n"); DebugPrint("\tPort Number: %d\n", PortExtension->PortNumber); - return FALSE; + AdapterExtension = PortExtension->AdapterExtension; + NT_ASSERT(IsPortValid(AdapterExtension, PortExtension->PortNumber)); + + // 5.5.3 + // 1. Software determines the cause of the interrupt by reading the PxIS register. + // It is possible for multiple bits to be set + // 2. Software clears appropriate bits in the PxIS register corresponding to the cause of the interrupt. + // 3. Software clears the interrupt bit in IS.IPS corresponding to the port. + // 4. If executing non-queued commands, software reads the PxCI register, and compares the current value to + // the list of commands previously issued by software that are still outstanding. + // If executing native queued commands, software reads the PxSACT register and compares the current + // value to the list of commands previously issued by software. + // Software completes with success any outstanding command whose corresponding bit has been cleared in + // the respective register. PxCI and PxSACT are volatile registers; software should only use their values + // to determine commands that have completed, not to determine which commands have previously been issued. + // 5. If there were errors, noted in the PxIS register, software performs error recovery actions (see section 6.2.2). + PxISMasked.Status = 0; + PxIS.Status = StorPortReadRegisterUlong(AdapterExtension, &PortExtension->Port->IS); + + // 6.2.2 + // Fatal Error + // signified by the setting of PxIS.HBFS, PxIS.HBDS, PxIS.IFS, or PxIS.TFES + if (PxIS.HBFS || PxIS.HBDS || PxIS.IFS || PxIS.TFES) + { + // In this state, the HBA shall not issue any new commands nor acknowledge DMA Setup FISes to process + // any native command queuing commands. To recover, the port must be restarted + // To detect an error that requires software recovery actions to be performed, + // software should check whether any of the following status bits are set on an interrupt: + // PxIS.HBFS, PxIS.HBDS, PxIS.IFS, and PxIS.TFES. If any of these bits are set, + // software should perform the appropriate error recovery actions based on whether + // non-queued commands were being issued or native command queuing commands were being issued. + + DebugPrint("\tFata Error: %x\n", PxIS.Status); + } + + // Normal Command Completion + // 3.3.5 + // A D2H Register FIS has been received with the âIâ bit set, and has been copied into system memory. + PxISMasked.DHRS = PxIS.DHRS; + // A PIO Setup FIS has been received with the âIâ bit set, it has been copied into system memory. + PxISMasked.PSS = PxIS.PSS; + // A DMA Setup FIS has been received with the âIâ bit set and has been copied into system memory. + PxISMasked.DSS = PxIS.DSS; + // A Set Device Bits FIS has been received with the âIâ bit set and has been copied into system memory/ + PxISMasked.SDBS = PxIS.SDBS; + // A PRD with the âIâ bit set has transferred all of its data. + PxISMasked.DPS = PxIS.DPS; + + if (PxISMasked.Status != 0) + { + StorPortWriteRegisterUlong(AdapterExtension, &PortExtension->Port->IS, PxISMasked.Status); + } + + // 10.7.1.1 + // Clear port interrupt + // It is set by the level of the virtual interrupt line being a set, and cleared by a write of â1â from the software. + IS = (1 << PortExtension->PortNumber); + StorPortWriteRegisterUlong(AdapterExtension, AdapterExtension->IS, IS); + + return; }// -- AhciInterruptHandler(); /** @@ -275,6 +336,8 @@ if ((portPending & (0x1 << nextPort)) == 0) continue; + + NT_ASSERT(IsPortValid(AdapterExtension, nextPort)); if ((nextPort == adapterExtension->LastInterruptPort) || (adapterExtension->PortExtension[nextPort].IsActive == FALSE)) @@ -284,7 +347,11 @@ // we can assign this interrupt to this port adapterExtension->LastInterruptPort = nextPort; - return AhciInterruptHandler(&adapterExtension->PortExtension[nextPort]); + AhciInterruptHandler(&adapterExtension->PortExtension[nextPort]); + + // interrupt belongs to this device + // should always return TRUE + return TRUE; } DebugPrint("\tSomething went wrong"); @@ -341,7 +408,7 @@ { Srb->SrbStatus = SRB_STATUS_SUCCESS; adapterExtension->StateFlags.Removed = 1; - DebugPrint("\tadapter removed\n"); + DebugPrint("\tAdapter removed\n"); } else if (pnpRequest->PnPAction == StorStopDevice) { @@ -417,6 +484,7 @@ __in ULONG PathId ) { + STOR_LOCK_HANDLE lockhandle; PAHCI_ADAPTER_EXTENSION adapterExtension; DebugPrint("AhciHwResetBus()\n"); @@ -425,7 +493,15 @@ if (IsPortValid(AdapterExtension, PathId)) { - // TODO: Reset Port + AhciZeroMemory(&lockhandle, sizeof(lockhandle)); + + // Acquire Lock + StorPortAcquireSpinLock(AdapterExtension, InterruptLock, NULL, &lockhandle); + + // TODO: Perform port reset + + // Release lock + StorPortReleaseSpinLock(AdapterExtension, &lockhandle); } return FALSE; @@ -666,6 +742,182 @@ }// -- DriverEntry(); /** + * @name AhciProcessSrb + * @not_implemented + * + * Prepare Srb for IO processing + * + * @param PortExtension + * @param Srb + * + */ +VOID +AhciProcessSrb ( + __in PAHCI_PORT_EXTENSION PortExtension, + __in PSCSI_REQUEST_BLOCK Srb + ) +{ + DebugPrint("AhciProcessSrb()\n"); + + NT_ASSERT(Srb->PathId == PortExtension->PortNumber); + + return; +}// -- AhciProcessSrb(); + +/** + * @name AhciActivatePort + * @not_implemented + * + * Program Port and populate command list + * + * @param PortExtension + * + */ +VOID +AhciActivatePort ( + __in PAHCI_PORT_EXTENSION PortExtension + ) +{ + DebugPrint("AhciActivatePort()\n"); + + return; +}// -- AhciActivatePort(); + +/** + * @name AhciProcessIO + * @implemented + * + * Acquire Exclusive lock to port, populate pending commands to command List + * program controller's port to process new commands in command list. + * + * @param AdapterExtension + * @param PathId + * @param Srb + * + */ +VOID +AhciProcessIO ( + __in PAHCI_ADAPTER_EXTENSION AdapterExtension, + __in UCHAR PathId, + __in PSCSI_REQUEST_BLOCK Srb + ) +{ + STOR_LOCK_HANDLE lockhandle; + PSCSI_REQUEST_BLOCK tmpSrb; + PAHCI_PORT_EXTENSION PortExtension; + ULONG commandSlotMask, occupiedSlots, slotIndex; + + DebugPrint("AhciProcessIO()\n"); + DebugPrint("\tPathId: %d\n", PathId); + + PortExtension = &AdapterExtension->PortExtension[PathId]; + + NT_ASSERT(PathId < MAXIMUM_AHCI_PORT_COUNT); + + // add Srb to queue + AddQueue(&PortExtension->SrbQueue, Srb); + + if (PortExtension->IsActive == FALSE) + return; // we should wait for device to get active + + AhciZeroMemory(&lockhandle, sizeof(lockhandle)); + + // Acquire Lock + StorPortAcquireSpinLock(AdapterExtension, InterruptLock, NULL, &lockhandle); + + occupiedSlots = PortExtension->OccupiedSlots; // Busy command slots for given port + commandSlotMask = (1 << AHCI_Global_Port_CAP_NCS(AdapterExtension->CAP)) - 1; // available slots mask + + commandSlotMask = (commandSlotMask & ~occupiedSlots); + if(commandSlotMask != 0) + { + // iterate over HBA port slots + for (slotIndex = 0; slotIndex <= AHCI_Global_Port_CAP_NCS(AdapterExtension->CAP); slotIndex++) + { + // find first free slot + if ((commandSlotMask & (1 << slotIndex)) != 0) + { + tmpSrb = RemoveQueue(&PortExtension->SrbQueue); + if (tmpSrb != NULL) + { + NT_ASSERT(Srb->PathId == PathId); + AhciProcessSrb(PortExtension, tmpSrb); + } + else + { + break; + } + } + else + { + break; + } + } + } + + // program HBA port + AhciActivatePort(PortExtension); + + // Release Lock + StorPortReleaseSpinLock(AdapterExtension, &lockhandle); + + return; +}// -- AhciProcessIO(); + +/** + * @name DeviceInquiryRequest + * @implemented + * + * Tells wheather given port is implemented or not + * + * @param AdapterExtension + * @param Srb + * @param Cdb + * + * @return + * return STOR status for DeviceInquiryRequest + * + * @remark + * http://www.seagate.com/staticfiles/support/disc/manuals/Interface%20manuals… + */ +ULONG +DeviceInquiryRequest ( + __in PAHCI_ADAPTER_EXTENSION AdapterExtension, + __in PSCSI_REQUEST_BLOCK Srb, + __in PCDB Cdb + ) +{ + PVOID DataBuffer; + ULONG DataBufferLength; + + DebugPrint("DeviceInquiryRequest()\n"); + + // 3.6.1 + // If the EVPD bit is set to zero, the device server shall return the standard INQUIRY data + if (Cdb->CDB6INQUIRY3.EnableVitalProductData == 0) + { + DebugPrint("\tEVPD Inquired\n"); + } + else + { + DebugPrint("\tVPD Inquired\n"); + + DataBuffer = Srb->DataBuffer; + DataBufferLength = Srb->DataTransferLength; + + if (DataBuffer == NULL) + { + return SRB_STATUS_INVALID_REQUEST; + } + + AhciZeroMemory(DataBuffer, DataBufferLength); + } + + AhciProcessIO(AdapterExtension, Srb->PathId, Srb); + return SRB_STATUS_SUCCESS; +}// -- DeviceInquiryRequest(); + +/** * @name AhciAdapterReset * @implemented * @@ -744,6 +996,8 @@ { Buffer[i] = 0; } + + return; }// -- AhciZeroMemory(); /** @@ -776,111 +1030,65 @@ }// -- IsPortValid() /** - * @name AhciProcessIO - * @not_implemented - * - * Acquire Exclusive lock to port, populate pending commands to command List - * program controller's port to process new commands in command list. - * - * @param AdapterExtension - * @param pathId + * @name AddQueue + * @implemented + * + * Add Srb to Queue + * + * @param Queue * @param Srb * - */ -VOID -AhciProcessIO ( - __in PAHCI_ADAPTER_EXTENSION AdapterExtension, - __in UCHAR pathId - ) -{ - STOR_LOCK_HANDLE lockhandle; - PAHCI_PORT_EXTENSION PortExtension; - ULONG commandSlotMask, occupiedSlots, slotIndex; - - DebugPrint("AhciProcessIO()\n"); - DebugPrint("\tPathId: %d\n", pathId); - - PortExtension = &AdapterExtension->PortExtension[pathId]; - - NT_ASSERT(pathId < MAXIMUM_AHCI_PORT_COUNT); - - if (PortExtension->IsActive == FALSE) - return; // we should wait for device to get active - - AhciZeroMemory(&lockhandle, sizeof(lockhandle)); - - // Acquire Lock - StorPortAcquireSpinLock(AdapterExtension, InterruptLock, NULL, &lockhandle); - - occupiedSlots = PortExtension->OccupiedSlots; // Busy command slots for given port - commandSlotMask = (1 << AHCI_Global_Port_CAP_NCS(AdapterExtension->CAP)) - 1; // available slots mask - - commandSlotMask = (commandSlotMask & ~occupiedSlots); - if(commandSlotMask != 0) - { - for (slotIndex = 0; slotIndex <= AHCI_Global_Port_CAP_NCS(AdapterExtension->CAP); slotIndex++) - { - // find first free slot - if ((commandSlotMask & (1 << slotIndex)) != 0) - { - // TODO: remove from queue and process it - } - } - } - - // Release Lock - StorPortReleaseSpinLock(AdapterExtension, &lockhandle); -}// -- AhciProcessIO(); - -/** - * @name DeviceInquiryRequest - * @implemented - * - * Tells wheather given port is implemented or not - * - * @param AdapterExtension - * @param Srb - * @param Cdb - * - * @return - * return STOR status for DeviceInquiryRequest - * - * @remark - * http://www.seagate.com/staticfiles/support/disc/manuals/Interface%20manuals… - */ -ULONG -DeviceInquiryRequest ( - __in PAHCI_ADAPTER_EXTENSION AdapterExtension, - __in PSCSI_REQUEST_BLOCK Srb, - __in PCDB Cdb - ) -{ - PVOID DataBuffer; - ULONG DataBufferLength; - - DebugPrint("DeviceInquiryRequest()\n"); - - // 3.6.1 - // If the EVPD bit is set to zero, the device server shall return the standard INQUIRY data - if (Cdb->CDB6INQUIRY3.EnableVitalProductData == 0) - { - DebugPrint("\tEVPD Inquired\n"); - } - else - { - DebugPrint("\tVPD Inquired\n"); - - DataBuffer = Srb->DataBuffer; - DataBufferLength = Srb->DataTransferLength; - - if (DataBuffer == NULL) - { - return SRB_STATUS_INVALID_REQUEST; - } - - AhciZeroMemory(DataBuffer, DataBufferLength); - } - - AhciProcessIO(AdapterExtension, Srb->PathId, Srb); - return SRB_STATUS_SUCCESS; -}// -- DeviceInquiryRequest(); + * @return + * return TRUE if Srb is successfully added to Queue + * + */ +__inline +BOOLEAN +AddQueue ( + __inout PAHCI_QUEUE Queue, + __in PVOID Srb + ) +{ + NT_ASSERT(Queue->Head < MAXIMUM_QUEUE_BUFFER_SIZE); + NT_ASSERT(Queue->Tail < MAXIMUM_QUEUE_BUFFER_SIZE); + + if (Queue->Head == ((Queue->Tail + 1) % MAXIMUM_QUEUE_BUFFER_SIZE)) + return FALSE; + + Queue->Buffer[Queue->Head++] = Srb; + Queue->Head %= MAXIMUM_QUEUE_BUFFER_SIZE; + + return TRUE; +}// -- AddQueue(); + +/** + * @name RemoveQueue + * @implemented + * + * Remove and return Srb from Queue + * + * @param Queue + * + * @return + * return Srb + * + */ +__inline +PVOID +RemoveQueue ( + __inout PAHCI_QUEUE Queue + ) +{ + PVOID Srb; + + NT_ASSERT(Queue->Head < MAXIMUM_QUEUE_BUFFER_SIZE); + NT_ASSERT(Queue->Tail < MAXIMUM_QUEUE_BUFFER_SIZE); + + if (Queue->Head == Queue->Tail) + return NULL; + + Srb = Queue->Buffer[Queue->Tail++]; + Queue->Tail %= MAXIMUM_QUEUE_BUFFER_SIZE; + + return Srb; +}// -- RemoveQueue(); Modified: branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/AHCI/drivers/storage/… ============================================================================== --- branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.h [iso-8859-1] (original) +++ branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.h [iso-8859-1] Thu Jun 16 17:02:55 2016 @@ -11,6 +11,7 @@ #define DEBUG 1 #define MAXIMUM_AHCI_PORT_COUNT 12 +#define MAXIMUM_QUEUE_BUFFER_SIZE 255 #define MAXIMUM_TRANSFER_LENGTH (128*1024) // 128 KB // section 3.1.2 @@ -31,6 +32,35 @@ ////////////////////////////////////////////////////////////// // ---- Support Structures --- // ////////////////////////////////////////////////////////////// + +// section 3.3.5 +typedef union _AHCI_INTERRUPT_STATUS +{ + struct + { + ULONG DHRS:1; //Device to Host Register FIS Interrupt + ULONG PSS :1; //PIO Setup FIS Interrupt + ULONG DSS :1; //DMA Setup FIS Interrupt + ULONG SDBS :1; //Set Device Bits Interrupt + ULONG UFS :1; //Unknown FIS Interrupt + ULONG DPS :1; //Descriptor Processed + ULONG PCS :1; //Port Connect Change Status + ULONG DMPS :1; //Device Mechanical Presence Status (DMPS) + ULONG Reserved :14; + ULONG PRCS :1; //PhyRdy Change Status + ULONG IPMS :1; //Incorrect Port Multiplier Status + ULONG OFS :1; //Overflow Status + ULONG Reserved2 :1; + ULONG INFS :1; //Interface Non-fatal Error Status + ULONG IFS :1; //Interface Fatal Error Status + ULONG HBDS :1; //Host Bus Data Error Status + ULONG HBFS :1; //Host Bus Fatal Error Status + ULONG TFES :1; //Task File Error Status + ULONG CPDS :1; //Cold Port Detect Status + }; + + ULONG Status; +} AHCI_INTERRUPT_STATUS; typedef struct _AHCI_FIS_DMA_SETUP { @@ -122,6 +152,13 @@ UCHAR Reserved5[4]; } AHCI_SET_DEVICE_BITS_FIS; + +typedef struct _AHCI_QUEUE +{ + PVOID Buffer[MAXIMUM_QUEUE_BUFFER_SIZE]; // because Storahci hold Srb queue of 255 size + ULONG Head; + ULONG Tail; +} AHCI_QUEUE, *PAHCI_QUEUE; ////////////////////////////////////////////////////////////// // --------------------------- // @@ -202,6 +239,7 @@ ULONG OccupiedSlots; // slots to which we have already assigned task BOOLEAN IsActive; PAHCI_PORT Port; // AHCI Port Infomation + AHCI_QUEUE SrbQueue; PAHCI_RECEIVED_FIS ReceivedFIS; PAHCI_COMMAND_HEADER CommandList; STOR_DEVICE_POWER_STATE DevicePowerState; // Device Power State @@ -274,3 +312,16 @@ __in PSCSI_REQUEST_BLOCK Srb, __in PCDB Cdb ); + +__inline +BOOLEAN +AddQueue ( + __inout PAHCI_QUEUE Queue, + __in PVOID Srb + ); + +__inline +PVOID +RemoveQueue ( + __inout PAHCI_QUEUE Queue + ); Modified: branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.inf URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/AHCI/drivers/storage/… ============================================================================== --- branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.inf [iso-8859-1] (original) +++ branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.inf [iso-8859-1] Thu Jun 16 17:02:55 2016 @@ -65,7 +65,7 @@ HKR,,TypesSupported,%REG_DWORD%,7 [Strings] -ROS = "ROS" +ROS = "ReactOS" DeviceDesc = "AHCI SATA Driver" SATA_AHCI.DeviceDesc = "Standard SATA AHCI Controller"

8 years, 7 months

[zhu] 71646: Merge changes from GsOC network branch. Last commit from the other branch added IRQ cancellation.

by zhu＠svn.reactos.org

Author: zhu Date: Thu Jun 16 15:40:32 2016 New Revision: 71646 URL: http://svn.reactos.org/svn/reactos?rev=71646&view=rev Log: Merge changes from GsOC network branch. Last commit from the other branch added IRQ cancellation. Added: branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/address.c (with props) branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/address.h (with props) branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/connection.c (with props) branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/entities.c (with props) branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/entities.h (with props) branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/information.c (with props) branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/information.h (with props) branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/interface.c (with props) branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/interface.h (with props) branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/main.c (with props) branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/ndis_lwip.c (with props) branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/ndis_lwip.h (with props) branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/precomp.h (with props) branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/stubs.c (with props) branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/tcp.c (with props) branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/tcp.h (with props) Removed: branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/DIRS branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/datalink/SOURCES branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/include/address.h branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/include/arp.h branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/include/checksum.h branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/include/datagram.h branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/include/debug.h branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/include/fileobjs.h branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/include/icmp.h branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/include/info.h branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/include/ip.h branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/include/lan.h branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/include/linux.h branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/include/lock.h branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/include/loopback.h branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/include/neighbor.h branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/include/pool.h branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/include/ports.h branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/include/precomp.h branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/include/rawip.h branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/include/receive.h branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/include/route.h branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/include/router.h branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/include/routines.h branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/include/tags.h branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/include/tcp.h branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/include/tcpcore.h branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/include/tcpdef.h branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/include/tcpip.h branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/include/ticonsts.h branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/include/tilists.h branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/include/titypes.h branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/include/transmit.h branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/include/udp.h branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/include/wait.h branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/notes.txt branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/readme.txt branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/tcpip/SOURCES branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/tcpip/ainfo.c branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/tcpip/buffer.c branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/tcpip/cinfo.c branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/tcpip/fileobjs.c branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/tcpip/info.c branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/tcpip/lock.c branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/tcpip/mockbuffer.c branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/tcpip/mocklock.c branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/tcpip/mockpool.c branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/tcpip/mockwait.c branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/tcpip/ninfo.c branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/tcpip/proto.c branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/tcpip/resource.rc branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/tcpip/tcpip.def branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/tcpip/tinfo.c branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/tcpip/wait.c branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/tests/setup.c branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/tests/stubs.tst branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/tests/tests/ipreceive.c branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/tests/tests/tigetprotocolnumber.c branches/GSoC_2016/lwIP-tcpip/sdk/lib/drivers/lwip/src/rosip.c branches/GSoC_2016/lwIP-tcpip/sdk/lib/drivers/lwip/src/rostcp.c Modified: branches/GSoC_2016/lwIP-tcpip/base/applications/network/CMakeLists.txt branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/CMakeLists.txt branches/GSoC_2016/lwIP-tcpip/sdk/lib/drivers/lwip/CMakeLists.txt branches/GSoC_2016/lwIP-tcpip/sdk/lib/drivers/lwip/src/include/lwipopts.h branches/GSoC_2016/lwIP-tcpip/sdk/lib/drivers/lwip/src/sys_arch.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/GSoC_2016/lwIP-tcpip/base/applications/network/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP-tcpip/base/appli… Modified: branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP-tcpip/drivers/ne… Removed: branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/DIRS URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP-tcpip/drivers/ne… Added: branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/address.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP-tcpip/drivers/ne… Added: branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/address.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP-tcpip/drivers/ne… Added: branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/connection.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP-tcpip/drivers/ne… Removed: branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/datalink/SOURCES URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP-tcpip/drivers/ne… Added: branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/entities.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP-tcpip/drivers/ne… Added: branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/entities.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP-tcpip/drivers/ne… Removed: branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/include/address.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP-tcpip/drivers/ne… Removed: branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/include/arp.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP-tcpip/drivers/ne… Removed: branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/include/checksum.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP-tcpip/drivers/ne… Removed: branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/include/datagram.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP-tcpip/drivers/ne… Removed: branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/include/debug.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP-tcpip/drivers/ne… Removed: branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/include/fileobjs.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP-tcpip/drivers/ne… Removed: branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/include/icmp.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP-tcpip/drivers/ne… Removed: branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/include/info.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP-tcpip/drivers/ne… Removed: branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/include/ip.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP-tcpip/drivers/ne… Removed: branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/include/lan.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP-tcpip/drivers/ne… Removed: branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/include/linux.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP-tcpip/drivers/ne… Removed: branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/include/lock.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP-tcpip/drivers/ne… Removed: branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/include/loopback.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP-tcpip/drivers/ne… Removed: branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/include/neighbor.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP-tcpip/drivers/ne… Removed: branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/include/pool.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP-tcpip/drivers/ne… Removed: branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/include/ports.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP-tcpip/drivers/ne… Removed: branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/include/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP-tcpip/drivers/ne… Removed: branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/include/rawip.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP-tcpip/drivers/ne… Removed: branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/include/receive.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP-tcpip/drivers/ne… Removed: branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/include/route.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP-tcpip/drivers/ne… Removed: branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/include/router.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP-tcpip/drivers/ne… Removed: branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/include/routines.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP-tcpip/drivers/ne… Removed: branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/include/tags.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP-tcpip/drivers/ne… Removed: branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/include/tcp.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP-tcpip/drivers/ne… Removed: branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/include/tcpcore.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP-tcpip/drivers/ne… Removed: branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/include/tcpdef.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP-tcpip/drivers/ne… Removed: branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/include/tcpip.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP-tcpip/drivers/ne… Removed: branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/include/ticonsts.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP-tcpip/drivers/ne… Removed: branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/include/tilists.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP-tcpip/drivers/ne… Removed: branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/include/titypes.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP-tcpip/drivers/ne… Removed: branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/include/transmit.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP-tcpip/drivers/ne… Removed: branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/include/udp.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP-tcpip/drivers/ne… Removed: branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/include/wait.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP-tcpip/drivers/ne… Added: branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/information.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP-tcpip/drivers/ne… Added: branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/information.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP-tcpip/drivers/ne… Added: branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/interface.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP-tcpip/drivers/ne… Added: branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/interface.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP-tcpip/drivers/ne… Added: branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/main.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP-tcpip/drivers/ne… Added: branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/ndis_lwip.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP-tcpip/drivers/ne… Added: branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/ndis_lwip.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP-tcpip/drivers/ne… Removed: branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/notes.txt URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP-tcpip/drivers/ne… Added: branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP-tcpip/drivers/ne… Removed: branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/readme.txt URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP-tcpip/drivers/ne… Added: branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/stubs.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP-tcpip/drivers/ne… Added: branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/tcp.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP-tcpip/drivers/ne… Added: branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/tcp.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP-tcpip/drivers/ne… Removed: branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/tcpip/SOURCES URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP-tcpip/drivers/ne… Removed: branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/tcpip/ainfo.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP-tcpip/drivers/ne… Removed: branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/tcpip/buffer.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP-tcpip/drivers/ne… Removed: branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/tcpip/cinfo.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP-tcpip/drivers/ne… Removed: branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/tcpip/fileobjs.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP-tcpip/drivers/ne… Removed: branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/tcpip/info.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP-tcpip/drivers/ne… Removed: branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/tcpip/lock.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP-tcpip/drivers/ne… Removed: branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/tcpip/mockbuffer.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP-tcpip/drivers/ne… Removed: branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/tcpip/mocklock.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP-tcpip/drivers/ne… Removed: branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/tcpip/mockpool.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP-tcpip/drivers/ne… Removed: branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/tcpip/mockwait.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP-tcpip/drivers/ne… Removed: branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/tcpip/ninfo.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP-tcpip/drivers/ne… Removed: branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/tcpip/proto.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP-tcpip/drivers/ne… Removed: branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/tcpip/resource.rc URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP-tcpip/drivers/ne… Removed: branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/tcpip/tcpip.def URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP-tcpip/drivers/ne… Removed: branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/tcpip/tinfo.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP-tcpip/drivers/ne… Removed: branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/tcpip/wait.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP-tcpip/drivers/ne… Removed: branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/tests/setup.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP-tcpip/drivers/ne… Removed: branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/tests/stubs.tst URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP-tcpip/drivers/ne… Removed: branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/tests/tests/ipreceive.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP-tcpip/drivers/ne… Removed: branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/tests/tests/tigetprotocolnumber.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP-tcpip/drivers/ne… Modified: branches/GSoC_2016/lwIP-tcpip/sdk/lib/drivers/lwip/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP-tcpip/sdk/lib/dr… Modified: branches/GSoC_2016/lwIP-tcpip/sdk/lib/drivers/lwip/src/include/lwipopts.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP-tcpip/sdk/lib/dr… Removed: branches/GSoC_2016/lwIP-tcpip/sdk/lib/drivers/lwip/src/rosip.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP-tcpip/sdk/lib/dr… Removed: branches/GSoC_2016/lwIP-tcpip/sdk/lib/drivers/lwip/src/rostcp.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP-tcpip/sdk/lib/dr… Modified: branches/GSoC_2016/lwIP-tcpip/sdk/lib/drivers/lwip/src/sys_arch.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP-tcpip/sdk/lib/dr…

8 years, 7 months

[ekohl] 71645: [SC] - Reorganized some commands in order to add erros and success messages. - Added error and success messages. - Enabled usage text for the failure command.

by ekohl＠svn.reactos.org

Author: ekohl Date: Wed Jun 15 21:28:33 2016 New Revision: 71645 URL: http://svn.reactos.org/svn/reactos?rev=71645&view=rev Log: [SC] - Reorganized some commands in order to add erros and success messages. - Added error and success messages. - Enabled usage text for the failure command. Modified: trunk/reactos/base/applications/sc/control.c trunk/reactos/base/applications/sc/create.c trunk/reactos/base/applications/sc/delete.c trunk/reactos/base/applications/sc/sdset.c trunk/reactos/base/applications/sc/sdshow.c trunk/reactos/base/applications/sc/start.c trunk/reactos/base/applications/sc/usage.c Modified: trunk/reactos/base/applications/sc/control.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sc/contr… ============================================================================== --- trunk/reactos/base/applications/sc/control.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/sc/control.c [iso-8859-1] Wed Jun 15 21:28:33 2016 @@ -16,9 +16,11 @@ INT ArgCount) { SC_HANDLE hSCManager = NULL; - SC_HANDLE hSc = NULL; + SC_HANDLE hService = NULL; SERVICE_STATUS Status; DWORD dwDesiredAccess = 0; + BOOL bResult = TRUE; + SERVICE_STATUS_PROCESS StatusEx; #ifdef SCDBG LPCTSTR *TmpArgs = Args; @@ -62,40 +64,50 @@ hSCManager = OpenSCManager(NULL, NULL, SC_MANAGER_CONNECT); - if (hSCManager != NULL) + if (hSCManager == NULL) { - hSc = OpenService(hSCManager, - ServiceName, - dwDesiredAccess); - if (hSc != NULL) - { - if (ControlService(hSc, - Control, - &Status)) - { - SERVICE_STATUS_PROCESS StatusEx; - - /* FIXME: lazy hack ;) */ - CopyMemory(&StatusEx, &Status, sizeof(Status)); - StatusEx.dwProcessId = 0; - StatusEx.dwServiceFlags = 0; - - PrintService(ServiceName, - &StatusEx, - FALSE); - - CloseServiceHandle(hSc); - CloseServiceHandle(hSCManager); - - return TRUE; - } - } - else - _tprintf(_T("[SC] OpenService FAILED %lu:\n\n"), GetLastError()); + _tprintf(_T("[SC] OpenSCManager FAILED %lu:\n\n"), GetLastError()); + bResult = FALSE; + goto done; } - ReportLastError(); - if (hSc) CloseServiceHandle(hSc); - if (hSCManager) CloseServiceHandle(hSCManager); - return FALSE; + hService = OpenService(hSCManager, + ServiceName, + dwDesiredAccess); + if (hService == NULL) + { + _tprintf(_T("[SC] OpenService FAILED %lu:\n\n"), GetLastError()); + bResult = FALSE; + goto done; + } + + if (!ControlService(hService, + Control, + &Status)) + { + _tprintf(_T("[SC] ControlService FAILED %lu:\n\n"), GetLastError()); + bResult = FALSE; + goto done; + } + + /* FIXME: lazy hack ;) */ + CopyMemory(&StatusEx, &Status, sizeof(Status)); + StatusEx.dwProcessId = 0; + StatusEx.dwServiceFlags = 0; + + PrintService(ServiceName, + &StatusEx, + FALSE); + +done: + if (!bResult) + ReportLastError(); + + if (hService) + CloseServiceHandle(hService); + + if (hSCManager) + CloseServiceHandle(hSCManager); + + return bResult; } Modified: trunk/reactos/base/applications/sc/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sc/creat… ============================================================================== --- trunk/reactos/base/applications/sc/create.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/sc/create.c [iso-8859-1] Wed Jun 15 21:28:33 2016 @@ -12,9 +12,9 @@ BOOL Create(LPCTSTR *ServiceArgs, INT ArgCount) { - SC_HANDLE hSCManager; - SC_HANDLE hSc; - BOOL bRet = FALSE; + SC_HANDLE hSCManager = NULL; + SC_HANDLE hService = NULL; + BOOL bRet = TRUE; INT i; INT Length; @@ -71,37 +71,44 @@ #endif hSCManager = OpenSCManager(NULL, NULL, SC_MANAGER_CREATE_SERVICE); + if (hSCManager == NULL) + { + _tprintf(_T("[SC] OpenSCManager FAILED %lu:\n\n"), GetLastError()); + bRet = FALSE; + goto done; + } - if (hSCManager != NULL) + hService = CreateService(hSCManager, + ServiceInfo.lpServiceName, + ServiceInfo.lpDisplayName, + SERVICE_ALL_ACCESS, + ServiceInfo.dwServiceType, + ServiceInfo.dwStartType, + ServiceInfo.dwErrorControl, + ServiceInfo.lpBinaryPathName, + ServiceInfo.lpLoadOrderGroup, + ServiceInfo.bTagId ? &ServiceInfo.dwTagId : NULL, + ServiceInfo.lpDependencies, + ServiceInfo.lpServiceStartName, + ServiceInfo.lpPassword); + if (hService == NULL) { - hSc = CreateService(hSCManager, - ServiceInfo.lpServiceName, - ServiceInfo.lpDisplayName, - SERVICE_ALL_ACCESS, - ServiceInfo.dwServiceType, - ServiceInfo.dwStartType, - ServiceInfo.dwErrorControl, - ServiceInfo.lpBinaryPathName, - ServiceInfo.lpLoadOrderGroup, - ServiceInfo.bTagId ? &ServiceInfo.dwTagId : NULL, - ServiceInfo.lpDependencies, - ServiceInfo.lpServiceStartName, - ServiceInfo.lpPassword); + _tprintf(_T("[SC] CreateService FAILED %lu:\n\n"), GetLastError()); + bRet = FALSE; + goto done; + } - if (hSc != NULL) - { - _tprintf(_T("[SC] CreateService SUCCESS\n")); + _tprintf(_T("[SC] CreateService SUCCESS\n\n")); - CloseServiceHandle(hSc); - bRet = TRUE; - } - else - ReportLastError(); +done: + if (bRet == FALSE) + ReportLastError(); + if (hService) + CloseServiceHandle(hService); + + if (hSCManager) CloseServiceHandle(hSCManager); - } - else - ReportLastError(); if (lpBuffer != NULL) HeapFree(GetProcessHeap(), 0, lpBuffer); Modified: trunk/reactos/base/applications/sc/delete.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sc/delet… ============================================================================== --- trunk/reactos/base/applications/sc/delete.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/sc/delete.c [iso-8859-1] Wed Jun 15 21:28:33 2016 @@ -13,6 +13,7 @@ { SC_HANDLE hSCManager = NULL; SC_HANDLE hSc = NULL; + BOOL bRet = TRUE; #ifdef SCDBG _tprintf(_T("service to delete - %s\n\n"), ServiceName); @@ -21,27 +22,39 @@ hSCManager = OpenSCManager(NULL, NULL, SC_MANAGER_CONNECT); - if (hSCManager != NULL) + if (hSCManager == NULL) { - hSc = OpenService(hSCManager, ServiceName, DELETE); - if (hSc != NULL) - { - if (DeleteService(hSc)) - { - _tprintf(_T("[SC] DeleteService SUCCESS\n")); - - CloseServiceHandle(hSc); - CloseServiceHandle(hSCManager); - - return TRUE; - } - } + _tprintf(_T("[SC] OpenSCManager FAILED %lu:\n\n"), GetLastError()); + bRet = FALSE; + goto done; } - ReportLastError(); + hSc = OpenService(hSCManager, ServiceName, DELETE); + if (hSc == NULL) + { + _tprintf(_T("[SC] OpenService FAILED %lu:\n\n"), GetLastError()); + bRet = FALSE; + goto done; + } - if (hSc) CloseServiceHandle(hSc); - if (hSCManager) CloseServiceHandle(hSCManager); + if (!DeleteService(hSc)) + { + _tprintf(_T("[SC] DeleteService FAILED %lu:\n\n"), GetLastError()); + bRet = FALSE; + goto done; + } - return FALSE; + _tprintf(_T("[SC] DeleteService SUCCESS\n\n")); + +done: + if (bRet == FALSE) + ReportLastError(); + + if (hSc) + CloseServiceHandle(hSc); + + if (hSCManager) + CloseServiceHandle(hSCManager); + + return bRet; } Modified: trunk/reactos/base/applications/sc/sdset.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sc/sdset… ============================================================================== --- trunk/reactos/base/applications/sc/sdset.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/sc/sdset.c [iso-8859-1] Wed Jun 15 21:28:33 2016 @@ -26,6 +26,7 @@ SC_MANAGER_CONNECT); if (hManager == NULL) { + _tprintf(_T("[SC] OpenSCManager FAILED %lu:\n\n"), GetLastError()); bResult = FALSE; goto done; } @@ -33,6 +34,7 @@ hService = OpenService(hManager, ServiceName, WRITE_DAC); if (hService == NULL) { + _tprintf(_T("[SC] OpenService FAILED %lu:\n\n"), GetLastError()); bResult = FALSE; goto done; } @@ -42,6 +44,7 @@ &pSecurityDescriptor, &ulSecurityDescriptorSize)) { + _tprintf(_T("[SC] ConvertStringSecurityDescriptorToSecurityDescriptor FAILED %lu:\n\n"), GetLastError()); bResult = FALSE; goto done; } @@ -50,6 +53,7 @@ DACL_SECURITY_INFORMATION, pSecurityDescriptor)) { + _tprintf(_T("[SC] SetServiceObjectSecurity FAILED %lu:\n\n"), GetLastError()); bResult = FALSE; goto done; } Modified: trunk/reactos/base/applications/sc/sdshow.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sc/sdsho… ============================================================================== --- trunk/reactos/base/applications/sc/sdshow.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/sc/sdshow.c [iso-8859-1] Wed Jun 15 21:28:33 2016 @@ -27,6 +27,7 @@ SC_MANAGER_CONNECT); if (hManager == NULL) { + _tprintf(_T("[SC] OpenSCManager FAILED %lu:\n\n"), GetLastError()); bResult = FALSE; goto done; } @@ -34,6 +35,7 @@ hService = OpenService(hManager, ServiceName, READ_CONTROL); if (hService == NULL) { + _tprintf(_T("[SC] OpenService FAILED %lu:\n\n"), GetLastError()); bResult = FALSE; goto done; } @@ -46,6 +48,7 @@ { if (cbBytesNeeded == 0) { + _tprintf(_T("[SC] QueryServiceObjectSecurity FAILED %lu:\n\n"), GetLastError()); bResult = FALSE; goto done; } @@ -55,6 +58,7 @@ if (pSecurityDescriptor == NULL) { SetLastError(ERROR_OUTOFMEMORY); + _tprintf(_T("[SC] HeapAlloc FAILED %lu:\n\n"), GetLastError()); bResult = FALSE; goto done; } @@ -65,6 +69,7 @@ cbBytesNeeded, &cbBytesNeeded)) { + _tprintf(_T("[SC] QueryServiceObjectSecurity FAILED %lu:\n\n"), GetLastError()); bResult = FALSE; goto done; } @@ -75,6 +80,7 @@ &pStringBuffer, NULL)) { + _tprintf(_T("[SC] ConvertSecurityDescriptorToStringSecurityDescriptor FAILED %lu:\n\n"), GetLastError()); bResult = FALSE; goto done; } Modified: trunk/reactos/base/applications/sc/start.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sc/start… ============================================================================== --- trunk/reactos/base/applications/sc/start.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/sc/start.c [iso-8859-1] Wed Jun 15 21:28:33 2016 @@ -14,6 +14,7 @@ SC_HANDLE hSCManager = NULL; SC_HANDLE hSc = NULL; LPSERVICE_STATUS_PROCESS pServiceInfo = NULL; + BOOL bResult = TRUE; #ifdef SCDBG LPCTSTR *TmpArgs = ServiceArgs; @@ -34,28 +35,33 @@ SC_MANAGER_CONNECT); if (hSCManager == NULL) { - ReportLastError(); - return FALSE; + _tprintf(_T("[SC] OpenSCManager FAILED %lu:\n\n"), GetLastError()); + bResult = FALSE; + goto done; } hSc = OpenService(hSCManager, ServiceName, SERVICE_START | SERVICE_QUERY_STATUS); - if (hSc == NULL) - goto fail; + { + _tprintf(_T("[SC] OpenService FAILED %lu:\n\n"), GetLastError()); + bResult = FALSE; + goto done; + } if (!ArgCount) { ServiceArgs = NULL; } - if (! StartService(hSc, - ArgCount, - ServiceArgs)) + if (!StartService(hSc, + ArgCount, + ServiceArgs)) { _tprintf(_T("[SC] StartService FAILED %lu:\n\n"), GetLastError()); - goto fail; + bResult = FALSE; + goto done; } pServiceInfo = QueryService(ServiceName); @@ -64,18 +70,19 @@ PrintService(ServiceName, pServiceInfo, TRUE); + + HeapFree(GetProcessHeap(), 0, pServiceInfo); } - HeapFree(GetProcessHeap(), 0, pServiceInfo); - CloseServiceHandle(hSc); - CloseServiceHandle(hSCManager); +done: + if (bResult == FALSE) + ReportLastError(); - return TRUE; + if (hSc) + CloseServiceHandle(hSc); -fail: - ReportLastError(); - if (hSc) CloseServiceHandle(hSc); - if (hSCManager) CloseServiceHandle(hSCManager); - return FALSE; + if (hSCManager) + CloseServiceHandle(hSCManager); + return bResult; } Modified: trunk/reactos/base/applications/sc/usage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sc/usage… ============================================================================== --- trunk/reactos/base/applications/sc/usage.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/sc/usage.c [iso-8859-1] Wed Jun 15 21:28:33 2016 @@ -35,7 +35,7 @@ _T("\t stop : Sends a STOP request to a service.\n") _T("\t config : Changes the configuration of a service (persistant).\n") _T("\t description : Changes the description of a service.\n") -// "\t failure : Changes the actions taken by a service upon failure.\n" + _T("\t failure : Changes the actions taken by a service upon failure.\n") _T("\t qc : Queries the configuration information for a service.\n") _T("\t qdescription : Queries the description for a service.\n") _T("\t qfailure : Queries the actions taken by a service upon failure.\n") @@ -171,9 +171,9 @@ VOID ControlUsage(VOID) { _tprintf(_T("DESCRIPTION:\n") - _T(" Sends a CONTROL control request to a service.\n") - _T("USAGE:\n") - _T(" sc <server> control [service name] <value>\n")); + _T(" Sends a CONTROL control request to a service.\n") + _T("USAGE:\n") + _T(" sc <server> control [service name] <value>\n")); } VOID SdShowUsage(VOID)

8 years, 7 months

[zhu] 71644: Implemented IRQ cancelling for listen() and connect() calls.

by zhu＠svn.reactos.org

Author: zhu Date: Wed Jun 15 19:10:40 2016 New Revision: 71644 URL: http://svn.reactos.org/svn/reactos?rev=71644&view=rev Log: Implemented IRQ cancelling for listen() and connect() calls. Modified: branches/GSoC_2016/lwIP/drivers/network/tcpip/address.c branches/GSoC_2016/lwIP/drivers/network/tcpip/main.c Modified: branches/GSoC_2016/lwIP/drivers/network/tcpip/address.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP/drivers/network/… ============================================================================== --- branches/GSoC_2016/lwIP/drivers/network/tcpip/address.c [iso-8859-1] (original) +++ branches/GSoC_2016/lwIP/drivers/network/tcpip/address.c [iso-8859-1] Wed Jun 15 19:10:40 2016 @@ -26,6 +26,100 @@ /* The list of shared addresses */ static KSPIN_LOCK AddressListLock; static LIST_ENTRY AddressListHead; + +NTSTATUS +PrepareIrpForCancel( + PIRP Irp, + PDRIVER_CANCEL CancelRoutine +) +{ + KIRQL OldIrql; + + DPRINT1("Prepare for cancel\n"); + + IoAcquireCancelSpinLock(&OldIrql); + + if (!Irp->Cancel) + { + IoSetCancelRoutine(Irp, CancelRoutine); + IoReleaseCancelSpinLock(OldIrql); + return STATUS_SUCCESS; + } + + IoReleaseCancelSpinLock(OldIrql); + + Irp->IoStatus.Status = STATUS_CANCELLED; + Irp->IoStatus.Information = 0; + + return Irp->IoStatus.Status; +} + +VOID +NTAPI +CancelRequestRoutine( + _Inout_ struct _DEVICE_OBJECT *DeviceObject, + _Inout_ _IRQL_uses_cancel_ struct _IRP *Irp +) +{ + PIO_STACK_LOCATION IrpSp; + PADDRESS_FILE AddressFile; + UCHAR MinorFunction; + KIRQL OldIrql; + + DPRINT1("IRP Cancel\n"); + + IoReleaseCancelSpinLock(Irp->CancelIrql); + + IrpSp = IoGetCurrentIrpStackLocation(Irp); + AddressFile = (PADDRESS_FILE)IrpSp->FileObject->FsContext; + MinorFunction = IrpSp->MinorFunction; + + Irp->IoStatus.Status = STATUS_CANCELLED; + Irp->IoStatus.Information = 0; + + switch(MinorFunction) + { + case TDI_RECEIVE: + goto TCP_CANCEL; + case TDI_RECEIVE_DATAGRAM: + DPRINT1("TDI_RECEIVE_DATAGRAM cancelling is handled within TcpIpReceiveDatagram()\n"); + goto DGRAM_CANCEL; + break; + case TDI_SEND: + goto TCP_CANCEL; + case TDI_SEND_DATAGRAM: + goto DGRAM_CANCEL; + case TDI_LISTEN: + goto TCP_CANCEL; + case TDI_CONNECT: + goto TCP_CANCEL; + case TDI_DISCONNECT: + goto TCP_CANCEL; + default: + DPRINT1("Invalid MinorFunction for cancelling IRP\n"); + return; + } + +TCP_CANCEL: + if (AddressFile->ConnectionContext) + { + tcp_close(AddressFile->ConnectionContext->lwip_tcp_pcb); + DPRINT1("TCP_CANCEL\n"); + goto FINISH; + } +DGRAM_CANCEL: + DPRINT1("DGRAM_CANCEL\n"); + +FINISH: + IoAcquireCancelSpinLock(&OldIrql); + IoSetCancelRoutine(Irp, NULL); + IoReleaseCancelSpinLock(OldIrql); + + IoCompleteRequest(Irp, IO_NETWORK_INCREMENT); + + DPRINT1("\n CancelRequestRoutine\n Exiting\n"); + return; +} void TcpIpInitializeAddresses(void) @@ -149,10 +243,40 @@ err_t err) { PIRP Irp; + PIO_STACK_LOCATION IrpSp; + KIRQL OldIrql; + PADDRESS_FILE AddressFile; DPRINT1("lwIP TCP Accept Callback\n"); Irp = (PIRP)arg; + IrpSp = IoGetCurrentIrpStackLocation(Irp); + AddressFile = (PADDRESS_FILE)IrpSp->FileObject->FsContext; + + IoAcquireCancelSpinLock(&OldIrql); + IoSetCancelRoutine(Irp, NULL); + Irp->Cancel = FALSE; + IoReleaseCancelSpinLock(OldIrql); + + DPRINT1("\nnewpcb %08x\n", newpcb); + if (AddressFile->ConnectionContext) + { + if (AddressFile->ConnectionContext->lwip_tcp_pcb) + { + DPRINT1("\nlwip_tcp_pcb %08x\n", AddressFile->ConnectionContext->lwip_tcp_pcb); + } + else + { + DPRINT1("\nlwip_tcp_pcb is NULL\n"); + } + } + else + { + DPRINT1("ConnectionContext is NULL\n"); + } + + AddressFile->ConnectionContext->lwip_tcp_pcb = newpcb; + Irp->IoStatus.Status = STATUS_SUCCESS; IoCompleteRequest(Irp, IO_NETWORK_INCREMENT); @@ -212,10 +336,38 @@ err_t err) { PIRP Irp; + PIO_STACK_LOCATION IrpSp; + KIRQL OldIrql; + PADDRESS_FILE AddressFile; DPRINT1("lwIP TCP Connected Callback\n"); Irp = (PIRP)arg; + IrpSp = IoGetCurrentIrpStackLocation(Irp); + AddressFile = (PADDRESS_FILE)IrpSp->FileObject->FsContext; + + IoAcquireCancelSpinLock(&OldIrql); + IoSetCancelRoutine(Irp, NULL); + Irp->Cancel = FALSE; + IoReleaseCancelSpinLock(OldIrql); + + DPRINT1("\ntpcb %08x\n", tpcb); + if (AddressFile->ConnectionContext) + { + if (AddressFile->ConnectionContext->lwip_tcp_pcb) + { + DPRINT1("\nlwip_tcp_pcb %08x\n", AddressFile->ConnectionContext->lwip_tcp_pcb); + } + else + { + DPRINT1("\nlwip_tcp_pcb is NULL\n"); + } + } + else + { + DPRINT1("ConnectionContext is NULL\n"); + } + Irp->IoStatus.Status = STATUS_SUCCESS; IoCompleteRequest(Irp, IO_NETWORK_INCREMENT); @@ -410,6 +562,10 @@ PTCP_CONTEXT Context; Context = ExAllocatePoolWithTag(NonPagedPool, sizeof(*Context), TAG_ADDRESS_FILE); + if (!Context) + { + return STATUS_NO_MEMORY; + } if (Protocol != IPPROTO_TCP) { @@ -456,7 +612,7 @@ tcp_close(AddressFile->ConnectionContext->lwip_tcp_pcb); ExFreePoolWithTag(AddressFile->ConnectionContext, TAG_ADDRESS_FILE); } - else + else if (AddressFile->Protocol == IPPROTO_RAW) raw_remove(AddressFile->lwip_raw_pcb); /* Remove from the list and free the structure */ @@ -585,6 +741,8 @@ DPRINT1("\n Local Address\n Address: %08x\n Port: %04x\n", AddressFile->ConnectionContext->lwip_tcp_pcb->local_ip, AddressFile->ConnectionContext->lwip_tcp_pcb->local_port); + + PrepareIrpForCancel(Irp, CancelRequestRoutine); lwip_err = tcp_connect(AddressFile->ConnectionContext->lwip_tcp_pcb, (ip_addr_t *)&SocketAddressInRemote->sin_addr.s_addr, @@ -768,7 +926,8 @@ _Inout_ PIRP Irp) { PIO_STACK_LOCATION IrpSp; - ADDRESS_FILE *AddressFile; + PTCP_CONTEXT Context; + PADDRESS_FILE AddressFile; IrpSp = IoGetCurrentIrpStackLocation(Irp); if ((ULONG)IrpSp->FileObject->FsContext2 != TDI_TRANSPORT_ADDRESS_FILE) @@ -777,14 +936,24 @@ } AddressFile = IrpSp->FileObject->FsContext; - if (AddressFile->Protocol != IPPROTO_TCP) { DPRINT1("Received TDI_DISASSOCIATE_ADDRESS for non-TCP protocol\n"); return STATUS_INVALID_ADDRESS; } - /* NO-OP because we need the address to deallocate the port when the connection closes */ + Context = AddressFile->ConnectionContext; + if (!Context) + { + DPRINT1("No connection context\n"); + return STATUS_INVALID_PARAMETER; + } + + if (Context->Protocol != IPPROTO_TCP) + { + DPRINT1("Address File and Context have mismatching protocols\n"); + return STATUS_INVALID_ADDRESS; + } return STATUS_SUCCESS; } @@ -833,6 +1002,8 @@ { ConnectionContext->lwip_tcp_pcb = lpcb; } + + PrepareIrpForCancel(Irp, CancelRequestRoutine); tcp_accept(ConnectionContext->lwip_tcp_pcb, lwip_tcp_accept_callback); tcp_arg(ConnectionContext->lwip_tcp_pcb, Irp); Modified: branches/GSoC_2016/lwIP/drivers/network/tcpip/main.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP/drivers/network/… ============================================================================== --- branches/GSoC_2016/lwIP/drivers/network/tcpip/main.c [iso-8859-1] (original) +++ branches/GSoC_2016/lwIP/drivers/network/tcpip/main.c [iso-8859-1] Wed Jun 15 19:10:40 2016 @@ -384,7 +384,9 @@ Quickie: Irp->IoStatus.Status = Status; - return Irp->IoStatus.Status; + IoCompleteRequest(Irp, IO_NETWORK_INCREMENT); + + return Irp->IoStatus.Status; } static

8 years, 7 months

[mjansen] 71643: [SHELL32] Use the logoff dialog instead of the generic ConfirmDialog. Patch by Jared Smudde. CORE-11413 #resolve #comment Thanks!

by mjansen＠svn.reactos.org

Author: mjansen Date: Wed Jun 15 17:46:26 2016 New Revision: 71643 URL: http://svn.reactos.org/svn/reactos?rev=71643&view=rev Log: [SHELL32] Use the logoff dialog instead of the generic ConfirmDialog. Patch by Jared Smudde. CORE-11413 #resolve #comment Thanks! Modified: trunk/reactos/dll/win32/shell32/dialogs/dialogs.cpp trunk/reactos/dll/win32/shell32/lang/bg-BG.rc trunk/reactos/dll/win32/shell32/lang/ca-ES.rc trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc trunk/reactos/dll/win32/shell32/lang/da-DK.rc trunk/reactos/dll/win32/shell32/lang/de-DE.rc trunk/reactos/dll/win32/shell32/lang/el-GR.rc trunk/reactos/dll/win32/shell32/lang/en-GB.rc trunk/reactos/dll/win32/shell32/lang/en-US.rc trunk/reactos/dll/win32/shell32/lang/es-ES.rc trunk/reactos/dll/win32/shell32/lang/fi-FI.rc trunk/reactos/dll/win32/shell32/lang/fr-FR.rc trunk/reactos/dll/win32/shell32/lang/he-IL.rc trunk/reactos/dll/win32/shell32/lang/hu-HU.rc trunk/reactos/dll/win32/shell32/lang/it-IT.rc trunk/reactos/dll/win32/shell32/lang/ja-JP.rc trunk/reactos/dll/win32/shell32/lang/ko-KR.rc trunk/reactos/dll/win32/shell32/lang/nl-NL.rc trunk/reactos/dll/win32/shell32/lang/no-NO.rc trunk/reactos/dll/win32/shell32/lang/pl-PL.rc trunk/reactos/dll/win32/shell32/lang/pt-BR.rc trunk/reactos/dll/win32/shell32/lang/pt-PT.rc trunk/reactos/dll/win32/shell32/lang/ro-RO.rc trunk/reactos/dll/win32/shell32/lang/ru-RU.rc trunk/reactos/dll/win32/shell32/lang/sk-SK.rc trunk/reactos/dll/win32/shell32/lang/sl-SI.rc trunk/reactos/dll/win32/shell32/lang/sq-AL.rc trunk/reactos/dll/win32/shell32/lang/sv-SE.rc trunk/reactos/dll/win32/shell32/lang/tr-TR.rc trunk/reactos/dll/win32/shell32/lang/uk-UA.rc trunk/reactos/dll/win32/shell32/lang/zh-CN.rc trunk/reactos/dll/win32/shell32/lang/zh-TW.rc trunk/reactos/dll/win32/shell32/shresdef.h Modified: trunk/reactos/dll/win32/shell32/dialogs/dialogs.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/dialogs/… ============================================================================== --- trunk/reactos/dll/win32/shell32/dialogs/dialogs.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/dialogs/dialogs.cpp [iso-8859-1] Wed Jun 15 17:46:26 2016 @@ -758,6 +758,40 @@ return 0; } +/************************************************************************* + * LogOffDialogProc + * + * NOTES: Used to make the Log Off dialog work + * + */ +INT_PTR CALLBACK LogOffDialogProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam) +{ + switch(Message) + { + case WM_INITDIALOG: + { + return TRUE; + } + case WM_CLOSE: + EndDialog(hwnd, IDCANCEL); + break; + case WM_COMMAND: + switch(LOWORD(wParam)) + { + case IDOK: + ExitWindowsEx(EWX_LOGOFF, 0); + break; + case IDCANCEL: + EndDialog(hwnd, IDCANCEL); + break; + } + break; + default: + break; + } + return FALSE; +} + /************************************************************************* * LogoffWindowsDialog [SHELL32.54] @@ -765,9 +799,7 @@ EXTERN_C int WINAPI LogoffWindowsDialog(HWND hWndOwner) { - if (ConfirmDialog(hWndOwner, IDS_LOGOFF_PROMPT, IDS_LOGOFF_TITLE)) - ExitWindowsEx(EWX_LOGOFF, 0); - + DialogBox(shell32_hInstance, MAKEINTRESOURCE(IDD_LOG_OFF), hWndOwner, LogOffDialogProc); return 0; } Modified: trunk/reactos/dll/win32/shell32/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/bg-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/bg-BG.rc [iso-8859-1] Wed Jun 15 17:46:26 2016 @@ -475,15 +475,15 @@ ICON "", 12301, 50, 89, 21, 20, SS_REALSIZECONTROL END -IDD_LOG_OFF DIALOGEX 0, 0, 190, 60 +IDD_LOG_OFF DIALOGEX 0, 0, 188, 60 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION CAPTION "ÐÐ·Ð»Ð¸Ð·Ð°Ð½Ðµ Ð¾Ñ Ð ÐµÐ°ÐºÑÐÐ¡" FONT 8, "MS Shell Dlg" BEGIN - ICON 45, 14344, 10, 10, 21, 20, SS_REALSIZECONTROL + ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20 LTEXT "Ð¡Ð¸Ð³ÑÑÐ½Ð¸ Ð»Ð¸ ÑÑÐµ, ÑÐµ Ð¸ÑÐºÐ°ÑÐµ Ð´Ð° Ð¸Ð·Ð»ÐµÐ·ÐµÑÐµ?", -1, 43, 11, 140, 22 - DEFPUSHBUTTON "&ÐÐ·Ð»Ð¸Ð·Ð°Ð½Ðµ", IDOK, 57, 40, 60, 14 - PUSHBUTTON "ÐÑÐºÐ°Ð·", IDCANCEL, 122, 40, 60, 14 + DEFPUSHBUTTON "&ÐÐ·Ð»Ð¸Ð·Ð°Ð½Ðµ", IDOK, 49, 38, 43, 14 + PUSHBUTTON "ÐÑÐºÐ°Ð·", IDCANCEL, 99, 38, 43, 14 END IDD_DISCONNECT DIALOGEX 0, 0, 190, 60 @@ -709,8 +709,6 @@ IDS_RESTART_PROMPT "ÐÑÐºÐ°ÑÐµ Ð»Ð¸ Ð´Ð° Ð¿ÑÐµÐ·Ð°Ð¿ÑÑÐ½ÐµÑÐµ ÑÐ¸ÑÑÐµÐ¼Ð°ÑÐ°?" IDS_SHUTDOWN_TITLE "ÐÐ·ÐºÐ»ÑÑÐ²Ð°Ð½Ðµ" IDS_SHUTDOWN_PROMPT "ÐÑÐºÐ°ÑÐµ Ð»Ð¸ Ð´Ð° Ð¸Ð·ÐºÐ»ÑÑÐ¸ÑÐµ ÐºÐ¾Ð¼Ð¿ÑÑÑÑÐ°?" - IDS_LOGOFF_TITLE "ÐÐ·Ð»Ð¸Ð·Ð°Ð½Ðµ" - IDS_LOGOFF_PROMPT "ÐÑÐºÐ°ÑÐµ Ð»Ð¸ Ð´Ð° Ð¸Ð·Ð»ÐµÐ·ÐµÑÐµ?" /* Run File dialog */ IDS_RUNDLG_ERROR "Unable to display Run File dialog box (internal error)" Modified: trunk/reactos/dll/win32/shell32/lang/ca-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ca-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ca-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ca-ES.rc [iso-8859-1] Wed Jun 15 17:46:26 2016 @@ -475,15 +475,15 @@ ICON "", 12301, 50, 89, 21, 20, SS_REALSIZECONTROL END -IDD_LOG_OFF DIALOGEX 0, 0, 190, 60 +IDD_LOG_OFF DIALOGEX 0, 0, 188, 60 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION CAPTION "Log Off ReactOS" FONT 8, "MS Shell Dlg" BEGIN - ICON 45, 14344, 10, 10, 21, 20, SS_REALSIZECONTROL - LTEXT "Are you sure you want to log off?", -1, 43, 11, 140, 22 - DEFPUSHBUTTON "&Log Off", IDOK, 57, 40, 60, 14 - PUSHBUTTON "Cancel", IDCANCEL, 122, 40, 60, 14 + ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20 + LTEXT "Are you sure you want to log off?", -1, 49, 15, 131, 8 + DEFPUSHBUTTON "&Log Off", IDOK, 49, 38, 43, 14 + PUSHBUTTON "Cancel", IDCANCEL, 99, 38, 43, 14 END IDD_DISCONNECT DIALOGEX 0, 0, 190, 60 @@ -709,8 +709,6 @@ IDS_RESTART_PROMPT "Do you want to restart the system?" IDS_SHUTDOWN_TITLE "Shutdown" IDS_SHUTDOWN_PROMPT "Do you want to shutdown?" - IDS_LOGOFF_TITLE "Log Off" - IDS_LOGOFF_PROMPT "Do you want to log off?" /* Run File dialog */ IDS_RUNDLG_ERROR "Unable to display Run File dialog box (internal error)" Modified: trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/cs-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc [iso-8859-1] Wed Jun 15 17:46:26 2016 @@ -481,15 +481,15 @@ ICON "", 12301, 50, 89, 21, 20, SS_REALSIZECONTROL END -IDD_LOG_OFF DIALOGEX 0, 0, 190, 60 +IDD_LOG_OFF DIALOGEX 0, 0, 188, 60 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION CAPTION "OdhlÃ¡sit se ze systÃ©mu ReactOS" FONT 8, "MS Shell Dlg" BEGIN - ICON 45, 14344, 10, 10, 21, 20, SS_REALSIZECONTROL - LTEXT "Opravdu se chcete odhlÃ¡sit?", -1, 43, 11, 140, 22 - DEFPUSHBUTTON "&OdhlÃ¡sit", IDOK, 57, 40, 60, 14 - PUSHBUTTON "Storno", IDCANCEL, 122, 40, 60, 14 + ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20 + LTEXT "Opravdu se chcete odhlÃ¡sit?", -1, 35, 16, 146, 8 + DEFPUSHBUTTON "&OdhlÃ¡sit", IDOK, 41, 39, 50, 14 + PUSHBUTTON "Storno", IDCANCEL, 95, 39, 50, 14 END IDD_DISCONNECT DIALOGEX 0, 0, 190, 60 @@ -715,8 +715,6 @@ IDS_RESTART_PROMPT "Opravdu chcete restartovat systÃ©m?" IDS_SHUTDOWN_TITLE "Vypnout" IDS_SHUTDOWN_PROMPT "Opravdu chcete vypnout poÄÃtaÄ?" - IDS_LOGOFF_TITLE "OdhlÃ¡sit se" - IDS_LOGOFF_PROMPT "Opravdu se chcete odhlÃ¡sit?" /* Run File dialog */ IDS_RUNDLG_ERROR "Nelze zobrazit dialog Spustit soubor (internÃ chyba)" Modified: trunk/reactos/dll/win32/shell32/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/da-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/da-DK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/da-DK.rc [iso-8859-1] Wed Jun 15 17:46:26 2016 @@ -481,15 +481,15 @@ ICON "", 12301, 50, 89, 21, 20, SS_REALSIZECONTROL END -IDD_LOG_OFF DIALOGEX 0, 0, 190, 60 +IDD_LOG_OFF DIALOGEX 0, 0, 188, 60 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION CAPTION "Log Off ReactOS" FONT 8, "MS Shell Dlg" BEGIN - ICON 45, 14344, 10, 10, 21, 20, SS_REALSIZECONTROL - LTEXT "Are you sure you want to log off?", -1, 43, 11, 140, 22 - DEFPUSHBUTTON "&Log Off", IDOK, 57, 40, 60, 14 - PUSHBUTTON "Cancel", IDCANCEL, 122, 40, 60, 14 + ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20 + LTEXT "Are you sure you want to log off?", -1, 49, 15, 131, 8 + DEFPUSHBUTTON "&Log Off", IDOK, 49, 38, 43, 14 + PUSHBUTTON "Cancel", IDCANCEL, 99, 38, 43, 14 END IDD_DISCONNECT DIALOGEX 0, 0, 190, 60 @@ -715,8 +715,6 @@ IDS_RESTART_PROMPT "Ãnsker du at Genstarte Systemet?" IDS_SHUTDOWN_TITLE "Luk Ned" IDS_SHUTDOWN_PROMPT "Ãnsker du at Lukke Ned?" - IDS_LOGOFF_TITLE "Log Off" - IDS_LOGOFF_PROMPT "Do you want to log off?" /* Run File dialog */ IDS_RUNDLG_ERROR "Unable to display Run File dialog box (internal error)" Modified: trunk/reactos/dll/win32/shell32/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/de-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/de-DE.rc [iso-8859-1] Wed Jun 15 17:46:26 2016 @@ -475,15 +475,15 @@ ICON "", 12301, 50, 89, 21, 20, SS_REALSIZECONTROL END -IDD_LOG_OFF DIALOGEX 0, 0, 190, 60 +IDD_LOG_OFF DIALOGEX 0, 0, 188, 60 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION CAPTION "Abmelden" FONT 8, "MS Shell Dlg" BEGIN - ICON 45, 14344, 10, 10, 21, 20, SS_REALSIZECONTROL - LTEXT "Sind Sie sicher, dass Sie sich abmelden wollen?", -1, 43, 11, 140, 22 - DEFPUSHBUTTON "&Abmelden", IDOK, 57, 40, 60, 14 - PUSHBUTTON "Abbrechen", IDCANCEL, 122, 40, 60, 14 + ICON IDI_SHELL_LOGOFF, IDC_STATIC, 7, 7, 20, 20 + LTEXT "Sind Sie sicher, dass Sie sich abmelden wollen?", -1, 35, 16, 146, 8 + DEFPUSHBUTTON "&Abmelden", IDOK, 41, 39, 50, 14 + PUSHBUTTON "Abbrechen", IDCANCEL, 95, 39, 50, 14 END IDD_DISCONNECT DIALOGEX 0, 0, 190, 60 @@ -710,8 +710,6 @@ IDS_RESTART_PROMPT "MÃ¶chten Sie das System neu starten?" IDS_SHUTDOWN_TITLE "Herunterfahren" IDS_SHUTDOWN_PROMPT "MÃ¶chten Sie das System herunterfahren?" - IDS_LOGOFF_TITLE "Ausloggen" - IDS_LOGOFF_PROMPT "MÃ¶chten Sie sich ausloggen?" /* Run File dialog */ IDS_RUNDLG_ERROR "Anzeigen der Datei AusfÃ¼hren Dialogbox nicht mÃ¶glich (interner Fehler)" Modified: trunk/reactos/dll/win32/shell32/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/el-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/el-GR.rc [iso-8859-1] Wed Jun 15 17:46:26 2016 @@ -475,15 +475,15 @@ ICON "", 12301, 50, 89, 21, 20, SS_REALSIZECONTROL END -IDD_LOG_OFF DIALOGEX 0, 0, 190, 60 +IDD_LOG_OFF DIALOGEX 0, 0, 188, 60 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION CAPTION "Log Off ReactOS" FONT 8, "MS Shell Dlg" BEGIN - ICON 45, 14344, 10, 10, 21, 20, SS_REALSIZECONTROL - LTEXT "Are you sure you want to log off?", -1, 43, 11, 140, 22 - DEFPUSHBUTTON "&Log Off", IDOK, 57, 40, 60, 14 - PUSHBUTTON "Cancel", IDCANCEL, 122, 40, 60, 14 + ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20 + LTEXT "Are you sure you want to log off?", -1, 49, 15, 131, 8 + DEFPUSHBUTTON "&Log Off", IDOK, 49, 38, 43, 14 + PUSHBUTTON "Cancel", IDCANCEL, 99, 38, 43, 14 END IDD_DISCONNECT DIALOGEX 0, 0, 190, 60 @@ -709,8 +709,6 @@ IDS_RESTART_PROMPT "ÎÎ¯ÏÏÎµ ÏÎ¯Î³Î¿ÏÏÎ¿Î¹ ÏÏÎ¹ Î¸ÎÎ»ÎµÏÎµ Î½Î± ÎµÏÎ±Î½ÎµÎºÎºÎ¹Î½Î®ÏÎµÏÎµ ÏÎ¿Î½ ÏÏÎ¿Î»Î¿Î³Î¹ÏÏÎ® ÏÎ±Ï;" IDS_SHUTDOWN_TITLE "ÎÏÎµÎ½ÎµÏÎ³Î¿ÏÎ¿Î¯Î·ÏÎ·" IDS_SHUTDOWN_PROMPT "ÎÎ¯ÏÏÎµ ÏÎ¯Î³Î¿ÏÏÎ¿Î¹ ÏÏÎ¹ Î¸ÎÎ»ÎµÏÎµ Î½Î± Î±ÏÎµÎ½ÎµÏÎ³Î¿ÏÎ¿Î¹Î®ÏÎµÏÎµ ÏÎ¿Î½ ÏÏÎ¿Î»Î¿Î³Î¹ÏÏÎ® ÏÎ±Ï;" - IDS_LOGOFF_TITLE "Log Off" - IDS_LOGOFF_PROMPT "Do you want to log off?" /* Run File dialog */ IDS_RUNDLG_ERROR "Unable to display Run File dialog box (internal error)" Modified: trunk/reactos/dll/win32/shell32/lang/en-GB.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/en-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/en-GB.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/en-GB.rc [iso-8859-1] Wed Jun 15 17:46:26 2016 @@ -475,15 +475,15 @@ ICON "", 12301, 50, 89, 21, 20, SS_REALSIZECONTROL END -IDD_LOG_OFF DIALOGEX 0, 0, 190, 60 +IDD_LOG_OFF DIALOGEX 0, 0, 188, 60 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION CAPTION "Log Off ReactOS" FONT 8, "MS Shell Dlg" BEGIN - ICON 45, 14344, 10, 10, 21, 20, SS_REALSIZECONTROL - LTEXT "Are you sure you want to log off?", -1, 43, 11, 140, 22 - DEFPUSHBUTTON "&Log Off", IDOK, 57, 40, 60, 14 - PUSHBUTTON "Cancel", IDCANCEL, 122, 40, 60, 14 + ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20 + LTEXT "Are you sure you want to log off?", -1, 49, 15, 131, 8 + DEFPUSHBUTTON "&Log Off", IDOK, 49, 38, 43, 14 + PUSHBUTTON "Cancel", IDCANCEL, 99, 38, 43, 14 END IDD_DISCONNECT DIALOGEX 0, 0, 190, 60 @@ -709,8 +709,6 @@ IDS_RESTART_PROMPT "Do you want to restart the system?" IDS_SHUTDOWN_TITLE "Shutdown" IDS_SHUTDOWN_PROMPT "Do you want to shutdown?" - IDS_LOGOFF_TITLE "Log Off" - IDS_LOGOFF_PROMPT "Do you want to log off?" /* Run File dialog */ IDS_RUNDLG_ERROR "Unable to display Run File dialog box (internal error)" Modified: trunk/reactos/dll/win32/shell32/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/en-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/en-US.rc [iso-8859-1] Wed Jun 15 17:46:26 2016 @@ -475,15 +475,15 @@ ICON "", 12301, 50, 89, 21, 20, SS_REALSIZECONTROL END -IDD_LOG_OFF DIALOGEX 0, 0, 190, 60 +IDD_LOG_OFF DIALOGEX 0, 0, 188, 60 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION CAPTION "Log Off ReactOS" FONT 8, "MS Shell Dlg" BEGIN - ICON 45, 14344, 10, 10, 21, 20, SS_REALSIZECONTROL - LTEXT "Are you sure you want to log off?", -1, 43, 11, 140, 22 - DEFPUSHBUTTON "&Log Off", IDOK, 57, 40, 60, 14 - PUSHBUTTON "Cancel", IDCANCEL, 122, 40, 60, 14 + ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20 + LTEXT "Are you sure you want to log off?", -1, 49, 15, 131, 8 + DEFPUSHBUTTON "&Log Off", IDOK, 49, 38, 43, 14 + PUSHBUTTON "Cancel", IDCANCEL, 99, 38, 43, 14 END IDD_DISCONNECT DIALOGEX 0, 0, 190, 60 @@ -709,8 +709,6 @@ IDS_RESTART_PROMPT "Do you want to restart the system?" IDS_SHUTDOWN_TITLE "Shutdown" IDS_SHUTDOWN_PROMPT "Do you want to shutdown?" - IDS_LOGOFF_TITLE "Log Off" - IDS_LOGOFF_PROMPT "Do you want to log off?" /* Run File dialog */ IDS_RUNDLG_ERROR "Unable to display Run File dialog box (internal error)" Modified: trunk/reactos/dll/win32/shell32/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/es-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/es-ES.rc [iso-8859-1] Wed Jun 15 17:46:26 2016 @@ -477,15 +477,15 @@ ICON "", 12301, 50, 89, 21, 20, SS_REALSIZECONTROL END -IDD_LOG_OFF DIALOGEX 0, 0, 190, 60 +IDD_LOG_OFF DIALOGEX 0, 0, 188, 60 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION CAPTION "Cerrar sesiÃ³n de ReactOS" FONT 8, "MS Shell Dlg" BEGIN - ICON 45, 14344, 10, 10, 21, 20, SS_REALSIZECONTROL - LTEXT "Â¿Esta seguro de que quiere cerrar la sesiÃ³n?", -1, 43, 11, 140, 22 - DEFPUSHBUTTON "&Cerrar sesiÃ³n", IDOK, 57, 40, 60, 14 - PUSHBUTTON "Cancelar", IDCANCEL, 122, 40, 60, 14 + ICON IDI_SHELL_LOGOFF, IDC_STATIC, 7, 7, 20, 20 + LTEXT "Â¿Esta seguro de que quiere cerrar la sesiÃ³n?", -1, 35, 16, 146, 8 + DEFPUSHBUTTON "&Cerrar sesiÃ³n", IDOK, 41, 39, 50, 14 + PUSHBUTTON "Cancelar", IDCANCEL, 95, 39, 50, 14 END IDD_DISCONNECT DIALOGEX 0, 0, 190, 60 @@ -711,8 +711,6 @@ IDS_RESTART_PROMPT "Â¿Desea reiniciar el equipo?" IDS_SHUTDOWN_TITLE "Apagar" IDS_SHUTDOWN_PROMPT "Â¿Desea apagar el equipo?" - IDS_LOGOFF_TITLE "Cerrar sesiÃ³n" - IDS_LOGOFF_PROMPT "Â¿Desea cerrar la sesiÃ³n?" /* Run File dialog */ IDS_RUNDLG_ERROR "No se pudo mostrar el diÃ¡logo Ejecutar (error interno)" Modified: trunk/reactos/dll/win32/shell32/lang/fi-FI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/fi-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/fi-FI.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/fi-FI.rc [iso-8859-1] Wed Jun 15 17:46:26 2016 @@ -475,15 +475,15 @@ ICON "", 12301, 50, 89, 21, 20, SS_REALSIZECONTROL END -IDD_LOG_OFF DIALOGEX 0, 0, 190, 60 +IDD_LOG_OFF DIALOGEX 0, 0, 188, 60 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION CAPTION "Log Off ReactOS" FONT 8, "MS Shell Dlg" BEGIN - ICON 45, 14344, 10, 10, 21, 20, SS_REALSIZECONTROL - LTEXT "Are you sure you want to log off?", -1, 43, 11, 140, 22 - DEFPUSHBUTTON "&Log Off", IDOK, 57, 40, 60, 14 - PUSHBUTTON "Cancel", IDCANCEL, 122, 40, 60, 14 + ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20 + LTEXT "Are you sure you want to log off?", -1, 49, 15, 131, 8 + DEFPUSHBUTTON "&Log Off", IDOK, 49, 38, 43, 14 + PUSHBUTTON "Cancel", IDCANCEL, 99, 38, 43, 14 END IDD_DISCONNECT DIALOGEX 0, 0, 190, 60 @@ -709,8 +709,6 @@ IDS_RESTART_PROMPT "Haluatko simuloida Windows:n uudelleenkÃ¤ynnistÃ¤mistÃ¤?" IDS_SHUTDOWN_TITLE "Sammuta" IDS_SHUTDOWN_PROMPT "Haluatko lopettaa Wine:n istunnon?" - IDS_LOGOFF_TITLE "Log Off" - IDS_LOGOFF_PROMPT "Do you want to log off?" /* Run File dialog */ IDS_RUNDLG_ERROR "Unable to display Run File dialog box (internal error)" Modified: trunk/reactos/dll/win32/shell32/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/fr-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/fr-FR.rc [iso-8859-1] Wed Jun 15 17:46:26 2016 @@ -475,15 +475,15 @@ ICON "", 12301, 50, 89, 21, 20, SS_REALSIZECONTROL END -IDD_LOG_OFF DIALOGEX 0, 0, 190, 60 +IDD_LOG_OFF DIALOGEX 0, 0, 188, 60 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION CAPTION "Fermer ReactOS" FONT 8, "MS Shell Dlg" BEGIN - ICON 45, 14344, 10, 10, 21, 20, SS_REALSIZECONTROL - LTEXT "Ãtes-vous sÃ»r de vouloir fermer ReactOS ?", -1, 43, 11, 140, 22 - DEFPUSHBUTTON "Fermer", IDOK, 57, 40, 60, 14 - PUSHBUTTON "Annuler", IDCANCEL, 122, 40, 60, 14 + ICON IDI_SHELL_LOGOFF, IDC_STATIC, 7, 7, 20, 20 + LTEXT "Ãtes-vous sÃ»r de vouloir fermer ReactOS ?", -1, 35, 16, 146, 8 + DEFPUSHBUTTON "Fermer", IDOK, 41, 39, 50, 14 + PUSHBUTTON "Annuler", IDCANCEL, 95, 39, 50, 14 END IDD_DISCONNECT DIALOGEX 0, 0, 190, 60 @@ -709,8 +709,6 @@ IDS_RESTART_PROMPT "Voulez-vous redÃ©marrer votre ordinateur ?" IDS_SHUTDOWN_TITLE "ArrÃªter" IDS_SHUTDOWN_PROMPT "Voulez-vous fermer la session ReactOS ?" - IDS_LOGOFF_TITLE "Se dÃ©connecter" - IDS_LOGOFF_PROMPT "Voulez-vous vous dÃ©connecter ?" /* Run File dialog */ IDS_RUNDLG_ERROR "Impossible d'afficher la boÃ®te de dialogue pour l'exÃ©cution d'un fichier (erreur interne)" Modified: trunk/reactos/dll/win32/shell32/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/he-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/he-IL.rc [iso-8859-1] Wed Jun 15 17:46:26 2016 @@ -475,15 +475,15 @@ ICON "", 12301, 50, 89, 21, 20, SS_REALSIZECONTROL END -IDD_LOG_OFF DIALOGEX 0, 0, 190, 60 +IDD_LOG_OFF DIALOGEX 0, 0, 188, 60 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION CAPTION "Log Off ReactOS" FONT 8, "MS Shell Dlg" BEGIN - ICON 45, 14344, 10, 10, 21, 20, SS_REALSIZECONTROL - LTEXT "Are you sure you want to log off?", -1, 43, 11, 140, 22 - DEFPUSHBUTTON "&Log Off", IDOK, 57, 40, 60, 14 - PUSHBUTTON "Cancel", IDCANCEL, 122, 40, 60, 14 + ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20 + LTEXT "Are you sure you want to log off?", -1, 49, 15, 131, 8 + DEFPUSHBUTTON "&Log Off", IDOK, 49, 38, 43, 14 + PUSHBUTTON "Cancel", IDCANCEL, 99, 38, 43, 14 END IDD_DISCONNECT DIALOGEX 0, 0, 190, 60 @@ -709,8 +709,6 @@ IDS_RESTART_PROMPT "××× ××¨×¦×× × ×××¤×¢×× ××××© ××ª ×××¢×¨××ª?" IDS_SHUTDOWN_TITLE "×××××" IDS_SHUTDOWN_PROMPT "××× ××¨×¦×× × ×××××ª ××ª ××××©×?" - IDS_LOGOFF_TITLE "××ª× ×ª×§××ª" - IDS_LOGOFF_PROMPT "××× ××¨×¦×× × ×××ª× ×ª×§?" /* Run File dialog */ IDS_RUNDLG_ERROR "Unable to display Run File dialog box (internal error)" Modified: trunk/reactos/dll/win32/shell32/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/hu-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/hu-HU.rc [iso-8859-1] Wed Jun 15 17:46:26 2016 @@ -475,15 +475,15 @@ ICON "", 12301, 50, 89, 21, 20, SS_REALSIZECONTROL END -IDD_LOG_OFF DIALOGEX 0, 0, 190, 60 +IDD_LOG_OFF DIALOGEX 0, 0, 188, 60 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION CAPTION "Log Off ReactOS" FONT 8, "MS Shell Dlg" BEGIN - ICON 45, 14344, 10, 10, 21, 20, SS_REALSIZECONTROL - LTEXT "Are you sure you want to log off?", -1, 43, 11, 140, 22 - DEFPUSHBUTTON "&Log Off", IDOK, 57, 40, 60, 14 - PUSHBUTTON "Cancel", IDCANCEL, 122, 40, 60, 14 + ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20 + LTEXT "Are you sure you want to log off?", -1, 49, 15, 131, 8 + DEFPUSHBUTTON "&Log Off", IDOK, 49, 38, 43, 14 + PUSHBUTTON "Cancel", IDCANCEL, 99, 38, 43, 14 END IDD_DISCONNECT DIALOGEX 0, 0, 190, 60 @@ -709,8 +709,6 @@ IDS_RESTART_PROMPT "Ãjra szeretnÃ©d indÃtani a rendszert?" IDS_SHUTDOWN_TITLE "KikapcsolÃ¡s" IDS_SHUTDOWN_PROMPT "Kiakarod kapcsolni szÃ¡mÃtÃ³gÃ©pÃ©t?" - IDS_LOGOFF_TITLE "Log Off" - IDS_LOGOFF_PROMPT "Do you want to log off?" /* Run File dialog */ IDS_RUNDLG_ERROR "Unable to display Run File dialog box (internal error)" Modified: trunk/reactos/dll/win32/shell32/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/it-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/it-IT.rc [iso-8859-1] Wed Jun 15 17:46:26 2016 @@ -475,15 +475,15 @@ ICON "", 12301, 50, 89, 21, 20, SS_REALSIZECONTROL END -IDD_LOG_OFF DIALOGEX 0, 0, 190, 60 +IDD_LOG_OFF DIALOGEX 0, 0, 188, 60 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION CAPTION "Chiudi sessione di ReactOS" FONT 8, "MS Shell Dlg" BEGIN - ICON 45, 14344, 10, 10, 21, 20, SS_REALSIZECONTROL - LTEXT "Siete sicuro di voler chiudere la sessione?", -1, 43, 11, 140, 22 - DEFPUSHBUTTON "&Chiudi sessione", IDOK, 57, 40, 60, 14 - PUSHBUTTON "Annulla", IDCANCEL, 122, 40, 60, 14 + ICON IDI_SHELL_LOGOFF, IDC_STATIC, 7, 7, 20, 20 + LTEXT "Siete sicuro di voler chiudere la sessione?", -1, 35, 16, 146, 8 + DEFPUSHBUTTON "&Chiudi sessione", IDOK, 35, 39, 55, 14 + PUSHBUTTON "Annulla", IDCANCEL, 95, 39, 50, 14 END IDD_DISCONNECT DIALOGEX 0, 0, 190, 60 @@ -709,8 +709,6 @@ IDS_RESTART_PROMPT "Volete riavviare il sistema?" IDS_SHUTDOWN_TITLE "Arresta sistema" IDS_SHUTDOWN_PROMPT "Volete arrestare il sistema?" - IDS_LOGOFF_TITLE "Disconnetti" - IDS_LOGOFF_PROMPT "Volete disconnettervi?" /* Run File dialog */ IDS_RUNDLG_ERROR "Impossibile mostrare il dialogo Eseguire (errore interno)" Modified: trunk/reactos/dll/win32/shell32/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ja-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ja-JP.rc [iso-8859-1] Wed Jun 15 17:46:26 2016 @@ -475,15 +475,15 @@ ICON "", 12301, 50, 89, 21, 20, SS_REALSIZECONTROL END -IDD_LOG_OFF DIALOGEX 0, 0, 190, 60 +IDD_LOG_OFF DIALOGEX 0, 0, 188, 60 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION CAPTION "ReactOSã®ãã°ãªã" FONT 9, "MS UI Gothic" BEGIN - ICON 45, 14344, 10, 10, 21, 20, SS_REALSIZECONTROL + ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 22, 21 LTEXT "ãã°ãªããã¦ãããããã§ãã?", -1, 43, 11, 140, 22 - DEFPUSHBUTTON "ãã°ãªã(&L)", IDOK, 57, 40, 60, 14 - PUSHBUTTON "ãã£ã³ã»ã«", IDCANCEL, 122, 40, 60, 14 + DEFPUSHBUTTON "ãã°ãªã(&L)", IDOK, 41, 39, 50, 14 + PUSHBUTTON "ãã£ã³ã»ã«", IDCANCEL, 95, 39, 50, 14 END IDD_DISCONNECT DIALOGEX 0, 0, 190, 60 @@ -709,8 +709,6 @@ IDS_RESTART_PROMPT "ã·ã¹ãã ãåèµ·åãã¾ãã?" IDS_SHUTDOWN_TITLE "ã·ã£ãããã¦ã³" IDS_SHUTDOWN_PROMPT "ã·ã£ãããã¦ã³ãã¾ãã?" - IDS_LOGOFF_TITLE "Log Off" - IDS_LOGOFF_PROMPT "Do you want to log off?" /* Run File dialog */ IDS_RUNDLG_ERROR "Unable to display Run File dialog box (internal error)" Modified: trunk/reactos/dll/win32/shell32/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ko-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ko-KR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ko-KR.rc [iso-8859-1] Wed Jun 15 17:46:26 2016 @@ -475,15 +475,15 @@ ICON "", 12301, 50, 89, 21, 20, SS_REALSIZECONTROL END -IDD_LOG_OFF DIALOGEX 0, 0, 190, 60 +IDD_LOG_OFF DIALOGEX 0, 0, 188, 60 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION CAPTION "Log Off ReactOS" -FONT 9, "MS Shell Dlg" -BEGIN - ICON 45, 14344, 10, 10, 21, 20, SS_REALSIZECONTROL - LTEXT "Are you sure you want to log off?", -1, 43, 11, 140, 22 - DEFPUSHBUTTON "&Log Off", IDOK, 57, 40, 60, 14 - PUSHBUTTON "Cancel", IDCANCEL, 122, 40, 60, 14 +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20 + LTEXT "Are you sure you want to log off?", -1, 49, 15, 131, 8 + DEFPUSHBUTTON "&Log Off", IDOK, 49, 38, 43, 14 + PUSHBUTTON "Cancel", IDCANCEL, 99, 38, 43, 14 END IDD_DISCONNECT DIALOGEX 0, 0, 190, 60 @@ -709,8 +709,6 @@ IDS_RESTART_PROMPT "Do you want to restart the system?" IDS_SHUTDOWN_TITLE "Shutdown" IDS_SHUTDOWN_PROMPT "Do you want to shutdown?" - IDS_LOGOFF_TITLE "Log Off" - IDS_LOGOFF_PROMPT "Do you want to log off?" /* Run File dialog */ IDS_RUNDLG_ERROR "Unable to display Run File dialog box (internal error)" Modified: trunk/reactos/dll/win32/shell32/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/nl-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/nl-NL.rc [iso-8859-1] Wed Jun 15 17:46:26 2016 @@ -475,15 +475,15 @@ ICON "", 12301, 50, 89, 21, 20, SS_REALSIZECONTROL END -IDD_LOG_OFF DIALOGEX 0, 0, 190, 60 +IDD_LOG_OFF DIALOGEX 0, 0, 188, 60 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION CAPTION "Log Off ReactOS" FONT 8, "MS Shell Dlg" BEGIN - ICON 45, 14344, 10, 10, 21, 20, SS_REALSIZECONTROL - LTEXT "Are you sure you want to log off?", -1, 43, 11, 140, 22 - DEFPUSHBUTTON "&Log Off", IDOK, 57, 40, 60, 14 - PUSHBUTTON "Cancel", IDCANCEL, 122, 40, 60, 14 + ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20 + LTEXT "Are you sure you want to log off?", -1, 49, 15, 131, 8 + DEFPUSHBUTTON "&Log Off", IDOK, 49, 38, 43, 14 + PUSHBUTTON "Cancel", IDCANCEL, 99, 38, 43, 14 END IDD_DISCONNECT DIALOGEX 0, 0, 190, 60 @@ -709,8 +709,6 @@ IDS_RESTART_PROMPT "Do you want to restart the system?" IDS_SHUTDOWN_TITLE "Shutdown" IDS_SHUTDOWN_PROMPT "Do you want to shutdown?" - IDS_LOGOFF_TITLE "Log Off" - IDS_LOGOFF_PROMPT "Do you want to log off?" /* Run File dialog */ IDS_RUNDLG_ERROR "Unable to display Run File dialog box (internal error)" Modified: trunk/reactos/dll/win32/shell32/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/no-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/no-NO.rc [iso-8859-1] Wed Jun 15 17:46:26 2016 @@ -475,12 +475,12 @@ ICON "", 12301, 50, 89, 21, 20, SS_REALSIZECONTROL END -IDD_LOG_OFF DIALOGEX 0, 0, 190, 60 +IDD_LOG_OFF DIALOGEX 0, 0, 188, 60 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION CAPTION "Logg av ReactOS" FONT 8, "MS Shell Dlg" BEGIN - ICON 45, 14344, 10, 10, 21, 20, SS_REALSIZECONTROL + ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20 LTEXT "Er du sikker pÃ¥ at du vil logge av?", -1, 43, 11, 140, 22 DEFPUSHBUTTON "&Logg av", IDOK, 57, 40, 60, 14 PUSHBUTTON "Avbryt", IDCANCEL, 122, 40, 60, 14 @@ -709,8 +709,6 @@ IDS_RESTART_PROMPT "Vil du starte datamaskinen pÃ¥ nytt?" IDS_SHUTDOWN_TITLE "Avslutt" IDS_SHUTDOWN_PROMPT "Vil du slÃ¥ av datamaskinen?" - IDS_LOGOFF_TITLE "Log Off" - IDS_LOGOFF_PROMPT "Do you want to log off?" /* Run File dialog */ IDS_RUNDLG_ERROR "Unable to display Run File dialog box (internal error)" Modified: trunk/reactos/dll/win32/shell32/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pl-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/pl-PL.rc [iso-8859-1] Wed Jun 15 17:46:26 2016 @@ -479,15 +479,15 @@ ICON "", 12301, 50, 89, 21, 20, SS_REALSIZECONTROL END -IDD_LOG_OFF DIALOGEX 0, 0, 190, 60 +IDD_LOG_OFF DIALOGEX 0, 0, 188, 60 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION CAPTION "Wyloguj siÄ z ReactOS" FONT 8, "MS Shell Dlg" BEGIN - ICON 45, 14344, 10, 10, 21, 20, SS_REALSIZECONTROL - LTEXT "Czy na pewno chcesz siÄ wylogowaÄ?", -1, 43, 11, 140, 22 - DEFPUSHBUTTON "&Wyloguj", IDOK, 57, 40, 60, 14 - PUSHBUTTON "Anuluj", IDCANCEL, 122, 40, 60, 14 + ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20 + LTEXT "Czy na pewno chcesz siÄ wylogowaÄ?", -1, 35, 16, 146, 8 + DEFPUSHBUTTON "&Wyloguj", IDOK, 41, 39, 50, 14 + PUSHBUTTON "Anuluj", IDCANCEL, 95, 39, 50, 14 END IDD_DISCONNECT DIALOGEX 0, 0, 190, 60 @@ -713,8 +713,6 @@ IDS_RESTART_PROMPT "Czy chcesz zrestartowaÄ system?" IDS_SHUTDOWN_TITLE "WyÅÄcz" IDS_SHUTDOWN_PROMPT "Czy chcesz wyÅÄczyÄ system?" - IDS_LOGOFF_TITLE "Wyloguj" - IDS_LOGOFF_PROMPT "Czy chcesz siÄ wylogowaÄ z systemu?" /* Run File dialog */ IDS_RUNDLG_ERROR "Nie mogÄ wyÅwietliÄ okna Uruchom (bÅÄd wewnÄtrzny)" Modified: trunk/reactos/dll/win32/shell32/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pt-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/pt-BR.rc [iso-8859-1] Wed Jun 15 17:46:26 2016 @@ -475,15 +475,15 @@ ICON "", 12301, 50, 89, 21, 20, SS_REALSIZECONTROL END -IDD_LOG_OFF DIALOGEX 0, 0, 190, 60 +IDD_LOG_OFF DIALOGEX 0, 0, 188, 60 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION CAPTION "Log Off ReactOS" FONT 8, "MS Shell Dlg" BEGIN - ICON 45, 14344, 10, 10, 21, 20, SS_REALSIZECONTROL - LTEXT "VocÃª tem certeza que desejar realizar log off?", -1, 43, 11, 140, 22 - DEFPUSHBUTTON "&Log Off", IDOK, 57, 40, 60, 14 - PUSHBUTTON "Cancelar", IDCANCEL, 122, 40, 60, 14 + ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20 + LTEXT "VocÃª tem certeza que desejar realizar log off?", -1, 35, 15, 148, 8 + DEFPUSHBUTTON "&Log Off", IDOK, 49, 38, 43, 14 + PUSHBUTTON "Cancelar", IDCANCEL, 99, 38, 43, 14 END IDD_DISCONNECT DIALOGEX 0, 0, 190, 60 @@ -709,8 +709,6 @@ IDS_RESTART_PROMPT "VocÃª quer simular a reinicializaÃ§Ã£o do Windows?" IDS_SHUTDOWN_TITLE "Desligar" IDS_SHUTDOWN_PROMPT "VocÃª quer finalizar a sessÃ£o?" - IDS_LOGOFF_TITLE "Log Off" - IDS_LOGOFF_PROMPT "VocÃª quer realizar log off?" /* Run File dialog */ IDS_RUNDLG_ERROR "Unable to display Run File dialog box (internal error)" Modified: trunk/reactos/dll/win32/shell32/lang/pt-PT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pt-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/pt-PT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/pt-PT.rc [iso-8859-1] Wed Jun 15 17:46:26 2016 @@ -475,15 +475,15 @@ ICON "", 12301, 50, 89, 21, 20, SS_REALSIZECONTROL END -IDD_LOG_OFF DIALOGEX 0, 0, 190, 60 +IDD_LOG_OFF DIALOGEX 0, 0, 188, 60 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION CAPTION "Terminar sessÃ£o ReactOS" FONT 8, "MS Shell Dlg" BEGIN - ICON 45, 14344, 10, 10, 21, 20, SS_REALSIZECONTROL - LTEXT "Tem a certeza que quer terminar a sessÃ£o?", -1, 43, 11, 140, 22 - DEFPUSHBUTTON "&Terminar a sessÃ£o", IDOK, 57, 40, 60, 14 - PUSHBUTTON "Cancelar", IDCANCEL, 122, 40, 60, 14 + ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20 + LTEXT "Tem a certeza que quer terminar a sessÃ£o?", -1, 43, 15, 131, 8 + DEFPUSHBUTTON "&Terminar a sessÃ£o", IDOK, 30, 38, 64, 14 + PUSHBUTTON "Cancelar", IDCANCEL, 99, 38, 43, 14 END IDD_DISCONNECT DIALOGEX 0, 0, 190, 60 @@ -709,8 +709,6 @@ IDS_RESTART_PROMPT "Deseja simular a reinicializaÃ§Ã£o do Windows?" IDS_SHUTDOWN_TITLE "Desligar" IDS_SHUTDOWN_PROMPT "Deseja finalizar esta sessÃ£o do ReactOS?" - IDS_LOGOFF_TITLE "Terminar a sessÃ£o" - IDS_LOGOFF_PROMPT "Pretende terminar a sessÃ£o?" /* Run File dialog */ IDS_RUNDLG_ERROR "Unable to display Run File dialog box (internal error)" Modified: trunk/reactos/dll/win32/shell32/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ro-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ro-RO.rc [iso-8859-1] Wed Jun 15 17:46:26 2016 @@ -477,15 +477,15 @@ ICON "", 12301, 50, 89, 21, 20, SS_REALSIZECONTROL END -IDD_LOG_OFF DIALOGEX 0, 0, 190, 60 +IDD_LOG_OFF DIALOGEX 0, 0, 188, 60 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION CAPTION "Deautentificare" FONT 8, "MS Shell Dlg" BEGIN - ICON 45, 14344, 10, 10, 21, 20, SS_REALSIZECONTROL - LTEXT "Sigur doriÈi sÄ vÄ deautentificaÈi?", -1, 43, 11, 140, 22 - DEFPUSHBUTTON "&DeautentificÄ", IDOK, 57, 40, 60, 14 - PUSHBUTTON "A&nuleazÄ", IDCANCEL, 122, 40, 60, 14 + ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20 + LTEXT "Sigur doriÈi sÄ vÄ deautentificaÈi?", IDC_STATIC, 35, 16, 146, 8 + DEFPUSHBUTTON "&DeautentificÄ", IDOK, 41, 39, 50, 14 + PUSHBUTTON "A&nuleazÄ", IDCANCEL, 95, 39, 50, 14 END IDD_DISCONNECT DIALOGEX 0, 0, 190, 60 @@ -711,8 +711,6 @@ IDS_RESTART_PROMPT "DoriÈi sÄ reporniÈi sistemul?" IDS_SHUTDOWN_TITLE "Ãnchidere" IDS_SHUTDOWN_PROMPT "DoriÈi sÄ Ã®nchideÈi calculatorul?" - IDS_LOGOFF_TITLE "Deautentificare" - IDS_LOGOFF_PROMPT "DoriÈi sÄ vÄ deautentificaÈi?" /* Run File dialog */ IDS_RUNDLG_ERROR "Nu se poate deschide Executare fiÈier (eroare internÄ)" Modified: trunk/reactos/dll/win32/shell32/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ru-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ru-RU.rc [iso-8859-1] Wed Jun 15 17:46:26 2016 @@ -477,15 +477,15 @@ ICON "", 12301, 50, 89, 21, 20, SS_REALSIZECONTROL END -IDD_LOG_OFF DIALOGEX 0, 0, 190, 60 +IDD_LOG_OFF DIALOGEX 0, 0, 188, 60 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION CAPTION "ÐÑÑÐ¾Ð´ Ð¸Ð· ReactOS" FONT 8, "MS Shell Dlg" BEGIN - ICON 45, 14344, 10, 10, 21, 20, SS_REALSIZECONTROL - LTEXT "ÐÑ Ð´ÐµÐ¹ÑÑÐ²Ð¸ÑÐµÐ»ÑÐ½Ð¾ ÑÐ¾ÑÐ¸ÑÐµ Ð²ÑÐ¹ÑÐ¸ Ð¸Ð· ÑÐ¸ÑÑÐµÐ¼Ñ?", -1, 43, 11, 140, 22 - DEFPUSHBUTTON "Ð&ÑÑÐ¾Ð´", IDOK, 57, 40, 60, 14 - PUSHBUTTON "ÐÑÐ¼ÐµÐ½Ð°", IDCANCEL, 122, 40, 60, 14 + ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20 + LTEXT "ÐÑ Ð´ÐµÐ¹ÑÑÐ²Ð¸ÑÐµÐ»ÑÐ½Ð¾ ÑÐ¾ÑÐ¸ÑÐµ Ð²ÑÐ¹ÑÐ¸ Ð¸Ð· ÑÐ¸ÑÑÐµÐ¼Ñ?", -1, 35, 16, 146, 8 + DEFPUSHBUTTON "Ð&ÑÑÐ¾Ð´", IDOK, 41, 39, 50, 14 + PUSHBUTTON "ÐÑÐ¼ÐµÐ½Ð°", IDCANCEL, 95, 39, 50, 14 END IDD_DISCONNECT DIALOGEX 0, 0, 190, 60 @@ -711,8 +711,6 @@ IDS_RESTART_PROMPT "ÐÑ Ð´ÐµÐ¹ÑÑÐ²Ð¸ÑÐµÐ»ÑÐ½Ð¾ ÑÐ¾ÑÐ¸ÑÐµ Ð¿ÐµÑÐµÐ·Ð°Ð³ÑÑÐ·Ð¸ÑÑ ReactOS?" IDS_SHUTDOWN_TITLE "ÐÐ°Ð²ÐµÑÑÐµÐ½Ð¸Ðµ ÑÐ°Ð±Ð¾ÑÑ" IDS_SHUTDOWN_PROMPT "ÐÑ Ð´ÐµÐ¹ÑÑÐ²Ð¸ÑÐµÐ»ÑÐ½Ð¾ ÑÐ¾ÑÐ¸ÑÐµ Ð·Ð°Ð²ÐµÑÑÐ¸ÑÑ ÑÐ°Ð±Ð¾ÑÑ ReactOS?" - IDS_LOGOFF_TITLE "ÐÐ°Ð²ÐµÑÑÐµÐ½Ð¸Ðµ ÑÐµÐ°Ð½ÑÐ°" - IDS_LOGOFF_PROMPT "ÐÑ Ð´ÐµÐ¹ÑÑÐ²Ð¸ÑÐµÐ»ÑÐ½Ð¾ ÑÐ¾ÑÐ¸ÑÐµ Ð²ÑÐ¹ÑÐ¸ Ð¸Ð· ÑÐ¸ÑÑÐµÐ¼Ñ?" /* Run File dialog */ IDS_RUNDLG_ERROR "ÐÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð¾ÑÐ¾Ð±ÑÐ°Ð·Ð¸ÑÑ Ð´Ð¸Ð°Ð»Ð¾Ð³Ð¾Ð²Ð¾Ðµ Ð¾ÐºÐ½Ð¾ ÐÑÐ¿Ð¾Ð»Ð½Ð¸ÑÑ (Ð²Ð½ÑÑÑÐµÐ½Ð½ÑÑ Ð¾ÑÐ¸Ð±ÐºÐ°)" Modified: trunk/reactos/dll/win32/shell32/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sk-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/sk-SK.rc [iso-8859-1] Wed Jun 15 17:46:26 2016 @@ -475,15 +475,15 @@ ICON "", 12301, 50, 89, 21, 20, SS_REALSIZECONTROL END -IDD_LOG_OFF DIALOGEX 0, 0, 190, 60 +IDD_LOG_OFF DIALOGEX 0, 0, 188, 60 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION CAPTION "OdhlÃ¡siÅ¥ ReactOS" FONT 8, "MS Shell Dlg" BEGIN - ICON 45, 14344, 10, 10, 21, 20, SS_REALSIZECONTROL - LTEXT "Ste si istÃ½, Å¾e sa chcete odhlÃ¡siÅ¥?", -1, 43, 11, 140, 22 - DEFPUSHBUTTON "O&dhlÃ¡siÅ¥", IDOK, 57, 40, 60, 14 - PUSHBUTTON "ZruÅ¡iÅ¥", IDCANCEL, 122, 40, 60, 14 + ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20 + LTEXT "Ste si istÃ½, Å¾e sa chcete odhlÃ¡siÅ¥?", -1, 49, 15, 131, 8 + DEFPUSHBUTTON "O&dhlÃ¡siÅ¥", IDOK, 49, 38, 43, 14 + PUSHBUTTON "ZruÅ¡iÅ¥", IDCANCEL, 99, 38, 43, 14 END IDD_DISCONNECT DIALOGEX 0, 0, 190, 60 @@ -709,8 +709,6 @@ IDS_RESTART_PROMPT "Naozaj chcete reÅ¡tartovaÅ¥ systÃ©m?" IDS_SHUTDOWN_TITLE "VypnÃºÅ¥" IDS_SHUTDOWN_PROMPT "Naozaj chcete vypnÃºÅ¥ poÄÃtaÄ?" - IDS_LOGOFF_TITLE "OdhlÃ¡siÅ¥" - IDS_LOGOFF_PROMPT "Naozaj sa chcete odhlÃ¡siÅ¥?" /* Run File dialog */ IDS_RUNDLG_ERROR "NemoÅ¾no zobraziÅ¥ dialogovÃ© okno SpustiÅ¥ sÃºbor (vnÃºtornÃ¡ chyba)" Modified: trunk/reactos/dll/win32/shell32/lang/sl-SI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sl-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sl-SI.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/sl-SI.rc [iso-8859-1] Wed Jun 15 17:46:26 2016 @@ -475,15 +475,15 @@ ICON "", 12301, 50, 89, 21, 20, SS_REALSIZECONTROL END -IDD_LOG_OFF DIALOGEX 0, 0, 190, 60 +IDD_LOG_OFF DIALOGEX 0, 0, 188, 60 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION CAPTION "Log Off ReactOS" FONT 8, "MS Shell Dlg" BEGIN - ICON 45, 14344, 10, 10, 21, 20, SS_REALSIZECONTROL - LTEXT "Are you sure you want to log off?", -1, 43, 11, 140, 22 - DEFPUSHBUTTON "&Log Off", IDOK, 57, 40, 60, 14 - PUSHBUTTON "Cancel", IDCANCEL, 122, 40, 60, 14 + ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20 + LTEXT "Are you sure you want to log off?", -1, 49, 15, 131, 8 + DEFPUSHBUTTON "&Log Off", IDOK, 49, 38, 43, 14 + PUSHBUTTON "Cancel", IDCANCEL, 99, 38, 43, 14 END IDD_DISCONNECT DIALOGEX 0, 0, 190, 60 @@ -709,8 +709,6 @@ IDS_RESTART_PROMPT "Do you want to restart the system?" IDS_SHUTDOWN_TITLE "Shutdown" IDS_SHUTDOWN_PROMPT "Do you want to shutdown?" - IDS_LOGOFF_TITLE "Log Off" - IDS_LOGOFF_PROMPT "Do you want to log off?" /* Run File dialog */ IDS_RUNDLG_ERROR "Unable to display Run File dialog box (internal error)" Modified: trunk/reactos/dll/win32/shell32/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sq-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/sq-AL.rc [iso-8859-1] Wed Jun 15 17:46:26 2016 @@ -479,15 +479,15 @@ ICON "", 12301, 50, 89, 21, 20, SS_REALSIZECONTROL END -IDD_LOG_OFF DIALOGEX 0, 0, 190, 60 +IDD_LOG_OFF DIALOGEX 0, 0, 188, 60 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION CAPTION "Dil nga ReactOS" FONT 8, "MS Shell Dlg" BEGIN - ICON 45, 14344, 10, 10, 21, 20, SS_REALSIZECONTROL - LTEXT "Jeni te sigurte qe doni tÃ« dilni?", -1, 43, 11, 140, 22 - DEFPUSHBUTTON "&Dil", IDOK, 57, 40, 60, 14 - PUSHBUTTON "Anulo", IDCANCEL, 122, 40, 60, 14 + ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20 + LTEXT "Jeni te sigurte qe doni tÃ« dilni?", -1, 35, 16, 146, 8 + DEFPUSHBUTTON "&Dil", IDOK, 41, 39, 50, 14 + PUSHBUTTON "Anulo", IDCANCEL, 95, 39, 50, 14 END IDD_DISCONNECT DIALOGEX 0, 0, 190, 60 @@ -713,8 +713,6 @@ IDS_RESTART_PROMPT "Doni tÃ« rifilloni sistemin?" IDS_SHUTDOWN_TITLE "Fike" IDS_SHUTDOWN_PROMPT "Doni ta filkni sistemin?" - IDS_LOGOFF_TITLE "Dilni" - IDS_LOGOFF_PROMPT "Doni tÃ« dilni nga sistemi?" /* Run File dialog */ IDS_RUNDLG_ERROR "NÃ« pamundÃ«si pÃ«r tÃ« shfaqur kutinÃ« dialogut ekzekuto (gabim i brendshÃ«m)" Modified: trunk/reactos/dll/win32/shell32/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sv-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/sv-SE.rc [iso-8859-1] Wed Jun 15 17:46:26 2016 @@ -475,15 +475,15 @@ ICON "", 12301, 50, 89, 21, 20, SS_REALSIZECONTROL END -IDD_LOG_OFF DIALOGEX 0, 0, 190, 60 +IDD_LOG_OFF DIALOGEX 0, 0, 188, 60 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION CAPTION "Log Off ReactOS" FONT 8, "MS Shell Dlg" BEGIN - ICON 45, 14344, 10, 10, 21, 20, SS_REALSIZECONTROL - LTEXT "Are you sure you want to log off?", -1, 43, 11, 140, 22 - DEFPUSHBUTTON "&Log Off", IDOK, 57, 40, 60, 14 - PUSHBUTTON "Cancel", IDCANCEL, 122, 40, 60, 14 + ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20 + LTEXT "Are you sure you want to log off?", -1, 49, 15, 131, 8 + DEFPUSHBUTTON "&Log Off", IDOK, 49, 38, 43, 14 + PUSHBUTTON "Cancel", IDCANCEL, 99, 38, 43, 14 END IDD_DISCONNECT DIALOGEX 0, 0, 190, 60 @@ -709,8 +709,6 @@ IDS_RESTART_PROMPT "Do you want to restart the system?" IDS_SHUTDOWN_TITLE "Shutdown" IDS_SHUTDOWN_PROMPT "Do you want to shutdown?" - IDS_LOGOFF_TITLE "Log Off" - IDS_LOGOFF_PROMPT "Do you want to log off?" /* Run File dialog */ IDS_RUNDLG_ERROR "Unable to display Run File dialog box (internal error)" Modified: trunk/reactos/dll/win32/shell32/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/tr-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/tr-TR.rc [iso-8859-1] Wed Jun 15 17:46:26 2016 @@ -475,15 +475,15 @@ ICON "", 12301, 50, 89, 21, 20, SS_REALSIZECONTROL END -IDD_LOG_OFF DIALOGEX 0, 0, 190, 60 +IDD_LOG_OFF DIALOGEX 0, 0, 188, 60 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION CAPTION "ReactOS Oturumunu Kapat" FONT 8, "MS Shell Dlg" BEGIN - ICON 45, 14344, 10, 10, 21, 20, SS_REALSIZECONTROL - LTEXT "Oturumu kapatmayÄ± gerÃ§ekten istiyor musunuz?", -1, 43, 11, 140, 22 - DEFPUSHBUTTON "Oturumu &Kapat", IDOK, 57, 40, 60, 14 - PUSHBUTTON "Ä°ptal", IDCANCEL, 122, 40, 60, 14 + ICON IDI_SHELL_LOGOFF, IDC_STATIC, 7, 7, 21, 20 + LTEXT "Oturumu kapatmayÄ± gerÃ§ekten istiyor musunuz?", -1, 33, 16, 151, 8 + DEFPUSHBUTTON "Oturumu &Kapat", IDOK, 30, 39, 60, 14 + PUSHBUTTON "Ä°ptal", IDCANCEL, 95, 39, 60, 14 END IDD_DISCONNECT DIALOGEX 0, 0, 190, 60 @@ -709,8 +709,6 @@ IDS_RESTART_PROMPT "Oturumunuzu sonlandÄ±rÄ±r, ReactOS'Ä± kapatÄ±r, ve ReactOS'Ä± yeniden baÅlatÄ±r." IDS_SHUTDOWN_TITLE "BilgisayarÄ± Kapat" IDS_SHUTDOWN_PROMPT "Oturumunuzu sonlandÄ±rÄ±r ve ReactOS'Ä± kapatÄ±r, bÃ¶ylece bilgisayarÄ±nÄ±zÄ±n gÃ¼cÃ¼nÃ¼ kesebilirsiniz." - IDS_LOGOFF_TITLE "Oturumu Kapat" - IDS_LOGOFF_PROMPT "BilgisayarÄ± tam gÃ¼Ã§ aÃ§Ä±k bÄ±rakarak oturumunuzu kapatÄ±r." /* Run File dialog */ IDS_RUNDLG_ERROR "ÃalÄ±ÅtÄ±r kutusu aÃ§Ä±lamÄ±yor (dahili hata)" Modified: trunk/reactos/dll/win32/shell32/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/uk-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/uk-UA.rc [iso-8859-1] Wed Jun 15 17:46:26 2016 @@ -475,15 +475,15 @@ ICON "", 12301, 50, 89, 21, 20, SS_REALSIZECONTROL END -IDD_LOG_OFF DIALOGEX 0, 0, 190, 60 +IDD_LOG_OFF DIALOGEX 0, 0, 188, 60 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION CAPTION "ÐÐ¸ÑÑÐ´ ÑÐ· ReactOS" FONT 8, "MS Shell Dlg" BEGIN - ICON 45, 14344, 10, 10, 21, 20, SS_REALSIZECONTROL - LTEXT "ÐÐ¸ Ð´ÑÐ¹ÑÐ½Ð¾ Ð±Ð°Ð¶Ð°ÑÑÐµ Ð²Ð¸Ð¹ÑÐ¸ ÑÐ· ÑÐ¸ÑÑÐµÐ¼Ð¸?", -1, 43, 11, 140, 22 - DEFPUSHBUTTON "Ð&Ð¸ÑÑÐ´", IDOK, 57, 40, 60, 14 - PUSHBUTTON "Ð¡ÐºÐ°ÑÑÐ²Ð°ÑÐ¸", IDCANCEL, 122, 40, 60, 14 + ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20 + LTEXT "ÐÐ¸ Ð´ÑÐ¹ÑÐ½Ð¾ Ð±Ð°Ð¶Ð°ÑÑÐµ Ð²Ð¸Ð¹ÑÐ¸ ÑÐ· ÑÐ¸ÑÑÐµÐ¼Ð¸?", -1, 49, 15, 131, 8 + DEFPUSHBUTTON "Ð&Ð¸ÑÑÐ´", IDOK, 49, 38, 43, 14 + PUSHBUTTON "Ð¡ÐºÐ°ÑÑÐ²Ð°ÑÐ¸", IDCANCEL, 99, 38, 43, 14 END IDD_DISCONNECT DIALOGEX 0, 0, 190, 60 @@ -709,8 +709,6 @@ IDS_RESTART_PROMPT "ÐÐ¸ ÑÐ¾ÑÐµÑÐµ Ð¿ÐµÑÐµÐ·Ð°Ð²Ð°Ð½ÑÐ°Ð¶Ð¸ÑÐ¸ ÑÐ¸ÑÑÐµÐ¼Ñ?" IDS_SHUTDOWN_TITLE "ÐÐ¸Ð¼ÐºÐ½ÑÑÐ¸" IDS_SHUTDOWN_PROMPT "ÐÐ¸ ÑÐ¾ÑÐµÑÐµ Ð²Ð¸Ð¼ÐºÐ½ÑÑÐ¸ ÐºÐ¾Ð¼Ð¿'ÑÑÐµÑ?" - IDS_LOGOFF_TITLE "ÐÐ¸ÑÑÐ´ Ð· ÑÐ¸ÑÑÐµÐ¼Ð¸" - IDS_LOGOFF_PROMPT "ÐÐ¸ ÑÐ¾ÑÐµÑÐµ Ð²Ð¸Ð¹ÑÐ¸ Ð· ÑÐ¸ÑÑÐµÐ¼Ð¸?" /* Run File dialog */ IDS_RUNDLG_ERROR "ÐÐµÐ¼Ð¾Ð¶Ð»Ð¸Ð²Ð¾ Ð²ÑÐ´Ð¾Ð±ÑÐ°Ð·Ð¸ÑÐ¸ ÐÑÐ°Ð»Ð¾Ð³ ÐÐ°Ð¿ÑÑÐºÑ Ð¤Ð°Ð¹Ð»Ñ (Ð²Ð½ÑÑÑÑÑÐ½Ñ Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ°)" Modified: trunk/reactos/dll/win32/shell32/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/zh-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/zh-CN.rc [iso-8859-1] Wed Jun 15 17:46:26 2016 @@ -484,15 +484,15 @@ ICON "", 12301, 50, 89, 21, 20, SS_REALSIZECONTROL END -IDD_LOG_OFF DIALOGEX 0, 0, 190, 60 +IDD_LOG_OFF DIALOGEX 0, 0, 188, 60 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION CAPTION "æ³¨é ReactOS" FONT 9, "MS Shell Dlg" BEGIN - ICON 45, 14344, 10, 10, 21, 20, SS_REALSIZECONTROL - LTEXT "ç¡®ä¿¡ä½ æ³è¦æ³¨éå?", -1, 43, 11, 140, 22 - DEFPUSHBUTTON "æ³¨é(&L)", IDOK, 57, 40, 60, 14 - PUSHBUTTON "åæ¶", IDCANCEL, 122, 40, 60, 14 + ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20 + LTEXT "ç¡®ä¿¡ä½ æ³è¦æ³¨éå?", -1, 35, 16, 146, 8 + DEFPUSHBUTTON "æ³¨é(&L)", IDOK, 41, 39, 50, 14 + PUSHBUTTON "åæ¶", IDCANCEL, 95, 39, 50, 14 END IDD_DISCONNECT DIALOGEX 0, 0, 190, 60 @@ -716,8 +716,6 @@ IDS_RESTART_PROMPT "æ¯å¦éæ°å¯å¨ç³»ç»?" IDS_SHUTDOWN_TITLE "å³æº" IDS_SHUTDOWN_PROMPT "æ¯å¦å³éç³»ç»?" - IDS_LOGOFF_TITLE "æ³¨é" - IDS_LOGOFF_PROMPT "ä½ æ³è¦æ³¨éåï¼" /* Run File dialog */ IDS_RUNDLG_ERROR "æ æ³æ¾ç¤ºè¿è¡æä»¶å¯¹è¯æ¡ ï¼åé¨éè¯¯ï¼" Modified: trunk/reactos/dll/win32/shell32/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/zh-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/zh-TW.rc [iso-8859-1] Wed Jun 15 17:46:26 2016 @@ -483,15 +483,15 @@ ICON "", 12301, 50, 89, 21, 20, SS_REALSIZECONTROL END -IDD_LOG_OFF DIALOGEX 0, 0, 190, 60 +IDD_LOG_OFF DIALOGEX 0, 0, 188, 60 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION CAPTION "Log Off ReactOS" FONT 9, "MS Shell Dlg" BEGIN - ICON 45, 14344, 10, 10, 21, 20, SS_REALSIZECONTROL - LTEXT "Are you sure you want to log off?", -1, 43, 11, 140, 22 - DEFPUSHBUTTON "&Log Off", IDOK, 57, 40, 60, 14 - PUSHBUTTON "Cancel", IDCANCEL, 122, 40, 60, 14 + ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20 + LTEXT "Are you sure you want to log off?", -1, 49, 15, 131, 8 + DEFPUSHBUTTON "&Log Off", IDOK, 49, 38, 43, 14 + PUSHBUTTON "Cancel", IDCANCEL, 99, 38, 43, 14 END IDD_DISCONNECT DIALOGEX 0, 0, 190, 60 @@ -717,8 +717,6 @@ IDS_RESTART_PROMPT "Do you want to restart the system?" IDS_SHUTDOWN_TITLE "éæ©" IDS_SHUTDOWN_PROMPT "Do you want to shutdown?" - IDS_LOGOFF_TITLE "ç»åº" - IDS_LOGOFF_PROMPT "Do you want to log off?" /* Run File dialog */ IDS_RUNDLG_ERROR "Unable to display Run File dialog box (internal error)" Modified: trunk/reactos/dll/win32/shell32/shresdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shresdef… ============================================================================== --- trunk/reactos/dll/win32/shell32/shresdef.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shresdef.h [iso-8859-1] Wed Jun 15 17:46:26 2016 @@ -110,9 +110,6 @@ #define IDS_DRIVE_FLOPPY 75 #define IDS_DRIVE_REMOVABLE 76 #define IDS_FS_UNKNOWN 77 - -#define IDS_LOGOFF_TITLE 78 -#define IDS_LOGOFF_PROMPT 79 #define IDS_CREATEFOLDER_DENIED 128 #define IDS_CREATEFOLDER_CAPTION 129

8 years, 7 months

[hbelusca] 71642: [APITESTS]: Fix MSVC warning C4114: "same type qualifier used more than once".

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Wed Jun 15 17:45:06 2016 New Revision: 71642 URL: http://svn.reactos.org/svn/reactos?rev=71642&view=rev Log: [APITESTS]: Fix MSVC warning C4114: "same type qualifier used more than once". Modified: trunk/rostests/apitests/advapi32/RtlEncryptMemory.c Modified: trunk/rostests/apitests/advapi32/RtlEncryptMemory.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/advapi32/RtlEncr… ============================================================================== --- trunk/rostests/apitests/advapi32/RtlEncryptMemory.c [iso-8859-1] (original) +++ trunk/rostests/apitests/advapi32/RtlEncryptMemory.c [iso-8859-1] Wed Jun 15 17:45:06 2016 @@ -15,7 +15,7 @@ START_TEST(RtlEncryptMemory) { - static const CHAR const TestData[32] = "This is some test Message!!!"; + static const CHAR TestData[32] = "This is some test Message!!!"; CHAR Buffer[32]; NTSTATUS Status;

8 years, 7 months

[apriyadarshi] 71641: Added AHCI_Global_HBA_CAP_S64A support Added AhciProcessIO Added RC file Added CMAKE file And Some fixes

by apriyadarshi＠svn.reactos.org

Author: apriyadarshi Date: Wed Jun 15 17:07:26 2016 New Revision: 71641 URL: http://svn.reactos.org/svn/reactos?rev=71641&view=rev Log: Added AHCI_Global_HBA_CAP_S64A support Added AhciProcessIO Added RC file Added CMAKE file And Some fixes Added: branches/GSoC_2016/AHCI/drivers/storage/storahci/CMakeLists.txt (with props) branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.rc (with props) Modified: branches/GSoC_2016/AHCI/drivers/storage/storahci/sources branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.c branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.h Added: branches/GSoC_2016/AHCI/drivers/storage/storahci/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/AHCI/drivers/storage/… ============================================================================== --- branches/GSoC_2016/AHCI/drivers/storage/storahci/CMakeLists.txt (added) +++ branches/GSoC_2016/AHCI/drivers/storage/storahci/CMakeLists.txt [iso-8859-1] Wed Jun 15 17:07:26 2016 @@ -0,0 +1,28 @@ + +set_cpp() + +include_directories( + BEFORE ${CMAKE_CURRENT_SOURCE_DIR} + inc) + +#add_definitions(-DDEBUG) + +list(APPEND SOURCE + storahci.cpp + ros_glue/ros_glue.cpp + stdafx.h) + +add_library(storahci SHARED ${SOURCE} storahci.rc) + +if(NOT MSVC) + add_target_compile_flags(storahci "-Wno-narrowing") + if(NOT CMAKE_C_COMPILER_ID STREQUAL "Clang") + add_target_compile_flags(storahci "-Wno-unused-but-set-variable") + endif() +endif() + +add_pch(storahci stdafx.h SOURCE) +set_module_type(storahci kernelmodedriver) +add_importlibs(storahci storport ntoskrnl hal) +add_cd_file(TARGET storahci DESTINATION reactos/system32/drivers NO_CAB FOR all) +add_registry_inf(storahci.inf) Propchange: branches/GSoC_2016/AHCI/drivers/storage/storahci/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/GSoC_2016/AHCI/drivers/storage/storahci/sources URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/AHCI/drivers/storage/… ============================================================================== --- branches/GSoC_2016/AHCI/drivers/storage/storahci/sources [iso-8859-1] (original) +++ branches/GSoC_2016/AHCI/drivers/storage/storahci/sources [iso-8859-1] Wed Jun 15 17:07:26 2016 @@ -6,4 +6,5 @@ INCLUDES = %BUILD%\inc LIBS = %BUILD%\lib -SOURCES = storahci.c +SOURCES = storahci.c \ + storahci.rc Modified: branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/AHCI/drivers/storage/… ============================================================================== --- branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.c [iso-8859-1] (original) +++ branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.c [iso-8859-1] Wed Jun 15 17:07:26 2016 @@ -61,18 +61,21 @@ return FALSE; } - if ((adapterExtension->CAP & AHCI_Global_HBA_CAP_S64A) != 0) - { - DebugPrint("\tCAP.S64A not supported\n"); - return FALSE; - } - // 10.1.2 For each implemented port, system software shall allocate memory for and program: // ï· PxCLB and PxCLBU (if CAP.S64A is set to â1â) // ï· PxFB and PxFBU (if CAP.S64A is set to â1â) // Note: Assuming 32bit support only StorPortWriteRegisterUlong(adapterExtension, &PortExtension->Port->CLB, commandListPhysical.LowPart); + if ((adapterExtension->CAP & AHCI_Global_HBA_CAP_S64A) != 0) + { + StorPortWriteRegisterUlong(adapterExtension, &PortExtension->Port->CLBU, commandListPhysical.HighPart); + } + StorPortWriteRegisterUlong(adapterExtension, &PortExtension->Port->FB, receivedFISPhysical.LowPart); + if ((adapterExtension->CAP & AHCI_Global_HBA_CAP_S64A) != 0) + { + StorPortWriteRegisterUlong(adapterExtension, &PortExtension->Port->FBU, receivedFISPhysical.HighPart); + } // set device power state flag to D0 PortExtension->DevicePowerState = StorPowerDeviceD0; @@ -207,14 +210,17 @@ /** * @name AhciInterruptHandler - * @implemented + * @not_implemented * * Interrupt Handler for PortExtension * * @param PortExtension * - */ -VOID + * @return + * return TRUE Indicates the interrupt was handled correctly + * return FALSE Indicates something went wrong + */ +BOOLEAN AhciInterruptHandler ( __in PAHCI_PORT_EXTENSION PortExtension ) @@ -222,6 +228,7 @@ DebugPrint("AhciInterruptHandler()\n"); DebugPrint("\tPort Number: %d\n", PortExtension->PortNumber); + return FALSE; }// -- AhciInterruptHandler(); /** @@ -277,11 +284,10 @@ // we can assign this interrupt to this port adapterExtension->LastInterruptPort = nextPort; - AhciInterruptHandler(&adapterExtension->PortExtension[nextPort]); - return TRUE; - } - - DebugPrint("\tSomething wrong"); + return AhciInterruptHandler(&adapterExtension->PortExtension[nextPort]); + } + + DebugPrint("\tSomething went wrong"); return FALSE; }// -- AhciHwInterrupt(); @@ -376,7 +382,6 @@ { Srb->SrbStatus = DeviceInquiryRequest(adapterExtension, Srb, cdb); StorPortNotification(RequestComplete, adapterExtension, Srb); - return TRUE; } } @@ -417,6 +422,11 @@ DebugPrint("AhciHwResetBus()\n"); adapterExtension = AdapterExtension; + + if (IsPortValid(AdapterExtension, PathId)) + { + // TODO: Reset Port + } return FALSE; }// -- AhciHwResetBus(); @@ -515,13 +525,12 @@ accessRange = *ConfigInfo->AccessRanges; if (accessRange[index].RangeStart.QuadPart == adapterExtension->AhciBaseAddress) { - abar = StorPortGetDeviceBase( - adapterExtension, - ConfigInfo->AdapterInterfaceType, - ConfigInfo->SystemIoBusNumber, - accessRange[index].RangeStart, - accessRange[index].RangeLength, - !accessRange[index].RangeInMemory); + abar = StorPortGetDeviceBase(adapterExtension, + ConfigInfo->AdapterInterfaceType, + ConfigInfo->SystemIoBusNumber, + accessRange[index].RangeStart, + accessRange[index].RangeLength, + !accessRange[index].RangeInMemory); break; } } @@ -647,11 +656,10 @@ hwInitializationData.DeviceExtensionSize = sizeof(AHCI_ADAPTER_EXTENSION); // register our hw init data - status = StorPortInitialize( - DriverObject, - RegistryPath, - &hwInitializationData, - NULL); + status = StorPortInitialize(DriverObject, + RegistryPath, + &hwInitializationData, + NULL); DebugPrint("\tstatus:%x\n", status); return status; @@ -768,6 +776,63 @@ }// -- IsPortValid() /** + * @name AhciProcessIO + * @not_implemented + * + * Acquire Exclusive lock to port, populate pending commands to command List + * program controller's port to process new commands in command list. + * + * @param AdapterExtension + * @param pathId + * @param Srb + * + */ +VOID +AhciProcessIO ( + __in PAHCI_ADAPTER_EXTENSION AdapterExtension, + __in UCHAR pathId + ) +{ + STOR_LOCK_HANDLE lockhandle; + PAHCI_PORT_EXTENSION PortExtension; + ULONG commandSlotMask, occupiedSlots, slotIndex; + + DebugPrint("AhciProcessIO()\n"); + DebugPrint("\tPathId: %d\n", pathId); + + PortExtension = &AdapterExtension->PortExtension[pathId]; + + NT_ASSERT(pathId < MAXIMUM_AHCI_PORT_COUNT); + + if (PortExtension->IsActive == FALSE) + return; // we should wait for device to get active + + AhciZeroMemory(&lockhandle, sizeof(lockhandle)); + + // Acquire Lock + StorPortAcquireSpinLock(AdapterExtension, InterruptLock, NULL, &lockhandle); + + occupiedSlots = PortExtension->OccupiedSlots; // Busy command slots for given port + commandSlotMask = (1 << AHCI_Global_Port_CAP_NCS(AdapterExtension->CAP)) - 1; // available slots mask + + commandSlotMask = (commandSlotMask & ~occupiedSlots); + if(commandSlotMask != 0) + { + for (slotIndex = 0; slotIndex <= AHCI_Global_Port_CAP_NCS(AdapterExtension->CAP); slotIndex++) + { + // find first free slot + if ((commandSlotMask & (1 << slotIndex)) != 0) + { + // TODO: remove from queue and process it + } + } + } + + // Release Lock + StorPortReleaseSpinLock(AdapterExtension, &lockhandle); +}// -- AhciProcessIO(); + +/** * @name DeviceInquiryRequest * @implemented * @@ -816,5 +881,6 @@ AhciZeroMemory(DataBuffer, DataBufferLength); } - return SRB_STATUS_BAD_FUNCTION; + AhciProcessIO(AdapterExtension, Srb->PathId, Srb); + return SRB_STATUS_SUCCESS; }// -- DeviceInquiryRequest(); Modified: branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/AHCI/drivers/storage/… ============================================================================== --- branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.h [iso-8859-1] (original) +++ branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.h [iso-8859-1] Wed Jun 15 17:07:26 2016 @@ -199,6 +199,7 @@ typedef struct _AHCI_PORT_EXTENSION { ULONG PortNumber; + ULONG OccupiedSlots; // slots to which we have already assigned task BOOLEAN IsActive; PAHCI_PORT Port; // AHCI Port Infomation PAHCI_RECEIVED_FIS ReceivedFIS; Added: branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.rc URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/AHCI/drivers/storage/… ============================================================================== --- branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.rc (added) +++ branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.rc [iso-8859-1] Wed Jun 15 17:07:26 2016 @@ -0,0 +1,22 @@ +// +// PROJECT: ReactOS Kernel +// LICENSE: GNU GPLv2 only as published by the Free Software Foundation +// PURPOSE: To Implement AHCI Miniport driver targeting storport NT 5.2 +// PROGRAMMERS: Aman Priyadarshi (aman.eureka(a)gmail.com) +// + +#define VERSION 1 +#define VERSION_STR "1.0" + +#define REACTOS_FILETYPE VFT_DRV +#define REACTOS_FILESUBTYPE VFT2_DRV_SYSTEM +#define REACTOS_FILEVERSION VERSION +#define REACTOS_PRODUCTVERSION VERSION +#define REACTOS_STR_COMPANY_NAME "ReactOS Development Team" +#define REACTOS_STR_FILE_DESCRIPTION "AHCI Storport Miniport Driver" +#define REACTOS_STR_FILE_VERSION VERSION_STR +#define REACTOS_STR_INTERNAL_NAME "storahci.sys" +#define REACTOS_STR_ORIGINAL_FILENAME "storahci.sys" +#define REACTOS_STR_LEGAL_COPYRIGHT "Copyright 2010 ReactOS Team" +#define REACTOS_STR_PRODUCT_NAME "AHCI Driver for ReactOS" +#define REACTOS_STR_PRODUCT_VERSION VERSION_STR Propchange: branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.rc ------------------------------------------------------------------------------ svn:eol-style = native

8 years, 7 months

[ekohl] 71640: [SC] Add some error and success messages to the config and description commands.

by ekohl＠svn.reactos.org

Author: ekohl Date: Tue Jun 14 22:00:34 2016 New Revision: 71640 URL: http://svn.reactos.org/svn/reactos?rev=71640&view=rev Log: [SC] Add some error and success messages to the config and description commands. Modified: trunk/reactos/base/applications/sc/config.c trunk/reactos/base/applications/sc/description.c Modified: trunk/reactos/base/applications/sc/config.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sc/confi… ============================================================================== --- trunk/reactos/base/applications/sc/config.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/sc/config.c [iso-8859-1] Tue Jun 14 22:00:34 2016 @@ -2,7 +2,7 @@ * PROJECT: ReactOS Services * LICENSE: GPL - See COPYING in the top level directory * FILE: base/applications/sc/config.c - * PURPOSE: Set the service configuration + * PURPOSE: Query/Set the service configuration * COPYRIGHT: Copyright 2016 Eric Kohl * */ @@ -28,6 +28,7 @@ SC_MANAGER_CONNECT); if (hManager == NULL) { + _tprintf(_T("[SC] OpenSCManager FAILED %lu:\n\n"), GetLastError()); bResult = FALSE; goto done; } @@ -35,6 +36,7 @@ hService = OpenService(hManager, ServiceName, SERVICE_QUERY_CONFIG); if (hService == NULL) { + _tprintf(_T("[SC] OpenService FAILED %lu:\n\n"), GetLastError()); bResult = FALSE; goto done; } @@ -46,6 +48,7 @@ { if (cbBytesNeeded == 0) { + _tprintf(_T("[SC] QueryServiceConfig FAILED %lu:\n\n"), GetLastError()); bResult = FALSE; goto done; } @@ -55,6 +58,7 @@ if (pServiceConfig == NULL) { SetLastError(ERROR_OUTOFMEMORY); + _tprintf(_T("[SC] HeapAlloc FAILED %lu:\n\n"), GetLastError()); bResult = FALSE; goto done; } @@ -64,9 +68,12 @@ cbBytesNeeded, &cbBytesNeeded)) { - bResult = FALSE; - goto done; - } + _tprintf(_T("[SC] QueryServiceConfig FAILED %lu:\n\n"), GetLastError()); + bResult = FALSE; + goto done; + } + + _tprintf(_T("[SC] QueryServiceConfig SUCCESS\n\n")); _tprintf(_T("SERVICE_NAME: %s\n"), ServiceName); _tprintf(_T(" TYPE : %-3lx "), pServiceConfig->dwServiceType); Modified: trunk/reactos/base/applications/sc/description.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sc/descr… ============================================================================== --- trunk/reactos/base/applications/sc/description.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/sc/description.c [iso-8859-1] Tue Jun 14 22:00:34 2016 @@ -26,6 +26,7 @@ SC_MANAGER_CONNECT); if (hManager == NULL) { + _tprintf(_T("[SC] OpenSCManager FAILED %lu:\n\n"), GetLastError()); bResult = FALSE; goto done; } @@ -33,6 +34,7 @@ hService = OpenService(hManager, ServiceName, SERVICE_QUERY_CONFIG); if (hService == NULL) { + _tprintf(_T("[SC] OpenService FAILED %lu:\n\n"), GetLastError()); bResult = FALSE; goto done; } @@ -45,6 +47,7 @@ { if (cbBytesNeeded == 0) { + _tprintf(_T("[SC] QueryServiceConfig2 FAILED %lu:\n\n"), GetLastError()); bResult = FALSE; goto done; } @@ -54,6 +57,7 @@ if (pServiceDescription == NULL) { SetLastError(ERROR_OUTOFMEMORY); + _tprintf(_T("[SC] HeapAlloc FAILED %lu:\n\n"), GetLastError()); bResult = FALSE; goto done; } @@ -64,9 +68,12 @@ cbBytesNeeded, &cbBytesNeeded)) { + _tprintf(_T("[SC] QueryServiceConfig2 FAILED %lu:\n\n"), GetLastError()); bResult = FALSE; goto done; } + + _tprintf(_T("[SC] QueryServiceConfig2 SUCCESS\n\n")); _tprintf(_T("SERVICE_NAME: %s\n"), ServiceName); _tprintf(_T(" DESCRIPTION : %s\n"), @@ -105,6 +112,7 @@ SC_MANAGER_CONNECT); if (hManager == NULL) { + _tprintf(_T("[SC] OpenSCManager FAILED %lu:\n\n"), GetLastError()); bResult = FALSE; goto done; } @@ -112,6 +120,7 @@ hService = OpenService(hManager, ServiceName, SERVICE_CHANGE_CONFIG); if (hService == NULL) { + _tprintf(_T("[SC] OpenService FAILED %lu:\n\n"), GetLastError()); bResult = FALSE; goto done; } @@ -122,9 +131,12 @@ SERVICE_CONFIG_DESCRIPTION, (LPBYTE)&ServiceDescription)) { + _tprintf(_T("[SC] ChangeServiceConfig2 FAILED %lu:\n\n"), GetLastError()); bResult = FALSE; goto done; } + + _tprintf(_T("[SC] ChangeServiceConfig2 SUCCESS\n\n")); done: if (bResult == FALSE)

8 years, 7 months

[ekohl] 71639: [SC] Merge the failure functions into a single file.

by ekohl＠svn.reactos.org

Author: ekohl Date: Tue Jun 14 20:58:37 2016 New Revision: 71639 URL: http://svn.reactos.org/svn/reactos?rev=71639&view=rev Log: [SC] Merge the failure functions into a single file. Removed: trunk/reactos/base/applications/sc/qfailure.c Modified: trunk/reactos/base/applications/sc/CMakeLists.txt trunk/reactos/base/applications/sc/failure.c Modified: trunk/reactos/base/applications/sc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sc/CMake… ============================================================================== --- trunk/reactos/base/applications/sc/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/sc/CMakeLists.txt [iso-8859-1] Tue Jun 14 20:58:37 2016 @@ -10,7 +10,6 @@ failure.c misc.c print.c - qfailure.c query.c sc.c sdset.c Modified: trunk/reactos/base/applications/sc/failure.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sc/failu… ============================================================================== --- trunk/reactos/base/applications/sc/failure.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/sc/failure.c [iso-8859-1] Tue Jun 14 20:58:37 2016 @@ -2,11 +2,119 @@ * PROJECT: ReactOS Services * LICENSE: GPL - See COPYING in the top level directory * FILE: base/applications/sc/failure.c - * PURPOSE: Set the service failure actions + * PURPOSE: Query/Set the service failure actions * COPYRIGHT: Copyright 2016 Eric Kohl */ #include "sc.h" + +BOOL QueryFailure(LPCTSTR ServiceName) +{ + SC_HANDLE hManager = NULL; + SC_HANDLE hService = NULL; + BOOL bResult = TRUE; + DWORD cbBytesNeeded = 0; + LPSERVICE_FAILURE_ACTIONS pServiceFailure = NULL; + INT i; + +#ifdef SCDBG + _tprintf(_T("service to show failure action - %s\n\n"), ServiceName); +#endif + + hManager = OpenSCManager(NULL, + NULL, + SC_MANAGER_CONNECT); + if (hManager == NULL) + { + bResult = FALSE; + goto done; + } + + hService = OpenService(hManager, ServiceName, SERVICE_QUERY_CONFIG); + if (hService == NULL) + { + bResult = FALSE; + goto done; + } + + if (!QueryServiceConfig2(hService, + SERVICE_CONFIG_FAILURE_ACTIONS, + NULL, + 0, + &cbBytesNeeded)) + { + if (cbBytesNeeded == 0) + { + bResult = FALSE; + goto done; + } + } + + pServiceFailure = HeapAlloc(GetProcessHeap(), 0, cbBytesNeeded); + if (pServiceFailure == NULL) + { + SetLastError(ERROR_OUTOFMEMORY); + bResult = FALSE; + goto done; + } + + if (!QueryServiceConfig2(hService, + SERVICE_CONFIG_FAILURE_ACTIONS, + (LPBYTE)pServiceFailure, + cbBytesNeeded, + &cbBytesNeeded)) + { + bResult = FALSE; + goto done; + } + + _tprintf(_T("SERVICE_NAME: %s\n"), ServiceName); + _tprintf(_T(" RESET_PERIOD : %lu seconds\n"), pServiceFailure->dwResetPeriod); + _tprintf(_T(" REBOOT_MESSAGE : %s\n"), (pServiceFailure->lpRebootMsg) ? pServiceFailure->lpRebootMsg : _T("")); + _tprintf(_T(" COMMAND_LINE : %s\n"), (pServiceFailure->lpCommand) ? pServiceFailure->lpCommand : _T("")); + _tprintf(_T(" FAILURE_ACTIONS : ")); + for (i = 0; i < pServiceFailure->cActions; i++) + { + if (i != 0) + _tprintf(_T(" ")); + switch (pServiceFailure->lpsaActions[i].Type) + { + case SC_ACTION_NONE: + continue; + + case SC_ACTION_RESTART: + _tprintf(_T("RESTART -- Delay = %lu milliseconds.\n"), pServiceFailure->lpsaActions[i].Delay); + break; + + case SC_ACTION_REBOOT: + _tprintf(_T("REBOOT -- Delay = %lu milliseconds.\n"), pServiceFailure->lpsaActions[i].Delay); + break; + + case SC_ACTION_RUN_COMMAND: + _tprintf(_T("RUN_COMMAND -- Delay = %lu milliseconds.\n"), pServiceFailure->lpsaActions[i].Delay); + break; + + default: + _tprintf(_T("\n")); + break; + } + } + +done: + if (bResult == FALSE) + ReportLastError(); + + if (pServiceFailure != NULL) + HeapFree(GetProcessHeap(), 0, pServiceFailure); + + if (hService) + CloseServiceHandle(hService); + + if (hManager) + CloseServiceHandle(hManager); + + return bResult; +} BOOL SetFailure( Removed: trunk/reactos/base/applications/sc/qfailure.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sc/qfail… ============================================================================== --- trunk/reactos/base/applications/sc/qfailure.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/sc/qfailure.c (removed) @@ -1,118 +0,0 @@ -/* - * PROJECT: ReactOS Services - * LICENSE: GPL - See COPYING in the top level directory - * FILE: base/applications/sc/qfailure.c - * PURPOSE: Show the service failure action - * COPYRIGHT: Copyright 2016 Eric Kohl - * - */ - -#include "sc.h" - -BOOL QueryFailure(LPCTSTR ServiceName) -{ - SC_HANDLE hManager = NULL; - SC_HANDLE hService = NULL; - BOOL bResult = TRUE; - DWORD cbBytesNeeded = 0; - LPSERVICE_FAILURE_ACTIONS pServiceFailure = NULL; - INT i; - -#ifdef SCDBG - _tprintf(_T("service to show failure action - %s\n\n"), ServiceName); -#endif - - hManager = OpenSCManager(NULL, - NULL, - SC_MANAGER_CONNECT); - if (hManager == NULL) - { - bResult = FALSE; - goto done; - } - - hService = OpenService(hManager, ServiceName, SERVICE_QUERY_CONFIG); - if (hService == NULL) - { - bResult = FALSE; - goto done; - } - - if (!QueryServiceConfig2(hService, - SERVICE_CONFIG_FAILURE_ACTIONS, - NULL, - 0, - &cbBytesNeeded)) - { - if (cbBytesNeeded == 0) - { - bResult = FALSE; - goto done; - } - } - - pServiceFailure = HeapAlloc(GetProcessHeap(), 0, cbBytesNeeded); - if (pServiceFailure == NULL) - { - SetLastError(ERROR_OUTOFMEMORY); - bResult = FALSE; - goto done; - } - - if (!QueryServiceConfig2(hService, - SERVICE_CONFIG_FAILURE_ACTIONS, - (LPBYTE)pServiceFailure, - cbBytesNeeded, - &cbBytesNeeded)) - { - bResult = FALSE; - goto done; - } - - _tprintf(_T("SERVICE_NAME: %s\n"), ServiceName); - _tprintf(_T(" RESET_PERIOD : %lu seconds\n"), pServiceFailure->dwResetPeriod); - _tprintf(_T(" REBOOT_MESSAGE : %s\n"), (pServiceFailure->lpRebootMsg) ? pServiceFailure->lpRebootMsg : _T("")); - _tprintf(_T(" COMMAND_LINE : %s\n"), (pServiceFailure->lpCommand) ? pServiceFailure->lpCommand : _T("")); - _tprintf(_T(" FAILURE_ACTIONS : ")); - for (i = 0; i < pServiceFailure->cActions; i++) - { - if (i != 0) - _tprintf(_T(" ")); - switch (pServiceFailure->lpsaActions[i].Type) - { - case SC_ACTION_NONE: - continue; - - case SC_ACTION_RESTART: - _tprintf(_T("RESTART -- Delay = %lu milliseconds.\n"), pServiceFailure->lpsaActions[i].Delay); - break; - - case SC_ACTION_REBOOT: - _tprintf(_T("REBOOT -- Delay = %lu milliseconds.\n"), pServiceFailure->lpsaActions[i].Delay); - break; - - case SC_ACTION_RUN_COMMAND: - _tprintf(_T("RUN_COMMAND -- Delay = %lu milliseconds.\n"), pServiceFailure->lpsaActions[i].Delay); - break; - - default: - _tprintf(_T("\n")); - break; - } - } - -done: - if (bResult == FALSE) - ReportLastError(); - - if (pServiceFailure != NULL) - HeapFree(GetProcessHeap(), 0, pServiceFailure); - - if (hService) - CloseServiceHandle(hService); - - if (hManager) - CloseServiceHandle(hManager); - - return bResult; -}

8 years, 7 months

← Newer
1
...
4
5
6
7
8
9
10
...
23
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 June 2016