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