Ros-diffs October 2017

ros-diffs@reactos.org

43 participants
275 discussions

[reactos] 01/01: [STORAHCI] Make the storahci driver build on gcc and add it to the build.

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=28f30ba85404b33cb9e47… commit 28f30ba85404b33cb9e475d9c78ea56f5bec840a Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Fri Oct 13 21:52:38 2017 +0200 [STORAHCI] Make the storahci driver build on gcc and add it to the build. --- drivers/storage/CMakeLists.txt | 2 +- drivers/storage/storahci/storahci.c | 86 ++++++++++++++++++++++++++---------- drivers/storage/storahci/storahci.h | 8 +++- drivers/storage/storahci/storahci.rc | 17 ++----- 4 files changed, 73 insertions(+), 40 deletions(-) diff --git a/drivers/storage/CMakeLists.txt b/drivers/storage/CMakeLists.txt index 44cd86852b..610df522d2 100644 --- a/drivers/storage/CMakeLists.txt +++ b/drivers/storage/CMakeLists.txt @@ -6,4 +6,4 @@ add_subdirectory(floppy) add_subdirectory(ide) add_subdirectory(port) add_subdirectory(scsiport) -#add_subdirectory(storahci) +add_subdirectory(storahci) diff --git a/drivers/storage/storahci/storahci.c b/drivers/storage/storahci/storahci.c index 97138a6a0a..54931ac6ff 100644 --- a/drivers/storage/storahci/storahci.c +++ b/drivers/storage/storahci/storahci.c @@ -19,10 +19,12 @@ * Return true if intialization was successful */ BOOLEAN +NTAPI AhciPortInitialize ( - __in PAHCI_PORT_EXTENSION PortExtension + __in PVOID DeviceExtension ) { + PAHCI_PORT_EXTENSION PortExtension; AHCI_PORT_CMD cmd; PAHCI_MEMORY_REGISTERS abar; ULONG mappedLength, portNumber, ticks; @@ -31,6 +33,7 @@ AhciPortInitialize ( AhciDebugPrint("AhciPortInitialize()\n"); + PortExtension = (PAHCI_PORT_EXTENSION)DeviceExtension; adapterExtension = PortExtension->AdapterExtension; abar = adapterExtension->ABAR_Address; portNumber = PortExtension->PortNumber; @@ -95,8 +98,8 @@ AhciPortInitialize ( } // 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’) + // ? 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 (IsAdapterCAPS64(adapterExtension->CAP)) @@ -417,8 +420,8 @@ AhciStartPort ( VOID AhciCommandCompletionDpcRoutine ( __in PSTOR_DPC Dpc, - __in PAHCI_ADAPTER_EXTENSION AdapterExtension, - __in PAHCI_PORT_EXTENSION PortExtension, + __in PVOID HwDeviceExtension, + __in PVOID SystemArgument1, __in PVOID SystemArgument2 ) { @@ -426,12 +429,17 @@ AhciCommandCompletionDpcRoutine ( PAHCI_SRB_EXTENSION SrbExtension; STOR_LOCK_HANDLE lockhandle = {0}; PAHCI_COMPLETION_ROUTINE CompletionRoutine; + PAHCI_ADAPTER_EXTENSION AdapterExtension; + PAHCI_PORT_EXTENSION PortExtension; UNREFERENCED_PARAMETER(Dpc); UNREFERENCED_PARAMETER(SystemArgument2); AhciDebugPrint("AhciCommandCompletionDpcRoutine()\n"); + AdapterExtension = (PAHCI_ADAPTER_EXTENSION)HwDeviceExtension; + PortExtension = (PAHCI_PORT_EXTENSION)SystemArgument1; + StorPortAcquireSpinLock(AdapterExtension, InterruptLock, NULL, &lockhandle); Srb = RemoveQueue(&PortExtension->CompletionQueue); StorPortReleaseSpinLock(AdapterExtension, &lockhandle); @@ -473,14 +481,17 @@ AhciCommandCompletionDpcRoutine ( */ BOOLEAN AhciHwPassiveInitialize ( - __in PAHCI_ADAPTER_EXTENSION AdapterExtension + __in PVOID DeviceExtension ) { ULONG index; + PAHCI_ADAPTER_EXTENSION AdapterExtension; PAHCI_PORT_EXTENSION PortExtension; AhciDebugPrint("AhciHwPassiveInitialize()\n"); + AdapterExtension = (PAHCI_ADAPTER_EXTENSION)DeviceExtension; + for (index = 0; index < AdapterExtension->PortCount; index++) { if ((AdapterExtension->PortImplemented & (0x1 << index)) != 0) @@ -506,14 +517,17 @@ AhciHwPassiveInitialize ( * return TRUE if intialization was successful */ BOOLEAN +NTAPI AhciHwInitialize ( - __in PAHCI_ADAPTER_EXTENSION AdapterExtension + __in PVOID DeviceExtension ) { + PAHCI_ADAPTER_EXTENSION AdapterExtension; AHCI_GHC ghc; AhciDebugPrint("AhciHwInitialize()\n"); + AdapterExtension = (PAHCI_ADAPTER_EXTENSION)DeviceExtension; AdapterExtension->StateFlags.MessagePerPort = FALSE; // First check what type of interrupt/synchronization device is using @@ -701,12 +715,16 @@ AhciInterruptHandler ( * return FALSE Indicates the interrupt was not ours. */ BOOLEAN +NTAPI AhciHwInterrupt ( - __in PAHCI_ADAPTER_EXTENSION AdapterExtension + __in PVOID DeviceExtension ) { + PAHCI_ADAPTER_EXTENSION AdapterExtension; ULONG portPending, nextPort, i, portCount; + AdapterExtension = (PAHCI_ADAPTER_EXTENSION)DeviceExtension; + if (AdapterExtension->StateFlags.Removed) { return FALSE; @@ -765,13 +783,18 @@ AhciHwInterrupt ( * return FALSE if the request must be submitted later */ BOOLEAN +NTAPI AhciHwStartIo ( - __in PAHCI_ADAPTER_EXTENSION AdapterExtension, + __in PVOID DeviceExtension, __in PSCSI_REQUEST_BLOCK Srb ) { + PAHCI_ADAPTER_EXTENSION AdapterExtension; + AhciDebugPrint("AhciHwStartIo()\n"); + AdapterExtension = (PAHCI_ADAPTER_EXTENSION)DeviceExtension; + if (!IsPortValid(AdapterExtension, Srb->PathId)) { Srb->SrbStatus = SRB_STATUS_NO_DEVICE; @@ -903,17 +926,18 @@ AhciHwStartIo ( * return TRUE if bus was successfully reset */ BOOLEAN +NTAPI AhciHwResetBus ( __in PVOID AdapterExtension, __in ULONG PathId ) { STOR_LOCK_HANDLE lockhandle = {0}; - PAHCI_ADAPTER_EXTENSION adapterExtension; +// PAHCI_ADAPTER_EXTENSION adapterExtension; AhciDebugPrint("AhciHwResetBus()\n"); - adapterExtension = AdapterExtension; +// adapterExtension = AdapterExtension; if (IsPortValid(AdapterExtension, PathId)) { @@ -962,11 +986,12 @@ AhciHwResetBus ( * @remarks Called by Storport. */ ULONG +NTAPI AhciHwFindAdapter ( - __in PVOID AdapterExtension, + __in PVOID DeviceExtension, __in PVOID HwContext, __in PVOID BusInformation, - __in PVOID ArgumentString, + __in PCHAR ArgumentString, __inout PPORT_CONFIGURATION_INFORMATION ConfigInfo, __in PBOOLEAN Reserved3 ) @@ -987,7 +1012,7 @@ AhciHwFindAdapter ( UNREFERENCED_PARAMETER(ArgumentString); UNREFERENCED_PARAMETER(Reserved3); - adapterExtension = AdapterExtension; + adapterExtension = DeviceExtension; adapterExtension->SlotNumber = ConfigInfo->SlotNumber; adapterExtension->SystemIoBusNumber = ConfigInfo->SystemIoBusNumber; @@ -1013,9 +1038,10 @@ AhciHwFindAdapter ( // The last PCI base address register (BAR[5], header offset 0x24) points to the AHCI base memory, it’s called ABAR (AHCI Base Memory Register). adapterExtension->AhciBaseAddress = pciConfigData->u.type0.BaseAddresses[5] & (0xFFFFFFF0); - AhciDebugPrint("\tVendorID:%d DeviceID:%d RevisionID:%d\n", adapterExtension->VendorID, - adapterExtension->DeviceID, - adapterExtension->RevisionID); + AhciDebugPrint("\tVendorID: %04x DeviceID: %04x RevisionID: %02x\n", + adapterExtension->VendorID, + adapterExtension->DeviceID, + adapterExtension->RevisionID); // 2.1.11 abar = NULL; @@ -1133,6 +1159,7 @@ AhciHwFindAdapter ( * NT_STATUS in case of driver loaded successfully. */ ULONG +NTAPI DriverEntry ( __in PVOID DriverObject, __in PVOID RegistryPath @@ -1599,15 +1626,20 @@ AhciProcessIO ( */ VOID AtapiInquiryCompletion ( - __in PAHCI_PORT_EXTENSION PortExtension, - __in PSCSI_REQUEST_BLOCK Srb + __in PVOID _Extension, + __in PVOID _Srb ) { - BOOLEAN status; + PAHCI_PORT_EXTENSION PortExtension; PAHCI_ADAPTER_EXTENSION AdapterExtension; + PSCSI_REQUEST_BLOCK Srb; + BOOLEAN status; AhciDebugPrint("AtapiInquiryCompletion()\n"); + PortExtension = (PAHCI_PORT_EXTENSION)_Extension; + Srb = (PSCSI_REQUEST_BLOCK)_Srb; + NT_ASSERT(Srb != NULL); NT_ASSERT(PortExtension != NULL); @@ -1637,11 +1669,14 @@ AtapiInquiryCompletion ( */ VOID InquiryCompletion ( - __in PAHCI_PORT_EXTENSION PortExtension, - __in PSCSI_REQUEST_BLOCK Srb + __in PVOID _Extension, + __in PVOID _Srb ) { - PCDB cdb; + PAHCI_PORT_EXTENSION PortExtension; + PSCSI_REQUEST_BLOCK Srb; + +// PCDB cdb; BOOLEAN status; PINQUIRYDATA InquiryData; PAHCI_SRB_EXTENSION SrbExtension; @@ -1650,10 +1685,13 @@ InquiryCompletion ( AhciDebugPrint("InquiryCompletion()\n"); + PortExtension = (PAHCI_PORT_EXTENSION)_Extension; + Srb = (PSCSI_REQUEST_BLOCK)_Srb; + NT_ASSERT(Srb != NULL); NT_ASSERT(PortExtension != NULL); - cdb = (PCDB)&Srb->Cdb; +// cdb = (PCDB)&Srb->Cdb; InquiryData = Srb->DataBuffer; SrbExtension = GetSrbExtension(Srb); AdapterExtension = PortExtension->AdapterExtension; diff --git a/drivers/storage/storahci/storahci.h b/drivers/storage/storahci/storahci.h index 6adcc50ace..8c5277d04c 100644 --- a/drivers/storage/storahci/storahci.h +++ b/drivers/storage/storahci/storahci.h @@ -9,9 +9,14 @@ #include <ata.h> #include <storport.h> +#define NDEBUG +#include <debug.h> + #define DEBUG 1 +#if defined(_MSC_VER) #pragma warning(disable:4214) // bit field types other than int #pragma warning(disable:4201) // nameless struct/union +#endif #define MAXIMUM_AHCI_PORT_COUNT 32 #define MAXIMUM_AHCI_PRDT_ENTRIES 32 @@ -76,7 +81,8 @@ #define AHCI_Global_Port_CAP_NCS(x) (((x) & 0xF00) >> 8) #define ROUND_UP(N, S) ((((N) + (S) - 1) / (S)) * (S)) -#define AhciDebugPrint(format, ...) StorPortDebugPrint(0, format, __VA_ARGS__) +//#define AhciDebugPrint(format, ...) StorPortDebugPrint(0, format, __VA_ARGS__) +#define AhciDebugPrint(format, ...) DbgPrint("(%s:%d) " format, __RELFILE__, __LINE__, ##__VA_ARGS__) typedef VOID diff --git a/drivers/storage/storahci/storahci.rc b/drivers/storage/storahci/storahci.rc index 5950ce2d1f..b6f7645078 100644 --- a/drivers/storage/storahci/storahci.rc +++ b/drivers/storage/storahci/storahci.rc @@ -4,19 +4,8 @@ // 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_VERSION_DLL #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_INTERNAL_NAME "storahci" #define REACTOS_STR_ORIGINAL_FILENAME "storahci.sys" -#define REACTOS_STR_LEGAL_COPYRIGHT "Copyright 2016 ReactOS Team" -#define REACTOS_STR_PRODUCT_NAME "AHCI Driver for ReactOS" -#define REACTOS_STR_PRODUCT_VERSION VERSION_STR +#include <reactos/version.rc>

6 years, 11 months

[reactos] 01/01: [WIN32K][DESK.CPL]: Add fit and fill background placement options (#28)

by Waritnan Sookbuntherng

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1128447196a424731226f… commit 1128447196a424731226f8911f90e94f2fe1c266 Author: Waritnan Sookbuntherng <lion328(a)hotmail.co.th> AuthorDate: Sat Oct 14 02:44:02 2017 +0700 [WIN32K][DESK.CPL]: Add fit and fill background placement options (#28) - WIN32K and DESK.CPL: Add fit and fill background placement options. - DESK.CPL: Define wallpaper placement constants; update translations. - WIN32K: Fix coding style. CORE-13360 --- dll/cpl/desk/background.c | 128 ++++++++++++++++++++++++++++++++++++++-- dll/cpl/desk/lang/bg-BG.rc | 2 + dll/cpl/desk/lang/cs-CZ.rc | 2 + dll/cpl/desk/lang/de-DE.rc | 2 + dll/cpl/desk/lang/el-GR.rc | 2 + dll/cpl/desk/lang/en-GB.rc | 2 + dll/cpl/desk/lang/en-US.rc | 2 + dll/cpl/desk/lang/es-ES.rc | 2 + dll/cpl/desk/lang/fr-FR.rc | 4 +- dll/cpl/desk/lang/he-IL.rc | 2 + dll/cpl/desk/lang/hu-HU.rc | 2 + dll/cpl/desk/lang/id-ID.rc | 2 + dll/cpl/desk/lang/it-IT.rc | 2 + dll/cpl/desk/lang/ja-JP.rc | 2 + dll/cpl/desk/lang/nl-NL.rc | 2 + dll/cpl/desk/lang/no-NO.rc | 2 + dll/cpl/desk/lang/pl-PL.rc | 2 + dll/cpl/desk/lang/pt-BR.rc | 2 + dll/cpl/desk/lang/ro-RO.rc | 2 + dll/cpl/desk/lang/ru-RU.rc | 2 + dll/cpl/desk/lang/sk-SK.rc | 2 + dll/cpl/desk/lang/sq-AL.rc | 2 + dll/cpl/desk/lang/sv-SE.rc | 2 + dll/cpl/desk/lang/tr-TR.rc | 2 + dll/cpl/desk/lang/uk-UA.rc | 2 + dll/cpl/desk/lang/zh-CN.rc | 2 + dll/cpl/desk/lang/zh-TW.rc | 2 + dll/cpl/desk/resource.h | 2 + win32ss/user/ntuser/desktop.c | 92 ++++++++++++++++++++++++++++- win32ss/user/ntuser/sysparams.c | 31 ++++++++-- win32ss/user/ntuser/sysparams.h | 4 +- 31 files changed, 296 insertions(+), 15 deletions(-) diff --git a/dll/cpl/desk/background.c b/dll/cpl/desk/background.c index 6d0a018b59..9853ef9dfa 100644 --- a/dll/cpl/desk/background.c +++ b/dll/cpl/desk/background.c @@ -15,9 +15,27 @@ #define MAX_BACKGROUNDS 100 -#define PLACEMENT_CENTER 0 -#define PLACEMENT_STRETCH 1 -#define PLACEMENT_TILE 2 +typedef enum +{ + PLACEMENT_CENTER = 0, + PLACEMENT_STRETCH, + PLACEMENT_TILE, + PLACEMENT_FIT, + PLACEMENT_FILL +} PLACEMENT; + +/* The tile placement is stored in different registry + * key, but due to a condition in win32k it needs to be + * zero when stored in the same key as others. + */ +typedef enum +{ + PLACEMENT_VALUE_CENTER = 0, + PLACEMENT_VALUE_STRETCH = 2, + PLACEMENT_VALUE_TILE = 0, + PLACEMENT_VALUE_FIT = 6, + PLACEMENT_VALUE_FILL = 10 +} PLACEMENT_VALUE; /* The values in these macros are dependent on the * layout of the monitor image and they must be adjusted @@ -440,7 +458,7 @@ InitBackgroundDialog(HWND hwndDlg, PDATA pData) { TCHAR szString[256]; HKEY regKey; - TCHAR szBuffer[2]; + TCHAR szBuffer[3]; DWORD bufferSize = sizeof(szBuffer); BITMAP bitmap; @@ -455,6 +473,12 @@ InitBackgroundDialog(HWND hwndDlg, PDATA pData) LoadString(hApplet, IDS_TILE, szString, sizeof(szString) / sizeof(TCHAR)); SendDlgItemMessage(hwndDlg, IDC_PLACEMENT_COMBO, CB_INSERTSTRING, PLACEMENT_TILE, (LPARAM)szString); + LoadString(hApplet, IDS_FIT, szString, sizeof(szString) / sizeof(TCHAR)); + SendDlgItemMessage(hwndDlg, IDC_PLACEMENT_COMBO, CB_INSERTSTRING, PLACEMENT_FIT, (LPARAM)szString); + + LoadString(hApplet, IDS_FILL, szString, sizeof(szString) / sizeof(TCHAR)); + SendDlgItemMessage(hwndDlg, IDC_PLACEMENT_COMBO, CB_INSERTSTRING, PLACEMENT_FILL, (LPARAM)szString); + SendDlgItemMessage(hwndDlg, IDC_PLACEMENT_COMBO, CB_SETCURSEL, PLACEMENT_CENTER, 0); pData->placementSelection = PLACEMENT_CENTER; @@ -475,17 +499,29 @@ InitBackgroundDialog(HWND hwndDlg, PDATA pData) if (RegQueryValueEx(regKey, TEXT("WallpaperStyle"), 0, NULL, (LPBYTE)szBuffer, &bufferSize) == ERROR_SUCCESS) { - if (_ttoi(szBuffer) == 0) + if (_ttoi(szBuffer) == PLACEMENT_VALUE_CENTER) { SendDlgItemMessage(hwndDlg, IDC_PLACEMENT_COMBO, CB_SETCURSEL, PLACEMENT_CENTER, 0); pData->placementSelection = PLACEMENT_CENTER; } - if (_ttoi(szBuffer) == 2) + if (_ttoi(szBuffer) == PLACEMENT_VALUE_STRETCH) { SendDlgItemMessage(hwndDlg, IDC_PLACEMENT_COMBO, CB_SETCURSEL, PLACEMENT_STRETCH, 0); pData->placementSelection = PLACEMENT_STRETCH; } + + if (_ttoi(szBuffer) == PLACEMENT_VALUE_FIT) + { + SendDlgItemMessage(hwndDlg, IDC_PLACEMENT_COMBO, CB_SETCURSEL, PLACEMENT_FIT, 0); + pData->placementSelection = PLACEMENT_FIT; + } + + if (_ttoi(szBuffer) == PLACEMENT_VALUE_FILL) + { + SendDlgItemMessage(hwndDlg, IDC_PLACEMENT_COMBO, CB_SETCURSEL, PLACEMENT_FILL, 0); + pData->placementSelection = PLACEMENT_FILL; + } } if (RegQueryValueEx(regKey, TEXT("TileWallpaper"), 0, NULL, (LPBYTE)szBuffer, &bufferSize) == ERROR_SUCCESS) @@ -758,6 +794,8 @@ DrawBackgroundPreview(LPDRAWITEMSTRUCT draw, PDATA pData) int scaledHeight; int posX, desX; int posY, desY; + int fitFillScaleNum, fitFillScaleDen; + int fitFillWidth, fitFillHeight; HBRUSH hBrush; int x; int y; @@ -875,6 +913,72 @@ DrawBackgroundPreview(LPDRAWITEMSTRUCT draw, PDATA pData) } break; + + case PLACEMENT_FIT: + if ((MONITOR_WIDTH * scaledHeight) <= (MONITOR_HEIGHT * scaledWidth)) + { + fitFillScaleNum = MONITOR_WIDTH; + fitFillScaleDen = scaledWidth; + } + else + { + fitFillScaleNum = MONITOR_HEIGHT; + fitFillScaleDen = scaledHeight; + } + + fitFillWidth = MulDiv(scaledWidth, fitFillScaleNum, fitFillScaleDen); + fitFillHeight = MulDiv(scaledHeight, fitFillScaleNum, fitFillScaleDen); + + posX = (MONITOR_WIDTH - fitFillWidth) / 2; + posY = (MONITOR_HEIGHT - fitFillHeight) / 2; + + StretchDIBits(hDC, + MONITOR_LEFT + posX, + MONITOR_TOP + posY, + fitFillWidth, + fitFillHeight, + 0, + 0, + pData->pWallpaperBitmap->width, + pData->pWallpaperBitmap->height, + pData->pWallpaperBitmap->bits, + pData->pWallpaperBitmap->info, + DIB_RGB_COLORS, + SRCCOPY); + break; + + case PLACEMENT_FILL: + if ((MONITOR_WIDTH * scaledHeight) > (MONITOR_HEIGHT * scaledWidth)) + { + fitFillScaleNum = MONITOR_WIDTH; + fitFillScaleDen = scaledWidth; + } + else + { + fitFillScaleNum = MONITOR_HEIGHT; + fitFillScaleDen = scaledHeight; + } + + fitFillWidth = MulDiv(scaledWidth, fitFillScaleNum, fitFillScaleDen); + fitFillHeight = MulDiv(scaledHeight, fitFillScaleNum, fitFillScaleDen); + + desX = (((fitFillWidth - MONITOR_WIDTH) * pData->pWallpaperBitmap->width) / (2 * fitFillWidth)); + desY = (((fitFillHeight - MONITOR_HEIGHT) * pData->pWallpaperBitmap->height) / (2 * fitFillHeight)); + + StretchDIBits(hDC, + MONITOR_LEFT, + MONITOR_TOP, + MONITOR_WIDTH, + MONITOR_HEIGHT, + desX, + desY, + (MONITOR_WIDTH * pData->pWallpaperBitmap->width) / fitFillWidth, + (MONITOR_HEIGHT * pData->pWallpaperBitmap->height) / fitFillHeight, + pData->pWallpaperBitmap->bits, + pData->pWallpaperBitmap->info, + DIB_RGB_COLORS, + SRCCOPY); + break; } } @@ -937,6 +1041,18 @@ SetWallpaper(PDATA pData) RegSetValueEx(regKey, TEXT("WallpaperStyle"), 0, REG_SZ, (LPBYTE)TEXT("2"), sizeof(TCHAR) * 2); } + if (pData->placementSelection == PLACEMENT_FIT) + { + RegSetValueEx(regKey, TEXT("TileWallpaper"), 0, REG_SZ, (LPBYTE)TEXT("0"), sizeof(TCHAR) * 2); + RegSetValueEx(regKey, TEXT("WallpaperStyle"), 0, REG_SZ, (LPBYTE)TEXT("6"), sizeof(TCHAR) * 2); + } + + if (pData->placementSelection == PLACEMENT_FILL) + { + RegSetValueEx(regKey, TEXT("TileWallpaper"), 0, REG_SZ, (LPBYTE)TEXT("0"), sizeof(TCHAR) * 2); + RegSetValueEx(regKey, TEXT("WallpaperStyle"), 0, REG_SZ, (LPBYTE)TEXT("10"), sizeof(TCHAR) * 3); + } + if (pData->backgroundItems[pData->backgroundSelection].bWallpaper != FALSE) { GdipLoadImageFromFile(pData->backgroundItems[pData->backgroundSelection].szFilename, &image); diff --git a/dll/cpl/desk/lang/bg-BG.rc b/dll/cpl/desk/lang/bg-BG.rc index de85e08305..780247ecd9 100644 --- a/dll/cpl/desk/lang/bg-BG.rc +++ b/dll/cpl/desk/lang/bg-BG.rc @@ -207,6 +207,8 @@ BEGIN IDS_CENTER "В средата" IDS_STRETCH "Разтегнато" IDS_TILE "Настелено" + IDS_FIT "Fit" + IDS_FILL "Fill" END STRINGTABLE diff --git a/dll/cpl/desk/lang/cs-CZ.rc b/dll/cpl/desk/lang/cs-CZ.rc index dd7692e48b..95c5bd907c 100644 --- a/dll/cpl/desk/lang/cs-CZ.rc +++ b/dll/cpl/desk/lang/cs-CZ.rc @@ -213,6 +213,8 @@ BEGIN IDS_CENTER "Na střed" IDS_STRETCH "Roztáhnout" IDS_TILE "Dlaždice" + IDS_FIT "Fit" + IDS_FILL "Fill" END STRINGTABLE diff --git a/dll/cpl/desk/lang/de-DE.rc b/dll/cpl/desk/lang/de-DE.rc index c3c1111b04..c49ebeb932 100644 --- a/dll/cpl/desk/lang/de-DE.rc +++ b/dll/cpl/desk/lang/de-DE.rc @@ -207,6 +207,8 @@ BEGIN IDS_CENTER "Zentriert" IDS_STRETCH "Gestreckt" IDS_TILE "Nebeneinander" + IDS_FIT "Fit" + IDS_FILL "Fill" END STRINGTABLE diff --git a/dll/cpl/desk/lang/el-GR.rc b/dll/cpl/desk/lang/el-GR.rc index 9b18cd6ff0..304a15f168 100644 --- a/dll/cpl/desk/lang/el-GR.rc +++ b/dll/cpl/desk/lang/el-GR.rc @@ -207,6 +207,8 @@ BEGIN IDS_CENTER "Κέντρο" IDS_STRETCH "Παραμόρφωση" IDS_TILE "Σε παράθεση" + IDS_FIT "Fit" + IDS_FILL "Fill" END STRINGTABLE diff --git a/dll/cpl/desk/lang/en-GB.rc b/dll/cpl/desk/lang/en-GB.rc index 4e4982b042..75a53f3e5b 100644 --- a/dll/cpl/desk/lang/en-GB.rc +++ b/dll/cpl/desk/lang/en-GB.rc @@ -207,6 +207,8 @@ BEGIN IDS_CENTER "Center" IDS_STRETCH "Stretch" IDS_TILE "Tile" + IDS_FIT "Fit" + IDS_FILL "Fill" END STRINGTABLE diff --git a/dll/cpl/desk/lang/en-US.rc b/dll/cpl/desk/lang/en-US.rc index 8d15bbbeb3..c29493c1bd 100644 --- a/dll/cpl/desk/lang/en-US.rc +++ b/dll/cpl/desk/lang/en-US.rc @@ -207,6 +207,8 @@ BEGIN IDS_CENTER "Center" IDS_STRETCH "Stretch" IDS_TILE "Tile" + IDS_FIT "Fit" + IDS_FILL "Fill" END STRINGTABLE diff --git a/dll/cpl/desk/lang/es-ES.rc b/dll/cpl/desk/lang/es-ES.rc index 819c6f8145..815192ea1f 100644 --- a/dll/cpl/desk/lang/es-ES.rc +++ b/dll/cpl/desk/lang/es-ES.rc @@ -209,6 +209,8 @@ BEGIN IDS_CENTER "Centrada" IDS_STRETCH "Expandida" IDS_TILE "En mosaico" + IDS_FIT "Fit" + IDS_FILL "Fill" END STRINGTABLE diff --git a/dll/cpl/desk/lang/fr-FR.rc b/dll/cpl/desk/lang/fr-FR.rc index 5ff190a1b2..820eb254d6 100644 --- a/dll/cpl/desk/lang/fr-FR.rc +++ b/dll/cpl/desk/lang/fr-FR.rc @@ -206,9 +206,11 @@ BEGIN IDS_CPLNAME "Affichage" IDS_CPLDESCRIPTION "Personalise l'affichage du bureau et de l'écran de veille." IDS_NONE "(Aucun)" - IDS_CENTER "Centre" + IDS_CENTER "Centrer" IDS_STRETCH "Étirer" IDS_TILE "Mosaïque" + IDS_FIT "Ajuster" + IDS_FILL "Remplir" END STRINGTABLE diff --git a/dll/cpl/desk/lang/he-IL.rc b/dll/cpl/desk/lang/he-IL.rc index ee57ec16f7..cd5b9adbbe 100644 --- a/dll/cpl/desk/lang/he-IL.rc +++ b/dll/cpl/desk/lang/he-IL.rc @@ -207,6 +207,8 @@ BEGIN IDS_CENTER "מרכז" IDS_STRETCH "מתח" IDS_TILE "פרוש" + IDS_FIT "Fit" + IDS_FILL "Fill" END STRINGTABLE diff --git a/dll/cpl/desk/lang/hu-HU.rc b/dll/cpl/desk/lang/hu-HU.rc index 7876225014..fd99370fc4 100644 --- a/dll/cpl/desk/lang/hu-HU.rc +++ b/dll/cpl/desk/lang/hu-HU.rc @@ -209,6 +209,8 @@ BEGIN IDS_CENTER "Középen" IDS_STRETCH "Széthúzva" IDS_TILE "Mozaikszerűen" + IDS_FIT "Fit" + IDS_FILL "Fill" END STRINGTABLE diff --git a/dll/cpl/desk/lang/id-ID.rc b/dll/cpl/desk/lang/id-ID.rc index 378267f552..fbae9c9b88 100644 --- a/dll/cpl/desk/lang/id-ID.rc +++ b/dll/cpl/desk/lang/id-ID.rc @@ -207,6 +207,8 @@ BEGIN IDS_CENTER "Tengah" IDS_STRETCH "Tarik" IDS_TILE "Tile" + IDS_FIT "Fit" + IDS_FILL "Fill" END STRINGTABLE diff --git a/dll/cpl/desk/lang/it-IT.rc b/dll/cpl/desk/lang/it-IT.rc index d121485a72..0d44f3da77 100644 --- a/dll/cpl/desk/lang/it-IT.rc +++ b/dll/cpl/desk/lang/it-IT.rc @@ -207,6 +207,8 @@ BEGIN IDS_CENTER "Al centro" IDS_STRETCH "Estesa" IDS_TILE "Affiancata" + IDS_FIT "Fit" + IDS_FILL "Fill" END STRINGTABLE diff --git a/dll/cpl/desk/lang/ja-JP.rc b/dll/cpl/desk/lang/ja-JP.rc index e326ea6394..20ff2aa926 100644 --- a/dll/cpl/desk/lang/ja-JP.rc +++ b/dll/cpl/desk/lang/ja-JP.rc @@ -207,6 +207,8 @@ BEGIN IDS_CENTER "中央に表示" IDS_STRETCH "拡大して表示" IDS_TILE "並べて表示" + IDS_FIT "Fit" + IDS_FILL "Fill" END STRINGTABLE diff --git a/dll/cpl/desk/lang/nl-NL.rc b/dll/cpl/desk/lang/nl-NL.rc index 5c7213de24..2cd1033e31 100644 --- a/dll/cpl/desk/lang/nl-NL.rc +++ b/dll/cpl/desk/lang/nl-NL.rc @@ -207,6 +207,8 @@ BEGIN IDS_CENTER "Center" IDS_STRETCH "Stretch" IDS_TILE "Tile" + IDS_FIT "Fit" + IDS_FILL "Fill" END STRINGTABLE diff --git a/dll/cpl/desk/lang/no-NO.rc b/dll/cpl/desk/lang/no-NO.rc index 5acd860787..210f49f7ae 100644 --- a/dll/cpl/desk/lang/no-NO.rc +++ b/dll/cpl/desk/lang/no-NO.rc @@ -207,6 +207,8 @@ BEGIN IDS_CENTER "Midtstill" IDS_STRETCH "Side ved side" IDS_TILE "Stukket" + IDS_FIT "Fit" + IDS_FILL "Fill" END STRINGTABLE diff --git a/dll/cpl/desk/lang/pl-PL.rc b/dll/cpl/desk/lang/pl-PL.rc index 037aee9f4a..f6f59bd371 100644 --- a/dll/cpl/desk/lang/pl-PL.rc +++ b/dll/cpl/desk/lang/pl-PL.rc @@ -216,6 +216,8 @@ BEGIN IDS_CENTER "Do środka" IDS_STRETCH "Rozciągnięcie" IDS_TILE "Sąsiadująco" + IDS_FIT "Fit" + IDS_FILL "Fill" END STRINGTABLE diff --git a/dll/cpl/desk/lang/pt-BR.rc b/dll/cpl/desk/lang/pt-BR.rc index c448cae75b..fffaca84bf 100644 --- a/dll/cpl/desk/lang/pt-BR.rc +++ b/dll/cpl/desk/lang/pt-BR.rc @@ -207,6 +207,8 @@ BEGIN IDS_CENTER "Centralizar" IDS_STRETCH "Estender" IDS_TILE "Lado a lado" + IDS_FIT "Fit" + IDS_FILL "Fill" END STRINGTABLE diff --git a/dll/cpl/desk/lang/ro-RO.rc b/dll/cpl/desk/lang/ro-RO.rc index 10e6007030..0dfbb37cb5 100644 --- a/dll/cpl/desk/lang/ro-RO.rc +++ b/dll/cpl/desk/lang/ro-RO.rc @@ -212,6 +212,8 @@ BEGIN IDS_CENTER "Centrat" IDS_STRETCH "Extins" IDS_TILE "Tapițat" + IDS_FIT "Fit" + IDS_FILL "Fill" END STRINGTABLE diff --git a/dll/cpl/desk/lang/ru-RU.rc b/dll/cpl/desk/lang/ru-RU.rc index d24182c2b9..90acdc6d66 100644 --- a/dll/cpl/desk/lang/ru-RU.rc +++ b/dll/cpl/desk/lang/ru-RU.rc @@ -207,6 +207,8 @@ BEGIN IDS_CENTER "по центру" IDS_STRETCH "растянуть" IDS_TILE "замостить" + IDS_FIT "вписать" + IDS_FILL "заполнить" END STRINGTABLE diff --git a/dll/cpl/desk/lang/sk-SK.rc b/dll/cpl/desk/lang/sk-SK.rc index 7f3b69328b..5c6311dad8 100644 --- a/dll/cpl/desk/lang/sk-SK.rc +++ b/dll/cpl/desk/lang/sk-SK.rc @@ -209,6 +209,8 @@ BEGIN IDS_CENTER "V strede" IDS_STRETCH "Roztiahnuť" IDS_TILE "Dlaždice" + IDS_FIT "Fit" + IDS_FILL "Fill" END STRINGTABLE diff --git a/dll/cpl/desk/lang/sq-AL.rc b/dll/cpl/desk/lang/sq-AL.rc index 1da51baa72..0a9fc973ab 100644 --- a/dll/cpl/desk/lang/sq-AL.rc +++ b/dll/cpl/desk/lang/sq-AL.rc @@ -211,6 +211,8 @@ BEGIN IDS_CENTER "Qender" IDS_STRETCH "Streq" IDS_TILE "Tile" + IDS_FIT "Fit" + IDS_FILL "Fill" END STRINGTABLE diff --git a/dll/cpl/desk/lang/sv-SE.rc b/dll/cpl/desk/lang/sv-SE.rc index dd7bb1bd5f..f286b2a921 100644 --- a/dll/cpl/desk/lang/sv-SE.rc +++ b/dll/cpl/desk/lang/sv-SE.rc @@ -209,6 +209,8 @@ BEGIN IDS_CENTER "Centrera" IDS_STRETCH "Sträck ut" IDS_TILE "Stapla" + IDS_FIT "Fit" + IDS_FILL "Fill" END STRINGTABLE diff --git a/dll/cpl/desk/lang/tr-TR.rc b/dll/cpl/desk/lang/tr-TR.rc index f33614293f..ee71aab40c 100644 --- a/dll/cpl/desk/lang/tr-TR.rc +++ b/dll/cpl/desk/lang/tr-TR.rc @@ -209,6 +209,8 @@ BEGIN IDS_CENTER "Ortala" IDS_STRETCH "Uzat" IDS_TILE "Döşe" + IDS_FIT "Fit" + IDS_FILL "Fill" END STRINGTABLE diff --git a/dll/cpl/desk/lang/uk-UA.rc b/dll/cpl/desk/lang/uk-UA.rc index b9aa734aa5..f768d29008 100644 --- a/dll/cpl/desk/lang/uk-UA.rc +++ b/dll/cpl/desk/lang/uk-UA.rc @@ -215,6 +215,8 @@ BEGIN IDS_CENTER "По центру" IDS_STRETCH "Розтягнути" IDS_TILE "Плиткою" + IDS_FIT "Fit" + IDS_FILL "Fill" END STRINGTABLE diff --git a/dll/cpl/desk/lang/zh-CN.rc b/dll/cpl/desk/lang/zh-CN.rc index b5973ee72f..ae16448009 100644 --- a/dll/cpl/desk/lang/zh-CN.rc +++ b/dll/cpl/desk/lang/zh-CN.rc @@ -214,6 +214,8 @@ BEGIN IDS_CENTER "居中" IDS_STRETCH "拉伸" IDS_TILE "平铺" + IDS_FIT "Fit" + IDS_FILL "Fill" END STRINGTABLE diff --git a/dll/cpl/desk/lang/zh-TW.rc b/dll/cpl/desk/lang/zh-TW.rc index 825e55411c..91f4ed2d7f 100644 --- a/dll/cpl/desk/lang/zh-TW.rc +++ b/dll/cpl/desk/lang/zh-TW.rc @@ -209,6 +209,8 @@ BEGIN IDS_CENTER "居中" IDS_STRETCH "拉伸" IDS_TILE "平鋪" + IDS_FIT "Fit" + IDS_FILL "Fill" END STRINGTABLE diff --git a/dll/cpl/desk/resource.h b/dll/cpl/desk/resource.h index 0bb35e0527..6884290e16 100644 --- a/dll/cpl/desk/resource.h +++ b/dll/cpl/desk/resource.h @@ -48,6 +48,8 @@ #define IDS_CENTER 2003 #define IDS_STRETCH 2004 #define IDS_TILE 2005 +#define IDS_FIT 2006 +#define IDS_FILL 2007 #define IDC_SETTINGS_DEVICE 201 #define IDC_SETTINGS_BPP 202 diff --git a/win32ss/user/ntuser/desktop.c b/win32ss/user/ntuser/desktop.c index 7129f58d60..9f2e3b4d81 100644 --- a/win32ss/user/ntuser/desktop.c +++ b/win32ss/user/ntuser/desktop.c @@ -1216,17 +1216,71 @@ IntPaintDesktop(HDC hDC) { SIZE sz; int x, y; + int scaledWidth, scaledHeight; + int wallpaperX, wallpaperY, wallpaperWidth, wallpaperHeight; HDC hWallpaperDC; sz.cx = WndDesktop->rcWindow.right - WndDesktop->rcWindow.left; sz.cy = WndDesktop->rcWindow.bottom - WndDesktop->rcWindow.top; + if (gspv.WallpaperMode == wmFit || + gspv.WallpaperMode == wmFill) + { + int scaleNum, scaleDen; + + // Precision improvement over ((sz.cx / gspv.cxWallpaper) > (sz.cy / gspv.cyWallpaper)) + if ((sz.cx * gspv.cyWallpaper) > (sz.cy * gspv.cxWallpaper)) + { + if (gspv.WallpaperMode == wmFit) + { + scaleNum = sz.cy; + scaleDen = gspv.cyWallpaper; + } + else + { + scaleNum = sz.cx; + scaleDen = gspv.cxWallpaper; + } + } + else + { + if (gspv.WallpaperMode == wmFit) + { + scaleNum = sz.cx; + scaleDen = gspv.cxWallpaper; + } + else + { + scaleNum = sz.cy; + scaleDen = gspv.cyWallpaper; + } + } + + scaledWidth = EngMulDiv(gspv.cxWallpaper, scaleNum, scaleDen); + scaledHeight = EngMulDiv(gspv.cyWallpaper, scaleNum, scaleDen); + + if (gspv.WallpaperMode == wmFill) + { + wallpaperX = (((scaledWidth - sz.cx) * gspv.cxWallpaper) / (2 * scaledWidth)); + wallpaperY = (((scaledHeight - sz.cy) * gspv.cyWallpaper) / (2 * scaledHeight)); + + wallpaperWidth = (sz.cx * gspv.cxWallpaper) / scaledWidth; + wallpaperHeight = (sz.cy * gspv.cyWallpaper) / scaledHeight; + } + } + if (gspv.WallpaperMode == wmStretch || - gspv.WallpaperMode == wmTile) + gspv.WallpaperMode == wmTile || + gspv.WallpaperMode == wmFill) { x = 0; y = 0; } + else if (gspv.WallpaperMode == wmFit) + { + x = (sz.cx - scaledWidth) / 2; + y = (sz.cy - scaledHeight) / 2; + } else { /* Find the upper left corner, can be negative if the bitmap is bigger than the screen */ @@ -1292,6 +1346,42 @@ IntPaintDesktop(HDC hDC) } } } + else if (gspv.WallpaperMode == wmFit) + { + if (Rect.right && Rect.bottom) + { + NtGdiStretchBlt(hDC, + x, + y, + scaledWidth, + scaledHeight, + hWallpaperDC, + 0, + 0, + gspv.cxWallpaper, + gspv.cyWallpaper, + SRCCOPY, + 0); + } + } + else if (gspv.WallpaperMode == wmFill) + { + if (Rect.right && Rect.bottom) + { + NtGdiStretchBlt(hDC, + x, + y, + sz.cx, + sz.cy, + hWallpaperDC, + wallpaperX, + wallpaperY, + wallpaperWidth, + wallpaperHeight, + SRCCOPY, + 0); + } + } else { NtGdiBitBlt(hDC, diff --git a/win32ss/user/ntuser/sysparams.c b/win32ss/user/ntuser/sysparams.c index ab0412606a..2265219586 100644 --- a/win32ss/user/ntuser/sysparams.c +++ b/win32ss/user/ntuser/sysparams.c @@ -625,13 +625,21 @@ SpiSetWallpaper(PVOID pvParam, FLONG fl) /* Capture UNICODE_STRING */ bResult = SpiMemCopy(&ustr, pvParam, sizeof(ustr), fl & SPIF_PROTECT); - if (!bResult) return 0; + if (!bResult) + { + return 0; + } if (ustr.Length > MAX_PATH * sizeof(WCHAR)) + { return 0; + } /* Copy the string buffer name */ bResult = SpiMemCopy(gspv.awcWallpaper, ustr.Buffer, ustr.Length, fl & SPIF_PROTECT); - if (!bResult) return 0; + if (!bResult) + { + return 0; + } /* Update the UNICODE_STRING */ gspv.ustrWallpaper.Buffer = gspv.awcWallpaper; @@ -669,7 +677,7 @@ SpiSetWallpaper(PVOID pvParam, FLONG fl) } /* Try to get the size of the wallpaper */ - if(!(psurfBmp = SURFACE_ShareLockSurface(hbmp))) + if (!(psurfBmp = SURFACE_ShareLockSurface(hbmp))) { GreDeleteObject(hbmp); return 0; @@ -690,13 +698,24 @@ SpiSetWallpaper(PVOID pvParam, FLONG fl) TRACE("SpiSetWallpaper: ulTile=%lu, ulStyle=%lu\n", ulTile, ulStyle); /* Check the values we found in the registry */ - if(ulTile && !ulStyle) + if (ulTile && !ulStyle) { gspv.WallpaperMode = wmTile; } - else if(!ulTile && ulStyle == 2) + else if (!ulTile && ulStyle) { - gspv.WallpaperMode = wmStretch; + if (ulStyle == 2) + { + gspv.WallpaperMode = wmStretch; + } + else if (ulStyle == 6) + { + gspv.WallpaperMode = wmFit; + } + else if (ulStyle == 10) + { + gspv.WallpaperMode = wmFill; + } } } else diff --git a/win32ss/user/ntuser/sysparams.h b/win32ss/user/ntuser/sysparams.h index 28e9d94536..0b564f8609 100644 --- a/win32ss/user/ntuser/sysparams.h +++ b/win32ss/user/ntuser/sysparams.h @@ -40,7 +40,9 @@ typedef enum { wmCenter = 0, wmTile, - wmStretch + wmStretch, + wmFit, + wmFill } WALLPAPER_MODE; typedef struct _SPIVALUES

6 years, 11 months

[reactos] 01/01: [STORPORT]: Fix build: declare STORPORT_API functions as exports.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=30bfd8afadbfa89b1bc7d… commit 30bfd8afadbfa89b1bc7d343bfc23a56863a117a Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Oct 12 23:14:08 2017 +0200 [STORPORT]: Fix build: declare STORPORT_API functions as exports. --- drivers/storage/port/storport/precomp.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/storage/port/storport/precomp.h b/drivers/storage/port/storport/precomp.h index c82d345893..68c59ba339 100644 --- a/drivers/storage/port/storport/precomp.h +++ b/drivers/storage/port/storport/precomp.h @@ -11,7 +11,11 @@ #include <wdm.h> #include <ntddk.h> #include <stdio.h> + +/* Declare STORPORT_API functions as exports rather than imports */ +#define _STORPORT_ #include <storport.h> + #include <ntddscsi.h> #include <ntdddisk.h> #include <mountdev.h>

6 years, 11 months

[reactos] 01/01: [STORPORT] Start the implementation of the storport driver and add it to the build. CORE-13866

by EricKohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b2c6c07d0fa0c230381aa… commit b2c6c07d0fa0c230381aa2a8d8c66e4aafc2fe24 Author: EricKohl <eric.kohl(a)reactos.org> AuthorDate: Thu Oct 12 22:37:43 2017 +0200 [STORPORT] Start the implementation of the storport driver and add it to the build. CORE-13866 --- drivers/storage/port/CMakeLists.txt | 2 +- drivers/storage/port/storport/CMakeLists.txt | 20 + drivers/storage/port/storport/fdo.c | 155 +++++ drivers/storage/port/storport/misc.c | 71 ++ drivers/storage/port/storport/pdo.c | 32 + drivers/storage/port/storport/precomp.h | 113 ++++ drivers/storage/port/storport/storport.c | 975 +++++++++++++++++++++++++++ drivers/storage/port/storport/storport.rc | 5 + drivers/storage/port/storport/storport.spec | 63 ++ drivers/storage/port/storport/stubs.c | 311 +++++++++ 10 files changed, 1746 insertions(+), 1 deletion(-) diff --git a/drivers/storage/port/CMakeLists.txt b/drivers/storage/port/CMakeLists.txt index dd3cc48096..9a5d2f26aa 100644 --- a/drivers/storage/port/CMakeLists.txt +++ b/drivers/storage/port/CMakeLists.txt @@ -1,2 +1,2 @@ - add_subdirectory(buslogic) +add_subdirectory(storport) diff --git a/drivers/storage/port/storport/CMakeLists.txt b/drivers/storage/port/storport/CMakeLists.txt new file mode 100644 index 0000000000..c531ee6f00 --- /dev/null +++ b/drivers/storage/port/storport/CMakeLists.txt @@ -0,0 +1,20 @@ + +spec2def(storport.sys storport.spec ADD_IMPORTLIB) + +list(APPEND SOURCE + fdo.c + misc.c + pdo.c + storport.c + stubs.c + precomp.h) + +add_library(storport SHARED + ${SOURCE} + storport.rc + ${CMAKE_CURRENT_BINARY_DIR}/storport.def) + +add_pch(storport precomp.h SOURCE) +set_module_type(storport kernelmodedriver) +add_importlibs(storport ntoskrnl hal) +add_cd_file(TARGET storport DESTINATION reactos/system32/drivers NO_CAB FOR all) diff --git a/drivers/storage/port/storport/fdo.c b/drivers/storage/port/storport/fdo.c new file mode 100644 index 0000000000..c8508d0527 --- /dev/null +++ b/drivers/storage/port/storport/fdo.c @@ -0,0 +1,155 @@ +/* + * PROJECT: ReactOS Storport Driver + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Storport FDO code + * COPYRIGHT: Copyright 2017 Eric Kohl (eric.kohl(a)reactos.org) + */ + +/* INCLUDES *******************************************************************/ + +#include "precomp.h" + +#define NDEBUG +#include <debug.h> + + +/* FUNCTIONS ******************************************************************/ + +static +NTSTATUS +NTAPI +PortFdoStartDevice( + _In_ PFDO_DEVICE_EXTENSION DeviceExtension, + _In_ PIRP Irp) +{ + DPRINT1("PortFdoStartDevice(%p %p)\n", + DeviceExtension, Irp); + + ASSERT(DeviceExtension->ExtensionType == FdoExtension); + + return STATUS_SUCCESS; +} + + +static +NTSTATUS +PortFdoQueryBusRelations( + _In_ PFDO_DEVICE_EXTENSION DeviceExtension, + _Out_ PULONG_PTR Information) +{ + NTSTATUS Status = STATUS_SUCCESS;; + + DPRINT1("PortFdoQueryBusRelations(%p %p)\n", + DeviceExtension, Information); + + *Information = 0; + + return Status; +} + + +NTSTATUS +NTAPI +PortFdoPnp( + _In_ PDEVICE_OBJECT DeviceObject, + _In_ PIRP Irp) +{ + PFDO_DEVICE_EXTENSION DeviceExtension; + PIO_STACK_LOCATION Stack; + ULONG_PTR Information = 0; + NTSTATUS Status = STATUS_NOT_SUPPORTED; + + DPRINT1("PortFdoPnp(%p %p)\n", + DeviceObject, Irp); + + DeviceExtension = (PFDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + ASSERT(DeviceExtension); + ASSERT(DeviceExtension->ExtensionType == FdoExtension); + + Stack = IoGetCurrentIrpStackLocation(Irp); + + switch (Stack->MinorFunction) + { + case IRP_MN_START_DEVICE: /* 0x00 */ + DPRINT1("IRP_MJ_PNP / IRP_MN_START_DEVICE\n"); + /* Call lower driver */ + Status = ForwardIrpAndWait(DeviceExtension->LowerDevice, Irp); + if (NT_SUCCESS(Status)) + { + Status = PortFdoStartDevice(DeviceExtension, Irp); + } + break; + + case IRP_MN_QUERY_REMOVE_DEVICE: /* 0x01 */ + DPRINT1("IRP_MJ_PNP / IRP_MN_QUERY_REMOVE_DEVICE\n"); + break; + + case IRP_MN_REMOVE_DEVICE: /* 0x02 */ + DPRINT1("IRP_MJ_PNP / IRP_MN_REMOVE_DEVICE\n"); + break; + + case IRP_MN_CANCEL_REMOVE_DEVICE: /* 0x03 */ + DPRINT1("IRP_MJ_PNP / IRP_MN_CANCEL_REMOVE_DEVICE\n"); + break; + + case IRP_MN_STOP_DEVICE: /* 0x04 */ + DPRINT1("IRP_MJ_PNP / IRP_MN_STOP_DEVICE\n"); + break; + + case IRP_MN_QUERY_STOP_DEVICE: /* 0x05 */ + DPRINT1("IRP_MJ_PNP / IRP_MN_QUERY_STOP_DEVICE\n"); + break; + + case IRP_MN_CANCEL_STOP_DEVICE: /* 0x06 */ + DPRINT1("IRP_MJ_PNP / IRP_MN_CANCEL_STOP_DEVICE\n"); + break; + + case IRP_MN_QUERY_DEVICE_RELATIONS: /* 0x07 */ + DPRINT1("IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_RELATIONS\n"); + switch (Stack->Parameters.QueryDeviceRelations.Type) + { + case BusRelations: + DPRINT1(" IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_RELATIONS / BusRelations\n"); + Status = PortFdoQueryBusRelations(DeviceExtension, &Information); + break; + + case RemovalRelations: + DPRINT1(" IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_RELATIONS / RemovalRelations\n"); + return ForwardIrpAndForget(DeviceExtension->LowerDevice, Irp); + + default: + DPRINT1(" IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_RELATIONS / Unknown type 0x%lx\n", + Stack->Parameters.QueryDeviceRelations.Type); + return ForwardIrpAndForget(DeviceExtension->LowerDevice, Irp); + } + break; + + case IRP_MN_FILTER_RESOURCE_REQUIREMENTS: /* 0x0d */ + DPRINT1("IRP_MJ_PNP / IRP_MN_FILTER_RESOURCE_REQUIREMENTS\n"); + return ForwardIrpAndForget(DeviceExtension->LowerDevice, Irp); + + case IRP_MN_QUERY_PNP_DEVICE_STATE: /* 0x14 */ + DPRINT1("IRP_MJ_PNP / IRP_MN_QUERY_PNP_DEVICE_STATE\n"); + break; + + case IRP_MN_DEVICE_USAGE_NOTIFICATION: /* 0x16 */ + DPRINT1("IRP_MJ_PNP / IRP_MN_DEVICE_USAGE_NOTIFICATION\n"); + break; + + case IRP_MN_SURPRISE_REMOVAL: /* 0x17 */ + DPRINT1("IRP_MJ_PNP / IRP_MN_SURPRISE_REMOVAL\n"); + break; + + default: + DPRINT1("IRP_MJ_PNP / Unknown IOCTL 0x%lx\n", Stack->MinorFunction); + return ForwardIrpAndForget(DeviceExtension->LowerDevice, Irp); + } + + Irp->IoStatus.Information = Information; + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return Status; +} + +/* EOF */ diff --git a/drivers/storage/port/storport/misc.c b/drivers/storage/port/storport/misc.c new file mode 100644 index 0000000000..3f2e254aa1 --- /dev/null +++ b/drivers/storage/port/storport/misc.c @@ -0,0 +1,71 @@ +/* + * PROJECT: ReactOS Storport Driver + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Storport helper functions + * COPYRIGHT: Copyright 2017 Eric Kohl (eric.kohl(a)reactos.org) + */ + +/* INCLUDES *******************************************************************/ + +#include "precomp.h" + +#define NDEBUG +#include <debug.h> + + +/* FUNCTIONS ******************************************************************/ + +static +NTSTATUS +NTAPI +ForwardIrpAndWaitCompletion( + _In_ PDEVICE_OBJECT DeviceObject, + _In_ PIRP Irp, + _In_ PVOID Context) +{ + if (Irp->PendingReturned) + KeSetEvent((PKEVENT)Context, IO_NO_INCREMENT, FALSE); + return STATUS_MORE_PROCESSING_REQUIRED; +} + + +NTSTATUS +ForwardIrpAndWait( + _In_ PDEVICE_OBJECT LowerDevice, + _In_ PIRP Irp) +{ + KEVENT Event; + NTSTATUS Status; + + ASSERT(LowerDevice); + + KeInitializeEvent(&Event, NotificationEvent, FALSE); + IoCopyCurrentIrpStackLocationToNext(Irp); + + IoSetCompletionRoutine(Irp, ForwardIrpAndWaitCompletion, &Event, TRUE, TRUE, TRUE); + + Status = IoCallDriver(LowerDevice, Irp); + if (Status == STATUS_PENDING) + { + Status = KeWaitForSingleObject(&Event, Suspended, KernelMode, FALSE, NULL); + if (NT_SUCCESS(Status)) + Status = Irp->IoStatus.Status; + } + + return Status; +} + + +NTSTATUS +NTAPI +ForwardIrpAndForget( + _In_ PDEVICE_OBJECT LowerDevice, + _In_ PIRP Irp) +{ + ASSERT(LowerDevice); + + IoSkipCurrentIrpStackLocation(Irp); + return IoCallDriver(LowerDevice, Irp); +} + +/* EOF */ diff --git a/drivers/storage/port/storport/pdo.c b/drivers/storage/port/storport/pdo.c new file mode 100644 index 0000000000..fb7280ccc0 --- /dev/null +++ b/drivers/storage/port/storport/pdo.c @@ -0,0 +1,32 @@ +/* + * PROJECT: ReactOS Storport Driver + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Storport PDO code + * COPYRIGHT: Copyright 2017 Eric Kohl (eric.kohl(a)reactos.org) + */ + +/* INCLUDES *******************************************************************/ + +#include "precomp.h" + +#define NDEBUG +#include <debug.h> + + +/* FUNCTIONS ******************************************************************/ + +NTSTATUS +NTAPI +PortPdoPnp( + _In_ PDEVICE_OBJECT DeviceObject, + _In_ PIRP Irp) +{ + DPRINT1("PortPdoPnp()\n"); + + Irp->IoStatus.Information = 0; + Irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_SUCCESS; +} + +/* EOF */ diff --git a/drivers/storage/port/storport/precomp.h b/drivers/storage/port/storport/precomp.h new file mode 100644 index 0000000000..c82d345893 --- /dev/null +++ b/drivers/storage/port/storport/precomp.h @@ -0,0 +1,113 @@ +/* + * PROJECT: ReactOS Storport Driver + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Storport driver common header file + * COPYRIGHT: Copyright 2017 Eric Kohl (eric.kohl(a)reactos.org) + */ + +#ifndef _STORPORT_PCH_ +#define _STORPORT_PCH_ + +#include <wdm.h> +#include <ntddk.h> +#include <stdio.h> +#include <storport.h> +#include <ntddscsi.h> +#include <ntdddisk.h> +#include <mountdev.h> + +typedef enum +{ + dsStopped, + dsStarted, + dsPaused, + dsRemoved, + dsSurpriseRemoved +} DEVICE_STATE; + +typedef enum +{ + InvalidExtension = 0, + DriverExtension, + FdoExtension, + PdoExtension +} EXTENSION_TYPE; + +typedef struct _DRIVER_OBJECT_EXTENSION +{ + EXTENSION_TYPE ExtensionType; + + PDRIVER_OBJECT DriverObject; + + KSPIN_LOCK AdapterListLock; + LIST_ENTRY AdapterListHead; + ULONG AdapterCount; + +} DRIVER_OBJECT_EXTENSION, *PDRIVER_OBJECT_EXTENSION; + +typedef struct _FDO_DEVICE_EXTENSION +{ + EXTENSION_TYPE ExtensionType; + + PDEVICE_OBJECT Device; + PDEVICE_OBJECT LowerDevice; + PDEVICE_OBJECT PhysicalDevice; + + DEVICE_STATE PnpState; + + LIST_ENTRY AdapterListEntry; +} FDO_DEVICE_EXTENSION, *PFDO_DEVICE_EXTENSION; + + +typedef struct _PDO_DEVICE_EXTENSION +{ + EXTENSION_TYPE ExtensionType; + + PDEVICE_OBJECT AttachedFdo; + + DEVICE_STATE PnpState; + +} PDO_DEVICE_EXTENSION, *PPDO_DEVICE_EXTENSION; + + +/* fdo.c */ + +NTSTATUS +NTAPI +PortFdoPnp( + _In_ PDEVICE_OBJECT DeviceObject, + _In_ PIRP Irp); + + +/* misc.c */ + +NTSTATUS +ForwardIrpAndWait( + _In_ PDEVICE_OBJECT LowerDevice, + _In_ PIRP Irp); + +NTSTATUS +NTAPI +ForwardIrpAndForget( + _In_ PDEVICE_OBJECT LowerDevice, + _In_ PIRP Irp); + + +/* pdo.c */ + +NTSTATUS +NTAPI +PortPdoPnp( + _In_ PDEVICE_OBJECT DeviceObject, + _In_ PIRP Irp); + + +/* storport.c */ + +NTSTATUS +NTAPI +DriverEntry( + _In_ PDRIVER_OBJECT DriverObject, + _In_ PUNICODE_STRING RegistryPath); + +#endif /* _STORPORT_PCH_ */ diff --git a/drivers/storage/port/storport/storport.c b/drivers/storage/port/storport/storport.c new file mode 100644 index 0000000000..9b227dd834 --- /dev/null +++ b/drivers/storage/port/storport/storport.c @@ -0,0 +1,975 @@ +/* + * PROJECT: ReactOS Storport Driver + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Storport driver main file + * COPYRIGHT: Copyright 2017 Eric Kohl (eric.kohl(a)reactos.org) + */ + +/* INCLUDES *******************************************************************/ + +#include "precomp.h" + +#define NDEBUG +#include <debug.h> + + +/* GLOBALS ********************************************************************/ + +ULONG PortNumber = 0; + + +/* FUNCTIONS ******************************************************************/ + +static +NTSTATUS +NTAPI +PortAddDevice( + _In_ PDRIVER_OBJECT DriverObject, + _In_ PDEVICE_OBJECT PhysicalDeviceObject) +{ + PDRIVER_OBJECT_EXTENSION DriverObjectExtension; + PFDO_DEVICE_EXTENSION DeviceExtension = NULL; + WCHAR NameBuffer[80]; + UNICODE_STRING DeviceName; + PDEVICE_OBJECT Fdo = NULL; + KLOCK_QUEUE_HANDLE LockHandle; + NTSTATUS Status; + + DPRINT1("PortAddDevice(%p %p)\n", + DriverObject, PhysicalDeviceObject); + + ASSERT(DriverObject); + ASSERT(PhysicalDeviceObject); + + swprintf(NameBuffer, + L"\\Device\\RaidPort%lu", + PortNumber); + RtlInitUnicodeString(&DeviceName, NameBuffer); + PortNumber++; + + DPRINT1("Creating device: %wZ\n", &DeviceName); + + /* Create the port device */ + Status = IoCreateDevice(DriverObject, + sizeof(FDO_DEVICE_EXTENSION), + &DeviceName, + FILE_DEVICE_CONTROLLER, + FILE_DEVICE_SECURE_OPEN, + FALSE, + &Fdo); + if (!NT_SUCCESS(Status)) + { + DPRINT1("IoCreateDevice() failed (Status 0x%08lx)\n", Status); + return Status; + } + + DPRINT1("Created device: %wZ (%p)\n", &DeviceName, Fdo); + + /* Initialize the device */ + Fdo->Flags |= DO_DIRECT_IO; + Fdo->Flags |= DO_POWER_PAGABLE; + + /* Initialize the device extension */ + DeviceExtension = (PFDO_DEVICE_EXTENSION)Fdo->DeviceExtension; + RtlZeroMemory(DeviceExtension, sizeof(FDO_DEVICE_EXTENSION)); + + DeviceExtension->ExtensionType = FdoExtension; + + DeviceExtension->Device = Fdo; + DeviceExtension->PhysicalDevice = PhysicalDeviceObject; + + DeviceExtension->PnpState = dsStopped; + + /* Attach the FDO to the device stack */ + Status = IoAttachDeviceToDeviceStackSafe(Fdo, + PhysicalDeviceObject, + &DeviceExtension->LowerDevice); + if (!NT_SUCCESS(Status)) + { + DPRINT1("IoAttachDeviceToDeviceStackSafe() failed (Status 0x%08lx)\n", Status); + IoDeleteDevice(Fdo); + return Status; + } + + /* Insert the FDO to the drivers FDO list */ + DriverObjectExtension = IoGetDriverObjectExtension(DriverObject, + (PVOID)DriverEntry); + ASSERT(DriverObjectExtension->ExtensionType == DriverExtension); + + KeAcquireInStackQueuedSpinLock(&DriverObjectExtension->AdapterListLock, + &LockHandle); + + InsertHeadList(&DriverObjectExtension->AdapterListHead, + &DeviceExtension->AdapterListEntry); + DriverObjectExtension->AdapterCount++; + + KeReleaseInStackQueuedSpinLock(&LockHandle); + + /* The device has been initialized */ + Fdo->Flags &= ~DO_DEVICE_INITIALIZING; + + DPRINT1("PortAddDevice() done (Status 0x%08lx)\n", Status); + + return Status; +} + + +static +VOID +NTAPI +PortUnload( + _In_ PDRIVER_OBJECT DriverObject) +{ + DPRINT1("PortUnload(%p)\n", + DriverObject); +} + + +static +NTSTATUS +NTAPI +PortDispatchCreate( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + DPRINT1("PortDispatchCreate(%p %p)\n", + DeviceObject, Irp); + + Irp->IoStatus.Status = STATUS_SUCCESS; + Irp->IoStatus.Information = FILE_OPENED; + + IoCompleteRequest( Irp, IO_NO_INCREMENT ); + + return STATUS_SUCCESS; +} + + +static +NTSTATUS +NTAPI +PortDispatchClose( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + DPRINT1("PortDispatchClose(%p %p)\n", + DeviceObject, Irp); + + Irp->IoStatus.Status = STATUS_SUCCESS; + Irp->IoStatus.Information = 0; + + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return STATUS_SUCCESS; +} + + +static +NTSTATUS +NTAPI +PortDispatchDeviceControl( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + DPRINT1("PortDispatchDeviceControl(%p %p)\n", + DeviceObject, Irp); + + Irp->IoStatus.Status = STATUS_SUCCESS; + Irp->IoStatus.Information = 0; + + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return STATUS_SUCCESS; +} + + +static +NTSTATUS +NTAPI +PortDispatchScsi( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + DPRINT1("PortDispatchScsi(%p %p)\n", + DeviceObject, Irp); + + Irp->IoStatus.Status = STATUS_SUCCESS; + Irp->IoStatus.Information = 0; + + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return STATUS_SUCCESS; +} + + +static +NTSTATUS +NTAPI +PortDispatchSystemControl( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + DPRINT1("PortDispatchSystemControl(%p %p)\n", + DeviceObject, Irp); + + Irp->IoStatus.Status = STATUS_SUCCESS; + Irp->IoStatus.Information = 0; + + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return STATUS_SUCCESS; +} + + +static +NTSTATUS +NTAPI +PortDispatchPnp( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PFDO_DEVICE_EXTENSION DeviceExtension; + + DPRINT1("PortDispatchPnp(%p %p)\n", + DeviceObject, Irp); + + DeviceExtension = (PFDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + DPRINT1("ExtensionType: %u\n", DeviceExtension->ExtensionType); + + switch (DeviceExtension->ExtensionType) + { + case FdoExtension: + return PortFdoPnp(DeviceObject, + Irp); + + case PdoExtension: + return PortPdoPnp(DeviceObject, + Irp); + + default: + Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_UNSUCCESSFUL; + } +} + + +static +NTSTATUS +NTAPI +PortDispatchPower( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + DPRINT1("PortDispatchPower(%p %p)\n", + DeviceObject, Irp); + + Irp->IoStatus.Status = STATUS_SUCCESS; + Irp->IoStatus.Information = 0; + + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return STATUS_SUCCESS; +} + + +/* PUBLIC FUNCTIONS ***********************************************************/ + +/* + * @implemented + */ +NTSTATUS +NTAPI +DriverEntry( + _In_ PDRIVER_OBJECT DriverObject, + _In_ PUNICODE_STRING RegistryPath) +{ + DPRINT1("DriverEntry(%p %p)\n", DriverObject, RegistryPath); + return STATUS_SUCCESS; +} + + +/* + * @unimplemented + */ +STORPORT_API +PUCHAR +NTAPI +StorPortAllocateRegistryBuffer( + _In_ PVOID HwDeviceExtension, + _In_ PULONG Length) +{ + DPRINT1("StorPortAllocateRegistryBuffer()\n"); + UNIMPLEMENTED; + return NULL; +} + + +/* + * @unimplemented + */ +STORPORT_API +BOOLEAN +NTAPI +StorPortBusy( + _In_ PVOID HwDeviceExtension, + _In_ ULONG RequestsToComplete) +{ + DPRINT1("StorPortBuzy()\n"); + UNIMPLEMENTED; + return FALSE; +} + + +/* + * @unimplemented + */ +STORPORT_API +VOID +NTAPI +StorPortCompleteRequest( + _In_ PVOID HwDeviceExtension, + _In_ UCHAR PathId, + _In_ UCHAR TargetId, + _In_ UCHAR Lun, + _In_ UCHAR SrbStatus) +{ + DPRINT1("StorPortCompleteRequest()\n"); + UNIMPLEMENTED; +} + + +/* + * @implemented + */ +STORPORT_API +ULONG +NTAPI +StorPortConvertPhysicalAddressToUlong( + _In_ STOR_PHYSICAL_ADDRESS Address) +{ + DPRINT1("StorPortConvertPhysicalAddressToUlong()\n"); + + return Address.u.LowPart; +} + + +/* + * @implemented + */ +STORPORT_API +STOR_PHYSICAL_ADDRESS +NTAPI +StorPortConvertUlongToPhysicalAddress( + _In_ ULONG_PTR UlongAddress) +{ + STOR_PHYSICAL_ADDRESS Address; + + DPRINT1("StorPortConvertUlongToPhysicalAddress()\n"); + + Address.QuadPart = UlongAddress; + return Address; +} + + +/* + * @implemented + */ +STORPORT_API +VOID +StorPortDebugPrint( + _In_ ULONG DebugPrintLevel, + _In_ PCHAR DebugMessage, + ...) +{ + va_list ap; + + va_start(ap, DebugMessage); + vDbgPrintExWithPrefix("STORMINI: ", 0x58, DebugPrintLevel, DebugMessage, ap); + va_end(ap); +} + + +/* + * @unimplemented + */ +STORPORT_API +BOOLEAN +NTAPI +StorPortDeviceBusy( + _In_ PVOID HwDeviceExtension, + _In_ UCHAR PathId, + _In_ UCHAR TargetId, + _In_ UCHAR Lun, + _In_ ULONG RequestsToComplete) +{ + DPRINT1("StorPortDeviceBusy()\n"); + UNIMPLEMENTED; + return FALSE; +} + + +/* + * @unimplemented + */ +STORPORT_API +BOOLEAN +NTAPI +StorPortDeviceReady( + _In_ PVOID HwDeviceExtension, + _In_ UCHAR PathId, + _In_ UCHAR TargetId, + _In_ UCHAR Lun) +{ + DPRINT1("StorPortDeviceReady()\n"); + UNIMPLEMENTED; + return FALSE; +} + + +/* + * @implemented + */ +STORPORT_API +VOID +NTAPI +StorPortFreeDeviceBase( + _In_ PVOID HwDeviceExtension, + _In_ PVOID MappedAddress) +{ + DPRINT1("StorPortFreeDeviceBase()\n"); +} + + +/* + * @unimplemented + */ +STORPORT_API +VOID +NTAPI +StorPortFreeRegistryBuffer( + _In_ PVOID HwDeviceExtension, + _In_ PUCHAR Buffer) +{ + DPRINT1("StorPortFreeRegistryBuffer()\n"); + UNIMPLEMENTED; +} + + +/* + * @unimplemented + */ +STORPORT_API +ULONG +NTAPI +StorPortGetBusData( + _In_ PVOID DeviceExtension, + _In_ ULONG BusDataType, + _In_ ULONG SystemIoBusNumber, + _In_ ULONG SlotNumber, + _Out_ _When_(Length != 0, _Out_writes_bytes_(Length)) PVOID Buffer, + _In_ ULONG Length) +{ + DPRINT1("StorPortGetBusData()\n"); + UNIMPLEMENTED; + return 0; +} + + +/* + * @unimplemented + */ +STORPORT_API +PVOID +NTAPI +StorPortGetDeviceBase( + _In_ PVOID HwDeviceExtension, + _In_ INTERFACE_TYPE BusType, + _In_ ULONG SystemIoBusNumber, + _In_ STOR_PHYSICAL_ADDRESS IoAddress, + _In_ ULONG NumberOfBytes, + _In_ BOOLEAN InIoSpace) +{ + DPRINT1("StorPortGetDeviceBase()\n"); + UNIMPLEMENTED; + return NULL; +} + + +/* + * @unimplemented + */ +STORPORT_API +PVOID +NTAPI +StorPortGetLogicalUnit( + _In_ PVOID HwDeviceExtension, + _In_ UCHAR PathId, + _In_ UCHAR TargetId, + _In_ UCHAR Lun) +{ + DPRINT1("StorPortGetLogicalUnit()\n"); + UNIMPLEMENTED; + return NULL; +} + + +/* + * @unimplemented + */ +STORPORT_API +STOR_PHYSICAL_ADDRESS +NTAPI +StorPortGetPhysicalAddress( + _In_ PVOID HwDeviceExtension, + _In_opt_ PSCSI_REQUEST_BLOCK Srb, + _In_ PVOID VirtualAddress, + _Out_ ULONG *Length) +{ + STOR_PHYSICAL_ADDRESS PhysicalAddress; + + DPRINT1("StorPortGetPhysicalAddress(%p %p %p %p)\n", + HwDeviceExtension, Srb, VirtualAddress, Length); + UNIMPLEMENTED; + + *Length = 0; + PhysicalAddress.QuadPart = (LONGLONG)0; + + return PhysicalAddress; +} + + +/* + * @unimplemented + */ +STORPORT_API +PSTOR_SCATTER_GATHER_LIST +NTAPI +StorPortGetScatterGatherList( + _In_ PVOID DeviceExtension, + _In_ PSCSI_REQUEST_BLOCK Srb) +{ + DPRINT1("StorPortGetScatterGatherList()\n"); + UNIMPLEMENTED; + return NULL; +} + + +/* + * @implemented + */ +STORPORT_API +PSCSI_REQUEST_BLOCK +NTAPI +StorPortGetSrb( + _In_ PVOID DeviceExtension, + _In_ UCHAR PathId, + _In_ UCHAR TargetId, + _In_ UCHAR Lun, + _In_ LONG QueueTag) +{ + DPRINT("StorPortGetSrb()\n"); + return NULL; +} + + +/* + * @unimplemented + */ +STORPORT_API +PVOID +NTAPI +StorPortGetUncachedExtension( + _In_ PVOID HwDeviceExtension, + _In_ PPORT_CONFIGURATION_INFORMATION ConfigInfo, + _In_ ULONG NumberOfBytes) +{ + DPRINT1("StorPortGetUncachedExtension(%p %p %lu)\n", + HwDeviceExtension, ConfigInfo, NumberOfBytes); + UNIMPLEMENTED; + return NULL; +} + + +/* + * @unimplemented + */ +STORPORT_API +PVOID +NTAPI +StorPortGetVirtualAddress( + _In_ PVOID HwDeviceExtension, + _In_ STOR_PHYSICAL_ADDRESS PhysicalAddress) +{ + DPRINT1("StorPortGetVirtualAddress(%p %I64x)\n", + HwDeviceExtension, PhysicalAddress.QuadPart); + UNIMPLEMENTED; + return NULL; +} + + +/* + * @implemented + */ +STORPORT_API +ULONG +NTAPI +StorPortInitialize( + _In_ PVOID Argument1, + _In_ PVOID Argument2, + _In_ struct _HW_INITIALIZATION_DATA *HwInitializationData, + _In_opt_ PVOID HwContext) +{ + PDRIVER_OBJECT DriverObject = (PDRIVER_OBJECT)Argument1; + PUNICODE_STRING RegistryPath = (PUNICODE_STRING)Argument2; + PDRIVER_OBJECT_EXTENSION DriverObjectExtension; + NTSTATUS Status = STATUS_SUCCESS; + + DPRINT1("StorPortInitialize(%p %p %p %p)\n", + Argument1, Argument2, HwInitializationData, HwContext); + + DPRINT1("HwInitializationDataSize: %lu\n", HwInitializationData->HwInitializationDataSize); + DPRINT1("AdapterInterfaceType: %u\n", HwInitializationData->AdapterInterfaceType); + DPRINT1("HwInitialize: %p\n", HwInitializationData->HwInitialize); + DPRINT1("HwStartIo: %p\n", HwInitializationData->HwStartIo); + DPRINT1("HwInterrupt: %p\n", HwInitializationData->HwInterrupt); + DPRINT1("HwFindAdapter: %p\n", HwInitializationData->HwFindAdapter); + DPRINT1("HwResetBus: %p\n", HwInitializationData->HwResetBus); + DPRINT1("HwDmaStarted: %p\n", HwInitializationData->HwDmaStarted); + DPRINT1("HwAdapterState: %p\n", HwInitializationData->HwAdapterState); + DPRINT1("DeviceExtensionSize: %lu\n", HwInitializationData->DeviceExtensionSize); + DPRINT1("SpecificLuExtensionSize: %lu\n", HwInitializationData->SpecificLuExtensionSize); + DPRINT1("SrbExtensionSize: %lu\n", HwInitializationData->SrbExtensionSize); + DPRINT1("NumberOfAccessRanges: %lu\n", HwInitializationData->NumberOfAccessRanges); + + /* Check parameters */ + if ((DriverObject == NULL) || + (RegistryPath == NULL) || + (HwInitializationData == NULL)) + { + DPRINT1("Invalid parameter!\n"); + return STATUS_INVALID_PARAMETER; + } + + /* Check initialization data */ + if ((HwInitializationData->HwInitializationDataSize < sizeof(HW_INITIALIZATION_DATA)) || + (HwInitializationData->HwInitialize == NULL) || + (HwInitializationData->HwStartIo == NULL) || + (HwInitializationData->HwFindAdapter == NULL) || + (HwInitializationData->HwResetBus == NULL)) + { + DPRINT1("Revision mismatch!\n"); + return STATUS_REVISION_MISMATCH; + } + + DriverObjectExtension = IoGetDriverObjectExtension(DriverObject, + (PVOID)DriverEntry); + if (DriverObjectExtension == NULL) + { + DPRINT1("No driver object extension!\n"); + + Status = IoAllocateDriverObjectExtension(DriverObject, + (PVOID)DriverEntry, + sizeof(DRIVER_OBJECT_EXTENSION), + (PVOID *)&DriverObjectExtension); + if (!NT_SUCCESS(Status)) + { + DPRINT1("IoAllocateDriverObjectExtension() failed (Status 0x%08lx)\n", Status); + return Status; + } + + DPRINT1("Driver object extension created!\n"); + + /* Initialize the driver object extension */ + RtlZeroMemory(DriverObjectExtension, + sizeof(DRIVER_OBJECT_EXTENSION)); + + DriverObjectExtension->ExtensionType = DriverExtension; + DriverObjectExtension->DriverObject = DriverObject; + + InitializeListHead(&DriverObjectExtension->AdapterListHead); + KeInitializeSpinLock(&DriverObjectExtension->AdapterListLock); + + + /* Set handlers */ + DriverObject->DriverExtension->AddDevice = PortAddDevice; +// DriverObject->DriverStartIo = PortStartIo; + DriverObject->DriverUnload = PortUnload; + DriverObject->MajorFunction[IRP_MJ_CREATE] = PortDispatchCreate; + DriverObject->MajorFunction[IRP_MJ_CLOSE] = PortDispatchClose; + DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = PortDispatchDeviceControl; + DriverObject->MajorFunction[IRP_MJ_SCSI] = PortDispatchScsi; + DriverObject->MajorFunction[IRP_MJ_POWER] = PortDispatchPower; + DriverObject->MajorFunction[IRP_MJ_SYSTEM_CONTROL] = PortDispatchSystemControl; + DriverObject->MajorFunction[IRP_MJ_PNP] = PortDispatchPnp; + } + + DPRINT1("StorPortInitialize() done (Status 0x%08lx)\n", Status); + + return Status; +} + + +/* + * @unimplemented + */ +STORPORT_API +VOID +NTAPI +StorPortLogError( + _In_ PVOID HwDeviceExtension, + _In_opt_ PSCSI_REQUEST_BLOCK Srb, + _In_ UCHAR PathId, + _In_ UCHAR TargetId, + _In_ UCHAR Lun, + _In_ ULONG ErrorCode, + _In_ ULONG UniqueId) +{ + DPRINT1("ScsiPortLogError() called\n"); + DPRINT1("PathId: 0x%02x TargetId: 0x%02x Lun: 0x%02x ErrorCode: 0x%08lx UniqueId: 0x%08lx\n", + PathId, TargetId, Lun, ErrorCode, UniqueId); + + DPRINT1("ScsiPortLogError() done\n"); +} + + +/* + * @implemented + */ +STORPORT_API +VOID +NTAPI +StorPortMoveMemory( + _Out_writes_bytes_(Length) PVOID Destination, + _In_reads_bytes_(Length) PVOID Source, + _In_ ULONG Length) +{ + RtlMoveMemory(Destination, Source, Length); +} + + +/* + * @unimplemented + */ +STORPORT_API +VOID +StorPortNotification( + _In_ SCSI_NOTIFICATION_TYPE NotificationType, + _In_ PVOID HwDeviceExtension, + ...) +{ + DPRINT1("StorPortNotification()\n"); +} + + +/* + * @unimplemented + */ +STORPORT_API +BOOLEAN +NTAPI +StorPortPause( + _In_ PVOID HwDeviceExtension, + _In_ ULONG TimeOut) +{ + DPRINT1("StorPortPause()\n"); + UNIMPLEMENTED; + return FALSE; +} + + +/* + * @unimplemented + */ +STORPORT_API +BOOLEAN +NTAPI +StorPortPauseDevice( + _In_ PVOID HwDeviceExtension, + _In_ UCHAR PathId, + _In_ UCHAR TargetId, + _In_ UCHAR Lun, + _In_ ULONG TimeOut) +{ + DPRINT1("StorPortPauseDevice()\n"); + UNIMPLEMENTED; + return FALSE; +} + + +/* + * @unimplemented + */ +STORPORT_API +BOOLEAN +NTAPI +StorPortReady( + _In_ PVOID HwDeviceExtension) +{ + DPRINT1("StorPortReady()\n"); + UNIMPLEMENTED; + return FALSE; +} + + +/* + * @unimplemented + */ +STORPORT_API +BOOLEAN +NTAPI +StorPortRegistryRead( + _In_ PVOID HwDeviceExtension, + _In_ PUCHAR ValueName, + _In_ ULONG Global, + _In_ ULONG Type, + _In_ PUCHAR Buffer, + _In_ PULONG BufferLength) +{ + DPRINT1("StorPortRegistryRead()\n"); + UNIMPLEMENTED; + return FALSE; +} + + +/* + * @unimplemented + */ +STORPORT_API +BOOLEAN +NTAPI +StorPortRegistryWrite( + _In_ PVOID HwDeviceExtension, + _In_ PUCHAR ValueName, + _In_ ULONG Global, + _In_ ULONG Type, + _In_ PUCHAR Buffer, + _In_ ULONG BufferLength) +{ + DPRINT1("StorPortRegistryWrite()\n"); + UNIMPLEMENTED; + return FALSE; +} + + +/* + * @unimplemented + */ +STORPORT_API +BOOLEAN +NTAPI +StorPortResume( + _In_ PVOID HwDeviceExtension) +{ + DPRINT1("StorPortResume()\n"); + UNIMPLEMENTED; + return FALSE; +} + + +/* + * @unimplemented + */ +STORPORT_API +BOOLEAN +NTAPI +StorPortResumeDevice( + _In_ PVOID HwDeviceExtension, + _In_ UCHAR PathId, + _In_ UCHAR TargetId, + _In_ UCHAR Lun) +{ + DPRINT1("StorPortResumeDevice()\n"); + UNIMPLEMENTED; + return FALSE; +} + + +/* + * @unimplemented + */ +STORPORT_API +ULONG +NTAPI +StorPortSetBusDataByOffset( + _In_ PVOID DeviceExtension, + _In_ ULONG BusDataType, + _In_ ULONG SystemIoBusNumber, + _In_ ULONG SlotNumber, + _In_reads_bytes_(Length) PVOID Buffer, + _In_ ULONG Offset, + _In_ ULONG Length) +{ + DPRINT1("StorPortSetBusDataByOffset()\n"); + UNIMPLEMENTED; + return 0; +} + + +/* + * @unimplemented + */ +STORPORT_API +BOOLEAN +NTAPI +StorPortSetDeviceQueueDepth( + _In_ PVOID HwDeviceExtension, + _In_ UCHAR PathId, + _In_ UCHAR TargetId, + _In_ UCHAR Lun, + _In_ ULONG Depth) +{ + DPRINT1("StorPortSetDeviceQueueDepth()\n"); + UNIMPLEMENTED; + return FALSE; +} + + +/* + * @implemented + */ +STORPORT_API +VOID +NTAPI +StorPortStallExecution( + _In_ ULONG Delay) +{ + KeStallExecutionProcessor(Delay); +} + + +/* + * @unimplemented + */ +STORPORT_API +VOID +NTAPI +StorPortSynchronizeAccess( + _In_ PVOID HwDeviceExtension, + _In_ PSTOR_SYNCHRONIZED_ACCESS SynchronizedAccessRoutine, + _In_opt_ PVOID Context) +{ + DPRINT1("StorPortSynchronizeAccess()\n"); + UNIMPLEMENTED; +} + + +/* + * @implemented + */ +STORPORT_API +BOOLEAN +NTAPI +StorPortValidateRange( + _In_ PVOID HwDeviceExtension, + _In_ INTERFACE_TYPE BusType, + _In_ ULONG SystemIoBusNumber, + _In_ STOR_PHYSICAL_ADDRESS IoAddress, + _In_ ULONG NumberOfBytes, + _In_ BOOLEAN InIoSpace) +{ + DPRINT1("StorPortValidateRange()\n"); + return TRUE; +} + +/* EOF */ diff --git a/drivers/storage/port/storport/storport.rc b/drivers/storage/port/storport/storport.rc new file mode 100644 index 0000000000..ec00692e01 --- /dev/null +++ b/drivers/storage/port/storport/storport.rc @@ -0,0 +1,5 @@ +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "Storport Driver" +#define REACTOS_STR_INTERNAL_NAME "storport" +#define REACTOS_STR_ORIGINAL_FILENAME "storport.sys" +#include <reactos/version.rc> \ No newline at end of file diff --git a/drivers/storage/port/storport/storport.spec b/drivers/storage/port/storport/storport.spec new file mode 100644 index 0000000000..2596b97279 --- /dev/null +++ b/drivers/storage/port/storport/storport.spec @@ -0,0 +1,63 @@ +# DllInitialize +@ stdcall ScsiPortMoveMemory(ptr ptr long) StorPortMoveMemory +@ cdecl ScsiPortNotification() StorPortNotification +@ stdcall StorPortAllocateRegistryBuffer(ptr ptr) +@ stdcall StorPortBusy(ptr long) +@ stdcall StorPortCompleteRequest(ptr long long long long) +@ stdcall StorPortConvertPhysicalAddressToUlong(long long) +@ stdcall StorPortConvertUlongToPhysicalAddress(long) +@ cdecl StorPortDebugPrint() +@ stdcall StorPortDeviceBusy(ptr long long long long) +@ stdcall StorPortDeviceReady(ptr long long long) +# StorPortExtendedFunction +@ stdcall StorPortFreeDeviceBase(ptr ptr) +@ stdcall StorPortFreeRegistryBuffer(ptr ptr) +@ stdcall StorPortGetBusData(ptr long long long ptr long) +@ stdcall StorPortGetDeviceBase(ptr long long long long long long) +@ stdcall StorPortGetLogicalUnit(ptr long long long) +@ stdcall StorPortGetPhysicalAddress(ptr ptr ptr long) +@ stdcall StorPortGetScatterGatherList(ptr ptr) +@ stdcall StorPortGetSrb(ptr long long long long) +@ stdcall StorPortGetUncachedExtension(ptr ptr long) +@ stdcall StorPortGetVirtualAddress(ptr long long) +@ stdcall StorPortInitialize(ptr ptr ptr ptr) +@ stdcall StorPortLogError(ptr ptr long long long long long) +@ stdcall StorPortMoveMemory(ptr ptr long) +@ cdecl StorPortNotification() +@ stdcall StorPortQuerySystemTime(ptr) NTOSKRNL.KeQuerySystemTime +@ stdcall StorPortPause(ptr long) +@ stdcall StorPortPauseDevice(ptr long long long long) +@ stdcall StorPortReadPortBufferUchar(ptr ptr ptr long) +@ stdcall StorPortReadPortBufferUlong(ptr ptr ptr long) +@ stdcall StorPortReadPortBufferUshort(ptr ptr ptr long) +@ stdcall StorPortReadPortUchar(ptr ptr) +@ stdcall StorPortReadPortUlong(ptr ptr) +@ stdcall StorPortReadPortUshort(ptr ptr) +@ stdcall StorPortReadRegisterBufferUchar(ptr ptr ptr long) +@ stdcall StorPortReadRegisterBufferUlong(ptr ptr ptr long) +@ stdcall StorPortReadRegisterBufferUshort(ptr ptr ptr long) +@ stdcall StorPortReadRegisterUchar(ptr ptr) +@ stdcall StorPortReadRegisterUlong(ptr ptr) +@ stdcall StorPortReadRegisterUshort(ptr ptr) +@ stdcall StorPortReady(ptr) +@ stdcall StorPortRegistryRead(ptr ptr long long ptr ptr) +@ stdcall StorPortRegistryWrite(ptr ptr long long ptr long) +@ stdcall StorPortResume(ptr) +@ stdcall StorPortResumeDevice(ptr long long long) +@ stdcall StorPortSetBusDataByOffset(ptr long long long ptr long long) +@ stdcall StorPortSetDeviceQueueDepth(ptr long long long long) +@ stdcall StorPortStallExecution(long) +@ stdcall StorPortSynchronizeAccess(ptr ptr ptr) +@ stdcall StorPortValidateRange(ptr long long long long long long) +@ stdcall StorPortWritePortBufferUchar(ptr ptr ptr long) +@ stdcall StorPortWritePortBufferUlong(ptr ptr ptr long) +@ stdcall StorPortWritePortBufferUshort(ptr ptr ptr long) +@ stdcall StorPortWritePortUchar(ptr ptr long) +@ stdcall StorPortWritePortUlong(ptr ptr long) +@ stdcall StorPortWritePortUshort(ptr ptr long) +@ stdcall StorPortWriteRegisterBufferUchar(ptr ptr ptr long) +@ stdcall StorPortWriteRegisterBufferUlong(ptr ptr ptr long) +@ stdcall StorPortWriteRegisterBufferUshort(ptr ptr ptr long) +@ stdcall StorPortWriteRegisterUchar(ptr ptr long) +@ stdcall StorPortWriteRegisterUlong(ptr ptr long) +@ stdcall StorPortWriteRegisterUshort(ptr ptr long) diff --git a/drivers/storage/port/storport/stubs.c b/drivers/storage/port/storport/stubs.c new file mode 100644 index 0000000000..80210dfd75 --- /dev/null +++ b/drivers/storage/port/storport/stubs.c @@ -0,0 +1,311 @@ +/* + * PROJECT: ReactOS Storport Driver + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Storport driver stub functions + * COPYRIGHT: Copyright 2017 Eric Kohl (eric.kohl(a)reactos.org) + */ + +/* INCLUDES *******************************************************************/ + +#include "precomp.h" + +#define NDEBUG +#include <debug.h> + + +/* FUNCTIONS ******************************************************************/ + +STORPORT_API +VOID +NTAPI +StorPortReadPortBufferUchar( + _In_ PVOID HwDeviceExtension, + _In_ PUCHAR Port, + _In_ PUCHAR Buffer, + _In_ ULONG Count) +{ + READ_PORT_BUFFER_UCHAR(Port, Buffer, Count); +} + + +STORPORT_API +VOID +NTAPI +StorPortReadPortBufferUlong( + _In_ PVOID HwDeviceExtension, + _In_ PULONG Port, + _In_ PULONG Buffer, + _In_ ULONG Count) +{ + READ_PORT_BUFFER_ULONG(Port, Buffer, Count); +} + + +STORPORT_API +VOID +NTAPI +StorPortReadPortBufferUshort( + _In_ PVOID HwDeviceExtension, + _In_ PUSHORT Port, + _In_ PUSHORT Buffer, + _In_ ULONG Count) +{ + READ_PORT_BUFFER_USHORT(Port, Buffer, Count); +} + + +STORPORT_API +UCHAR +NTAPI +StorPortReadPortUchar( + _In_ PVOID HwDeviceExtension, + _In_ PUCHAR Port) +{ + return READ_PORT_UCHAR(Port); +} + + +STORPORT_API +ULONG +NTAPI +StorPortReadPortUlong( + _In_ PVOID HwDeviceExtension, + _In_ PULONG Port) +{ + return READ_PORT_ULONG(Port); +} + + +STORPORT_API +USHORT +NTAPI +StorPortReadPortUshort( + _In_ PVOID HwDeviceExtension, + _In_ PUSHORT Port) +{ + return READ_PORT_USHORT(Port); +} + + +STORPORT_API +VOID +NTAPI +StorPortReadRegisterBufferUchar( + _In_ PVOID HwDeviceExtension, + _In_ PUCHAR Register, + _In_ PUCHAR Buffer, + _In_ ULONG Count) +{ + READ_REGISTER_BUFFER_UCHAR(Register, Buffer, Count); +} + + +STORPORT_API +VOID +NTAPI +StorPortReadRegisterBufferUlong( + _In_ PVOID HwDeviceExtension, + _In_ PULONG Register, + _In_ PULONG Buffer, + _In_ ULONG Count) +{ + READ_REGISTER_BUFFER_ULONG(Register, Buffer, Count); +} + + +STORPORT_API +VOID +NTAPI +StorPortReadRegisterBufferUshort( + _In_ PVOID HwDeviceExtension, + _In_ PUSHORT Register, + _In_ PUSHORT Buffer, + _In_ ULONG Count) +{ + READ_REGISTER_BUFFER_USHORT(Register, Buffer, Count); +} + + +STORPORT_API +UCHAR +NTAPI +StorPortReadRegisterUchar( + _In_ PVOID HwDeviceExtension, + _In_ PUCHAR Register) +{ + return READ_REGISTER_UCHAR(Register); +} + + +STORPORT_API +ULONG +NTAPI +StorPortReadRegisterUlong( + _In_ PVOID HwDeviceExtension, + _In_ PULONG Register) +{ + return READ_REGISTER_ULONG(Register); +} + + +STORPORT_API +USHORT +NTAPI +StorPortReadRegisterUshort( + _In_ PVOID HwDeviceExtension, + _In_ PUSHORT Register) +{ + return READ_REGISTER_USHORT(Register); +} + + +STORPORT_API +VOID +NTAPI +StorPortWritePortBufferUchar( + _In_ PVOID HwDeviceExtension, + _In_ PUCHAR Port, + _In_ PUCHAR Buffer, + _In_ ULONG Count) +{ + WRITE_PORT_BUFFER_UCHAR(Port, Buffer, Count); +} + + +STORPORT_API +VOID +NTAPI +StorPortWritePortBufferUlong( + _In_ PVOID HwDeviceExtension, + _In_ PULONG Port, + _In_ PULONG Buffer, + _In_ ULONG Count) +{ + WRITE_PORT_BUFFER_ULONG(Port, Buffer, Count); +} + + +STORPORT_API +VOID +NTAPI +StorPortWritePortBufferUshort( + _In_ PVOID HwDeviceExtension, + _In_ PUSHORT Port, + _In_ PUSHORT Buffer, + _In_ ULONG Count) +{ + WRITE_PORT_BUFFER_USHORT(Port, Buffer, Count); +} + + +STORPORT_API +VOID +NTAPI +StorPortWritePortUchar( + _In_ PVOID HwDeviceExtension, + _In_ PUCHAR Port, + _In_ UCHAR Value) +{ + WRITE_PORT_UCHAR(Port, Value); +} + + +STORPORT_API +VOID +NTAPI +StorPortWritePortUlong( + _In_ PVOID HwDeviceExtension, + _In_ PULONG Port, + _In_ ULONG Value) +{ + WRITE_PORT_ULONG(Port, Value); +} + + +STORPORT_API +VOID +NTAPI +StorPortWritePortUshort( + _In_ PVOID HwDeviceExtension, + _In_ PUSHORT Port, + _In_ USHORT Value) +{ + WRITE_PORT_USHORT(Port, Value); +} + + +STORPORT_API +VOID +NTAPI +StorPortWriteRegisterBufferUchar( + _In_ PVOID HwDeviceExtension, + _In_ PUCHAR Register, + _In_ PUCHAR Buffer, + _In_ ULONG Count) +{ + WRITE_REGISTER_BUFFER_UCHAR(Register, Buffer, Count); +} + + +STORPORT_API +VOID +NTAPI +StorPortWriteRegisterBufferUlong( + _In_ PVOID HwDeviceExtension, + _In_ PULONG Register, + _In_ PULONG Buffer, + _In_ ULONG Count) +{ + WRITE_REGISTER_BUFFER_ULONG(Register, Buffer, Count); +} + + +STORPORT_API +VOID +NTAPI +StorPortWriteRegisterBufferUshort( + _In_ PVOID HwDeviceExtension, + _In_ PUSHORT Register, + _In_ PUSHORT Buffer, + _In_ ULONG Count) +{ + WRITE_REGISTER_BUFFER_USHORT(Register, Buffer, Count); +} + + +STORPORT_API +VOID +NTAPI +StorPortWriteRegisterUchar( + _In_ PVOID HwDeviceExtension, + _In_ PUCHAR Register, + _In_ UCHAR Value) +{ + WRITE_REGISTER_UCHAR(Register, Value); +} + + +STORPORT_API +VOID +NTAPI +StorPortWriteRegisterUlong( + _In_ PVOID HwDeviceExtension, + _In_ PULONG Register, + _In_ ULONG Value) +{ + WRITE_REGISTER_ULONG(Register, Value); +} + + +STORPORT_API +VOID +NTAPI +StorPortWriteRegisterUshort( + _In_ PVOID HwDeviceExtension, + _In_ PUSHORT Register, + _In_ USHORT Value) +{ + WRITE_REGISTER_USHORT(Register, Value); +} + +/* EOF */

6 years, 11 months

[reactos] 02/02: Merge branch 'master' of https://github.com/reactos/reactos

by gedmurphy

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=637276f1abd7e8fdd5a54… commit 637276f1abd7e8fdd5a54bd4ea2f03ecbd0e3e7d Merge: 650cca217a 1473c522cf Author: gedmurphy <gedmurphy(a)reactos.org> AuthorDate: Thu Oct 12 21:36:29 2017 +0100 Merge branch 'master' of https://github.com/reactos/reactos

6 years, 11 months

[reactos] 01/02: [FLTMGR] - Implement FltGetVolumeProperties - Internal structs taken from public pdbs

by Ged Murphy

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=650cca217ad8ad0bab16a… commit 650cca217ad8ad0bab16a61a96251463ebc9aaa1 Author: Ged Murphy <gedmurphy(a)gmail.com> AuthorDate: Thu Oct 12 21:06:41 2017 +0100 [FLTMGR] - Implement FltGetVolumeProperties - Internal structs taken from public pdbs --- drivers/filters/fltmgr/CMakeLists.txt | 1 + drivers/filters/fltmgr/Volume.c | 110 ++++++++++++++++++++++++++++++++++ drivers/filters/fltmgr/fltmgr.spec | 1 + drivers/filters/fltmgr/fltmgrint.h | 108 +++++++++++++++++++++++++++++++++ 4 files changed, 220 insertions(+) diff --git a/drivers/filters/fltmgr/CMakeLists.txt b/drivers/filters/fltmgr/CMakeLists.txt index f3d52e2200..5a02cab116 100644 --- a/drivers/filters/fltmgr/CMakeLists.txt +++ b/drivers/filters/fltmgr/CMakeLists.txt @@ -7,6 +7,7 @@ list(APPEND SOURCE Messaging.c Misc.c Object.c + Volume.c ${CMAKE_CURRENT_BINARY_DIR}/fltmgr.def fltmgr.h) diff --git a/drivers/filters/fltmgr/Volume.c b/drivers/filters/fltmgr/Volume.c new file mode 100644 index 0000000000..6a854f76a6 --- /dev/null +++ b/drivers/filters/fltmgr/Volume.c @@ -0,0 +1,110 @@ +/* +* PROJECT: Filesystem Filter Manager +* LICENSE: GPL - See COPYING in the top level directory +* FILE: drivers/filters/fltmgr/Context.c +* PURPOSE: Contains routines for the volume +* PROGRAMMERS: Ged Murphy (gedmurphy(a)reactos.org) +*/ + +/* INCLUDES ******************************************************************/ + +#include "fltmgr.h" +#include "fltmgrint.h" + +#define NDEBUG +#include <debug.h> + + +/* DATA *********************************************************************/ + + + +/* EXPORTED FUNCTIONS ******************************************************/ + +NTSTATUS +FLTAPI +FltGetVolumeProperties( + _In_ PFLT_VOLUME Volume, + _Out_writes_bytes_to_opt_(VolumePropertiesLength, *LengthReturned) PFLT_VOLUME_PROPERTIES VolumeProperties, + _In_ ULONG VolumePropertiesLength, + _Out_ PULONG LengthReturned +) +{ + ULONG BufferRequired; + ULONG BytesWritten; + PCHAR Ptr; + NTSTATUS Status; + + /* Calculate the required buffer size */ + BufferRequired = sizeof(FLT_VOLUME_PROPERTIES) + + Volume->CDODriverName.Length + + Volume->DeviceName.Length + + Volume->CDODeviceName.Length; + + /* If we don't have enough buffer to fill in the fixed struct, return with the required size */ + if (VolumePropertiesLength < sizeof(FLT_VOLUME_PROPERTIES)) + { + *LengthReturned = BufferRequired; + return STATUS_BUFFER_TOO_SMALL; + } + + /* Clear out the buffer */ + RtlZeroMemory(VolumeProperties, sizeof(FLT_VOLUME_PROPERTIES)); + + /* Fill in the fixed data */ + VolumeProperties->DeviceType = Volume->DeviceObject->DeviceType; + VolumeProperties->DeviceObjectFlags = Volume->DeviceObject->Flags; + VolumeProperties->AlignmentRequirement = Volume->DeviceObject->AlignmentRequirement; + VolumeProperties->SectorSize = Volume->DeviceObject->SectorSize; + if (Volume->DiskDeviceObject) + { + VolumeProperties->DeviceCharacteristics = Volume->DiskDeviceObject->Characteristics; + } + else + { + VolumeProperties->DeviceCharacteristics = Volume->DeviceObject->Characteristics; + } + + /* So far we've written the fixed struct data */ + BytesWritten = sizeof(FLT_VOLUME_PROPERTIES); + Ptr = (PCHAR)(VolumeProperties + 1); + + /* Make sure we have enough room to add the dynamic data */ + if (VolumePropertiesLength >= BufferRequired) + { + /* Add the FS device name */ + VolumeProperties->FileSystemDeviceName.Length = 0; + VolumeProperties->FileSystemDeviceName.MaximumLength = Volume->CDODeviceName.Length; + VolumeProperties->FileSystemDeviceName.Buffer = (PWCH)Ptr; + RtlCopyUnicodeString(&VolumeProperties->FileSystemDeviceName, &Volume->CDODeviceName); + Ptr += VolumeProperties->FileSystemDeviceName.Length; + + /* Add the driver name */ + VolumeProperties->FileSystemDriverName.Length = 0; + VolumeProperties->FileSystemDriverName.MaximumLength = Volume->CDODriverName.Length; + VolumeProperties->FileSystemDriverName.Buffer = (PWCH)Ptr; + RtlCopyUnicodeString(&VolumeProperties->FileSystemDriverName, &Volume->CDODriverName); + Ptr += VolumeProperties->FileSystemDriverName.Length; + + /* Add the volume name */ + VolumeProperties->RealDeviceName.Length = 0; + VolumeProperties->RealDeviceName.MaximumLength = Volume->DeviceName.Length; + VolumeProperties->RealDeviceName.Buffer = (PWCH)Ptr; + RtlCopyUnicodeString(&VolumeProperties->RealDeviceName, &Volume->DeviceName); + + BytesWritten = BufferRequired; + + Status = STATUS_SUCCESS; + } + else + { + Status = STATUS_BUFFER_OVERFLOW; + } + + /* Set the number of bytes we wrote and return */ + *LengthReturned = BytesWritten; + return Status; +} + + +/* INTERNAL FUNCTIONS ******************************************************/ \ No newline at end of file diff --git a/drivers/filters/fltmgr/fltmgr.spec b/drivers/filters/fltmgr/fltmgr.spec index 9e18cd5997..c7094eb9cf 100644 --- a/drivers/filters/fltmgr/fltmgr.spec +++ b/drivers/filters/fltmgr/fltmgr.spec @@ -7,4 +7,5 @@ @ stdcall FltBuildDefaultSecurityDescriptor(ptr long) @ stdcall FltFreeSecurityDescriptor(ptr) @ stdcall FltGetDiskDeviceObject(ptr ptr) + @ stdcall FltGetVolumeProperties(ptr ptr long ptr) diff --git a/drivers/filters/fltmgr/fltmgrint.h b/drivers/filters/fltmgr/fltmgrint.h index e5280879b0..a060b70eec 100644 --- a/drivers/filters/fltmgr/fltmgrint.h +++ b/drivers/filters/fltmgr/fltmgrint.h @@ -201,6 +201,114 @@ typedef struct _FLT_PORT_OBJECT } FLT_PORT_OBJECT, *PFLT_PORT_OBJECT; +typedef enum _FLT_VOLUME_FLAGS +{ + VOLFL_NETWORK_FILESYSTEM = 0x1, + VOLFL_PENDING_MOUNT_SETUP_NOTIFIES = 0x2, + VOLFL_MOUNT_SETUP_NOTIFIES_CALLED = 0x4, + VOLFL_MOUNTING = 0x8, + VOLFL_SENT_SHUTDOWN_IRP = 0x10, + VOLFL_ENABLE_NAME_CACHING = 0x20, + VOLFL_FILTER_EVER_ATTACHED = 0x40, + VOLFL_STANDARD_LINK_NOT_SUPPORTED = 0x80 + +} FLT_VOLUME_FLAGS, *PFLT_VOLUME_FLAGS; + + +typedef enum _CALLBACK_NODE_FLAGS +{ + CBNFL_SKIP_PAGING_IO = 0x1, + CBNFL_SKIP_CACHED_IO = 0x2, + CBNFL_USE_NAME_CALLBACK_EX = 0x4, + CBNFL_SKIP_NON_DASD_IO = 0x8 + +} CALLBACK_NODE_FLAGS, *PCALLBACK_NODE_FLAGS; + + +typedef struct _CALLBACK_CTRL +{ + LIST_ENTRY OperationLists[50]; + CALLBACK_NODE_FLAGS OperationFlags[50]; + +} CALLBACK_CTRL, *PCALLBACK_CTRL; + +typedef struct _TREE_ROOT +{ + RTL_SPLAY_LINKS *Tree; + +} TREE_ROOT, *PTREE_ROOT; + + +typedef struct _CONTEXT_LIST_CTRL +{ + TREE_ROOT List; + +} CONTEXT_LIST_CTRL, *PCONTEXT_LIST_CTRL; + +typedef struct _NAME_CACHE_LIST_CTRL_STATS +{ + ULONG Searches; + ULONG Hits; + ULONG Created; + ULONG Temporary; + ULONG Duplicate; + ULONG Removed; + ULONG RemovedDueToCase; + +} NAME_CACHE_LIST_CTRL_STATS, *PNAME_CACHE_LIST_CTRL_STATS; + + +typedef struct _NAME_CACHE_VOLUME_CTRL_STATS +{ + ULONG AllContextsTemporary; + ULONG PurgeNameCache; + NAME_CACHE_LIST_CTRL_STATS NormalizedNames; + NAME_CACHE_LIST_CTRL_STATS OpenedNames; + NAME_CACHE_LIST_CTRL_STATS ShortNames; + ULONG AncestorLookup; + ULONG ParentHit; + ULONG NonParentHit; + +} NAME_CACHE_VOLUME_CTRL_STATS, *PNAME_CACHE_VOLUME_CTRL_STATS; + + +typedef struct _NAME_CACHE_VOLUME_CTRL +{ + FAST_MUTEX Lock; + ULONG AllContextsTemporary; + LARGE_INTEGER LastRenameCompleted; + NAME_CACHE_VOLUME_CTRL_STATS Stats; + +} NAME_CACHE_VOLUME_CTRL, *PNAME_CACHE_VOLUME_CTRL; + + +typedef struct _FLT_VOLUME +{ + FLT_OBJECT Base; + FLT_VOLUME_FLAGS Flags; + FLT_FILESYSTEM_TYPE FileSystemType; + PDEVICE_OBJECT DeviceObject; + PDEVICE_OBJECT DiskDeviceObject; + PFLT_VOLUME FrameZeroVolume; + PFLT_VOLUME VolumeInNextFrame; + PFLTP_FRAME Frame; + UNICODE_STRING DeviceName; + UNICODE_STRING GuidName; + UNICODE_STRING CDODeviceName; + UNICODE_STRING CDODriverName; + FLT_RESOURCE_LIST_HEAD InstanceList; + CALLBACK_CTRL Callbacks; + EX_PUSH_LOCK ContextLock; + CONTEXT_LIST_CTRL VolumeContexts; + FLT_RESOURCE_LIST_HEAD StreamListCtrls; + FLT_RESOURCE_LIST_HEAD FileListCtrls; + NAME_CACHE_VOLUME_CTRL NameCacheCtrl; + ERESOURCE MountNotifyLock; + ULONG TargetedOpenActiveCount; + EX_PUSH_LOCK TxVolContextListLock; + TREE_ROOT TxVolContexts; + +} FLT_VOLUME, *PFLT_VOLUME;

6 years, 11 months

[reactos] 01/01: [FLTMGR] - Implement FltGetVolumeProperties - Internal structs taken from public pdbs

by gedmurphy

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1473c522cf23e9d34f5af… commit 1473c522cf23e9d34f5af1da1309f5ac6cb419e6 Author: gedmurphy <starwars1> AuthorDate: Thu Oct 12 21:06:41 2017 +0100 [FLTMGR] - Implement FltGetVolumeProperties - Internal structs taken from public pdbs --- drivers/filters/fltmgr/CMakeLists.txt | 1 + drivers/filters/fltmgr/Volume.c | 110 ++++++++++++++++++++++++++++++++++ drivers/filters/fltmgr/fltmgr.spec | 1 + drivers/filters/fltmgr/fltmgrint.h | 108 +++++++++++++++++++++++++++++++++ 4 files changed, 220 insertions(+) diff --git a/drivers/filters/fltmgr/CMakeLists.txt b/drivers/filters/fltmgr/CMakeLists.txt index f3d52e2200..5a02cab116 100644 --- a/drivers/filters/fltmgr/CMakeLists.txt +++ b/drivers/filters/fltmgr/CMakeLists.txt @@ -7,6 +7,7 @@ list(APPEND SOURCE Messaging.c Misc.c Object.c + Volume.c ${CMAKE_CURRENT_BINARY_DIR}/fltmgr.def fltmgr.h) diff --git a/drivers/filters/fltmgr/Volume.c b/drivers/filters/fltmgr/Volume.c new file mode 100644 index 0000000000..6a854f76a6 --- /dev/null +++ b/drivers/filters/fltmgr/Volume.c @@ -0,0 +1,110 @@ +/* +* PROJECT: Filesystem Filter Manager +* LICENSE: GPL - See COPYING in the top level directory +* FILE: drivers/filters/fltmgr/Context.c +* PURPOSE: Contains routines for the volume +* PROGRAMMERS: Ged Murphy (gedmurphy(a)reactos.org) +*/ + +/* INCLUDES ******************************************************************/ + +#include "fltmgr.h" +#include "fltmgrint.h" + +#define NDEBUG +#include <debug.h> + + +/* DATA *********************************************************************/ + + + +/* EXPORTED FUNCTIONS ******************************************************/ + +NTSTATUS +FLTAPI +FltGetVolumeProperties( + _In_ PFLT_VOLUME Volume, + _Out_writes_bytes_to_opt_(VolumePropertiesLength, *LengthReturned) PFLT_VOLUME_PROPERTIES VolumeProperties, + _In_ ULONG VolumePropertiesLength, + _Out_ PULONG LengthReturned +) +{ + ULONG BufferRequired; + ULONG BytesWritten; + PCHAR Ptr; + NTSTATUS Status; + + /* Calculate the required buffer size */ + BufferRequired = sizeof(FLT_VOLUME_PROPERTIES) + + Volume->CDODriverName.Length + + Volume->DeviceName.Length + + Volume->CDODeviceName.Length; + + /* If we don't have enough buffer to fill in the fixed struct, return with the required size */ + if (VolumePropertiesLength < sizeof(FLT_VOLUME_PROPERTIES)) + { + *LengthReturned = BufferRequired; + return STATUS_BUFFER_TOO_SMALL; + } + + /* Clear out the buffer */ + RtlZeroMemory(VolumeProperties, sizeof(FLT_VOLUME_PROPERTIES)); + + /* Fill in the fixed data */ + VolumeProperties->DeviceType = Volume->DeviceObject->DeviceType; + VolumeProperties->DeviceObjectFlags = Volume->DeviceObject->Flags; + VolumeProperties->AlignmentRequirement = Volume->DeviceObject->AlignmentRequirement; + VolumeProperties->SectorSize = Volume->DeviceObject->SectorSize; + if (Volume->DiskDeviceObject) + { + VolumeProperties->DeviceCharacteristics = Volume->DiskDeviceObject->Characteristics; + } + else + { + VolumeProperties->DeviceCharacteristics = Volume->DeviceObject->Characteristics; + } + + /* So far we've written the fixed struct data */ + BytesWritten = sizeof(FLT_VOLUME_PROPERTIES); + Ptr = (PCHAR)(VolumeProperties + 1); + + /* Make sure we have enough room to add the dynamic data */ + if (VolumePropertiesLength >= BufferRequired) + { + /* Add the FS device name */ + VolumeProperties->FileSystemDeviceName.Length = 0; + VolumeProperties->FileSystemDeviceName.MaximumLength = Volume->CDODeviceName.Length; + VolumeProperties->FileSystemDeviceName.Buffer = (PWCH)Ptr; + RtlCopyUnicodeString(&VolumeProperties->FileSystemDeviceName, &Volume->CDODeviceName); + Ptr += VolumeProperties->FileSystemDeviceName.Length; + + /* Add the driver name */ + VolumeProperties->FileSystemDriverName.Length = 0; + VolumeProperties->FileSystemDriverName.MaximumLength = Volume->CDODriverName.Length; + VolumeProperties->FileSystemDriverName.Buffer = (PWCH)Ptr; + RtlCopyUnicodeString(&VolumeProperties->FileSystemDriverName, &Volume->CDODriverName); + Ptr += VolumeProperties->FileSystemDriverName.Length; + + /* Add the volume name */ + VolumeProperties->RealDeviceName.Length = 0; + VolumeProperties->RealDeviceName.MaximumLength = Volume->DeviceName.Length; + VolumeProperties->RealDeviceName.Buffer = (PWCH)Ptr; + RtlCopyUnicodeString(&VolumeProperties->RealDeviceName, &Volume->DeviceName); + + BytesWritten = BufferRequired; + + Status = STATUS_SUCCESS; + } + else + { + Status = STATUS_BUFFER_OVERFLOW; + } + + /* Set the number of bytes we wrote and return */ + *LengthReturned = BytesWritten; + return Status; +} + + +/* INTERNAL FUNCTIONS ******************************************************/ \ No newline at end of file diff --git a/drivers/filters/fltmgr/fltmgr.spec b/drivers/filters/fltmgr/fltmgr.spec index 9e18cd5997..c7094eb9cf 100644 --- a/drivers/filters/fltmgr/fltmgr.spec +++ b/drivers/filters/fltmgr/fltmgr.spec @@ -7,4 +7,5 @@ @ stdcall FltBuildDefaultSecurityDescriptor(ptr long) @ stdcall FltFreeSecurityDescriptor(ptr) @ stdcall FltGetDiskDeviceObject(ptr ptr) + @ stdcall FltGetVolumeProperties(ptr ptr long ptr) diff --git a/drivers/filters/fltmgr/fltmgrint.h b/drivers/filters/fltmgr/fltmgrint.h index e5280879b0..a060b70eec 100644 --- a/drivers/filters/fltmgr/fltmgrint.h +++ b/drivers/filters/fltmgr/fltmgrint.h @@ -201,6 +201,114 @@ typedef struct _FLT_PORT_OBJECT } FLT_PORT_OBJECT, *PFLT_PORT_OBJECT; +typedef enum _FLT_VOLUME_FLAGS +{ + VOLFL_NETWORK_FILESYSTEM = 0x1, + VOLFL_PENDING_MOUNT_SETUP_NOTIFIES = 0x2, + VOLFL_MOUNT_SETUP_NOTIFIES_CALLED = 0x4, + VOLFL_MOUNTING = 0x8, + VOLFL_SENT_SHUTDOWN_IRP = 0x10, + VOLFL_ENABLE_NAME_CACHING = 0x20, + VOLFL_FILTER_EVER_ATTACHED = 0x40, + VOLFL_STANDARD_LINK_NOT_SUPPORTED = 0x80 + +} FLT_VOLUME_FLAGS, *PFLT_VOLUME_FLAGS; + + +typedef enum _CALLBACK_NODE_FLAGS +{ + CBNFL_SKIP_PAGING_IO = 0x1, + CBNFL_SKIP_CACHED_IO = 0x2, + CBNFL_USE_NAME_CALLBACK_EX = 0x4, + CBNFL_SKIP_NON_DASD_IO = 0x8 + +} CALLBACK_NODE_FLAGS, *PCALLBACK_NODE_FLAGS; + + +typedef struct _CALLBACK_CTRL +{ + LIST_ENTRY OperationLists[50]; + CALLBACK_NODE_FLAGS OperationFlags[50]; + +} CALLBACK_CTRL, *PCALLBACK_CTRL; + +typedef struct _TREE_ROOT +{ + RTL_SPLAY_LINKS *Tree; + +} TREE_ROOT, *PTREE_ROOT; + + +typedef struct _CONTEXT_LIST_CTRL +{ + TREE_ROOT List; + +} CONTEXT_LIST_CTRL, *PCONTEXT_LIST_CTRL; + +typedef struct _NAME_CACHE_LIST_CTRL_STATS +{ + ULONG Searches; + ULONG Hits; + ULONG Created; + ULONG Temporary; + ULONG Duplicate; + ULONG Removed; + ULONG RemovedDueToCase; + +} NAME_CACHE_LIST_CTRL_STATS, *PNAME_CACHE_LIST_CTRL_STATS; + + +typedef struct _NAME_CACHE_VOLUME_CTRL_STATS +{ + ULONG AllContextsTemporary; + ULONG PurgeNameCache; + NAME_CACHE_LIST_CTRL_STATS NormalizedNames; + NAME_CACHE_LIST_CTRL_STATS OpenedNames; + NAME_CACHE_LIST_CTRL_STATS ShortNames; + ULONG AncestorLookup; + ULONG ParentHit; + ULONG NonParentHit; + +} NAME_CACHE_VOLUME_CTRL_STATS, *PNAME_CACHE_VOLUME_CTRL_STATS; + + +typedef struct _NAME_CACHE_VOLUME_CTRL +{ + FAST_MUTEX Lock; + ULONG AllContextsTemporary; + LARGE_INTEGER LastRenameCompleted; + NAME_CACHE_VOLUME_CTRL_STATS Stats; + +} NAME_CACHE_VOLUME_CTRL, *PNAME_CACHE_VOLUME_CTRL; + + +typedef struct _FLT_VOLUME +{ + FLT_OBJECT Base; + FLT_VOLUME_FLAGS Flags; + FLT_FILESYSTEM_TYPE FileSystemType; + PDEVICE_OBJECT DeviceObject; + PDEVICE_OBJECT DiskDeviceObject; + PFLT_VOLUME FrameZeroVolume; + PFLT_VOLUME VolumeInNextFrame; + PFLTP_FRAME Frame; + UNICODE_STRING DeviceName; + UNICODE_STRING GuidName; + UNICODE_STRING CDODeviceName; + UNICODE_STRING CDODriverName; + FLT_RESOURCE_LIST_HEAD InstanceList; + CALLBACK_CTRL Callbacks; + EX_PUSH_LOCK ContextLock; + CONTEXT_LIST_CTRL VolumeContexts; + FLT_RESOURCE_LIST_HEAD StreamListCtrls; + FLT_RESOURCE_LIST_HEAD FileListCtrls; + NAME_CACHE_VOLUME_CTRL NameCacheCtrl; + ERESOURCE MountNotifyLock; + ULONG TargetedOpenActiveCount; + EX_PUSH_LOCK TxVolContextListLock; + TREE_ROOT TxVolContexts; + +} FLT_VOLUME, *PFLT_VOLUME;

6 years, 11 months

[reactos] 01/01: [SRVSVC] Implement NetrServerStatisticsGet().

by EricKohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2a4ea213fa1b7522d17e1… commit 2a4ea213fa1b7522d17e1efe613103e4ca5ca5d3 Author: EricKohl <eric.kohl(a)reactos.org> AuthorDate: Thu Oct 12 17:57:45 2017 +0200 [SRVSVC] Implement NetrServerStatisticsGet(). --- base/services/srvsvc/rpcserver.c | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/base/services/srvsvc/rpcserver.c b/base/services/srvsvc/rpcserver.c index 217d662380..ab96f2554f 100644 --- a/base/services/srvsvc/rpcserver.c +++ b/base/services/srvsvc/rpcserver.c @@ -395,8 +395,28 @@ NetrServerStatisticsGet( DWORD Options, LPSTAT_SERVER_0 *InfoStruct) { - UNIMPLEMENTED; - return ERROR_CALL_NOT_IMPLEMENTED; + PSTAT_SERVER_0 pStatBuffer; + + TRACE("NetrServerStatisticsGet(%p %p %lu 0x%lx %p)\n", + ServerName, Service, Level, Options, InfoStruct); + + if (Level != 0) + return ERROR_INVALID_LEVEL; + + if (Options != 0) + return ERROR_INVALID_PARAMETER; + + pStatBuffer = midl_user_allocate(sizeof(STAT_SERVER_0)); + if (pStatBuffer == NULL) + return ERROR_NOT_ENOUGH_MEMORY; + + ZeroMemory(pStatBuffer, sizeof(STAT_SERVER_0)); + + // FIXME: Return the actual statistcs data! + + *InfoStruct = pStatBuffer; + + return NERR_Success; }

6 years, 11 months

[reactos] 01/01: Start to implement fltmgr tests [WIP] (#52)

by Ged Murphy

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9d15fb927941f29a88559… commit 9d15fb927941f29a8855944fa68376b1fec9b77e Author: Ged Murphy <gedmurphy(a)gmail.com> AuthorDate: Thu Oct 12 15:32:30 2017 +0100 Start to implement fltmgr tests [WIP] (#52) [FLTMGR] - Partially implement registering contexts - Add a misc file which contains stubs of the APIs needed in the test suite - Export some APIs needed by the test suite [KMTESTS] - Create a File System Mini-filter wrapper to host drivers for the filter manager tests - Add a test file which will be used for testing that mini-filters load correctly - Add a test file which will be used to write tests for IRP_MJ_CREATE requests --- drivers/filters/CMakeLists.txt | 2 +- drivers/filters/fltmgr/CMakeLists.txt | 1 + drivers/filters/fltmgr/Context.c | 103 +++- drivers/filters/fltmgr/Interface.c | 12 + drivers/filters/fltmgr/Messaging.c | 2 +- drivers/filters/fltmgr/Misc.c | 56 +++ drivers/filters/fltmgr/fltmgr.spec | 7 +- modules/rostests/kmtests/CMakeLists.txt | 1 + modules/rostests/kmtests/fltmgr/CMakeLists.txt | 3 + .../kmtests/fltmgr/fltmgr_create/CMakeLists.txt | 14 + .../kmtests/fltmgr/fltmgr_create/fltmgr_create.c | 147 ++++++ .../kmtests/fltmgr/fltmgr_load/CMakeLists.txt | 14 + .../kmtests/fltmgr/fltmgr_load/fltmgr_load.c | 234 +++++++++ modules/rostests/kmtests/include/kmt_platform.h | 3 + modules/rostests/kmtests/include/kmt_test.h | 23 + .../kmtests/kmtest_drv/kmtest_fsminifilter.c | 525 +++++++++++++++++++++ 16 files changed, 1139 insertions(+), 8 deletions(-) diff --git a/drivers/filters/CMakeLists.txt b/drivers/filters/CMakeLists.txt index 7b70050409..2d135dd919 100644 --- a/drivers/filters/CMakeLists.txt +++ b/drivers/filters/CMakeLists.txt @@ -1,2 +1,2 @@ -#add_subdirectory(fltmgr) +add_subdirectory(fltmgr) add_subdirectory(mountmgr) diff --git a/drivers/filters/fltmgr/CMakeLists.txt b/drivers/filters/fltmgr/CMakeLists.txt index ea527186d2..f3d52e2200 100644 --- a/drivers/filters/fltmgr/CMakeLists.txt +++ b/drivers/filters/fltmgr/CMakeLists.txt @@ -5,6 +5,7 @@ list(APPEND SOURCE Interface.c Lib.c Messaging.c + Misc.c Object.c ${CMAKE_CURRENT_BINARY_DIR}/fltmgr.def fltmgr.h) diff --git a/drivers/filters/fltmgr/Context.c b/drivers/filters/fltmgr/Context.c index ead64cda27..7e6d03c62c 100644 --- a/drivers/filters/fltmgr/Context.c +++ b/drivers/filters/fltmgr/Context.c @@ -27,7 +27,7 @@ static NTSTATUS SetupContextHeader( _In_ PFLT_FILTER Filter, - _In_ PFLT_CONTEXT_REGISTRATION ContextPtr, + _In_ PCFLT_CONTEXT_REGISTRATION ContextPtr, _Out_ PALLOCATE_CONTEXT_HEADER ContextHeader ); @@ -43,9 +43,102 @@ NTSTATUS FltpRegisterContexts(_In_ PFLT_FILTER Filter, _In_ const FLT_CONTEXT_REGISTRATION *Context) { - UNREFERENCED_PARAMETER(Filter); - UNREFERENCED_PARAMETER(Context); - return STATUS_NOT_IMPLEMENTED; + PCFLT_CONTEXT_REGISTRATION ContextPtr; + PALLOCATE_CONTEXT_HEADER ContextHeader, Prev; + PVOID Buffer; + ULONG BufferSize = 0; + USHORT i; + NTSTATUS Status; + + /* Loop through all entries in the context registration array */ + ContextPtr = Context; + while (ContextPtr) + { + /* Bail if we found the terminator */ + if (ContextPtr->ContextType == FLT_CONTEXT_END) + break; + + /* Make sure we have a valid context */ + if (IsContextTypeValid(ContextPtr->ContextType)) + { + /* Each context is backed by a crtl struct. Reserve space for it */ + BufferSize += sizeof(STREAM_LIST_CTRL); + } + + /* Move to the next entry */ + ContextPtr++; + } + + /* Bail if we found no valid registration requests */ + if (BufferSize == 0) + { + return STATUS_SUCCESS; + } + + /* Allocate the pool that'll hold the context crtl structs */ + Buffer = ExAllocatePoolWithTag(NonPagedPool, BufferSize, FM_TAG_CONTEXT_REGISTA); + if (!Buffer) return STATUS_INSUFFICIENT_RESOURCES; + + RtlZeroMemory(Buffer, BufferSize); + + /* Setup our loop data */ + ContextHeader = Buffer; + Prev = NULL; + Status = STATUS_SUCCESS; + + for (i = 0; i < MAX_CONTEXT_TYPES; i++) + { + ContextPtr = (PFLT_CONTEXT_REGISTRATION)Context; + while (ContextPtr) + { + /* We don't support variable sized contents yet */ + FLT_ASSERT(ContextPtr->Size != FLT_VARIABLE_SIZED_CONTEXTS); + + /* Bail if we found the terminator */ + if (ContextPtr->ContextType == FLT_CONTEXT_END) + break; + + /* Size and pooltag are only checked when ContextAllocateCallback is null */ + if (ContextPtr->ContextAllocateCallback == FALSE && ContextPtr->PoolTag == FALSE) + { + Status = STATUS_FLT_INVALID_CONTEXT_REGISTRATION; + goto Quit; + } + + /* Make sure we have a valid context */ + if (IsContextTypeValid(ContextPtr->ContextType)) + { + Status = SetupContextHeader(Filter, ContextPtr, ContextHeader); + if (NT_SUCCESS(Status)) + { + if (Prev) + { + Prev->Next = ContextHeader; + } + + Filter->SupportedContexts[i] = ContextHeader; + } + } + + Prev = ContextHeader; + + /* Move to the next entry */ + ContextPtr++; + } + } + +Quit: + if (NT_SUCCESS(Status)) + { + Filter->SupportedContextsListHead = Buffer; + } + else + { + ExFreePoolWithTag(Buffer, FM_TAG_CONTEXT_REGISTA); + //FIXME: Cleanup anything that SetupContextHeader may have allocated + } + + return Status; } @@ -72,7 +165,7 @@ IsContextTypeValid(_In_ FLT_CONTEXT_TYPE ContextType) static NTSTATUS SetupContextHeader(_In_ PFLT_FILTER Filter, - _In_ PFLT_CONTEXT_REGISTRATION ContextPtr, + _In_ PCFLT_CONTEXT_REGISTRATION ContextPtr, _Out_ PALLOCATE_CONTEXT_HEADER ContextHeader) { return 0; diff --git a/drivers/filters/fltmgr/Interface.c b/drivers/filters/fltmgr/Interface.c index 7854000b8b..be1288a7c2 100644 --- a/drivers/filters/fltmgr/Interface.c +++ b/drivers/filters/fltmgr/Interface.c @@ -17,6 +17,18 @@ /* DATA *********************************************************************/ +#define VALID_FAST_IO_DISPATCH_HANDLER(_FastIoDispatchPtr, _FieldName) \ + (((_FastIoDispatchPtr) != NULL) && \ + (((_FastIoDispatchPtr)->SizeOfFastIoDispatch) >= \ + (FIELD_OFFSET(FAST_IO_DISPATCH, _FieldName) + sizeof(void *))) && \ + ((_FastIoDispatchPtr)->_FieldName != NULL)) + +#define IS_MY_DEVICE_OBJECT(_devObj) \ + (((_devObj) != NULL) && \ + ((_devObj)->DriverObject == Dispatcher::DriverObject) && \ + ((_devObj)->DeviceExtension != NULL)) + + DRIVER_INITIALIZE DriverEntry; NTSTATUS NTAPI diff --git a/drivers/filters/fltmgr/Messaging.c b/drivers/filters/fltmgr/Messaging.c index e6e4473fab..97e6a94c9c 100644 --- a/drivers/filters/fltmgr/Messaging.c +++ b/drivers/filters/fltmgr/Messaging.c @@ -125,7 +125,7 @@ FltCreateCommunicationPort(_In_ PFLT_FILTER Filter, FltObjectDereference(Filter); } - return STATUS_NOT_IMPLEMENTED; + return Status; } _IRQL_requires_max_(PASSIVE_LEVEL) diff --git a/drivers/filters/fltmgr/Misc.c b/drivers/filters/fltmgr/Misc.c new file mode 100644 index 0000000000..3ef1424d5f --- /dev/null +++ b/drivers/filters/fltmgr/Misc.c @@ -0,0 +1,56 @@ +/* + * PROJECT: Filesystem Filter Manager + * LICENSE: GPL - See COPYING in the top level directory + * FILE: drivers/filters/fltmgr/Misc.c + * PURPOSE: Uncataloged functions + * PROGRAMMERS: Ged Murphy (gedmurphy(a)reactos.org) + */ + +/* INCLUDES ******************************************************************/ + +#include "fltmgr.h" +#include "fltmgrint.h" + +#define NDEBUG +#include <debug.h> + + +/* DATA *********************************************************************/ + + + + +/* EXPORTED FUNCTIONS ******************************************************/ + +NTSTATUS +FLTAPI +FltBuildDefaultSecurityDescriptor( + _Outptr_ PSECURITY_DESCRIPTOR *SecurityDescriptor, + _In_ ACCESS_MASK DesiredAccess +) +{ + UNREFERENCED_PARAMETER(SecurityDescriptor); + UNREFERENCED_PARAMETER(DesiredAccess); + return 0; +} + +VOID +FLTAPI +FltFreeSecurityDescriptor( + _In_ PSECURITY_DESCRIPTOR SecurityDescriptor +) +{ + UNREFERENCED_PARAMETER(SecurityDescriptor); +} + +NTSTATUS +FLTAPI +FltGetDiskDeviceObject( + _In_ PFLT_VOLUME Volume, + _Outptr_ PDEVICE_OBJECT *DiskDeviceObject +) +{ + UNREFERENCED_PARAMETER(Volume); + UNREFERENCED_PARAMETER(DiskDeviceObject); + return 0; +} \ No newline at end of file diff --git a/drivers/filters/fltmgr/fltmgr.spec b/drivers/filters/fltmgr/fltmgr.spec index 2967a05d7a..9e18cd5997 100644 --- a/drivers/filters/fltmgr/fltmgr.spec +++ b/drivers/filters/fltmgr/fltmgr.spec @@ -2,4 +2,9 @@ @ stdcall FltRegisterFilter(ptr ptr ptr) @ stdcall FltUnregisterFilter(ptr) @ stdcall FltCloseCommunicationPort(ptr) - + @ stdcall FltStartFiltering(ptr) + @ stdcall FltCreateCommunicationPort(ptr ptr ptr ptr ptr ptr ptr long) + @ stdcall FltBuildDefaultSecurityDescriptor(ptr long) + @ stdcall FltFreeSecurityDescriptor(ptr) + @ stdcall FltGetDiskDeviceObject(ptr ptr) + diff --git a/modules/rostests/kmtests/CMakeLists.txt b/modules/rostests/kmtests/CMakeLists.txt index dfc6c98d0a..d51ef000c7 100644 --- a/modules/rostests/kmtests/CMakeLists.txt +++ b/modules/rostests/kmtests/CMakeLists.txt @@ -5,6 +5,7 @@ include_directories(include) # subdirectories containing special-purpose drivers # add_subdirectory(example) +add_subdirectory(fltmgr) add_subdirectory(hidparse) add_subdirectory(kernel32) add_subdirectory(ntos_cc) diff --git a/modules/rostests/kmtests/fltmgr/CMakeLists.txt b/modules/rostests/kmtests/fltmgr/CMakeLists.txt new file mode 100644 index 0000000000..fd7a55e6bc --- /dev/null +++ b/modules/rostests/kmtests/fltmgr/CMakeLists.txt @@ -0,0 +1,3 @@ + +add_subdirectory(fltmgr_load) +add_subdirectory(fltmgr_create) diff --git a/modules/rostests/kmtests/fltmgr/fltmgr_create/CMakeLists.txt b/modules/rostests/kmtests/fltmgr/fltmgr_create/CMakeLists.txt new file mode 100644 index 0000000000..435293967e --- /dev/null +++ b/modules/rostests/kmtests/fltmgr/fltmgr_create/CMakeLists.txt @@ -0,0 +1,14 @@ + +include_directories(../../include) + +list(APPEND FLTMGR_TEST_DRV_SOURCE + ../../kmtest_drv/kmtest_fsminifilter.c + fltmgr_create.c) + +add_library(fltmgr_create SHARED ${FLTMGR_TEST_DRV_SOURCE}) +set_module_type(fltmgr_create kernelmodedriver) +target_link_libraries(fltmgr_create kmtest_printf ${PSEH_LIB}) +add_importlibs(fltmgr_create fltmgr ntoskrnl hal) +add_target_compile_definitions(fltmgr_create KMT_STANDALONE_DRIVER KMT_FILTER_DRIVER NTDDI_VERSION=NTDDI_WS03SP1) +#add_pch(example_drv ../include/kmt_test.h) +add_rostests_file(TARGET fltmgr_create) diff --git a/modules/rostests/kmtests/fltmgr/fltmgr_create/fltmgr_create.c b/modules/rostests/kmtests/fltmgr/fltmgr_create/fltmgr_create.c new file mode 100644 index 0000000000..6c28f3ef18 --- /dev/null +++ b/modules/rostests/kmtests/fltmgr/fltmgr_create/fltmgr_create.c @@ -0,0 +1,147 @@ +/* + * PROJECT: ReactOS kernel-mode tests - Filter Manager + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: Tests for checking the create operations + * PROGRAMMER: Ged Murphy <gedmurphy(a)reactos.org> + */ + +#include <kmt_test.h> +#include <fltkernel.h> + +//#define NDEBUG +#include <debug.h> + +/* prototypes */ +static +FLT_PREOP_CALLBACK_STATUS +FLTAPI +TestFilterPreOperation( + _Inout_ PFLT_CALLBACK_DATA Data, + _In_ PCFLT_RELATED_OBJECTS FltObjects, + _Outptr_result_maybenull_ PVOID *CompletionContext +); + +static +FLT_POSTOP_CALLBACK_STATUS +FLTAPI +TestFilterPostOperation( + _Inout_ PFLT_CALLBACK_DATA Data, + _In_ PCFLT_RELATED_OBJECTS FltObjects, + _In_opt_ PVOID CompletionContext, + _In_ FLT_POST_OPERATION_FLAGS Flags +); + + +/* Globals */ +static PDRIVER_OBJECT TestDriverObject; + + +CONST FLT_OPERATION_REGISTRATION Callbacks[] = +{ + { IRP_MJ_CREATE, + 0, + TestFilterPreOperation, + TestFilterPostOperation }, + + { IRP_MJ_OPERATION_END } +}; + + +NTSTATUS +TestEntry( + IN PDRIVER_OBJECT DriverObject, + IN PCUNICODE_STRING RegistryPath, + OUT PCWSTR *DeviceName, + IN OUT INT *Flags) +{ + NTSTATUS Status = STATUS_SUCCESS; + + PAGED_CODE(); + + UNREFERENCED_PARAMETER(RegistryPath); + UNREFERENCED_PARAMETER(Flags); + + DPRINT("Entry!\n"); + + ok_irql(PASSIVE_LEVEL); + TestDriverObject = DriverObject; + + *DeviceName = L"fltmgr_create"; + + trace("Hi, this is the filter manager create test driver\n"); + + (VOID)KmtFilterRegisterCallbacks(Callbacks); + + return Status; +} + +VOID +TestFilterUnload( + IN ULONG Flags) +{ + PAGED_CODE(); + + DPRINT("Unload!\n"); + + ok_irql(PASSIVE_LEVEL); + + trace("Unloading filter manager test driver\n"); +} + +VOID +TestQueryTeardown( + _In_ PCFLT_RELATED_OBJECTS FltObjects, + _In_ FLT_INSTANCE_QUERY_TEARDOWN_FLAGS Flags) +{ + UNREFERENCED_PARAMETER(FltObjects); + UNREFERENCED_PARAMETER(Flags); +} + +NTSTATUS +TestInstanceSetup( + _In_ PCFLT_RELATED_OBJECTS FltObjects, + _In_ FLT_INSTANCE_SETUP_FLAGS Flags, + _In_ DEVICE_TYPE VolumeDeviceType, + _In_ FLT_FILESYSTEM_TYPE VolumeFilesystemType, + _In_ PUNICODE_STRING VolumeName, + _In_ ULONG SectorSize, + _In_ ULONG ReportedSectorSize +) +{ + trace("Received an attach request for VolumeType 0x%X, FileSystemType %d\n", + VolumeDeviceType, + VolumeFilesystemType); + + return STATUS_FLT_DO_NOT_ATTACH; +} + +static +FLT_PREOP_CALLBACK_STATUS +FLTAPI +TestFilterPreOperation( + _Inout_ PFLT_CALLBACK_DATA Data, + _In_ PCFLT_RELATED_OBJECTS FltObjects, + _Outptr_result_maybenull_ PVOID *CompletionContext) +{ + PFLT_IO_PARAMETER_BLOCK Iopb = Data->Iopb; + + ok_eq_hex(Iopb->MajorFunction, IRP_MJ_CREATE); + + return FLT_PREOP_SUCCESS_NO_CALLBACK; +} + +static +FLT_POSTOP_CALLBACK_STATUS +FLTAPI +TestFilterPostOperation( + _Inout_ PFLT_CALLBACK_DATA Data, + _In_ PCFLT_RELATED_OBJECTS FltObjects, + _In_opt_ PVOID CompletionContext, + _In_ FLT_POST_OPERATION_FLAGS Flags) +{ + PFLT_IO_PARAMETER_BLOCK Iopb = Data->Iopb; + + ok_eq_hex(Iopb->MajorFunction, IRP_MJ_CREATE); + + return FLT_POSTOP_FINISHED_PROCESSING; +} \ No newline at end of file diff --git a/modules/rostests/kmtests/fltmgr/fltmgr_load/CMakeLists.txt b/modules/rostests/kmtests/fltmgr/fltmgr_load/CMakeLists.txt new file mode 100644 index 0000000000..7fa022d154 --- /dev/null +++ b/modules/rostests/kmtests/fltmgr/fltmgr_load/CMakeLists.txt @@ -0,0 +1,14 @@ + +include_directories(../../include) + +list(APPEND FLTMGR_TEST_DRV_SOURCE + ../../kmtest_drv/kmtest_fsminifilter.c + fltmgr_load.c) + +add_library(fltmgr_load SHARED ${FLTMGR_TEST_DRV_SOURCE}) +set_module_type(fltmgr_load kernelmodedriver) +target_link_libraries(fltmgr_load kmtest_printf ${PSEH_LIB}) +add_importlibs(fltmgr_load fltmgr ntoskrnl hal) +add_target_compile_definitions(fltmgr_load KMT_STANDALONE_DRIVER KMT_FILTER_DRIVER NTDDI_VERSION=NTDDI_WS03SP1) +#add_pch(example_drv ../include/kmt_test.h) +add_rostests_file(TARGET fltmgr_load) diff --git a/modules/rostests/kmtests/fltmgr/fltmgr_load/fltmgr_load.c b/modules/rostests/kmtests/fltmgr/fltmgr_load/fltmgr_load.c new file mode 100644 index 0000000000..7b9f5235cb --- /dev/null +++ b/modules/rostests/kmtests/fltmgr/fltmgr_load/fltmgr_load.c @@ -0,0 +1,234 @@ +/* + * PROJECT: ReactOS kernel-mode tests - Filter Manager + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: Tests for checking filters load correctly + * PROGRAMMER: Ged Murphy <gedmurphy(a)reactos.org> + */ + +#include <kmt_test.h> +#include <fltkernel.h> + +//#define NDEBUG +#include <debug.h> + +/* prototypes */ +NTSTATUS +FLTAPI +TestClientConnect( + _In_ PFLT_PORT ClientPort, + _In_opt_ PVOID ServerPortCookie, + _In_reads_bytes_opt_(SizeOfContext) PVOID ConnectionContext, + _In_ ULONG SizeOfContext, + _Outptr_result_maybenull_ PVOID *ConnectionPortCookie +); + +VOID +FLTAPI +TestClientDisconnect( + _In_opt_ PVOID ConnectionCookie +); + +NTSTATUS +FLTAPI +TestMessageHandler( + _In_opt_ PVOID ConnectionCookie, + _In_reads_bytes_opt_(InputBufferLength) PVOID InputBuffer, + _In_ ULONG InputBufferLength, + _Out_writes_bytes_to_opt_(OutputBufferLength, *ReturnOutputBufferLength) PVOID OutputBuffer, + _In_ ULONG OutputBufferLength, + _Out_ PULONG ReturnOutputBufferLength +); + + +/* Globals */ +static PDRIVER_OBJECT TestDriverObject; + + + +/** + * @name TestEntry + * + * Test entry point. + * This is called by DriverEntry as early as possible, but with ResultBuffer + * initialized, so that test macros work correctly + * + * @param DriverObject + * Driver Object. + * This is guaranteed not to have been touched by DriverEntry before + * the call to TestEntry + * @param RegistryPath + * Driver Registry Path + * This is guaranteed not to have been touched by DriverEntry before + * the call to TestEntry + * @param DeviceName + * Pointer to receive a test-specific name for the device to create + * @param Flags + * Pointer to a flags variable instructing DriverEntry how to proceed. + * See the KMT_TESTENTRY_FLAGS enumeration for possible values + * Initialized to zero on entry + * + * @return Status. + * DriverEntry will fail if this is a failure status + */ +NTSTATUS +TestEntry( + IN PDRIVER_OBJECT DriverObject, + IN PCUNICODE_STRING RegistryPath, + OUT PCWSTR *DeviceName, + IN OUT INT *Flags) +{ + NTSTATUS Status = STATUS_SUCCESS; + + PAGED_CODE(); + + UNREFERENCED_PARAMETER(RegistryPath); + UNREFERENCED_PARAMETER(Flags); + + DPRINT("Entry!\n"); + + ok_irql(PASSIVE_LEVEL); + TestDriverObject = DriverObject; + + *DeviceName = L"fltmgr_load"; + + trace("Hi, this is the filter manager load test driver\n"); + + KmtFilterRegisterComms(TestClientConnect, TestClientDisconnect, TestMessageHandler, 1); + + return Status; +} + +/** + * @name TestUnload + * + * Test unload routine. + * This is called by the driver's Unload routine as early as possible, with + * ResultBuffer and the test device object still valid, so that test macros + * work correctly + * + * @param DriverObject + * Driver Object. + * This is guaranteed not to have been touched by Unload before the call + * to TestEntry + * + * @return Status + */ +VOID +TestFilterUnload( + IN ULONG Flags) +{ + PAGED_CODE(); + + DPRINT("Unload!\n"); + + ok_irql(PASSIVE_LEVEL); + + trace("Unloading filter manager load test driver\n"); +} + + +/** +* @name TestInstanceSetup +* +* Test volume attach routine. +* This is called by the driver's InstanceSetupCallback routine in response to +* a new volume attaching. +* +* @param FltObjects +* Filter Object Pointers +* Pointer to an FLT_RELATED_OBJECTS structure that contains opaque pointers +* for the objects related to the current operation +* @param Flags +* Bitmask of flags that indicate why the instance is being attached +* @param VolumeDeviceType +* Device type of the file system volume +* @param VolumeFilesystemType +* File system type of the volume +* @param VolumeName +* Unicode string containing the name of the volume. +* The string is only valid within the context of this function +* @param SectorSize +* Adjusts the sector size to a minimum of 0x200, which is more reliable +* @param ReportedSectorSize +* Sector size of the volume as reported by the filter manager +* +* @return Status. +* Return STATUS_SUCCESS to attach or STATUS_FLT_DO_NOT_ATTACH to ignore +*/ +NTSTATUS +TestInstanceSetup( + _In_ PCFLT_RELATED_OBJECTS FltObjects, + _In_ FLT_INSTANCE_SETUP_FLAGS Flags, + _In_ DEVICE_TYPE VolumeDeviceType, + _In_ FLT_FILESYSTEM_TYPE VolumeFilesystemType, + _In_ PUNICODE_STRING VolumeName, + _In_ ULONG SectorSize, + _In_ ULONG ReportedSectorSize +) +{ + trace("Received an attach request for VolumeType 0x%X, FileSystemType %d\n", + VolumeDeviceType, + VolumeFilesystemType); + + /* We're not interested in attaching to any volumes in this test */ + return STATUS_FLT_DO_NOT_ATTACH; +} + +/** +* @name TestQueryTeardown +* +* Test volume attach routine. +* This is called by the driver's InstanceSetupCallback routine in response to +* a new volume attaching. +* +* @param FltObjects +* Filter Object Pointers +* Pointer to an FLT_RELATED_OBJECTS structure that contains opaque pointers +* for the objects related to the current operation +* @param Flags +* Flag that indicates why the minifilter driver instance is being torn down +* +*/ +VOID +TestQueryTeardown( + _In_ PCFLT_RELATED_OBJECTS FltObjects, + _In_ FLT_INSTANCE_QUERY_TEARDOWN_FLAGS Flags) +{ + trace("Received a teardown request, Flags %lu\n", Flags); + + UNREFERENCED_PARAMETER(FltObjects); + UNREFERENCED_PARAMETER(Flags); +} + +NTSTATUS +FLTAPI +TestClientConnect( + _In_ PFLT_PORT ClientPort, + _In_opt_ PVOID ServerPortCookie, + _In_reads_bytes_opt_(SizeOfContext) PVOID ConnectionContext, + _In_ ULONG SizeOfContext, + _Outptr_result_maybenull_ PVOID *ConnectionPortCookie) +{ + return 0; +} + +VOID +FLTAPI +TestClientDisconnect( + _In_opt_ PVOID ConnectionCookie) +{ + +} + +NTSTATUS +FLTAPI +TestMessageHandler( + _In_opt_ PVOID ConnectionCookie, + _In_reads_bytes_opt_(InputBufferLength) PVOID InputBuffer, + _In_ ULONG InputBufferLength, + _Out_writes_bytes_to_opt_(OutputBufferLength, *ReturnOutputBufferLength) PVOID OutputBuffer, + _In_ ULONG OutputBufferLength, + _Out_ PULONG ReturnOutputBufferLength) +{ + return 0; +} diff --git a/modules/rostests/kmtests/include/kmt_platform.h b/modules/rostests/kmtests/include/kmt_platform.h index 4efdc583bb..9e732c397a 100644 --- a/modules/rostests/kmtests/include/kmt_platform.h +++ b/modules/rostests/kmtests/include/kmt_platform.h @@ -25,6 +25,9 @@ #include <ndk/obfuncs.h> #include <ndk/sefuncs.h> #include <ntstrsafe.h> +#if defined KMT_FILTER_DRIVER +#include <fltkernel.h> +#endif #elif defined KMT_USER_MODE #define WIN32_NO_STATUS diff --git a/modules/rostests/kmtests/include/kmt_test.h b/modules/rostests/kmtests/include/kmt_test.h index b2de5bc19a..5941676140 100644 --- a/modules/rostests/kmtests/include/kmt_test.h +++ b/modules/rostests/kmtests/include/kmt_test.h @@ -117,6 +117,29 @@ NTSTATUS TestEntry(IN PDRIVER_OBJECT DriverObject, IN PCUNICODE_STRING RegistryP VOID TestUnload(IN PDRIVER_OBJECT DriverObject); #endif /* defined KMT_STANDALONE_DRIVER */ +#ifdef KMT_FILTER_DRIVER +#ifndef KMT_KERNEL_MODE +#define KMT_KERNEL_MODE +#endif + +NTSTATUS KmtFilterRegisterCallbacks(_In_ CONST FLT_OPERATION_REGISTRATION *OperationRegistration); + +typedef enum +{ + TESTENTRY_NO_REGISTER_FILTER = 1, + TESTENTRY_NO_CREATE_COMMS_PORT = 2, + TESTENTRY_NO_START_FILTERING = 4, +} KMT_MINIFILTER_FLAGS; + +VOID TestFilterUnload(_In_ ULONG Flags); +NTSTATUS TestInstanceSetup(_In_ PCFLT_RELATED_OBJECTS FltObjects, _In_ FLT_INSTANCE_SETUP_FLAGS Flags, _In_ DEVICE_TYPE VolumeDeviceType, _In_ FLT_FILESYSTEM_TYPE VolumeFilesystemType, _In_ PUNICODE_STRING VolumeName, _In_ ULONG RealSectorSize, _In_ ULONG SectorSize); +VOID TestQueryTeardown(_In_ PCFLT_RELATED_OBJECTS FltObjects, _In_ FLT_INSTANCE_QUERY_TEARDOWN_FLAGS Flags); + +NTSTATUS KmtFilterRegisterComms(_In_ PFLT_CONNECT_NOTIFY ConnectNotifyCallback, _In_ PFLT_DISCONNECT_NOTIFY DisconnectNotifyCallback, _In_opt_ PFLT_MESSAGE_NOTIFY MessageNotifyCallback, _In_ LONG MaxClientConnections); + +#endif/* defined KMT_FILTER_DRIVER */ + + #ifdef KMT_KERNEL_MODE /* Device Extension layout */ typedef struct diff --git a/modules/rostests/kmtests/kmtest_drv/kmtest_fsminifilter.c b/modules/rostests/kmtests/kmtest_drv/kmtest_fsminifilter.c new file mode 100644 index 0000000000..2de7f3b159 --- /dev/null +++ b/modules/rostests/kmtests/kmtest_drv/kmtest_fsminifilter.c @@ -0,0 +1,525 @@ +/* + * PROJECT: ReactOS kernel-mode tests - Filter Manager + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: FS Mini-filter wrapper to host the filter manager tests + * PROGRAMMER: Ged Murphy <ged.murphy(a)reactos.org> + */ + +#include <ntifs.h> +#include <ndk/ketypes.h> +#include <fltkernel.h> + +#define KMT_DEFINE_TEST_FUNCTIONS +#include <kmt_test.h> + +#define NDEBUG +#include <debug.h> + +#include <kmt_public.h> + +#define KMTEST_FILTER_POOL_TAG 'fTMK' + + +typedef struct _FILTER_DATA +{ + PDRIVER_OBJECT DriverObject; + FLT_REGISTRATION FilterRegistration; + PFLT_FILTER Filter; + PFLT_PORT ServerPort; + +} FILTER_DATA, *PFILTER_DATA; + + +/* Prototypes */ +DRIVER_INITIALIZE DriverEntry; + +/* Globals */ +static PDRIVER_OBJECT TestDriverObject; +static FILTER_DATA FilterData; +static PFLT_OPERATION_REGISTRATION Callbacks = NULL; +static PFLT_CONTEXT_REGISTRATION Contexts = NULL; + +static PFLT_CONNECT_NOTIFY FilterConnect = NULL; +static PFLT_DISCONNECT_NOTIFY FilterDisconnect = NULL; +static PFLT_MESSAGE_NOTIFY FilterMessage = NULL; +static LONG MaxConnections = 0; + +NTSTATUS +FLTAPI +FilterUnload( + _In_ FLT_FILTER_UNLOAD_FLAGS Flags +); + +NTSTATUS +FLTAPI +FilterInstanceSetup( + _In_ PCFLT_RELATED_OBJECTS FltObjects, + _In_ FLT_INSTANCE_SETUP_FLAGS Flags, + _In_ DEVICE_TYPE VolumeDeviceType, + _In_ FLT_FILESYSTEM_TYPE VolumeFilesystemType +); + +NTSTATUS +FLTAPI +FilterQueryTeardown( + _In_ PCFLT_RELATED_OBJECTS FltObjects, + _In_ FLT_INSTANCE_QUERY_TEARDOWN_FLAGS Flags +); + +FLT_PREOP_CALLBACK_STATUS +FLTAPI +FilterPreOperation( + _Inout_ PFLT_CALLBACK_DATA Data, + _In_ PCFLT_RELATED_OBJECTS FltObjects, + _Outptr_result_maybenull_ PVOID *CompletionContext +); + +FLT_POSTOP_CALLBACK_STATUS +FLTAPI +FilterPostOperation( + _Inout_ PFLT_CALLBACK_DATA Data, + _In_ PCFLT_RELATED_OBJECTS FltObjects, + _In_opt_ PVOID CompletionContext, + _In_ FLT_POST_OPERATION_FLAGS Flags +); + + + +FLT_REGISTRATION FilterRegistration = +{ + sizeof(FLT_REGISTRATION), // Size + FLT_REGISTRATION_VERSION, // Version + 0, // Flags + NULL, // ContextRegistration + NULL, // OperationRegistration + FilterUnload, // FilterUnloadCallback + FilterInstanceSetup, // InstanceSetupCallback + FilterQueryTeardown, // InstanceQueryTeardownCallback + NULL, // InstanceTeardownStartCallback + NULL, // InstanceTeardownCompleteCallback + NULL, // AmFilterGenerateFileNameCallback + NULL, // AmFilterNormalizeNameComponentCallback + NULL, // NormalizeContextCleanupCallback +#if FLT_MGR_LONGHORN + NULL, // TransactionNotificationCallback + NULL, // AmFilterNormalizeNameComponentExCallback +#endif +}; + + + +/* Filter Interface Routines ****************************/ + +/** + * @name DriverEntry + * + * Driver entry point. + * + * @param DriverObject + * Driver Object + * @param RegistryPath + * Driver Registry Path + * + * @return Status + */ +NTSTATUS +NTAPI +DriverEntry( + IN PDRIVER_OBJECT DriverObject, + IN PUNICODE_STRING RegistryPath) +{ + NTSTATUS Status = STATUS_SUCCESS; + OBJECT_ATTRIBUTES ObjectAttributes; + PSECURITY_DESCRIPTOR SecurityDescriptor; + UNICODE_STRING DeviceName; + WCHAR DeviceNameBuffer[128] = L"\\Device\\Kmtest-"; + PCWSTR DeviceNameSuffix; + INT Flags = 0; + PKPRCB Prcb; + + PAGED_CODE(); + //__debugbreak(); + DPRINT("DriverEntry\n"); + + RtlZeroMemory(&FilterData, sizeof(FILTER_DATA)); + + Prcb = KeGetCurrentPrcb(); + KmtIsCheckedBuild = (Prcb->BuildType & PRCB_BUILD_DEBUG) != 0; + KmtIsMultiProcessorBuild = (Prcb->BuildType & PRCB_BUILD_UNIPROCESSOR) == 0; + TestDriverObject = DriverObject; + + + /* call TestEntry */ + RtlInitUnicodeString(&DeviceName, DeviceNameBuffer); + DeviceName.MaximumLength = sizeof DeviceNameBuffer; + TestEntry(DriverObject, RegistryPath, &DeviceNameSuffix, &Flags); + + RtlAppendUnicodeToString(&DeviceName, DeviceNameSuffix); + + /* Register with the filter manager */ + if (!(Flags & TESTENTRY_NO_REGISTER_FILTER)) + { + Status = FltRegisterFilter(DriverObject, + &FilterRegistration, + &FilterData.Filter); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to register the filter driver %wZ\n", &DeviceName); + goto cleanup; + } + } + + if (!(Flags & TESTENTRY_NO_CREATE_COMMS_PORT)) + { + /* Create a security descriptor */ + Status = FltBuildDefaultSecurityDescriptor(&SecurityDescriptor, + FLT_PORT_ALL_ACCESS); + if (!NT_SUCCESS(Status)) + { + goto cleanup; + } + + /* Initialize the security descriptor object */ + InitializeObjectAttributes(&ObjectAttributes, + &DeviceName, + OBJ_KERNEL_HANDLE | OBJ_CASE_INSENSITIVE, + NULL, + SecurityDescriptor); + + + /* Create the usermode communication port */ + Status = FltCreateCommunicationPort(FilterData.Filter, + &FilterData.ServerPort, + &ObjectAttributes, + NULL, + FilterConnect, + FilterDisconnect, + FilterMessage, + MaxConnections); + + /* Free the security descriptor */ + FltFreeSecurityDescriptor(SecurityDescriptor); + + if (!NT_SUCCESS(Status)) + { + goto cleanup; + } + } + + if (!(Flags & TESTENTRY_NO_START_FILTERING)) + { + /* Start filtering the requests */ + Status = FltStartFiltering(FilterData.Filter); + } + +cleanup: + if (!NT_SUCCESS(Status)) + { + if (FilterData.ServerPort) + { + FltCloseCommunicationPort(FilterData.ServerPort); + } + if (FilterData.Filter) + { + FltUnregisterFilter(FilterData.Filter); + } + } + + return Status; +} + +/** + * @name DriverUnload + * + * Driver cleanup funtion. + * + * @param Flags + * Flags describing the unload request + */ +NTSTATUS +FLTAPI +FilterUnload( + _In_ FLT_FILTER_UNLOAD_FLAGS Flags) +{ + PAGED_CODE(); + UNREFERENCED_PARAMETER(Flags); + + DPRINT("DriverUnload\n"); + + TestFilterUnload(Flags); + + /* Close the port and unregister the filter */ + if (FilterData.ServerPort) + { + FltCloseCommunicationPort(FilterData.ServerPort); + FilterData.ServerPort = NULL; + } + if (FilterData.Filter) + { + FltUnregisterFilter(FilterData.Filter); + FilterData.Filter = NULL; + } + + if (Callbacks) + { + ExFreePoolWithTag(Callbacks, KMTEST_FILTER_POOL_TAG); + Callbacks = NULL; + } + + return STATUS_SUCCESS; +} + + +/** + * @name FilterInstanceSetup + * + * Volume attach routine + * + * @param FltObjects + * Filter Object Pointers + * Pointer to an FLT_RELATED_OBJECTS structure that contains opaque pointers + * for the objects related to the current operation + * @param Flags + * Bitmask of flags that indicate why the instance is being attached + * @param VolumeDeviceType + * Device type of the file system volume + * @param VolumeFilesystemType + * File system type of the volume + * + * @return Status. + * Return STATUS_SUCCESS to attach or STATUS_FLT_DO_NOT_ATTACH to ignore + */ +NTSTATUS +FLTAPI +FilterInstanceSetup( + _In_ PCFLT_RELATED_OBJECTS FltObjects, + _In_ FLT_INSTANCE_SETUP_FLAGS Flags, + _In_ DEVICE_TYPE VolumeDeviceType, + _In_ FLT_FILESYSTEM_TYPE VolumeFilesystemType) +{ +#if 0 + UCHAR VolPropBuffer[sizeof(FLT_VOLUME_PROPERTIES) + 512]; + PFLT_VOLUME_PROPERTIES VolumeProperties = (PFLT_VOLUME_PROPERTIES)VolPropBuffer; +#endif + PDEVICE_OBJECT DeviceObject = NULL; + UNICODE_STRING VolumeName; + ULONG ReportedSectorSize = 0; + ULONG SectorSize = 0; + NTSTATUS Status; + + PAGED_CODE(); + + UNREFERENCED_PARAMETER(FltObjects); + UNREFERENCED_PARAMETER(Flags); + + RtlInitUnicodeString(&VolumeName, NULL); +#if 0 // FltGetVolumeProperties is not yet implemented + /* Get the properties of this volume */ + Status = FltGetVolumeProperties(Volume, + VolumeProperties, + sizeof(VolPropBuffer), + &LengthReturned); + if (NT_SUCCESS(Status)) + { + FLT_ASSERT((VolumeProperties->SectorSize == 0) || (VolumeProperties->SectorSize >= MIN_SECTOR_SIZE)); + SectorSize = max(VolumeProperties->SectorSize, MIN_SECTOR_SIZE); + ReportedSectorSize = VolumeProperties->SectorSize; + } + else + { + DPRINT1("Failed to get the volume properties : 0x%X", Status); + return Status; + } +#endif + /* Get the storage device object we want a name for */ + Status = FltGetDiskDeviceObject(FltObjects->Volume, &DeviceObject); + if (NT_SUCCESS(Status)) + { + /* Get the dos device name */ + Status = IoVolumeDeviceToDosName(DeviceObject, &VolumeName); + if (NT_SUCCESS(Status)) + { + DPRINT("VolumeDeviceType %lu, VolumeFilesystemType %lu, Real SectSize=0x%04x, Reported SectSize=0x%04x, Name=\"%wZ\"", + VolumeDeviceType, + VolumeFilesystemType, + SectorSize, + ReportedSectorSize, + &VolumeName); + + Status = TestInstanceSetup(FltObjects, + Flags, + VolumeDeviceType, + VolumeFilesystemType, + &VolumeName, + SectorSize, + ReportedSectorSize); + + /* The buffer was allocated by the IoMgr */ + ExFreePool(VolumeName.Buffer); + } + } + + return Status; +} + + +/** + * @name FilterQueryTeardown + * + * Volume detatch routine + * + * @param FltObjects + * Filter Object Pointers + * Pointer to an FLT_RELATED_OBJECTS structure that contains opaque pointers + * for the objects related to the current operation + * @param Flags + * Flag that indicates why the minifilter driver instance is being torn down + * + */ +NTSTATUS +FLTAPI +FilterQueryTeardown( + _In_ PCFLT_RELATED_OBJECTS FltObjects, + _In_ FLT_INSTANCE_QUERY_TEARDOWN_FLAGS Flags) +{ + PAGED_CODE(); + + TestQueryTeardown(FltObjects, Flags); + + /* We always allow a volume to detach */ + return STATUS_SUCCESS; +} + + +/* Public Routines **************************************/ + +NTSTATUS +KmtFilterRegisterCallbacks( + _In_ CONST FLT_OPERATION_REGISTRATION *OperationRegistration) +{ + ULONG Count = 0; + INT i; + + if (Callbacks) + { + return STATUS_ALREADY_REGISTERED; + } + + /* Count how many IRPs being registered */ + for (i = 0; i < IRP_MJ_MAXIMUM_FUNCTION; i++) + { + if (OperationRegistration[i].MajorFunction == IRP_MJ_OPERATION_END) + break; + Count++; + } + + /* Allocate enough pool to hold a copy of the array */ + Callbacks = ExAllocatePoolWithTag(NonPagedPool, + sizeof(FLT_OPERATION_REGISTRATION) * (Count + 1), + KMTEST_FILTER_POOL_TAG); + if (Callbacks == NULL) + { + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* Copy the array, but using the our own pre/post callbacks */ + for (i = 0; i < Count; i++) + { + Callbacks[i].MajorFunction = OperationRegistration[i].MajorFunction; + Callbacks[i].Flags = OperationRegistration[i].Flags; + Callbacks[i].PreOperation = FilterPreOperation; + Callbacks[i].PostOperation = FilterPostOperation; + } + + /* Terminate the array */ + Callbacks[Count].MajorFunction = IRP_MJ_OPERATION_END; + + return STATUS_SUCCESS; +} + +NTSTATUS +KmtFilterRegisterContexts( + _In_ PFLT_CONTEXT_REGISTRATION ContextRegistration, + _In_ PVOID Callback) +{ + UNREFERENCED_PARAMETER(ContextRegistration); + UNREFERENCED_PARAMETER(Callback); + UNREFERENCED_PARAMETER(Contexts); + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +KmtFilterRegisterComms( + _In_ PFLT_CONNECT_NOTIFY ConnectNotifyCallback, + _In_ PFLT_DISCONNECT_NOTIFY DisconnectNotifyCallback, + _In_opt_ PFLT_MESSAGE_NOTIFY MessageNotifyCallback, + _In_ LONG MaxClientConnections) +{ + FilterConnect = ConnectNotifyCallback; + FilterDisconnect = DisconnectNotifyCallback; + FilterMessage = MessageNotifyCallback; + MaxConnections = MaxClientConnections; + + return STATUS_SUCCESS; +} + + +/* Private Routines ******************************************/ + +FLT_PREOP_CALLBACK_STATUS +FLTAPI +FilterPreOperation( + _Inout_ PFLT_CALLBACK_DATA Data, + _In_ PCFLT_RELATED_OBJECTS FltObjects, + _Outptr_result_maybenull_ PVOID *CompletionContext) +{ + FLT_PREOP_CALLBACK_STATUS Status; + UCHAR MajorFunction; + INT i; + + Status = FLT_PREOP_SUCCESS_NO_CALLBACK; + MajorFunction = Data->Iopb->MajorFunction; + + for (i = 0; i < sizeof(Callbacks) / sizeof(Callbacks[0]); i++) + { + if (MajorFunction == Callbacks[i].MajorFunction) + { + // Call their pre-callback + Status = Callbacks[i].PreOperation(Data, + FltObjects, + CompletionContext); + } + } + + return Status; +} + +FLT_POSTOP_CALLBACK_STATUS +FLTAPI +FilterPostOperation( + _Inout_ PFLT_CALLBACK_DATA Data, + _In_ PCFLT_RELATED_OBJECTS FltObjects, + _In_opt_ PVOID CompletionContext, + _In_ FLT_POST_OPERATION_FLAGS Flags) +{ + FLT_POSTOP_CALLBACK_STATUS Status; + UCHAR MajorFunction; + INT i; + + Status = FLT_POSTOP_FINISHED_PROCESSING; + MajorFunction = Data->Iopb->MajorFunction; + + for (i = 0; i < sizeof(Callbacks) / sizeof(Callbacks[0]); i++) + { + if (MajorFunction == Callbacks[i].MajorFunction) + { + // Call their post-callback + Status = Callbacks[i].PostOperation(Data, + FltObjects, + CompletionContext, + Flags); + } + } + + return Status; +}

6 years, 11 months

[reactos] 01/01: [TRANSLATION]: Brazilian Portuguese translation update for input.cpl (#51)

by Alisson Lauffer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5d0a122ff6dbc89c6503f… commit 5d0a122ff6dbc89c6503f2aa6efa7aca503348fb Author: Alisson Lauffer <alissonvitortc(a)gmail.com> AuthorDate: Wed Oct 11 19:10:23 2017 -0300 [TRANSLATION]: Brazilian Portuguese translation update for input.cpl (#51) --- dll/cpl/input/lang/pt-BR.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/cpl/input/lang/pt-BR.rc b/dll/cpl/input/lang/pt-BR.rc index 9c33f2d94b..4ac6977d16 100644 --- a/dll/cpl/input/lang/pt-BR.rc +++ b/dll/cpl/input/lang/pt-BR.rc @@ -22,7 +22,7 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Configurações de sistema", -1, 7, 7, 240, 70 AUTOCHECKBOX "&Desabilitar serviços de texto avançado", IDC_TURNOFFTEXTSVCS_CB, 14, 20, 220, 12 - LTEXT "Marque esta caixa de seleção para deslitar os serviços de texto avançado em todos os programas. Isto não é recomendado para usuários do Leste Asiático por que isto irá fechar a barra de idiomas.", -1, 14, 40, 230, 35 + LTEXT "Marque esta caixa de seleção para desabilitar os serviços de texto avançado em todos os programas. Isto não é recomendado para usuários do Leste Asiático por que irá fechar a barra de idiomas.", -1, 14, 40, 230, 35 END IDD_KEYSETTINGS DIALOGEX 0, 0, 272, 163

6 years, 11 months

← Newer
1
...
14
15
16
17
18
19
20
...
28
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2017