Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tfaber] 68261: [SHELL32] - Fix reference leak in SHLoadInProc
by tfaber＠svn.reactos.org 25 Jun '15

25 Jun '15

Author: tfaber Date: Thu Jun 25 12:57:03 2015 New Revision: 68261 URL: http://svn.reactos.org/svn/reactos?rev=68261&view=rev Log: [SHELL32] - Fix reference leak in SHLoadInProc Modified: trunk/reactos/dll/win32/shell32/wine/shell32_main.c Modified: trunk/reactos/dll/win32/shell32/wine/shell32_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/wine/she… ============================================================================== --- trunk/reactos/dll/win32/shell32/wine/shell32_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/wine/shell32_main.c [iso-8859-1] Thu Jun 25 12:57:03 2015 @@ -1033,8 +1033,12 @@ TRACE("%s\n", debugstr_guid(rclsid)); CoCreateInstance(rclsid, NULL, CLSCTX_INPROC_SERVER, &IID_IUnknown,&ptr); - if (ptr) + if(ptr) + { + IUnknown * pUnk = ptr; + IUnknown_Release(pUnk); return S_OK; + } return DISP_E_MEMBERNOTFOUND; }

1 0

[tfaber] 68260: [SHELL32] - Fix shell folder reference leak in SHGetFileInfoW CORE-9867
by tfaber＠svn.reactos.org 25 Jun '15

25 Jun '15

Author: tfaber Date: Thu Jun 25 12:51:38 2015 New Revision: 68260 URL: http://svn.reactos.org/svn/reactos?rev=68260&view=rev Log: [SHELL32] - Fix shell folder reference leak in SHGetFileInfoW CORE-9867 Modified: trunk/reactos/dll/win32/shell32/wine/shell32_main.c Modified: trunk/reactos/dll/win32/shell32/wine/shell32_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/wine/she… ============================================================================== --- trunk/reactos/dll/win32/shell32/wine/shell32_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/wine/shell32_main.c [iso-8859-1] Thu Jun 25 12:51:38 2015 @@ -723,6 +723,9 @@ if (flags & ~SHGFI_KNOWN_FLAGS) FIXME("unknown flags %08x\n", flags & ~SHGFI_KNOWN_FLAGS); + if (psfParent) + IShellFolder_Release(psfParent); + if (hr != S_OK) ret = FALSE;

1 0

[cfinck] 68259: [LOCALSPL] - Implement LocalSetJob for Level 1 and 2. - Add pPrintProcessor, pwszPrintProcessorParameters and pwszStatus members to the LOCAL_JOB structure and use them in LocalAddJ...
by cfinck＠svn.reactos.org 25 Jun '15

25 Jun '15

Author: cfinck Date: Thu Jun 25 12:29:18 2015 New Revision: 68259 URL: http://svn.reactos.org/svn/reactos?rev=68259&view=rev Log: [LOCALSPL] - Implement LocalSetJob for Level 1 and 2. - Add pPrintProcessor, pwszPrintProcessorParameters and pwszStatus members to the LOCAL_JOB structure and use them in LocalAddJob, LocalGetJob and LocalSetJob. - Fix naming of some LOCAL_JOB members. Modified: 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 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] Thu Jun 25 12:29:18 2015 @@ -164,7 +164,7 @@ } // Add it to the Printer's Job List. - if (!InsertElementSkiplist(&pJob->Printer->JobList, pJob)) + if (!InsertElementSkiplist(&pJob->pPrinter->JobList, pJob)) { ERR("InsertElementSkiplist failed for job %lu for the Printer's Job List!\n", pJob->dwJobID); goto Cleanup; @@ -215,10 +215,10 @@ goto Cleanup; } - pPrinterHandle = (PLOCAL_PRINTER_HANDLE)pHandle->SpecificHandle; + pPrinterHandle = (PLOCAL_PRINTER_HANDLE)pHandle->pSpecificHandle; // This handle must not have started a job yet! - if (pPrinterHandle->StartedJob) + if (pPrinterHandle->pStartedJob) { dwErrorCode = ERROR_INVALID_HANDLE; goto Cleanup; @@ -233,7 +233,7 @@ // 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) + if (pPrinterHandle->pPrinter->dwAttributes & PRINTER_ATTRIBUTE_DIRECT) { dwErrorCode = ERROR_INVALID_ACCESS; goto Cleanup; @@ -264,7 +264,8 @@ } // Copy over defaults to the LOCAL_JOB structure. - pJob->Printer = pPrinterHandle->Printer; + pJob->pPrinter = pPrinterHandle->pPrinter; + pJob->pPrintProcessor = pPrinterHandle->pPrinter->pPrintProcessor; pJob->dwPriority = DEF_PRIORITY; pJob->pwszDatatype = AllocSplStr(pPrinterHandle->pwszDatatype); pJob->pwszDocumentName = AllocSplStr(wszDefaultDocumentName); @@ -321,7 +322,7 @@ // 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)) + if (!InsertTailElementSkiplist(&pJob->pPrinter->JobList, pJob)) { dwErrorCode = ERROR_NOT_ENOUGH_MEMORY; ERR("InsertTailElementSkiplist failed for job %lu for the Printer's Job List!\n", pJob->dwJobID); @@ -363,14 +364,19 @@ DWORD cbDatatype = (wcslen(pJob->pwszDatatype) + 1) * sizeof(WCHAR); DWORD cbDocumentName = (wcslen(pJob->pwszDocumentName) + 1) * sizeof(WCHAR); DWORD cbMachineName = (wcslen(pJob->pwszMachineName) + 1) * sizeof(WCHAR); - DWORD cbPrinterName = (wcslen(pJob->Printer->pwszPrinterName) + 1) * sizeof(WCHAR); + DWORD cbPrinterName = (wcslen(pJob->pPrinter->pwszPrinterName) + 1) * sizeof(WCHAR); + DWORD cbStatus = 0; DWORD cbUserName = (wcslen(pJob->pwszUserName) + 1) * sizeof(WCHAR); DWORD dwErrorCode; JOB_INFO_1W JobInfo1 = { 0 }; PBYTE pString; + // A Status Message is optional. + if (pJob->pwszStatus) + cbStatus = (wcslen(pJob->pwszStatus) + 1) * sizeof(WCHAR); + // Check if the supplied buffer is large enough. - *pcbNeeded = sizeof(JOB_INFO_1W) + cbDatatype + cbDocumentName + cbMachineName + cbPrinterName + cbUserName; + *pcbNeeded = sizeof(JOB_INFO_1W) + cbDatatype + cbDocumentName + cbMachineName + cbPrinterName + cbStatus + cbUserName; if (cbBuf < *pcbNeeded) { dwErrorCode = ERROR_INSUFFICIENT_BUFFER; @@ -393,8 +399,15 @@ pString += cbMachineName; JobInfo1.pPrinterName = (PWSTR)pString; - CopyMemory(pString, pJob->Printer->pwszPrinterName, cbPrinterName); + CopyMemory(pString, pJob->pPrinter->pwszPrinterName, cbPrinterName); pString += cbPrinterName; + + if (cbStatus) + { + JobInfo1.pStatus = (PWSTR)pString; + CopyMemory(pString, pJob->pwszStatus, cbStatus); + pString += cbStatus; + } JobInfo1.pUserName = (PWSTR)pString; CopyMemory(pString, pJob->pwszUserName, cbUserName); @@ -419,11 +432,13 @@ { DWORD cbDatatype = (wcslen(pJob->pwszDatatype) + 1) * sizeof(WCHAR); DWORD cbDocumentName = (wcslen(pJob->pwszDocumentName) + 1) * sizeof(WCHAR); - DWORD cbDriverName = (wcslen(pJob->Printer->pwszPrinterDriver) + 1) * sizeof(WCHAR); + DWORD cbDriverName = (wcslen(pJob->pPrinter->pwszPrinterDriver) + 1) * sizeof(WCHAR); DWORD cbMachineName = (wcslen(pJob->pwszMachineName) + 1) * sizeof(WCHAR); DWORD cbNotifyName = (wcslen(pJob->pwszNotifyName) + 1) * sizeof(WCHAR); - DWORD cbPrinterName = (wcslen(pJob->Printer->pwszPrinterName) + 1) * sizeof(WCHAR); - DWORD cbPrintProcessor = (wcslen(pJob->Printer->pPrintProcessor->pwszName) + 1) * sizeof(WCHAR); + DWORD cbPrinterName = (wcslen(pJob->pPrinter->pwszPrinterName) + 1) * sizeof(WCHAR); + DWORD cbPrintProcessor = (wcslen(pJob->pPrintProcessor->pwszName) + 1) * sizeof(WCHAR); + DWORD cbPrintProcessorParameters = 0; + DWORD cbStatus = 0; DWORD cbUserName = (wcslen(pJob->pwszUserName) + 1) * sizeof(WCHAR); DWORD dwErrorCode; FILETIME ftNow; @@ -433,8 +448,15 @@ ULARGE_INTEGER uliNow; ULARGE_INTEGER uliSubmitted; + // Print Processor Parameters and Status Message are optional. + if (pJob->pwszPrintProcessorParameters) + cbPrintProcessorParameters = (wcslen(pJob->pwszPrintProcessorParameters) + 1) * sizeof(WCHAR); + + if (pJob->pwszStatus) + cbStatus = (wcslen(pJob->pwszStatus) + 1) * sizeof(WCHAR); + // Check if the supplied buffer is large enough. - *pcbNeeded = sizeof(JOB_INFO_2W) + cbDatatype + sizeof(DEVMODEW) + cbDocumentName + cbDriverName + cbMachineName + cbNotifyName + cbPrinterName + cbPrintProcessor + cbUserName; + *pcbNeeded = sizeof(JOB_INFO_2W) + cbDatatype + sizeof(DEVMODEW) + cbDocumentName + cbDriverName + cbMachineName + cbNotifyName + cbPrinterName + cbPrintProcessor + cbPrintProcessorParameters + cbStatus + cbUserName; if (cbBuf < *pcbNeeded) { dwErrorCode = ERROR_INSUFFICIENT_BUFFER; @@ -457,7 +479,7 @@ pString += cbDocumentName; JobInfo2.pDriverName = (PWSTR)pString; - CopyMemory(pString, pJob->Printer->pwszPrinterDriver, cbDriverName); + CopyMemory(pString, pJob->pPrinter->pwszPrinterDriver, cbDriverName); pString += cbDriverName; JobInfo2.pMachineName = (PWSTR)pString; @@ -469,12 +491,26 @@ pString += cbNotifyName; JobInfo2.pPrinterName = (PWSTR)pString; - CopyMemory(pString, pJob->Printer->pwszPrinterName, cbPrinterName); + CopyMemory(pString, pJob->pPrinter->pwszPrinterName, cbPrinterName); pString += cbPrinterName; JobInfo2.pPrintProcessor = (PWSTR)pString; - CopyMemory(pString, pJob->Printer->pPrintProcessor->pwszName, cbPrintProcessor); + CopyMemory(pString, pJob->pPrintProcessor->pwszName, cbPrintProcessor); pString += cbPrintProcessor; + + if (cbPrintProcessorParameters) + { + JobInfo2.pParameters = (PWSTR)pString; + CopyMemory(pString, pJob->pwszPrintProcessorParameters, cbPrintProcessorParameters); + pString += cbPrintProcessorParameters; + } + + if (cbStatus) + { + JobInfo2.pStatus = (PWSTR)pString; + CopyMemory(pString, pJob->pwszStatus, cbStatus); + pString += cbStatus; + } JobInfo2.pUserName = (PWSTR)pString; CopyMemory(pString, pJob->pwszUserName, cbUserName); @@ -496,7 +532,7 @@ // Position in JOB_INFO_2W is the 1-based index of the job in the processing queue. // Retrieve this through the element index of the job in the Printer's Job List. - if (!LookupElementSkiplist(&pJob->Printer->JobList, pJob, &JobInfo2.Position)) + if (!LookupElementSkiplist(&pJob->pPrinter->JobList, pJob, &JobInfo2.Position)) { dwErrorCode = ERROR_NOT_ENOUGH_MEMORY; ERR("pJob could not be located in the Printer's Job List!\n"); @@ -525,7 +561,7 @@ } BOOL WINAPI -LocalGetJob(HANDLE hPrinter, DWORD JobId, DWORD Level, LPBYTE pOutput, DWORD cbBuf, LPDWORD pcbNeeded) +LocalGetJob(HANDLE hPrinter, DWORD JobId, DWORD Level, PBYTE pOutput, DWORD cbBuf, LPDWORD pcbNeeded) { DWORD dwErrorCode; PLOCAL_HANDLE pHandle; @@ -540,11 +576,11 @@ goto Cleanup; } - pPrinterHandle = (PLOCAL_PRINTER_HANDLE)pHandle->SpecificHandle; + pPrinterHandle = (PLOCAL_PRINTER_HANDLE)pHandle->pSpecificHandle; // Get the desired job. pJob = LookupElementSkiplist(&GlobalJobList, &JobId, NULL); - if (!pJob || pJob->Printer != pPrinterHandle->Printer) + if (!pJob || pJob->pPrinter != pPrinterHandle->pPrinter) { dwErrorCode = ERROR_INVALID_PARAMETER; goto Cleanup; @@ -557,6 +593,287 @@ dwErrorCode = _LocalGetJobLevel2(pPrinterHandle, pJob, pOutput, cbBuf, pcbNeeded); else dwErrorCode = ERROR_INVALID_LEVEL; + +Cleanup: + SetLastError(dwErrorCode); + return (dwErrorCode == ERROR_SUCCESS); +} + +static DWORD +_LocalSetJobLevel1(PLOCAL_PRINTER_HANDLE pPrinterHandle, PLOCAL_JOB pJob, PJOB_INFO_1W pJobInfo) +{ + DWORD dwErrorCode; + + // First check the validity of the input before changing anything. + if (!FindDatatype(pJob->pPrintProcessor, pJobInfo->pDatatype)) + { + dwErrorCode = ERROR_INVALID_DATATYPE; + goto Cleanup; + } + + // Check if the datatype has changed. + if (wcscmp(pJob->pwszDatatype, pJobInfo->pDatatype) != 0) + { + // Use the new value. + if (!ReallocSplStr(&pJob->pwszDatatype, pJobInfo->pDatatype)) + { + dwErrorCode = ERROR_NOT_ENOUGH_MEMORY; + ERR("ReallocSplStr failed, last error is %lu!\n", GetLastError()); + goto Cleanup; + } + } + + // Check if the document name has changed. + if (wcscmp(pJob->pwszDocumentName, pJobInfo->pDocument) != 0) + { + // Use the new value. + if (!ReallocSplStr(&pJob->pwszDocumentName, pJobInfo->pDocument)) + { + dwErrorCode = ERROR_NOT_ENOUGH_MEMORY; + ERR("ReallocSplStr failed, last error is %lu!\n", GetLastError()); + goto Cleanup; + } + } + + // Check if the status message has changed. + if ((!pJob->pwszStatus && pJobInfo->pStatus) || wcscmp(pJob->pwszStatus, pJobInfo->pStatus) != 0) + { + // Use the new value. + if (!ReallocSplStr(&pJob->pwszStatus, pJobInfo->pStatus)) + { + dwErrorCode = ERROR_NOT_ENOUGH_MEMORY; + ERR("ReallocSplStr failed, last error is %lu!\n", GetLastError()); + goto Cleanup; + } + } + + // Check if the user name has changed. + if (wcscmp(pJob->pwszUserName, pJobInfo->pUserName) != 0) + { + // The new user name doesn't need to exist, so no additional verification is required. + + // Use the new value. + if (!ReallocSplStr(&pJob->pwszUserName, pJobInfo->pUserName)) + { + dwErrorCode = ERROR_NOT_ENOUGH_MEMORY; + ERR("ReallocSplStr failed, last error is %lu!\n", GetLastError()); + goto Cleanup; + } + } + + // Check if the priority has changed. + if (pJob->dwPriority != pJobInfo->Priority && IS_VALID_PRIORITY(pJobInfo->Priority)) + { + // Set the new priority. + pJob->dwPriority = pJobInfo->Priority; + + // Remove and reinsert the job in the Printer's Job List. + // The Compare function will be used to find the right position now considering the new priority. + DeleteElementSkiplist(&pJob->pPrinter->JobList, pJob); + InsertElementSkiplist(&pJob->pPrinter->JobList, pJob); + } + + // Check if the status flags have changed. + if (pJob->dwStatus != pJobInfo->Status) + { + // Only add status flags that make sense. + if (pJobInfo->Status & JOB_STATUS_PAUSED) + pJob->dwStatus |= JOB_STATUS_PAUSED; + + if (pJobInfo->Status & JOB_STATUS_ERROR) + pJob->dwStatus |= JOB_STATUS_ERROR; + + if (pJobInfo->Status & JOB_STATUS_OFFLINE) + pJob->dwStatus |= JOB_STATUS_OFFLINE; + + if (pJobInfo->Status & JOB_STATUS_PAPEROUT) + pJob->dwStatus |= JOB_STATUS_PAPEROUT; + } + + dwErrorCode = ERROR_SUCCESS; + +Cleanup: + return dwErrorCode; +} + +static DWORD +_LocalSetJobLevel2(PLOCAL_PRINTER_HANDLE pPrinterHandle, PLOCAL_JOB pJob, PJOB_INFO_2W pJobInfo) +{ + DWORD dwErrorCode; + PLOCAL_PRINT_PROCESSOR pPrintProcessor; + + // First check the validity of the input before changing anything. + pPrintProcessor = FindPrintProcessor(pJobInfo->pPrintProcessor); + if (!pPrintProcessor) + { + dwErrorCode = ERROR_UNKNOWN_PRINTPROCESSOR; + goto Cleanup; + } + + if (!FindDatatype(pPrintProcessor, pJobInfo->pDatatype)) + { + dwErrorCode = ERROR_INVALID_DATATYPE; + goto Cleanup; + } + + // Check if the datatype has changed. + if (wcscmp(pJob->pwszDatatype, pJobInfo->pDatatype) != 0) + { + // Use the new value. + if (!ReallocSplStr(&pJob->pwszDatatype, pJobInfo->pDatatype)) + { + dwErrorCode = ERROR_NOT_ENOUGH_MEMORY; + ERR("ReallocSplStr failed, last error is %lu!\n", GetLastError()); + goto Cleanup; + } + } + + // Check if the document name has changed. + if (wcscmp(pJob->pwszDocumentName, pJobInfo->pDocument) != 0) + { + // Use the new value. + if (!ReallocSplStr(&pJob->pwszDocumentName, pJobInfo->pDocument)) + { + dwErrorCode = ERROR_NOT_ENOUGH_MEMORY; + ERR("ReallocSplStr failed, last error is %lu!\n", GetLastError()); + goto Cleanup; + } + } + + // Check if the notify name has changed. + if (wcscmp(pJob->pwszNotifyName, pJobInfo->pNotifyName) != 0) + { + // The new notify name doesn't need to exist, so no additional verification is required. + + // Use the new value. + if (!ReallocSplStr(&pJob->pwszNotifyName, pJobInfo->pNotifyName)) + { + dwErrorCode = ERROR_NOT_ENOUGH_MEMORY; + ERR("ReallocSplStr failed, last error is %lu!\n", GetLastError()); + goto Cleanup; + } + } + + // Check if the (optional) Print Processor Parameters have changed. + if ((!pJob->pwszPrintProcessorParameters && pJobInfo->pParameters) || wcscmp(pJob->pwszPrintProcessorParameters, pJobInfo->pParameters) != 0) + { + // Use the new value. + if (!ReallocSplStr(&pJob->pwszPrintProcessorParameters, pJobInfo->pParameters)) + { + dwErrorCode = ERROR_NOT_ENOUGH_MEMORY; + ERR("ReallocSplStr failed, last error is %lu!\n", GetLastError()); + goto Cleanup; + } + } + + // Check if the (optional) Status Message has changed. + if ((!pJob->pwszStatus && pJobInfo->pStatus) || wcscmp(pJob->pwszStatus, pJobInfo->pStatus) != 0) + { + // Use the new value. + if (!ReallocSplStr(&pJob->pwszStatus, pJobInfo->pStatus)) + { + dwErrorCode = ERROR_NOT_ENOUGH_MEMORY; + ERR("ReallocSplStr failed, last error is %lu!\n", GetLastError()); + goto Cleanup; + } + } + + // Check if the user name has changed. + if (wcscmp(pJob->pwszUserName, pJobInfo->pUserName) != 0) + { + // The new user name doesn't need to exist, so no additional verification is required. + + // Use the new value. + if (!ReallocSplStr(&pJob->pwszUserName, pJobInfo->pUserName)) + { + dwErrorCode = ERROR_NOT_ENOUGH_MEMORY; + ERR("ReallocSplStr failed, last error is %lu!\n", GetLastError()); + goto Cleanup; + } + } + + // Check if the priority has changed. + if (pJob->dwPriority != pJobInfo->Priority && IS_VALID_PRIORITY(pJobInfo->Priority)) + { + // Set the new priority. + pJob->dwPriority = pJobInfo->Priority; + + // Remove and reinsert the job in the Printer's Job List. + // The Compare function will be used to find the right position now considering the new priority. + DeleteElementSkiplist(&pJob->pPrinter->JobList, pJob); + InsertElementSkiplist(&pJob->pPrinter->JobList, pJob); + } + + // Check if the status flags have changed. + if (pJob->dwStatus != pJobInfo->Status) + { + // Only add status flags that make sense. + if (pJobInfo->Status & JOB_STATUS_PAUSED) + pJob->dwStatus |= JOB_STATUS_PAUSED; + + if (pJobInfo->Status & JOB_STATUS_ERROR) + pJob->dwStatus |= JOB_STATUS_ERROR; + + if (pJobInfo->Status & JOB_STATUS_OFFLINE) + pJob->dwStatus |= JOB_STATUS_OFFLINE; + + if (pJobInfo->Status & JOB_STATUS_PAPEROUT) + pJob->dwStatus |= JOB_STATUS_PAPEROUT; + } + + dwErrorCode = ERROR_SUCCESS; + +Cleanup: + return dwErrorCode; +} + +BOOL WINAPI +LocalSetJob(HANDLE hPrinter, DWORD JobId, DWORD Level, PBYTE pJobInfo, DWORD Command) +{ + DWORD dwErrorCode; + PLOCAL_HANDLE pHandle; + PLOCAL_JOB pJob; + PLOCAL_PRINTER_HANDLE pPrinterHandle; + + // Check if this is a printer handle. + pHandle = (PLOCAL_HANDLE)hPrinter; + if (pHandle->HandleType != Printer) + { + dwErrorCode = ERROR_INVALID_HANDLE; + goto Cleanup; + } + + pPrinterHandle = (PLOCAL_PRINTER_HANDLE)pHandle->pSpecificHandle; + + // Get the desired job. + pJob = LookupElementSkiplist(&GlobalJobList, &JobId, NULL); + if (!pJob || pJob->pPrinter != pPrinterHandle->pPrinter) + { + dwErrorCode = ERROR_INVALID_PARAMETER; + goto Cleanup; + } + + // Setting job information is handled differently for each level. + if (Level) + { + if (Level == 1) + dwErrorCode = _LocalSetJobLevel1(pPrinterHandle, pJob, (PJOB_INFO_1W)pJobInfo); + else if (Level == 2) + dwErrorCode = _LocalSetJobLevel2(pPrinterHandle, pJob, (PJOB_INFO_2W)pJobInfo); + else + dwErrorCode = ERROR_INVALID_LEVEL; + } + + if (dwErrorCode != ERROR_SUCCESS) + goto Cleanup; + + // Perform an additional command if desired. + if (Command) + { + // TODO + } + + dwErrorCode = ERROR_SUCCESS; Cleanup: SetLastError(dwErrorCode); @@ -626,7 +943,7 @@ pJob->dwJobID = pShadowFile->dwJobID; pJob->dwTotalPages = pShadowFile->dwTotalPages; pJob->dwPriority = pShadowFile->dwPriority; - pJob->Printer = pPrinter; + pJob->pPrinter = pPrinter; pJob->pwszDatatype = AllocSplStr((PCWSTR)((ULONG_PTR)pShadowFile + pShadowFile->offDatatype)); pJob->pwszDocumentName = AllocSplStr((PCWSTR)((ULONG_PTR)pShadowFile + pShadowFile->offDocumentName)); pJob->pwszOutputFile = NULL; @@ -667,7 +984,7 @@ } // Compute the total size of the shadow file. - cbPrinterName = (wcslen(pJob->Printer->pwszPrinterName) + 1) * sizeof(WCHAR); + cbPrinterName = (wcslen(pJob->pPrinter->pwszPrinterName) + 1) * sizeof(WCHAR); cbDatatype = (wcslen(pJob->pwszDatatype) + 1) * sizeof(WCHAR); cbDocumentName = (wcslen(pJob->pwszDocumentName) + 1) * sizeof(WCHAR); cbFileSize = sizeof(SHD_HEADER) + cbPrinterName + cbDatatype + cbDocumentName + sizeof(DEVMODEW); @@ -694,7 +1011,7 @@ // The first value begins right after the shadow file header. dwCurrentOffset = sizeof(SHD_HEADER); - CopyMemory((PBYTE)pShadowFile + dwCurrentOffset, pJob->Printer->pwszPrinterName, cbPrinterName); + CopyMemory((PBYTE)pShadowFile + dwCurrentOffset, pJob->pPrinter->pwszPrinterName, cbPrinterName); pShadowFile->offPrinterName = dwCurrentOffset; dwCurrentOffset += cbPrinterName; 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] Thu Jun 25 12:29:18 2015 @@ -34,7 +34,7 @@ // Local Constants static const PRINTPROVIDOR _PrintProviderFunctions = { LocalOpenPrinter, // fpOpenPrinter - NULL, // fpSetJob + LocalSetJob, // fpSetJob LocalGetJob, // fpGetJob NULL, // fpEnumJobs NULL, // fpAddPrinter 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] Thu Jun 25 12:29:18 2015 @@ -32,6 +32,7 @@ // Macros #define IS_VALID_JOB_ID(ID) (ID >= 1 && ID <= 99999) +#define IS_VALID_PRIORITY(P) (P >= MIN_PRIORITY && P <= MAX_PRIORITY) // Constants #define MAX_PRINTER_NAME 220 @@ -91,23 +92,26 @@ typedef struct _LOCAL_JOB { // This sort key must be the first element for LookupElementSkiplist to work! - DWORD dwJobID; // Internal and external ID of this Job - - PLOCAL_PRINTER Printer; // Associated Printer to this Job - DWORD dwPriority; // Priority of this Job from MIN_PRIORITY to MAX_PRIORITY, default being DEF_PRIORITY - SYSTEMTIME stSubmitted; // Time of the submission of this Job - PWSTR pwszUserName; // User that submitted the Job - PWSTR pwszNotifyName; // User that shall be notified about the status of the Job - PWSTR pwszDocumentName; // Name of the Document that is printed - PWSTR pwszDatatype; // Datatype of the Document - PWSTR pwszOutputFile; // Output File to spool the Job to - DWORD dwTotalPages; // Total pages of the Document - DWORD dwPagesPrinted; // Number of pages that have already been printed - DWORD dwStartTime; // Earliest time in minutes since 12:00 AM UTC when this document can be printed - DWORD dwUntilTime; // Latest time in minutes since 12:00 AM UTC when this document can be printed - DWORD dwStatus; // JOB_STATUS_* flags of the Job - PWSTR pwszMachineName; // Name of the machine that submitted the Job (prepended with two backslashes) - DEVMODEW DevMode; // Associated Device Mode to this Job + DWORD dwJobID; // Internal and external ID of this Job + + PLOCAL_PRINTER pPrinter; // Associated Printer to this Job + PLOCAL_PRINT_PROCESSOR pPrintProcessor; // Associated Print Processor to this Job + DWORD dwPriority; // Priority of this Job from MIN_PRIORITY to MAX_PRIORITY, default being DEF_PRIORITY + SYSTEMTIME stSubmitted; // Time of the submission of this Job + PWSTR pwszUserName; // User that submitted the Job + PWSTR pwszNotifyName; // User that shall be notified about the status of the Job + PWSTR pwszDocumentName; // Name of the Document that is printed + PWSTR pwszDatatype; // Datatype of the Document + PWSTR pwszOutputFile; // Output File to spool the Job to + PWSTR pwszPrintProcessorParameters; // Optional; Parameters for the chosen Print Processor + PWSTR pwszStatus; // Optional; a Status Message for the Job + DWORD dwTotalPages; // Total pages of the Document + DWORD dwPagesPrinted; // Number of pages that have already been printed + DWORD dwStartTime; // Earliest time in minutes since 12:00 AM UTC when this document can be printed + DWORD dwUntilTime; // Latest time in minutes since 12:00 AM UTC when this document can be printed + DWORD dwStatus; // JOB_STATUS_* flags of the Job + PWSTR pwszMachineName; // Name of the machine that submitted the Job (prepended with two backslashes) + DEVMODEW DevMode; // Associated Device Mode to this Job } LOCAL_JOB, *PLOCAL_JOB; @@ -120,8 +124,8 @@ */ typedef struct _LOCAL_PRINTER_HANDLE { - PLOCAL_PRINTER Printer; - PLOCAL_JOB StartedJob; + PLOCAL_PRINTER pPrinter; + PLOCAL_JOB pStartedJob; PWSTR pwszDatatype; DEVMODEW DevMode; } @@ -134,7 +138,7 @@ typedef struct _LOCAL_HANDLE { enum { Printer, Monitor, Port } HandleType; - PVOID SpecificHandle; + PVOID pSpecificHandle; } LOCAL_HANDLE, *PLOCAL_HANDLE; @@ -184,6 +188,7 @@ void InitializePrinterJobList(PLOCAL_PRINTER pPrinter); BOOL WINAPI LocalAddJob(HANDLE hPrinter, DWORD Level, LPBYTE pData, DWORD cbBuf, LPDWORD pcbNeeded); BOOL WINAPI LocalGetJob(HANDLE hPrinter, DWORD JobId, DWORD Level, LPBYTE pOutput, DWORD cbBuf, LPDWORD pcbNeeded); +BOOL WINAPI LocalSetJob(HANDLE hPrinter, DWORD JobId, DWORD Level, PBYTE pJobInfo, DWORD Command); PLOCAL_JOB ReadJobShadowFile(PCWSTR pwszFilePath); BOOL WriteJobShadowFile(PCWSTR pwszFilePath, const PLOCAL_JOB pJob); 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] Thu Jun 25 12:29:18 2015 @@ -537,7 +537,7 @@ // Create a new printer handle. pPrinterHandle = DllAllocSplMem(sizeof(LOCAL_PRINTER_HANDLE)); - pPrinterHandle->Printer = pPrinter; + pPrinterHandle->pPrinter = pPrinter; // Check if a datatype was given. if (pDefault && pDefault->pDatatype) @@ -600,20 +600,20 @@ // Look for this job in the Global Job List. pJob = LookupElementSkiplist(&GlobalJobList, &dwJobID, NULL); - if (!pJob || pJob->Printer != pPrinter) + if (!pJob || pJob->pPrinter != pPrinter) { // The user supplied a non-existing Job ID or the Job ID does not belong to the supplied printer name. dwErrorCode = ERROR_INVALID_PRINTER_NAME; goto Cleanup; } - pPrinterHandle->StartedJob = pJob; + pPrinterHandle->pStartedJob = pJob; } // Create a new handle that references a printer. pHandle = DllAllocSplMem(sizeof(LOCAL_HANDLE)); pHandle->HandleType = Printer; - pHandle->SpecificHandle = pPrinterHandle; + pHandle->pSpecificHandle = pPrinterHandle; } else { @@ -637,7 +637,7 @@ ///////////// TODO ///////////////////// pHandle = DllAllocSplMem(sizeof(LOCAL_HANDLE)); pHandle->HandleType = Monitor; - //pHandle->SpecificHandle = pMonitorHandle; + //pHandle->pSpecificHandle = pMonitorHandle; } else if (wcscmp(p, L"XcvPort ") == 0) { @@ -647,7 +647,7 @@ //////////// TODO ////////////////////// pHandle = DllAllocSplMem(sizeof(LOCAL_HANDLE)); pHandle->HandleType = Port; - //pHandle->SpecificHandle = pPortHandle; + //pHandle->pSpecificHandle = pPortHandle; } else { @@ -710,7 +710,7 @@ goto Cleanup; } - pPrinterHandle = (PLOCAL_PRINTER_HANDLE)pHandle->SpecificHandle; + pPrinterHandle = (PLOCAL_PRINTER_HANDLE)pHandle->pSpecificHandle; // Check if this is the right document information level. if (Level != 1) @@ -723,14 +723,14 @@ // Create a new job. pJob = DllAllocSplMem(sizeof(LOCAL_JOB)); - pJob->Printer = pPrinterHandle->Printer; + pJob->pPrinter = pPrinterHandle->pPrinter; pJob->dwPriority = DEF_PRIORITY; // Check if a datatype was given. if (pDocumentInfo1->pDatatype) { // Use the datatype if it's valid. - if (!FindDatatype(pJob->Printer->pPrintProcessor, pDocumentInfo1->pDatatype)) + if (!FindDatatype(pJob->pPrintProcessor, pDocumentInfo1->pDatatype)) { dwErrorCode = ERROR_INVALID_DATATYPE; goto Cleanup; @@ -771,14 +771,14 @@ // 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)) + if (!InsertTailElementSkiplist(&pJob->pPrinter->JobList, pJob)) { dwErrorCode = ERROR_NOT_ENOUGH_MEMORY; ERR("InsertTailElementSkiplist failed for job %lu for the Printer's Job List!\n", pJob->dwJobID); goto Cleanup; } - pPrinterHandle->StartedJob = pJob; + pPrinterHandle->pStartedJob = pJob; dwErrorCode = ERROR_SUCCESS; dwReturnValue = pJob->dwJobID;

1 0

[ekohl] 68258: [NTOSKRNL] xHalIoReadPartitionTable: Do not return a valid partiton number for container partitions.
by ekohl＠svn.reactos.org 24 Jun '15

24 Jun '15

Author: ekohl Date: Wed Jun 24 20:22:19 2015 New Revision: 68258 URL: http://svn.reactos.org/svn/reactos?rev=68258&view=rev Log: [NTOSKRNL] xHalIoReadPartitionTable: Do not return a valid partiton number for container partitions. Modified: trunk/reactos/ntoskrnl/fstub/disksup.c Modified: trunk/reactos/ntoskrnl/fstub/disksup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fstub/disksup.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/fstub/disksup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fstub/disksup.c [iso-8859-1] Wed Jun 24 20:22:19 2015 @@ -1655,9 +1655,8 @@ UInt32x32To64(GET_PARTITION_LENGTH(PartitionDescriptor), SectorSize); - // BUGBUGBUG: The correct partition numbers seem to cause boot failures!!! -// PartitionInfo->PartitionNumber = (!IsContainerPartition(PartitionType)) ? i : 0; - PartitionInfo->PartitionNumber = i + 1; + /* Get the partition number */ + PartitionInfo->PartitionNumber = (!IsContainerPartition(PartitionType)) ? i + 1 : 0; } else {

1 0

[ekohl] 68257: [USETUP] - ReAllocateLayoutBuffer: Write all new partition table entries to the disk. - UpdateDiskLayout: - Create link entries for logical partitions. - Wipe unused logical partiton...
by ekohl＠svn.reactos.org 24 Jun '15

24 Jun '15

Author: ekohl Date: Wed Jun 24 20:06:33 2015 New Revision: 68257 URL: http://svn.reactos.org/svn/reactos?rev=68257&view=rev Log: [USETUP] - ReAllocateLayoutBuffer: Write all new partition table entries to the disk. - UpdateDiskLayout: - Create link entries for logical partitions. - Wipe unused logical partiton table entries. Modified: trunk/reactos/base/setup/usetup/partlist.c Modified: trunk/reactos/base/setup/usetup/partlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/partlist… ============================================================================== --- trunk/reactos/base/setup/usetup/partlist.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/partlist.c [iso-8859-1] Wed Jun 24 20:06:33 2015 @@ -2192,7 +2192,6 @@ } -#if 0 static BOOLEAN IsEmptyLayoutEntry( @@ -2200,12 +2199,10 @@ { if (PartitionInfo->StartingOffset.QuadPart == 0 && PartitionInfo->PartitionLength.QuadPart == 0) -// PartitionInfo->PartitionType == 0) return TRUE; return FALSE; } -#endif static @@ -2280,6 +2277,7 @@ ULONG NewPartitionCount; ULONG CurrentPartitionCount = 0; ULONG LayoutBufferSize; + ULONG i; DPRINT1("ReAllocateLayoutBuffer()\n"); @@ -2306,6 +2304,13 @@ return FALSE; } + /* If the layout buffer grows, make sure the new (empty) entries are written to the disk */ + if (NewPartitionCount > CurrentPartitionCount) + { + for (i = CurrentPartitionCount; i < NewPartitionCount; i++) + NewLayoutBuffer->PartitionEntry[i].RewritePartition = TRUE; + } + DiskEntry->LayoutBuffer = NewLayoutBuffer; DiskEntry->LayoutBuffer->PartitionCount = NewPartitionCount; @@ -2319,6 +2324,7 @@ IN PDISKENTRY DiskEntry) { PPARTITION_INFORMATION PartitionInfo; + PPARTITION_INFORMATION LinkInfo = NULL; PLIST_ENTRY ListEntry; PPARTENTRY PartEntry; ULONG Index; @@ -2350,7 +2356,7 @@ PartitionInfo->StartingOffset.QuadPart = PartEntry->StartSector.QuadPart * DiskEntry->BytesPerSector; PartitionInfo->PartitionLength.QuadPart = PartEntry->SectorCount.QuadPart * DiskEntry->BytesPerSector; - PartitionInfo->HiddenSectors = PartEntry->StartSector.LowPart; + PartitionInfo->HiddenSectors = (ULONG)PartEntry->StartSector.QuadPart; PartitionInfo->PartitionNumber = (!IsContainerPartition(PartEntry->PartitionType)) ? PartitionNumber : 0; PartitionInfo->PartitionType = PartEntry->PartitionType; PartitionInfo->BootIndicator = PartEntry->BootIndicator; @@ -2395,6 +2401,22 @@ PartEntry->PartitionNumber = PartitionNumber; PartEntry->PartitionIndex = Index; + /* Fill the link entry of the previous partition table */ + if (LinkInfo != NULL) + { + LinkInfo->StartingOffset.QuadPart = (PartEntry->StartSector.QuadPart - DiskEntry->SectorAlignment) * DiskEntry->BytesPerSector; + LinkInfo->PartitionLength.QuadPart = (PartEntry->StartSector.QuadPart + DiskEntry->SectorAlignment) * DiskEntry->BytesPerSector; + LinkInfo->HiddenSectors = (ULONG)(PartEntry->StartSector.QuadPart - DiskEntry->SectorAlignment - DiskEntry->ExtendedPartition->StartSector.QuadPart); + LinkInfo->PartitionNumber = 0; + LinkInfo->PartitionType = PARTITION_EXTENDED; + LinkInfo->BootIndicator = FALSE; + LinkInfo->RecognizedPartition = FALSE; + LinkInfo->RewritePartition = TRUE; + } + + /* Save a pointer to the link entry of the current partition table */ + LinkInfo = &DiskEntry->LayoutBuffer->PartitionEntry[Index + 1]; + PartitionNumber++; Index += 4; } @@ -2402,26 +2424,52 @@ ListEntry = ListEntry->Flink; } -#if 0 - for (;Index < 4; Index++) - { + /* Wipe unused primary partition table entries */ + for (Index = GetPrimaryPartitionCount(DiskEntry); Index < 4; Index++) + { + DPRINT1("Primary partition entry %lu\n", Index); + PartitionInfo = &DiskEntry->LayoutBuffer->PartitionEntry[Index]; if (!IsEmptyLayoutEntry(PartitionInfo)) { - DPRINT1("Wiping partition entry %lu\n", Index); + DPRINT1("Wiping primary partition entry %lu\n", Index); PartitionInfo->StartingOffset.QuadPart = 0; PartitionInfo->PartitionLength.QuadPart = 0; PartitionInfo->HiddenSectors = 0; PartitionInfo->PartitionNumber = 0; - PartitionInfo->PartitionType = 0; + PartitionInfo->PartitionType = PARTITION_ENTRY_UNUSED; PartitionInfo->BootIndicator = FALSE; PartitionInfo->RecognizedPartition = FALSE; PartitionInfo->RewritePartition = TRUE; } } -#endif + + /* Wipe unused logical partition table entries */ + for (Index = 4; Index < DiskEntry->LayoutBuffer->PartitionCount; Index++) + { + if (Index % 4 >= 2) + { + DPRINT1("Logical partition entry %lu\n", Index); + + PartitionInfo = &DiskEntry->LayoutBuffer->PartitionEntry[Index]; + + if (!IsEmptyLayoutEntry(PartitionInfo)) + { + DPRINT1("Wiping partition entry %lu\n", Index); + + PartitionInfo->StartingOffset.QuadPart = 0; + PartitionInfo->PartitionLength.QuadPart = 0; + PartitionInfo->HiddenSectors = 0; + PartitionInfo->PartitionNumber = 0; + PartitionInfo->PartitionType = PARTITION_ENTRY_UNUSED; + PartitionInfo->BootIndicator = FALSE; + PartitionInfo->RecognizedPartition = FALSE; + PartitionInfo->RewritePartition = TRUE; + } + } + } #ifdef DUMP_PARTITION_TABLE DumpPartitionTable(DiskEntry);

1 0

[hbelusca] 68256: [GRMBL]: Fix build on *niks.
by hbelusca＠svn.reactos.org 24 Jun '15

24 Jun '15

Author: hbelusca Date: Wed Jun 24 20:00:23 2015 New Revision: 68256 URL: http://svn.reactos.org/svn/reactos?rev=68256&view=rev Log: [GRMBL]: Fix build on *niks. Modified: trunk/reactos/tools/bin2c.c Modified: trunk/reactos/tools/bin2c.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/bin2c.c?rev=68256&r1… ============================================================================== --- trunk/reactos/tools/bin2c.c [iso-8859-1] (original) +++ trunk/reactos/tools/bin2c.c [iso-8859-1] Wed Jun 24 20:00:23 2015 @@ -7,6 +7,13 @@ */ #include <stdio.h> + +#ifdef _WIN32 +#include <string.h> // Required for _stricmp() +#else +#include <strings.h> // Required for strcasecmp() +#define _stricmp strcasecmp +#endif static size_t dumpHex(FILE* inFile, FILE* outCFile, char nullTerminate) {

1 0

[hbelusca] 68255: [TOOLS_BIN2C] - Fix a GCC warning (error on Macs) concerning the printf "%Iu" specifier. - To make sure data included by bin2c, that need to be interpreted as a (long) string, is ...
by hbelusca＠svn.reactos.org 24 Jun '15

24 Jun '15

Author: hbelusca Date: Wed Jun 24 19:54:19 2015 New Revision: 68255 URL: http://svn.reactos.org/svn/reactos?rev=68255&view=rev Log: [TOOLS_BIN2C] - Fix a GCC warning (error on Macs) concerning the printf "%Iu" specifier. - To make sure data included by bin2c, that need to be interpreted as a (long) string, is correctly NULL-terminated, introduce an output format called "STR": this creates a long character array using the "\xXX" format. - To circumvent a silly limitation of MSVC (all versions?) about the maximum length (65535 bytes) of a char string (aka. char MyArray[] = "...my_long_string...";), introduced yet another output format called "BINSTR" which creates an array of bytes that is NULL-terminated (aka. char MyArray[] = {0xde, 0xad, 0xbe, 0xef, 0x00};). - Finally, the output format "BIN" is the regular bin2c format (simple array of bytes). [HAL_PCIDATA][FREELDR_INSTALL] Use the above-described functionality (for HAL_PCIDATA, use BINSTR format because the PciVendors data is otherwise too large to be stored in "char_string" format). Modified: trunk/reactos/boot/freeldr/install/CMakeLists.txt trunk/reactos/boot/freeldr/install/install.c trunk/reactos/hal/halx86/pcidata.cmake trunk/reactos/tools/bin2c.c Modified: trunk/reactos/boot/freeldr/install/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/install/CMake… ============================================================================== --- trunk/reactos/boot/freeldr/install/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/install/CMakeLists.txt [iso-8859-1] Wed Jun 24 19:54:19 2015 @@ -4,12 +4,12 @@ # add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/fat.c ${CMAKE_CURRENT_BINARY_DIR}/fat.h - COMMAND native-bin2c ${CMAKE_CURRENT_BINARY_DIR}/../bootsect/fat.bin ${CMAKE_CURRENT_BINARY_DIR}/fat.c ${CMAKE_CURRENT_BINARY_DIR}/fat.h fat_data + COMMAND native-bin2c ${CMAKE_CURRENT_BINARY_DIR}/../bootsect/fat.bin ${CMAKE_CURRENT_BINARY_DIR}/fat.c ${CMAKE_CURRENT_BINARY_DIR}/fat.h BIN fat_data DEPENDS native-bin2c fat) add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/fat32.c ${CMAKE_CURRENT_BINARY_DIR}/fat32.h - COMMAND native-bin2c ${CMAKE_CURRENT_BINARY_DIR}/../bootsect/fat32.bin ${CMAKE_CURRENT_BINARY_DIR}/fat32.c ${CMAKE_CURRENT_BINARY_DIR}/fat32.h fat32_data + COMMAND native-bin2c ${CMAKE_CURRENT_BINARY_DIR}/../bootsect/fat32.bin ${CMAKE_CURRENT_BINARY_DIR}/fat32.c ${CMAKE_CURRENT_BINARY_DIR}/fat32.h BIN fat32_data DEPENDS native-bin2c fat32) ##################################### Modified: trunk/reactos/boot/freeldr/install/install.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/install/insta… ============================================================================== --- trunk/reactos/boot/freeldr/install/install.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/install/install.c [iso-8859-1] Wed Jun 24 19:54:19 2015 @@ -36,7 +36,6 @@ int main(int argc, char *argv[]) { - if (argc < 3) { _tprintf(_T("syntax: install x: [fs_type]\nwhere fs_type is fat or fat32\n")); Modified: trunk/reactos/hal/halx86/pcidata.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/pcidata.cmake?r… ============================================================================== --- trunk/reactos/hal/halx86/pcidata.cmake [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/pcidata.cmake [iso-8859-1] Wed Jun 24 19:54:19 2015 @@ -3,11 +3,11 @@ # add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/pci_classes.c ${CMAKE_CURRENT_BINARY_DIR}/pci_classes.h - COMMAND native-bin2c ${CMAKE_CURRENT_SOURCE_DIR}/legacy/bus/pci_classes.ids ${CMAKE_CURRENT_BINARY_DIR}/pci_classes.c ${CMAKE_CURRENT_BINARY_DIR}/pci_classes.h ClassTable INIT_FUNCTION ${CMAKE_CURRENT_SOURCE_DIR}/include/hal.h + COMMAND native-bin2c ${CMAKE_CURRENT_SOURCE_DIR}/legacy/bus/pci_classes.ids ${CMAKE_CURRENT_BINARY_DIR}/pci_classes.c ${CMAKE_CURRENT_BINARY_DIR}/pci_classes.h BINSTR ClassTable INIT_FUNCTION ${CMAKE_CURRENT_SOURCE_DIR}/include/hal.h DEPENDS native-bin2c ${CMAKE_CURRENT_SOURCE_DIR}/legacy/bus/pci_classes.ids) add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/pci_vendors.c ${CMAKE_CURRENT_BINARY_DIR}/pci_vendors.h - COMMAND native-bin2c ${CMAKE_CURRENT_SOURCE_DIR}/legacy/bus/pci_vendors.ids ${CMAKE_CURRENT_BINARY_DIR}/pci_vendors.c ${CMAKE_CURRENT_BINARY_DIR}/pci_vendors.h VendorTable INIT_FUNCTION ${CMAKE_CURRENT_SOURCE_DIR}/include/hal.h + COMMAND native-bin2c ${CMAKE_CURRENT_SOURCE_DIR}/legacy/bus/pci_vendors.ids ${CMAKE_CURRENT_BINARY_DIR}/pci_vendors.c ${CMAKE_CURRENT_BINARY_DIR}/pci_vendors.h BINSTR VendorTable INIT_FUNCTION ${CMAKE_CURRENT_SOURCE_DIR}/include/hal.h DEPENDS native-bin2c ${CMAKE_CURRENT_SOURCE_DIR}/legacy/bus/pci_vendors.ids) ##################################### Modified: trunk/reactos/tools/bin2c.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/bin2c.c?rev=68255&r1… ============================================================================== --- trunk/reactos/tools/bin2c.c [iso-8859-1] (original) +++ trunk/reactos/tools/bin2c.c [iso-8859-1] Wed Jun 24 19:54:19 2015 @@ -8,18 +8,102 @@ #include <stdio.h> -int main(int argc, char *argv[]) +static size_t dumpHex(FILE* inFile, FILE* outCFile, char nullTerminate) +{ + size_t bufLen = 0; + unsigned char ch; + + fprintf(outCFile, "\n{"); + do + { + /* Read the next byte */ + ch = fgetc(inFile); + + if (feof(inFile) && nullTerminate) + ch = 0x00; + + if (!feof(inFile) || nullTerminate) + { + /* Start a new line if needed */ + if ((bufLen % 16) == 0) + fprintf(outCFile, "\n "); + + /* Write the byte or the optional NULL terminator */ + fprintf(outCFile, " 0x%02x,", (unsigned int)ch); + + ++bufLen; + } + } while (!feof(inFile)); + fprintf(outCFile, "\n}"); + + return bufLen; +} + +static size_t dumpStr(FILE* inFile, FILE* outCFile) +{ + size_t bufLen = 0; + unsigned char ch; + + /* Always start the first line */ + fprintf(outCFile, "\n \""); + do + { + /* Read the next byte */ + ch = fgetc(inFile); + + /* If a byte is available... */ + if (!feof(inFile)) + { + /* ... do we need to start a new line? */ + if ((bufLen != 0) && (bufLen % 16) == 0) + { + /* Yes, end the current line and start a new one */ + fprintf(outCFile, "\""); + fprintf(outCFile, "\n \""); + } + + /* Now write the byte */ + fprintf(outCFile, "\\x%02x", (unsigned int)ch); + } + /* ... otherwise, end the current line... */ + else + { + fprintf(outCFile, "\""); + /* We break just after */ + } + + ++bufLen; // This takes also the final NULL terminator into account. + + } while (!feof(inFile)); + + return bufLen; +} + +static void usage(char* name) +{ + fprintf(stdout, "Usage: %s infile.bin outfile.c outfile.h [BIN|BINSTR|STR] array_name [array_attribute [header_for_attribute]]\n", name); +} + +int main(int argc, char* argv[]) { FILE* inFile; FILE* outCFile; FILE* outHFile; size_t bufLen; - unsigned char ch; /* Validate the arguments */ - if (argc < 5) + if (argc < 6) { - fprintf(stdout, "Usage: bin2c infile.bin outfile.c outfile.h array_name [array_attribute [header_for_attribute]]\n"); + usage(argv[0]); + return -1; + } + + /* Verify the output format */ + if (_stricmp(argv[4], "BIN" ) != 0 && + _stricmp(argv[4], "BINSTR") != 0 && + _stricmp(argv[4], "STR" ) != 0) + { + usage(argv[0]); return -1; } @@ -48,41 +132,36 @@ /* Generate the source file and close it */ fprintf(outCFile, "/* This file is autogenerated, do not edit. */\n\n"); - if (argc >= 7) + if (argc >= 8) { /* Include needed header for defining the array attribute */ - fprintf(outCFile, "#include \"%s\"\n", argv[6]); + fprintf(outCFile, "#include \"%s\"\n", argv[7]); } fprintf(outCFile, "#include \"%s\"\n\n", argv[3]); /* Generate the data array */ - if (argc >= 6) + if (argc >= 7) { /* Add the array attribute */ - fprintf(outCFile, "%s ", argv[5]); + fprintf(outCFile, "%s ", argv[6]); } - fprintf(outCFile, "unsigned char %s[] =\n{", argv[4]); + fprintf(outCFile, "unsigned char %s[] =", argv[5]); - bufLen = 0; - ch = fgetc(inFile); - while (!feof(inFile)) - { - if ((bufLen % 16) == 0) - fprintf(outCFile, "\n "); + /* Output the bytes in the chosen format */ + if (_stricmp(argv[4], "BIN") == 0) + bufLen = dumpHex(inFile, outCFile, 0); + else if (_stricmp(argv[4], "BINSTR") == 0) + bufLen = dumpHex(inFile, outCFile, 1); + else // (_stricmp(argv[4], "STR") == 0) + bufLen = dumpStr(inFile, outCFile); - fprintf(outCFile, " 0x%02x,", (unsigned int)ch); - ++bufLen; - ch = fgetc(inFile); - } - /* Put a final NULL terminator */ - fprintf(outCFile, "\n 0x00"); ++bufLen; - fprintf(outCFile, "\n};\n"); + fprintf(outCFile, ";\n"); fclose(outCFile); /* Generate the header file and close it */ fprintf(outHFile, "/* This file is autogenerated, do not edit. */\n\n"); - fprintf(outHFile, "#define %s_SIZE %Iu\n" , argv[4], bufLen); - fprintf(outHFile, "extern unsigned char %s[%Iu];\n", argv[4], bufLen); + fprintf(outHFile, "#define %s_SIZE %lu\n" , argv[5], bufLen); + fprintf(outHFile, "extern unsigned char %s[%lu];\n", argv[5], bufLen); fclose(outHFile); /* Close the input file */

1 0

[pschweitzer] 68254: [NTFS] - Bail out if no subnode is available - It's unimplemented if subnodes are available
by pschweitzer＠svn.reactos.org 24 Jun '15

24 Jun '15

Author: pschweitzer Date: Wed Jun 24 19:21:04 2015 New Revision: 68254 URL: http://svn.reactos.org/svn/reactos?rev=68254&view=rev Log: [NTFS] - Bail out if no subnode is available - It's unimplemented if subnodes are available Modified: trunk/reactos/drivers/filesystems/ntfs/mft.c Modified: trunk/reactos/drivers/filesystems/ntfs/mft.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/m… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/mft.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/mft.c [iso-8859-1] Wed Jun 24 19:21:04 2015 @@ -535,9 +535,12 @@ IndexEntry = (PINDEX_ENTRY_ATTRIBUTE)((PCHAR)IndexEntry + IndexEntry->Length); } - if (IndexEntry->Flags & NTFS_INDEX_ENTRY_NODE) - DPRINT1("Sub-node available\n"); - + if (!(IndexEntry->Flags & NTFS_INDEX_ENTRY_NODE)) + { + return STATUS_OBJECT_PATH_NOT_FOUND; + } + + UNIMPLEMENTED; return STATUS_OBJECT_PATH_NOT_FOUND; }

1 0

[cfinck] 68253: [SPOOLSS] Halfplement and document the undocumented but exported MarshallDownStructure API. Information about this API was exclusively gained by writing a custom XML file for rohita...
by cfinck＠svn.reactos.org 24 Jun '15

24 Jun '15

Author: cfinck Date: Wed Jun 24 16:26:33 2015 New Revision: 68253 URL: http://svn.reactos.org/svn/reactos?rev=68253&view=rev Log: [SPOOLSS] Halfplement and document the undocumented but exported MarshallDownStructure API. Information about this API was exclusively gained by writing a custom XML file for rohitab.com's API Monitor and monitoring calls under Windows. I could figure out the parameters passed to the function, but don't really know what most of them are for. For me, the function does what it should and what I will soon need it for, but without making use of cbSize, cbPerElementSize, cbStructureSize and bSomeBoolean. A Code Review and additional hints are highly appreciated! My XML file for the API Monitor is available on request. Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/spoolss.spec branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/tools.c branches/colins-printing-for-freedom/reactos/win32ss/printing/include/spoolss.h Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/spoolss.spec URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/spoolss.spec [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/spoolss.spec [iso-8859-1] Wed Jun 24 16:26:33 2015 @@ -96,7 +96,7 @@ @ stub LoadDriverFiletoConvertDevmode @ stub LoadDriverWithVersion @ stub LogWmiTraceEvent -@ stub MarshallDownStructure +@ stdcall MarshallDownStructure(ptr ptr long long) @ stub MarshallDownStructuresArray @ stub MarshallUpStructure @ stub MarshallUpStructuresArray Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/tools.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/tools.c [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/tools.c [iso-8859-1] Wed Jun 24 16:26:33 2015 @@ -7,6 +7,56 @@ #include "precomp.h" + +/** + * @name MarshallDownStructure + * + * Prepare a structure for marshalling/serialization by replacing absolute pointer addresses in its fields by relative offsets. + * + * @param pStructure + * Pointer to the structure to operate on. + * + * @param pParameters + * Array of MARSHALL_DOWN_INFO elements containing information about the fields of the structure as well as how to modify them. + * See the documentation on MARSHALL_DOWN_INFO for more information. + * You have to indicate the end of the array by setting the dwOffset field to MAXDWORD. + * + * @param cbStructureSize + * Apparently, this is the size in bytes of the structure given through pStructure under Windows. + * This parameter is unused in my implementation. + * + * @param bSomeBoolean + * Unknown boolean value + * + * @return + * TRUE if the structure was successfully adjusted, FALSE otherwise. + */ +BOOL WINAPI +MarshallDownStructure(PVOID pStructure, PMARSHALL_DOWN_INFO pParameters, DWORD cbStructureSize, BOOL bSomeBoolean) +{ + // Sanity checks + if (!pStructure || !pParameters) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + // Loop until we reach an element with offset set to MAXDWORD. + while (pParameters->dwOffset != MAXDWORD) + { + if (pParameters->bAdjustAddress) + { + // Apply the byte offset on pStructure. There must be a pointer at this position, whose address we're adjusting + // by subtracting the address of pStructure from it. + *((PULONG_PTR)((PBYTE)pStructure + pParameters->dwOffset)) -= (ULONG_PTR)pStructure; + } + + // Advance to the next element description. + pParameters++; + } + + return TRUE; +} /** * @name PackStrings Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/include/spoolss.h URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/include/spoolss.h [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/include/spoolss.h [iso-8859-1] Wed Jun 24 16:26:33 2015 @@ -8,10 +8,22 @@ #ifndef _REACTOS_SPOOLSS_H #define _REACTOS_SPOOLSS_H +typedef struct _MARSHALL_DOWN_INFO +{ + DWORD dwOffset; /** Byte offset of this element within the structure or MAXDWORD to indicate the end of the array */ + DWORD cbSize; /** Total size of this element in bytes under Windows. Unused here, I don't know what we need this number for. */ + DWORD cbPerElementSize; /** If this element is a structure itself, this field gives the size in bytes of each element of the structure. + Otherwise, this is the same as cbTotalSize. E.g. for SYSTEMTIME, cbSize would be 16 and cbPerElementSize would be 2. + Unused here, I don't know what we need this number for. */ + BOOL bAdjustAddress; /** TRUE if MarshallDownStructure shall adjust the address of this element, FALSE if it shall leave this element untouched. */ +} +MARSHALL_DOWN_INFO, *PMARSHALL_DOWN_INFO; + PWSTR WINAPI AllocSplStr(PCWSTR pwszInput); PVOID WINAPI DllAllocSplMem(DWORD dwBytes); BOOL WINAPI DllFreeSplMem(PVOID pMem); BOOL WINAPI DllFreeSplStr(PWSTR pwszString); +BOOL WINAPI MarshallDownStructure(PVOID pStructure, PMARSHALL_DOWN_INFO pParameters, DWORD cbStructureSize, BOOL bSomeBoolean); PBYTE WINAPI PackStrings(PCWSTR* pSource, PBYTE pDest, PDWORD DestOffsets, PBYTE pEnd); PVOID WINAPI ReallocSplMem(PVOID pOldMem, DWORD cbOld, DWORD cbNew); BOOL WINAPI ReallocSplStr(PWSTR* ppwszString, PCWSTR pwszInput);

1 0

[cfinck] 68252: Addendum to r68248
by cfinck＠svn.reactos.org 24 Jun '15

24 Jun '15

Author: cfinck Date: Wed Jun 24 16:20:13 2015 New Revision: 68252 URL: http://svn.reactos.org/svn/reactos?rev=68252&view=rev Log: Addendum to r68248 Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolsv/main.c branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolsv/precomp.h Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolsv/main.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolsv/main.c [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolsv/main.c [iso-8859-1] Wed Jun 24 16:20:13 2015 @@ -59,7 +59,7 @@ _UpdateServiceStatus(SERVICE_START_PENDING, 0); // Create a thread for serving RPC requests - hThread = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE)RpcThreadProc, NULL, 0, NULL); + hThread = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE)LrpcThreadProc, NULL, 0, NULL); if (!hThread) { ERR("CreateThread failed with error %u!\n", GetLastError()); Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolsv/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolsv/precomp.h [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolsv/precomp.h [iso-8859-1] Wed Jun 24 16:20:13 2015 @@ -22,7 +22,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(spoolsv); // rpcserver.c -DWORD WINAPI RpcThreadProc(LPVOID lpParameter); +DWORD WINAPI LrpcThreadProc(LPVOID lpParameter); // Undocumented spoolss BOOL WINAPI InitializeRouter(HANDLE SpoolerStatusHandle);

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs