Ros-diffs June 2015

ros-diffs@reactos.org

13 participants
343 discussions

[cfinck] 68247: [WINSPOOL] Don't rely on pure magic to transmit the error code of the RPC call to the calling application. Instead use SetLastError on the return value of the call (this is what all...

by cfinck＠svn.reactos.org

Author: cfinck Date: Tue Jun 23 13:46:14 2015 New Revision: 68247 URL: http://svn.reactos.org/svn/reactos?rev=68247&view=rev Log: [WINSPOOL] Don't rely on pure magic to transmit the error code of the RPC call to the calling application. Instead use SetLastError on the return value of the call (this is what all these DWORD return values are for!) [SPOOLSV] For every RPC function, return the error code of the called Spooler Router function instead of the error code of RpcRevertToSelf. [LOCALSPL, WINPRINT] - Change the code structure in every function called from the Spooler Router to always set an error code, especially ERROR_SUCCESS on success. - Store Attributes and Status values for a local printer. - Fail in LocalAddJob if an invalid handle has been supplied or the printer is set to do direct printing. Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/main.c branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolsv/init.c branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolsv/jobs.c branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolsv/printers.c branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolsv/printprocessors.c branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/jobs.c branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/main.c branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/printers.c branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/printprocessors.c branches/colins-printing-for-freedom/reactos/win32ss/printing/processors/winprint/main.c branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/jobs.c branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/main.c branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/precomp.h branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/printers.c branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/printprocessors.c Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/main.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/main.c [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/main.c [iso-8859-1] Tue Jun 23 13:46:14 2015 @@ -94,9 +94,10 @@ return FALSE; } -DWORD WINAPI +BOOL WINAPI SpoolerInit() { // Nothing to do here yet - return ERROR_SUCCESS; + SetLastError(ERROR_SUCCESS); + return TRUE; } Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolsv/init.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolsv/init.c [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolsv/init.c [iso-8859-1] Tue Jun 23 13:46:14 2015 @@ -21,13 +21,9 @@ return dwErrorCode; } - dwErrorCode = SpoolerInit(); - if (dwErrorCode != ERROR_SUCCESS) - { - ERR("SpoolerInit failed with error %lu!\n", dwErrorCode); - RpcRevertToSelf(); - return dwErrorCode; - } + SpoolerInit(); + dwErrorCode = GetLastError(); - return RpcRevertToSelf(); + RpcRevertToSelf(); + return dwErrorCode; } Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolsv/jobs.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolsv/jobs.c [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolsv/jobs.c [iso-8859-1] Tue Jun 23 13:46:14 2015 @@ -19,15 +19,11 @@ return dwErrorCode; } - dwErrorCode = AddJobW(hPrinter, Level, pAddJob, cbBuf, pcbNeeded); - if (dwErrorCode != ERROR_SUCCESS) - { - ERR("AddJobW failed with error %lu!\n", dwErrorCode); - RpcRevertToSelf(); - return dwErrorCode; - } + AddJobW(hPrinter, Level, pAddJob, cbBuf, pcbNeeded); + dwErrorCode = GetLastError(); - return RpcRevertToSelf(); + RpcRevertToSelf(); + return dwErrorCode; } DWORD @@ -42,15 +38,11 @@ return dwErrorCode; } - dwErrorCode = GetJobW(hPrinter, JobId, Level, pJob, cbBuf, pcbNeeded); - if (dwErrorCode != ERROR_SUCCESS) - { - ERR("GetJobW failed with error %lu!\n", dwErrorCode); - RpcRevertToSelf(); - return dwErrorCode; - } + GetJobW(hPrinter, JobId, Level, pJob, cbBuf, pcbNeeded); + dwErrorCode = GetLastError(); - return RpcRevertToSelf(); + RpcRevertToSelf(); + return dwErrorCode; } DWORD Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolsv/printers.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolsv/printers.c [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolsv/printers.c [iso-8859-1] Tue Jun 23 13:46:14 2015 @@ -19,15 +19,11 @@ return dwErrorCode; } - dwErrorCode = EnumPrintersW(Flags, Name, Level, pPrinterEnum, cbBuf, pcbNeeded, pcReturned); - if (dwErrorCode != ERROR_SUCCESS) - { - ERR("EnumPrintersW failed with error %lu!\n", dwErrorCode); - RpcRevertToSelf(); - return dwErrorCode; - } + EnumPrintersW(Flags, Name, Level, pPrinterEnum, cbBuf, pcbNeeded, pcReturned); + dwErrorCode = GetLastError(); - return RpcRevertToSelf(); + RpcRevertToSelf(); + return dwErrorCode; } DWORD @@ -47,13 +43,9 @@ Default.pDatatype = pDatatype; Default.pDevMode = (PDEVMODEW)pDevModeContainer->pDevMode; - dwErrorCode = OpenPrinterW(pPrinterName, phPrinter, &Default); - if (dwErrorCode != ERROR_SUCCESS) - { - ERR("OpenPrinterW failed with error %lu!\n", dwErrorCode); - RpcRevertToSelf(); - return dwErrorCode; - } + OpenPrinterW(pPrinterName, phPrinter, &Default); + dwErrorCode = GetLastError(); - return RpcRevertToSelf(); + RpcRevertToSelf(); + return dwErrorCode; } Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolsv/printprocessors.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolsv/printprocessors.c [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolsv/printprocessors.c [iso-8859-1] Tue Jun 23 13:46:14 2015 @@ -26,15 +26,11 @@ return dwErrorCode; } - dwErrorCode = EnumPrintProcessorDatatypesW(pName, pPrintProcessorName, Level, pDatatypes, cbBuf, pcbNeeded, pcReturned); - if (dwErrorCode != ERROR_SUCCESS) - { - ERR("EnumPrintProcessorDatatypesW failed with error %lu!\n", dwErrorCode); - RpcRevertToSelf(); - return dwErrorCode; - } + EnumPrintProcessorDatatypesW(pName, pPrintProcessorName, Level, pDatatypes, cbBuf, pcbNeeded, pcReturned); + dwErrorCode = GetLastError(); - return RpcRevertToSelf(); + RpcRevertToSelf(); + return dwErrorCode; } DWORD @@ -49,15 +45,11 @@ return dwErrorCode; } - dwErrorCode = EnumPrintProcessorsW(pName, pEnvironment, Level, pPrintProcessorInfo, cbBuf, pcbNeeded, pcReturned); - if (dwErrorCode != ERROR_SUCCESS) - { - ERR("EnumPrintProcessorsW failed with error %lu!\n", dwErrorCode); - RpcRevertToSelf(); - return dwErrorCode; - } + EnumPrintProcessorsW(pName, pEnvironment, Level, pPrintProcessorInfo, cbBuf, pcbNeeded, pcReturned); + dwErrorCode = GetLastError(); - return RpcRevertToSelf(); + RpcRevertToSelf(); + return dwErrorCode; } DWORD @@ -72,13 +64,9 @@ return dwErrorCode; } - dwErrorCode = GetPrintProcessorDirectoryW(pName, pEnvironment, Level, pPrintProcessorDirectory, cbBuf, pcbNeeded); - if (dwErrorCode != ERROR_SUCCESS) - { - ERR("EnumPrintProcessorsW failed with error %lu!\n", dwErrorCode); - RpcRevertToSelf(); - return dwErrorCode; - } + GetPrintProcessorDirectoryW(pName, pEnvironment, Level, pPrintProcessorDirectory, cbBuf, pcbNeeded); + dwErrorCode = GetLastError(); - return RpcRevertToSelf(); + RpcRevertToSelf(); + return dwErrorCode; } Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/jobs.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/jobs.c [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/jobs.c [iso-8859-1] Tue Jun 23 13:46:14 2015 @@ -17,11 +17,7 @@ RpcTryExcept { dwErrorCode = _RpcAddJob(hPrinter, Level, pData, cbBuf, pcbNeeded); - if (dwErrorCode) - { - ERR("_RpcAddJob failed with error %lu!\n", dwErrorCode); - } - + SetLastError(dwErrorCode); bReturnValue = (dwErrorCode == ERROR_SUCCESS); } RpcExcept(EXCEPTION_EXECUTE_HANDLER) @@ -43,11 +39,7 @@ RpcTryExcept { dwErrorCode = _RpcGetJob(hPrinter, JobId, Level, pJob, cbBuf, pcbNeeded); - if (dwErrorCode) - { - ERR("_RpcGetJob failed with error %lu!\n", dwErrorCode); - } - + SetLastError(dwErrorCode); bReturnValue = (dwErrorCode == ERROR_SUCCESS); } RpcExcept(EXCEPTION_EXECUTE_HANDLER) Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/main.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/main.c [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/main.c [iso-8859-1] Tue Jun 23 13:46:14 2015 @@ -68,19 +68,15 @@ BOOL WINAPI SpoolerInit() { - BOOL ReturnValue = FALSE; - DWORD ErrorCode; + BOOL bReturnValue = FALSE; + DWORD dwErrorCode; // Nothing to initialize here yet, but pass this call to the Spool Service as well. RpcTryExcept { - ErrorCode = _RpcSpoolerInit(); - if (ErrorCode) - { - ERR("_RpcSpoolerInit failed with error %lu!\n", ErrorCode); - } - - ReturnValue = (ErrorCode == ERROR_SUCCESS); + dwErrorCode = _RpcSpoolerInit(); + SetLastError(dwErrorCode); + bReturnValue = (dwErrorCode == ERROR_SUCCESS); } RpcExcept(EXCEPTION_EXECUTE_HANDLER) { @@ -88,5 +84,5 @@ } RpcEndExcept; - return ReturnValue; + return bReturnValue; } Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/printers.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/printers.c [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/printers.c [iso-8859-1] Tue Jun 23 13:46:14 2015 @@ -23,11 +23,7 @@ RpcTryExcept { dwErrorCode = _RpcEnumPrinters(Flags, Name, Level, pPrinterEnum, cbBuf, pcbNeeded, pcReturned); - if (dwErrorCode) - { - ERR("_RpcEnumPrinters failed with error %lu!\n", dwErrorCode); - } - + SetLastError(dwErrorCode); bReturnValue = (dwErrorCode == ERROR_SUCCESS); } RpcExcept(EXCEPTION_EXECUTE_HANDLER) @@ -204,11 +200,7 @@ RpcTryExcept { dwErrorCode = _RpcOpenPrinter(pPrinterName, phPrinter, pDatatype, pDevModeContainer, AccessRequired); - if (dwErrorCode) - { - ERR("_RpcOpenPrinter failed with error %lu!\n", dwErrorCode); - } - + SetLastError(dwErrorCode); bReturnValue = (dwErrorCode == ERROR_SUCCESS); } RpcExcept(EXCEPTION_EXECUTE_HANDLER) Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/printprocessors.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/printprocessors.c [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/printprocessors.c [iso-8859-1] Tue Jun 23 13:46:14 2015 @@ -23,11 +23,7 @@ RpcTryExcept { dwErrorCode = _RpcEnumPrintProcessorDatatypes(pName, pPrintProcessorName, Level, pDatatypes, cbBuf, pcbNeeded, pcReturned); - if (dwErrorCode) - { - ERR("_RpcEnumPrintProcessorDatatypes failed with error %lu!\n", dwErrorCode); - } - + SetLastError(dwErrorCode); bReturnValue = (dwErrorCode == ERROR_SUCCESS); } RpcExcept(EXCEPTION_EXECUTE_HANDLER) @@ -49,11 +45,7 @@ RpcTryExcept { dwErrorCode = _RpcEnumPrintProcessors(pName, pEnvironment, Level, pPrintProcessorInfo, cbBuf, pcbNeeded, pcReturned); - if (dwErrorCode) - { - ERR("_RpcEnumPrintProcessors failed with error %lu!\n", dwErrorCode); - } - + SetLastError(dwErrorCode); bReturnValue = (dwErrorCode == ERROR_SUCCESS); } RpcExcept(EXCEPTION_EXECUTE_HANDLER) @@ -75,11 +67,7 @@ RpcTryExcept { dwErrorCode = _RpcGetPrintProcessorDirectory(pName, pEnvironment, Level, pPrintProcessorInfo, cbBuf, pcbNeeded); - if (dwErrorCode) - { - ERR("_RpcGetPrintProcessorDirectory failed with error %lu!\n", dwErrorCode); - } - + SetLastError(dwErrorCode); bReturnValue = (dwErrorCode == ERROR_SUCCESS); } RpcExcept(EXCEPTION_EXECUTE_HANDLER) Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/processors/winprint/main.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/processors/winprint/main.c [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/processors/winprint/main.c [iso-8859-1] Tue Jun 23 13:46:14 2015 @@ -49,13 +49,17 @@ EnumPrintProcessorDatatypesW(LPWSTR pName, LPWSTR pPrintProcessorName, DWORD Level, LPBYTE pDatatypes, DWORD cbBuf, LPDWORD pcbNeeded, LPDWORD pcReturned) { DWORD cbDatatype; + DWORD dwErrorCode; DWORD dwOffsets[_countof(pwszDatatypes)]; PCWSTR* pCurrentDatatype; PDWORD pCurrentOffset = dwOffsets; // Sanity checks if (Level != 1 || !pcbNeeded || !pcReturned) - return FALSE; + { + dwErrorCode = ERROR_INVALID_PARAMETER; + goto Cleanup; + } // Count the required buffer size and the number of datatypes. *pcbNeeded = 0; @@ -76,20 +80,24 @@ // Check if the supplied buffer is large enough. if (cbBuf < *pcbNeeded) { - SetLastError(ERROR_INSUFFICIENT_BUFFER); - return FALSE; + dwErrorCode = ERROR_INSUFFICIENT_BUFFER; + goto Cleanup; } // Check if a buffer was supplied at all. if (!pDatatypes) { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; + dwErrorCode = ERROR_INVALID_PARAMETER; + goto Cleanup; } // Copy over all datatypes. *pCurrentOffset = MAXDWORD; PackStrings(pwszDatatypes, pDatatypes, dwOffsets, &pDatatypes[*pcbNeeded]); - return TRUE; + dwErrorCode = ERROR_SUCCESS; + +Cleanup: + SetLastError(dwErrorCode); + return (dwErrorCode == ERROR_SUCCESS); } Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/jobs.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/jobs.c [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/jobs.c [iso-8859-1] Tue Jun 23 13:46:14 2015 @@ -196,36 +196,54 @@ const DWORD cchSpl = _countof("?????.SPL") - 1; ADDJOB_INFO_1W AddJobInfo1; - BOOL bReturnValue = FALSE; DWORD cchMachineName; DWORD cchUserName; + DWORD dwErrorCode; PBYTE p; PLOCAL_HANDLE pHandle; PLOCAL_JOB pJob; PLOCAL_PRINTER_HANDLE pPrinterHandle; RPC_BINDING_HANDLE hServerBinding = NULL; - RPC_STATUS Status; RPC_WSTR pwszBinding = NULL; RPC_WSTR pwszMachineName = NULL; // Check if this is a printer handle. pHandle = (PLOCAL_HANDLE)hPrinter; if (pHandle->HandleType != Printer) - goto Cleanup; + { + dwErrorCode = ERROR_INVALID_HANDLE; + goto Cleanup; + } pPrinterHandle = (PLOCAL_PRINTER_HANDLE)pHandle->SpecificHandle; + + // This handle must not have started a job yet! + if (pPrinterHandle->StartedJob) + { + dwErrorCode = ERROR_INVALID_HANDLE; + goto Cleanup; + } // Check if this is the right structure level. if (Level != 1) - goto Cleanup; - - // FIXME: This needs to fail if the printer is set to do direct printing. + { + dwErrorCode = ERROR_INVALID_LEVEL; + goto Cleanup; + } + + // Check if the printer is set to do direct printing. + // The Job List isn't used in this case. + if (pPrinterHandle->Printer->dwAttributes & PRINTER_ATTRIBUTE_DIRECT) + { + dwErrorCode = ERROR_INVALID_ACCESS; + goto Cleanup; + } // Check if the supplied buffer is large enough. *pcbNeeded = sizeof(ADDJOB_INFO_1W) + (cchSpoolDirectory + cchPrintersPath + cchSpl + 1) * sizeof(WCHAR); if (cbBuf < *pcbNeeded) { - SetLastError(ERROR_INSUFFICIENT_BUFFER); + dwErrorCode = ERROR_INSUFFICIENT_BUFFER; goto Cleanup; } @@ -233,13 +251,17 @@ pJob = DllAllocSplMem(sizeof(LOCAL_JOB)); if (!pJob) { - ERR("DllAllocSplMem failed with error %lu!\n", GetLastError()); + dwErrorCode = GetLastError(); + ERR("DllAllocSplMem failed with error %lu!\n", dwErrorCode); goto Cleanup; } // Reserve an ID for this job. if (!GetNextJobID(&pJob->dwJobID)) - goto Cleanup; + { + dwErrorCode = ERROR_NOT_ENOUGH_MEMORY; + goto Cleanup; + } // Copy over defaults to the LOCAL_JOB structure. pJob->Printer = pPrinterHandle->Printer; @@ -254,7 +276,8 @@ pJob->pwszUserName = DllAllocSplMem(cchUserName * sizeof(WCHAR)); if (!GetUserNameW(pJob->pwszUserName, &cchUserName)) { - ERR("GetUserNameW failed with error %lu!\n", GetLastError()); + dwErrorCode = GetLastError(); + ERR("GetUserNameW failed with error %lu!\n", dwErrorCode); goto Cleanup; } @@ -262,24 +285,24 @@ pJob->pwszNotifyName = AllocSplStr(pJob->pwszUserName); // Get the name of the machine that submitted the Job over RPC. - Status = RpcBindingServerFromClient(NULL, &hServerBinding); - if (Status != RPC_S_OK) - { - ERR("RpcBindingServerFromClient failed with status %lu!\n", Status); - goto Cleanup; - } - - Status = RpcBindingToStringBindingW(hServerBinding, &pwszBinding); - if (Status != RPC_S_OK) - { - ERR("RpcBindingToStringBindingW failed with status %lu!\n", Status); - goto Cleanup; - } - - Status = RpcStringBindingParseW(pwszBinding, NULL, NULL, &pwszMachineName, NULL, NULL); - if (Status != RPC_S_OK) - { - ERR("RpcStringBindingParseW failed with status %lu!\n", Status); + dwErrorCode = RpcBindingServerFromClient(NULL, &hServerBinding); + if (dwErrorCode != RPC_S_OK) + { + ERR("RpcBindingServerFromClient failed with status %lu!\n", dwErrorCode); + goto Cleanup; + } + + dwErrorCode = RpcBindingToStringBindingW(hServerBinding, &pwszBinding); + if (dwErrorCode != RPC_S_OK) + { + ERR("RpcBindingToStringBindingW failed with status %lu!\n", dwErrorCode); + goto Cleanup; + } + + dwErrorCode = RpcStringBindingParseW(pwszBinding, NULL, NULL, &pwszMachineName, NULL, NULL); + if (dwErrorCode != RPC_S_OK) + { + ERR("RpcStringBindingParseW failed with status %lu!\n", dwErrorCode); goto Cleanup; } @@ -291,6 +314,7 @@ // Add the job to the Global Job List. if (!InsertElementSkiplist(&GlobalJobList, pJob)) { + dwErrorCode = ERROR_NOT_ENOUGH_MEMORY; ERR("InsertElementSkiplist failed for job %lu for the GlobalJobList!\n", pJob->dwJobID); goto Cleanup; } @@ -299,6 +323,7 @@ // As all new jobs are created with default priority, we can be sure that it would always be inserted at the end. if (!InsertTailElementSkiplist(&pJob->Printer->JobList, pJob)) { + dwErrorCode = ERROR_NOT_ENOUGH_MEMORY; ERR("InsertTailElementSkiplist failed for job %lu for the Printer's Job List!\n", pJob->dwJobID); goto Cleanup; } @@ -315,7 +340,7 @@ p += cchPrintersPath; swprintf((PWSTR)p, L"%05lu.SPL", pJob->dwJobID); - bReturnValue = TRUE; + dwErrorCode = ERROR_SUCCESS; Cleanup: if (pwszMachineName) @@ -327,11 +352,12 @@ if (hServerBinding) RpcBindingFree(&hServerBinding); - return bReturnValue; -} - - -static BOOL + SetLastError(dwErrorCode); + return (dwErrorCode == ERROR_SUCCESS); +} + + +static DWORD _LocalGetJobLevel1(PLOCAL_PRINTER_HANDLE pPrinterHandle, PLOCAL_JOB pJob, PBYTE pOutput, DWORD cbBuf, PDWORD pcbNeeded) { DWORD cbDatatype = (wcslen(pJob->pwszDatatype) + 1) * sizeof(WCHAR); @@ -339,6 +365,7 @@ DWORD cbMachineName = (wcslen(pJob->pwszMachineName) + 1) * sizeof(WCHAR); DWORD cbPrinterName = (wcslen(pJob->Printer->pwszPrinterName) + 1) * sizeof(WCHAR); DWORD cbUserName = (wcslen(pJob->pwszUserName) + 1) * sizeof(WCHAR); + DWORD dwErrorCode; JOB_INFO_1W JobInfo1 = { 0 }; PBYTE pString; @@ -346,8 +373,8 @@ *pcbNeeded = sizeof(JOB_INFO_1W) + cbDatatype + cbDocumentName + cbMachineName + cbPrinterName + cbUserName; if (cbBuf < *pcbNeeded) { - SetLastError(ERROR_INSUFFICIENT_BUFFER); - return FALSE; + dwErrorCode = ERROR_INSUFFICIENT_BUFFER; + goto Cleanup; } // Put the strings right after the JOB_INFO_1W structure. @@ -381,10 +408,13 @@ CopyMemory(&JobInfo1.Submitted, &pJob->stSubmitted, sizeof(SYSTEMTIME)); CopyMemory(pOutput, &JobInfo1, sizeof(JOB_INFO_1W)); - return TRUE; -} - -static BOOL + dwErrorCode = ERROR_SUCCESS; + +Cleanup: + return dwErrorCode; +} + +static DWORD _LocalGetJobLevel2(PLOCAL_PRINTER_HANDLE pPrinterHandle, PLOCAL_JOB pJob, PBYTE pOutput, DWORD cbBuf, PDWORD pcbNeeded) { DWORD cbDatatype = (wcslen(pJob->pwszDatatype) + 1) * sizeof(WCHAR); @@ -395,6 +425,7 @@ DWORD cbPrinterName = (wcslen(pJob->Printer->pwszPrinterName) + 1) * sizeof(WCHAR); DWORD cbPrintProcessor = (wcslen(pJob->Printer->pPrintProcessor->pwszName) + 1) * sizeof(WCHAR); DWORD cbUserName = (wcslen(pJob->pwszUserName) + 1) * sizeof(WCHAR); + DWORD dwErrorCode; FILETIME ftNow; FILETIME ftSubmitted; JOB_INFO_2W JobInfo2 = { 0 }; @@ -406,8 +437,8 @@ *pcbNeeded = sizeof(JOB_INFO_2W) + cbDatatype + sizeof(DEVMODEW) + cbDocumentName + cbDriverName + cbMachineName + cbNotifyName + cbPrinterName + cbPrintProcessor + cbUserName; if (cbBuf < *pcbNeeded) { - SetLastError(ERROR_INSUFFICIENT_BUFFER); - return FALSE; + dwErrorCode = ERROR_INSUFFICIENT_BUFFER; + goto Cleanup; } // Put the strings right after the JOB_INFO_2W structure. @@ -467,8 +498,9 @@ // Retrieve this through the element index of the job in the Printer's Job List. if (!LookupElementSkiplist(&pJob->Printer->JobList, pJob, &JobInfo2.Position)) { + dwErrorCode = ERROR_NOT_ENOUGH_MEMORY; ERR("pJob could not be located in the Printer's Job List!\n"); - return FALSE; + goto Cleanup; } // Make the index 1-based. @@ -486,12 +518,16 @@ // Finally copy the structure to the output pointer. CopyMemory(pOutput, &JobInfo2, sizeof(JOB_INFO_2W)); - return TRUE; + dwErrorCode = ERROR_SUCCESS; + +Cleanup: + return dwErrorCode; } BOOL WINAPI LocalGetJob(HANDLE hPrinter, DWORD JobId, DWORD Level, LPBYTE pOutput, DWORD cbBuf, LPDWORD pcbNeeded) { + DWORD dwErrorCode; PLOCAL_HANDLE pHandle; PLOCAL_JOB pJob; PLOCAL_PRINTER_HANDLE pPrinterHandle; @@ -499,7 +535,10 @@ // Check if this is a printer handle. pHandle = (PLOCAL_HANDLE)hPrinter; if (pHandle->HandleType != Printer) - return FALSE; + { + dwErrorCode = ERROR_INVALID_HANDLE; + goto Cleanup; + } pPrinterHandle = (PLOCAL_PRINTER_HANDLE)pHandle->SpecificHandle; @@ -507,17 +546,21 @@ pJob = LookupElementSkiplist(&GlobalJobList, &JobId, NULL); if (!pJob || pJob->Printer != pPrinterHandle->Printer) { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; + dwErrorCode = ERROR_INVALID_PARAMETER; + goto Cleanup; } // The function behaves differently for each level. if (Level == 1) - return _LocalGetJobLevel1(pPrinterHandle, pJob, pOutput, cbBuf, pcbNeeded); + dwErrorCode = _LocalGetJobLevel1(pPrinterHandle, pJob, pOutput, cbBuf, pcbNeeded); else if (Level == 2) - return _LocalGetJobLevel2(pPrinterHandle, pJob, pOutput, cbBuf, pcbNeeded); - - return FALSE; + dwErrorCode = _LocalGetJobLevel2(pPrinterHandle, pJob, pOutput, cbBuf, pcbNeeded); + else + dwErrorCode = ERROR_INVALID_LEVEL; + +Cleanup: + SetLastError(dwErrorCode); + return (dwErrorCode == ERROR_SUCCESS); } PLOCAL_JOB Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/main.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/main.c [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/main.c [iso-8859-1] Tue Jun 23 13:46:14 2015 @@ -156,5 +156,6 @@ { CopyMemory(pPrintProvidor, &_PrintProviderFunctions, min(cbPrintProvidor, sizeof(PRINTPROVIDOR))); + SetLastError(ERROR_SUCCESS); return TRUE; } Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/precomp.h [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/precomp.h [iso-8859-1] Tue Jun 23 13:46:14 2015 @@ -73,6 +73,8 @@ // This sort key must be the first element for LookupElementSkiplist to work! PWSTR pwszPrinterName; + DWORD dwAttributes; + DWORD dwStatus; PWSTR pwszPrinterDriver; PWSTR pwszDescription; PWSTR pwszDefaultDatatype; Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/printers.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/printers.c [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/printers.c [iso-8859-1] Tue Jun 23 13:46:14 2015 @@ -38,7 +38,7 @@ { const WCHAR wszPrintersKey[] = L"SYSTEM\\CurrentControlSet\\Control\\Print\\Printers"; - DWORD cbDevMode; + DWORD cbData; DWORD cchPrinterName; DWORD dwSubKeys; DWORD i; @@ -173,11 +173,29 @@ } // Get the default DevMode. - cbDevMode = sizeof(DEVMODEW); - lStatus = RegQueryValueExW(hSubKey, L"Default DevMode", NULL, NULL, (PBYTE)&pPrinter->DefaultDevMode, &cbDevMode); - if (lStatus != ERROR_SUCCESS || cbDevMode != sizeof(DEVMODEW)) - { - ERR("Couldn't query a valid DevMode for Printer \"%S\", status is %ld, cbDevMode is %lu!\n", wszPrinterName, lStatus, cbDevMode); + cbData = sizeof(DEVMODEW); + lStatus = RegQueryValueExW(hSubKey, L"Default DevMode", NULL, NULL, (PBYTE)&pPrinter->DefaultDevMode, &cbData); + if (lStatus != ERROR_SUCCESS || cbData != sizeof(DEVMODEW)) + { + ERR("Couldn't query a valid DevMode for Printer \"%S\", status is %ld, cbData is %lu!\n", wszPrinterName, lStatus, cbData); + continue; + } + + // Get the Attributes. + cbData = sizeof(DWORD); + lStatus = RegQueryValueExW(hSubKey, L"Attributes", NULL, NULL, (PBYTE)&pPrinter->dwAttributes, &cbData); + if (lStatus != ERROR_SUCCESS) + { + ERR("Couldn't query Attributes for Printer \"%S\", status is %ld!\n", wszPrinterName, lStatus); + continue; + } + + // Get the Status. + cbData = sizeof(DWORD); + lStatus = RegQueryValueExW(hSubKey, L"Status", NULL, NULL, (PBYTE)&pPrinter->dwStatus, &cbData); + if (lStatus != ERROR_SUCCESS) + { + ERR("Couldn't query Status for Printer \"%S\", status is %ld!\n", wszPrinterName, lStatus); continue; } @@ -223,7 +241,7 @@ } -BOOL +DWORD _LocalEnumPrintersLevel1(DWORD Flags, LPWSTR Name, LPBYTE pPrinterEnum, DWORD cbBuf, LPDWORD pcbNeeded, LPDWORD pcReturned) { const WCHAR wszComma[] = L","; @@ -232,6 +250,7 @@ DWORD cbComment; DWORD cbDescription; DWORD cchComputerName = 0; + DWORD dwErrorCode; DWORD i; PBYTE pPrinterInfo; PBYTE pPrinterString; @@ -263,8 +282,9 @@ cchComputerName = MAX_COMPUTERNAME_LENGTH + 1; if (!GetComputerNameW(&wszComputerName[2], &cchComputerName)) { - ERR("GetComputerNameW failed with error %lu!\n", GetLastError()); - return FALSE; + dwErrorCode = GetLastError(); + ERR("GetComputerNameW failed with error %lu!\n", dwErrorCode); + goto Cleanup; } // Add the leading slashes to the total length. @@ -273,8 +293,8 @@ // Now compare this with the local computer name and reject if it doesn't match. if (wcsicmp(&Name[2], &wszComputerName[2]) != 0) { - SetLastError(ERROR_INVALID_NAME); - return FALSE; + dwErrorCode = ERROR_INVALID_NAME; + goto Cleanup; } // Add a trailing backslash to wszComputerName, which will later be prepended in front of the printer names. @@ -284,8 +304,8 @@ else if (wcsicmp(Name, wszPrintProviderInfo[0]) != 0) { // The user supplied a name that cannot be processed by the local print provider. - SetLastError(ERROR_INVALID_NAME); - return FALSE; + dwErrorCode = ERROR_INVALID_NAME; + goto Cleanup; } } else @@ -302,14 +322,15 @@ // Check if the supplied buffer is large enough. if (cbBuf < *pcbNeeded) { - SetLastError(ERROR_INSUFFICIENT_BUFFER); - return FALSE; + dwErrorCode = ERROR_INSUFFICIENT_BUFFER; + goto Cleanup; } // Copy over the print processor information. ((PPRINTER_INFO_1W)pPrinterEnum)->Flags = 0; PackStrings(wszPrintProviderInfo, pPrinterEnum, dwOffsets, &pPrinterEnum[*pcbNeeded]); - return TRUE; + dwErrorCode = ERROR_SUCCESS; + goto Cleanup; } } @@ -332,8 +353,8 @@ // Check if the supplied buffer is large enough. if (cbBuf < *pcbNeeded) { - SetLastError(ERROR_INSUFFICIENT_BUFFER); - return FALSE; + dwErrorCode = ERROR_INSUFFICIENT_BUFFER; + goto Cleanup; } // Put the strings right after the last PRINTER_INFO_1W structure. @@ -381,12 +402,17 @@ pPrinterInfo += sizeof(PRINTER_INFO_1W); } - return TRUE; + dwErrorCode = ERROR_SUCCESS; + +Cleanup: + return dwErrorCode; } BOOL WINAPI LocalEnumPrinters(DWORD Flags, LPWSTR Name, DWORD Level, LPBYTE pPrinterEnum, DWORD cbBuf, LPDWORD pcbNeeded, LPDWORD pcReturned) { + DWORD dwErrorCode; + // Do no sanity checks here. This is verified by localspl_apitest! // Begin counting. @@ -394,30 +420,36 @@ *pcReturned = 0; // Think positive :) - SetLastError(ERROR_SUCCESS); + // 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) - return _LocalEnumPrintersLevel1(Flags, Name, pPrinterEnum, cbBuf, pcbNeeded, pcReturned); - - // TODO: Handle other levels. - - // The caller supplied an invalid level. - return FALSE; - } - - // Treat it as success if the caller queried no information and we don't need to return any. - return TRUE; + { + 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; + } + } + +Cleanup: + SetLastError(dwErrorCode); + return (dwErrorCode == ERROR_SUCCESS); } BOOL WINAPI LocalOpenPrinter(PWSTR lpPrinterName, HANDLE* phPrinter, PPRINTER_DEFAULTSW pDefault) { - BOOL bReturnValue = ROUTER_UNKNOWN; DWORD cchComputerName; DWORD cchPrinterName; + DWORD dwErrorCode; DWORD dwJobID; PWSTR p = lpPrinterName; PWSTR pwszPrinterName = NULL; @@ -430,7 +462,7 @@ // Sanity checks if (!lpPrinterName || !phPrinter) { - SetLastError(ERROR_INVALID_PARAMETER); + dwErrorCode = ERROR_INVALID_PARAMETER; goto Cleanup; } @@ -445,7 +477,7 @@ if (!p) { // We didn't get a proper server name. - SetLastError(ERROR_INVALID_PRINTER_NAME); + dwErrorCode = ERROR_INVALID_PRINTER_NAME; goto Cleanup; } @@ -456,14 +488,15 @@ cchComputerName = _countof(wszComputerName); if (!GetComputerNameW(wszComputerName, &cchComputerName)) { - ERR("GetComputerNameW failed with error %lu!\n", GetLastError()); + dwErrorCode = GetLastError(); + ERR("GetComputerNameW failed with error %lu!\n", dwErrorCode); goto Cleanup; } // Now compare this with the local computer name and reject if it doesn't match, because this print provider only supports local printers. if (wcsicmp(lpPrinterName, wszComputerName) != 0) { - SetLastError(ERROR_INVALID_PRINTER_NAME); + dwErrorCode = ERROR_INVALID_PRINTER_NAME; goto Cleanup; } @@ -481,7 +514,7 @@ // No printer name and no comma? This is invalid! if (!cchPrinterName && !p) { - SetLastError(ERROR_INVALID_PRINTER_NAME); + dwErrorCode = ERROR_INVALID_PRINTER_NAME; goto Cleanup; } @@ -498,7 +531,7 @@ if (!pPrinter) { // The printer does not exist. - SetLastError(ERROR_INVALID_PRINTER_NAME); + dwErrorCode = ERROR_INVALID_PRINTER_NAME; goto Cleanup; } @@ -512,7 +545,7 @@ // Use the datatype if it's valid. if (!FindDatatype(pPrinter->pPrintProcessor, pDefault->pDatatype)) { - SetLastError(ERROR_INVALID_DATATYPE); + dwErrorCode = ERROR_INVALID_DATATYPE; goto Cleanup; } @@ -545,7 +578,7 @@ // The "Job " string has to follow now. if (wcscmp(p, L"Job ") != 0) { - SetLastError(ERROR_INVALID_PRINTER_NAME); + dwErrorCode = ERROR_INVALID_PRINTER_NAME; goto Cleanup; } @@ -561,7 +594,7 @@ if (!IS_VALID_JOB_ID(dwJobID)) { // The user supplied an invalid Job ID. - SetLastError(ERROR_INVALID_PRINTER_NAME); + dwErrorCode = ERROR_INVALID_PRINTER_NAME; goto Cleanup; } @@ -570,7 +603,7 @@ if (!pJob || pJob->Printer != pPrinter) { // The user supplied a non-existing Job ID or the Job ID does not belong to the supplied printer name. - SetLastError(ERROR_INVALID_PRINTER_NAME); + dwErrorCode = ERROR_INVALID_PRINTER_NAME; goto Cleanup; } @@ -618,13 +651,13 @@ } else { - SetLastError(ERROR_INVALID_PRINTER_NAME); + dwErrorCode = ERROR_INVALID_PRINTER_NAME; goto Cleanup; } } *phPrinter = (HANDLE)pHandle; - bReturnValue = ROUTER_SUCCESS; + dwErrorCode = ERROR_SUCCESS; // Don't let the cleanup routines free this. pPrinterHandle = NULL; @@ -642,12 +675,15 @@ if (pwszPrinterName) DllFreeSplMem(pwszPrinterName); - return bReturnValue; + SetLastError(dwErrorCode); + return (dwErrorCode == ERROR_SUCCESS); } DWORD WINAPI LocalStartDocPrinter(HANDLE hPrinter, DWORD Level, LPBYTE pDocInfo) { + DWORD dwErrorCode; + DWORD dwReturnValue = 0; PDOC_INFO_1W pDocumentInfo1; PLOCAL_HANDLE pHandle; PLOCAL_JOB pJob; @@ -656,22 +692,22 @@ // Sanity checks if (!pDocInfo) { - SetLastError(ERROR_INVALID_PARAMETER); - return 0; + dwErrorCode = ERROR_INVALID_PARAMETER; + goto Cleanup; } if (!hPrinter) { - SetLastError(ERROR_INVALID_HANDLE); - return 0; + dwErrorCode = ERROR_INVALID_HANDLE; + goto Cleanup; } // Check if this is a printer handle. pHandle = (PLOCAL_HANDLE)hPrinter; if (pHandle->HandleType != Printer) { - SetLastError(ERROR_INVALID_HANDLE); - return 0; + dwErrorCode = ERROR_INVALID_HANDLE; + goto Cleanup; } pPrinterHandle = (PLOCAL_PRINTER_HANDLE)pHandle->SpecificHandle; @@ -679,8 +715,8 @@ // Check if this is the right document information level. if (Level != 1) { - SetLastError(ERROR_INVALID_LEVEL); - return 0; + dwErrorCode = ERROR_INVALID_LEVEL; + goto Cleanup; } pDocumentInfo1 = (PDOC_INFO_1W)pDocInfo; @@ -696,8 +732,8 @@ // Use the datatype if it's valid. if (!FindDatatype(pJob->Printer->pPrintProcessor, pDocumentInfo1->pDatatype)) { - SetLastError(ERROR_INVALID_DATATYPE); - return 0; + dwErrorCode = ERROR_INVALID_DATATYPE; + goto Cleanup; } pJob->pwszDatatype = AllocSplStr(pDocumentInfo1->pDatatype); @@ -720,25 +756,35 @@ // Get an ID for the new job. if (!GetNextJobID(&pJob->dwJobID)) - return 0; + { + dwErrorCode = ERROR_NOT_ENOUGH_MEMORY; + goto Cleanup; + } // Add the job to the Global Job List. if (!InsertElementSkiplist(&GlobalJobList, pJob)) { + dwErrorCode = ERROR_NOT_ENOUGH_MEMORY; ERR("InsertElementSkiplist failed for job %lu for the GlobalJobList!\n", pJob->dwJobID); - return 0; + goto Cleanup; } // Add the job at the end of the Printer's Job List. // As all new jobs are created with default priority, we can be sure that it would always be inserted at the end. if (!InsertTailElementSkiplist(&pJob->Printer->JobList, pJob)) { + dwErrorCode = ERROR_NOT_ENOUGH_MEMORY; ERR("InsertTailElementSkiplist failed for job %lu for the Printer's Job List!\n", pJob->dwJobID); - return 0; + goto Cleanup; } pPrinterHandle->StartedJob = pJob; - return pJob->dwJobID; + dwErrorCode = ERROR_SUCCESS; + dwReturnValue = pJob->dwJobID; + +Cleanup: + SetLastError(dwErrorCode); + return dwReturnValue; } BOOL WINAPI Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/printprocessors.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/printprocessors.c [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/printprocessors.c [iso-8859-1] Tue Jun 23 13:46:14 2015 @@ -24,18 +24,16 @@ * You can use it for further tasks and have to close it with RegCloseKey. * * @return - * TRUE if the environment is valid and a registry key was opened, FALSE otherwise. - * In case of failure, Last Error will be set to ERROR_INVALID_ENVIRONMENT. + * A Windows Error Code indicating success or failure. */ -static BOOL +static DWORD _OpenEnvironment(PCWSTR pEnvironment, PHKEY hKey) { const WCHAR wszEnvironmentsKey[] = L"SYSTEM\\CurrentControlSet\\Control\\Print\\Environments\\"; const DWORD cchEnvironmentsKey = _countof(wszEnvironmentsKey) - 1; - BOOL bReturnValue = FALSE; DWORD cchEnvironment; - LONG lStatus; + DWORD dwErrorCode; PWSTR pwszEnvironmentKey = NULL; // Use the current environment if none was supplied. @@ -55,25 +53,23 @@ CopyMemory(&pwszEnvironmentKey[cchEnvironmentsKey], pEnvironment, (cchEnvironment + 1) * sizeof(WCHAR)); // Open the registry key. - lStatus = RegOpenKeyExW(HKEY_LOCAL_MACHINE, pwszEnvironmentKey, 0, KEY_READ, hKey); - if (lStatus == ERROR_FILE_NOT_FOUND) - { - SetLastError(ERROR_INVALID_ENVIRONMENT); - goto Cleanup; - } - else if (lStatus != ERROR_SUCCESS) - { - ERR("RegOpenKeyExW failed with status %ld!\n", lStatus); - goto Cleanup; - } - - bReturnValue = TRUE; + dwErrorCode = (DWORD)RegOpenKeyExW(HKEY_LOCAL_MACHINE, pwszEnvironmentKey, 0, KEY_READ, hKey); + if (dwErrorCode == ERROR_FILE_NOT_FOUND) + { + dwErrorCode = ERROR_INVALID_ENVIRONMENT; + goto Cleanup; + } + else if (dwErrorCode != ERROR_SUCCESS) + { + ERR("RegOpenKeyExW failed with status %lu!\n", dwErrorCode); + goto Cleanup; + } Cleanup: if (pwszEnvironmentKey) DllFreeSplMem(pwszEnvironmentKey); - return bReturnValue; + return dwErrorCode; } BOOL @@ -146,7 +142,7 @@ wszPrintProcessorPath[cchPrintProcessorPath++] = L'\\'; // Open the environment registry key. - if (!_OpenEnvironment(NULL, &hKey)) + if (_OpenEnvironment(NULL, &hKey) != ERROR_SUCCESS) goto Cleanup; // Open the "Print Processors" subkey. @@ -372,25 +368,33 @@ BOOL WINAPI LocalEnumPrintProcessorDatatypes(LPWSTR pName, LPWSTR pPrintProcessorName, DWORD Level, LPBYTE pDatatypes, DWORD cbBuf, LPDWORD pcbNeeded, LPDWORD pcReturned) { + DWORD dwErrorCode; PLOCAL_PRINT_PROCESSOR pPrintProcessor; // Sanity checks if (Level != 1) { - SetLastError(ERROR_INVALID_LEVEL); - return FALSE; + dwErrorCode = ERROR_INVALID_LEVEL; + goto Cleanup; } // Try to find the Print Processor. pPrintProcessor = FindPrintProcessor(pPrintProcessorName); if (!pPrintProcessor) { - SetLastError(ERROR_UNKNOWN_PRINTPROCESSOR); - return FALSE; + dwErrorCode = ERROR_UNKNOWN_PRINTPROCESSOR; + goto Cleanup; } // Call its EnumPrintProcessorDatatypesW function. - return pPrintProcessor->pfnEnumPrintProcessorDatatypesW(pName, pPrintProcessorName, Level, pDatatypes, cbBuf, pcbNeeded, pcReturned); + if (pPrintProcessor->pfnEnumPrintProcessorDatatypesW(pName, pPrintProcessorName, Level, pDatatypes, cbBuf, pcbNeeded, pcReturned)) + dwErrorCode = ERROR_SUCCESS; + else + dwErrorCode = GetLastError(); + +Cleanup: + SetLastError(dwErrorCode); + return (dwErrorCode == ERROR_SUCCESS); } /** @@ -431,13 +435,12 @@ BOOL WINAPI LocalEnumPrintProcessors(LPWSTR pName, LPWSTR pEnvironment, DWORD Level, LPBYTE pPrintProcessorInfo, DWORD cbBuf, LPDWORD pcbNeeded, LPDWORD pcReturned) { - BOOL bReturnValue = FALSE; DWORD cchMaxSubKey; DWORD cchPrintProcessor; + DWORD dwErrorCode; DWORD i; HKEY hKey = NULL; HKEY hSubKey = NULL; - LONG lStatus; PBYTE pCurrentOutputPrintProcessor; PBYTE pCurrentOutputPrintProcessorInfo; PRINTPROCESSOR_INFO_1W PrintProcessorInfo1; @@ -446,35 +449,36 @@ // Sanity checks if (Level != 1) { - SetLastError(ERROR_INVALID_LEVEL); + dwErrorCode = ERROR_INVALID_LEVEL; goto Cleanup; } if (!pcbNeeded || !pcReturned) { - // This error must be caught by RPC and returned as RPC_X_NULL_REF_POINTER. - ERR("pcbNeeded or pcReturned is NULL!\n"); + // This error is also caught by RPC and returned as RPC_X_NULL_REF_POINTER. + dwErrorCode = ERROR_INVALID_PARAMETER; goto Cleanup; } // Verify pEnvironment and open its registry key. // We use the registry and not the PrintProcessorList here, because the caller may request information about a different environment. - if (!_OpenEnvironment(pEnvironment, &hKey)) + dwErrorCode = _OpenEnvironment(pEnvironment, &hKey); + if (dwErrorCode != ERROR_SUCCESS) goto Cleanup; // Open the "Print Processors" subkey. - lStatus = RegOpenKeyExW(hKey, L"Print Processors", 0, KEY_READ, &hSubKey); - if (lStatus != ERROR_SUCCESS) - { - ERR("RegOpenKeyExW failed with status %ld!\n", lStatus); + dwErrorCode = (DWORD)RegOpenKeyExW(hKey, L"Print Processors", 0, KEY_READ, &hSubKey); + if (dwErrorCode != ERROR_SUCCESS) + { + ERR("RegOpenKeyExW failed with status %lu!\n", dwErrorCode); goto Cleanup; } // Get the number of Print Processors and maximum sub key length. - lStatus = RegQueryInfoKeyW(hSubKey, NULL, NULL, NULL, pcReturned, &cchMaxSubKey, NULL, NULL, NULL, NULL, NULL, NULL); - if (lStatus != ERROR_SUCCESS) - { - ERR("RegQueryInfoKeyW failed with status %ld!\n", lStatus); + dwErrorCode = (DWORD)RegQueryInfoKeyW(hSubKey, NULL, NULL, NULL, pcReturned, &cchMaxSubKey, NULL, NULL, NULL, NULL, NULL, NULL); + if (dwErrorCode != ERROR_SUCCESS) + { + ERR("RegQueryInfoKeyW failed with status %lu!\n", dwErrorCode); goto Cleanup; } @@ -482,6 +486,7 @@ pwszTemp = DllAllocSplMem((cchMaxSubKey + 1) * sizeof(WCHAR)); if (!pwszTemp) { + dwErrorCode = ERROR_NOT_ENOUGH_MEMORY; ERR("DllAllocSplMem failed with error %lu!\n", GetLastError()); goto Cleanup; } @@ -494,10 +499,10 @@ // RegEnumKeyExW sucks! Unlike similar API functions, it only returns the actual numbers of characters copied when you supply a buffer large enough. // So use pwszTemp with its size cchMaxSubKey for this. cchPrintProcessor = cchMaxSubKey; - lStatus = RegEnumKeyExW(hSubKey, i, pwszTemp, &cchPrintProcessor, NULL, NULL, NULL, NULL); - if (lStatus != ERROR_SUCCESS) - { - ERR("RegEnumKeyExW failed with status %ld!\n", lStatus); + dwErrorCode = (DWORD)RegEnumKeyExW(hSubKey, i, pwszTemp, &cchPrintProcessor, NULL, NULL, NULL, NULL); + if (dwErrorCode != ERROR_SUCCESS) + { + ERR("RegEnumKeyExW failed with status %lu!\n", dwErrorCode); goto Cleanup; } @@ -507,7 +512,7 @@ // Check if the supplied buffer is large enough. if (cbBuf < *pcbNeeded) { - SetLastError(ERROR_INSUFFICIENT_BUFFER); + dwErrorCode = ERROR_INSUFFICIENT_BUFFER; goto Cleanup; } @@ -522,10 +527,10 @@ cchPrintProcessor = cchMaxSubKey; // Copy the Print Processor name. - lStatus = RegEnumKeyExW(hSubKey, i, (PWSTR)pCurrentOutputPrintProcessor, &cchPrintProcessor, NULL, NULL, NULL, NULL); - if (lStatus != ERROR_SUCCESS) - { - ERR("RegEnumKeyExW failed with status %ld!\n", lStatus); + dwErrorCode = (DWORD)RegEnumKeyExW(hSubKey, i, (PWSTR)pCurrentOutputPrintProcessor, &cchPrintProcessor, NULL, NULL, NULL, NULL); + if (dwErrorCode != ERROR_SUCCESS) + { + ERR("RegEnumKeyExW failed with status %lu!\n", dwErrorCode); goto Cleanup; } @@ -539,8 +544,7 @@ } // We've finished successfully! - SetLastError(ERROR_SUCCESS); - bReturnValue = TRUE; + dwErrorCode = ERROR_SUCCESS; Cleanup: if (pwszTemp) @@ -552,7 +556,8 @@ if (hKey) RegCloseKey(hKey); - return bReturnValue; + SetLastError(dwErrorCode); + return (dwErrorCode == ERROR_SUCCESS); } /** @@ -592,34 +597,34 @@ const WCHAR wszPath[] = L"\\PRTPROCS\\"; const DWORD cchPath = _countof(wszPath) - 1; - BOOL bReturnValue = FALSE; DWORD cbDataWritten; + DWORD dwErrorCode; HKEY hKey = NULL; - LONG lStatus; // Sanity checks if (Level != 1) { - SetLastError(ERROR_INVALID_LEVEL); + dwErrorCode = ERROR_INVALID_LEVEL; goto Cleanup; } if (!pcbNeeded) { - // This error must be caught by RPC and returned as RPC_X_NULL_REF_POINTER. - ERR("pcbNeeded is NULL!\n"); + // This error is also caught by RPC and returned as RPC_X_NULL_REF_POINTER. + dwErrorCode = ERROR_INVALID_PARAMETER; goto Cleanup; } // Verify pEnvironment and open its registry key. - if (!_OpenEnvironment(pEnvironment, &hKey)) + dwErrorCode = _OpenEnvironment(pEnvironment, &hKey); + if (dwErrorCode != ERROR_SUCCESS) goto Cleanup; // Determine the size of the required buffer. - lStatus = RegQueryValueExW(hKey, L"Directory", NULL, NULL, NULL, pcbNeeded); - if (lStatus != ERROR_SUCCESS) - { - ERR("RegQueryValueExW failed with status %ld!\n", lStatus); + dwErrorCode = (DWORD)RegQueryValueExW(hKey, L"Directory", NULL, NULL, NULL, pcbNeeded); + if (dwErrorCode != ERROR_SUCCESS) + { + ERR("RegQueryValueExW failed with status %lu!\n", dwErrorCode); goto Cleanup; } @@ -629,7 +634,7 @@ // Is the supplied buffer large enough? if (cbBuf < *pcbNeeded) { - SetLastError(ERROR_INSUFFICIENT_BUFFER); + dwErrorCode = ERROR_INSUFFICIENT_BUFFER; goto Cleanup; } @@ -638,20 +643,20 @@ CopyMemory(&pPrintProcessorInfo[cchSpoolDirectory], wszPath, cchPath * sizeof(WCHAR)); // Get the directory name from the registry. - lStatus = RegQueryValueExW(hKey, L"Directory", NULL, NULL, &pPrintProcessorInfo[cchSpoolDirectory + cchPath], &cbDataWritten); - if (lStatus != ERROR_SUCCESS) - { - ERR("RegQueryValueExW failed with status %ld!\n", lStatus); + dwErrorCode = (DWORD)RegQueryValueExW(hKey, L"Directory", NULL, NULL, &pPrintProcessorInfo[cchSpoolDirectory + cchPath], &cbDataWritten); + if (dwErrorCode != ERROR_SUCCESS) + { + ERR("RegQueryValueExW failed with status %lu!\n", dwErrorCode); goto Cleanup; } // We've finished successfully! - SetLastError(ERROR_SUCCESS); - bReturnValue = TRUE; + dwErrorCode = ERROR_SUCCESS; Cleanup: if (hKey) RegCloseKey(hKey); - return bReturnValue; + SetLastError(dwErrorCode); + return (dwErrorCode == ERROR_SUCCESS); }

9 years, 6 months

[tfaber] 68246: [ROSAUTOTEST] - Flush cout after each write as already done by Colin in r66855, per ROSTESTS-158 - Use DbgPrint instead of OutputDebugStringA again because the latter only calls the...

by tfaber＠svn.reactos.org

Author: tfaber Date: Tue Jun 23 10:06:38 2015 New Revision: 68246 URL: http://svn.reactos.org/svn/reactos?rev=68246&view=rev Log: [ROSAUTOTEST] - Flush cout after each write as already done by Colin in r66855, per ROSTESTS-158 - Use DbgPrint instead of OutputDebugStringA again because the latter only calls the former anyway Fixes test summary lines not being recognized by Testman, especially on VMware. A little summary so we don't keep going back and forth with this function: 1) Only writing complete lines is required to that the output doesn't mix with debug output from other components. See r55618 2) OutputDebugStringA splits its input into 512-byte-sized blocks with no regard for line breaks, so using it with strings larger than 512 bytes breaks (1). 3) OutputDebugStringA eventually calls DbgPrint("%s", string) anyway so using it with chunks smaller than 512 bytes is not an optimization As a result, yes this function MUST split up the lines itself, this can't be optimized or simplified away! kthxbye ROSTESTS-178 #resolve Modified: trunk/rostests/rosautotest/tools.cpp Modified: trunk/rostests/rosautotest/tools.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/tools.cpp?rev… ============================================================================== --- trunk/rostests/rosautotest/tools.cpp [iso-8859-1] (original) +++ trunk/rostests/rosautotest/tools.cpp [iso-8859-1] Tue Jun 23 10:06:38 2015 @@ -2,7 +2,7 @@ * PROJECT: ReactOS Automatic Testing Utility * LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation * PURPOSE: Various helper functions - * COPYRIGHT: Copyright 2008-2009 Colin Finck <colin(a)reactos.org> + * COPYRIGHT: Copyright 2008-2015 Colin Finck <colin(a)reactos.org> */ #include "precomp.h" @@ -136,7 +136,7 @@ } DbgString[size] = 0; - OutputDebugStringA(DbgString); + DbgPrint("%s", DbgString); } last_newline = curr_pos; @@ -150,11 +150,11 @@ { /* Output the whole string */ if(Configuration.DoPrint()) - cout << NewString; + cout << NewString << flush; memcpy(DbgString, NewString.c_str() + start, size); DbgString[size] = 0; - OutputDebugStringA(DbgString); + DbgPrint("%s", DbgString); NewString.clear(); return NewString; @@ -162,7 +162,7 @@ /* Output full lines only */ if(Configuration.DoPrint()) - cout << NewString.substr(0, start); + cout << NewString.substr(0, start) << flush; /* Return the remaining chunk */ return NewString.substr(start, size);

9 years, 6 months

[tfaber] 68245: [ROSAUTOTEST] - Revert r66855 to make the upcoming commit's diff show my actual changes. ROSTESTS-178 ROSTESTS-158

by tfaber＠svn.reactos.org

Author: tfaber Date: Tue Jun 23 09:54:46 2015 New Revision: 68245 URL: http://svn.reactos.org/svn/reactos?rev=68245&view=rev Log: [ROSAUTOTEST] - Revert r66855 to make the upcoming commit's diff show my actual changes. ROSTESTS-178 ROSTESTS-158 Modified: trunk/rostests/rosautotest/CWineTest.cpp trunk/rostests/rosautotest/precomp.h trunk/rostests/rosautotest/tools.cpp Modified: trunk/rostests/rosautotest/CWineTest.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/CWineTest.cpp… ============================================================================== --- trunk/rostests/rosautotest/CWineTest.cpp [iso-8859-1] (original) +++ trunk/rostests/rosautotest/CWineTest.cpp [iso-8859-1] Tue Jun 23 09:54:46 2015 @@ -276,6 +276,7 @@ stringstream ss, ssFinish; DWORD StartTime; float TotalTime; + string tailString; CPipe Pipe; char Buffer[1024]; @@ -294,7 +295,7 @@ { /* Output text through StringOut, even while the test is still running */ Buffer[BytesAvailable] = 0; - StringOut(string(Buffer)); + tailString = StringOut(tailString.append(string(Buffer)), false); if(Configuration.DoSubmit()) TestInfo->Log += Buffer; @@ -304,9 +305,16 @@ } catch(CTestException& e) { + if(!tailString.empty()) + StringOut(tailString); + tailString.clear(); StringOut(e.GetMessage()); TestInfo->Log += e.GetMessage(); } + + /* Print what's left */ + if(!tailString.empty()) + StringOut(tailString); TotalTime = ((float)GetTickCount() - StartTime)/1000; ssFinish << "Test " << TestInfo->Test << " completed in "; Modified: trunk/rostests/rosautotest/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/precomp.h?rev… ============================================================================== --- trunk/rostests/rosautotest/precomp.h [iso-8859-1] (original) +++ trunk/rostests/rosautotest/precomp.h [iso-8859-1] Tue Jun 23 09:54:46 2015 @@ -69,7 +69,7 @@ string EscapeString(const string& Input); string GetINIValue(PCWCH AppName, PCWCH KeyName, PCWCH FileName); bool IsNumber(const char* Input); -void StringOut(const string& InputString); +string StringOut(const string& String, bool forcePrint = true); string UnicodeToAscii(PCWSTR UnicodeString); string UnicodeToAscii(const wstring& UnicodeString); Modified: trunk/rostests/rosautotest/tools.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/tools.cpp?rev… ============================================================================== --- trunk/rostests/rosautotest/tools.cpp [iso-8859-1] (original) +++ trunk/rostests/rosautotest/tools.cpp [iso-8859-1] Tue Jun 23 09:54:46 2015 @@ -2,11 +2,12 @@ * PROJECT: ReactOS Automatic Testing Utility * LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation * PURPOSE: Various helper functions - * COPYRIGHT: Copyright 2008-2015 Colin Finck <colin(a)reactos.org> + * COPYRIGHT: Copyright 2008-2009 Colin Finck <colin(a)reactos.org> */ #include "precomp.h" +#define DBGPRINT_BUFSIZE 511 static const char HexCharacters[] = "0123456789ABCDEF"; /** @@ -86,43 +87,85 @@ /** * Outputs a string through the standard output and the debug output. - * The input string may have LF or CRLF line endings. - * - * @param InputString + * The string may have LF or CRLF line endings. + * + * @param String * The std::string to output */ -void -StringOut(const string& InputString) -{ - const char* pInput = InputString.c_str(); - char* OutputString = new char[InputString.size() + 1]; - char* pOutput = OutputString; +string +StringOut(const string& String, bool forcePrint) +{ + char DbgString[DBGPRINT_BUFSIZE + 1]; + size_t i, start = 0, last_newline = 0, size = 0, curr_pos = 0; + string NewString; /* Unify the line endings (the piped output of the tests may use CRLF) */ - while (*pInput) + for(i = 0; i < String.size(); i++) { /* If this is a CRLF line-ending, only copy a \n to the new string and skip the next character */ - if (*pInput == '\r' && *(pInput + 1) == '\n') - { - *pOutput = '\n'; - ++pInput; + if(String[i] == '\r' && String[i + 1] == '\n') + { + NewString += '\n'; + ++i; } else { - *pOutput = *pInput; - } - - ++pInput; - ++pOutput; - } - - *pOutput = 0; - OutputDebugStringA(OutputString); - - if (Configuration.DoPrint()) - cout << OutputString << flush; - - delete[] OutputString; + /* Otherwise copy the string */ + NewString += String[i]; + } + + curr_pos = NewString.size(); + + /* Try to print whole lines but obey the 512 bytes chunk size limit*/ + if(NewString[curr_pos - 1] == '\n' || (curr_pos - start) == DBGPRINT_BUFSIZE) + { + if((curr_pos - start) >= DBGPRINT_BUFSIZE) + { + /* No newlines so far, or the string just fits */ + if(last_newline <= start || ((curr_pos - start == DBGPRINT_BUFSIZE) && NewString[curr_pos - 1] == '\n')) + { + size = curr_pos - start; + memcpy(DbgString, NewString.c_str() + start, size); + start = curr_pos; + } + else + { + size = last_newline - start; + memcpy(DbgString, NewString.c_str() + start, size); + start = last_newline; + } + + DbgString[size] = 0; + OutputDebugStringA(DbgString); + } + + last_newline = curr_pos; + } + } + + size = curr_pos - start; + + /* Only print if forced to or if the rest is a whole line */ + if(forcePrint == true || NewString[curr_pos - 1] == '\n') + { + /* Output the whole string */ + if(Configuration.DoPrint()) + cout << NewString; + + memcpy(DbgString, NewString.c_str() + start, size); + DbgString[size] = 0; + OutputDebugStringA(DbgString); + + NewString.clear(); + return NewString; + } + + /* Output full lines only */ + if(Configuration.DoPrint()) + cout << NewString.substr(0, start); + + /* Return the remaining chunk */ + return NewString.substr(start, size); } /**

9 years, 6 months

[pschweitzer] 68244: [CDFS] In case of directory enumeration, validate the record earlier to really prevent any potentiel buffer overflow CORE-9254

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Tue Jun 23 06:54:44 2015 New Revision: 68244 URL: http://svn.reactos.org/svn/reactos?rev=68244&view=rev Log: [CDFS] In case of directory enumeration, validate the record earlier to really prevent any potentiel buffer overflow CORE-9254 Modified: trunk/reactos/drivers/filesystems/cdfs/dirctl.c Modified: trunk/reactos/drivers/filesystems/cdfs/dirctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/d… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/dirctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/dirctl.c [iso-8859-1] Tue Jun 23 06:54:44 2015 @@ -117,6 +117,12 @@ DPRINT("Index %lu RecordLength %lu Offset %lu\n", *pIndex, Record->RecordLength, *CurrentOffset); + if (!CdfsIsRecordValid(DeviceExt, Record)) + { + CcUnpinData(*Context); + return STATUS_DISK_CORRUPT_ERROR; + } + CdfsGetDirEntryName(DeviceExt, Record, Name); *Ptr = Record; @@ -259,18 +265,11 @@ { break; } - else if (Status == STATUS_UNSUCCESSFUL) + else if (Status == STATUS_UNSUCCESSFUL || Status == STATUS_DISK_CORRUPT_ERROR) { /* Note: the directory cache has already been unpinned */ RtlFreeUnicodeString(&FileToFindUpcase); return Status; - } - - if (!CdfsIsRecordValid(DeviceExt, Record)) - { - RtlFreeUnicodeString(&FileToFindUpcase); - CcUnpinData(Context); - return STATUS_DISK_CORRUPT_ERROR; } DPRINT("Name '%S'\n", name);

9 years, 6 months

[tfaber] 68243: [NTOS:MM] - Print some debug information before asserting in MiRosUnmapViewOfSection. CORE-9865

by tfaber＠svn.reactos.org

Author: tfaber Date: Mon Jun 22 20:47:56 2015 New Revision: 68243 URL: http://svn.reactos.org/svn/reactos?rev=68243&view=rev Log: [NTOS:MM] - Print some debug information before asserting in MiRosUnmapViewOfSection. CORE-9865 Modified: trunk/reactos/ntoskrnl/mm/section.c Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] Mon Jun 22 20:47:56 2015 @@ -4232,14 +4232,24 @@ ((char*)ImageBaseAddress + (ULONG_PTR)SectionSegments[i].Image.VirtualAddress); Status = MmUnmapViewOfSegment(AddressSpace, SBaseAddress); - NT_ASSERT(NT_SUCCESS(Status)); + if (!NT_SUCCESS(Status)) + { + DPRINT1("MmUnmapViewOfSegment failed for %p (Process %p) with %lx\n", + SBaseAddress, Process, Status); + NT_ASSERT(NT_SUCCESS(Status)); + } } } } else { Status = MmUnmapViewOfSegment(AddressSpace, BaseAddress); - NT_ASSERT(NT_SUCCESS(Status)); + if (!NT_SUCCESS(Status)) + { + DPRINT1("MmUnmapViewOfSegment failed for %p (Process %p) with %lx\n", + BaseAddress, Process, Status); + NT_ASSERT(NT_SUCCESS(Status)); + } } MmUnlockAddressSpace(AddressSpace);

9 years, 6 months

[pschweitzer] 68242: [CDFS] Prevent code duplication by making CdfsGetEntryName() call CdfsGetDirEntryName() which is now available driver-wide

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Mon Jun 22 18:42:56 2015 New Revision: 68242 URL: http://svn.reactos.org/svn/reactos?rev=68242&view=rev Log: [CDFS] Prevent code duplication by making CdfsGetEntryName() call CdfsGetDirEntryName() which is now available driver-wide Modified: trunk/reactos/drivers/filesystems/cdfs/cdfs.h trunk/reactos/drivers/filesystems/cdfs/dirctl.c trunk/reactos/drivers/filesystems/cdfs/fcb.c trunk/reactos/drivers/filesystems/cdfs/misc.c Modified: trunk/reactos/drivers/filesystems/cdfs/cdfs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/c… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/cdfs.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/cdfs.h [iso-8859-1] Mon Jun 22 18:42:56 2015 @@ -484,6 +484,11 @@ CdfsIsRecordValid(IN PDEVICE_EXTENSION DeviceExt, IN PDIR_RECORD Record); +VOID +CdfsGetDirEntryName(PDEVICE_EXTENSION DeviceExt, + PDIR_RECORD Record, + PWSTR Name); + /* rw.c */ NTSTATUS Modified: trunk/reactos/drivers/filesystems/cdfs/dirctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/d… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/dirctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/dirctl.c [iso-8859-1] Mon Jun 22 18:42:56 2015 @@ -117,31 +117,7 @@ DPRINT("Index %lu RecordLength %lu Offset %lu\n", *pIndex, Record->RecordLength, *CurrentOffset); - if (Record->FileIdLength == 1 && Record->FileId[0] == 0) - { - wcscpy(Name, L"."); - } - else if (Record->FileIdLength == 1 && Record->FileId[0] == 1) - { - wcscpy(Name, L".."); - } - else - { - if (DeviceExt->CdInfo.JolietLevel == 0) - { - ULONG i; - - for (i = 0; i < Record->FileIdLength && Record->FileId[i] != ';'; i++) - Name[i] = (WCHAR)Record->FileId[i]; - Name[i] = 0; - } - else - { - CdfsSwapString(Name, Record->FileId, Record->FileIdLength); - } - } - - DPRINT("Name '%S'\n", Name); + CdfsGetDirEntryName(DeviceExt, Record, Name); *Ptr = Record; Modified: trunk/reactos/drivers/filesystems/cdfs/fcb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/fcb.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/fcb.c [iso-8859-1] Mon Jun 22 18:42:56 2015 @@ -326,44 +326,6 @@ } -static VOID -CdfsGetDirEntryName(PDEVICE_EXTENSION DeviceExt, - PDIR_RECORD Record, - PWSTR Name) - /* - * FUNCTION: Retrieves the file name from a directory record. - */ -{ - if (Record->FileIdLength == 1 && Record->FileId[0] == 0) - { - wcscpy(Name, L"."); - } - else if (Record->FileIdLength == 1 && Record->FileId[0] == 1) - { - wcscpy(Name, L".."); - } - else - { - if (DeviceExt->CdInfo.JolietLevel == 0) - { - ULONG i; - - for (i = 0; i < Record->FileIdLength && Record->FileId[i] != ';'; i++) - Name[i] = (WCHAR)Record->FileId[i]; - Name[i] = 0; - } - else - { - CdfsSwapString(Name, - Record->FileId, - Record->FileIdLength); - } - } - - DPRINT("Name '%S'\n", Name); -} - - NTSTATUS CdfsMakeFCBFromDirEntry(PVCB Vcb, PFCB DirectoryFCB, Modified: trunk/reactos/drivers/filesystems/cdfs/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/m… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/misc.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/misc.c [iso-8859-1] Mon Jun 22 18:42:56 2015 @@ -346,4 +346,41 @@ DPRINT("Returning short name %wZ for long name %wZ\n", ShortName, LongName); } +VOID +CdfsGetDirEntryName(PDEVICE_EXTENSION DeviceExt, + PDIR_RECORD Record, + PWSTR Name) + /* + * FUNCTION: Retrieves the file name from a directory record. + */ +{ + if (Record->FileIdLength == 1 && Record->FileId[0] == 0) + { + wcscpy(Name, L"."); + } + else if (Record->FileIdLength == 1 && Record->FileId[0] == 1) + { + wcscpy(Name, L".."); + } + else + { + if (DeviceExt->CdInfo.JolietLevel == 0) + { + ULONG i; + + for (i = 0; i < Record->FileIdLength && Record->FileId[i] != ';'; i++) + Name[i] = (WCHAR)Record->FileId[i]; + Name[i] = 0; + } + else + { + CdfsSwapString(Name, + Record->FileId, + Record->FileIdLength); + } + } + + DPRINT("Name '%S'\n", Name); +} + /* EOF */

9 years, 6 months

[akhaldi] 68241: [CMD][EXPLORER] Properly track resource file dependencies. CORE-9806

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Jun 22 18:39:14 2015 New Revision: 68241 URL: http://svn.reactos.org/svn/reactos?rev=68241&view=rev Log: [CMD][EXPLORER] Properly track resource file dependencies. CORE-9806 Modified: trunk/reactos/base/shell/cmd/CMakeLists.txt trunk/reactos/base/shell/explorer/CMakeLists.txt Modified: trunk/reactos/base/shell/cmd/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/CMakeLists.… ============================================================================== --- trunk/reactos/base/shell/cmd/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/CMakeLists.txt [iso-8859-1] Mon Jun 22 18:39:14 2015 @@ -67,6 +67,7 @@ window.c precomp.h) +add_rc_deps(cmd.rc ${CMAKE_CURRENT_SOURCE_DIR}/res/terminal.ico) add_executable(cmd ${SOURCE} cmd.rc) target_link_libraries(cmd wine) set_module_type(cmd win32cui UNICODE) Modified: trunk/reactos/base/shell/explorer/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/CMakeL… ============================================================================== --- trunk/reactos/base/shell/explorer/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/CMakeLists.txt [iso-8859-1] Mon Jun 22 18:39:14 2015 @@ -23,6 +23,8 @@ util.cpp precomp.h) +file(GLOB explorer_rc_deps res/*.*) +add_rc_deps(explorer.rc ${explorer_rc_deps}) add_executable(explorer ${SOURCE} explorer.rc) target_link_libraries(explorer uuid atlnew wine) set_module_type(explorer win32gui UNICODE)

9 years, 6 months

[akhaldi] 68240: [LIVECD] Add the required folder for the favorites menu to work. By Barrett Karish. CORE-9780

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Jun 22 18:33:49 2015 New Revision: 68240 URL: http://svn.reactos.org/svn/reactos?rev=68240&view=rev Log: [LIVECD] Add the required folder for the favorites menu to work. By Barrett Karish. CORE-9780 Modified: trunk/reactos/boot/CMakeLists.txt Modified: trunk/reactos/boot/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/CMakeLists.txt?rev=68… ============================================================================== --- trunk/reactos/boot/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/boot/CMakeLists.txt [iso-8859-1] Mon Jun 22 18:33:49 2015 @@ -20,8 +20,9 @@ #clear it out file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/livecd.lst "") -#create the empty Desktop and Start Menu folders +#create the empty Desktop, Favorites, and Start Menu folders file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/livecd.lst "Profiles/Default User/Desktop\n") +file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/livecd.lst "Profiles/Default User/Favorites\n") file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/livecd.lst "Profiles/Default User/Start Menu/Programs\n") add_custom_target(livecd @@ -33,8 +34,9 @@ #clear it out file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "") -#create the empty Desktop and Start Menu folders +#create the empty Desktop, Favorites, and Start Menu folders file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/Default User/Desktop\n") +file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "Profiles/Default User/Favorites\n") file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/Default User/Start Menu/Programs\n") add_custom_target(hybridcd

9 years, 6 months

[pschweitzer] 68239: [CDFS] Revamp r68233: - Don't duplicate code, implement checks in a helper function - When checking name content, do it earlier for better performances - Add extra checks to pr...

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Mon Jun 22 17:27:47 2015 New Revision: 68239 URL: http://svn.reactos.org/svn/reactos?rev=68239&view=rev Log: [CDFS] Revamp r68233: - Don't duplicate code, implement checks in a helper function - When checking name content, do it earlier for better performances - Add extra checks to prevent a potential buffer overflow in case of Joliet names with illformed entries CORE-9254 Modified: trunk/reactos/drivers/filesystems/cdfs/cdfs.h trunk/reactos/drivers/filesystems/cdfs/dirctl.c trunk/reactos/drivers/filesystems/cdfs/fcb.c trunk/reactos/drivers/filesystems/cdfs/misc.c Modified: trunk/reactos/drivers/filesystems/cdfs/cdfs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/c… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/cdfs.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/cdfs.h [iso-8859-1] Mon Jun 22 17:27:47 2015 @@ -480,6 +480,10 @@ PUNICODE_STRING LongName, PUNICODE_STRING ShortName); +BOOLEAN +CdfsIsRecordValid(IN PDEVICE_EXTENSION DeviceExt, + IN PDIR_RECORD Record); + /* rw.c */ NTSTATUS Modified: trunk/reactos/drivers/filesystems/cdfs/dirctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/d… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/dirctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/dirctl.c [iso-8859-1] Mon Jun 22 17:27:47 2015 @@ -290,9 +290,8 @@ return Status; } - if (Record->RecordLength < Record->FileIdLength + FIELD_OFFSET(DIR_RECORD, FileId)) - { - DPRINT1("Found corrupted entry! %u - %u\n", Record->RecordLength, Record->FileIdLength + FIELD_OFFSET(DIR_RECORD, FileId)); + if (!CdfsIsRecordValid(DeviceExt, Record)) + { RtlFreeUnicodeString(&FileToFindUpcase); CcUnpinData(Context); return STATUS_DISK_CORRUPT_ERROR; @@ -301,14 +300,6 @@ DPRINT("Name '%S'\n", name); RtlInitUnicodeString(&LongName, name); - /* Was the entry degenerated? */ - if (LongName.Length < sizeof(WCHAR)) - { - DPRINT1("Found entry with invalid name!\n"); - RtlFreeUnicodeString(&FileToFindUpcase); - CcUnpinData(Context); - return STATUS_DISK_CORRUPT_ERROR; - } ShortName.Length = 0; ShortName.MaximumLength = 26; Modified: trunk/reactos/drivers/filesystems/cdfs/fcb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/fcb.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/fcb.c [iso-8859-1] Mon Jun 22 17:27:47 2015 @@ -558,9 +558,8 @@ DPRINT("RecordLength %u ExtAttrRecordLength %u NameLength %u\n", Record->RecordLength, Record->ExtAttrRecordLength, Record->FileIdLength); - if (Record->RecordLength < Record->FileIdLength + FIELD_OFFSET(DIR_RECORD, FileId)) - { - DPRINT1("Found corrupted entry! %u - %u\n", Record->RecordLength, Record->FileIdLength + FIELD_OFFSET(DIR_RECORD, FileId)); + if (!CdfsIsRecordValid(DeviceExt, Record)) + { RtlFreeUnicodeString(&FileToFindUpcase); CcUnpinData(Context); return STATUS_DISK_CORRUPT_ERROR; @@ -572,15 +571,6 @@ DPRINT ("Offset %lu\n", Offset); RtlInitUnicodeString(&LongName, Name); - /* Was the entry degenerated? */ - if (LongName.Length < sizeof(WCHAR)) - { - DPRINT1("Found entry with invalid name!\n"); - RtlFreeUnicodeString(&FileToFindUpcase); - CcUnpinData(Context); - return STATUS_DISK_CORRUPT_ERROR; - } - RtlInitEmptyUnicodeString(&ShortName, ShortNameBuffer, sizeof(ShortNameBuffer)); RtlZeroMemory(ShortNameBuffer, sizeof(ShortNameBuffer)); Modified: trunk/reactos/drivers/filesystems/cdfs/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/m… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/misc.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/misc.c [iso-8859-1] Mon Jun 22 17:27:47 2015 @@ -206,6 +206,55 @@ return FsRtlIsFatDbcsLegal(DbcsName, FALSE, FALSE, FALSE); } +BOOLEAN +CdfsIsRecordValid(IN PDEVICE_EXTENSION DeviceExt, + IN PDIR_RECORD Record) +{ + if (Record->RecordLength < Record->FileIdLength + FIELD_OFFSET(DIR_RECORD, FileId)) + { + DPRINT1("Found corrupted entry! %u - %u\n", Record->RecordLength, Record->FileIdLength + FIELD_OFFSET(DIR_RECORD, FileId)); + return FALSE; + } + + if (Record->FileIdLength == 0) + { + DPRINT1("Found corrupted entry (null size)!\n"); + return FALSE; + } + + if (DeviceExt->CdInfo.JolietLevel == 0) + { + if (Record->FileId[0] == ANSI_NULL && Record->FileIdLength != 1) + { + DPRINT1("Found corrupted entry!\n"); + return FALSE; + } + } + else + { + if (Record->FileIdLength & 1 && Record->FileIdLength != 1) + { + DPRINT1("Found corrupted entry! %u\n", Record->FileIdLength); + return FALSE; + } + + if (Record->FileIdLength == 1 && Record->FileId[0] != 0 && Record->FileId[0] != 1) + { + DPRINT1("Found corrupted entry! %c\n", Record->FileId[0]); + DPRINT1("%wc\n", ((PWSTR)Record->FileId)[0]); + return FALSE; + } + + if (((PWSTR)Record->FileId)[0] == UNICODE_NULL) + { + DPRINT1("Found corrupted entry!\n"); + return FALSE; + } + } + + return TRUE; +} + VOID CdfsShortNameCacheGet (PFCB DirectoryFcb,

9 years, 6 months

[akhaldi] 68238: [EXPLORER] Explicitly request applications to re-register their systray icons as soon as explorer is started. By Joachim Henze. CORE-9824

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Jun 22 16:01:43 2015 New Revision: 68238 URL: http://svn.reactos.org/svn/reactos?rev=68238&view=rev Log: [EXPLORER] Explicitly request applications to re-register their systray icons as soon as explorer is started. By Joachim Henze. CORE-9824 Modified: trunk/reactos/base/shell/explorer/trayntfy.cpp Modified: trunk/reactos/base/shell/explorer/trayntfy.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/traynt… ============================================================================== --- trunk/reactos/base/shell/explorer/trayntfy.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/trayntfy.cpp [iso-8859-1] Mon Jun 22 16:01:43 2015 @@ -434,6 +434,13 @@ LRESULT OnCreate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { Toolbar.Initialize(m_hWnd); + + // Explicitly request running applications to re-register their systray icons + SendNotifyMessage(HWND_BROADCAST, + RegisterWindowMessage(TEXT("TaskbarCreated")), + 0, + 0); + return TRUE; }

9 years, 6 months

← Newer
1
...
6
7
8
9
10
11
12
...
35
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 June 2015