Ros-diffs January 2018

ros-diffs@reactos.org

37 participants
372 discussions

01/01: [PRINTING] Replace all my custom marshalling code by calls to the newly implemented APIs, thereby significantly reducing the codebase and providing a sane template to implement more Printing APIs.

by Colin Finck

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=22ffe5300b5882605b679… commit 22ffe5300b5882605b6790057b84010d8043fe53 Author: Colin Finck <colin(a)reactos.org> AuthorDate: Wed Jan 17 12:52:12 2018 +0100 Commit: Colin Finck <colin(a)reactos.org> CommitDate: Wed Jan 17 12:52:12 2018 +0100 [PRINTING] Replace all my custom marshalling code by calls to the newly implemented APIs, thereby significantly reducing the codebase and providing a sane template to implement more Printing APIs. --- .../apitests/spoolss/MarshallDownStructuresArray.c | 6 +- win32ss/printing/base/spoolsv/jobs.c | 79 ++--------- win32ss/printing/base/spoolsv/monitors.c | 30 +--- win32ss/printing/base/spoolsv/ports.c | 42 +----- win32ss/printing/base/spoolsv/printers.c | 124 ++-------------- win32ss/printing/base/spoolsv/printprocessors.c | 33 +---- win32ss/printing/base/winspool/jobs.c | 74 ++-------- win32ss/printing/base/winspool/monitors.c | 31 +--- win32ss/printing/base/winspool/ports.c | 31 +--- win32ss/printing/base/winspool/printers.c | 124 ++-------------- win32ss/printing/base/winspool/printprocessors.c | 41 ++---- win32ss/printing/include/marshalling/jobs.h | 71 ++++++++++ win32ss/printing/include/marshalling/monitors.h | 30 ++++ win32ss/printing/include/marshalling/ports.h | 10 +- win32ss/printing/include/marshalling/printers.h | 157 +++++++++++++++++++++ .../printing/include/marshalling/printprocessors.h | 22 +++ 16 files changed, 359 insertions(+), 546 deletions(-) diff --git a/modules/rostests/apitests/spoolss/MarshallDownStructuresArray.c b/modules/rostests/apitests/spoolss/MarshallDownStructuresArray.c index cd057074ec..7b7deba6f4 100644 --- a/modules/rostests/apitests/spoolss/MarshallDownStructuresArray.c +++ b/modules/rostests/apitests/spoolss/MarshallDownStructuresArray.c @@ -74,7 +74,7 @@ START_TEST(MarshallDownStructuresArray) // Marshall them down. SetLastError(0xDEADBEEF); - ok(MarshallDownStructuresArray(pPortInfo2, cElements, PortInfo2Marshalling.pInfo, PortInfo2Marshalling.cbStructureSize, TRUE), "MarshallDownStructuresArray returns FALSE!\n"); + ok(MarshallDownStructuresArray(pPortInfo2, cElements, pPortInfoMarshalling[2]->pInfo, pPortInfoMarshalling[2]->cbStructureSize, TRUE), "MarshallDownStructuresArray returns FALSE!\n"); ok(GetLastError() == 0xDEADBEEF, "GetLastError returns %lu!\n", GetLastError()); // DWORD values should be unchanged. @@ -99,13 +99,13 @@ START_TEST(MarshallDownStructuresArray) // Due to the implementation of PackStrings, (&pPortInfo2[0])->pPortName contains the highest offset. // Show that MarshallUpStructuresArray checks the offsets and bails out with ERROR_INVALID_DATA if cbSize <= highest offset. SetLastError(0xDEADBEEF); - ok(!MarshallUpStructuresArray((DWORD)(&pPortInfo2[0])->pPortName, pPortInfo2Test, cElements, PortInfo2Marshalling.pInfo, PortInfo2Marshalling.cbStructureSize, TRUE), "MarshallUpStructuresArray returns TRUE!\n"); + ok(!MarshallUpStructuresArray((DWORD)(&pPortInfo2[0])->pPortName, pPortInfo2Test, cElements, pPortInfoMarshalling[2]->pInfo, pPortInfoMarshalling[2]->cbStructureSize, TRUE), "MarshallUpStructuresArray returns TRUE!\n"); ok(GetLastError() == ERROR_INVALID_DATA, "GetLastError returns %lu!\n", GetLastError()); // It works with cbSize > highest offset. // In real world cases, we would use cbPortInfo2Size for cbSize. SetLastError(0xDEADBEEF); - ok(MarshallUpStructuresArray((DWORD)(&pPortInfo2[0])->pPortName + 1, pPortInfo2, cElements, PortInfo2Marshalling.pInfo, PortInfo2Marshalling.cbStructureSize, TRUE), "MarshallUpStructuresArray returns FALSE!\n"); + ok(MarshallUpStructuresArray((DWORD)(&pPortInfo2[0])->pPortName + 1, pPortInfo2, cElements, pPortInfoMarshalling[2]->pInfo, pPortInfoMarshalling[2]->cbStructureSize, TRUE), "MarshallUpStructuresArray returns FALSE!\n"); ok(GetLastError() == 0xDEADBEEF, "GetLastError returns %lu!\n", GetLastError()); // pPortInfo2 should now be identical to the copy again. diff --git a/win32ss/printing/base/spoolsv/jobs.c b/win32ss/printing/base/spoolsv/jobs.c index 596cddbf35..3fe510e6c7 100644 --- a/win32ss/printing/base/spoolsv/jobs.c +++ b/win32ss/printing/base/spoolsv/jobs.c @@ -2,65 +2,11 @@ * PROJECT: ReactOS Print Spooler Service * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: Functions for managing print jobs - * COPYRIGHT: Copyright 2015-2017 Colin Finck (colin(a)reactos.org) + * COPYRIGHT: Copyright 2015-2018 Colin Finck (colin(a)reactos.org) */ #include "precomp.h" - -static void -_MarshallDownAddJobInfo(PADDJOB_INFO_1W* ppAddJobInfo1) -{ - // Replace absolute pointer addresses in the output by relative offsets. - PADDJOB_INFO_1W pAddJobInfo1 = *ppAddJobInfo1; - pAddJobInfo1->Path = (PWSTR)((ULONG_PTR)pAddJobInfo1->Path - (ULONG_PTR)pAddJobInfo1); - - *ppAddJobInfo1 += sizeof(ADDJOB_INFO_1W); -} - -static void -_MarshallDownJobInfo(PBYTE* ppJobInfo, DWORD Level) -{ - // Replace absolute pointer addresses in the output by relative offsets. - if (Level == 1) - { - PJOB_INFO_1W pJobInfo1 = (PJOB_INFO_1W)(*ppJobInfo); - - pJobInfo1->pDatatype = (PWSTR)((ULONG_PTR)pJobInfo1->pDatatype - (ULONG_PTR)pJobInfo1); - pJobInfo1->pDocument = (PWSTR)((ULONG_PTR)pJobInfo1->pDocument - (ULONG_PTR)pJobInfo1); - pJobInfo1->pMachineName = (PWSTR)((ULONG_PTR)pJobInfo1->pMachineName - (ULONG_PTR)pJobInfo1); - pJobInfo1->pPrinterName = (PWSTR)((ULONG_PTR)pJobInfo1->pPrinterName - (ULONG_PTR)pJobInfo1); - - if (pJobInfo1->pStatus) - pJobInfo1->pStatus = (PWSTR)((ULONG_PTR)pJobInfo1->pStatus - (ULONG_PTR)pJobInfo1); - - pJobInfo1->pUserName = (PWSTR)((ULONG_PTR)pJobInfo1->pUserName - (ULONG_PTR)pJobInfo1); - - *ppJobInfo += sizeof(JOB_INFO_1W); - } - else if (Level == 2) - { - PJOB_INFO_2W pJobInfo2 = (PJOB_INFO_2W)(*ppJobInfo); - - pJobInfo2->pDatatype = (PWSTR)((ULONG_PTR)pJobInfo2->pDatatype - (ULONG_PTR)pJobInfo2); - pJobInfo2->pDevMode = (PDEVMODEW)((ULONG_PTR)pJobInfo2->pDevMode - (ULONG_PTR)pJobInfo2); - pJobInfo2->pDocument = (PWSTR)((ULONG_PTR)pJobInfo2->pDocument - (ULONG_PTR)pJobInfo2); - pJobInfo2->pDriverName = (PWSTR)((ULONG_PTR)pJobInfo2->pDriverName - (ULONG_PTR)pJobInfo2); - pJobInfo2->pMachineName = (PWSTR)((ULONG_PTR)pJobInfo2->pMachineName - (ULONG_PTR)pJobInfo2); - pJobInfo2->pNotifyName = (PWSTR)((ULONG_PTR)pJobInfo2->pNotifyName - (ULONG_PTR)pJobInfo2); - pJobInfo2->pPrinterName = (PWSTR)((ULONG_PTR)pJobInfo2->pPrinterName - (ULONG_PTR)pJobInfo2); - pJobInfo2->pPrintProcessor = (PWSTR)((ULONG_PTR)pJobInfo2->pPrintProcessor - (ULONG_PTR)pJobInfo2); - - if (pJobInfo2->pParameters) - pJobInfo2->pParameters = (PWSTR)((ULONG_PTR)pJobInfo2->pParameters - (ULONG_PTR)pJobInfo2); - - if (pJobInfo2->pStatus) - pJobInfo2->pStatus = (PWSTR)((ULONG_PTR)pJobInfo2->pStatus - (ULONG_PTR)pJobInfo2); - - pJobInfo2->pUserName = (PWSTR)((ULONG_PTR)pJobInfo2->pUserName - (ULONG_PTR)pJobInfo2); - - *ppJobInfo += sizeof(JOB_INFO_2W); - } -} +#include <marshalling/jobs.h> DWORD _RpcAddJob(WINSPOOL_PRINTER_HANDLE hPrinter, DWORD Level, BYTE* pAddJob, DWORD cbBuf, DWORD* pcbNeeded) @@ -79,10 +25,8 @@ _RpcAddJob(WINSPOOL_PRINTER_HANDLE hPrinter, DWORD Level, BYTE* pAddJob, DWORD c if (AddJobW(hPrinter, Level, pAddJobAligned, cbBuf, pcbNeeded)) { - PBYTE p = pAddJobAligned; - // Replace absolute pointer addresses in the output by relative offsets. - _MarshallDownAddJobInfo((PADDJOB_INFO_1W*)&p); + MarshallDownStructure(pAddJobAligned, AddJobInfo1Marshalling.pInfo, AddJobInfo1Marshalling.cbStructureSize, TRUE); } else { @@ -112,12 +56,12 @@ _RpcEnumJobs(WINSPOOL_PRINTER_HANDLE hPrinter, DWORD FirstJob, DWORD NoJobs, DWO if (EnumJobsW(hPrinter, FirstJob, NoJobs, Level, pJobAligned, cbBuf, pcbNeeded, pcReturned)) { - DWORD i; - PBYTE p = pJobAligned; - - // Replace absolute pointer addresses in the output by relative offsets. - for (i = 0; i < *pcReturned; i++) - _MarshallDownJobInfo(&p, Level); + // Replace absolute pointer addresses in the output by relative offsets for JOB_INFO_1W and JOB_INFO_2W. + if (Level <= 2) + { + ASSERT(Level >= 1); + MarshallDownStructuresArray(pJobAligned, *pcReturned, pJobInfoMarshalling[Level]->pInfo, pJobInfoMarshalling[Level]->cbStructureSize, TRUE); + } } else { @@ -147,10 +91,9 @@ _RpcGetJob(WINSPOOL_PRINTER_HANDLE hPrinter, DWORD JobId, DWORD Level, BYTE* pJo if (GetJobW(hPrinter, JobId, Level, pJobAligned, cbBuf, pcbNeeded)) { - PBYTE p = pJobAligned; - // Replace absolute pointer addresses in the output by relative offsets. - _MarshallDownJobInfo(&p, Level); + ASSERT(Level >= 1 && Level <= 2); + MarshallDownStructure(pJobAligned, pJobInfoMarshalling[Level]->pInfo, pJobInfoMarshalling[Level]->cbStructureSize, TRUE); } else { diff --git a/win32ss/printing/base/spoolsv/monitors.c b/win32ss/printing/base/spoolsv/monitors.c index 3e02902a38..0b83ccad00 100644 --- a/win32ss/printing/base/spoolsv/monitors.c +++ b/win32ss/printing/base/spoolsv/monitors.c @@ -2,30 +2,11 @@ * PROJECT: ReactOS Print Spooler Service * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: Functions related to Print Monitors - * COPYRIGHT: Copyright 2015-2017 Colin Finck (colin(a)reactos.org) + * COPYRIGHT: Copyright 2015-2018 Colin Finck (colin(a)reactos.org) */ #include "precomp.h" - -static void -_MarshallDownMonitorInfo(PBYTE* ppMonitorInfo, DWORD Level) -{ - PMONITOR_INFO_2W pMonitorInfo2 = (PMONITOR_INFO_2W)(*ppMonitorInfo); // MONITOR_INFO_1W is a subset of MONITOR_INFO_2W - - // Replace absolute pointer addresses in the output by relative offsets. - pMonitorInfo2->pName = (PWSTR)((ULONG_PTR)pMonitorInfo2->pName - (ULONG_PTR)pMonitorInfo2); - - if (Level == 1) - { - *ppMonitorInfo += sizeof(MONITOR_INFO_1W); - } - else - { - pMonitorInfo2->pDLLName = (PWSTR)((ULONG_PTR)pMonitorInfo2->pDLLName - (ULONG_PTR)pMonitorInfo2); - pMonitorInfo2->pEnvironment = (PWSTR)((ULONG_PTR)pMonitorInfo2->pEnvironment - (ULONG_PTR)pMonitorInfo2); - *ppMonitorInfo += sizeof(MONITOR_INFO_2W); - } -} +#include <marshalling/monitors.h> DWORD _RpcAddMonitor(WINSPOOL_HANDLE pName, WINSPOOL_MONITOR_CONTAINER* pMonitorContainer) @@ -59,11 +40,8 @@ _RpcEnumMonitors(WINSPOOL_HANDLE pName, DWORD Level, BYTE* pMonitor, DWORD cbBuf if(EnumMonitorsW(pName, Level, pMonitorAligned, cbBuf, pcbNeeded, pcReturned)) { // Replace absolute pointer addresses in the output by relative offsets. - DWORD i; - PBYTE p = pMonitorAligned; - - for (i = 0; i < *pcReturned; i++) - _MarshallDownMonitorInfo(&p, Level); + ASSERT(Level >= 1 && Level <= 2); + MarshallDownStructuresArray(pMonitorAligned, *pcReturned, pMonitorInfoMarshalling[Level]->pInfo, pMonitorInfoMarshalling[Level]->cbStructureSize, TRUE); } else { diff --git a/win32ss/printing/base/spoolsv/ports.c b/win32ss/printing/base/spoolsv/ports.c index d88a08cbd5..8b510d7ee0 100644 --- a/win32ss/printing/base/spoolsv/ports.c +++ b/win32ss/printing/base/spoolsv/ports.c @@ -2,42 +2,11 @@ * PROJECT: ReactOS Print Spooler Service * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: Functions related to Ports - * COPYRIGHT: Copyright 2015-2017 Colin Finck (colin(a)reactos.org) + * COPYRIGHT: Copyright 2015-2018 Colin Finck (colin(a)reactos.org) */ #include "precomp.h" - -static void -_MarshallDownPortInfo(PBYTE* ppPortInfo, DWORD Level) -{ - // Replace absolute pointer addresses in the output by relative offsets. - if (Level == 1) - { - PPORT_INFO_1W pPortInfo1 = (PPORT_INFO_1W)(*ppPortInfo); - - pPortInfo1->pName = (PWSTR)((ULONG_PTR)pPortInfo1->pName - (ULONG_PTR)pPortInfo1); - - *ppPortInfo += sizeof(PORT_INFO_1W); - } - else if (Level == 2) - { - PPORT_INFO_2W pPortInfo2 = (PPORT_INFO_2W)(*ppPortInfo); - - pPortInfo2->pPortName = (PWSTR)((ULONG_PTR)pPortInfo2->pPortName - (ULONG_PTR)pPortInfo2); - pPortInfo2->pDescription = (PWSTR)((ULONG_PTR)pPortInfo2->pDescription - (ULONG_PTR)pPortInfo2); - pPortInfo2->pMonitorName = (PWSTR)((ULONG_PTR)pPortInfo2->pMonitorName - (ULONG_PTR)pPortInfo2); - - *ppPortInfo += sizeof(PORT_INFO_2W); - } - else if (Level == 3) - { - PPORT_INFO_3W pPortInfo3 = (PPORT_INFO_3W)(*ppPortInfo); - - pPortInfo3->pszStatus = (PWSTR)((ULONG_PTR)pPortInfo3->pszStatus - (ULONG_PTR)pPortInfo3); - - *ppPortInfo += sizeof(PORT_INFO_3W); - } -} +#include <marshalling/ports.h> DWORD _RpcAddPort(WINSPOOL_HANDLE pName, ULONG_PTR hWnd, WCHAR* pMonitorName) @@ -85,11 +54,8 @@ _RpcEnumPorts(WINSPOOL_HANDLE pName, DWORD Level, BYTE* pPort, DWORD cbBuf, DWOR if (EnumPortsW(pName, Level, pPortAligned, cbBuf, pcbNeeded, pcReturned)) { // Replace absolute pointer addresses in the output by relative offsets. - DWORD i; - PBYTE p = pPortAligned; - - for (i = 0; i < *pcReturned; i++) - _MarshallDownPortInfo(&p, Level); + ASSERT(Level >= 1 && Level <= 2); + MarshallDownStructuresArray(pPortAligned, *pcReturned, pPortInfoMarshalling[Level]->pInfo, pPortInfoMarshalling[Level]->cbStructureSize, TRUE); } else { diff --git a/win32ss/printing/base/spoolsv/printers.c b/win32ss/printing/base/spoolsv/printers.c index 881eec87d4..08eec5f071 100644 --- a/win32ss/printing/base/spoolsv/printers.c +++ b/win32ss/printing/base/spoolsv/printers.c @@ -2,118 +2,11 @@ * PROJECT: ReactOS Print Spooler Service * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: Functions related to Printers and printing - * COPYRIGHT: Copyright 2015-2017 Colin Finck (colin(a)reactos.org) + * COPYRIGHT: Copyright 2015-2018 Colin Finck (colin(a)reactos.org) */ #include "precomp.h" - -static void -_MarshallDownPrinterInfo(PBYTE* ppPrinterInfo, DWORD Level) -{ - // Replace absolute pointer addresses in the output by relative offsets. - if (Level == 0) - { - PPRINTER_INFO_STRESS pPrinterInfo0 = (PPRINTER_INFO_STRESS)(*ppPrinterInfo); - - pPrinterInfo0->pPrinterName = (PWSTR)((ULONG_PTR)pPrinterInfo0->pPrinterName - (ULONG_PTR)pPrinterInfo0); - - if (pPrinterInfo0->pServerName) - pPrinterInfo0->pServerName = (PWSTR)((ULONG_PTR)pPrinterInfo0->pServerName - (ULONG_PTR)pPrinterInfo0); - - *ppPrinterInfo += sizeof(PRINTER_INFO_STRESS); - } - else if (Level == 1) - { - PPRINTER_INFO_1W pPrinterInfo1 = (PPRINTER_INFO_1W)(*ppPrinterInfo); - - pPrinterInfo1->pName = (PWSTR)((ULONG_PTR)pPrinterInfo1->pName - (ULONG_PTR)pPrinterInfo1); - pPrinterInfo1->pDescription = (PWSTR)((ULONG_PTR)pPrinterInfo1->pDescription - (ULONG_PTR)pPrinterInfo1); - pPrinterInfo1->pComment = (PWSTR)((ULONG_PTR)pPrinterInfo1->pComment - (ULONG_PTR)pPrinterInfo1); - - *ppPrinterInfo += sizeof(PRINTER_INFO_1W); - } - else if (Level == 2) - { - PPRINTER_INFO_2W pPrinterInfo2 = (PPRINTER_INFO_2W)(*ppPrinterInfo); - - pPrinterInfo2->pPrinterName = (PWSTR)((ULONG_PTR)pPrinterInfo2->pPrinterName - (ULONG_PTR)pPrinterInfo2); - pPrinterInfo2->pShareName = (PWSTR)((ULONG_PTR)pPrinterInfo2->pShareName - (ULONG_PTR)pPrinterInfo2); - pPrinterInfo2->pPortName = (PWSTR)((ULONG_PTR)pPrinterInfo2->pPortName - (ULONG_PTR)pPrinterInfo2); - pPrinterInfo2->pDriverName = (PWSTR)((ULONG_PTR)pPrinterInfo2->pDriverName - (ULONG_PTR)pPrinterInfo2); - pPrinterInfo2->pComment = (PWSTR)((ULONG_PTR)pPrinterInfo2->pComment - (ULONG_PTR)pPrinterInfo2); - pPrinterInfo2->pLocation = (PWSTR)((ULONG_PTR)pPrinterInfo2->pLocation - (ULONG_PTR)pPrinterInfo2); - pPrinterInfo2->pDevMode = (PDEVMODEW)((ULONG_PTR)pPrinterInfo2->pDevMode - (ULONG_PTR)pPrinterInfo2); - pPrinterInfo2->pSepFile = (PWSTR)((ULONG_PTR)pPrinterInfo2->pSepFile - (ULONG_PTR)pPrinterInfo2); - pPrinterInfo2->pPrintProcessor = (PWSTR)((ULONG_PTR)pPrinterInfo2->pPrintProcessor - (ULONG_PTR)pPrinterInfo2); - pPrinterInfo2->pDatatype = (PWSTR)((ULONG_PTR)pPrinterInfo2->pDatatype - (ULONG_PTR)pPrinterInfo2); - pPrinterInfo2->pParameters = (PWSTR)((ULONG_PTR)pPrinterInfo2->pParameters - (ULONG_PTR)pPrinterInfo2); - - if (pPrinterInfo2->pServerName) - pPrinterInfo2->pServerName = (PWSTR)((ULONG_PTR)pPrinterInfo2->pServerName - (ULONG_PTR)pPrinterInfo2); - - if (pPrinterInfo2->pSecurityDescriptor) - pPrinterInfo2->pSecurityDescriptor = (PSECURITY_DESCRIPTOR)((ULONG_PTR)pPrinterInfo2->pSecurityDescriptor - (ULONG_PTR)pPrinterInfo2); - - *ppPrinterInfo += sizeof(PRINTER_INFO_2W); - } - else if (Level == 3) - { - PPRINTER_INFO_3 pPrinterInfo3 = (PPRINTER_INFO_3)(*ppPrinterInfo); - - pPrinterInfo3->pSecurityDescriptor = (PSECURITY_DESCRIPTOR)((ULONG_PTR)pPrinterInfo3->pSecurityDescriptor - (ULONG_PTR)pPrinterInfo3); - - *ppPrinterInfo += sizeof(PRINTER_INFO_3); - } - else if (Level == 4) - { - PPRINTER_INFO_4W pPrinterInfo4 = (PPRINTER_INFO_4W)(*ppPrinterInfo); - - pPrinterInfo4->pPrinterName = (PWSTR)((ULONG_PTR)pPrinterInfo4->pPrinterName - (ULONG_PTR)pPrinterInfo4); - - if (pPrinterInfo4->pServerName) - pPrinterInfo4->pServerName = (PWSTR)((ULONG_PTR)pPrinterInfo4->pServerName - (ULONG_PTR)pPrinterInfo4); - - *ppPrinterInfo += sizeof(PRINTER_INFO_4W); - } - else if (Level == 5) - { - PPRINTER_INFO_5W pPrinterInfo5 = (PPRINTER_INFO_5W)(*ppPrinterInfo); - - pPrinterInfo5->pPrinterName = (PWSTR)((ULONG_PTR)pPrinterInfo5->pPrinterName - (ULONG_PTR)pPrinterInfo5); - pPrinterInfo5->pPortName = (PWSTR)((ULONG_PTR)pPrinterInfo5->pPortName - (ULONG_PTR)pPrinterInfo5); - - *ppPrinterInfo += sizeof(PRINTER_INFO_5W); - } - else if (Level == 6) - { - *ppPrinterInfo += sizeof(PRINTER_INFO_6); - } - else if (Level == 7) - { - PPRINTER_INFO_7W pPrinterInfo7 = (PPRINTER_INFO_7W)(*ppPrinterInfo); - - if (pPrinterInfo7->pszObjectGUID) - pPrinterInfo7->pszObjectGUID = (PWSTR)((ULONG_PTR)pPrinterInfo7->pszObjectGUID - (ULONG_PTR)pPrinterInfo7); - - *ppPrinterInfo += sizeof(PRINTER_INFO_7W); - } - else if (Level == 8) - { - PPRINTER_INFO_8W pPrinterInfo8 = (PPRINTER_INFO_8W)(*ppPrinterInfo); - - pPrinterInfo8->pDevMode = (PDEVMODEW)((ULONG_PTR)pPrinterInfo8->pDevMode - (ULONG_PTR)pPrinterInfo8); - - *ppPrinterInfo += sizeof(PRINTER_INFO_8W); - } - else if (Level == 9) - { - PPRINTER_INFO_9W pPrinterInfo9 = (PPRINTER_INFO_9W)(*ppPrinterInfo); - - pPrinterInfo9->pDevMode = (PDEVMODEW)((ULONG_PTR)pPrinterInfo9->pDevMode - (ULONG_PTR)pPrinterInfo9); - - *ppPrinterInfo += sizeof(PRINTER_INFO_9W); - } -} +#include <marshalling/printers.h> DWORD _RpcAbortPrinter(WINSPOOL_PRINTER_HANDLE hPrinter) @@ -219,11 +112,9 @@ _RpcEnumPrinters(DWORD Flags, WINSPOOL_HANDLE Name, DWORD Level, BYTE* pPrinterE if (EnumPrintersW(Flags, Name, Level, pPrinterEnumAligned, cbBuf, pcbNeeded, pcReturned)) { - DWORD i; - PBYTE p = pPrinterEnumAligned; - - for (i = 0; i < *pcReturned; i++) - _MarshallDownPrinterInfo(&p, Level); + // Replace absolute pointer addresses in the output by relative offsets. + ASSERT(Level <= 9); + MarshallDownStructuresArray(pPrinterEnumAligned, *pcReturned, pPrinterInfoMarshalling[Level]->pInfo, pPrinterInfoMarshalling[Level]->cbStructureSize, TRUE); } else { @@ -260,8 +151,9 @@ _RpcGetPrinter(WINSPOOL_PRINTER_HANDLE hPrinter, DWORD Level, BYTE* pPrinter, DW if (GetPrinterW(hPrinter, Level, pPrinterAligned, cbBuf, pcbNeeded)) { - PBYTE p = pPrinterAligned; - _MarshallDownPrinterInfo(&p, Level); + // Replace absolute pointer addresses in the output by relative offsets. + ASSERT(Level <= 9); + MarshallDownStructure(pPrinterAligned, pPrinterInfoMarshalling[Level]->pInfo, pPrinterInfoMarshalling[Level]->cbStructureSize, TRUE); } else { diff --git a/win32ss/printing/base/spoolsv/printprocessors.c b/win32ss/printing/base/spoolsv/printprocessors.c index 0e949bbec8..fcdb7d50d4 100644 --- a/win32ss/printing/base/spoolsv/printprocessors.c +++ b/win32ss/printing/base/spoolsv/printprocessors.c @@ -2,28 +2,11 @@ * PROJECT: ReactOS Print Spooler Service * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: Functions related to Print Processors - * COPYRIGHT: Copyright 2015-2017 Colin Finck (colin(a)reactos.org) + * COPYRIGHT: Copyright 2015-2018 Colin Finck (colin(a)reactos.org) */ #include "precomp.h" - -static void -_MarshallDownDatatypesInfo(PDATATYPES_INFO_1W* ppDatatypesInfo1) -{ - // Replace absolute pointer addresses in the output by relative offsets. - PDATATYPES_INFO_1W pDatatypesInfo1 = *ppDatatypesInfo1; - pDatatypesInfo1->pName = (PWSTR)((ULONG_PTR)pDatatypesInfo1->pName - (ULONG_PTR)pDatatypesInfo1); - *ppDatatypesInfo1 += sizeof(DATATYPES_INFO_1W); -} - -static void -_MarshallDownPrintProcessorInfo(PPRINTPROCESSOR_INFO_1W* ppPrintProcessorInfo1) -{ - // Replace absolute pointer addresses in the output by relative offsets. - PPRINTPROCESSOR_INFO_1W pPrintProcessorInfo1 = *ppPrintProcessorInfo1; - pPrintProcessorInfo1->pName = (PWSTR)((ULONG_PTR)pPrintProcessorInfo1->pName - (ULONG_PTR)pPrintProcessorInfo1); - *ppPrintProcessorInfo1 += sizeof(PRINTPROCESSOR_INFO_1W); -} +#include <marshalling/printprocessors.h> DWORD _RpcAddPrintProcessor(WINSPOOL_HANDLE pName, WCHAR* pEnvironment, WCHAR* pPathName, WCHAR* pPrintProcessorName) @@ -57,11 +40,7 @@ _RpcEnumPrintProcessorDatatypes(WINSPOOL_HANDLE pName, WCHAR* pPrintProcessorNam if (EnumPrintProcessorDatatypesW(pName, pPrintProcessorName, Level, pDatatypesAligned, cbBuf, pcbNeeded, pcReturned)) { // Replace absolute pointer addresses in the output by relative offsets. - DWORD i; - PDATATYPES_INFO_1W p = (PDATATYPES_INFO_1W)pDatatypesAligned; - - for (i = 0; i < *pcReturned; i++) - _MarshallDownDatatypesInfo(&p); + MarshallDownStructuresArray(pDatatypesAligned, *pcReturned, DatatypesInfo1Marshalling.pInfo, DatatypesInfo1Marshalling.cbStructureSize, TRUE); } else { @@ -92,11 +71,7 @@ _RpcEnumPrintProcessors(WINSPOOL_HANDLE pName, WCHAR* pEnvironment, DWORD Level, if (EnumPrintProcessorsW(pName, pEnvironment, Level, pPrintProcessorInfoAligned, cbBuf, pcbNeeded, pcReturned)) { // Replace absolute pointer addresses in the output by relative offsets. - DWORD i; - PPRINTPROCESSOR_INFO_1W p = (PPRINTPROCESSOR_INFO_1W)pPrintProcessorInfoAligned; - - for (i = 0; i < *pcReturned; i++) - _MarshallDownPrintProcessorInfo(&p); + MarshallDownStructuresArray(pPrintProcessorInfoAligned, *pcReturned, PrintProcessorInfo1Marshalling.pInfo, PrintProcessorInfo1Marshalling.cbStructureSize, TRUE); } else { diff --git a/win32ss/printing/base/winspool/jobs.c b/win32ss/printing/base/winspool/jobs.c index 7551a30b33..e3cea6500c 100644 --- a/win32ss/printing/base/winspool/jobs.c +++ b/win32ss/printing/base/winspool/jobs.c @@ -2,59 +2,11 @@ * PROJECT: ReactOS Spooler API * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: Functions for managing print jobs - * COPYRIGHT: Copyright 2015-2017 Colin Finck (colin(a)reactos.org) + * COPYRIGHT: Copyright 2015-2018 Colin Finck (colin(a)reactos.org) */ #include "precomp.h" - -static void -_MarshallUpAddJobInfo(PADDJOB_INFO_1W pAddJobInfo1) -{ - // Replace relative offset addresses in the output by absolute pointers. - pAddJobInfo1->Path = (PWSTR)((ULONG_PTR)pAddJobInfo1->Path + (ULONG_PTR)pAddJobInfo1); -} - -static void -_MarshallUpJobInfo(PBYTE pJobInfo, DWORD Level) -{ - PJOB_INFO_1W pJobInfo1; - PJOB_INFO_2W pJobInfo2; - - // Replace relative offset addresses in the output by absolute pointers. - if (Level == 1) - { - pJobInfo1 = (PJOB_INFO_1W)pJobInfo; - pJobInfo1->pDatatype = (PWSTR)((ULONG_PTR)pJobInfo1->pDatatype + (ULONG_PTR)pJobInfo1); - pJobInfo1->pDocument = (PWSTR)((ULONG_PTR)pJobInfo1->pDocument + (ULONG_PTR)pJobInfo1); - pJobInfo1->pMachineName = (PWSTR)((ULONG_PTR)pJobInfo1->pMachineName + (ULONG_PTR)pJobInfo1); - pJobInfo1->pPrinterName = (PWSTR)((ULONG_PTR)pJobInfo1->pPrinterName + (ULONG_PTR)pJobInfo1); - - if (pJobInfo1->pStatus) - pJobInfo1->pStatus = (PWSTR)((ULONG_PTR)pJobInfo1->pStatus + (ULONG_PTR)pJobInfo1); - - pJobInfo1->pUserName = (PWSTR)((ULONG_PTR)pJobInfo1->pUserName + (ULONG_PTR)pJobInfo1); - } - else if (Level == 2) - { - pJobInfo2 = (PJOB_INFO_2W)pJobInfo; - pJobInfo2->pDatatype = (PWSTR)((ULONG_PTR)pJobInfo2->pDatatype + (ULONG_PTR)pJobInfo2); - pJobInfo2->pDevMode = (PDEVMODEW)((ULONG_PTR)pJobInfo2->pDevMode + (ULONG_PTR)pJobInfo2); - pJobInfo2->pDocument = (PWSTR)((ULONG_PTR)pJobInfo2->pDocument + (ULONG_PTR)pJobInfo2); - pJobInfo2->pDriverName = (PWSTR)((ULONG_PTR)pJobInfo2->pDriverName + (ULONG_PTR)pJobInfo2); - pJobInfo2->pMachineName = (PWSTR)((ULONG_PTR)pJobInfo2->pMachineName + (ULONG_PTR)pJobInfo2); - pJobInfo2->pNotifyName = (PWSTR)((ULONG_PTR)pJobInfo2->pNotifyName + (ULONG_PTR)pJobInfo2); - pJobInfo2->pPrinterName = (PWSTR)((ULONG_PTR)pJobInfo2->pPrinterName + (ULONG_PTR)pJobInfo2); - pJobInfo2->pPrintProcessor = (PWSTR)((ULONG_PTR)pJobInfo2->pPrintProcessor + (ULONG_PTR)pJobInfo2); - - if (pJobInfo2->pParameters) - pJobInfo2->pParameters = (PWSTR)((ULONG_PTR)pJobInfo2->pParameters + (ULONG_PTR)pJobInfo2); - - if (pJobInfo2->pStatus) - pJobInfo2->pStatus = (PWSTR)((ULONG_PTR)pJobInfo2->pStatus + (ULONG_PTR)pJobInfo2); - - pJobInfo2->pUserName = (PWSTR)((ULONG_PTR)pJobInfo2->pUserName + (ULONG_PTR)pJobInfo2); - } -} +#include <marshalling/jobs.h> BOOL WINAPI AddJobA(HANDLE hPrinter, DWORD Level, PBYTE pData, DWORD cbBuf, PDWORD pcbNeeded) @@ -91,7 +43,10 @@ AddJobW(HANDLE hPrinter, DWORD Level, PBYTE pData, DWORD cbBuf, PDWORD pcbNeeded RpcEndExcept; if (dwErrorCode == ERROR_SUCCESS) - _MarshallUpAddJobInfo((PADDJOB_INFO_1W)pData); + { + // Replace relative offset addresses in the output by absolute pointers. + MarshallUpStructure(cbBuf, pData, AddJobInfo1Marshalling.pInfo, AddJobInfo1Marshalling.cbStructureSize, TRUE); + } Cleanup: SetLastError(dwErrorCode); @@ -110,8 +65,6 @@ BOOL WINAPI EnumJobsW(HANDLE hPrinter, DWORD FirstJob, DWORD NoJobs, DWORD Level, PBYTE pJob, DWORD cbBuf, PDWORD pcbNeeded, PDWORD pcReturned) { DWORD dwErrorCode; - DWORD i; - PBYTE p = pJob; PSPOOLER_HANDLE pHandle = (PSPOOLER_HANDLE)hPrinter; TRACE("EnumJobsW(%p, %lu, %lu, %lu, %p, %lu, %p, %p)\n", hPrinter, FirstJob, NoJobs, Level, pJob, cbBuf, pcbNeeded, pcReturned); @@ -136,15 +89,11 @@ EnumJobsW(HANDLE hPrinter, DWORD FirstJob, DWORD NoJobs, DWORD Level, PBYTE pJob if (dwErrorCode == ERROR_SUCCESS) { - // Replace relative offset addresses in the output by absolute pointers. - for (i = 0; i < *pcReturned; i++) + // Replace relative offset addresses in the output by absolute pointers for JOB_INFO_1W and JOB_INFO_2W. + if (Level <= 2) { - _MarshallUpJobInfo(p, Level); - - if (Level == 1) - p += sizeof(JOB_INFO_1W); - else if (Level == 2) - p += sizeof(JOB_INFO_2W); + ASSERT(Level >= 1); + MarshallUpStructuresArray(cbBuf, pJob, *pcReturned, pJobInfoMarshalling[Level]->pInfo, pJobInfoMarshalling[Level]->cbStructureSize, TRUE); } } @@ -190,7 +139,8 @@ GetJobW(HANDLE hPrinter, DWORD JobId, DWORD Level, PBYTE pJob, DWORD cbBuf, PDWO if (dwErrorCode == ERROR_SUCCESS) { // Replace relative offset addresses in the output by absolute pointers. - _MarshallUpJobInfo(pJob, Level); + ASSERT(Level >= 1 && Level <= 2); + MarshallUpStructure(cbBuf, pJob, pJobInfoMarshalling[Level]->pInfo, pJobInfoMarshalling[Level]->cbStructureSize, TRUE); } Cleanup: diff --git a/win32ss/printing/base/winspool/monitors.c b/win32ss/printing/base/winspool/monitors.c index 4a36895126..18c6fd1d69 100644 --- a/win32ss/printing/base/winspool/monitors.c +++ b/win32ss/printing/base/winspool/monitors.c @@ -2,25 +2,11 @@ * PROJECT: ReactOS Spooler API * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: Functions related to Print Monitors - * COPYRIGHT: Copyright 2015-2017 Colin Finck (colin(a)reactos.org) + * COPYRIGHT: Copyright 2015-2018 Colin Finck (colin(a)reactos.org) */ #include "precomp.h" - -static void -_MarshallUpMonitorInfo(PBYTE pMonitorInfo, DWORD Level) -{ - PMONITOR_INFO_2W pMonitorInfo2 = (PMONITOR_INFO_2W)pMonitorInfo; // MONITOR_INFO_1W is a subset of MONITOR_INFO_2W - - // Replace relative offset addresses in the output by absolute pointers. - pMonitorInfo2->pName = (PWSTR)((ULONG_PTR)pMonitorInfo2->pName + (ULONG_PTR)pMonitorInfo2); - - if (Level == 2) - { - pMonitorInfo2->pDLLName = (PWSTR)((ULONG_PTR)pMonitorInfo2->pDLLName + (ULONG_PTR)pMonitorInfo2); - pMonitorInfo2->pEnvironment = (PWSTR)((ULONG_PTR)pMonitorInfo2->pEnvironment + (ULONG_PTR)pMonitorInfo2); - } -} +#include <marshalling/monitors.h> BOOL WINAPI AddMonitorA(PSTR pName, DWORD Level, PBYTE pMonitors) @@ -66,8 +52,6 @@ BOOL WINAPI EnumMonitorsW(PWSTR pName, DWORD Level, PBYTE pMonitors, DWORD cbBuf, PDWORD pcbNeeded, PDWORD pcReturned) { DWORD dwErrorCode; - DWORD i; - PBYTE p = pMonitors; TRACE("EnumMonitorsW(%S, %lu, %p, %lu, %p, %p)\n", pName, Level, pMonitors, cbBuf, pcbNeeded, pcReturned); @@ -86,15 +70,8 @@ EnumMonitorsW(PWSTR pName, DWORD Level, PBYTE pMonitors, DWORD cbBuf, PDWORD pcb if (dwErrorCode == ERROR_SUCCESS) { // Replace relative offset addresses in the output by absolute pointers. - for (i = 0; i < *pcReturned; i++) - { - _MarshallUpMonitorInfo(p, Level); - - if (Level == 1) - p += sizeof(MONITOR_INFO_1W); - else if (Level == 2) - p += sizeof(MONITOR_INFO_2W); - } + ASSERT(Level >= 1 && Level <= 2); + MarshallUpStructuresArray(cbBuf, pMonitors, *pcReturned, pMonitorInfoMarshalling[Level]->pInfo, pMonitorInfoMarshalling[Level]->cbStructureSize, TRUE); } SetLastError(dwErrorCode); diff --git a/win32ss/printing/base/winspool/ports.c b/win32ss/printing/base/winspool/ports.c index 28977bdaeb..f243567407 100644 --- a/win32ss/printing/base/winspool/ports.c +++ b/win32ss/printing/base/winspool/ports.c @@ -2,25 +2,11 @@ * PROJECT: ReactOS Spooler API * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: Functions related to Ports - * COPYRIGHT: Copyright 2015-2017 Colin Finck (colin(a)reactos.org) + * COPYRIGHT: Copyright 2015-2018 Colin Finck (colin(a)reactos.org) */ #include "precomp.h" - -static void -_MarshallUpPortInfo(PBYTE pPortInfo, DWORD Level) -{ - PPORT_INFO_2W pPortInfo2 = (PPORT_INFO_2W)pPortInfo; // PORT_INFO_1W is a subset of PORT_INFO_2W - - // Replace relative offset addresses in the output by absolute pointers. - pPortInfo2->pPortName = (PWSTR)((ULONG_PTR)pPortInfo2->pPortName + (ULONG_PTR)pPortInfo2); - - if (Level == 2) - { - pPortInfo2->pDescription = (PWSTR)((ULONG_PTR)pPortInfo2->pDescription + (ULONG_PTR)pPortInfo2); - pPortInfo2->pMonitorName = (PWSTR)((ULONG_PTR)pPortInfo2->pMonitorName + (ULONG_PTR)pPortInfo2); - } -} +#include <marshalling/ports.h> BOOL WINAPI AddPortA(PSTR pName, HWND hWnd, PSTR pMonitorName) @@ -98,8 +84,6 @@ BOOL WINAPI EnumPortsW(PWSTR pName, DWORD Level, PBYTE pPorts, DWORD cbBuf, PDWORD pcbNeeded, PDWORD pcReturned) { DWORD dwErrorCode; - DWORD i; - PBYTE p = pPorts; TRACE("EnumPortsW(%S, %lu, %p, %lu, %p, %p)\n", pName, Level, pPorts, cbBuf, pcbNeeded, pcReturned); @@ -118,15 +102,8 @@ EnumPortsW(PWSTR pName, DWORD Level, PBYTE pPorts, DWORD cbBuf, PDWORD pcbNeeded if (dwErrorCode == ERROR_SUCCESS) { // Replace relative offset addresses in the output by absolute pointers. - for (i = 0; i < *pcReturned; i++) - { - _MarshallUpPortInfo(p, Level); - - if (Level == 1) - p += sizeof(PORT_INFO_1W); - else if (Level == 2) - p += sizeof(PORT_INFO_2W); - } + ASSERT(Level >= 1 && Level <= 2); + MarshallUpStructuresArray(cbBuf, pPorts, *pcReturned, pPortInfoMarshalling[Level]->pInfo, pPortInfoMarshalling[Level]->cbStructureSize, TRUE); } SetLastError(dwErrorCode); diff --git a/win32ss/printing/base/winspool/printers.c b/win32ss/printing/base/winspool/printers.c index 471db1339e..9c2d12b31f 100644 --- a/win32ss/printing/base/winspool/printers.c +++ b/win32ss/printing/base/winspool/printers.c @@ -2,10 +2,11 @@ * PROJECT: ReactOS Spooler API * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: Functions related to Printers and printing - * COPYRIGHT: Copyright 2015-2017 Colin Finck (colin(a)reactos.org) + * COPYRIGHT: Copyright 2015-2018 Colin Finck (colin(a)reactos.org) */ #include "precomp.h" +#include <marshalling/printers.h> // Local Constants @@ -14,114 +15,6 @@ static const WCHAR wszWindowsKey[] = L"Software\\Microsoft\\Windows NT\\CurrentVersion\\Windows"; static const WCHAR wszDeviceValue[] = L"Device"; -static void -_MarshallUpPrinterInfo(PBYTE* ppPrinterInfo, DWORD Level) -{ - // Replace relative offset addresses in the output by absolute pointers and advance to the next structure. - if (Level == 0) - { - PPRINTER_INFO_STRESS pPrinterInfo0 = (PPRINTER_INFO_STRESS)(*ppPrinterInfo); - - pPrinterInfo0->pPrinterName = (PWSTR)((ULONG_PTR)pPrinterInfo0->pPrinterName + (ULONG_PTR)pPrinterInfo0); - - if (pPrinterInfo0->pServerName) - pPrinterInfo0->pServerName = (PWSTR)((ULONG_PTR)pPrinterInfo0->pServerName + (ULONG_PTR)pPrinterInfo0); - - *ppPrinterInfo += sizeof(PRINTER_INFO_STRESS); - } - else if (Level == 1) - { - PPRINTER_INFO_1W pPrinterInfo1 = (PPRINTER_INFO_1W)(*ppPrinterInfo); - - pPrinterInfo1->pName = (PWSTR)((ULONG_PTR)pPrinterInfo1->pName + (ULONG_PTR)pPrinterInfo1); - pPrinterInfo1->pDescription = (PWSTR)((ULONG_PTR)pPrinterInfo1->pDescription + (ULONG_PTR)pPrinterInfo1); - pPrinterInfo1->pComment = (PWSTR)((ULONG_PTR)pPrinterInfo1->pComment + (ULONG_PTR)pPrinterInfo1); - - *ppPrinterInfo += sizeof(PRINTER_INFO_1W); - } - else if (Level == 2) - { - PPRINTER_INFO_2W pPrinterInfo2 = (PPRINTER_INFO_2W)(*ppPrinterInfo); - - pPrinterInfo2->pPrinterName = (PWSTR)((ULONG_PTR)pPrinterInfo2->pPrinterName + (ULONG_PTR)pPrinterInfo2); - pPrinterInfo2->pShareName = (PWSTR)((ULONG_PTR)pPrinterInfo2->pShareName + (ULONG_PTR)pPrinterInfo2); - pPrinterInfo2->pPortName = (PWSTR)((ULONG_PTR)pPrinterInfo2->pPortName + (ULONG_PTR)pPrinterInfo2); - pPrinterInfo2->pDriverName = (PWSTR)((ULONG_PTR)pPrinterInfo2->pDriverName + (ULONG_PTR)pPrinterInfo2); - pPrinterInfo2->pComment = (PWSTR)((ULONG_PTR)pPrinterInfo2->pComment + (ULONG_PTR)pPrinterInfo2); - pPrinterInfo2->pLocation = (PWSTR)((ULONG_PTR)pPrinterInfo2->pLocation + (ULONG_PTR)pPrinterInfo2); - pPrinterInfo2->pDevMode = (PDEVMODEW)((ULONG_PTR)pPrinterInfo2->pDevMode + (ULONG_PTR)pPrinterInfo2); - pPrinterInfo2->pSepFile = (PWSTR)((ULONG_PTR)pPrinterInfo2->pSepFile + (ULONG_PTR)pPrinterInfo2); - pPrinterInfo2->pPrintProcessor = (PWSTR)((ULONG_PTR)pPrinterInfo2->pPrintProcessor + (ULONG_PTR)pPrinterInfo2); - pPrinterInfo2->pDatatype = (PWSTR)((ULONG_PTR)pPrinterInfo2->pDatatype + (ULONG_PTR)pPrinterInfo2); - pPrinterInfo2->pParameters = (PWSTR)((ULONG_PTR)pPrinterInfo2->pParameters + (ULONG_PTR)pPrinterInfo2); - - if (pPrinterInfo2->pServerName) - pPrinterInfo2->pServerName = (PWSTR)((ULONG_PTR)pPrinterInfo2->pServerName + (ULONG_PTR)pPrinterInfo2); - - if (pPrinterInfo2->pSecurityDescriptor) - pPrinterInfo2->pSecurityDescriptor = (PSECURITY_DESCRIPTOR)((ULONG_PTR)pPrinterInfo2->pSecurityDescriptor + (ULONG_PTR)pPrinterInfo2); - - *ppPrinterInfo += sizeof(PRINTER_INFO_2W); - } - else if (Level == 3) - { - PPRINTER_INFO_3 pPrinterInfo3 = (PPRINTER_INFO_3)(*ppPrinterInfo); - - pPrinterInfo3->pSecurityDescriptor = (PSECURITY_DESCRIPTOR)((ULONG_PTR)pPrinterInfo3->pSecurityDescriptor + (ULONG_PTR)pPrinterInfo3); - - *ppPrinterInfo += sizeof(PRINTER_INFO_3); - } - else if (Level == 4) - { - PPRINTER_INFO_4W pPrinterInfo4 = (PPRINTER_INFO_4W)(*ppPrinterInfo); - - pPrinterInfo4->pPrinterName = (PWSTR)((ULONG_PTR)pPrinterInfo4->pPrinterName + (ULONG_PTR)pPrinterInfo4); - - if (pPrinterInfo4->pServerName) - pPrinterInfo4->pServerName = (PWSTR)((ULONG_PTR)pPrinterInfo4->pServerName + (ULONG_PTR)pPrinterInfo4); - - *ppPrinterInfo += sizeof(PRINTER_INFO_4W); - } - else if (Level == 5) - { - PPRINTER_INFO_5W pPrinterInfo5 = (PPRINTER_INFO_5W)(*ppPrinterInfo); - - pPrinterInfo5->pPrinterName = (PWSTR)((ULONG_PTR)pPrinterInfo5->pPrinterName + (ULONG_PTR)pPrinterInfo5); - pPrinterInfo5->pPortName = (PWSTR)((ULONG_PTR)pPrinterInfo5->pPortName + (ULONG_PTR)pPrinterInfo5); - - *ppPrinterInfo += sizeof(PRINTER_INFO_5W); - } - else if (Level == 6) - { - *ppPrinterInfo += sizeof(PRINTER_INFO_6); - } - else if (Level == 7) - { - PPRINTER_INFO_7W pPrinterInfo7 = (PPRINTER_INFO_7W)(*ppPrinterInfo); - - if (pPrinterInfo7->pszObjectGUID) - pPrinterInfo7->pszObjectGUID = (PWSTR)((ULONG_PTR)pPrinterInfo7->pszObjectGUID + (ULONG_PTR)pPrinterInfo7); - - *ppPrinterInfo += sizeof(PRINTER_INFO_7W); - } - else if (Level == 8) - { - PPRINTER_INFO_8W pPrinterInfo8 = (PPRINTER_INFO_8W)(*ppPrinterInfo); - - pPrinterInfo8->pDevMode = (PDEVMODEW)((ULONG_PTR)pPrinterInfo8->pDevMode + (ULONG_PTR)pPrinterInfo8); - - *ppPrinterInfo += sizeof(PRINTER_INFO_8W); - } - else if (Level == 9) - { - PPRINTER_INFO_9W pPrinterInfo9 = (PPRINTER_INFO_9W)(*ppPrinterInfo); - - pPrinterInfo9->pDevMode = (PDEVMODEW)((ULONG_PTR)pPrinterInfo9->pDevMode + (ULONG_PTR)pPrinterInfo9); - - *ppPrinterInfo += sizeof(PRINTER_INFO_9W); - } -} - static DWORD _StartDocPrinterSpooled(PSPOOLER_HANDLE pHandle, PDOC_INFO_1W pDocInfo1, PADDJOB_INFO_1W pAddJobInfo1) { @@ -448,11 +341,9 @@ EnumPrintersW(DWORD Flags, PWSTR Name, DWORD Level, PBYTE pPrinterEnum, DWORD cb if (dwErrorCode == ERROR_SUCCESS) { - DWORD i; - PBYTE p = pPrinterEnum; - - for (i = 0; i < *pcReturned; i++) - _MarshallUpPrinterInfo(&p, Level); + // Replace relative offset addresses in the output by absolute pointers. + ASSERT(Level <= 9); + MarshallUpStructuresArray(cbBuf, pPrinterEnum, *pcReturned, pPrinterInfoMarshalling[Level]->pInfo, pPrinterInfoMarshalling[Level]->cbStructureSize, TRUE); } Cleanup: @@ -665,8 +556,9 @@ GetPrinterW(HANDLE hPrinter, DWORD Level, LPBYTE pPrinter, DWORD cbBuf, LPDWORD if (dwErrorCode == ERROR_SUCCESS) { - PBYTE p = pPrinter; - _MarshallUpPrinterInfo(&p, Level); + // Replace relative offset addresses in the output by absolute pointers. + ASSERT(Level <= 9); + MarshallUpStructure(cbBuf, pPrinter, pPrinterInfoMarshalling[Level]->pInfo, pPrinterInfoMarshalling[Level]->cbStructureSize, TRUE); } Cleanup: diff --git a/win32ss/printing/base/winspool/printprocessors.c b/win32ss/printing/base/winspool/printprocessors.c index 406297de6f..9283eeb788 100644 --- a/win32ss/printing/base/winspool/printprocessors.c +++ b/win32ss/printing/base/winspool/printprocessors.c @@ -2,30 +2,13 @@ * PROJECT: ReactOS Spooler API * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: Functions related to Print Processors -* COPYRIGHT: Copyright 2015-2017 Colin Finck (colin(a)reactos.org) +* COPYRIGHT: Copyright 2015-2018 Colin Finck (colin(a)reactos.org) */ #include "precomp.h" +#include <marshalling/printprocessors.h> #include <prtprocenv.h> -static void -_MarshallUpDatatypesInfo(PDATATYPES_INFO_1W* ppDatatypesInfo1) -{ - // Replace relative offset addresses in the output by absolute pointers. - PDATATYPES_INFO_1W pDatatypesInfo1 = *ppDatatypesInfo1; - pDatatypesInfo1->pName = (PWSTR)((ULONG_PTR)pDatatypesInfo1->pName + (ULONG_PTR)pDatatypesInfo1); - *ppDatatypesInfo1 += sizeof(DATATYPES_INFO_1W); -} - -static void -_MarshallUpPrintProcessorInfo(PPRINTPROCESSOR_INFO_1W* ppPrintProcessorInfo1) -{ - // Replace relative offset addresses in the output by absolute pointers. - PPRINTPROCESSOR_INFO_1W pPrintProcessorInfo1 = *ppPrintProcessorInfo1; - pPrintProcessorInfo1->pName = (PWSTR)((ULONG_PTR)pPrintProcessorInfo1->pName + (ULONG_PTR)pPrintProcessorInfo1); - *ppPrintProcessorInfo1 += sizeof(PRINTPROCESSOR_INFO_1W); -} - BOOL WINAPI AddPrintProcessorA(PSTR pName, PSTR pEnvironment, PSTR pPathName, PSTR pPrintProcessorName) { @@ -85,7 +68,7 @@ EnumPrintProcessorDatatypesW(PWSTR pName, LPWSTR pPrintProcessorName, DWORD Leve { dwErrorCode = _RpcEnumPrintProcessorDatatypes(pName, pPrintProcessorName, Level, pDatatypes, cbBuf, pcbNeeded, pcReturned); } - RpcExcept(EXCEPTION_EXECUTE_HANDLER) + RpcExcept(EXCEPTION_EXECUTE_HANDLER) { dwErrorCode = RpcExceptionCode(); ERR("_RpcEnumPrintProcessorDatatypes failed with exception code %lu!\n", dwErrorCode); @@ -94,11 +77,8 @@ EnumPrintProcessorDatatypesW(PWSTR pName, LPWSTR pPrintProcessorName, DWORD Leve if (dwErrorCode == ERROR_SUCCESS) { - DWORD i; - PDATATYPES_INFO_1W p = (PDATATYPES_INFO_1W)pDatatypes; - - for (i = 0; i < *pcReturned; i++) - _MarshallUpDatatypesInfo(&p); + // Replace relative offset addresses in the output by absolute pointers. + MarshallUpStructuresArray(cbBuf, pDatatypes, *pcReturned, DatatypesInfo1Marshalling.pInfo, DatatypesInfo1Marshalling.cbStructureSize, TRUE); } Cleanup: @@ -130,7 +110,7 @@ EnumPrintProcessorsW(PWSTR pName, PWSTR pEnvironment, DWORD Level, PBYTE pPrintP { dwErrorCode = _RpcEnumPrintProcessors(pName, pEnvironment, Level, pPrintProcessorInfo, cbBuf, pcbNeeded, pcReturned); } - RpcExcept(EXCEPTION_EXECUTE_HANDLER) + RpcExcept(EXCEPTION_EXECUTE_HANDLER) { dwErrorCode = RpcExceptionCode(); } @@ -138,11 +118,8 @@ EnumPrintProcessorsW(PWSTR pName, PWSTR pEnvironment, DWORD Level, PBYTE pPrintP if (dwErrorCode == ERROR_SUCCESS) { - DWORD i; - PPRINTPROCESSOR_INFO_1W p = (PPRINTPROCESSOR_INFO_1W)pPrintProcessorInfo; - - for (i = 0; i < *pcReturned; i++) - _MarshallUpPrintProcessorInfo(&p); + // Replace relative offset addresses in the output by absolute pointers. + MarshallUpStructuresArray(cbBuf, pPrintProcessorInfo, *pcReturned, PrintProcessorInfo1Marshalling.pInfo, PrintProcessorInfo1Marshalling.cbStructureSize, TRUE); } SetLastError(dwErrorCode); @@ -250,7 +227,7 @@ GetPrintProcessorDirectoryW(PWSTR pName, PWSTR pEnvironment, DWORD Level, PBYTE { dwErrorCode = _RpcGetPrintProcessorDirectory(pName, pEnvironment, Level, pPrintProcessorInfo, cbBuf, pcbNeeded); } - RpcExcept(EXCEPTION_EXECUTE_HANDLER) + RpcExcept(EXCEPTION_EXECUTE_HANDLER) { dwErrorCode = RpcExceptionCode(); } diff --git a/win32ss/printing/include/marshalling/jobs.h b/win32ss/printing/include/marshalling/jobs.h new file mode 100644 index 0000000000..d38d4109e9 --- /dev/null +++ b/win32ss/printing/include/marshalling/jobs.h @@ -0,0 +1,71 @@ +/* + * PROJECT: ReactOS Printing Stack Marshalling Functions + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Marshalling definitions for ADDJOB_INFO_* and JOB_INFO_* + * COPYRIGHT: Copyright 2015-2018 Colin Finck (colin(a)reactos.org) + */ + +static const MARSHALLING AddJobInfo1Marshalling = { + sizeof(ADDJOB_INFO_1W), + { + { FIELD_OFFSET(ADDJOB_INFO_1W, Path), RTL_FIELD_SIZE(ADDJOB_INFO_1W, Path), RTL_FIELD_SIZE(ADDJOB_INFO_1W, Path), TRUE }, + { FIELD_OFFSET(ADDJOB_INFO_1W, JobId), RTL_FIELD_SIZE(ADDJOB_INFO_1W, JobId), RTL_FIELD_SIZE(ADDJOB_INFO_1W, JobId), FALSE }, + { MAXDWORD, 0, 0, FALSE } + } +}; + +static const MARSHALLING JobInfo1Marshalling = { + sizeof(JOB_INFO_1W), + { + { FIELD_OFFSET(JOB_INFO_1W, JobId), RTL_FIELD_SIZE(JOB_INFO_1W, JobId), RTL_FIELD_SIZE(JOB_INFO_1W, JobId), FALSE }, + { FIELD_OFFSET(JOB_INFO_1W, pPrinterName), RTL_FIELD_SIZE(JOB_INFO_1W, pPrinterName), RTL_FIELD_SIZE(JOB_INFO_1W, pPrinterName), TRUE }, + { FIELD_OFFSET(JOB_INFO_1W, pMachineName), RTL_FIELD_SIZE(JOB_INFO_1W, pMachineName), RTL_FIELD_SIZE(JOB_INFO_1W, pMachineName), TRUE }, + { FIELD_OFFSET(JOB_INFO_1W, pUserName), RTL_FIELD_SIZE(JOB_INFO_1W, pUserName), RTL_FIELD_SIZE(JOB_INFO_1W, pUserName), TRUE }, + { FIELD_OFFSET(JOB_INFO_1W, pDocument), RTL_FIELD_SIZE(JOB_INFO_1W, pDocument), RTL_FIELD_SIZE(JOB_INFO_1W, pDocument), TRUE }, + { FIELD_OFFSET(JOB_INFO_1W, pDatatype), RTL_FIELD_SIZE(JOB_INFO_1W, pDatatype), RTL_FIELD_SIZE(JOB_INFO_1W, pDatatype), TRUE }, + { FIELD_OFFSET(JOB_INFO_1W, pStatus), RTL_FIELD_SIZE(JOB_INFO_1W, pStatus), RTL_FIELD_SIZE(JOB_INFO_1W, pStatus), TRUE }, + { FIELD_OFFSET(JOB_INFO_1W, Status), RTL_FIELD_SIZE(JOB_INFO_1W, Status), RTL_FIELD_SIZE(JOB_INFO_1W, Status), FALSE }, + { FIELD_OFFSET(JOB_INFO_1W, Priority), RTL_FIELD_SIZE(JOB_INFO_1W, Priority), RTL_FIELD_SIZE(JOB_INFO_1W, Priority), FALSE }, + { FIELD_OFFSET(JOB_INFO_1W, Position), RTL_FIELD_SIZE(JOB_INFO_1W, Position), RTL_FIELD_SIZE(JOB_INFO_1W, Position), FALSE }, + { FIELD_OFFSET(JOB_INFO_1W, TotalPages), RTL_FIELD_SIZE(JOB_INFO_1W, TotalPages), RTL_FIELD_SIZE(JOB_INFO_1W, TotalPages), FALSE }, + { FIELD_OFFSET(JOB_INFO_1W, PagesPrinted), RTL_FIELD_SIZE(JOB_INFO_1W, PagesPrinted), RTL_FIELD_SIZE(JOB_INFO_1W, PagesPrinted), FALSE }, + { FIELD_OFFSET(JOB_INFO_1W, Submitted), RTL_FIELD_SIZE(JOB_INFO_1W, Submitted), sizeof(WORD), FALSE }, + { MAXDWORD, 0, 0, FALSE } + } +}; + +static const MARSHALLING JobInfo2Marshalling = { + sizeof(JOB_INFO_2W), + { + { FIELD_OFFSET(JOB_INFO_2W, JobId), RTL_FIELD_SIZE(JOB_INFO_2W, JobId), RTL_FIELD_SIZE(JOB_INFO_2W, JobId), FALSE }, + { FIELD_OFFSET(JOB_INFO_2W, pPrinterName), RTL_FIELD_SIZE(JOB_INFO_2W, pPrinterName), RTL_FIELD_SIZE(JOB_INFO_2W, pPrinterName), TRUE }, + { FIELD_OFFSET(JOB_INFO_2W, pMachineName), RTL_FIELD_SIZE(JOB_INFO_2W, pMachineName), RTL_FIELD_SIZE(JOB_INFO_2W, pMachineName), TRUE }, + { FIELD_OFFSET(JOB_INFO_2W, pUserName), RTL_FIELD_SIZE(JOB_INFO_2W, pUserName), RTL_FIELD_SIZE(JOB_INFO_2W, pUserName), TRUE }, + { FIELD_OFFSET(JOB_INFO_2W, pDocument), RTL_FIELD_SIZE(JOB_INFO_2W, pDocument), RTL_FIELD_SIZE(JOB_INFO_2W, pDocument), TRUE }, + { FIELD_OFFSET(JOB_INFO_2W, pNotifyName), RTL_FIELD_SIZE(JOB_INFO_2W, pNotifyName), RTL_FIELD_SIZE(JOB_INFO_2W, pNotifyName), TRUE }, + { FIELD_OFFSET(JOB_INFO_2W, pDatatype), RTL_FIELD_SIZE(JOB_INFO_2W, pDatatype), RTL_FIELD_SIZE(JOB_INFO_2W, pDatatype), TRUE }, + { FIELD_OFFSET(JOB_INFO_2W, pPrintProcessor), RTL_FIELD_SIZE(JOB_INFO_2W, pPrintProcessor), RTL_FIELD_SIZE(JOB_INFO_2W, pPrintProcessor), TRUE }, + { FIELD_OFFSET(JOB_INFO_2W, pParameters), RTL_FIELD_SIZE(JOB_INFO_2W, pParameters), RTL_FIELD_SIZE(JOB_INFO_2W, pParameters), TRUE }, + { FIELD_OFFSET(JOB_INFO_2W, pDriverName), RTL_FIELD_SIZE(JOB_INFO_2W, pDriverName), RTL_FIELD_SIZE(JOB_INFO_2W, pDriverName), TRUE }, + { FIELD_OFFSET(JOB_INFO_2W, pDevMode), RTL_FIELD_SIZE(JOB_INFO_2W, pDevMode), RTL_FIELD_SIZE(JOB_INFO_2W, pDevMode), TRUE }, + { FIELD_OFFSET(JOB_INFO_2W, pStatus), RTL_FIELD_SIZE(JOB_INFO_2W, pStatus), RTL_FIELD_SIZE(JOB_INFO_2W, pStatus), TRUE }, + { FIELD_OFFSET(JOB_INFO_2W, pSecurityDescriptor), RTL_FIELD_SIZE(JOB_INFO_2W, pSecurityDescriptor), RTL_FIELD_SIZE(JOB_INFO_2W, pSecurityDescriptor), TRUE }, + { FIELD_OFFSET(JOB_INFO_2W, Status), RTL_FIELD_SIZE(JOB_INFO_2W, Status), RTL_FIELD_SIZE(JOB_INFO_2W, Status), FALSE }, + { FIELD_OFFSET(JOB_INFO_2W, Priority), RTL_FIELD_SIZE(JOB_INFO_2W, Priority), RTL_FIELD_SIZE(JOB_INFO_2W, Priority), FALSE }, + { FIELD_OFFSET(JOB_INFO_2W, Position), RTL_FIELD_SIZE(JOB_INFO_2W, Position), RTL_FIELD_SIZE(JOB_INFO_2W, Position), FALSE }, + { FIELD_OFFSET(JOB_INFO_2W, StartTime), RTL_FIELD_SIZE(JOB_INFO_2W, StartTime), RTL_FIELD_SIZE(JOB_INFO_2W, StartTime), FALSE }, + { FIELD_OFFSET(JOB_INFO_2W, UntilTime), RTL_FIELD_SIZE(JOB_INFO_2W, UntilTime), RTL_FIELD_SIZE(JOB_INFO_2W, UntilTime), FALSE }, + { FIELD_OFFSET(JOB_INFO_2W, TotalPages), RTL_FIELD_SIZE(JOB_INFO_2W, TotalPages), RTL_FIELD_SIZE(JOB_INFO_2W, TotalPages), FALSE }, + { FIELD_OFFSET(JOB_INFO_2W, Size), RTL_FIELD_SIZE(JOB_INFO_2W, Size), RTL_FIELD_SIZE(JOB_INFO_2W, Size), FALSE }, + { FIELD_OFFSET(JOB_INFO_2W, Submitted), RTL_FIELD_SIZE(JOB_INFO_2W, Submitted), sizeof(WORD), FALSE }, + { FIELD_OFFSET(JOB_INFO_2W, Time), RTL_FIELD_SIZE(JOB_INFO_2W, Time), RTL_FIELD_SIZE(JOB_INFO_2W, Time), FALSE }, + { FIELD_OFFSET(JOB_INFO_2W, PagesPrinted), RTL_FIELD_SIZE(JOB_INFO_2W, PagesPrinted), RTL_FIELD_SIZE(JOB_INFO_2W, PagesPrinted), FALSE }, + { MAXDWORD, 0, 0, FALSE } + } +}; + +static const MARSHALLING* pJobInfoMarshalling[] = { + NULL, + &JobInfo1Marshalling, + &JobInfo2Marshalling +}; diff --git a/win32ss/printing/include/marshalling/monitors.h b/win32ss/printing/include/marshalling/monitors.h new file mode 100644 index 0000000000..555272b9a6 --- /dev/null +++ b/win32ss/printing/include/marshalling/monitors.h @@ -0,0 +1,30 @@ +/* + * PROJECT: ReactOS Printing Stack Marshalling Functions + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Marshalling definitions for MONITOR_INFO_* + * COPYRIGHT: Copyright 2015-2018 Colin Finck (colin(a)reactos.org) + */ + +static const MARSHALLING MonitorInfo1Marshalling = { + sizeof(MONITOR_INFO_1W), + { + { FIELD_OFFSET(MONITOR_INFO_1W, pName), RTL_FIELD_SIZE(MONITOR_INFO_1W, pName), RTL_FIELD_SIZE(MONITOR_INFO_1W, pName), TRUE }, + { MAXDWORD, 0, 0, FALSE } + } +}; + +static const MARSHALLING MonitorInfo2Marshalling = { + sizeof(MONITOR_INFO_2W), + { + { FIELD_OFFSET(MONITOR_INFO_2W, pName), RTL_FIELD_SIZE(MONITOR_INFO_2W, pName), RTL_FIELD_SIZE(MONITOR_INFO_2W, pName), TRUE }, + { FIELD_OFFSET(MONITOR_INFO_2W, pEnvironment), RTL_FIELD_SIZE(MONITOR_INFO_2W, pEnvironment), RTL_FIELD_SIZE(MONITOR_INFO_2W, pEnvironment), TRUE }, + { FIELD_OFFSET(MONITOR_INFO_2W, pDLLName), RTL_FIELD_SIZE(MONITOR_INFO_2W, pDLLName), RTL_FIELD_SIZE(MONITOR_INFO_2W, pDLLName), TRUE }, + { MAXDWORD, 0, 0, FALSE } + } +}; + +static const MARSHALLING* pMonitorInfoMarshalling[] = { + NULL, + &MonitorInfo1Marshalling, + &MonitorInfo2Marshalling +}; diff --git a/win32ss/printing/include/marshalling/ports.h b/win32ss/printing/include/marshalling/ports.h index b53eb31742..29f22273c8 100644 --- a/win32ss/printing/include/marshalling/ports.h +++ b/win32ss/printing/include/marshalling/ports.h @@ -5,7 +5,7 @@ * COPYRIGHT: Copyright 2015-2018 Colin Finck (colin(a)reactos.org) */ -const MARSHALLING PortInfo1Marshalling = { +static const MARSHALLING PortInfo1Marshalling = { sizeof(PORT_INFO_1W), { { FIELD_OFFSET(PORT_INFO_1W, pName), RTL_FIELD_SIZE(PORT_INFO_1W, pName), RTL_FIELD_SIZE(PORT_INFO_1W, pName), TRUE }, @@ -13,7 +13,7 @@ const MARSHALLING PortInfo1Marshalling = { } }; -const MARSHALLING PortInfo2Marshalling = { +static const MARSHALLING PortInfo2Marshalling = { sizeof(PORT_INFO_2W), { { FIELD_OFFSET(PORT_INFO_2W, pPortName), RTL_FIELD_SIZE(PORT_INFO_2W, pPortName), RTL_FIELD_SIZE(PORT_INFO_2W, pPortName), TRUE }, @@ -24,3 +24,9 @@ const MARSHALLING PortInfo2Marshalling = { { MAXDWORD, 0, 0, FALSE } } }; + +static const MARSHALLING* pPortInfoMarshalling[] = { + NULL, + &PortInfo1Marshalling, + &PortInfo2Marshalling +}; diff --git a/win32ss/printing/include/marshalling/printers.h b/win32ss/printing/include/marshalling/printers.h new file mode 100644 index 0000000000..d4727434d6 --- /dev/null +++ b/win32ss/printing/include/marshalling/printers.h @@ -0,0 +1,157 @@ +/* + * PROJECT: ReactOS Printing Stack Marshalling Functions + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Marshalling definitions for PRINTER_INFO_* + * COPYRIGHT: Copyright 2015-2018 Colin Finck (colin(a)reactos.org) + */ + +static const MARSHALLING PrinterInfoStressMarshalling = { + sizeof(PRINTER_INFO_STRESS), + { + { FIELD_OFFSET(PRINTER_INFO_STRESS, pPrinterName), RTL_FIELD_SIZE(PRINTER_INFO_STRESS, pPrinterName), RTL_FIELD_SIZE(PRINTER_INFO_STRESS, pPrinterName), TRUE }, + { FIELD_OFFSET(PRINTER_INFO_STRESS, pServerName), RTL_FIELD_SIZE(PRINTER_INFO_STRESS, pServerName), RTL_FIELD_SIZE(PRINTER_INFO_STRESS, pServerName), TRUE }, + { FIELD_OFFSET(PRINTER_INFO_STRESS, cJobs), RTL_FIELD_SIZE(PRINTER_INFO_STRESS, cJobs), RTL_FIELD_SIZE(PRINTER_INFO_STRESS, cJobs), FALSE }, + { FIELD_OFFSET(PRINTER_INFO_STRESS, cTotalJobs), RTL_FIELD_SIZE(PRINTER_INFO_STRESS, cTotalJobs), RTL_FIELD_SIZE(PRINTER_INFO_STRESS, cTotalJobs), FALSE }, + { FIELD_OFFSET(PRINTER_INFO_STRESS, cTotalBytes), RTL_FIELD_SIZE(PRINTER_INFO_STRESS, cTotalBytes), RTL_FIELD_SIZE(PRINTER_INFO_STRESS, cTotalBytes), FALSE }, + { FIELD_OFFSET(PRINTER_INFO_STRESS, stUpTime), RTL_FIELD_SIZE(PRINTER_INFO_STRESS, stUpTime), sizeof(WORD), FALSE }, + { FIELD_OFFSET(PRINTER_INFO_STRESS, MaxcRef), RTL_FIELD_SIZE(PRINTER_INFO_STRESS, MaxcRef), RTL_FIELD_SIZE(PRINTER_INFO_STRESS, MaxcRef), FALSE }, + { FIELD_OFFSET(PRINTER_INFO_STRESS, cTotalPagesPrinted), RTL_FIELD_SIZE(PRINTER_INFO_STRESS, cTotalPagesPrinted), RTL_FIELD_SIZE(PRINTER_INFO_STRESS, cTotalPagesPrinted), FALSE }, + { FIELD_OFFSET(PRINTER_INFO_STRESS, dwGetVersion), RTL_FIELD_SIZE(PRINTER_INFO_STRESS, dwGetVersion), RTL_FIELD_SIZE(PRINTER_INFO_STRESS, dwGetVersion), FALSE }, + { FIELD_OFFSET(PRINTER_INFO_STRESS, fFreeBuild), RTL_FIELD_SIZE(PRINTER_INFO_STRESS, fFreeBuild), RTL_FIELD_SIZE(PRINTER_INFO_STRESS, fFreeBuild), FALSE }, + { FIELD_OFFSET(PRINTER_INFO_STRESS, cSpooling), RTL_FIELD_SIZE(PRINTER_INFO_STRESS, cSpooling), RTL_FIELD_SIZE(PRINTER_INFO_STRESS, cSpooling), FALSE }, + { FIELD_OFFSET(PRINTER_INFO_STRESS, cMaxSpooling), RTL_FIELD_SIZE(PRINTER_INFO_STRESS, cMaxSpooling), RTL_FIELD_SIZE(PRINTER_INFO_STRESS, cMaxSpooling), FALSE }, + { FIELD_OFFSET(PRINTER_INFO_STRESS, cRef), RTL_FIELD_SIZE(PRINTER_INFO_STRESS, cRef), RTL_FIELD_SIZE(PRINTER_INFO_STRESS, cRef), FALSE }, + { FIELD_OFFSET(PRINTER_INFO_STRESS, cErrorOutOfPaper), RTL_FIELD_SIZE(PRINTER_INFO_STRESS, cErrorOutOfPaper), RTL_FIELD_SIZE(PRINTER_INFO_STRESS, cErrorOutOfPaper), FALSE }, + { FIELD_OFFSET(PRINTER_INFO_STRESS, cErrorNotReady), RTL_FIELD_SIZE(PRINTER_INFO_STRESS, cErrorNotReady), RTL_FIELD_SIZE(PRINTER_INFO_STRESS, cErrorNotReady), FALSE }, + { FIELD_OFFSET(PRINTER_INFO_STRESS, cJobError), RTL_FIELD_SIZE(PRINTER_INFO_STRESS, cJobError), RTL_FIELD_SIZE(PRINTER_INFO_STRESS, cJobError), FALSE }, + { FIELD_OFFSET(PRINTER_INFO_STRESS, dwNumberOfProcessors), RTL_FIELD_SIZE(PRINTER_INFO_STRESS, dwNumberOfProcessors), RTL_FIELD_SIZE(PRINTER_INFO_STRESS, dwNumberOfProcessors), FALSE }, + { FIELD_OFFSET(PRINTER_INFO_STRESS, dwProcessorType), RTL_FIELD_SIZE(PRINTER_INFO_STRESS, dwProcessorType), RTL_FIELD_SIZE(PRINTER_INFO_STRESS, dwProcessorType), FALSE }, + { FIELD_OFFSET(PRINTER_INFO_STRESS, dwHighPartTotalBytes), RTL_FIELD_SIZE(PRINTER_INFO_STRESS, dwHighPartTotalBytes), RTL_FIELD_SIZE(PRINTER_INFO_STRESS, dwHighPartTotalBytes), FALSE }, + { FIELD_OFFSET(PRINTER_INFO_STRESS, cChangeID), RTL_FIELD_SIZE(PRINTER_INFO_STRESS, cChangeID), RTL_FIELD_SIZE(PRINTER_INFO_STRESS, cChangeID), FALSE }, + { FIELD_OFFSET(PRINTER_INFO_STRESS, dwLastError), RTL_FIELD_SIZE(PRINTER_INFO_STRESS, dwLastError), RTL_FIELD_SIZE(PRINTER_INFO_STRESS, dwLastError), FALSE }, + { FIELD_OFFSET(PRINTER_INFO_STRESS, Status), RTL_FIELD_SIZE(PRINTER_INFO_STRESS, Status), RTL_FIELD_SIZE(PRINTER_INFO_STRESS, Status), FALSE }, + { FIELD_OFFSET(PRINTER_INFO_STRESS, cEnumerateNetworkPrinters), RTL_FIELD_SIZE(PRINTER_INFO_STRESS, cEnumerateNetworkPrinters), RTL_FIELD_SIZE(PRINTER_INFO_STRESS, cEnumerateNetworkPrinters), FALSE }, + { FIELD_OFFSET(PRINTER_INFO_STRESS, cAddNetPrinters), RTL_FIELD_SIZE(PRINTER_INFO_STRESS, cAddNetPrinters), RTL_FIELD_SIZE(PRINTER_INFO_STRESS, cAddNetPrinters), FALSE }, + { FIELD_OFFSET(PRINTER_INFO_STRESS, wProcessorArchitecture), RTL_FIELD_SIZE(PRINTER_INFO_STRESS, wProcessorArchitecture), RTL_FIELD_SIZE(PRINTER_INFO_STRESS, wProcessorArchitecture), FALSE }, + { FIELD_OFFSET(PRINTER_INFO_STRESS, wProcessorLevel), RTL_FIELD_SIZE(PRINTER_INFO_STRESS, wProcessorLevel), RTL_FIELD_SIZE(PRINTER_INFO_STRESS, wProcessorLevel), FALSE }, + { FIELD_OFFSET(PRINTER_INFO_STRESS, cRefIC), RTL_FIELD_SIZE(PRINTER_INFO_STRESS, cRefIC), RTL_FIELD_SIZE(PRINTER_INFO_STRESS, cRefIC), FALSE }, + { FIELD_OFFSET(PRINTER_INFO_STRESS, dwReserved2), RTL_FIELD_SIZE(PRINTER_INFO_STRESS, dwReserved2), RTL_FIELD_SIZE(PRINTER_INFO_STRESS, dwReserved2), FALSE }, + { FIELD_OFFSET(PRINTER_INFO_STRESS, dwReserved3), RTL_FIELD_SIZE(PRINTER_INFO_STRESS, dwReserved3), RTL_FIELD_SIZE(PRINTER_INFO_STRESS, dwReserved3), FALSE }, + { MAXDWORD, 0, 0, FALSE } + } +}; + +static const MARSHALLING PrinterInfo1Marshalling = { + sizeof(PRINTER_INFO_1W), + { + { FIELD_OFFSET(PRINTER_INFO_1W, Flags), RTL_FIELD_SIZE(PRINTER_INFO_1W, Flags), RTL_FIELD_SIZE(PRINTER_INFO_1W, Flags), FALSE }, + { FIELD_OFFSET(PRINTER_INFO_1W, pDescription), RTL_FIELD_SIZE(PRINTER_INFO_1W, pDescription), RTL_FIELD_SIZE(PRINTER_INFO_1W, pDescription), TRUE }, + { FIELD_OFFSET(PRINTER_INFO_1W, pName), RTL_FIELD_SIZE(PRINTER_INFO_1W, pName), RTL_FIELD_SIZE(PRINTER_INFO_1W, pName), TRUE }, + { FIELD_OFFSET(PRINTER_INFO_1W, pComment), RTL_FIELD_SIZE(PRINTER_INFO_1W, pComment), RTL_FIELD_SIZE(PRINTER_INFO_1W, pComment), TRUE }, + { MAXDWORD, 0, 0, FALSE } + } +}; + +static const MARSHALLING PrinterInfo2Marshalling = { + sizeof(PRINTER_INFO_2W), + { + { FIELD_OFFSET(PRINTER_INFO_2W, pServerName), RTL_FIELD_SIZE(PRINTER_INFO_2W, pServerName), RTL_FIELD_SIZE(PRINTER_INFO_2W, pServerName), TRUE }, + { FIELD_OFFSET(PRINTER_INFO_2W, pPrinterName), RTL_FIELD_SIZE(PRINTER_INFO_2W, pPrinterName), RTL_FIELD_SIZE(PRINTER_INFO_2W, pPrinterName), TRUE }, + { FIELD_OFFSET(PRINTER_INFO_2W, pShareName), RTL_FIELD_SIZE(PRINTER_INFO_2W, pShareName), RTL_FIELD_SIZE(PRINTER_INFO_2W, pShareName), TRUE }, + { FIELD_OFFSET(PRINTER_INFO_2W, pPortName), RTL_FIELD_SIZE(PRINTER_INFO_2W, pPortName), RTL_FIELD_SIZE(PRINTER_INFO_2W, pPortName), TRUE }, + { FIELD_OFFSET(PRINTER_INFO_2W, pDriverName), RTL_FIELD_SIZE(PRINTER_INFO_2W, pDriverName), RTL_FIELD_SIZE(PRINTER_INFO_2W, pDriverName), TRUE }, + { FIELD_OFFSET(PRINTER_INFO_2W, pComment), RTL_FIELD_SIZE(PRINTER_INFO_2W, pComment), RTL_FIELD_SIZE(PRINTER_INFO_2W, pComment), TRUE }, + { FIELD_OFFSET(PRINTER_INFO_2W, pLocation), RTL_FIELD_SIZE(PRINTER_INFO_2W, pLocation), RTL_FIELD_SIZE(PRINTER_INFO_2W, pLocation), TRUE }, + { FIELD_OFFSET(PRINTER_INFO_2W, pDevMode), RTL_FIELD_SIZE(PRINTER_INFO_2W, pDevMode), RTL_FIELD_SIZE(PRINTER_INFO_2W, pDevMode), TRUE }, + { FIELD_OFFSET(PRINTER_INFO_2W, pSepFile), RTL_FIELD_SIZE(PRINTER_INFO_2W, pSepFile), RTL_FIELD_SIZE(PRINTER_INFO_2W, pSepFile), TRUE }, + { FIELD_OFFSET(PRINTER_INFO_2W, pPrintProcessor), RTL_FIELD_SIZE(PRINTER_INFO_2W, pPrintProcessor), RTL_FIELD_SIZE(PRINTER_INFO_2W, pPrintProcessor), TRUE }, + { FIELD_OFFSET(PRINTER_INFO_2W, pDatatype), RTL_FIELD_SIZE(PRINTER_INFO_2W, pDatatype), RTL_FIELD_SIZE(PRINTER_INFO_2W, pDatatype), TRUE }, + { FIELD_OFFSET(PRINTER_INFO_2W, pParameters), RTL_FIELD_SIZE(PRINTER_INFO_2W, pParameters), RTL_FIELD_SIZE(PRINTER_INFO_2W, pParameters), TRUE }, + { FIELD_OFFSET(PRINTER_INFO_2W, pSecurityDescriptor), RTL_FIELD_SIZE(PRINTER_INFO_2W, pSecurityDescriptor), RTL_FIELD_SIZE(PRINTER_INFO_2W, pSecurityDescriptor), TRUE }, + { FIELD_OFFSET(PRINTER_INFO_2W, Attributes), RTL_FIELD_SIZE(PRINTER_INFO_2W, Attributes), RTL_FIELD_SIZE(PRINTER_INFO_2W, Attributes), FALSE }, + { FIELD_OFFSET(PRINTER_INFO_2W, Priority), RTL_FIELD_SIZE(PRINTER_INFO_2W, Priority), RTL_FIELD_SIZE(PRINTER_INFO_2W, Priority), FALSE }, + { FIELD_OFFSET(PRINTER_INFO_2W, DefaultPriority), RTL_FIELD_SIZE(PRINTER_INFO_2W, DefaultPriority), RTL_FIELD_SIZE(PRINTER_INFO_2W, DefaultPriority), FALSE }, + { FIELD_OFFSET(PRINTER_INFO_2W, StartTime), RTL_FIELD_SIZE(PRINTER_INFO_2W, StartTime), RTL_FIELD_SIZE(PRINTER_INFO_2W, StartTime), FALSE }, + { FIELD_OFFSET(PRINTER_INFO_2W, UntilTime), RTL_FIELD_SIZE(PRINTER_INFO_2W, UntilTime), RTL_FIELD_SIZE(PRINTER_INFO_2W, UntilTime), FALSE }, + { FIELD_OFFSET(PRINTER_INFO_2W, Status), RTL_FIELD_SIZE(PRINTER_INFO_2W, Status), RTL_FIELD_SIZE(PRINTER_INFO_2W, Status), FALSE }, + { FIELD_OFFSET(PRINTER_INFO_2W, cJobs), RTL_FIELD_SIZE(PRINTER_INFO_2W, cJobs), RTL_FIELD_SIZE(PRINTER_INFO_2W, cJobs), FALSE }, + { FIELD_OFFSET(PRINTER_INFO_2W, AveragePPM), RTL_FIELD_SIZE(PRINTER_INFO_2W, AveragePPM), RTL_FIELD_SIZE(PRINTER_INFO_2W, AveragePPM), FALSE }, + { MAXDWORD, 0, 0, FALSE } + } +}; + +static const MARSHALLING PrinterInfo3Marshalling = { + sizeof(PRINTER_INFO_3), + { + { FIELD_OFFSET(PRINTER_INFO_3, pSecurityDescriptor), RTL_FIELD_SIZE(PRINTER_INFO_3, pSecurityDescriptor), RTL_FIELD_SIZE(PRINTER_INFO_3, pSecurityDescriptor), TRUE }, + { MAXDWORD, 0, 0, FALSE } + } +}; + +static const MARSHALLING PrinterInfo4Marshalling = { + sizeof(PRINTER_INFO_4W), + { + { FIELD_OFFSET(PRINTER_INFO_4W, pPrinterName), RTL_FIELD_SIZE(PRINTER_INFO_4W, pPrinterName), RTL_FIELD_SIZE(PRINTER_INFO_4W, pPrinterName), TRUE }, + { FIELD_OFFSET(PRINTER_INFO_4W, pServerName), RTL_FIELD_SIZE(PRINTER_INFO_4W, pServerName), RTL_FIELD_SIZE(PRINTER_INFO_4W, pServerName), TRUE }, + { FIELD_OFFSET(PRINTER_INFO_4W, Attributes), RTL_FIELD_SIZE(PRINTER_INFO_4W, Attributes), RTL_FIELD_SIZE(PRINTER_INFO_4W, Attributes), FALSE }, + { MAXDWORD, 0, 0, FALSE } + } +}; + +static const MARSHALLING PrinterInfo5Marshalling = { + sizeof(PRINTER_INFO_5W), + { + { FIELD_OFFSET(PRINTER_INFO_5W, pPrinterName), RTL_FIELD_SIZE(PRINTER_INFO_5W, pPrinterName), RTL_FIELD_SIZE(PRINTER_INFO_5W, pPrinterName), TRUE }, + { FIELD_OFFSET(PRINTER_INFO_5W, pPortName), RTL_FIELD_SIZE(PRINTER_INFO_5W, pPortName), RTL_FIELD_SIZE(PRINTER_INFO_5W, pPortName), TRUE }, + { FIELD_OFFSET(PRINTER_INFO_5W, Attributes), RTL_FIELD_SIZE(PRINTER_INFO_5W, Attributes), RTL_FIELD_SIZE(PRINTER_INFO_5W, Attributes), FALSE }, + { FIELD_OFFSET(PRINTER_INFO_5W, DeviceNotSelectedTimeout), RTL_FIELD_SIZE(PRINTER_INFO_5W, DeviceNotSelectedTimeout), RTL_FIELD_SIZE(PRINTER_INFO_5W, DeviceNotSelectedTimeout), FALSE }, + { FIELD_OFFSET(PRINTER_INFO_5W, TransmissionRetryTimeout), RTL_FIELD_SIZE(PRINTER_INFO_5W, TransmissionRetryTimeout), RTL_FIELD_SIZE(PRINTER_INFO_5W, TransmissionRetryTimeout), FALSE }, + { MAXDWORD, 0, 0, FALSE } + } +}; + +static const MARSHALLING PrinterInfo6Marshalling = { + sizeof(PRINTER_INFO_6), + { + { FIELD_OFFSET(PRINTER_INFO_6, dwStatus), RTL_FIELD_SIZE(PRINTER_INFO_6, dwStatus), RTL_FIELD_SIZE(PRINTER_INFO_6, dwStatus), FALSE }, + { MAXDWORD, 0, 0, FALSE } + } +}; + +static const MARSHALLING PrinterInfo7Marshalling = { + sizeof(PRINTER_INFO_7W), + { + { FIELD_OFFSET(PRINTER_INFO_7W, pszObjectGUID), RTL_FIELD_SIZE(PRINTER_INFO_7W, pszObjectGUID), RTL_FIELD_SIZE(PRINTER_INFO_7W, pszObjectGUID), TRUE }, + { FIELD_OFFSET(PRINTER_INFO_7W, dwAction), RTL_FIELD_SIZE(PRINTER_INFO_7W, dwAction), RTL_FIELD_SIZE(PRINTER_INFO_7W, dwAction), FALSE }, + { MAXDWORD, 0, 0, FALSE } + } +}; + +static const MARSHALLING PrinterInfo8Marshalling = { + sizeof(PRINTER_INFO_8W), + { + { FIELD_OFFSET(PRINTER_INFO_8W, pDevMode), RTL_FIELD_SIZE(PRINTER_INFO_8W, pDevMode), RTL_FIELD_SIZE(PRINTER_INFO_8W, pDevMode), TRUE }, + { MAXDWORD, 0, 0, FALSE } + } +}; + +static const MARSHALLING PrinterInfo9Marshalling = { + sizeof(PRINTER_INFO_9W), + { + { FIELD_OFFSET(PRINTER_INFO_9W, pDevMode), RTL_FIELD_SIZE(PRINTER_INFO_9W, pDevMode), RTL_FIELD_SIZE(PRINTER_INFO_9W, pDevMode), TRUE }, + { MAXDWORD, 0, 0, FALSE } + } +}; + +static const MARSHALLING* pPrinterInfoMarshalling[] = { + &PrinterInfoStressMarshalling, + &PrinterInfo1Marshalling, + &PrinterInfo2Marshalling, + &PrinterInfo3Marshalling, + &PrinterInfo4Marshalling, + &PrinterInfo5Marshalling, + &PrinterInfo6Marshalling, + &PrinterInfo7Marshalling, + &PrinterInfo8Marshalling, + &PrinterInfo9Marshalling +}; diff --git a/win32ss/printing/include/marshalling/printprocessors.h b/win32ss/printing/include/marshalling/printprocessors.h new file mode 100644 index 0000000000..6b20c7f3da --- /dev/null +++ b/win32ss/printing/include/marshalling/printprocessors.h @@ -0,0 +1,22 @@ +/* + * PROJECT: ReactOS Printing Stack Marshalling Functions + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Marshalling definitions for DATATYPES_INFO_* and PRINTPROCESSOR_INFO_* + * COPYRIGHT: Copyright 2015-2018 Colin Finck (colin(a)reactos.org) + */ + +static const MARSHALLING DatatypesInfo1Marshalling = { + sizeof(DATATYPES_INFO_1W), + { + { FIELD_OFFSET(DATATYPES_INFO_1W, pName), RTL_FIELD_SIZE(DATATYPES_INFO_1W, pName), RTL_FIELD_SIZE(DATATYPES_INFO_1W, pName), TRUE }, + { MAXDWORD, 0, 0, FALSE } + } +}; + +static const MARSHALLING PrintProcessorInfo1Marshalling = { + sizeof(PRINTPROCESSOR_INFO_1W), + { + { FIELD_OFFSET(PRINTPROCESSOR_INFO_1W, pName), RTL_FIELD_SIZE(PRINTPROCESSOR_INFO_1W, pName), RTL_FIELD_SIZE(PRINTPROCESSOR_INFO_1W, pName), TRUE }, + { MAXDWORD, 0, 0, FALSE } + } +};

6 years, 11 months

01/01: [PRINTING] Try to fix Linux build #2

by Colin Finck

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=35ef5a3c24bca5d03c24d… commit 35ef5a3c24bca5d03c24df26e3211dbf453c8dc7 Author: Colin Finck <colin(a)reactos.org> AuthorDate: Wed Jan 17 10:55:02 2018 +0100 Commit: Colin Finck <colin(a)reactos.org> CommitDate: Wed Jan 17 10:55:02 2018 +0100 [PRINTING] Try to fix Linux build #2 --- win32ss/printing/base/marshalling.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/win32ss/printing/base/marshalling.c b/win32ss/printing/base/marshalling.c index 3a7ac9e270..8388a0af64 100644 --- a/win32ss/printing/base/marshalling.c +++ b/win32ss/printing/base/marshalling.c @@ -9,6 +9,8 @@ #include <windef.h> #include <winbase.h> +#include <marshalling/marshalling.h> + /** * @name MarshallDownStructure *

6 years, 11 months

01/01: [PRINTING] Try to fix Linux build.

by Colin Finck

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=86c59690da171daec466b… commit 86c59690da171daec466b69f3da2ee3a73ca6e86 Author: Colin Finck <colin(a)reactos.org> AuthorDate: Wed Jan 17 10:41:55 2018 +0100 Commit: Colin Finck <colin(a)reactos.org> CommitDate: Wed Jan 17 10:41:55 2018 +0100 [PRINTING] Try to fix Linux build. Why this previously built without any errors using GCC and MSVC under Windows is left as an exercise to the reader. --- win32ss/printing/base/marshalling.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/win32ss/printing/base/marshalling.c b/win32ss/printing/base/marshalling.c index bdca025076..3a7ac9e270 100644 --- a/win32ss/printing/base/marshalling.c +++ b/win32ss/printing/base/marshalling.c @@ -5,6 +5,9 @@ * COPYRIGHT: Copyright 2015-2018 Colin Finck (colin(a)reactos.org) */ +#define WIN32_NO_STATUS +#include <windef.h> +#include <winbase.h> /** * @name MarshallDownStructure

6 years, 11 months

01/01: [PRINTING] Implement the undocumented MarshallDownStructure, MarshallDownStructuresArray, MarshallUpStructure, and MarshallUpStructuresArray to the extent I need and could find out through black-box testing.

by Colin Finck

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f3ea8225cb2217463fa68… commit f3ea8225cb2217463fa68b5892c1ddc9c064a27a Author: Colin Finck <colin(a)reactos.org> AuthorDate: Wed Jan 17 10:13:25 2018 +0100 Commit: Colin Finck <colin(a)reactos.org> CommitDate: Wed Jan 17 10:13:25 2018 +0100 [PRINTING] Implement the undocumented MarshallDownStructure, MarshallDownStructuresArray, MarshallUpStructure, and MarshallUpStructuresArray to the extent I need and could find out through black-box testing. PDBs reveal that these functions are also used in winspool.drv, but not imported from spoolss.dll to retain the client/server architecture. As winspool.drv highly benefits from the MarshallUp* functions, I put them in a source file shared between spoolss.dll and winspool.drv. The added API Tests cover my testing and all implemented features. One more item done from https://reactos.org/wiki/Printing ! --- modules/rostests/apitests/spoolss/CMakeLists.txt | 2 + .../apitests/spoolss/MarshallDownStructuresArray.c | 118 ++++++++++++ .../apitests/spoolss/MarshallUpStructuresArray.c | 37 ++++ modules/rostests/apitests/spoolss/testlist.c | 6 +- win32ss/printing/base/marshalling.c | 212 +++++++++++++++++++++ win32ss/printing/base/spoolss/CMakeLists.txt | 1 + win32ss/printing/base/spoolss/precomp.h | 1 + win32ss/printing/base/spoolss/spoolss.spec | 6 +- win32ss/printing/base/spoolss/tools.c | 50 ----- win32ss/printing/base/spoolsv/precomp.h | 2 + win32ss/printing/base/winspool/CMakeLists.txt | 1 + win32ss/printing/base/winspool/precomp.h | 2 + win32ss/printing/include/marshalling/marshalling.h | 35 ++++ win32ss/printing/include/marshalling/ports.h | 26 +++ win32ss/printing/include/spoolss.h | 1 - 15 files changed, 445 insertions(+), 55 deletions(-) diff --git a/modules/rostests/apitests/spoolss/CMakeLists.txt b/modules/rostests/apitests/spoolss/CMakeLists.txt index f838489dc4..d746573b24 100644 --- a/modules/rostests/apitests/spoolss/CMakeLists.txt +++ b/modules/rostests/apitests/spoolss/CMakeLists.txt @@ -3,6 +3,8 @@ include_directories(${REACTOS_SOURCE_DIR}/win32ss/printing/include) list(APPEND SOURCE AlignRpcPtr.c + MarshallDownStructuresArray.c + MarshallUpStructuresArray.c PackStrings.c ReallocSplStr.c SplInitializeWinSpoolDrv.c diff --git a/modules/rostests/apitests/spoolss/MarshallDownStructuresArray.c b/modules/rostests/apitests/spoolss/MarshallDownStructuresArray.c new file mode 100644 index 0000000000..cd057074ec --- /dev/null +++ b/modules/rostests/apitests/spoolss/MarshallDownStructuresArray.c @@ -0,0 +1,118 @@ +/* + * PROJECT: ReactOS Spooler Router API Tests + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Tests for MarshallDownStructuresArray + * COPYRIGHT: Copyright 2018 Colin Finck (colin(a)reactos.org) + */ + +#include <apitest.h> + +#define WIN32_NO_STATUS +#include <windef.h> +#include <winbase.h> +#include <wingdi.h> +#include <winspool.h> +#include <ndk/rtlfuncs.h> + +#include <spoolss.h> +#include <marshalling/marshalling.h> +#include <marshalling/ports.h> + +START_TEST(MarshallDownStructuresArray) +{ + const DWORD cElements = 2; + const DWORD dwPortInfo2Offsets[] = { + FIELD_OFFSET(PORT_INFO_2W, pPortName), + FIELD_OFFSET(PORT_INFO_2W, pMonitorName), + FIELD_OFFSET(PORT_INFO_2W, pDescription), + MAXDWORD + }; + + PPORT_INFO_2W pPortInfo2; + PPORT_INFO_2W pPortInfo2Copy; + PPORT_INFO_2W pPortInfo2Test; + PBYTE pPortInfoEnd; + PWSTR pwszStrings[] = { L"PortName", L"MonitorName", L"Description" }; + DWORD cbPortInfo2Size = cElements * (sizeof(PORT_INFO_2W) + (wcslen(pwszStrings[0]) + 1 + wcslen(pwszStrings[1]) + 1 + wcslen(pwszStrings[2]) + 1) * sizeof(WCHAR)); + DWORD fPortType = 1337; + DWORD Reserved = 42; + + // Setting cElements to zero should yield success. + SetLastError(0xDEADBEEF); + ok(MarshallDownStructuresArray(NULL, 0, NULL, 0, FALSE), "MarshallDownStructuresArray returns FALSE!\n"); + ok(GetLastError() == 0xDEADBEEF, "GetLastError returns %lu!\n", GetLastError()); + + // Setting cElements non-zero should fail with ERROR_INVALID_PARAMETER. + SetLastError(0xDEADBEEF); + ok(!MarshallDownStructuresArray(NULL, 1, NULL, 0, FALSE), "MarshallDownStructuresArray returns TRUE!\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "GetLastError returns %lu!\n", GetLastError()); + + // This is triggered by both pStructuresArray and pInfo. + SetLastError(0xDEADBEEF); + ok(!MarshallDownStructuresArray((PVOID)0xDEADDEAD, 1, NULL, 0, FALSE), "MarshallDownStructuresArray returns TRUE!\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "GetLastError returns %lu!\n", GetLastError()); + + SetLastError(0xDEADBEEF); + ok(!MarshallDownStructuresArray(NULL, 1, (const MARSHALLING_INFO*)0xDEADDEAD, 0, FALSE), "MarshallDownStructuresArray returns TRUE!\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "GetLastError returns %lu!\n", GetLastError()); + + // Now create two PORT_INFO_2W structures. + pPortInfo2 = (PPORT_INFO_2W)HeapAlloc(GetProcessHeap(), 0, cbPortInfo2Size); + pPortInfoEnd = (PBYTE)pPortInfo2 + cbPortInfo2Size; + + (&pPortInfo2[0])->fPortType = fPortType; + (&pPortInfo2[0])->Reserved = Reserved; + pPortInfoEnd = PackStrings(pwszStrings, (PBYTE)(&pPortInfo2[0]), dwPortInfo2Offsets, pPortInfoEnd); + + (&pPortInfo2[1])->fPortType = fPortType + 1; + (&pPortInfo2[1])->Reserved = Reserved + 1; + pPortInfoEnd = PackStrings(pwszStrings, (PBYTE)(&pPortInfo2[1]), dwPortInfo2Offsets, pPortInfoEnd); + + // Create a backup. + pPortInfo2Copy = (PPORT_INFO_2W)HeapAlloc(GetProcessHeap(), 0, cbPortInfo2Size); + CopyMemory(pPortInfo2Copy, pPortInfo2, cbPortInfo2Size); + + // Marshall them down. + SetLastError(0xDEADBEEF); + ok(MarshallDownStructuresArray(pPortInfo2, cElements, PortInfo2Marshalling.pInfo, PortInfo2Marshalling.cbStructureSize, TRUE), "MarshallDownStructuresArray returns FALSE!\n"); + ok(GetLastError() == 0xDEADBEEF, "GetLastError returns %lu!\n", GetLastError()); + + // DWORD values should be unchanged. + ok((&pPortInfo2[0])->fPortType == fPortType, "fPortType is %lu!\n", (&pPortInfo2[0])->fPortType); + ok((&pPortInfo2[0])->Reserved == Reserved, "Reserved is %lu!\n", (&pPortInfo2[0])->Reserved); + ok((&pPortInfo2[1])->fPortType == fPortType + 1, "fPortType is %lu!\n", (&pPortInfo2[1])->fPortType); + ok((&pPortInfo2[1])->Reserved == Reserved + 1, "Reserved is %lu!\n", (&pPortInfo2[1])->Reserved); + + // Pointers should now contain relative offsets. + ok((ULONG_PTR)(&pPortInfo2[0])->pPortName == ((ULONG_PTR)(&pPortInfo2Copy[0])->pPortName - (ULONG_PTR)(&pPortInfo2[0])), "pPortName is %p!\n", (&pPortInfo2[0])->pPortName); + ok((ULONG_PTR)(&pPortInfo2[0])->pMonitorName == ((ULONG_PTR)(&pPortInfo2Copy[0])->pMonitorName - (ULONG_PTR)(&pPortInfo2[0])), "pMonitorName is %p!\n", (&pPortInfo2[0])->pMonitorName); + ok((ULONG_PTR)(&pPortInfo2[0])->pDescription == ((ULONG_PTR)(&pPortInfo2Copy[0])->pDescription - (ULONG_PTR)(&pPortInfo2[0])), "pDescription is %p!\n", (&pPortInfo2[0])->pDescription); + ok((ULONG_PTR)(&pPortInfo2[1])->pPortName == ((ULONG_PTR)(&pPortInfo2Copy[1])->pPortName - (ULONG_PTR)(&pPortInfo2[1])), "pPortName is %p!\n", (&pPortInfo2[1])->pPortName); + ok((ULONG_PTR)(&pPortInfo2[1])->pMonitorName == ((ULONG_PTR)(&pPortInfo2Copy[1])->pMonitorName - (ULONG_PTR)(&pPortInfo2[1])), "pMonitorName is %p!\n", (&pPortInfo2[1])->pMonitorName); + ok((ULONG_PTR)(&pPortInfo2[1])->pDescription == ((ULONG_PTR)(&pPortInfo2Copy[1])->pDescription - (ULONG_PTR)(&pPortInfo2[1])), "pDescription is %p!\n", (&pPortInfo2[1])->pDescription); + + // Marshall them up again. + // We need a backup of the marshalled down array to experiment with MarshallUpStructuresArray. + pPortInfo2Test = (PPORT_INFO_2W)HeapAlloc(GetProcessHeap(), 0, cbPortInfo2Size); + CopyMemory(pPortInfo2Test, pPortInfo2, cbPortInfo2Size); + + // Due to the implementation of PackStrings, (&pPortInfo2[0])->pPortName contains the highest offset. + // Show that MarshallUpStructuresArray checks the offsets and bails out with ERROR_INVALID_DATA if cbSize <= highest offset. + SetLastError(0xDEADBEEF); + ok(!MarshallUpStructuresArray((DWORD)(&pPortInfo2[0])->pPortName, pPortInfo2Test, cElements, PortInfo2Marshalling.pInfo, PortInfo2Marshalling.cbStructureSize, TRUE), "MarshallUpStructuresArray returns TRUE!\n"); + ok(GetLastError() == ERROR_INVALID_DATA, "GetLastError returns %lu!\n", GetLastError()); + + // It works with cbSize > highest offset. + // In real world cases, we would use cbPortInfo2Size for cbSize. + SetLastError(0xDEADBEEF); + ok(MarshallUpStructuresArray((DWORD)(&pPortInfo2[0])->pPortName + 1, pPortInfo2, cElements, PortInfo2Marshalling.pInfo, PortInfo2Marshalling.cbStructureSize, TRUE), "MarshallUpStructuresArray returns FALSE!\n"); + ok(GetLastError() == 0xDEADBEEF, "GetLastError returns %lu!\n", GetLastError()); + + // pPortInfo2 should now be identical to the copy again. + ok(RtlEqualMemory(pPortInfo2, pPortInfo2Copy, cbPortInfo2Size), "pPortInfo2 and pPortInfo2Copy are not equal after marshalling down and up!\n"); + + // Free all memory. + HeapFree(GetProcessHeap(), 0, pPortInfo2); + HeapFree(GetProcessHeap(), 0, pPortInfo2Copy); + HeapFree(GetProcessHeap(), 0, pPortInfo2Test); +} diff --git a/modules/rostests/apitests/spoolss/MarshallUpStructuresArray.c b/modules/rostests/apitests/spoolss/MarshallUpStructuresArray.c new file mode 100644 index 0000000000..d47c8b21dd --- /dev/null +++ b/modules/rostests/apitests/spoolss/MarshallUpStructuresArray.c @@ -0,0 +1,37 @@ +/* + * PROJECT: ReactOS Spooler Router API Tests + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Tests for MarshallUpStructuresArray + * COPYRIGHT: Copyright 2018 Colin Finck (colin(a)reactos.org) + */ + +#include <apitest.h> + +#define WIN32_NO_STATUS +#include <windef.h> +#include <winbase.h> +#include <marshalling/marshalling.h> + +START_TEST(MarshallUpStructuresArray) +{ + // Setting cElements to zero should yield success. + SetLastError(0xDEADBEEF); + ok(MarshallUpStructuresArray(0, NULL, 0, NULL, 0, FALSE), "MarshallUpStructuresArray returns FALSE!\n"); + ok(GetLastError() == 0xDEADBEEF, "GetLastError returns %lu!\n", GetLastError()); + + // Setting cElements non-zero should fail with ERROR_INVALID_PARAMETER. + SetLastError(0xDEADBEEF); + ok(!MarshallUpStructuresArray(0, NULL, 1, NULL, 0, FALSE), "MarshallUpStructuresArray returns TRUE!\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "GetLastError returns %lu!\n", GetLastError()); + + // This is triggered by both pStructuresArray and pInfo. + SetLastError(0xDEADBEEF); + ok(!MarshallUpStructuresArray(0, (PVOID)0xDEADDEAD, 1, NULL, 0, FALSE), "MarshallUpStructuresArray returns TRUE!\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "GetLastError returns %lu!\n", GetLastError()); + + SetLastError(0xDEADBEEF); + ok(!MarshallUpStructuresArray(0, NULL, 1, (const MARSHALLING_INFO*)0xDEADDEAD, 0, FALSE), "MarshallUpStructuresArray returns TRUE!\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "GetLastError returns %lu!\n", GetLastError()); + + // More testing is conducted in the MarshallDownStructuresArray test. +} diff --git a/modules/rostests/apitests/spoolss/testlist.c b/modules/rostests/apitests/spoolss/testlist.c index 67b885cbd6..f37cc351df 100644 --- a/modules/rostests/apitests/spoolss/testlist.c +++ b/modules/rostests/apitests/spoolss/testlist.c @@ -2,7 +2,7 @@ * PROJECT: ReactOS Spooler Router API Tests * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: Test list - * COPYRIGHT: Copyright 2015-2017 Colin Finck (colin(a)reactos.org) + * COPYRIGHT: Copyright 2015-2018 Colin Finck (colin(a)reactos.org) */ #define __ROS_LONG64__ @@ -11,6 +11,8 @@ #include <apitest.h> extern void func_AlignRpcPtr(void); +extern void func_MarshallDownStructuresArray(void); +extern void func_MarshallUpStructuresArray(void); extern void func_PackStrings(void); extern void func_ReallocSplStr(void); extern void func_SplInitializeWinSpoolDrv(void); @@ -18,6 +20,8 @@ extern void func_SplInitializeWinSpoolDrv(void); const struct test winetest_testlist[] = { { "AlignRpcPtr", func_AlignRpcPtr }, + { "MarshallDownStructuresArray", func_MarshallDownStructuresArray }, + { "MarshallUpStructuresArray", func_MarshallUpStructuresArray }, { "PackStrings", func_PackStrings }, { "ReallocSplStr", func_ReallocSplStr }, { "SplInitializeWinSpoolDrv", func_SplInitializeWinSpoolDrv }, diff --git a/win32ss/printing/base/marshalling.c b/win32ss/printing/base/marshalling.c new file mode 100644 index 0000000000..bdca025076 --- /dev/null +++ b/win32ss/printing/base/marshalling.c @@ -0,0 +1,212 @@ +/* + * PROJECT: ReactOS Printing Stack Marshalling Functions + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Marshalling functions + * COPYRIGHT: Copyright 2015-2018 Colin Finck (colin(a)reactos.org) + */ + + +/** + * @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 pInfo + * Array of MARSHALLING_INFO elements containing information about the fields of the structure as well as how to modify them. + * See the documentation on MARSHALLING_INFO for more information. + * You have to indicate the end of the array by setting the dwOffset field to MAXDWORD. + * + * @param cbStructureSize + * Size in bytes of the structure. + * This parameter is unused in my implementation. + * + * @param bSomeBoolean + * Unknown boolean value, set to TRUE. + * + * @return + * TRUE if the structure was successfully adjusted, FALSE otherwise. + */ +BOOL WINAPI +MarshallDownStructure(PVOID pStructure, const MARSHALLING_INFO* pInfo, DWORD cbStructureSize, BOOL bSomeBoolean) +{ + // Sanity checks + if (!pStructure || !pInfo) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + // Loop until we reach an element with offset set to MAXDWORD. + while (pInfo->dwOffset != MAXDWORD) + { + PULONG_PTR pCurrentField = (PULONG_PTR)((PBYTE)pStructure + pInfo->dwOffset); + + if (pInfo->bAdjustAddress && *pCurrentField) + { + // Make a relative offset out of the absolute pointer address. + *pCurrentField -= (ULONG_PTR)pStructure; + } + + // Advance to the next field description. + pInfo++; + } + + return TRUE; +} + +/** + * @name MarshallDownStructuresArray + * + * Prepare an array of structures for marshalling/serialization by replacing absolute pointer addresses in its fields by relative offsets. + * + * @param pStructuresArray + * Pointer to the array of structures to operate on. + * + * @param cElements + * Number of array elements. + * + * @param pInfo + * Array of MARSHALLING_INFO elements containing information about the fields of the structure as well as how to modify them. + * See the documentation on MARSHALLING_INFO for more information. + * You have to indicate the end of the array by setting the dwOffset field to MAXDWORD. + * + * @param cbStructureSize + * Size in bytes of each structure array element. + * + * @param bSomeBoolean + * Unknown boolean value, set to TRUE. + * + * @return + * TRUE if the array was successfully adjusted, FALSE otherwise. + */ +BOOL WINAPI +MarshallDownStructuresArray(PVOID pStructuresArray, DWORD cElements, const MARSHALLING_INFO* pInfo, DWORD cbStructureSize, BOOL bSomeBoolean) +{ + PBYTE pCurrentElement = pStructuresArray; + + // Call MarshallDownStructure on all array elements given by cElements of cbStructureSize. + while (cElements--) + { + if (!MarshallDownStructure(pCurrentElement, pInfo, cbStructureSize, bSomeBoolean)) + return FALSE; + + // Advance to the next array element. + pCurrentElement += cbStructureSize; + } + + return TRUE; +} + +/** + * @name MarshallUpStructure + * + * Unmarshall/deserialize a structure previuosly marshalled by MarshallDownStructure by replacing relative offsets in its fields + * by absolute pointer addresses again. + * + * @param cbSize + * Size in bytes of the memory allocated for both the structure and its data. + * The function will check if all relative offsets are within the bounds given by this size. + * + * @param pStructure + * Pointer to the structure to operate on. + * + * @param pInfo + * Array of MARSHALLING_INFO elements containing information about the fields of the structure as well as how to modify them. + * See the documentation on MARSHALLING_INFO for more information. + * You have to indicate the end of the array by setting the dwOffset field to MAXDWORD. + * + * @param cbStructureSize + * Size in bytes of the structure. + * This parameter is unused in my implementation. + * + * @param bSomeBoolean + * Unknown boolean value, set to TRUE. + * + * @return + * TRUE if the structure was successfully adjusted, FALSE otherwise. + */ +BOOL WINAPI +MarshallUpStructure(DWORD cbSize, PVOID pStructure, const MARSHALLING_INFO* pInfo, DWORD cbStructureSize, BOOL bSomeBoolean) +{ + // Sanity checks + if (!pStructure || !pInfo) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + // Loop until we reach an element with offset set to MAXDWORD. + while (pInfo->dwOffset != MAXDWORD) + { + PULONG_PTR pCurrentField = (PULONG_PTR)((PBYTE)pStructure + pInfo->dwOffset); + + if (pInfo->bAdjustAddress && *pCurrentField) + { + // Verify that the offset in the current field is within the bounds given by cbSize. + if (cbSize <= *pCurrentField) + { + SetLastError(ERROR_INVALID_DATA); + return FALSE; + } + + // Make an absolute pointer address out of the relative offset. + *pCurrentField += (ULONG_PTR)pStructure; + } + + // Advance to the next field description. + pInfo++; + } + + return TRUE; +} + +/** + * @name MarshallUpStructuresArray + * + * Unmarshall/deserialize an array of structures previuosly marshalled by MarshallDownStructuresArray by replacing relative offsets + * in its fields by absolute pointer addresses again. + * + * @param cbSize + * Size in bytes of the memory allocated for the entire structure array and its data. + * The function will check if all relative offsets are within the bounds given by this size. + * + * @param pStructuresArray + * Pointer to the array of structures to operate on. + * + * @param cElements + * Number of array elements. + * + * @param pInfo + * Array of MARSHALLING_INFO elements containing information about the fields of the structure as well as how to modify them. + * See the documentation on MARSHALLING_INFO for more information. + * You have to indicate the end of the array by setting the dwOffset field to MAXDWORD. + * + * @param cbStructureSize + * Size in bytes of each structure array element. + * + * @param bSomeBoolean + * Unknown boolean value, set to TRUE. + * + * @return + * TRUE if the array was successfully adjusted, FALSE otherwise. + */ +BOOL WINAPI +MarshallUpStructuresArray(DWORD cbSize, PVOID pStructuresArray, DWORD cElements, const MARSHALLING_INFO* pInfo, DWORD cbStructureSize, BOOL bSomeBoolean) +{ + PBYTE pCurrentElement = pStructuresArray; + + // Call MarshallUpStructure on all array elements given by cElements of cbStructureSize. + while (cElements--) + { + if (!MarshallUpStructure(cbSize, pCurrentElement, pInfo, cbStructureSize, bSomeBoolean)) + return FALSE; + + // Advance to the next array element. + pCurrentElement += cbStructureSize; + } + + return TRUE; +} diff --git a/win32ss/printing/base/spoolss/CMakeLists.txt b/win32ss/printing/base/spoolss/CMakeLists.txt index f7ef3f273d..12d6649e63 100644 --- a/win32ss/printing/base/spoolss/CMakeLists.txt +++ b/win32ss/printing/base/spoolss/CMakeLists.txt @@ -2,6 +2,7 @@ spec2def(spoolss.dll spoolss.spec ADD_IMPORTLIB) list(APPEND SOURCE + ../marshalling.c context.c jobs.c main.c diff --git a/win32ss/printing/base/spoolss/precomp.h b/win32ss/printing/base/spoolss/precomp.h index 6ec7633c2b..3a859aa2d7 100644 --- a/win32ss/printing/base/spoolss/precomp.h +++ b/win32ss/printing/base/spoolss/precomp.h @@ -18,6 +18,7 @@ #include <ndk/rtlfuncs.h> #include <spoolss.h> +#include <marshalling/marshalling.h> #include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(spoolss); diff --git a/win32ss/printing/base/spoolss/spoolss.spec b/win32ss/printing/base/spoolss/spoolss.spec index 172ab0b151..87e136c9a4 100644 --- a/win32ss/printing/base/spoolss/spoolss.spec +++ b/win32ss/printing/base/spoolss/spoolss.spec @@ -97,9 +97,9 @@ @ stub LoadDriverWithVersion @ stub LogWmiTraceEvent @ stdcall MarshallDownStructure(ptr ptr long long) -@ stub MarshallDownStructuresArray -@ stub MarshallUpStructure -@ stub MarshallUpStructuresArray +@ stdcall MarshallDownStructuresArray(ptr long ptr long long) +@ stdcall MarshallUpStructure(long ptr ptr long long) +@ stdcall MarshallUpStructuresArray(long ptr long ptr long long) @ stub MIDL_user_allocate1 @ stub MIDL_user_free1 @ stub OldGetPrinterDriverW diff --git a/win32ss/printing/base/spoolss/tools.c b/win32ss/printing/base/spoolss/tools.c index e6545bdf28..7b8410a41a 100644 --- a/win32ss/printing/base/spoolss/tools.c +++ b/win32ss/printing/base/spoolss/tools.c @@ -8,56 +8,6 @@ #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 * diff --git a/win32ss/printing/base/spoolsv/precomp.h b/win32ss/printing/base/spoolsv/precomp.h index f7d09e1e3d..5ab518a43c 100644 --- a/win32ss/printing/base/spoolsv/precomp.h +++ b/win32ss/printing/base/spoolsv/precomp.h @@ -17,8 +17,10 @@ #include <winspool.h> #include <winsplp.h> #include <winspool_s.h> +#include <ndk/rtlfuncs.h> #include <spoolss.h> +#include <marshalling/marshalling.h> #include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(spoolsv); diff --git a/win32ss/printing/base/winspool/CMakeLists.txt b/win32ss/printing/base/winspool/CMakeLists.txt index b4dcf8a163..aea2d85f3d 100644 --- a/win32ss/printing/base/winspool/CMakeLists.txt +++ b/win32ss/printing/base/winspool/CMakeLists.txt @@ -4,6 +4,7 @@ add_rpc_files(client ${REACTOS_SOURCE_DIR}/sdk/include/reactos/idl/winspool.idl) spec2def(winspool.drv winspool.spec ADD_IMPORTLIB) list(APPEND SOURCE + ../marshalling.c devmode.c forms.c jobs.c diff --git a/win32ss/printing/base/winspool/precomp.h b/win32ss/printing/base/winspool/precomp.h index 9cf5be3e90..cbfaac933c 100644 --- a/win32ss/printing/base/winspool/precomp.h +++ b/win32ss/printing/base/winspool/precomp.h @@ -15,8 +15,10 @@ #include <winreg.h> #include <winspool.h> #include <winspool_c.h> +#include <ndk/rtlfuncs.h> #include <spoolss.h> +#include <marshalling/marshalling.h> #include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(winspool); diff --git a/win32ss/printing/include/marshalling/marshalling.h b/win32ss/printing/include/marshalling/marshalling.h new file mode 100644 index 0000000000..d82db43a2b --- /dev/null +++ b/win32ss/printing/include/marshalling/marshalling.h @@ -0,0 +1,35 @@ +/* + * PROJECT: ReactOS Printing Stack Marshalling Functions + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Marshalling definitions + * COPYRIGHT: Copyright 2015-2018 Colin Finck (colin(a)reactos.org) + */ + + +#ifndef _MARSHALLING_H +#define _MARSHALLING_H + +typedef struct _MARSHALLING_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. */ +} +MARSHALLING_INFO; + +typedef struct _MARSHALLING +{ + DWORD cbStructureSize; + MARSHALLING_INFO pInfo[]; +} +MARSHALLING; + +BOOL WINAPI MarshallDownStructure(PVOID pStructure, const MARSHALLING_INFO* pInfo, DWORD cbStructureSize, BOOL bSomeBoolean); +BOOL WINAPI MarshallDownStructuresArray(PVOID pStructuresArray, DWORD cElements, const MARSHALLING_INFO* pInfo, DWORD cbStructureSize, BOOL bSomeBoolean); +BOOL WINAPI MarshallUpStructure(DWORD cbSize, PVOID pStructure, const MARSHALLING_INFO* pInfo, DWORD cbStructureSize, BOOL bSomeBoolean); +BOOL WINAPI MarshallUpStructuresArray(DWORD cbSize, PVOID pStructuresArray, DWORD cElements, const MARSHALLING_INFO* pInfo, DWORD cbStructureSize, BOOL bSomeBoolean); + +#endif diff --git a/win32ss/printing/include/marshalling/ports.h b/win32ss/printing/include/marshalling/ports.h new file mode 100644 index 0000000000..b53eb31742 --- /dev/null +++ b/win32ss/printing/include/marshalling/ports.h @@ -0,0 +1,26 @@ +/* + * PROJECT: ReactOS Printing Stack Marshalling Functions + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Marshalling definitions for PORT_INFO_* + * COPYRIGHT: Copyright 2015-2018 Colin Finck (colin(a)reactos.org) + */ + +const MARSHALLING PortInfo1Marshalling = { + sizeof(PORT_INFO_1W), + { + { FIELD_OFFSET(PORT_INFO_1W, pName), RTL_FIELD_SIZE(PORT_INFO_1W, pName), RTL_FIELD_SIZE(PORT_INFO_1W, pName), TRUE }, + { MAXDWORD, 0, 0, FALSE } + } +}; + +const MARSHALLING PortInfo2Marshalling = { + sizeof(PORT_INFO_2W), + { + { FIELD_OFFSET(PORT_INFO_2W, pPortName), RTL_FIELD_SIZE(PORT_INFO_2W, pPortName), RTL_FIELD_SIZE(PORT_INFO_2W, pPortName), TRUE }, + { FIELD_OFFSET(PORT_INFO_2W, pMonitorName), RTL_FIELD_SIZE(PORT_INFO_2W, pMonitorName), RTL_FIELD_SIZE(PORT_INFO_2W, pMonitorName), TRUE }, + { FIELD_OFFSET(PORT_INFO_2W, pDescription), RTL_FIELD_SIZE(PORT_INFO_2W, pDescription), RTL_FIELD_SIZE(PORT_INFO_2W, pDescription), TRUE }, + { FIELD_OFFSET(PORT_INFO_2W, fPortType), RTL_FIELD_SIZE(PORT_INFO_2W, fPortType), RTL_FIELD_SIZE(PORT_INFO_2W, fPortType), FALSE }, + { FIELD_OFFSET(PORT_INFO_2W, Reserved), RTL_FIELD_SIZE(PORT_INFO_2W, Reserved), RTL_FIELD_SIZE(PORT_INFO_2W, Reserved), FALSE }, + { MAXDWORD, 0, 0, FALSE } + } +}; diff --git a/win32ss/printing/include/spoolss.h b/win32ss/printing/include/spoolss.h index a841fb29e0..7e1c132dcf 100644 --- a/win32ss/printing/include/spoolss.h +++ b/win32ss/printing/include/spoolss.h @@ -63,7 +63,6 @@ PVOID WINAPI DllAllocSplMem(DWORD dwBytes); BOOL WINAPI DllFreeSplMem(PVOID pMem); BOOL WINAPI DllFreeSplStr(PWSTR pwszString); BOOL WINAPI InitializeRouter(HANDLE SpoolerStatusHandle); -BOOL WINAPI MarshallDownStructure(PVOID pStructure, PMARSHALL_DOWN_INFO pParameters, DWORD cbStructureSize, BOOL bSomeBoolean); PBYTE WINAPI PackStrings(PWSTR* pSource, PBYTE pDest, const DWORD* DestOffsets, PBYTE pEnd); PVOID WINAPI ReallocSplMem(PVOID pOldMem, DWORD cbOld, DWORD cbNew); BOOL WINAPI ReallocSplStr(PWSTR* ppwszString, PCWSTR pwszInput);

6 years, 11 months

01/01: [NTOS:MM] Fix broken ASSERT. CID 701285

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2ae756a4e5a70fc4cff60… commit 2ae756a4e5a70fc4cff60c935fcb90f3d9ebede2 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Tue Jan 16 22:10:22 2018 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Tue Jan 16 22:29:19 2018 +0100 [NTOS:MM] Fix broken ASSERT. CID 701285 --- ntoskrnl/mm/ARM3/virtual.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ntoskrnl/mm/ARM3/virtual.c b/ntoskrnl/mm/ARM3/virtual.c index bbc773a919..97f017f326 100644 --- a/ntoskrnl/mm/ARM3/virtual.c +++ b/ntoskrnl/mm/ARM3/virtual.c @@ -5490,8 +5490,8 @@ FinalPath: AlreadyDecommitted; ASSERT(CommitReduction >= 0); + ASSERT(Vad->u.VadFlags.CommitCharge >= CommitReduction); Vad->u.VadFlags.CommitCharge -= CommitReduction; - ASSERT(Vad->u.VadFlags.CommitCharge >= 0); // // We are done, go to the exit path without freeing the VAD as it remains

6 years, 11 months

02/02: [EXPLORER] CTrayBandSite: Call DBID_SETWINDOWTHEME on new bands to make them use the theme of the taskbar. CORE-14176

by Giannis Adamopoulos

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=71e66c69c1fe53c9cec35… commit 71e66c69c1fe53c9cec35e5fbf62b64a67f73f3a Author: Giannis Adamopoulos <gadamopoulos(a)reactos.org> AuthorDate: Tue Jan 16 11:43:28 2018 +0200 Commit: Giannis Adamopoulos <gadamopoulos(a)reactos.org> CommitDate: Tue Jan 16 11:50:52 2018 +0200 [EXPLORER] CTrayBandSite: Call DBID_SETWINDOWTHEME on new bands to make them use the theme of the taskbar. CORE-14176 --- base/shell/explorer/tbsite.cpp | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/base/shell/explorer/tbsite.cpp b/base/shell/explorer/tbsite.cpp index 1cb3ab5a66..aa2f4e6985 100644 --- a/base/shell/explorer/tbsite.cpp +++ b/base/shell/explorer/tbsite.cpp @@ -355,7 +355,23 @@ public: /* FIXME: Should be delayed */ IUnknown_Exec(punk, IID_IDeskBand, DBID_DELAYINIT, 0, NULL, NULL); - return m_BandSite->AddBand(punk); + HRESULT hr = m_BandSite->AddBand(punk); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + VARIANT vThemeName; + V_VT(&vThemeName) = VT_BSTR; + V_BSTR(&vThemeName) = SysAllocString(L"TaskBar"); + IUnknown_Exec(punk, + IID_IDeskBand, + DBID_SETWINDOWTHEME, + 0, + &vThemeName, + NULL); + + SysFreeString(V_BSTR(&vThemeName)); + + return S_OK; } virtual HRESULT STDMETHODCALLTYPE EnumBands(

6 years, 11 months

01/02: [BROWSEUI] CISFBand: Handle DBID_SETWINDOWTHEME. CORE-14176

by Giannis Adamopoulos

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4c23b78b5e71913a1a660… commit 4c23b78b5e71913a1a6604bf55615b0475f22ff6 Author: Giannis Adamopoulos <gadamopoulos(a)reactos.org> AuthorDate: Tue Jan 16 11:36:34 2018 +0200 Commit: Giannis Adamopoulos <gadamopoulos(a)reactos.org> CommitDate: Tue Jan 16 11:50:51 2018 +0200 [BROWSEUI] CISFBand: Handle DBID_SETWINDOWTHEME. CORE-14176 --- dll/win32/browseui/CMakeLists.txt | 2 +- dll/win32/browseui/shellbars/CISFBand.cpp | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dll/win32/browseui/CMakeLists.txt b/dll/win32/browseui/CMakeLists.txt index 161c45fb59..85b269fb1f 100644 --- a/dll/win32/browseui/CMakeLists.txt +++ b/dll/win32/browseui/CMakeLists.txt @@ -45,7 +45,7 @@ add_library(browseui SHARED set_module_type(browseui win32dll UNICODE) target_link_libraries(browseui shellbars atlnew uuid wine) -add_importlibs(browseui shlwapi shell32 comctl32 gdi32 ole32 oleaut32 user32 advapi32 msvcrt kernel32 ntdll) +add_importlibs(browseui uxtheme shlwapi shell32 comctl32 gdi32 ole32 oleaut32 user32 advapi32 msvcrt kernel32 ntdll) add_pch(browseui precomp.h SOURCE) add_cd_file(TARGET browseui DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/browseui/shellbars/CISFBand.cpp b/dll/win32/browseui/shellbars/CISFBand.cpp index 670e647a23..8d538c21ac 100644 --- a/dll/win32/browseui/shellbars/CISFBand.cpp +++ b/dll/win32/browseui/shellbars/CISFBand.cpp @@ -10,6 +10,8 @@ #include <commoncontrols.h> #include <shellapi.h> +#include <wingdi.h> +#include <uxtheme.h> /* TODO: @@ -431,6 +433,13 @@ HRESULT CISFBand::CreateSimpleToolbar(HWND hWndParent) if (IsEqualIID(*pguidCmdGroup, IID_IDeskBand)) { + if (nCmdID == DBID_SETWINDOWTHEME) + { + if (pvaIn && V_VT(pvaIn) == VT_BSTR && V_BSTR(pvaIn)) + { + SetWindowTheme(m_hWnd, V_BSTR(pvaIn), NULL); + } + } return S_OK; }

6 years, 11 months

01/01: [NTOSKRNL] Implement CcIsThereDirtyData()

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c779dbd4c5779cfddfd40… commit c779dbd4c5779cfddfd4054601d996c15ae22ff4 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Mon Jan 15 23:20:53 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Mon Jan 15 23:20:53 2018 +0100 [NTOSKRNL] Implement CcIsThereDirtyData() --- ntoskrnl/cc/fs.c | 40 +++++++++++++++++++++++++++++++++++++--- ntoskrnl/cc/view.c | 2 +- ntoskrnl/include/internal/cc.h | 1 + 3 files changed, 39 insertions(+), 4 deletions(-) diff --git a/ntoskrnl/cc/fs.c b/ntoskrnl/cc/fs.c index fb5f99aab2..d62e18dee0 100644 --- a/ntoskrnl/cc/fs.c +++ b/ntoskrnl/cc/fs.c @@ -111,17 +111,51 @@ CcInitializeCacheMap ( } /* - * @unimplemented + * @implemented */ BOOLEAN NTAPI CcIsThereDirtyData ( IN PVPB Vpb) { + PROS_VACB Vacb; + PLIST_ENTRY Entry; + /* Assume no dirty data */ + BOOLEAN Dirty = FALSE; + CCTRACE(CC_API_DEBUG, "Vpb=%p\n", Vpb); - UNIMPLEMENTED; - return FALSE; + KeAcquireGuardedMutex(&ViewLock); + + /* Browse dirty VACBs */ + for (Entry = DirtyVacbListHead.Flink; Entry != &DirtyVacbListHead; Entry = Entry->Flink) + { + Vacb = CONTAINING_RECORD(Entry, ROS_VACB, DirtyVacbListEntry); + /* Look for these associated with our volume */ + if (Vacb->SharedCacheMap->FileObject->Vpb != Vpb) + { + continue; + } + + /* From now on, we are associated with our VPB */ + + /* Temporary files are not counted as dirty */ + if (BooleanFlagOn(Vacb->SharedCacheMap->FileObject->Flags, FO_TEMPORARY_FILE)) + { + continue; + } + + /* A single dirty VACB is enough to have dirty data */ + if (Vacb->Dirty) + { + Dirty = TRUE; + break; + } + } + + KeReleaseGuardedMutex(&ViewLock); + + return Dirty; } /* diff --git a/ntoskrnl/cc/view.c b/ntoskrnl/cc/view.c index f38a028d9b..0e37b77efc 100644 --- a/ntoskrnl/cc/view.c +++ b/ntoskrnl/cc/view.c @@ -41,7 +41,7 @@ /* GLOBALS *******************************************************************/ -static LIST_ENTRY DirtyVacbListHead; +LIST_ENTRY DirtyVacbListHead; static LIST_ENTRY VacbLruListHead; ULONG DirtyPageCount = 0; diff --git a/ntoskrnl/include/internal/cc.h b/ntoskrnl/include/internal/cc.h index 4f7c4823af..58d2b15a50 100644 --- a/ntoskrnl/include/internal/cc.h +++ b/ntoskrnl/include/internal/cc.h @@ -40,6 +40,7 @@ // Global Cc Data // extern ULONG CcRosTraceLevel; +extern LIST_ENTRY DirtyVacbListHead; typedef struct _PF_SCENARIO_ID {

6 years, 11 months

01/01: [KERNEL32] Add version info to VerifyVersionInfo mismatch print.

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4a2ad113e59e8998dcf30… commit 4a2ad113e59e8998dcf30ec490e76008bedb6a1e Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sun Jan 14 00:57:56 2018 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Mon Jan 15 19:47:58 2018 +0100 [KERNEL32] Add version info to VerifyVersionInfo mismatch print. --- dll/win32/kernel32/client/version.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/dll/win32/kernel32/client/version.c b/dll/win32/kernel32/client/version.c index 0ae917392b..b335210510 100644 --- a/dll/win32/kernel32/client/version.c +++ b/dll/win32/kernel32/client/version.c @@ -131,7 +131,18 @@ VerifyVersionInfoW(IN LPOSVERSIONINFOEXW lpVersionInformation, return FALSE; case STATUS_REVISION_MISMATCH: - DPRINT1("VerifyVersionInfo -- Version mismatch\n"); + if (lpVersionInformation) + { + DPRINT1("VerifyVersionInfo -- Version mismatch(%d.%d.%d:%d)\n", + (dwTypeMask & VER_MAJORVERSION) ? lpVersionInformation->dwMajorVersion : -1, + (dwTypeMask & VER_MINORVERSION) ? lpVersionInformation->dwMinorVersion : -1, + (dwTypeMask & VER_BUILDNUMBER) ? lpVersionInformation->dwBuildNumber : -1, + (dwTypeMask & VER_PLATFORMID) ? lpVersionInformation->dwPlatformId : -1); + } + else + { + DPRINT1("VerifyVersionInfo -- Version mismatch(NULL)\n"); + } SetLastError(ERROR_OLD_WIN_VERSION); return FALSE;

6 years, 11 months

02/02: [UXTHEME] -Pass a non 0 wParam when themes get enabled and 0 when they get disabled

by Giannis Adamopoulos

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7e9f56229f8287f597c4a… commit 7e9f56229f8287f597c4a78fd215d3e3e359a873 Author: Giannis Adamopoulos <gadamopoulos(a)reactos.org> AuthorDate: Fri Jan 12 18:52:08 2018 +0200 Commit: Giannis Adamopoulos <gadamopoulos(a)reactos.org> CommitDate: Mon Jan 15 12:57:08 2018 +0200 [UXTHEME] -Pass a non 0 wParam when themes get enabled and 0 when they get disabled --- dll/win32/uxtheme/system.c | 20 ++++++++++---------- dll/win32/uxtheme/themehooks.c | 4 ++-- dll/win32/uxtheme/uxthemep.h | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dll/win32/uxtheme/system.c b/dll/win32/uxtheme/system.c index 84d703d157..2fb1ac8b5a 100644 --- a/dll/win32/uxtheme/system.c +++ b/dll/win32/uxtheme/system.c @@ -58,23 +58,23 @@ int g_cHandles; /***********************************************************************/ -static BOOL CALLBACK UXTHEME_broadcast_msg_enumchild (HWND hWnd, LPARAM msg) +static BOOL CALLBACK UXTHEME_send_theme_changed (HWND hWnd, LPARAM enable) { - SendMessageW(hWnd, msg, 0, 0); + SendMessageW(hWnd, WM_THEMECHANGED, enable, 0); return TRUE; } -/* Broadcast a message to *all* windows, including children */ -BOOL CALLBACK UXTHEME_broadcast_msg (HWND hWnd, LPARAM msg) +/* Broadcast WM_THEMECHANGED to *all* windows, including children */ +BOOL CALLBACK UXTHEME_broadcast_theme_changed (HWND hWnd, LPARAM enable) { if (hWnd == NULL) { - EnumWindows (UXTHEME_broadcast_msg, msg); + EnumWindows (UXTHEME_broadcast_theme_changed, enable); } else { - SendMessageW(hWnd, msg, 0, 0); - EnumChildWindows (hWnd, UXTHEME_broadcast_msg_enumchild, msg); + UXTHEME_send_theme_changed(hWnd, enable); + EnumChildWindows (hWnd, UXTHEME_send_theme_changed, enable); } return TRUE; } @@ -658,7 +658,7 @@ HRESULT WINAPI EnableTheming(BOOL fEnable) RegSetValueExW(hKey, szThemeActive, 0, REG_SZ, (LPBYTE)szEnabled, sizeof(WCHAR)); RegCloseKey(hKey); } - UXTHEME_broadcast_msg (NULL, WM_THEMECHANGED); + UXTHEME_broadcast_theme_changed (NULL, fEnable); } return S_OK; } @@ -884,7 +884,7 @@ HRESULT WINAPI SetWindowTheme(HWND hwnd, LPCWSTR pszSubAppName, if (!SUCCEEDED(hr)) return hr; - UXTHEME_broadcast_msg (hwnd, WM_THEMECHANGED); + UXTHEME_broadcast_theme_changed (hwnd, TRUE); return hr; } @@ -1160,7 +1160,7 @@ HRESULT WINAPI ApplyTheme(HTHEMEFILE hThemeFile, char *unknown, HWND hWnd) HRESULT hr; TRACE("(%p,%s,%p)\n", hThemeFile, unknown, hWnd); hr = UXTHEME_ApplyTheme(hThemeFile); - UXTHEME_broadcast_msg (NULL, WM_THEMECHANGED); + UXTHEME_broadcast_theme_changed (NULL, (g_ActiveThemeFile != NULL)); return hr; } diff --git a/dll/win32/uxtheme/themehooks.c b/dll/win32/uxtheme/themehooks.c index e87b6d0abe..99811808f7 100644 --- a/dll/win32/uxtheme/themehooks.c +++ b/dll/win32/uxtheme/themehooks.c @@ -697,7 +697,7 @@ ThemeHooksInstall() ret = FALSE; } - UXTHEME_broadcast_msg (NULL, WM_THEMECHANGED); + UXTHEME_broadcast_theme_changed (NULL, TRUE); return ret; } @@ -709,7 +709,7 @@ ThemeHooksRemove() ret = UnregisterUserApiHook(); - UXTHEME_broadcast_msg (NULL, WM_THEMECHANGED); + UXTHEME_broadcast_theme_changed (NULL, FALSE); return ret; } diff --git a/dll/win32/uxtheme/uxthemep.h b/dll/win32/uxtheme/uxthemep.h index 8aeb65d98a..2708cdd48f 100644 --- a/dll/win32/uxtheme/uxthemep.h +++ b/dll/win32/uxtheme/uxthemep.h @@ -256,7 +256,7 @@ extern BOOL g_bThemeHooksActive; void UXTHEME_InitSystem(HINSTANCE hInst); void UXTHEME_LoadTheme(BOOL bLoad); -BOOL CALLBACK UXTHEME_broadcast_msg (HWND hWnd, LPARAM msg); +BOOL CALLBACK UXTHEME_broadcast_theme_changed (HWND hWnd, LPARAM enable); /* No alpha blending */ #define ALPHABLEND_NONE 0

6 years, 11 months

← Newer
1
...
25
26
27
28
29
30
31
...
38
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 January 2018