Ros-diffs April 2017

ros-diffs@reactos.org

14 participants
179 discussions

by cfinck＠svn.reactos.org

Author: cfinck Date: Sun Apr 16 15:37:31 2017 New Revision: 74326 URL: http://svn.reactos.org/svn/reactos?rev=74326&view=rev Log: Fix GCC build (2/2) Modified: trunk/reactos/win32ss/printing/base/spoolss/printers.c trunk/reactos/win32ss/printing/base/spoolss/tools.c trunk/reactos/win32ss/printing/include/spoolss.h trunk/reactos/win32ss/printing/providers/localspl/main.c trunk/reactos/win32ss/printing/providers/localspl/precomp.h trunk/reactos/win32ss/printing/providers/localspl/printers.c Modified: trunk/reactos/win32ss/printing/base/spoolss/printers.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/printing/base/spoo… ============================================================================== --- trunk/reactos/win32ss/printing/base/spoolss/printers.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/printing/base/spoolss/printers.c [iso-8859-1] Sun Apr 16 15:37:31 2017 @@ -65,7 +65,6 @@ BOOL WINAPI EnumPrintersW(DWORD Flags, PWSTR Name, DWORD Level, PBYTE pPrinterEnum, DWORD cbBuf, PDWORD pcbNeeded, PDWORD pcReturned) { - BOOL bReturnValue; DWORD cbCallBuffer; DWORD cbNeeded; DWORD dwErrorCode = 0xFFFFFFFF; @@ -94,7 +93,7 @@ pPrintProvider = CONTAINING_RECORD(pEntry, SPOOLSS_PRINT_PROVIDER, Entry); // Call the EnumPrinters function of this Print Provider. - bReturnValue = pPrintProvider->PrintProvider.fpEnumPrinters(Flags, Name, Level, pCallBuffer, cbCallBuffer, &cbNeeded, &dwReturned); + pPrintProvider->PrintProvider.fpEnumPrinters(Flags, Name, Level, pCallBuffer, cbCallBuffer, &cbNeeded, &dwReturned); // Add the returned counts to the total values. *pcbNeeded += cbNeeded; Modified: trunk/reactos/win32ss/printing/base/spoolss/tools.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/printing/base/spoo… ============================================================================== --- trunk/reactos/win32ss/printing/base/spoolss/tools.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/printing/base/spoolss/tools.c [iso-8859-1] Sun Apr 16 15:37:31 2017 @@ -2,7 +2,7 @@ * PROJECT: ReactOS Spooler Router * LICENSE: GNU LGPL v2.1 or any later version as published by the Free Software Foundation * PURPOSE: Miscellaneous tool functions - * COPYRIGHT: Copyright 2015 Colin Finck <colin(a)reactos.org> + * COPYRIGHT: Copyright 2015-2017 Colin Finck <colin(a)reactos.org> */ #include "precomp.h" @@ -86,7 +86,7 @@ * The strings are copied in reverse order, so this pointer will point to the last copied string of pSource. */ PBYTE WINAPI -PackStrings(PCWSTR* pSource, PBYTE pDest, const DWORD* DestOffsets, PBYTE pEnd) +PackStrings(PWSTR* pSource, PBYTE pDest, const DWORD* DestOffsets, PBYTE pEnd) { DWORD cbString; ULONG_PTR StringAddress; Modified: trunk/reactos/win32ss/printing/include/spoolss.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/printing/include/s… ============================================================================== --- trunk/reactos/win32ss/printing/include/spoolss.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/printing/include/spoolss.h [iso-8859-1] Sun Apr 16 15:37:31 2017 @@ -26,7 +26,7 @@ BOOL WINAPI DllFreeSplStr(PWSTR pwszString); BOOL WINAPI InitializeRouter(HANDLE SpoolerStatusHandle); BOOL WINAPI MarshallDownStructure(PVOID pStructure, PMARSHALL_DOWN_INFO pParameters, DWORD cbStructureSize, BOOL bSomeBoolean); -PBYTE WINAPI PackStrings(PCWSTR* pSource, PBYTE pDest, const DWORD* DestOffsets, PBYTE pEnd); +PBYTE WINAPI PackStrings(PWSTR* pSource, PBYTE pDest, const DWORD* DestOffsets, PBYTE pEnd); PVOID WINAPI ReallocSplMem(PVOID pOldMem, DWORD cbOld, DWORD cbNew); BOOL WINAPI ReallocSplStr(PWSTR* ppwszString, PCWSTR pwszInput); BOOL WINAPI SplInitializeWinSpoolDrv(PVOID* pTable); Modified: trunk/reactos/win32ss/printing/providers/localspl/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/printing/providers… ============================================================================== --- trunk/reactos/win32ss/printing/providers/localspl/main.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/printing/providers/localspl/main.c [iso-8859-1] Sun Apr 16 15:37:31 2017 @@ -16,7 +16,7 @@ const WCHAR wszDefaultDocumentName[] = L"Local Downlevel Document"; -const WCHAR* wszPrintProviderInfo[3] = { +PWSTR wszPrintProviderInfo[3] = { L"Windows NT Local Print Providor", // Name L"Locally connected Printers", // Comment L"Windows NT Local Printers" // Description Modified: trunk/reactos/win32ss/printing/providers/localspl/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/printing/providers… ============================================================================== --- trunk/reactos/win32ss/printing/providers/localspl/precomp.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/printing/providers/localspl/precomp.h [iso-8859-1] Sun Apr 16 15:37:31 2017 @@ -258,7 +258,7 @@ extern const WCHAR wszCurrentEnvironment[]; extern const DWORD cbCurrentEnvironment; extern const WCHAR wszDefaultDocumentName[]; -extern const WCHAR* wszPrintProviderInfo[3]; +extern PWSTR wszPrintProviderInfo[3]; extern WCHAR wszSpoolDirectory[MAX_PATH]; extern DWORD cchSpoolDirectory; Modified: trunk/reactos/win32ss/printing/providers/localspl/printers.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/printing/providers… ============================================================================== --- trunk/reactos/win32ss/printing/providers/localspl/printers.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/printing/providers/localspl/printers.c [iso-8859-1] Sun Apr 16 15:37:31 2017 @@ -386,9 +386,9 @@ { const WCHAR wszComma[] = L","; - DWORD cbName; - DWORD cbComment; - DWORD cbDescription; + size_t cbName; + size_t cbComment; + size_t cbDescription; DWORD cchComputerName = 0; DWORD dwErrorCode; DWORD i;

7 years, 8 months

[cfinck] 74325: Fix GCC build

by cfinck＠svn.reactos.org

Author: cfinck Date: Sun Apr 16 14:30:07 2017 New Revision: 74325 URL: http://svn.reactos.org/svn/reactos?rev=74325&view=rev Log: Fix GCC build Modified: trunk/reactos/win32ss/printing/include/spoolss.h Modified: trunk/reactos/win32ss/printing/include/spoolss.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/printing/include/s… ============================================================================== --- trunk/reactos/win32ss/printing/include/spoolss.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/printing/include/spoolss.h [iso-8859-1] Sun Apr 16 14:30:07 2017 @@ -30,7 +30,7 @@ PVOID WINAPI ReallocSplMem(PVOID pOldMem, DWORD cbOld, DWORD cbNew); BOOL WINAPI ReallocSplStr(PWSTR* ppwszString, PCWSTR pwszInput); BOOL WINAPI SplInitializeWinSpoolDrv(PVOID* pTable); -DWORD WINAPI SpoolerInit(); +BOOL WINAPI SpoolerInit(); PDWORD WINAPI UndoAlignRpcPtr(PVOID pDestinationBuffer, PVOID pSourceBuffer, DWORD cbBuffer, PDWORD pcbNeeded); #endif

7 years, 8 months

[cfinck] 74324: [LOCALSPL] - Refactor LocalEnumPrinters to make it ready for supporting additional levels. - Correctly handle all passed flags for Level 1 queries to the Local Print Provider. - Int...

by cfinck＠svn.reactos.org

Author: cfinck Date: Sun Apr 16 14:12:01 2017 New Revision: 74324 URL: http://svn.reactos.org/svn/reactos?rev=74324&view=rev Log: [LOCALSPL] - Refactor LocalEnumPrinters to make it ready for supporting additional levels. - Correctly handle all passed flags for Level 1 queries to the Local Print Provider. - Introduce strsafe functions to LocalEnumPrinters in a way that actually makes the code smaller. To be done in other parts too. - Use PackStrings in LocalEnumPrinters to simplify the code. - Return the correct 3 strings in the Description field of Level 1 queries. That also introduces the "Location" field. - Remove debug spam in _OpenEnvironment. [SPOOLSV] - Make use of the newly implemented AlignRpcPtr/UndoAlignRpcPtr. Fixes a test. [WINSPOOL] - Dismiss invalid levels already in EnumPrintersW and zero the input buffer here (but not in localspl). Verified by a test. EnumPrintersW for Level 1 should be fully supported now. Modified: trunk/reactos/boot/bootdata/hivesys.inf trunk/reactos/win32ss/printing/base/spoolss/printers.c trunk/reactos/win32ss/printing/base/spoolsv/precomp.h trunk/reactos/win32ss/printing/base/spoolsv/printers.c trunk/reactos/win32ss/printing/base/winspool/printers.c trunk/reactos/win32ss/printing/include/spoolss.h trunk/reactos/win32ss/printing/providers/localspl/main.c trunk/reactos/win32ss/printing/providers/localspl/precomp.h trunk/reactos/win32ss/printing/providers/localspl/printers.c trunk/reactos/win32ss/printing/providers/localspl/printprocessors.c trunk/rostests/apitests/localspl/dll/fpEnumPrinters.c trunk/rostests/apitests/winspool/EnumPrinters.c Modified: trunk/reactos/boot/bootdata/hivesys.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] Sun Apr 16 14:12:01 2017 @@ -1277,6 +1277,7 @@ 00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\ 00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\ 00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Control\Print\Printers\Dummy Printer On LPT1","Location",,"At Home" HKLM,"SYSTEM\CurrentControlSet\Control\Print\Printers\Dummy Printer On LPT1","Port",,"LPT1:" HKLM,"SYSTEM\CurrentControlSet\Control\Print\Printers\Dummy Printer On LPT1","Print Processor",,"winprint" HKLM,"SYSTEM\CurrentControlSet\Control\Print\Printers\Dummy Printer On LPT1","Printer Driver",,"Dummy Printer Driver" Modified: trunk/reactos/win32ss/printing/base/spoolss/printers.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/printing/base/spoo… ============================================================================== --- trunk/reactos/win32ss/printing/base/spoolss/printers.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/printing/base/spoolss/printers.c [iso-8859-1] Sun Apr 16 14:12:01 2017 @@ -2,7 +2,7 @@ * PROJECT: ReactOS Spooler Router * LICENSE: GNU LGPL v2.1 or any later version as published by the Free Software Foundation * PURPOSE: Functions related to Printers and printing - * COPYRIGHT: Copyright 2015 Colin Finck <colin(a)reactos.org> + * COPYRIGHT: Copyright 2015-2017 Colin Finck <colin(a)reactos.org> */ #include "precomp.h" @@ -68,27 +68,27 @@ BOOL bReturnValue; DWORD cbCallBuffer; DWORD cbNeeded; + DWORD dwErrorCode = 0xFFFFFFFF; DWORD dwReturned; PBYTE pCallBuffer; PSPOOLSS_PRINT_PROVIDER pPrintProvider; PLIST_ENTRY pEntry; - // Sanity checks. - if ((cbBuf && !pPrinterEnum) || !pcbNeeded || !pcReturned) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - // Begin counting. *pcbNeeded = 0; *pcReturned = 0; + if (cbBuf && !pPrinterEnum) + { + dwErrorCode = ERROR_INVALID_USER_BUFFER; + goto Cleanup; + } + // At the beginning, we have the full buffer available. cbCallBuffer = cbBuf; pCallBuffer = pPrinterEnum; - // Loop through all Print Provider. + // Loop through all Print Providers. for (pEntry = PrintProviderList.Flink; pEntry != &PrintProviderList; pEntry = pEntry->Flink) { pPrintProvider = CONTAINING_RECORD(pEntry, SPOOLSS_PRINT_PROVIDER, Entry); @@ -109,9 +109,15 @@ // Advance the buffer if the caller provided it. if (pCallBuffer) pCallBuffer += cbNeeded; - } - - return bReturnValue; + + // dwErrorCode shall not be overwritten if a previous EnumPrinters call already succeeded. + if (dwErrorCode != ERROR_SUCCESS) + dwErrorCode = GetLastError(); + } + +Cleanup: + SetLastError(dwErrorCode); + return (dwErrorCode == ERROR_SUCCESS); } BOOL WINAPI @@ -148,6 +154,7 @@ OpenPrinterW(PWSTR pPrinterName, PHANDLE phPrinter, PPRINTER_DEFAULTSW pDefault) { BOOL bReturnValue; + DWORD dwErrorCode = ERROR_INVALID_PRINTER_NAME; HANDLE hPrinter; PLIST_ENTRY pEntry; PSPOOLSS_PRINTER_HANDLE pHandle; @@ -156,8 +163,8 @@ // Sanity checks. if (!pPrinterName || !phPrinter) { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; + dwErrorCode = ERROR_INVALID_PARAMETER; + goto Cleanup; } // Loop through all Print Providers to find one able to open this Printer. @@ -173,27 +180,33 @@ pHandle = DllAllocSplMem(sizeof(SPOOLSS_PRINTER_HANDLE)); if (!pHandle) { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); ERR("DllAllocSplMem failed with error %lu!\n", GetLastError()); - return FALSE; + dwErrorCode = ERROR_NOT_ENOUGH_MEMORY; + goto Cleanup; } pHandle->pPrintProvider = pPrintProvider; pHandle->hPrinter = hPrinter; *phPrinter = (HANDLE)pHandle; - SetLastError(ERROR_SUCCESS); - return TRUE; + dwErrorCode = ERROR_SUCCESS; + goto Cleanup; } else if (bReturnValue == ROUTER_STOP_ROUTING) { ERR("A Print Provider returned ROUTER_STOP_ROUTING for Printer \"%S\"!\n", pPrinterName); - return FALSE; + dwErrorCode = GetLastError(); + goto Cleanup; } } - // We found no Print Provider able to open this Printer. - return FALSE; + // ERROR_INVALID_NAME by the Print Provider is translated to ERROR_INVALID_PRINTER_NAME here, but not in other APIs as far as I know. + if (dwErrorCode == ERROR_INVALID_NAME) + dwErrorCode = ERROR_INVALID_PRINTER_NAME; + +Cleanup: + SetLastError(dwErrorCode); + return (dwErrorCode == ERROR_SUCCESS); } BOOL WINAPI Modified: trunk/reactos/win32ss/printing/base/spoolsv/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/printing/base/spoo… ============================================================================== --- trunk/reactos/win32ss/printing/base/spoolsv/precomp.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/printing/base/spoolsv/precomp.h [iso-8859-1] Sun Apr 16 14:12:01 2017 @@ -2,7 +2,7 @@ * PROJECT: ReactOS Print Spooler Service * LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation * PURPOSE: Precompiled Header for all source files - * COPYRIGHT: Copyright 2015 Colin Finck <colin(a)reactos.org> + * COPYRIGHT: Copyright 2015-2017 Colin Finck <colin(a)reactos.org> */ #ifndef _PRECOMP_H @@ -18,14 +18,12 @@ #include <winsplp.h> #include <winspool_s.h> +#include <spoolss.h> + #include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(spoolsv); // rpcserver.c DWORD WINAPI LrpcThreadProc(LPVOID lpParameter); -// Undocumented spoolss -BOOL WINAPI InitializeRouter(HANDLE SpoolerStatusHandle); -DWORD WINAPI SpoolerInit(); - #endif Modified: trunk/reactos/win32ss/printing/base/spoolsv/printers.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/printing/base/spoo… ============================================================================== --- trunk/reactos/win32ss/printing/base/spoolsv/printers.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/printing/base/spoolsv/printers.c [iso-8859-1] Sun Apr 16 14:12:01 2017 @@ -2,7 +2,7 @@ * PROJECT: ReactOS Print Spooler Service * LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation * PURPOSE: Functions related to Printers and printing - * COPYRIGHT: Copyright 2015 Colin Finck <colin(a)reactos.org> + * COPYRIGHT: Copyright 2015-2017 Colin Finck <colin(a)reactos.org> */ #include "precomp.h" @@ -137,21 +137,24 @@ _RpcEnumPrinters(DWORD Flags, WINSPOOL_HANDLE Name, DWORD Level, BYTE* pPrinterEnum, DWORD cbBuf, DWORD* pcbNeeded, DWORD* pcReturned) { DWORD dwErrorCode; - DWORD i; - PBYTE p = pPrinterEnum; - - dwErrorCode = RpcImpersonateClient(NULL); - if (dwErrorCode != ERROR_SUCCESS) - { - ERR("RpcImpersonateClient failed with error %lu!\n", dwErrorCode); - return dwErrorCode; - } - - EnumPrintersW(Flags, Name, Level, pPrinterEnum, cbBuf, pcbNeeded, pcReturned); + PBYTE pPrinterEnumAligned; + + dwErrorCode = RpcImpersonateClient(NULL); + if (dwErrorCode != ERROR_SUCCESS) + { + ERR("RpcImpersonateClient failed with error %lu!\n", dwErrorCode); + return dwErrorCode; + } + + pPrinterEnumAligned = AlignRpcPtr(pPrinterEnum, &cbBuf); + EnumPrintersW(Flags, Name, Level, pPrinterEnumAligned, cbBuf, pcbNeeded, pcReturned); dwErrorCode = GetLastError(); if (dwErrorCode == ERROR_SUCCESS) { + DWORD i; + PBYTE p = pPrinterEnumAligned; + // Replace absolute pointer addresses in the output by relative offsets. for (i = 0; i < *pcReturned; i++) { @@ -165,6 +168,8 @@ } RpcRevertToSelf(); + UndoAlignRpcPtr(pPrinterEnum, pPrinterEnumAligned, cbBuf, pcbNeeded); + return dwErrorCode; } Modified: trunk/reactos/win32ss/printing/base/winspool/printers.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/printing/base/wins… ============================================================================== --- trunk/reactos/win32ss/printing/base/winspool/printers.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/printing/base/winspool/printers.c [iso-8859-1] Sun Apr 16 14:12:01 2017 @@ -2,7 +2,7 @@ * PROJECT: ReactOS Spooler API * LICENSE: GNU LGPL v2.1 or any later version as published by the Free Software Foundation * PURPOSE: Functions related to Printers and printing - * COPYRIGHT: Copyright 2015 Colin Finck <colin(a)reactos.org> + * COPYRIGHT: Copyright 2015-2017 Colin Finck <colin(a)reactos.org> */ #include "precomp.h" @@ -309,6 +309,16 @@ DWORD i; PBYTE p = pPrinterEnum; + // Dismiss invalid levels already at this point. + if (Level == 3 || Level > 5) + { + dwErrorCode = ERROR_INVALID_LEVEL; + goto Cleanup; + } + + if (cbBuf && pPrinterEnum) + ZeroMemory(pPrinterEnum, cbBuf); + // Do the RPC call RpcTryExcept { @@ -335,6 +345,7 @@ } } +Cleanup: SetLastError(dwErrorCode); return (dwErrorCode == ERROR_SUCCESS); } Modified: trunk/reactos/win32ss/printing/include/spoolss.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/printing/include/s… ============================================================================== --- trunk/reactos/win32ss/printing/include/spoolss.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/printing/include/spoolss.h [iso-8859-1] Sun Apr 16 14:12:01 2017 @@ -24,11 +24,13 @@ PVOID WINAPI DllAllocSplMem(DWORD dwBytes); BOOL WINAPI DllFreeSplMem(PVOID pMem); BOOL WINAPI DllFreeSplStr(PWSTR pwszString); +BOOL WINAPI InitializeRouter(HANDLE SpoolerStatusHandle); BOOL WINAPI MarshallDownStructure(PVOID pStructure, PMARSHALL_DOWN_INFO pParameters, DWORD cbStructureSize, BOOL bSomeBoolean); PBYTE WINAPI PackStrings(PCWSTR* pSource, PBYTE pDest, const DWORD* DestOffsets, PBYTE pEnd); PVOID WINAPI ReallocSplMem(PVOID pOldMem, DWORD cbOld, DWORD cbNew); BOOL WINAPI ReallocSplStr(PWSTR* ppwszString, PCWSTR pwszInput); BOOL WINAPI SplInitializeWinSpoolDrv(PVOID* pTable); +DWORD WINAPI SpoolerInit(); PDWORD WINAPI UndoAlignRpcPtr(PVOID pDestinationBuffer, PVOID pSourceBuffer, DWORD cbBuffer, PDWORD pcbNeeded); #endif Modified: trunk/reactos/win32ss/printing/providers/localspl/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/printing/providers… ============================================================================== --- trunk/reactos/win32ss/printing/providers/localspl/main.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/printing/providers/localspl/main.c [iso-8859-1] Sun Apr 16 14:12:01 2017 @@ -2,7 +2,7 @@ * PROJECT: ReactOS Local Spooler * LICENSE: GNU LGPL v2.1 or any later version as published by the Free Software Foundation * PURPOSE: Main functions - * COPYRIGHT: Copyright 2015-2016 Colin Finck <colin(a)reactos.org> + * COPYRIGHT: Copyright 2015-2017 Colin Finck <colin(a)reactos.org> */ #include "precomp.h" @@ -18,8 +18,8 @@ const WCHAR* wszPrintProviderInfo[3] = { L"Windows NT Local Print Providor", // Name - L"Windows NT Local Printers", // Description - L"Locally connected Printers" // Comment + L"Locally connected Printers", // Comment + L"Windows NT Local Printers" // Description }; // Local Constants Modified: trunk/reactos/win32ss/printing/providers/localspl/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/printing/providers… ============================================================================== --- trunk/reactos/win32ss/printing/providers/localspl/precomp.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/printing/providers/localspl/precomp.h [iso-8859-1] Sun Apr 16 14:12:01 2017 @@ -15,6 +15,7 @@ #include <lmcons.h> #include <rpc.h> +#include <strsafe.h> #include <windef.h> #include <winbase.h> #include <wingdi.h> @@ -114,6 +115,7 @@ DWORD dwAttributes; DWORD dwStatus; + PWSTR pwszLocation; PWSTR pwszPrinterDriver; PWSTR pwszDescription; PWSTR pwszDefaultDatatype; Modified: trunk/reactos/win32ss/printing/providers/localspl/printers.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/printing/providers… ============================================================================== --- trunk/reactos/win32ss/printing/providers/localspl/printers.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/printing/providers/localspl/printers.c [iso-8859-1] Sun Apr 16 14:12:01 2017 @@ -2,7 +2,7 @@ * PROJECT: ReactOS Local Spooler * LICENSE: GNU LGPL v2.1 or any later version as published by the Free Software Foundation * PURPOSE: Functions related to Printers and printing - * COPYRIGHT: Copyright 2015 Colin Finck <colin(a)reactos.org> + * COPYRIGHT: Copyright 2015-2017 Colin Finck <colin(a)reactos.org> */ #include "precomp.h" @@ -10,6 +10,13 @@ // Global Variables SKIPLIST PrinterList; +// Local Constants +static DWORD dwPrinterInfo1Offsets[] = { + FIELD_OFFSET(PRINTER_INFO_1W, pName), + FIELD_OFFSET(PRINTER_INFO_1W, pComment), + FIELD_OFFSET(PRINTER_INFO_1W, pDescription), + MAXDWORD +}; /** * @name _PrinterListCompareRoutine @@ -170,6 +177,11 @@ pPrinter->pPort = pPort; InitializePrinterJobList(pPrinter); + // Get the location. + pPrinter->pwszLocation = AllocAndRegQueryWSZ(hSubKey, L"Location"); + if (!pPrinter->pwszLocation) + continue; + // Get the printer driver. pPrinter->pwszPrinterDriver = AllocAndRegQueryWSZ(hSubKey, L"Printer Driver"); if (!pPrinter->pwszPrinterDriver) @@ -284,9 +296,93 @@ return (dwErrorCode == ERROR_SUCCESS); } - -DWORD -_LocalEnumPrintersLevel1(DWORD Flags, LPWSTR Name, LPBYTE pPrinterEnum, DWORD cbBuf, LPDWORD pcbNeeded, LPDWORD pcReturned) +/** + * @name _IsLocalComputerName + * + * Checks if the given Computer Name matches the local Computer Name. + * + * @param Name + * Computer Name prepended with two backslashes to check. + * + * @param pwszComputerName + * Pointer to a string able to hold 2 + MAX_COMPUTERNAME_LENGTH + 1 + 1 characters. + * Will contain a string "\\COMPUTERNAME\" on success that can be prepended in EnumPrinters. + * + * @param pcchComputerName + * On success, this pointer receives the length in characters of pwszComputerName. + * + * @return + * ERROR_SUCCESS on success or an error code on failure. + */ +static DWORD +_IsLocalComputerName(PCWSTR Name, PWSTR pwszComputerName, PDWORD pcchComputerName) +{ + DWORD dwErrorCode; + + // Prepend slashes to the computer name. + pwszComputerName[0] = L'\\'; + pwszComputerName[1] = L'\\'; + + // Get the local computer name for comparison. + *pcchComputerName = MAX_COMPUTERNAME_LENGTH + 1; + if (!GetComputerNameW(&pwszComputerName[2], pcchComputerName)) + { + dwErrorCode = GetLastError(); + ERR("GetComputerNameW failed with error %lu!\n", dwErrorCode); + goto Cleanup; + } + + // Add the leading slashes to the total length. + *pcchComputerName += 2; + + // Now compare this with the local computer name and reject it with ERROR_INVALID_NAME if it doesn't match. + if (wcsicmp(&Name[2], &pwszComputerName[2]) != 0) + { + dwErrorCode = ERROR_INVALID_NAME; + goto Cleanup; + } + + // Add a trailing backslash to pwszComputerName, which will later be prepended in front of the printer names. + pwszComputerName[(*pcchComputerName)++] = L'\\'; + pwszComputerName[*pcchComputerName] = 0; + + dwErrorCode = ERROR_SUCCESS; + +Cleanup: + return dwErrorCode; +} + +static DWORD +_DumpLevel1PrintProviderInformation(PBYTE pPrinterEnum, DWORD cbBuf, PDWORD pcbNeeded, PDWORD pcReturned) +{ + int i; + + // Count the needed bytes for Print Provider information. + *pcbNeeded = sizeof(PRINTER_INFO_1W); + + for (i = 0; i < 3; i++) + *pcbNeeded += (wcslen(wszPrintProviderInfo[i]) + 1) * sizeof(WCHAR); + + // Check if the supplied buffer is large enough. + if (cbBuf < *pcbNeeded) + return ERROR_INSUFFICIENT_BUFFER; + + // Copy over the Print Provider information. + ((PPRINTER_INFO_1W)pPrinterEnum)->Flags = 0; + PackStrings(wszPrintProviderInfo, pPrinterEnum, dwPrinterInfo1Offsets, &pPrinterEnum[*pcbNeeded]); + *pcReturned = 1; + + return ERROR_SUCCESS; +} + +static DWORD +_LocalEnumPrintersLevel0(DWORD Flags, PCWSTR Name, PBYTE pPrinterEnum, DWORD cbBuf, PDWORD pcbNeeded, PDWORD pcReturned) +{ + return ERROR_INVALID_LEVEL; +} + +static DWORD +_LocalEnumPrintersLevel1(DWORD Flags, PCWSTR Name, PBYTE pPrinterEnum, DWORD cbBuf, PDWORD pcbNeeded, PDWORD pcReturned) { const WCHAR wszComma[] = L","; @@ -297,57 +393,28 @@ DWORD dwErrorCode; DWORD i; PBYTE pPrinterInfo; - PBYTE pPrinterString; + PBYTE pPrinterStrings; PSKIPLIST_NODE pNode; PLOCAL_PRINTER pPrinter; - PRINTER_INFO_1W PrinterInfo1; - WCHAR wszComputerName[2 + MAX_COMPUTERNAME_LENGTH + 1 + 1]; - - DWORD dwOffsets[] = { - FIELD_OFFSET(PRINTER_INFO_1W, pName), - FIELD_OFFSET(PRINTER_INFO_1W, pDescription), - FIELD_OFFSET(PRINTER_INFO_1W, pComment), - MAXDWORD - }; + PWSTR p; + PWSTR pwszStrings[3]; + WCHAR wszComputerName[2 + MAX_COMPUTERNAME_LENGTH + 1 + 1] = { 0 }; if (Flags & PRINTER_ENUM_NAME) { if (Name) { // The user supplied a Computer Name (with leading double backslashes) or Print Provider Name. - // Only process what's directed at us and dismiss every other request with ERROR_INVALID_NAME. + // Only process what's directed at us. if (Name[0] == L'\\' && Name[1] == L'\\') { - // Prepend slashes to the computer name. - wszComputerName[0] = L'\\'; - wszComputerName[1] = L'\\'; - - // Get the local computer name for comparison. - cchComputerName = MAX_COMPUTERNAME_LENGTH + 1; - if (!GetComputerNameW(&wszComputerName[2], &cchComputerName)) - { - dwErrorCode = GetLastError(); - ERR("GetComputerNameW failed with error %lu!\n", dwErrorCode); + dwErrorCode = _IsLocalComputerName(Name, wszComputerName, &cchComputerName); + if (dwErrorCode != ERROR_SUCCESS) goto Cleanup; - } - - // Add the leading slashes to the total length. - cchComputerName += 2; - - // Now compare this with the local computer name and reject if it doesn't match. - if (wcsicmp(&Name[2], &wszComputerName[2]) != 0) - { - dwErrorCode = ERROR_INVALID_NAME; - goto Cleanup; - } - - // Add a trailing backslash to wszComputerName, which will later be prepended in front of the printer names. - wszComputerName[cchComputerName++] = L'\\'; - wszComputerName[cchComputerName] = 0; } else if (wcsicmp(Name, wszPrintProviderInfo[0]) != 0) { - // The user supplied a name that cannot be processed by the local print provider. + // The user supplied a name that cannot be processed by the Local Print Provider. dwErrorCode = ERROR_INVALID_NAME; goto Cleanup; } @@ -356,23 +423,7 @@ { // The caller wants information about this Print Provider. // spoolss packs this into an array of information about all Print Providers. - *pcbNeeded = sizeof(PRINTER_INFO_1W); - - for (i = 0; i < 3; i++) - *pcbNeeded += (wcslen(wszPrintProviderInfo[i]) + 1) * sizeof(WCHAR); - - // Check if the supplied buffer is large enough. - if (cbBuf < *pcbNeeded) - { - dwErrorCode = ERROR_INSUFFICIENT_BUFFER; - goto Cleanup; - } - - // Copy over the print processor information. - ((PPRINTER_INFO_1W)pPrinterEnum)->Flags = 0; - PackStrings(wszPrintProviderInfo, pPrinterEnum, dwOffsets, &pPrinterEnum[*pcbNeeded]); - *pcReturned = 1; - dwErrorCode = ERROR_SUCCESS; + dwErrorCode = _DumpLevel1PrintProviderInformation(pPrinterEnum, cbBuf, pcbNeeded, pcReturned); goto Cleanup; } } @@ -384,14 +435,17 @@ { pPrinter = (PLOCAL_PRINTER)pNode->Element; - // This looks wrong, but is totally right. PRINTER_INFO_1W has three members pName, pComment and pDescription. - // But pComment equals the "Description" registry value while pDescription is concatenated out of pName and pComment. + // TODO: If PRINTER_ENUM_SHARED is given, add this Printer if it's shared instead of just ignoring it. + if (Flags & PRINTER_ENUM_SHARED) + continue; + + // Attention: pComment equals the "Description" registry value while pDescription is concatenated out of several strings. // On top of this, the computer name is prepended to the printer name if the user supplied the local computer name during the query. - cbName = (wcslen(pPrinter->pwszPrinterName) + 1) * sizeof(WCHAR); + cbName = (cchComputerName + wcslen(pPrinter->pwszPrinterName) + 1) * sizeof(WCHAR); cbComment = (wcslen(pPrinter->pwszDescription) + 1) * sizeof(WCHAR); - cbDescription = cchComputerName * sizeof(WCHAR) + cbName + cbComment + sizeof(WCHAR); - - *pcbNeeded += sizeof(PRINTER_INFO_1W) + cchComputerName * sizeof(WCHAR) + cbName + cbComment + cbDescription; + cbDescription = cbName + (wcslen(pPrinter->pwszPrinterDriver) + 1 + wcslen(pPrinter->pwszLocation) + 1) * sizeof(WCHAR); + + *pcbNeeded += sizeof(PRINTER_INFO_1W) + cbName + cbComment + cbDescription; i++; } @@ -402,49 +456,53 @@ goto Cleanup; } - // Put the strings right after the last PRINTER_INFO_1W structure. - // Due to all the required string processing, we can't just use PackStrings here :( + // Initialize the variables for filling the output buffer using PackStrings. pPrinterInfo = pPrinterEnum; - pPrinterString = pPrinterEnum + i * sizeof(PRINTER_INFO_1W); - - // Copy over the printer information. + pPrinterStrings = &pPrinterEnum[*pcbNeeded]; + + // Copy over the Printer information. for (pNode = PrinterList.Head.Next[0]; pNode; pNode = pNode->Next[0]) { pPrinter = (PLOCAL_PRINTER)pNode->Element; - // FIXME: As for now, the Flags member returns no information. - PrinterInfo1.Flags = 0; - - // Copy the printer name. - PrinterInfo1.pName = (PWSTR)pPrinterString; - CopyMemory(pPrinterString, wszComputerName, cchComputerName * sizeof(WCHAR)); - pPrinterString += cchComputerName * sizeof(WCHAR); - cbName = (wcslen(pPrinter->pwszPrinterName) + 1) * sizeof(WCHAR); - CopyMemory(pPrinterString, pPrinter->pwszPrinterName, cbName); - pPrinterString += cbName; - - // Copy the printer comment (equals the "Description" registry value). - PrinterInfo1.pComment = (PWSTR)pPrinterString; + // TODO: If PRINTER_ENUM_SHARED is given, add this Printer if it's shared instead of just ignoring it. + if (Flags & PRINTER_ENUM_SHARED) + continue; + + // Indicate that this is a Printer. + ((PPRINTER_INFO_1W)pPrinterInfo)->Flags = PRINTER_ENUM_ICON8; + + // Calculate the string lengths. + cbName = (cchComputerName + wcslen(pPrinter->pwszPrinterName) + 1) * sizeof(WCHAR); cbComment = (wcslen(pPrinter->pwszDescription) + 1) * sizeof(WCHAR); - CopyMemory(pPrinterString, pPrinter->pwszDescription, cbComment); - pPrinterString += cbComment; - - // Copy the description, which for PRINTER_INFO_1W has the form "Name,Comment," - PrinterInfo1.pDescription = (PWSTR)pPrinterString; - CopyMemory(pPrinterString, wszComputerName, cchComputerName * sizeof(WCHAR)); - pPrinterString += cchComputerName * sizeof(WCHAR); - CopyMemory(pPrinterString, pPrinter->pwszPrinterName, cbName - sizeof(WCHAR)); - pPrinterString += cbName - sizeof(WCHAR); - CopyMemory(pPrinterString, wszComma, sizeof(WCHAR)); - pPrinterString += sizeof(WCHAR); - CopyMemory(pPrinterString, pPrinter->pwszDescription, cbComment - sizeof(WCHAR)); - pPrinterString += cbComment - sizeof(WCHAR); - CopyMemory(pPrinterString, wszComma, sizeof(wszComma)); - pPrinterString += sizeof(wszComma); - + cbDescription = cbName + (wcslen(pPrinter->pwszPrinterDriver) + 1 + wcslen(pPrinter->pwszLocation) + 1) * sizeof(WCHAR); + + // Copy the Printer Name. + pwszStrings[0] = DllAllocSplMem(cbName); + p = pwszStrings[0]; + StringCbCopyExW(p, cbName, wszComputerName, &p, &cbName, 0); + StringCbCopyExW(p, cbName, pPrinter->pwszPrinterName, &p, &cbName, 0); + + // Copy the Printer comment (equals the "Description" registry value). + pwszStrings[1] = pPrinter->pwszDescription; + + // Copy the description, which for PRINTER_INFO_1W has the form "Name,Printer Driver,Location" + pwszStrings[2] = DllAllocSplMem(cbDescription); + p = pwszStrings[2]; + StringCbCopyExW(p, cbDescription, wszComputerName, &p, &cbDescription, 0); + StringCbCopyExW(p, cbDescription, pPrinter->pwszPrinterName, &p, &cbDescription, 0); + StringCbCopyExW(p, cbDescription, wszComma, &p, &cbDescription, 0); + StringCbCopyExW(p, cbDescription, pPrinter->pwszPrinterDriver, &p, &cbDescription, 0); + StringCbCopyExW(p, cbDescription, wszComma, &p, &cbDescription, 0); + StringCbCopyExW(p, cbDescription, pPrinter->pwszLocation, &p, &cbDescription, 0); + // Finally copy the structure and advance to the next one in the output buffer. - CopyMemory(pPrinterInfo, &PrinterInfo1, sizeof(PRINTER_INFO_1W)); + pPrinterStrings = PackStrings(pwszStrings, pPrinterInfo, dwPrinterInfo1Offsets, pPrinterStrings); pPrinterInfo += sizeof(PRINTER_INFO_1W); + + // Free the memory for temporary strings. + DllFreeSplMem(pwszStrings[0]); + DllFreeSplMem(pwszStrings[2]); } *pcReturned = i; @@ -452,6 +510,24 @@ Cleanup: return dwErrorCode; +} + +static DWORD +_LocalEnumPrintersLevel2(DWORD Flags, PCWSTR Name, PBYTE pPrinterEnum, DWORD cbBuf, PDWORD pcbNeeded, PDWORD pcReturned) +{ + return ERROR_INVALID_LEVEL; +} + +static DWORD +_LocalEnumPrintersLevel4(DWORD Flags, PCWSTR Name, PBYTE pPrinterEnum, DWORD cbBuf, PDWORD pcbNeeded, PDWORD pcReturned) +{ + return ERROR_INVALID_LEVEL; +} + +static DWORD +_LocalEnumPrintersLevel5(DWORD Flags, PCWSTR Name, PBYTE pPrinterEnum, DWORD cbBuf, PDWORD pcbNeeded, PDWORD pcReturned) +{ + return ERROR_INVALID_LEVEL; } BOOL WINAPI @@ -465,24 +541,47 @@ *pcbNeeded = 0; *pcReturned = 0; - // Think positive :) - // Treat it as success if the caller queried no information and we don't need to return any. - dwErrorCode = ERROR_SUCCESS; - - if (Flags & PRINTER_ENUM_LOCAL) - { - // The function behaves quite differently for each level. - if (Level == 1) - { - dwErrorCode = _LocalEnumPrintersLevel1(Flags, Name, pPrinterEnum, cbBuf, pcbNeeded, pcReturned); - } - else - { - // TODO: Handle other levels. - // The caller supplied an invalid level. - dwErrorCode = ERROR_INVALID_LEVEL; - goto Cleanup; - } + if (Flags & PRINTER_ENUM_CONNECTIONS || Flags & PRINTER_ENUM_REMOTE || Flags & PRINTER_ENUM_NETWORK) + { + // If the flags for the Network Print Provider are given, bail out with ERROR_INVALID_NAME. + // This is the internal way for a Print Provider to signal that it doesn't handle this request. + dwErrorCode = ERROR_INVALID_NAME; + goto Cleanup; + } + + if (!(Flags & PRINTER_ENUM_LOCAL || Flags & PRINTER_ENUM_NAME)) + { + // The Local Print Provider is the right destination for the request, but without any of these flags, + // there is no information that can be returned. + // So just signal a successful request. + dwErrorCode = ERROR_SUCCESS; + goto Cleanup; + } + + if (Level == 0) + { + dwErrorCode = _LocalEnumPrintersLevel0(Flags, Name, pPrinterEnum, cbBuf, pcbNeeded, pcReturned); + } + else if (Level == 1) + { + dwErrorCode = _LocalEnumPrintersLevel1(Flags, Name, pPrinterEnum, cbBuf, pcbNeeded, pcReturned); + } + else if (Level == 2) + { + dwErrorCode = _LocalEnumPrintersLevel2(Flags, Name, pPrinterEnum, cbBuf, pcbNeeded, pcReturned); + } + else if (Level == 4) + { + dwErrorCode = _LocalEnumPrintersLevel4(Flags, Name, pPrinterEnum, cbBuf, pcbNeeded, pcReturned); + } + else if (Level == 5) + { + dwErrorCode = _LocalEnumPrintersLevel5(Flags, Name, pPrinterEnum, cbBuf, pcbNeeded, pcReturned); + } + else + { + // The caller supplied an invalid level. + dwErrorCode = ERROR_INVALID_LEVEL; } Cleanup: Modified: trunk/reactos/win32ss/printing/providers/localspl/printprocessors.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/printing/providers… ============================================================================== --- trunk/reactos/win32ss/printing/providers/localspl/printprocessors.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/printing/providers/localspl/printprocessors.c [iso-8859-1] Sun Apr 16 14:12:01 2017 @@ -160,10 +160,7 @@ // Open the environment registry key. dwErrorCode = _OpenEnvironment(wszCurrentEnvironment, &hKey); if (dwErrorCode != ERROR_SUCCESS) - { - ERR("_OpenEnvironment failed with error %lu!\n", dwErrorCode); - goto Cleanup; - } + goto Cleanup; // Open the "Print Processors" subkey. dwErrorCode = (DWORD)RegOpenKeyExW(hKey, L"Print Processors", 0, KEY_READ, &hSubKey); @@ -494,10 +491,7 @@ // We use the registry and not the PrintProcessorList here, because the caller may request information about a different environment. dwErrorCode = _OpenEnvironment(pEnvironment, &hKey); if (dwErrorCode != ERROR_SUCCESS) - { - ERR("_OpenEnvironment failed with error %lu!\n", dwErrorCode); - goto Cleanup; - } + goto Cleanup; // Open the "Print Processors" subkey. dwErrorCode = (DWORD)RegOpenKeyExW(hKey, L"Print Processors", 0, KEY_READ, &hSubKey); Modified: trunk/rostests/apitests/localspl/dll/fpEnumPrinters.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/localspl/dll/fpE… ============================================================================== --- trunk/rostests/apitests/localspl/dll/fpEnumPrinters.c [iso-8859-1] (original) +++ trunk/rostests/apitests/localspl/dll/fpEnumPrinters.c [iso-8859-1] Sun Apr 16 14:12:01 2017 @@ -2,7 +2,7 @@ * PROJECT: ReactOS Local Spooler API Tests Injected DLL * LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation * PURPOSE: Tests for fpEnumPrinters - * COPYRIGHT: Copyright 2015 Colin Finck <colin(a)reactos.org> + * COPYRIGHT: Copyright 2015-2017 Colin Finck <colin(a)reactos.org> */ #include <apitest.h> @@ -22,6 +22,8 @@ START_TEST(fpEnumPrinters) { + BYTE TempBuffer[50]; + BYTE ZeroBuffer[50]; DWORD cbNeeded; DWORD cbTemp; DWORD dwReturned; @@ -33,18 +35,30 @@ if (!GetLocalsplFuncs(&pp)) return; + // Verify that fpEnumPrinters returns success and zeros cbNeeded and dwReturned (but not TempBuffer!) if no flag has been specified. + memset(TempBuffer, 0xDE, sizeof(TempBuffer)); + memset(ZeroBuffer, 0, sizeof(ZeroBuffer)); + cbNeeded = 0xDEADBEEF; + dwReturned = 0xDEADBEEF; + SetLastError(0xDEADBEEF); + ok(pp.fpEnumPrinters(0, NULL, 1, TempBuffer, sizeof(TempBuffer), &cbNeeded, &dwReturned), "fpEnumPrinters returns FALSE\n"); + ok(GetLastError() == ERROR_SUCCESS, "fpEnumPrinters returns error %lu!\n", GetLastError()); + ok(memcmp(TempBuffer, ZeroBuffer, sizeof(TempBuffer)) != 0, "TempBuffer has been zeroed!\n"); + ok(cbNeeded == 0, "cbNeeded is %lu!\n", cbNeeded); + ok(dwReturned == 0, "dwReturned is %lu!\n", dwReturned); + // Verify that localspl only returns information about a single print provider (namely itself). cbNeeded = 0xDEADBEEF; dwReturned = 0xDEADBEEF; SetLastError(0xDEADBEEF); - ok(!pp.fpEnumPrinters(PRINTER_ENUM_LOCAL | PRINTER_ENUM_NAME, NULL, 1, NULL, 0, &cbNeeded, &dwReturned), "fpEnumPrinters returns TRUE\n"); + ok(!pp.fpEnumPrinters(PRINTER_ENUM_NAME, NULL, 1, NULL, 0, &cbNeeded, &dwReturned), "fpEnumPrinters returns TRUE\n"); ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "fpEnumPrinters returns error %lu!\n", GetLastError()); ok(cbNeeded > 0, "cbNeeded is 0!\n"); ok(dwReturned == 0, "dwReturned is %lu!\n", dwReturned); SetLastError(0xDEADBEEF); pPrinterInfo1 = HeapAlloc(GetProcessHeap(), 0, cbNeeded); - ok(pp.fpEnumPrinters(PRINTER_ENUM_LOCAL | PRINTER_ENUM_NAME, NULL, 1, (PBYTE)pPrinterInfo1, cbNeeded, &cbNeeded, &dwReturned), "fpEnumPrinters returns FALSE\n"); + ok(pp.fpEnumPrinters(PRINTER_ENUM_NAME, NULL, 1, (PBYTE)pPrinterInfo1, cbNeeded, &cbNeeded, &dwReturned), "fpEnumPrinters returns FALSE\n"); ok(GetLastError() == ERROR_SUCCESS, "fpEnumPrinters returns error %lu!\n", GetLastError()); ok(cbNeeded > 0, "cbNeeded is 0!\n"); ok(dwReturned == 1, "dwReturned is %lu!\n", dwReturned); Modified: trunk/rostests/apitests/winspool/EnumPrinters.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/winspool/EnumPri… ============================================================================== --- trunk/rostests/apitests/winspool/EnumPrinters.c [iso-8859-1] (original) +++ trunk/rostests/apitests/winspool/EnumPrinters.c [iso-8859-1] Sun Apr 16 14:12:01 2017 @@ -2,7 +2,7 @@ * PROJECT: ReactOS Print Spooler DLL API Tests * LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation * PURPOSE: Tests for EnumPrintersA/EnumPrintersW - * COPYRIGHT: Copyright 2015 Colin Finck <colin(a)reactos.org> + * COPYRIGHT: Copyright 2015-2017 Colin Finck <colin(a)reactos.org> */ #include <apitest.h> @@ -15,12 +15,25 @@ START_TEST(EnumPrinters) { + BYTE TempBuffer[50]; + BYTE ZeroBuffer[50] = { 0 }; DWORD cbNeeded; DWORD cbTemp; DWORD dwReturned; PVOID pMem; DWORD i; DWORD dwValidLevels[] = { 0, 1, 2, 4, 5 }; + + // Verify that EnumPrintersW returns success and zeroes all input variables even though no flag has been specified. + memset(TempBuffer, 0xDE, sizeof(TempBuffer)); + cbNeeded = 0xDEADBEEF; + dwReturned = 0xDEADBEEF; + SetLastError(0xDEADBEEF); + ok(EnumPrintersW(0, NULL, 1, TempBuffer, sizeof(TempBuffer), &cbNeeded, &dwReturned), "EnumPrintersW returns FALSE\n"); + ok(GetLastError() == ERROR_SUCCESS, "EnumPrintersW returns error %lu!\n", GetLastError()); + ok(memcmp(TempBuffer, ZeroBuffer, sizeof(TempBuffer)) == 0, "TempBuffer has not been zeroed!\n"); + ok(cbNeeded == 0, "cbNeeded is %lu!\n", cbNeeded); + ok(dwReturned == 0, "dwReturned is %lu!\n", dwReturned); // Level 5 is the highest supported under Windows Server 2003. Higher levels need to fail and leave the variables untouched! cbNeeded = 0xDEADBEEF; @@ -69,7 +82,7 @@ ok(cbNeeded > 0, "cbNeeded is 0 for Level %lu!\n", dwValidLevels[i]); ok(dwReturned == 0, "dwReturned is %lu for Level %lu!\n", dwReturned, dwValidLevels[i]); - // Same error has to occur with a size to small. + // Same error has to occur with no buffer, but a size < 4 (AlignRpcPtr comes into play here). SetLastError(0xDEADBEEF); ok(!EnumPrintersW(PRINTER_ENUM_LOCAL, NULL, dwValidLevels[i], NULL, 1, &cbNeeded, &dwReturned), "EnumPrintersW returns TRUE for Level %lu!\n", dwValidLevels[i]); ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "EnumPrintersW returns error %lu for Level %lu!\n", GetLastError(), dwValidLevels[i]);

7 years, 8 months

[cfinck] 74323: [SPOOLSS] Add ASSERTs, improve documentation and the variety of tests for AlignRpcPtr/UndoAlignRpcPtr. Based on comments by Serge Gautherie.

by cfinck＠svn.reactos.org

Author: cfinck Date: Sun Apr 16 10:36:16 2017 New Revision: 74323 URL: http://svn.reactos.org/svn/reactos?rev=74323&view=rev Log: [SPOOLSS] Add ASSERTs, improve documentation and the variety of tests for AlignRpcPtr/UndoAlignRpcPtr. Based on comments by Serge Gautherie. Modified: trunk/reactos/win32ss/printing/base/spoolss/memory.c trunk/rostests/apitests/spoolss/AlignRpcPtr.c Modified: trunk/reactos/win32ss/printing/base/spoolss/memory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/printing/base/spoo… ============================================================================== --- trunk/reactos/win32ss/printing/base/spoolss/memory.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/printing/base/spoolss/memory.c [iso-8859-1] Sun Apr 16 10:36:16 2017 @@ -28,6 +28,8 @@ PVOID WINAPI AlignRpcPtr(PVOID pBuffer, PDWORD pcbBuffer) { + ASSERT(pcbBuffer); + // Align down the buffer size in pcbBuffer to a 4-byte boundary. *pcbBuffer -= *pcbBuffer % sizeof(DWORD); @@ -209,7 +211,7 @@ * The original unaligned buffer, which you input as pBuffer to AlignRpcPtr. * The data from pSourceBuffer is copied into this buffer before pSourceBuffer is freed. * If AlignRpcPtr did not allocate a buffer, pDestinationBuffer equals pSourceBuffer and no memory is copied or freed. - * This parameter may be NULL if pSourceBuffer is NULL. + * This parameter may be NULL if pSourceBuffer is NULL or cbBuffer is 0. * * @param pSourceBuffer * The aligned buffer, which is returned by AlignRpcPtr. @@ -233,6 +235,9 @@ PDWORD WINAPI UndoAlignRpcPtr(PVOID pDestinationBuffer, PVOID pSourceBuffer, DWORD cbBuffer, PDWORD pcbNeeded) { + // pDestinationBuffer is accessed unless pSourceBuffer equals pDestinationBuffer or cbBuffer is 0. + ASSERT(pDestinationBuffer || pSourceBuffer == pDestinationBuffer || cbBuffer == 0); + // If pSourceBuffer is given, and source and destination pointers don't match, // we assume that pSourceBuffer is the buffer allocated by AlignRpcPtr. if (pSourceBuffer && pSourceBuffer != pDestinationBuffer) Modified: trunk/rostests/apitests/spoolss/AlignRpcPtr.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/spoolss/AlignRpc… ============================================================================== --- trunk/rostests/apitests/spoolss/AlignRpcPtr.c [iso-8859-1] (original) +++ trunk/rostests/apitests/spoolss/AlignRpcPtr.c [iso-8859-1] Sun Apr 16 10:36:16 2017 @@ -54,13 +54,18 @@ ok(pOutputBuffer != pInputBuffer, "pOutputBuffer == pInputBuffer\n"); ok(cbBuffer == 4, "cbBuffer is %lu\n", cbBuffer); + // Prove that AlignRpcPtr also works with a NULL buffer. The size should be aligned down. + cbBuffer = 6; + ok(!AlignRpcPtr(NULL, &cbBuffer), "AlignRpcPtr returns something\n"); + ok(cbBuffer == 4, "cbBuffer is %lu\n", cbBuffer); + // We can also test all parameters of UndoAlignRpcPtr here. // Because pOutputBuffer != pInputBuffer, it copies the given 4 bytes from (aligned) pOutputBuffer to (unaligned) pInputBuffer // while aligning up the given 7 bytes in our passed &cbBuffer. // &cbBuffer is also returned. strcpy(pOutputBuffer, "abc"); strcpy(pInputBuffer, "XXXXXXXXX"); - cbBuffer = 7; + cbBuffer = 5; pcbBuffer = UndoAlignRpcPtr(pInputBuffer, pOutputBuffer, 4, &cbBuffer); ok(strcmp(pInputBuffer, "abc") == 0, "pInputBuffer is %s\n", pInputBuffer); ok(pcbBuffer == &cbBuffer, "pcbBuffer != &cbBuffer\n"); @@ -68,14 +73,14 @@ // Prove that UndoAlignRpcPtr works without any parameters and doesn't try to copy data from NULL pointers. ok(!UndoAlignRpcPtr(NULL, NULL, 0, NULL), "UndoAlignRpcPtr returns something\n"); - ok(!UndoAlignRpcPtr(NULL, NULL, 4, NULL), "UndoAlignRpcPtr returns something\n"); + ok(!UndoAlignRpcPtr(NULL, NULL, 6, NULL), "UndoAlignRpcPtr returns something\n"); // Prove that UndoAlignRpcPtr doesn't access source and destination memory at all when they are equal. // If it did, it should crash here, because I'm giving invalid memory addresses. ok(!UndoAlignRpcPtr((PVOID)1, (PVOID)1, 4, NULL), "UndoAlignRpcPtr returns something\n"); - // Prove that the pcbNeeded parameter of UndoAlignRpcPtr works independently and aligns up everything up to a DWORD. - cbBuffer = 0xFFFFFFFF; + // Prove that the pcbNeeded parameter of UndoAlignRpcPtr works independently and aligns up to a DWORD. + cbBuffer = 0xFFFFFFFD; pcbBuffer = UndoAlignRpcPtr(NULL, NULL, 0, &cbBuffer); ok(pcbBuffer == &cbBuffer, "pcbBuffer != &cbBuffer\n"); ok(cbBuffer == 0, "cbBuffer is %lu\n", cbBuffer);

7 years, 8 months

[tfaber] 74322: [NTOS:CC] - Rename ROS_SHARED_CACHE_MAP::RefCount to OpenCount. One step closer to the real SHARED_CACHE_MAP. CORE-8065

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Apr 16 08:50:20 2017 New Revision: 74322 URL: http://svn.reactos.org/svn/reactos?rev=74322&view=rev Log: [NTOS:CC] - Rename ROS_SHARED_CACHE_MAP::RefCount to OpenCount. One step closer to the real SHARED_CACHE_MAP. CORE-8065 Modified: trunk/reactos/ntoskrnl/cc/view.c trunk/reactos/ntoskrnl/include/internal/cc.h Modified: trunk/reactos/ntoskrnl/cc/view.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/view.c?rev=743… ============================================================================== --- trunk/reactos/ntoskrnl/cc/view.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cc/view.c [iso-8859-1] Sun Apr 16 08:50:20 2017 @@ -982,14 +982,14 @@ ASSERT(SharedCacheMap); - SharedCacheMap->RefCount++; + SharedCacheMap->OpenCount++; KeReleaseGuardedMutex(&ViewLock); CcFlushCache(FileObject->SectionObjectPointer, NULL, 0, NULL); KeAcquireGuardedMutex(&ViewLock); - SharedCacheMap->RefCount--; - if (SharedCacheMap->RefCount == 0) + SharedCacheMap->OpenCount--; + if (SharedCacheMap->OpenCount == 0) { FileObject->SectionObjectPointer->SharedCacheMap = NULL; @@ -1040,8 +1040,8 @@ KeAcquireGuardedMutex(&ViewLock); SharedCacheMap = FileObject->SectionObjectPointer->SharedCacheMap; ASSERT(SharedCacheMap); - ASSERT(SharedCacheMap->RefCount != 0); - SharedCacheMap->RefCount++; + ASSERT(SharedCacheMap->OpenCount != 0); + SharedCacheMap->OpenCount++; KeReleaseGuardedMutex(&ViewLock); } @@ -1054,7 +1054,7 @@ DPRINT("CcRosRemoveIfClosed()\n"); KeAcquireGuardedMutex(&ViewLock); SharedCacheMap = SectionObjectPointer->SharedCacheMap; - if (SharedCacheMap && SharedCacheMap->RefCount == 0) + if (SharedCacheMap && SharedCacheMap->OpenCount == 0) { CcRosDeleteFileCache(SharedCacheMap->FileObject, SharedCacheMap); } @@ -1071,10 +1071,10 @@ KeAcquireGuardedMutex(&ViewLock); SharedCacheMap = FileObject->SectionObjectPointer->SharedCacheMap; ASSERT(SharedCacheMap); - if (SharedCacheMap->RefCount > 0) - { - SharedCacheMap->RefCount--; - if (SharedCacheMap->RefCount == 0) + if (SharedCacheMap->OpenCount > 0) + { + SharedCacheMap->OpenCount--; + if (SharedCacheMap->OpenCount == 0) { MmFreeSectionSegments(SharedCacheMap->FileObject); CcRosDeleteFileCache(FileObject, SharedCacheMap); @@ -1102,10 +1102,10 @@ if (FileObject->PrivateCacheMap != NULL) { FileObject->PrivateCacheMap = NULL; - if (SharedCacheMap->RefCount > 0) + if (SharedCacheMap->OpenCount > 0) { - SharedCacheMap->RefCount--; - if (SharedCacheMap->RefCount == 0) + SharedCacheMap->OpenCount--; + if (SharedCacheMap->OpenCount == 0) { MmFreeSectionSegments(SharedCacheMap->FileObject); CcRosDeleteFileCache(FileObject, SharedCacheMap); @@ -1138,7 +1138,7 @@ if (FileObject->PrivateCacheMap == NULL) { FileObject->PrivateCacheMap = SharedCacheMap; - SharedCacheMap->RefCount++; + SharedCacheMap->OpenCount++; } Status = STATUS_SUCCESS; } @@ -1193,7 +1193,7 @@ if (FileObject->PrivateCacheMap == NULL) { FileObject->PrivateCacheMap = SharedCacheMap; - SharedCacheMap->RefCount++; + SharedCacheMap->OpenCount++; } KeReleaseGuardedMutex(&ViewLock); Modified: trunk/reactos/ntoskrnl/include/internal/cc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/cc.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/cc.h [iso-8859-1] Sun Apr 16 08:50:20 2017 @@ -153,7 +153,7 @@ PCACHE_MANAGER_CALLBACKS Callbacks; PVOID LazyWriteContext; KSPIN_LOCK CacheMapLock; - ULONG RefCount; + ULONG OpenCount; #if DBG BOOLEAN Trace; /* enable extra trace output for this cache map and it's VACBs */ #endif

7 years, 8 months

[tthompson] 74321: [NTFS] Add support for creating new MFT entries: +AddStandardInformation(), +AddData(), +AddFileName() - Add attributes to a file record +NtfsCreateFileRecord() - Creates a new f...

by tthompson＠svn.reactos.org

Author: tthompson Date: Sun Apr 16 00:17:07 2017 New Revision: 74321 URL: http://svn.reactos.org/svn/reactos?rev=74321&view=rev Log: [NTFS] Add support for creating new MFT entries: +AddStandardInformation(), +AddData(), +AddFileName() - Add attributes to a file record +NtfsCreateFileRecord() - Creates a new file record and saves it to the MFT. +AddNewMftEntry() - Adds a file record to the MFT. NtfsCreateFile() - Modified to create a file record on a file-creation request (file creation is still unsupported; the created file needs to be added to the parent's directory index). +SetFileRecordEnd() - Establishes a new file record size UpdateFileRecord() - Improved documentation InternalSetResidentAttributeLength() - Updated to use SetFileRecordEnd(). Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/attrib.c branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/create.c branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/mft.c branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/ntfs.h Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/attrib.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/drivers/filesyst… ============================================================================== --- branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/attrib.c [iso-8859-1] (original) +++ branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/attrib.c [iso-8859-1] Sun Apr 16 00:17:07 2017 @@ -36,6 +36,185 @@ /* FUNCTIONS ****************************************************************/ /** +* @name AddData +* @implemented +* +* Adds a $DATA attribute to a given FileRecord. +* +* @param FileRecord +* Pointer to a complete file record to add the attribute to. Caller is responsible for +* ensuring FileRecord is large enough to contain $DATA. +* +* @param AttributeAddress +* Pointer to the region of memory that will receive the $DATA attribute. +* This address must reside within FileRecord. Must be aligned to an 8-byte boundary (relative to FileRecord). +* +* @return +* STATUS_SUCCESS on success. STATUS_NOT_IMPLEMENTED if target address isn't at the end +* of the given file record. +* +* @remarks +* Only adding the attribute to the end of the file record is supported; AttributeAddress must +* be of type AttributeEnd. +* As it's implemented, this function is only intended to assist in creating new file records. It +* could be made more general-purpose by considering file records with an $ATTRIBUTE_LIST. +* It's the caller's responsibility to ensure the given file record has enough memory allocated +* for the attribute. +*/ +NTSTATUS +AddData(PFILE_RECORD_HEADER FileRecord, + PNTFS_ATTR_RECORD AttributeAddress) +{ + ULONG ResidentHeaderLength = FIELD_OFFSET(NTFS_ATTR_RECORD, Resident.Reserved) + sizeof(UCHAR); + ULONG FileRecordEnd = AttributeAddress->Length; + + if (AttributeAddress->Type != AttributeEnd) + { + DPRINT1("FIXME: Can only add $DATA attribute to the end of a file record.\n"); + return STATUS_NOT_IMPLEMENTED; + } + + AttributeAddress->Type = AttributeData; + AttributeAddress->Length = ResidentHeaderLength; + AttributeAddress->Length = ALIGN_UP_BY(AttributeAddress->Length, 8); + AttributeAddress->Resident.ValueLength = 0; + AttributeAddress->Resident.ValueOffset = ResidentHeaderLength; + + // for unnamed $DATA attributes, NameOffset equals header length + AttributeAddress->NameOffset = ResidentHeaderLength; + AttributeAddress->Instance = FileRecord->NextAttributeNumber++; + + // move the attribute-end and file-record-end markers to the end of the file record + AttributeAddress = (PNTFS_ATTR_RECORD)((ULONG_PTR)AttributeAddress + AttributeAddress->Length); + SetFileRecordEnd(FileRecord, AttributeAddress, FileRecordEnd); + + return STATUS_SUCCESS; +} + +/** +* @name AddFileName +* @implemented +* +* Adds a $FILE_NAME attribute to a given FileRecord. +* +* @param FileRecord +* Pointer to a complete file record to add the attribute to. Caller is responsible for +* ensuring FileRecord is large enough to contain $FILE_NAME. +* +* @param AttributeAddress +* Pointer to the region of memory that will receive the $FILE_NAME attribute. +* This address must reside within FileRecord. Must be aligned to an 8-byte boundary (relative to FileRecord). +* +* @param DeviceExt +* Points to the target disk's DEVICE_EXTENSION. +* +* @param FileObject +* Pointer to the FILE_OBJECT which represents the new name. +* This parameter is used to determine the filename and parent directory. +* +* @return +* STATUS_SUCCESS on success. STATUS_NOT_IMPLEMENTED if target address isn't at the end +* of the given file record. +* +* @remarks +* Only adding the attribute to the end of the file record is supported; AttributeAddress must +* be of type AttributeEnd. +* As it's implemented, this function is only intended to assist in creating new file records. It +* could be made more general-purpose by considering file records with an $ATTRIBUTE_LIST. +* It's the caller's responsibility to ensure the given file record has enough memory allocated +* for the attribute. +*/ +NTSTATUS +AddFileName(PFILE_RECORD_HEADER FileRecord, + PNTFS_ATTR_RECORD AttributeAddress, + PDEVICE_EXTENSION DeviceExt, + PFILE_OBJECT FileObject) +{ + ULONG ResidentHeaderLength = FIELD_OFFSET(NTFS_ATTR_RECORD, Resident.Reserved) + sizeof(UCHAR); + PFILENAME_ATTRIBUTE FileNameAttribute; + LARGE_INTEGER SystemTime; + ULONG FileRecordEnd = AttributeAddress->Length; + ULONGLONG CurrentMFTIndex = NTFS_FILE_ROOT; + UNICODE_STRING Current, Remaining; + NTSTATUS Status = STATUS_SUCCESS; + ULONG FirstEntry = 0; + + if (AttributeAddress->Type != AttributeEnd) + { + DPRINT1("FIXME: Can only add $FILE_NAME attribute to the end of a file record.\n"); + return STATUS_NOT_IMPLEMENTED; + } + + AttributeAddress->Type = AttributeFileName; + AttributeAddress->Instance = FileRecord->NextAttributeNumber++; + + FileNameAttribute = (PFILENAME_ATTRIBUTE)((LONG_PTR)AttributeAddress + ResidentHeaderLength); + + // set timestamps + KeQuerySystemTime(&SystemTime); + FileNameAttribute->CreationTime = SystemTime.QuadPart; + FileNameAttribute->ChangeTime = SystemTime.QuadPart; + FileNameAttribute->LastWriteTime = SystemTime.QuadPart; + FileNameAttribute->LastAccessTime = SystemTime.QuadPart; + + FileNameAttribute->FileAttributes = NTFS_FILE_TYPE_ARCHIVE; + + // we need to extract the filename from the path + DPRINT1("Pathname: %wZ\n", &FileObject->FileName); + + FsRtlDissectName(FileObject->FileName, &Current, &Remaining); + + while (Current.Length != 0) + { + DPRINT1("Current: %wZ\n", &Current); + + Status = NtfsFindMftRecord(DeviceExt, CurrentMFTIndex, &Current, &FirstEntry, FALSE, &CurrentMFTIndex); + if (!NT_SUCCESS(Status)) + { + break; + } + + if (Remaining.Length == 0) + break; + + FsRtlDissectName(Current, &Current, &Remaining); + } + + DPRINT1("MFT Index of parent: %I64u\n", CurrentMFTIndex); + + // set reference to parent directory + FileNameAttribute->DirectoryFileReferenceNumber = CurrentMFTIndex; + + // The highest 2 bytes should be the sequence number, unless the parent happens to be root + if (CurrentMFTIndex == NTFS_FILE_ROOT) + FileNameAttribute->DirectoryFileReferenceNumber |= (ULONGLONG)NTFS_FILE_ROOT << 48; + else + FileNameAttribute->DirectoryFileReferenceNumber |= (ULONGLONG)FileRecord->SequenceNumber << 48; + + DPRINT1("FileNameAttribute->DirectoryFileReferenceNumber: 0x%I64x\n", FileNameAttribute->DirectoryFileReferenceNumber); + + FileNameAttribute->NameLength = Current.Length / 2; + // TODO: Get proper nametype, add DOS links as needed + FileNameAttribute->NameType = NTFS_FILE_NAME_WIN32_AND_DOS; + RtlCopyMemory(FileNameAttribute->Name, Current.Buffer, Current.Length); + FileRecord->LinkCount++; + + AttributeAddress->Length = ResidentHeaderLength + + FIELD_OFFSET(FILENAME_ATTRIBUTE, Name) + Current.Length; + AttributeAddress->Length = ALIGN_UP_BY(AttributeAddress->Length, 8); + + AttributeAddress->Resident.ValueLength = FIELD_OFFSET(FILENAME_ATTRIBUTE, Name) + Current.Length; + AttributeAddress->Resident.ValueOffset = ResidentHeaderLength; + AttributeAddress->Resident.Flags = 1; // indexed + + // move the attribute-end and file-record-end markers to the end of the file record + AttributeAddress = (PNTFS_ATTR_RECORD)((ULONG_PTR)AttributeAddress + AttributeAddress->Length); + SetFileRecordEnd(FileRecord, AttributeAddress, FileRecordEnd); + + return Status; +} + +/** * @name AddRun * @implemented * @@ -190,6 +369,69 @@ NtfsDumpDataRuns((PUCHAR)((ULONG_PTR)DestinationAttribute + DestinationAttribute->NonResident.MappingPairsOffset), 0); return Status; +} + +/** +* @name AddStandardInformation +* @implemented +* +* Adds a $STANDARD_INFORMATION attribute to a given FileRecord. +* +* @param FileRecord +* Pointer to a complete file record to add the attribute to. Caller is responsible for +* ensuring FileRecord is large enough to contain $STANDARD_INFORMATION. +* +* @param AttributeAddress +* Pointer to the region of memory that will receive the $STANDARD_INFORMATION attribute. +* This address must reside within FileRecord. Must be aligned to an 8-byte boundary (relative to FileRecord). +* +* @return +* STATUS_SUCCESS on success. STATUS_NOT_IMPLEMENTED if target address isn't at the end +* of the given file record. +* +* @remarks +* Only adding the attribute to the end of the file record is supported; AttributeAddress must +* be of type AttributeEnd. +* As it's implemented, this function is only intended to assist in creating new file records. It +* could be made more general-purpose by considering file records with an $ATTRIBUTE_LIST. +* It's the caller's responsibility to ensure the given file record has enough memory allocated +* for the attribute. +*/ +NTSTATUS +AddStandardInformation(PFILE_RECORD_HEADER FileRecord, + PNTFS_ATTR_RECORD AttributeAddress) +{ + ULONG ResidentHeaderLength = FIELD_OFFSET(NTFS_ATTR_RECORD, Resident.Reserved) + sizeof(UCHAR); + PSTANDARD_INFORMATION StandardInfo = (PSTANDARD_INFORMATION)((LONG_PTR)AttributeAddress + ResidentHeaderLength); + LARGE_INTEGER SystemTime; + ULONG FileRecordEnd = AttributeAddress->Length; + + if (AttributeAddress->Type != AttributeEnd) + { + DPRINT1("FIXME: Can only add $STANDARD_INFORMATION attribute to the end of a file record.\n"); + return STATUS_NOT_IMPLEMENTED; + } + + AttributeAddress->Type = AttributeStandardInformation; + AttributeAddress->Length = sizeof(STANDARD_INFORMATION) + ResidentHeaderLength; + AttributeAddress->Length = ALIGN_UP_BY(AttributeAddress->Length, 8); + AttributeAddress->Resident.ValueLength = sizeof(STANDARD_INFORMATION); + AttributeAddress->Resident.ValueOffset = ResidentHeaderLength; + AttributeAddress->Instance = FileRecord->NextAttributeNumber++; + + // set dates and times + KeQuerySystemTime(&SystemTime); + StandardInfo->CreationTime = SystemTime.QuadPart; + StandardInfo->ChangeTime = SystemTime.QuadPart; + StandardInfo->LastWriteTime = SystemTime.QuadPart; + StandardInfo->LastAccessTime = SystemTime.QuadPart; + StandardInfo->FileAttribute = NTFS_FILE_TYPE_ARCHIVE; + + // move the attribute-end and file-record-end markers to the end of the file record + AttributeAddress = (PNTFS_ATTR_RECORD)((ULONG_PTR)AttributeAddress + AttributeAddress->Length); + SetFileRecordEnd(FileRecord, AttributeAddress, FileRecordEnd); + + return STATUS_SUCCESS; } /** Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/create.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/drivers/filesyst… ============================================================================== --- branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/create.c [iso-8859-1] (original) +++ branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/create.c [iso-8859-1] Sun Apr 16 00:17:07 2017 @@ -545,8 +545,15 @@ RequestedDisposition == FILE_OPEN_IF || RequestedDisposition == FILE_OVERWRITE_IF || RequestedDisposition == FILE_SUPERSEDE) - { - DPRINT1("Denying file creation request on NTFS volume\n"); + { + // Create the file record on disk + Status = NtfsCreateFileRecord(DeviceExt, FileObject); + + // Update the parent directory index + // Still TODO + + // Call NtfsOpenFile() + return STATUS_CANNOT_MAKE; } } @@ -599,4 +606,89 @@ return Status; } +/** +* @name NtfsCreateFileRecord() +* @implemented +* +* Creates a file record and saves it to the MFT. +* +* @param DeviceExt +* Points to the target disk's DEVICE_EXTENSION +* +* @param FileObject +* Pointer to a FILE_OBJECT describing the file to be created +* +* @return +* STATUS_SUCCESS on success. +* STATUS_INSUFFICIENT_RESOURCES if unable to allocate memory for the file record. +*/ +NTSTATUS +NtfsCreateFileRecord(PDEVICE_EXTENSION DeviceExt, + PFILE_OBJECT FileObject) +{ + NTSTATUS Status = STATUS_SUCCESS; + PFILE_RECORD_HEADER FileRecord; + PNTFS_ATTR_RECORD NextAttribute; + + // allocate memory for file record + FileRecord = ExAllocatePoolWithTag(NonPagedPool, + DeviceExt->NtfsInfo.BytesPerFileRecord, + TAG_NTFS); + if (!FileRecord) + { + DPRINT1("ERROR: Unable to allocate memory for file record!\n"); + return STATUS_INSUFFICIENT_RESOURCES; + } + + RtlZeroMemory(FileRecord, DeviceExt->NtfsInfo.BytesPerFileRecord); + + FileRecord->Ntfs.Type = NRH_FILE_TYPE; + + // calculate USA offset and count + FileRecord->Ntfs.UsaOffset = FIELD_OFFSET(FILE_RECORD_HEADER, MFTRecordNumber) + sizeof(ULONG); + + // size of USA (in ULONG's) will be 1 (for USA number) + 1 for every sector the file record uses + FileRecord->BytesAllocated = DeviceExt->NtfsInfo.BytesPerFileRecord; + FileRecord->Ntfs.UsaCount = (FileRecord->BytesAllocated / DeviceExt->NtfsInfo.BytesPerSector) + 1; + + // setup other file record fields + FileRecord->SequenceNumber = 1; + FileRecord->AttributeOffset = FileRecord->Ntfs.UsaOffset + (2 * FileRecord->Ntfs.UsaCount); + FileRecord->AttributeOffset = ALIGN_UP_BY(FileRecord->AttributeOffset, 8); + FileRecord->Flags = FRH_IN_USE; + FileRecord->BytesInUse = FileRecord->AttributeOffset + sizeof(ULONG) * 2; + + // find where the first attribute will be added + NextAttribute = (PNTFS_ATTR_RECORD)((ULONG_PTR)FileRecord + FileRecord->AttributeOffset); + + // mark the (temporary) end of the file-record + NextAttribute->Type = AttributeEnd; + NextAttribute->Length = FILE_RECORD_END; + + // add first attribute, $STANDARD_INFORMATION + AddStandardInformation(FileRecord, NextAttribute); + + // advance NextAttribute pointer to the next attribute + NextAttribute = (PNTFS_ATTR_RECORD)((ULONG_PTR)NextAttribute + (ULONG_PTR)NextAttribute->Length); + + // Add the $FILE_NAME attribute + AddFileName(FileRecord, NextAttribute, DeviceExt, FileObject); + + // advance NextAttribute pointer to the next attribute + NextAttribute = (PNTFS_ATTR_RECORD)((ULONG_PTR)NextAttribute + (ULONG_PTR)NextAttribute->Length); + + // add the $DATA attribute + AddData(FileRecord, NextAttribute); + + // dump file record in memory (for debugging) + NtfsDumpFileRecord(DeviceExt, FileRecord); + + // Now that we've built the file record in memory, we need to store it in the MFT. + Status = AddNewMftEntry(FileRecord, DeviceExt); + + ExFreePoolWithTag(FileRecord, TAG_NTFS); + + return Status; +} + /* EOF */ Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/mft.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/drivers/filesyst… ============================================================================== --- branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/mft.c [iso-8859-1] (original) +++ branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/mft.c [iso-8859-1] Sun Apr 16 00:17:07 2017 @@ -172,7 +172,7 @@ return AttrRecord->Resident.ValueLength; } -void +VOID InternalSetResidentAttributeLength(PNTFS_ATTR_CONTEXT AttrContext, PFILE_RECORD_HEADER FileRecord, ULONG AttrOffset, @@ -201,14 +201,9 @@ Destination->Length += Padding; } - // advance Destination to the final "attribute" and write the end type + // advance Destination to the final "attribute" and set the file record end Destination = (PNTFS_ATTR_RECORD)((ULONG_PTR)Destination + Destination->Length); - Destination->Type = AttributeEnd; - - // write the final marker (which shares the same offset and type as the Length field) - Destination->Length = FILE_RECORD_END; - - FileRecord->BytesInUse = NextAttributeOffset + (sizeof(ULONG) * 2); + SetFileRecordEnd(FileRecord, Destination, FILE_RECORD_END); } /** @@ -359,6 +354,41 @@ return STATUS_SUCCESS; } +/** +* @name SetFileRecordEnd +* @implemented +* +* This small function sets a new endpoint for the file record. It set's the final +* AttrEnd->Type to AttributeEnd and recalculates the bytes used by the file record. +* +* @param FileRecord +* Pointer to the file record whose endpoint (length) will be set. +* +* @param AttrEnd +* Pointer to section of memory that will receive the AttributeEnd marker. This must point +* to memory allocated for the FileRecord. Must be aligned to an 8-byte boundary (relative to FileRecord). +* +* @param EndMarker +* This value will be written after AttributeEnd but isn't critical at all. When Windows resizes +* a file record, it preserves the final ULONG that previously ended the record, even though this +* value is (to my knowledge) never used. We emulate this behavior. +* +*/ +VOID +SetFileRecordEnd(PFILE_RECORD_HEADER FileRecord, + PNTFS_ATTR_RECORD AttrEnd, + ULONG EndMarker) +{ + // mark the end of attributes + AttrEnd->Type = AttributeEnd; + + // Restore the "file-record-end marker." The value is never checked but this behavior is consistent with Win2k3. + AttrEnd->Length = EndMarker; + + // recalculate bytes in use + FileRecord->BytesInUse = (ULONG_PTR)AttrEnd - (ULONG_PTR)FileRecord + sizeof(ULONG) * 2; +} + ULONG ReadAttribute(PDEVICE_EXTENSION Vcb, PNTFS_ATTR_CONTEXT Context, @@ -711,7 +741,9 @@ { // We reached the last assigned cluster // TODO: assign new clusters to the end of the file. - // (Presently, this code will never be reached, the write should have already failed by now) + // (Presently, this code will rarely be reached, the write will usually have already failed by now) + // [We can reach here by creating a new file record when the MFT isn't large enough] + DPRINT1("FIXME: Master File Table needs to be enlarged.\n"); return STATUS_END_OF_FILE; } @@ -1070,25 +1102,39 @@ } /** -* UpdateFileRecord +* @name UpdateFileRecord * @implemented +* * Writes a file record to the master file table, at a given index. +* +* @param Vcb +* Pointer to the DEVICE_EXTENSION of the target drive being written to. +* +* @param MftIndex +* Target index in the master file table to store the file record. +* +* @param FileRecord +* Pointer to the complete file record which will be written to the master file table. +* +* @return +* STATUS_SUCCESSFUL on success. An error passed from WriteAttribute() otherwise. +* */ NTSTATUS UpdateFileRecord(PDEVICE_EXTENSION Vcb, - ULONGLONG index, - PFILE_RECORD_HEADER file) + ULONGLONG MftIndex, + PFILE_RECORD_HEADER FileRecord) { ULONG BytesWritten; NTSTATUS Status = STATUS_SUCCESS; - DPRINT("UpdateFileRecord(%p, %I64x, %p)\n", Vcb, index, file); + DPRINT("UpdateFileRecord(%p, 0x%I64x, %p)\n", Vcb, MftIndex, FileRecord); // Add the fixup array to prepare the data for writing to disk - AddFixupArray(Vcb, &file->Ntfs); + AddFixupArray(Vcb, &FileRecord->Ntfs); // write the file record to the master file table - Status = WriteAttribute(Vcb, Vcb->MFTContext, index * Vcb->NtfsInfo.BytesPerFileRecord, (const PUCHAR)file, Vcb->NtfsInfo.BytesPerFileRecord, &BytesWritten); + Status = WriteAttribute(Vcb, Vcb->MFTContext, MftIndex * Vcb->NtfsInfo.BytesPerFileRecord, (const PUCHAR)FileRecord, Vcb->NtfsInfo.BytesPerFileRecord, &BytesWritten); if (!NT_SUCCESS(Status)) { @@ -1096,7 +1142,7 @@ } // remove the fixup array (so the file record pointer can still be used) - FixupUpdateSequenceArray(Vcb, &file->Ntfs); + FixupUpdateSequenceArray(Vcb, &FileRecord->Ntfs); return Status; } @@ -1131,6 +1177,117 @@ } return STATUS_SUCCESS; +} + +/** +* @name AddNewMftEntry +* @implemented +* +* Adds a file record to the master file table of a given device. +* +* @param FileRecord +* Pointer to a complete file record which will be saved to disk. +* +* @param DeviceExt +* Pointer to the DEVICE_EXTENSION of the target drive. +* +* @return +* STATUS_SUCCESS on success. +* STATUS_OBJECT_NAME_NOT_FOUND if we can't find the MFT's $Bitmap or if we weren't able +* to read the attribute. +* STATUS_INSUFFICIENT_RESOURCES if we can't allocate enough memory for a copy of $Bitmap. +* STATUS_NOT_IMPLEMENTED if we need to increase the size of the MFT. +* +*/ +NTSTATUS +AddNewMftEntry(PFILE_RECORD_HEADER FileRecord, + PDEVICE_EXTENSION DeviceExt) +{ + NTSTATUS Status = STATUS_SUCCESS; + ULONGLONG MftIndex; + RTL_BITMAP Bitmap; + ULONGLONG BitmapDataSize; + ULONGLONG AttrBytesRead; + PVOID BitmapData; + ULONG LengthWritten; + + // First, we have to read the mft's $Bitmap attribute + PNTFS_ATTR_CONTEXT BitmapContext; + Status = FindAttribute(DeviceExt, DeviceExt->MasterFileTable, AttributeBitmap, L"", 0, &BitmapContext, NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT1("ERROR: Couldn't find $Bitmap attribute of master file table!\n"); + return Status; + } + + // allocate a buffer for the $Bitmap attribute + BitmapDataSize = AttributeDataLength(&BitmapContext->Record); + BitmapData = ExAllocatePoolWithTag(NonPagedPool, BitmapDataSize, TAG_NTFS); + if (!BitmapData) + { + ReleaseAttributeContext(BitmapContext); + return STATUS_INSUFFICIENT_RESOURCES; + } + + // read $Bitmap attribute + AttrBytesRead = ReadAttribute(DeviceExt, BitmapContext, 0, BitmapData, BitmapDataSize); + + if (AttrBytesRead == 0) + { + DPRINT1("ERROR: Unable to read $Bitmap attribute of master file table!\n"); + ExFreePoolWithTag(BitmapData, TAG_NTFS); + ReleaseAttributeContext(BitmapContext); + return STATUS_OBJECT_NAME_NOT_FOUND; + } + + // convert buffer into bitmap + RtlInitializeBitMap(&Bitmap, (PULONG)BitmapData, BitmapDataSize * 8); + + // set next available bit, preferrably after 23rd bit + MftIndex = RtlFindClearBitsAndSet(&Bitmap, 1, 24); + if ((LONG)MftIndex == -1) + { + DPRINT1("ERROR: Couldn't find free space in MFT for file record!\n"); + + ExFreePoolWithTag(BitmapData, TAG_NTFS); + ReleaseAttributeContext(BitmapContext); + + // TODO: increase mft size + return STATUS_NOT_IMPLEMENTED; + } + + DPRINT1("Creating file record at MFT index: %I64u\n", MftIndex); + + // update file record with index + FileRecord->MFTRecordNumber = MftIndex; + + // [BitmapData should have been updated via RtlFindClearBitsAndSet()] + + // write the bitmap back to the MFT's $Bitmap attribute + Status = WriteAttribute(DeviceExt, BitmapContext, 0, BitmapData, BitmapDataSize, &LengthWritten); + if (!NT_SUCCESS(Status)) + { + DPRINT1("ERROR encountered when writing $Bitmap attribute!\n"); + ExFreePoolWithTag(BitmapData, TAG_NTFS); + ReleaseAttributeContext(BitmapContext); + return Status; + } + + // update the file record (write it to disk) + Status = UpdateFileRecord(DeviceExt, MftIndex, FileRecord); + + if (!NT_SUCCESS(Status)) + { + DPRINT1("ERROR: Unable to write file record!\n"); + ExFreePoolWithTag(BitmapData, TAG_NTFS); + ReleaseAttributeContext(BitmapContext); + return Status; + } + + ExFreePoolWithTag(BitmapData, TAG_NTFS); + ReleaseAttributeContext(BitmapContext); + + return Status; } NTSTATUS Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/ntfs.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/drivers/filesyst… ============================================================================== --- branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] (original) +++ branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] Sun Apr 16 00:17:07 2017 @@ -517,12 +517,26 @@ //NtfsDumpAttribute(PATTRIBUTE Attribute); NTSTATUS +AddData(PFILE_RECORD_HEADER FileRecord, + PNTFS_ATTR_RECORD AttributeAddress); + +NTSTATUS AddRun(PNTFS_VCB Vcb, PNTFS_ATTR_CONTEXT AttrContext, ULONG AttrOffset, PFILE_RECORD_HEADER FileRecord, ULONGLONG NextAssignedCluster, ULONG RunLength); + +NTSTATUS +AddFileName(PFILE_RECORD_HEADER FileRecord, + PNTFS_ATTR_RECORD AttributeAddress, + PDEVICE_EXTENSION DeviceExt, + PFILE_OBJECT FileObject); + +NTSTATUS +AddStandardInformation(PFILE_RECORD_HEADER FileRecord, + PNTFS_ATTR_RECORD AttributeAddress); NTSTATUS ConvertDataRunsToLargeMCB(PUCHAR DataRun, @@ -647,6 +661,9 @@ NTSTATUS NtfsCreate(PNTFS_IRP_CONTEXT IrpContext); +NTSTATUS +NtfsCreateFileRecord(PDEVICE_EXTENSION DeviceExt, + PFILE_OBJECT FileObject); /* devctl.c */ @@ -786,6 +803,10 @@ /* mft.c */ +NTSTATUS +AddNewMftEntry(PFILE_RECORD_HEADER FileRecord, + PDEVICE_EXTENSION DeviceExt); + PNTFS_ATTR_CONTEXT PrepareAttributeContext(PNTFS_ATTR_RECORD AttrRecord); @@ -817,6 +838,11 @@ ULONG AttrOffset, PFILE_RECORD_HEADER FileRecord, PLARGE_INTEGER DataSize); + +VOID +SetFileRecordEnd(PFILE_RECORD_HEADER FileRecord, + PNTFS_ATTR_RECORD AttrEnd, + ULONG EndMarker); ULONGLONG AttributeAllocatedLength(PNTFS_ATTR_RECORD AttrRecord); @@ -855,8 +881,8 @@ NTSTATUS UpdateFileRecord(PDEVICE_EXTENSION Vcb, - ULONGLONG index, - PFILE_RECORD_HEADER file); + ULONGLONG MftIndex, + PFILE_RECORD_HEADER FileRecord); NTSTATUS FindAttribute(PDEVICE_EXTENSION Vcb, @@ -919,6 +945,14 @@ PULONGLONG MFTIndex, ULONGLONG CurrentMFTIndex); +NTSTATUS +NtfsFindMftRecord(PDEVICE_EXTENSION Vcb, + ULONGLONG MFTIndex, + PUNICODE_STRING FileName, + PULONG FirstEntry, + BOOLEAN DirSearch, + ULONGLONG *OutMFTIndex); + /* misc.c */ BOOLEAN

7 years, 8 months

[mjansen] 74320: Fix copypasta error, spotted by Thomas.

by mjansen＠svn.reactos.org

Author: mjansen Date: Sat Apr 15 22:18:29 2017 New Revision: 74320 URL: http://svn.reactos.org/svn/reactos?rev=74320&view=rev Log: Fix copypasta error, spotted by Thomas. Modified: trunk/reactos/win32ss/gdi/ntgdi/freetype.c Modified: trunk/reactos/win32ss/gdi/ntgdi/freetype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/freetype… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/freetype.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/freetype.c [iso-8859-1] Sat Apr 15 22:18:29 2017 @@ -75,7 +75,7 @@ ExReleaseFastMutexUnsafeAndLeaveCriticalRegion(FontListLock) #define ASSERT_GLOBALFONTS_LOCK_HELD() \ - ASSERT(FreeTypeLock->Owner == KeGetCurrentThread()) + ASSERT(FontListLock->Owner == KeGetCurrentThread()) #define IntLockFreeType \ ExEnterCriticalRegionAndAcquireFastMutexUnsafe(FreeTypeLock)

7 years, 8 months

[tfaber] 74319: [UNIATA] - Update to version 0.46e3 (and fix up the version numbers) - Un-"fix" insignificant typo corrections that only serve to make syncing harder CORE-13032 #resolve CORE-11894 ...

by tfaber＠svn.reactos.org

Author: tfaber Date: Sat Apr 15 20:24:43 2017 New Revision: 74319 URL: http://svn.reactos.org/svn/reactos?rev=74319&view=rev Log: [UNIATA] - Update to version 0.46e3 (and fix up the version numbers) - Un-"fix" insignificant typo corrections that only serve to make syncing harder CORE-13032 #resolve CORE-11894 CORE-11277 CORE-12909 Modified: trunk/reactos/drivers/storage/ide/uniata/atacmd_map.h trunk/reactos/drivers/storage/ide/uniata/atapi.h trunk/reactos/drivers/storage/ide/uniata/bsmaster.h trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp trunk/reactos/drivers/storage/ide/uniata/id_dma.cpp trunk/reactos/drivers/storage/ide/uniata/uniata_ver.h Modified: trunk/reactos/drivers/storage/ide/uniata/atacmd_map.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/atacmd_map.h [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/atacmd_map.h [iso-8859-1] Sat Apr 15 20:24:43 2017 @@ -1,5 +1,5 @@ -// Build Version 0.46d8 +// Build Version 0.46e3 UCHAR const AtaCommands48[256] = { Modified: trunk/reactos/drivers/storage/ide/uniata/atapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/atapi.h [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/atapi.h [iso-8859-1] Sat Apr 15 20:24:43 2017 @@ -712,7 +712,7 @@ USHORT UDMASupport : 7; // 62 ATAPI USHORT MultiWordDMASupport : 3; USHORT DMASupport : 1; - USHORT Reserved62_11_14 : 4; + USHORT Reseved62_11_14 : 4; USHORT DMADirRequired : 1; } AtapiDMA; }; Modified: trunk/reactos/drivers/storage/ide/uniata/bsmaster.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/bsmaster.h [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/bsmaster.h [iso-8859-1] Sat Apr 15 20:24:43 2017 @@ -1896,8 +1896,9 @@ #define VM_VMWARE 0x03 #define VM_QEMU 0x04 #define VM_BOCHS 0x05 - -#define VM_MAX_KNOWN VM_BOCHS +#define VM_PCEM 0x06 + +#define VM_MAX_KNOWN VM_PCEM extern BOOLEAN WinVer_WDM_Model; Modified: trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp [iso-8859-1] Sat Apr 15 20:24:43 2017 @@ -1762,7 +1762,7 @@ // ATI/SII chipsets with memory-mapped IO hangs when // I call ReadBuffer(), probably due to PCI burst/prefetch enabled // Unfortunately, I don't know yet how to workaround it except - // specifying manual delay in the way you see below. + // spacifying manual delay in the way you see below. ReadBuffer(chan, (PUSHORT)&deviceExtension->FullIdentifyData, 256, PIO0_TIMING); // Work around for some IDE and one model Atapi that will present more than @@ -1917,6 +1917,8 @@ // Check for HDDs > 8Gb if ((deviceExtension->FullIdentifyData.NumberOfCylinders == 0x3fff) && /* (deviceExtension->FullIdentifyData.TranslationFieldsValid) &&*/ + deviceExtension->FullIdentifyData.NumberOfHeads && + deviceExtension->FullIdentifyData.SectorsPerTrack && (NumOfSectors < deviceExtension->FullIdentifyData.UserAddressableSectors)) { KdPrint2((PRINT_PREFIX "NumberOfCylinders == 0x3fff\n")); cylinders = @@ -1960,6 +1962,8 @@ if(LunExt->DeviceFlags & DFLAGS_LBA_ENABLED) { if(deviceExtension->FullIdentifyData.FeaturesSupport.Address48 && deviceExtension->FullIdentifyData.FeaturesEnabled.Address48 && + deviceExtension->FullIdentifyData.NumberOfHeads && + deviceExtension->FullIdentifyData.SectorsPerTrack && (deviceExtension->FullIdentifyData.UserAddressableSectors48 > NumOfSectors) ) { KdPrint2((PRINT_PREFIX "LBA48\n")); @@ -2093,8 +2097,21 @@ // fill IdentifyData with bogus geometry KdPrint2((PRINT_PREFIX "requested LunExt->GeomType=%x\n", LunExt->opt_GeomType)); - tmp_cylinders = NumOfSectors / (deviceExtension->FullIdentifyData.CurrentSectorsPerTrack * - deviceExtension->FullIdentifyData.NumberOfCurrentHeads); + if(deviceExtension->FullIdentifyData.CurrentSectorsPerTrack && + deviceExtension->FullIdentifyData.NumberOfCurrentHeads) { + tmp_cylinders = NumOfSectors / (deviceExtension->FullIdentifyData.CurrentSectorsPerTrack * + deviceExtension->FullIdentifyData.NumberOfCurrentHeads); + } else + if(deviceExtension->FullIdentifyData.SectorsPerTrack && + deviceExtension->FullIdentifyData.NumberOfHeads) { + KdPrint2((PRINT_PREFIX "Current C/H = %#I64x/%#I64x\n", + deviceExtension->FullIdentifyData.CurrentSectorsPerTrack, + deviceExtension->FullIdentifyData.NumberOfCurrentHeads)); + tmp_cylinders = NumOfSectors / (deviceExtension->FullIdentifyData.SectorsPerTrack * + deviceExtension->FullIdentifyData.NumberOfHeads); + } else { + tmp_cylinders = 0; + } KdPrint2((PRINT_PREFIX "tmp_cylinders = %#I64x\n", tmp_cylinders)); if((tmp_cylinders < 0xffff) || (LunExt->opt_GeomType == GEOM_ORIG)) { // ok, we can keep original values @@ -2114,6 +2131,11 @@ LunExt->opt_GeomType = GEOM_UNIATA; } } + } + + if(!deviceExtension->FullIdentifyData.SectorsPerTrack || + !deviceExtension->FullIdentifyData.NumberOfHeads) { + KdPrint2((PRINT_PREFIX "Zero S/H -> Force Use GEOM_STD\n")); } if(LunExt->opt_GeomType == GEOM_STD) { @@ -5845,6 +5867,10 @@ statusByte = WaitOnBusy(chan); + if(wordCount&1 && atapiDev && (g_opt_VirtualMachine == VM_BOCHS)) { + KdPrint2((PRINT_PREFIX + "IdeIntr: unaligned ATAPI %#x Words\n", wordCount)); + } else if(LunExt->DeviceFlags & DFLAGS_DWORDIO_ENABLED) { KdPrint2((PRINT_PREFIX "IdeIntr: pre-Read %#x Dwords\n", wordCount/2)); Modified: trunk/reactos/drivers/storage/ide/uniata/id_dma.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/id_dma.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/id_dma.cpp [iso-8859-1] Sat Apr 15 20:24:43 2017 @@ -107,6 +107,8 @@ PHYSICAL_ADDRESS ph_addr; ULONG addr; + *(volatile char*)data; // Touch memory, this will prevent condition of not-ready page table for valid addresses + // See ROS-11894 bug ph_addr = MmGetPhysicalAddress(data); KdPrint3((PRINT_PREFIX "AtapiVirtToPhysAddr_: %x -> %8.8x:%8.8x\n", data, ph_addr.HighPart, ph_addr.LowPart)); if(!ph_addru && ph_addr.HighPart) { Modified: trunk/reactos/drivers/storage/ide/uniata/uniata_ver.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/uniata_ver.h [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/uniata_ver.h [iso-8859-1] Sat Apr 15 20:24:43 2017 @@ -1,10 +1,10 @@ -#define UNIATA_VER_STR "46d8" -#define UNIATA_VER_DOT 0.46.4.8 +#define UNIATA_VER_STR "46e3" +#define UNIATA_VER_DOT 0.46.5.3 #define UNIATA_VER_MJ 0 #define UNIATA_VER_MN 46 -#define UNIATA_VER_SUB_MJ 4 -#define UNIATA_VER_SUB_MN 8 -#define UNIATA_VER_DOT_COMMA 0,46,4,8 -#define UNIATA_VER_DOT_STR "0.46.4.8" -#define UNIATA_VER_YEAR 2016 -#define UNIATA_VER_YEAR_STR "2016" +#define UNIATA_VER_SUB_MJ 5 +#define UNIATA_VER_SUB_MN 3 +#define UNIATA_VER_DOT_COMMA 0,46,5,3 +#define UNIATA_VER_DOT_STR "0.46.5.3" +#define UNIATA_VER_YEAR 2017 +#define UNIATA_VER_YEAR_STR "2017"

7 years, 8 months

[tfaber] 74318: [RTL] - In Wait_thread_proc, prioritize the cancel event over the wait object. This avoids executing the callback again after RtlDeregisterWait has been called. Fixes ThemeStartCall...

by tfaber＠svn.reactos.org

Author: tfaber Date: Sat Apr 15 17:39:49 2017 New Revision: 74318 URL: http://svn.reactos.org/svn/reactos?rev=74318&view=rev Log: [RTL] - In Wait_thread_proc, prioritize the cancel event over the wait object. This avoids executing the callback again after RtlDeregisterWait has been called. Fixes ThemeStartCallback being called twice, causing a double free. CORE-13074 #resolve Modified: trunk/reactos/sdk/lib/rtl/wait.c Modified: trunk/reactos/sdk/lib/rtl/wait.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/rtl/wait.c?rev=743… ============================================================================== --- trunk/reactos/sdk/lib/rtl/wait.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/rtl/wait.c [iso-8859-1] Sat Apr 15 17:39:49 2017 @@ -45,7 +45,7 @@ PRTLP_WAIT Wait = (PRTLP_WAIT) Arg; NTSTATUS Status; BOOLEAN alertable = (Wait->Flags & WT_EXECUTEINIOTHREAD) != 0; - HANDLE handles[2] = { Wait->Object, Wait->CancelEvent }; + HANDLE handles[2] = { Wait->CancelEvent, Wait->Object }; LARGE_INTEGER timeout; HANDLE completion_event; @@ -59,11 +59,11 @@ alertable, get_nt_timeout( &timeout, Wait->Milliseconds ) ); - if (Status == STATUS_WAIT_0 || Status == STATUS_TIMEOUT) + if (Status == STATUS_WAIT_1 || Status == STATUS_TIMEOUT) { BOOLEAN TimerOrWaitFired; - if (Status == STATUS_WAIT_0) + if (Status == STATUS_WAIT_1) { // TRACE( "object %p signaled, calling callback %p with context %p\n", // Wait->Object, Wait->Callback,

7 years, 8 months

[ekohl] 74317: [SCHEDSVC] Insert a job into the start list when it is loaded or added. Remove it from the start list when it gets deleted. The start list is sorted by start time.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sat Apr 15 10:33:29 2017 New Revision: 74317 URL: http://svn.reactos.org/svn/reactos?rev=74317&view=rev Log: [SCHEDSVC] Insert a job into the start list when it is loaded or added. Remove it from the start list when it gets deleted. The start list is sorted by start time. Modified: trunk/reactos/base/services/schedsvc/job.c trunk/reactos/base/services/schedsvc/precomp.h trunk/reactos/base/services/schedsvc/rpcserver.c Modified: trunk/reactos/base/services/schedsvc/job.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/schedsvc/job… ============================================================================== --- trunk/reactos/base/services/schedsvc/job.c [iso-8859-1] (original) +++ trunk/reactos/base/services/schedsvc/job.c [iso-8859-1] Sat Apr 15 10:33:29 2017 @@ -276,18 +276,24 @@ pJob->JobId = dwNextJobId++; dwJobCount++; + // Cancel the start timer + /* Append the new job to the job list */ InsertTailList(&JobListHead, &pJob->JobEntry); + /* Calculate the next start time */ + CalculateNextStartTime(pJob); + + /* Insert the job into the start list */ + InsertJobIntoStartList(&StartListHead, pJob); +#if 0 + DumpStartList(&StartListHead); +#endif + + // Update the start timer + /* Release the job list lock */ RtlReleaseResource(&JobListLock); - - /* Calculate the next start time */ - CalculateNextStartTime(pJob); - - // Insert job into the start list - - // Update the start timer pJob = NULL; } @@ -330,7 +336,10 @@ CalculateNextStartTime(PJOB pJob) { SYSTEMTIME StartTime; + FILETIME FileTime; DWORD_PTR Now; + + TRACE("CalculateNextStartTime(%p)\n", pJob); GetLocalTime(&StartTime); @@ -365,8 +374,82 @@ } } - ERR("Next start: %02hu:%02hu %02hu.%02hu.%hu\n", StartTime.wHour, - StartTime.wMinute, StartTime.wDay, StartTime.wMonth, StartTime.wYear); - - SystemTimeToFileTime(&StartTime, &pJob->StartTime); -} + TRACE("Next start: %02hu:%02hu %02hu.%02hu.%hu\n", StartTime.wHour, + StartTime.wMinute, StartTime.wDay, StartTime.wMonth, StartTime.wYear); + + SystemTimeToFileTime(&StartTime, &FileTime); + pJob->StartTime.u.LowPart = FileTime.dwLowDateTime; + pJob->StartTime.u.HighPart = FileTime.dwHighDateTime; +} + + +VOID +InsertJobIntoStartList( + _In_ PLIST_ENTRY StartListHead, + _In_ PJOB pJob) +{ + PLIST_ENTRY CurrentEntry, PreviousEntry; + PJOB CurrentJob; + + if (IsListEmpty(StartListHead)) + { + InsertHeadList(StartListHead, &pJob->StartEntry); + return; + } + + CurrentEntry = StartListHead->Flink; + while (CurrentEntry != StartListHead) + { + CurrentJob = CONTAINING_RECORD(CurrentEntry, JOB, StartEntry); + + if ((CurrentEntry == StartListHead->Flink) && + (pJob->StartTime.QuadPart < CurrentJob->StartTime.QuadPart)) + { + /* Insert before the first entry */ + InsertHeadList(StartListHead, &pJob->StartEntry); + return; + } + + if (pJob->StartTime.QuadPart < CurrentJob->StartTime.QuadPart) + { + /* Insert between the previous and the current entry */ + PreviousEntry = CurrentEntry->Blink; + pJob->StartEntry.Blink = PreviousEntry; + pJob->StartEntry.Flink = CurrentEntry; + PreviousEntry->Flink = &pJob->StartEntry; + CurrentEntry->Blink = &pJob->StartEntry; + return; + } + + if ((CurrentEntry->Flink == StartListHead) && + (pJob->StartTime.QuadPart >= CurrentJob->StartTime.QuadPart)) + { + /* Insert after the last entry */ + InsertTailList(StartListHead, &pJob->StartEntry); + return; + } + + CurrentEntry = CurrentEntry->Flink; + } +} + + +VOID +DumpStartList( + _In_ PLIST_ENTRY StartListHead) +{ + PLIST_ENTRY CurrentEntry; + PJOB CurrentJob; + + CurrentEntry = StartListHead->Flink; + while (CurrentEntry != StartListHead) + { + CurrentJob = CONTAINING_RECORD(CurrentEntry, JOB, StartEntry); + + TRACE("%3lu: %016I64x\n", CurrentJob->JobId, CurrentJob->StartTime.QuadPart); + + CurrentEntry = CurrentEntry->Flink; + } +} + +/* EOF */ Modified: trunk/reactos/base/services/schedsvc/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/schedsvc/pre… ============================================================================== --- trunk/reactos/base/services/schedsvc/precomp.h [iso-8859-1] (original) +++ trunk/reactos/base/services/schedsvc/precomp.h [iso-8859-1] Sat Apr 15 10:33:29 2017 @@ -4,6 +4,7 @@ #define WIN32_NO_STATUS #define _INC_WINDOWS #define COM_NO_WINDOWS_H +#include <limits.h> #include <stdarg.h> #include <stdio.h> #include <windef.h> @@ -28,7 +29,7 @@ LIST_ENTRY JobEntry; LIST_ENTRY StartEntry; - FILETIME StartTime; + ULARGE_INTEGER StartTime; WCHAR Name[9]; DWORD JobId; @@ -39,7 +40,6 @@ WCHAR Command[1]; } JOB, *PJOB; -#define DWORD_MAX 0xffffffffUL extern DWORD dwNextJobId; extern DWORD dwJobCount; @@ -66,7 +66,17 @@ VOID CalculateNextStartTime( - PJOB pJob); + _In_ PJOB pJob); + +VOID +InsertJobIntoStartList( + _In_ PLIST_ENTRY StartListHead, + _In_ PJOB pJob); + +VOID +DumpStartList( + _In_ PLIST_ENTRY StartListHead); + /* rpcserver.c */ Modified: trunk/reactos/base/services/schedsvc/rpcserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/schedsvc/rpc… ============================================================================== --- trunk/reactos/base/services/schedsvc/rpcserver.c [iso-8859-1] (original) +++ trunk/reactos/base/services/schedsvc/rpcserver.c [iso-8859-1] Sat Apr 15 10:33:29 2017 @@ -112,21 +112,27 @@ pJob->JobId = dwNextJobId++; dwJobCount++; + // Cancel the start timer + /* Append the new job to the job list */ InsertTailList(&JobListHead, &pJob->JobEntry); + /* Save the job in the registry */ + SaveJob(pJob); + + /* Calculate the next start time */ + CalculateNextStartTime(pJob); + + /* Insert the job into the start list */ + InsertJobIntoStartList(&StartListHead, pJob); +#if 0 + DumpStartList(&StartListHead); +#endif + + // Update the start timer + /* Release the job list lock */ RtlReleaseResource(&JobListLock); - - /* Save the job in the registry */ - SaveJob(pJob); - - /* Calculate the next start time */ - CalculateNextStartTime(pJob); - - // Insert job into the start list - - // Update the start timer /* Return the new job ID */ *pJobId = pJob->JobId; @@ -156,6 +162,8 @@ /* Acquire the job list lock exclusively */ RtlAcquireResourceExclusive(&JobListLock, TRUE); + // Cancel the start timer + JobEntry = JobListHead.Flink; while (JobEntry != &JobListHead) { @@ -163,9 +171,11 @@ if ((CurrentJob->JobId >= MinJobId) && (CurrentJob->JobId <= MaxJobId)) { - // Remove job from the start list - - // Update the start timer + /* Remove the job from the start list */ + RemoveEntryList(&CurrentJob->StartEntry); +#if 0 + DumpStartList(&StartListHead); +#endif /* Remove the job from the registry */ DeleteJob(CurrentJob); @@ -183,6 +193,8 @@ JobEntry = JobEntry->Flink; } + // Update the start timer + /* Release the job list lock */ RtlReleaseResource(&JobListLock); @@ -245,7 +257,7 @@ (wcslen(CurrentJob->Command) + 1) * sizeof(WCHAR); TRACE("dwEntrySize: %lu\n", dwEntrySize); - if ((PreferedMaximumLength != DWORD_MAX) && + if ((PreferedMaximumLength != ULONG_MAX) && (dwRequiredSize + dwEntrySize > PreferedMaximumLength)) break; @@ -259,7 +271,7 @@ TRACE("dwEntriesToRead: %lu\n", dwEntriesToRead); TRACE("dwRequiredSize: %lu\n", dwRequiredSize); - if (PreferedMaximumLength != DWORD_MAX) + if (PreferedMaximumLength != ULONG_MAX) dwRequiredSize = PreferedMaximumLength; TRACE("Allocating dwRequiredSize: %lu\n", dwRequiredSize);

7 years, 8 months

← Newer
1
...
9
10
11
12
13
14
15
...
18
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 April 2017